From ed1d5351a16b3650822ff7d8c3a56ff95d0eacbf Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 1 Jul 2010 17:39:32 +0200 Subject: xserver-xorg: upgrade 1.9 RC3 to RC4 Signed-off-by: Martin Jansa --- .../include/preferred-xorg-versions-live.inc | 4 +-- ...ake-sure-that-DisplayModeRec-name-is-init.patch | 25 -------------- ...ack-assume-pixman-supports-overlapped-blt.patch | 14 -------- ...ake-sure-that-DisplayModeRec-name-is-init.patch | 25 ++++++++++++++ ...ack-assume-pixman-supports-overlapped-blt.patch | 14 ++++++++ recipes/xorg-xserver/xserver-xorg_1.8.99.903.bb | 38 ---------------------- recipes/xorg-xserver/xserver-xorg_1.8.99.904.bb | 38 ++++++++++++++++++++++ 7 files changed, 79 insertions(+), 79 deletions(-) delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.8.99.903/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.8.99.903/hack-assume-pixman-supports-overlapped-blt.patch create mode 100644 recipes/xorg-xserver/xserver-xorg-1.8.99.904/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch create mode 100644 recipes/xorg-xserver/xserver-xorg-1.8.99.904/hack-assume-pixman-supports-overlapped-blt.patch delete mode 100644 recipes/xorg-xserver/xserver-xorg_1.8.99.903.bb create mode 100644 recipes/xorg-xserver/xserver-xorg_1.8.99.904.bb diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc index 3dc846dd63..3332efa30d 100644 --- a/conf/distro/include/preferred-xorg-versions-live.inc +++ b/conf/distro/include/preferred-xorg-versions-live.inc @@ -1,4 +1,4 @@ -#Mon Jun 28 09:07:30 CEST 2010 +#Thu Jul 1 16:47:21 CEST 2010 #app PREFERRED_VERSION_appres ?= "1.0.2" PREFERRED_VERSION_bdftopcf ?= "1.0.2" @@ -353,4 +353,4 @@ PREFERRED_VERSION_util-macros ?= "1.10.0" PREFERRED_VERSION_util-macros-native ?= "1.10.0" PREFERRED_VERSION_xorg-cf-files ?= "1.0.3" #xserver -PREFERRED_VERSION_xserver-xorg ?= "1.8.99.903" +PREFERRED_VERSION_xserver-xorg ?= "1.8.99.904" diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.99.903/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch b/recipes/xorg-xserver/xserver-xorg-1.8.99.903/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch deleted file mode 100644 index adbc274fd7..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.8.99.903/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7deb3068ff65ecadf035e8e493d418aca89c9212 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 30 Jun 2010 10:42:36 +0200 -Subject: [PATCH] xf86Modes: make sure that DisplayModeRec name is initialized to NULL and then don't call free() on it in xf86SetModeDefaultName - ---- - hw/xfree86/modes/xf86Modes.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c -index 05f4319..09a9679 100644 ---- a/hw/xfree86/modes/xf86Modes.c -+++ b/hw/xfree86/modes/xf86Modes.c -@@ -206,7 +206,7 @@ xf86DuplicateMode(const DisplayModeRec *pMode) - { - DisplayModePtr pNew; - -- pNew = xnfalloc(sizeof(DisplayModeRec)); -+ pNew = xnfcalloc(1, sizeof(DisplayModeRec)); - *pNew = *pMode; - pNew->next = NULL; - pNew->prev = NULL; --- -1.7.1 - diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.99.903/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.8.99.903/hack-assume-pixman-supports-overlapped-blt.patch deleted file mode 100644 index a947582f15..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.8.99.903/hack-assume-pixman-supports-overlapped-blt.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/fb/fbcopy.c b/fb/fbcopy.c -index 07eb663..ba394b7 100644 ---- a/fb/fbcopy.c -+++ b/fb/fbcopy.c -@@ -91,8 +91,7 @@ fbCopyNtoN (DrawablePtr pSrcDrawable, - while (nbox--) - { - #ifndef FB_ACCESS_WRAPPER /* pixman_blt() doesn't support accessors yet */ -- if (pm == FB_ALLONES && alu == GXcopy && !reverse && -- !upsidedown) -+ if (pm == FB_ALLONES && alu == GXcopy) - { - if (!pixman_blt ((uint32_t *)src, (uint32_t *)dst, srcStride, dstStride, srcBpp, dstBpp, - (pbox->x1 + dx + srcXoff), diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.99.904/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch b/recipes/xorg-xserver/xserver-xorg-1.8.99.904/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch new file mode 100644 index 0000000000..adbc274fd7 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.8.99.904/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch @@ -0,0 +1,25 @@ +From 7deb3068ff65ecadf035e8e493d418aca89c9212 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 30 Jun 2010 10:42:36 +0200 +Subject: [PATCH] xf86Modes: make sure that DisplayModeRec name is initialized to NULL and then don't call free() on it in xf86SetModeDefaultName + +--- + hw/xfree86/modes/xf86Modes.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c +index 05f4319..09a9679 100644 +--- a/hw/xfree86/modes/xf86Modes.c ++++ b/hw/xfree86/modes/xf86Modes.c +@@ -206,7 +206,7 @@ xf86DuplicateMode(const DisplayModeRec *pMode) + { + DisplayModePtr pNew; + +- pNew = xnfalloc(sizeof(DisplayModeRec)); ++ pNew = xnfcalloc(1, sizeof(DisplayModeRec)); + *pNew = *pMode; + pNew->next = NULL; + pNew->prev = NULL; +-- +1.7.1 + diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.99.904/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.8.99.904/hack-assume-pixman-supports-overlapped-blt.patch new file mode 100644 index 0000000000..a947582f15 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.8.99.904/hack-assume-pixman-supports-overlapped-blt.patch @@ -0,0 +1,14 @@ +diff --git a/fb/fbcopy.c b/fb/fbcopy.c +index 07eb663..ba394b7 100644 +--- a/fb/fbcopy.c ++++ b/fb/fbcopy.c +@@ -91,8 +91,7 @@ fbCopyNtoN (DrawablePtr pSrcDrawable, + while (nbox--) + { + #ifndef FB_ACCESS_WRAPPER /* pixman_blt() doesn't support accessors yet */ +- if (pm == FB_ALLONES && alu == GXcopy && !reverse && +- !upsidedown) ++ if (pm == FB_ALLONES && alu == GXcopy) + { + if (!pixman_blt ((uint32_t *)src, (uint32_t *)dst, srcStride, dstStride, srcBpp, dstBpp, + (pbox->x1 + dx + srcXoff), diff --git a/recipes/xorg-xserver/xserver-xorg_1.8.99.903.bb b/recipes/xorg-xserver/xserver-xorg_1.8.99.903.bb deleted file mode 100644 index 709c57c42b..0000000000 --- a/recipes/xorg-xserver/xserver-xorg_1.8.99.903.bb +++ /dev/null @@ -1,38 +0,0 @@ -# Assign it here, since the hal->udev transition happens post 1.7 in angstrom -DISTRO_XORG_CONFIG_MANAGER_angstrom = "udev" - -require xorg-xserver-common.inc - -DESCRIPTION = "the X.Org X server" -DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native" -PE = "2" -PR = "${INC_PR}.3" - -# Needs newer mesa-dri, where is D_P = "-1" -DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_shr = "1" - -SRC_URI += " \ - file://dolt-fix-1.7.0.patch \ - file://randr-support-1.7.0.patch \ - file://hack-fbdev-ignore-return-mode.patch \ - file://0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch \ - " -SRC_URI[archive.md5sum] = "d49305baa79772ca965407b0fd2dcb84" -SRC_URI[archive.sha256sum] = "2e7e999da9e23e2daee35715c4432447408ae1edc4bdac0b13e667af58cd5775" - -SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch" -SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch" - -do_install_prepend() { - mkdir -p ${D}/${libdir}/X11/fonts -} - -# The NVidia driver requires Xinerama support in the X server. Ion uses it. -PACKAGE_ARCH_ion = "${MACHINE_ARCH}" -XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}" - -EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" -EXTRA_OECONF += " --enable-dri2 --disable-unit-tests " - -export LDFLAGS += " -ldl " diff --git a/recipes/xorg-xserver/xserver-xorg_1.8.99.904.bb b/recipes/xorg-xserver/xserver-xorg_1.8.99.904.bb new file mode 100644 index 0000000000..6ae1e53df0 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg_1.8.99.904.bb @@ -0,0 +1,38 @@ +# Assign it here, since the hal->udev transition happens post 1.7 in angstrom +DISTRO_XORG_CONFIG_MANAGER_angstrom = "udev" + +require xorg-xserver-common.inc + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native" +PE = "2" +PR = "${INC_PR}.3" + +# Needs newer mesa-dri, where is D_P = "-1" +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_shr = "1" + +SRC_URI += " \ + file://dolt-fix-1.7.0.patch \ + file://randr-support-1.7.0.patch \ + file://hack-fbdev-ignore-return-mode.patch \ + file://0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch \ + " +SRC_URI[archive.md5sum] = "5e987ddbd3796718b52ee0b7c06b3c68" +SRC_URI[archive.sha256sum] = "be2b0097997758fbd917449ee013435b4012722a02774fe2a4ec1d06d7ea75d1" + +SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch" +SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch" + +do_install_prepend() { + mkdir -p ${D}/${libdir}/X11/fonts +} + +# The NVidia driver requires Xinerama support in the X server. Ion uses it. +PACKAGE_ARCH_ion = "${MACHINE_ARCH}" +XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}" + +EXTRA_OECONF += " ${CONFIG_MANAGER_OPTION} ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" +EXTRA_OECONF += " --enable-dri2 --disable-unit-tests " + +export LDFLAGS += " -ldl " -- cgit v1.2.3