From 1f412ddc3056d8d9d1e7bd1977c83774e7a7bc1d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 26 Feb 2010 14:23:13 +0100 Subject: xserver-xorg: move older versions to obsolete (1.7.1 stays only because is used in preferred-xorg-versions-X11R7.5.inc, but it should move to 1.7.4 too) Signed-off-by: Martin Jansa --- .../xorg-xserver/xserver-xorg-1.6.1/drmfix.patch | 15 ++++++++++++ ...ack-assume-pixman-supports-overlapped-blt.patch | 14 +++++++++++ ...ack-assume-pixman-supports-overlapped-blt.patch | 14 +++++++++++ .../obsolete/xorg-xserver/xserver-xorg_1.6.1.bb | 17 ++++++++++++++ .../obsolete/xorg-xserver/xserver-xorg_1.7.2.bb | 19 +++++++++++++++ .../obsolete/xorg-xserver/xserver-xorg_1.7.3.bb | 27 ++++++++++++++++++++++ .../xorg-xserver/xserver-xorg-1.6.1/drmfix.patch | 15 ------------ ...ack-assume-pixman-supports-overlapped-blt.patch | 14 ----------- ...ack-assume-pixman-supports-overlapped-blt.patch | 14 ----------- recipes/xorg-xserver/xserver-xorg_1.6.1.bb | 17 -------------- recipes/xorg-xserver/xserver-xorg_1.7.2.bb | 19 --------------- recipes/xorg-xserver/xserver-xorg_1.7.3.bb | 27 ---------------------- 12 files changed, 106 insertions(+), 106 deletions(-) create mode 100644 recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch create mode 100644 recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch create mode 100644 recipes/obsolete/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch create mode 100644 recipes/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb create mode 100644 recipes/obsolete/xorg-xserver/xserver-xorg_1.7.2.bb create mode 100644 recipes/obsolete/xorg-xserver/xserver-xorg_1.7.3.bb delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch delete mode 100644 recipes/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch delete mode 100644 recipes/xorg-xserver/xserver-xorg_1.6.1.bb delete mode 100644 recipes/xorg-xserver/xserver-xorg_1.7.2.bb delete mode 100644 recipes/xorg-xserver/xserver-xorg_1.7.3.bb (limited to 'recipes') diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch b/recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch new file mode 100644 index 0000000000..8ebda98975 --- /dev/null +++ b/recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch @@ -0,0 +1,15 @@ +upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) + +Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am +=================================================================== +--- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100 ++++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am 2008-10-27 13:27:40.000000000 +0000 +@@ -40,7 +40,7 @@ + + AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) + +-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack ++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) + + # FIXME: These need to be added to the build + LNX_EXTRA_SRCS = \ diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch new file mode 100644 index 0000000000..a947582f15 --- /dev/null +++ b/recipes/obsolete/xorg-xserver/xserver-xorg-1.6.1/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/obsolete/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/obsolete/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch new file mode 100644 index 0000000000..a947582f15 --- /dev/null +++ b/recipes/obsolete/xorg-xserver/xserver-xorg-1.7.3/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/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb b/recipes/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb new file mode 100644 index 0000000000..ff8e1cfa03 --- /dev/null +++ b/recipes/obsolete/xorg-xserver/xserver-xorg_1.6.1.bb @@ -0,0 +1,17 @@ +require xorg-xserver-common.inc + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman libpciaccess openssl xineramaproto libxinerama" +RDEPENDS += "hal" +PE = "2" +PR = "${INC_PR}.1" + +SRC_URI += "file://sysroot_fix.patch;patch=1 \ + file://dolt-fix.patch;patch=1" + +# This requires support in pixman, which the default one doesn't have +SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1" + +MESA_VER = "7.2" + +export LDFLAGS += " -ldl " diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.2.bb b/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.2.bb new file mode 100644 index 0000000000..08908b784f --- /dev/null +++ b/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.2.bb @@ -0,0 +1,19 @@ +require xorg-xserver-common.inc + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts" +PE = "2" +PR = "${INC_PR}.0" + +SRC_URI += "file://sysroot_fix.patch;patch=1 \ + file://dolt-fix-1.7.0.patch;patch=1 \ + file://randr-support-1.7.0.patch;patch=1 \ + " +do_install_prepend() { + mkdir -p ${D}/${libdir}/X11/fonts +} + +EXTRA_OECONF += "--disable-xephyr --disable-config-hal --disable-xinerama --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" +EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests " + +export LDFLAGS += " -ldl " diff --git a/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.3.bb b/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.3.bb new file mode 100644 index 0000000000..33aafb5fe3 --- /dev/null +++ b/recipes/obsolete/xorg-xserver/xserver-xorg_1.7.3.bb @@ -0,0 +1,27 @@ +require xorg-xserver-common.inc + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts" +PE = "2" +PR = "${INC_PR}.0" + +SRC_URI += "file://sysroot_fix.patch;patch=1 \ + file://dolt-fix-1.7.0.patch;patch=1 \ + file://randr-support-1.7.0.patch;patch=1 \ + file://hack-fbdev-ignore-return-mode.patch;patch=1 \ + " + +SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1" +SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1" + +do_install_prepend() { + mkdir -p ${D}/${libdir}/X11/fonts +} + +# The NVidia driver requires Xinerama support in the X server. Ion uses it. +XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}" + +EXTRA_OECONF += " --enable-config-hal ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" +EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests " + +export LDFLAGS += " -ldl " diff --git a/recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch deleted file mode 100644 index 8ebda98975..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.6.1/drmfix.patch +++ /dev/null @@ -1,15 +0,0 @@ -upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) - -Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am -=================================================================== ---- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100 -+++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am 2008-10-27 13:27:40.000000000 +0000 -@@ -40,7 +40,7 @@ - - AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) - --INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack -+INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) - - # FIXME: These need to be added to the build - LNX_EXTRA_SRCS = \ diff --git a/recipes/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.6.1/hack-assume-pixman-supports-overlapped-blt.patch deleted file mode 100644 index a947582f15..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.6.1/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.7.3/hack-assume-pixman-supports-overlapped-blt.patch b/recipes/xorg-xserver/xserver-xorg-1.7.3/hack-assume-pixman-supports-overlapped-blt.patch deleted file mode 100644 index a947582f15..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.7.3/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.6.1.bb b/recipes/xorg-xserver/xserver-xorg_1.6.1.bb deleted file mode 100644 index ff8e1cfa03..0000000000 --- a/recipes/xorg-xserver/xserver-xorg_1.6.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -require xorg-xserver-common.inc - -DESCRIPTION = "the X.Org X server" -DEPENDS += "pixman libpciaccess openssl xineramaproto libxinerama" -RDEPENDS += "hal" -PE = "2" -PR = "${INC_PR}.1" - -SRC_URI += "file://sysroot_fix.patch;patch=1 \ - file://dolt-fix.patch;patch=1" - -# This requires support in pixman, which the default one doesn't have -SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1" - -MESA_VER = "7.2" - -export LDFLAGS += " -ldl " diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.2.bb b/recipes/xorg-xserver/xserver-xorg_1.7.2.bb deleted file mode 100644 index 08908b784f..0000000000 --- a/recipes/xorg-xserver/xserver-xorg_1.7.2.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-xserver-common.inc - -DESCRIPTION = "the X.Org X server" -DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts" -PE = "2" -PR = "${INC_PR}.0" - -SRC_URI += "file://sysroot_fix.patch;patch=1 \ - file://dolt-fix-1.7.0.patch;patch=1 \ - file://randr-support-1.7.0.patch;patch=1 \ - " -do_install_prepend() { - mkdir -p ${D}/${libdir}/X11/fonts -} - -EXTRA_OECONF += "--disable-xephyr --disable-config-hal --disable-xinerama --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" -EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests " - -export LDFLAGS += " -ldl " diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.3.bb b/recipes/xorg-xserver/xserver-xorg_1.7.3.bb deleted file mode 100644 index 33aafb5fe3..0000000000 --- a/recipes/xorg-xserver/xserver-xorg_1.7.3.bb +++ /dev/null @@ -1,27 +0,0 @@ -require xorg-xserver-common.inc - -DESCRIPTION = "the X.Org X server" -DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts" -PE = "2" -PR = "${INC_PR}.0" - -SRC_URI += "file://sysroot_fix.patch;patch=1 \ - file://dolt-fix-1.7.0.patch;patch=1 \ - file://randr-support-1.7.0.patch;patch=1 \ - file://hack-fbdev-ignore-return-mode.patch;patch=1 \ - " - -SRC_URI_append_angstrom = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1" -SRC_URI_append_shr = " file://hack-assume-pixman-supports-overlapped-blt.patch;patch=1" - -do_install_prepend() { - mkdir -p ${D}/${libdir}/X11/fonts -} - -# The NVidia driver requires Xinerama support in the X server. Ion uses it. -XINERAMA = "${@['--disable-xinerama','--enable-xinerama'][bb.data.getVar('MACHINE',d) in ['ion']]}" - -EXTRA_OECONF += " --enable-config-hal ${XINERAMA} --disable-kdrive --disable-xephyr --disable-xsdl --disable-xfake --disable-xfbdev --disable-dmx" -EXTRA_OECONF += " --disable-glx-tls --enable-dri2 --disable-unit-tests " - -export LDFLAGS += " -ldl " -- cgit v1.2.3