From 5b03c054c362ffec457d4515f329e30c7a32fb91 Mon Sep 17 00:00:00 2001 From: Wang Quanxian Date: Tue, 24 Jul 2012 10:19:43 +0800 Subject: [PATCH] delete weston-mode patch from packaging dir Signed-Off-By Quanxian Wang --- packaging/weston-mode-nextcom.patch | 55 ------------------------------------- packaging/weston.spec | 10 ------- 2 files changed, 65 deletions(-) delete mode 100644 packaging/weston-mode-nextcom.patch diff --git a/packaging/weston-mode-nextcom.patch b/packaging/weston-mode-nextcom.patch deleted file mode 100644 index 4520c2b..0000000 --- a/packaging/weston-mode-nextcom.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/src/compositor-drm.c b/src/compositor-drm.c -index 4dffa1d..6239f91 100644 ---- a/src/compositor-drm.c -+++ b/src/compositor-drm.c -@@ -143,6 +143,16 @@ struct drm_sprite { - uint32_t formats[]; - }; - -+static drmModeModeInfo builtin_800x480 = { -+ 33750, /* clock */ -+ 800, 864, 976, 1088, 0, -+ 480, 486, 494, 517, 0, -+ 59920, -+ DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC, -+ 0, -+ "800x480" -+}; -+ - static int - surface_is_primary(struct weston_compositor *ec, struct weston_surface *es) - { -@@ -1344,13 +1354,30 @@ create_output_for_connector(struct drm_compositor *ec, - drmModeFreeEncoder(encoder); - if (crtc == NULL) - goto err_free; -- crtc_mode = crtc->mode; -+ -+ /* if don't get mode from drm driver, use default 800x480 */ -+ if (crtc->mode.clock != 0) -+ { -+ crtc_mode = crtc->mode; -+ } else { -+ if (connector->count_modes == 0) -+ crtc_mode = builtin_800x480; -+ else -+ crtc_mode = connector->modes[0]; -+ } -+ - drmModeFreeCrtc(crtc); - -- for (i = 0; i < connector->count_modes; i++) { -- ret = drm_output_add_mode(output, &connector->modes[i]); -+ if (connector->count_modes == 0) { -+ ret = drm_output_add_mode(output, &crtc_mode); - if (ret) - goto err_free; -+ }else{ -+ for (i = 0; i < connector->count_modes; i++) { -+ ret = drm_output_add_mode(output, &connector->modes[i]); -+ if (ret) -+ goto err_free; -+ } - } - - preferred = NULL; diff --git a/packaging/weston.spec b/packaging/weston.spec index 19393f4..002eab4 100644 --- a/packaging/weston.spec +++ b/packaging/weston.spec @@ -33,11 +33,6 @@ BuildRequires: pam-devel BuildRequires: libjpeg-devel Requires: xkeyboard-config -# -# Special patch for Tizen -# -Patch1: weston-mode-nextcom.patch - %description Weston compositor @@ -52,11 +47,6 @@ Adds a simple cursor theme to the default cursor theme %prep %setup -q -n %{name}-%{version} -# -# Apply patches -# -%patch1 -p1 - %build %autogen --disable-setuid-install -- 2.7.4