From 50103f4e5fe8d4a17307b7559a04fd6c77c2b922 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 6 Sep 2009 22:21:03 +0200 Subject: [PATCH] xorg-server: update to xorg-server-1.6.99.900 --- packages/x11/xserver/xorg-server/build | 1 - .../patches/30_dri-no-xinerama.diff | 47 ++++++++++++++ .../xorg-server/patches/50-pkgconfig_gl.diff | 62 +++++++++++++++++++ .../xorg-server/patches/75_nvidia-drv.diff | 12 ++++ packages/x11/xserver/xorg-server/url | 2 +- 5 files changed, 122 insertions(+), 2 deletions(-) create mode 100644 packages/x11/xserver/xorg-server/patches/30_dri-no-xinerama.diff create mode 100644 packages/x11/xserver/xorg-server/patches/50-pkgconfig_gl.diff create mode 100644 packages/x11/xserver/xorg-server/patches/75_nvidia-drv.diff diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build index de4afe9a13..935c17f75b 100755 --- a/packages/x11/xserver/xorg-server/build +++ b/packages/x11/xserver/xorg-server/build @@ -96,7 +96,6 @@ cd $PKG_BUILD --with-gnu-ld \ --enable-install-libxf86config \ --with-os-vendor="OpenELEC" \ - --with-mesa-source=`ls -d $ROOT/$BUILD/$MESA*` \ --with-module-dir=$XORG_PATH_MODULES \ --with-xkb-path=$XORG_PATH_XKB \ --with-xkb-output=/var/cache/xkb \ diff --git a/packages/x11/xserver/xorg-server/patches/30_dri-no-xinerama.diff b/packages/x11/xserver/xorg-server/patches/30_dri-no-xinerama.diff new file mode 100644 index 0000000000..f01f0f2692 --- /dev/null +++ b/packages/x11/xserver/xorg-server/patches/30_dri-no-xinerama.diff @@ -0,0 +1,47 @@ +diff -Naur a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c +--- a/hw/xfree86/dri/dri.c 2009-08-31 01:17:11.000000000 +0200 ++++ b/hw/xfree86/dri/dri.c 2009-09-04 13:35:36.000000000 +0200 +@@ -73,7 +73,7 @@ + + #define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu) + +-#if !defined(PANORAMIX) ++#ifdef PANORAMIX + extern Bool noPanoramiXExtension; + #endif + +@@ -321,7 +321,6 @@ + drm_context_t * reserved; + int reserved_count; + int i; +- Bool xineramaInCore = FALSE; + DRIEntPrivPtr pDRIEntPriv; + ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + DRIContextFlags flags = 0; +@@ -340,20 +339,17 @@ + return FALSE; + } + ++#ifdef PANORAMIX + /* + * If Xinerama is on, don't allow DRI to initialise. It won't be usable + * anyway. + */ +- if (xf86LoaderCheckSymbol("noPanoramiXExtension")) +- xineramaInCore = TRUE; +- +- if (xineramaInCore) { +- if (!noPanoramiXExtension) { +- DRIDrvMsg(pScreen->myNum, X_WARNING, +- "Direct rendering is not supported when Xinerama is enabled\n"); +- return FALSE; +- } ++ if (!noPanoramiXExtension) { ++ DRIDrvMsg(pScreen->myNum, X_WARNING, ++ "Direct rendering is not supported when Xinerama is enabled\n"); ++ return FALSE; + } ++#endif /* PANORAMIX */ + + if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize, + pDRIInfo->busIdString, diff --git a/packages/x11/xserver/xorg-server/patches/50-pkgconfig_gl.diff b/packages/x11/xserver/xorg-server/patches/50-pkgconfig_gl.diff new file mode 100644 index 0000000000..7a8c80d9c1 --- /dev/null +++ b/packages/x11/xserver/xorg-server/patches/50-pkgconfig_gl.diff @@ -0,0 +1,62 @@ +diff -Naur a/configure b/configure +--- a/configure 2009-09-04 08:44:13.000000000 +0200 ++++ b/configure 2009-09-04 13:44:05.000000000 +0200 +@@ -22218,12 +22218,12 @@ + pkg_cv_GL_CFLAGS="$GL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.9 gl >= 7.1.0\"") >&5 +- ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.9 gl >= 7.1.0") 2>&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.9\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.9") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "glproto >= 1.4.9 gl >= 7.1.0" 2>/dev/null` ++ pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "glproto >= 1.4.9" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22234,12 +22234,12 @@ + pkg_cv_GL_LIBS="$GL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.9 gl >= 7.1.0\"") >&5 +- ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.9 gl >= 7.1.0") 2>&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.9\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.9") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "glproto >= 1.4.9 gl >= 7.1.0" 2>/dev/null` ++ pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "glproto >= 1.4.9" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -22257,14 +22257,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glproto >= 1.4.9 gl >= 7.1.0" 2>&1` ++ GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glproto >= 1.4.9" 2>&1` + else +- GL_PKG_ERRORS=`$PKG_CONFIG --print-errors "glproto >= 1.4.9 gl >= 7.1.0" 2>&1` ++ GL_PKG_ERRORS=`$PKG_CONFIG --print-errors "glproto >= 1.4.9" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GL_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (glproto >= 1.4.9 gl >= 7.1.0) were not met: ++ { { $as_echo "$as_me:$LINENO: error: Package requirements (glproto >= 1.4.9) were not met: + + $GL_PKG_ERRORS + +@@ -22275,7 +22275,7 @@ + and GL_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-$as_echo "$as_me: error: Package requirements (glproto >= 1.4.9 gl >= 7.1.0) were not met: ++$as_echo "$as_me: error: Package requirements (glproto >= 1.4.9) were not met: + + $GL_PKG_ERRORS + diff --git a/packages/x11/xserver/xorg-server/patches/75_nvidia-drv.diff b/packages/x11/xserver/xorg-server/patches/75_nvidia-drv.diff new file mode 100644 index 0000000000..c5dde6f915 --- /dev/null +++ b/packages/x11/xserver/xorg-server/patches/75_nvidia-drv.diff @@ -0,0 +1,12 @@ +diff -Naur a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c +--- a/hw/xfree86/common/xf86AutoConfig.c 2009-09-04 13:53:31.000000000 +0200 ++++ b/hw/xfree86/common/xf86AutoConfig.c 2009-09-04 05:15:54.000000000 +0200 +@@ -192,7 +192,7 @@ + break; + case 0x102b: driverList[0] = "mga"; break; + case 0x10c8: driverList[0] = "neomagic"; break; +- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; ++ case 0x10de: case 0x12d2: driverList[0] = "nvidia"; driverList[1] = "nv"; break; + case 0x1106: driverList[0] = "openchrome"; break; + case 0x1163: driverList[0] = "rendition"; break; + case 0x5333: diff --git a/packages/x11/xserver/xorg-server/url b/packages/x11/xserver/xorg-server/url index 965b926bcd..a9e73e5186 100644 --- a/packages/x11/xserver/xorg-server/url +++ b/packages/x11/xserver/xorg-server/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xorg-server-20090828.tar.bz2 +http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.6.99.900.tar.bz2