From 271da49386e259723ef574713339f04886630604 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Tue, 14 Jan 2014 03:47:29 +0000 Subject: Tue Jan 14 03:40:13 UTC 2014 --- extra/xorg-server/PKGBUILD | 64 +++++++++------------- extra/xorg-server/bug59825.patch | 12 ---- .../fb-rename-wfbDestroyGlyphCache.patch | 27 --------- extra/xorg-server/xephyr-glx.patch | 39 ------------- .../xserver-1.6.0-less-acpi-brokenness.patch | 25 --------- 5 files changed, 25 insertions(+), 142 deletions(-) delete mode 100644 extra/xorg-server/bug59825.patch delete mode 100644 extra/xorg-server/fb-rename-wfbDestroyGlyphCache.patch delete mode 100644 extra/xorg-server/xephyr-glx.patch delete mode 100644 extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch (limited to 'extra/xorg-server') diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index b9b3f52ad..5bc67ab42 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,39 +1,33 @@ -# $Id: PKGBUILD 203261 2014-01-06 22:20:54Z lcarlier $ +# $Id: PKGBUILD 203648 2014-01-13 17:13:35Z andyrtr $ # Maintainer: AndyRTR # Maintainer: Jan de Groot pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.14.5 -pkgrel=2 +pkgver=1.15.0 +pkgrel=5 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' - 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' - 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' - 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt') +makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' + 'inputproto' 'fontsproto' 'videoproto' 'presentproto' 'compositeproto' 'recordproto' 'scrnsaverproto' + 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' + 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' + 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' + 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto' 'libxshmfence') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-nvidia.patch autoconfig-sis.patch - xserver-1.6.0-less-acpi-brokenness.patch - bug59825.patch - xephyr-glx.patch xvfb-run xvfb-run.1 10-quirks.conf - fb-rename-wfbDestroyGlyphCache.patch - CVE-2013-6424.diff) -sha256sums=('8d0f06bf1416487a5170318477088826a8d737d4a201e996b2dc1ecff47461d1' + CVE-2013-6424.diff) +sha256sums=('613b2f2e7ee2a06d2f8e862c836dc70d319c52f1537749e027398f40086aabb8' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' - 'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a' - '26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588' - 'bb63658d250c21bbfaf94c5417f2920ce5963ee1f7db6cac2b163a54f2e9b619' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166' - 'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1' '89948993afd4d9aec6a0bdbaf62f494e9956bb77a0386307d497f340a818ff61') prepare() { @@ -44,18 +38,6 @@ prepare() { # Use unofficial imedia SiS driver for supported SiS devices patch -Np0 -i ../autoconfig-sis.patch - # https://bugs.freedesktop.org/show_bug.cgi?id=59825 - fixes crash with vboxvideo -# patch -Np1 -i ../bug59825.patch - - # From Fedora. Do not build acpid code, it is buggy and we do not need it - patch -Np1 -i ../xserver-1.6.0-less-acpi-brokenness.patch - - # Add GLX support for Xephyr - https://bugs.freedesktop.org/show_bug.cgi?id=62346 - patch -Np0 -i ../xephyr-glx.patch - - # http://cgit.freedesktop.org/xorg/xserver/commit/fb/wfbrename.h?id=5047810a4c20fab444b8c6eb146c55dcdb0d4219 - patch -Np1 -i ../fb-rename-wfbDestroyGlyphCache.patch - # Fix CVE-2013-6424 (FS#38401) patch -Np1 -i ../CVE-2013-6424.diff } @@ -90,6 +72,10 @@ build() { --with-xkb-path=/usr/share/X11/xkb \ --with-xkb-output=/var/lib/xkb \ --with-fontrootdir=/usr/share/fonts + +# --without-dtrace \ +# --disable-linux-acpi --disable-linux-apm \ + make # Disable subdirs for make install rule to make splitting easier @@ -119,12 +105,13 @@ package_xorg-server-common() { package_xorg-server() { pkgdesc="Xorg X server" - depends=(libxdmcp libxfont libpciaccess libdrm 'pixman>=0.28.0' libgcrypt libxau xorg-server-common xf86-input-evdev) + depends=(libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence) backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on - provides=('X-ABI-VIDEODRV_VERSION=14' 'X-ABI-XINPUT_VERSION=19' 'X-ABI-EXTENSION_VERSION=7.0' 'x-server') + # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg + provides=('X-ABI-VIDEODRV_VERSION=15' 'X-ABI-XINPUT_VERSION=20' 'X-ABI-EXTENSION_VERSION=8.0' 'x-server') groups=('xorg') - conflicts=('nvidia-utils<=290.10') + conflicts=('nvidia-utils<=331.20') cd "${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install @@ -154,7 +141,7 @@ package_xorg-server() { package_xorg-server-xephyr() { pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libgl libgcrypt libxv 'pixman>=0.28.0' xorg-server-common) + depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms') cd "${pkgbase}-${pkgver}/hw/kdrive" make DESTDIR="${pkgdir}" install @@ -165,7 +152,7 @@ package_xorg-server-xephyr() { package_xorg-server-xvfb() { pkgdesc="Virtual framebuffer X server" - depends=(libxfont libxdmcp libxau libgcrypt 'pixman>=0.28.0' xorg-server-common xorg-xauth) + depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common xorg-xauth) cd "${pkgbase}-${pkgver}/hw/vfb" make DESTDIR="${pkgdir}" install @@ -179,7 +166,7 @@ package_xorg-server-xvfb() { package_xorg-server-xnest() { pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libxext libgcrypt 'pixman>=0.28.0' xorg-server-common) + depends=(libxfont libxext libgcrypt pixman xorg-server-common) cd "${pkgbase}-${pkgver}/hw/xnest" make DESTDIR="${pkgdir}" install @@ -190,7 +177,7 @@ package_xorg-server-xnest() { package_xorg-server-xdmx() { pkgdesc="Distributed Multihead X Server and utilities" - depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes 'pixman>=0.28.0' xorg-server-common) + depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common) cd "${pkgbase}-${pkgver}/hw/dmx" make DESTDIR="${pkgdir}" install @@ -204,9 +191,8 @@ package_xorg-server-devel() { depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc xproto randrproto renderproto xextproto inputproto kbproto fontsproto pixman videoproto xf86driproto glproto - mesa dri2proto xineramaproto libpciaccess - # see FS#32146 - resourceproto scrnsaverproto + mesa dri2proto dri3proto xineramaproto libpciaccess + resourceproto scrnsaverproto presentproto # not technically required but almost every Xorg pkg needs it to build xorg-util-macros) diff --git a/extra/xorg-server/bug59825.patch b/extra/xorg-server/bug59825.patch deleted file mode 100644 index b405d136d..000000000 --- a/extra/xorg-server/bug59825.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -U 3 -b -d -p -r -- a/glx/glxdri.c b/glx/glxdri.c ---- a/glx/glxdri.c 2013-01-24 22:14:35.216092949 +0100 -+++ b/glx/glxdri.c 2013-01-24 22:13:48.499427991 +0100 -@@ -971,6 +971,8 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - size_t buffer_size; - ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - -+ framebuffer.base = NULL; -+ - if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") || - !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || !isCapable) { - LogMessage(X_INFO, \ No newline at end of file diff --git a/extra/xorg-server/fb-rename-wfbDestroyGlyphCache.patch b/extra/xorg-server/fb-rename-wfbDestroyGlyphCache.patch deleted file mode 100644 index 177f908ef..000000000 --- a/extra/xorg-server/fb-rename-wfbDestroyGlyphCache.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5047810a4c20fab444b8c6eb146c55dcdb0d4219 Mon Sep 17 00:00:00 2001 -From: Aaron Plattner -Date: Wed, 06 Mar 2013 17:40:28 +0000 -Subject: fb: Rename wfbDestroyGlyphCache - -Renaming this function was missed in commit -9cbcb5bd6a5360a128d15b77a02d8d3351f74366, so both libfb.so and libwfb.so define -functions named fbDestroyGlyphCache. - -Signed-off-by: Aaron Plattner -Reviewed-by: Søren Sandmann -Signed-off-by: Keith Packard ---- -diff --git a/fb/wfbrename.h b/fb/wfbrename.h -index 588440c..54d00d0 100644 ---- a/fb/wfbrename.h -+++ b/fb/wfbrename.h -@@ -52,6 +52,7 @@ - #define fbCreatePixmap wfbCreatePixmap - #define fbCreatePixmapBpp wfbCreatePixmapBpp - #define fbCreateWindow wfbCreateWindow -+#define fbDestroyGlyphCache wfbDestroyGlyphCache - #define fbDestroyPixmap wfbDestroyPixmap - #define fbDestroyWindow wfbDestroyWindow - #define fbDoCopy wfbDoCopy --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/xorg-server/xephyr-glx.patch b/extra/xorg-server/xephyr-glx.patch deleted file mode 100644 index 3011e2497..000000000 --- a/extra/xorg-server/xephyr-glx.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- hw/kdrive/ephyr/ephyrinit.c 2013-03-14 19:07:41.904335711 +0100 -+++ hw/kdrive/ephyr/ephyrinit.c.new 2013-03-14 19:07:33.024335444 +0100 -@@ -28,6 +28,7 @@ - #endif - #include "ephyr.h" - #include "ephyrlog.h" -+#include "glx_extinit.h" - - extern Window EphyrPreExistingHostWin; - extern Bool EphyrWantGrayScale; -@@ -53,9 +54,28 @@ - KdCardInfoAdd(&ephyrFuncs, 0); - } - -+static const ExtensionModule ephyrExtensions[] = { -+#ifdef GLXEXT -+ { GlxExtensionInit, "GLX", &noGlxExtension }, -+#endif -+}; -+ -+static -+void ephyrExtensionInit(void) -+{ -+ int i; -+ -+ for (i = 0; i < ARRAY_SIZE(ephyrExtensions); i++) -+ LoadExtension(&ephyrExtensions[i], TRUE); -+} -+ -+ - void - InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) - { -+ if (serverGeneration == 1) -+ ephyrExtensionInit(); -+ - KdInitOutput(pScreenInfo, argc, argv); - } - diff --git a/extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch b/extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch deleted file mode 100644 index b42c2d7c8..000000000 --- a/extra/xorg-server/xserver-1.6.0-less-acpi-brokenness.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0002cde5312e785529b2901d7f8a82d5623e4ca7 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Wed, 9 Nov 2011 11:52:06 +1000 -Subject: [PATCH 2/7] Don't build the ACPI code. - -No good can come of this. ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a12783c..54f4464 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1620,7 +1620,6 @@ if test "x$XORG" = xyes; then - linux_alpha=yes - ;; - i*86|amd64*|x86_64*|ia64*) -- linux_acpi="yes" - ;; - *) - ;; --- -1.7.10.1 - -- cgit v1.2.3-54-g00ecf