Date: Monday, July 1, 2013 @ 12:57:19
Author: jgc
Revision: 189246
upgpkg: xorg-server 1.14.2-2
Add patch that enables support for GLX in Xephyr again
Add dependency on xorg-xauth for Xvfb-run
Rename git-fixes to something that makes sense. This patch is from git master,
not from 1.14 branch
Added:
xorg-server/trunk/fb-rename-wfbDestroyGlyphCache.patch
(from rev 189245, xorg-server/trunk/git-fixes.patch)
xorg-server/trunk/xephyr-glx.patch
Modified:
xorg-server/trunk/PKGBUILD
Deleted:
xorg-server/trunk/git-fixes.patch
--------------------------------------+
PKGBUILD | 44 ++++++++++++++++++---------------
fb-rename-wfbDestroyGlyphCache.patch | 27 ++++++++++++++++++++
git-fixes.patch | 27 --------------------
xephyr-glx.patch | 39 +++++++++++++++++++++++++++++
4 files changed, 91 insertions(+), 46 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-07-01 10:19:48 UTC (rev 189245)
+++ PKGBUILD 2013-07-01 10:57:19 UTC (rev 189246)
@@ -5,7 +5,7 @@
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.2
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('custom')
url="http://xorg.freedesktop.org";
@@ -19,38 +19,44 @@
autoconfig-sis.patch
xserver-1.6.0-less-acpi-brokenness.patch
bug59825.patch
+ xephyr-glx.patch
xvfb-run
xvfb-run.1
10-quirks.conf
- git-fixes.patch)
+ fb-rename-wfbDestroyGlyphCache.patch)
sha256sums=('f6ddfb3f1cfff2d69d45657aec626ebe8b5847810154ff7df7ed2072b076c86b'
'66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a'
'26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588'
+ 'bb63658d250c21bbfaf94c5417f2920ce5963ee1f7db6cac2b163a54f2e9b619'
'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
'94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1')
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
+prepare() {
+ cd "${pkgbase}-${pkgver}"
# Use nouveau/nv/nvidia drivers for nvidia devices
- patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch"
+ patch -Np1 -i ../autoconfig-nvidia.patch
# Use unofficial imedia SiS driver for supported SiS devices
- patch -Np0 -i "${srcdir}/autoconfig-sis.patch"
+ patch -Np0 -i ../autoconfig-sis.patch
# https://bugs.freedesktop.org/show_bug.cgi?id=59825 - fixes crash with
vboxvideo
- patch -Np1 -i "${srcdir}/bug59825.patch"
+ patch -Np1 -i ../bug59825.patch
# From Fedora. Do not build acpid code, it is buggy and we do not need it
- patch -Np1 -i "${srcdir}/xserver-1.6.0-less-acpi-brokenness.patch"
+ patch -Np1 -i ../xserver-1.6.0-less-acpi-brokenness.patch
- # post release git fixes
- patch -Np1 -i "${srcdir}/git-fixes.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
+}
+build() {
+ cd "${pkgbase}-${pkgver}"
autoreconf -fi
./configure --prefix=/usr \
--enable-ipv6 \
@@ -93,7 +99,7 @@
pkgdesc="Xorg server common files"
depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap'
'xorg-fonts-misc')
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd "${pkgbase}-${pkgver}"
install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common"
install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common"
@@ -115,7 +121,7 @@
groups=('xorg')
conflicts=('nvidia-utils<=290.10')
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd "${pkgbase}-${pkgver}"
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/etc/X11"
@@ -145,7 +151,7 @@
pkgdesc="A nested X server that runs as an X application"
depends=(libxfont libgl libgcrypt libxv 'pixman>=0.28.0' xorg-server-common)
- cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive"
+ cd "${pkgbase}-${pkgver}/hw/kdrive"
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr"
@@ -154,9 +160,9 @@
package_xorg-server-xvfb() {
pkgdesc="Virtual framebuffer X server"
- depends=(libxfont libxdmcp libxau libgcrypt 'pixman>=0.28.0'
xorg-server-common)
+ depends=(libxfont libxdmcp libxau libgcrypt 'pixman>=0.28.0'
xorg-server-common xorg-xauth)
- cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb"
+ cd "${pkgbase}-${pkgver}/hw/vfb"
make DESTDIR="${pkgdir}" install
install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
@@ -170,7 +176,7 @@
pkgdesc="A nested X server that runs as an X application"
depends=(libxfont libxext libgcrypt 'pixman>=0.28.0' xorg-server-common)
- cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest"
+ cd "${pkgbase}-${pkgver}/hw/xnest"
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest"
@@ -181,7 +187,7 @@
pkgdesc="Distributed Multihead X Server and utilities"
depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes
'pixman>=0.28.0' xorg-server-common)
- cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx"
+ cd "${pkgbase}-${pkgver}/hw/dmx"
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx"
@@ -199,7 +205,7 @@
# not technically required but almost every Xorg pkg needs it to
build
xorg-util-macros)
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd "${pkgbase}-${pkgver}"
make DESTDIR="${pkgdir}" install
rm -rf "${pkgdir}/usr/bin"
Copied: xorg-server/trunk/fb-rename-wfbDestroyGlyphCache.patch (from rev
189245, xorg-server/trunk/git-fixes.patch)
===================================================================
--- fb-rename-wfbDestroyGlyphCache.patch (rev 0)
+++ fb-rename-wfbDestroyGlyphCache.patch 2013-07-01 10:57:19 UTC (rev
189246)
@@ -0,0 +1,27 @@
+From 5047810a4c20fab444b8c6eb146c55dcdb0d4219 Mon Sep 17 00:00:00 2001
+From: Aaron Plattner <aplatt...@nvidia.com>
+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 <aplatt...@nvidia.com>
+Reviewed-by: Søren Sandmann <s...@redhat.com>
+Signed-off-by: Keith Packard <kei...@keithp.com>
+---
+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
Deleted: git-fixes.patch
===================================================================
--- git-fixes.patch 2013-07-01 10:19:48 UTC (rev 189245)
+++ git-fixes.patch 2013-07-01 10:57:19 UTC (rev 189246)
@@ -1,27 +0,0 @@
-From 5047810a4c20fab444b8c6eb146c55dcdb0d4219 Mon Sep 17 00:00:00 2001
-From: Aaron Plattner <aplatt...@nvidia.com>
-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 <aplatt...@nvidia.com>
-Reviewed-by: Søren Sandmann <s...@redhat.com>
-Signed-off-by: Keith Packard <kei...@keithp.com>
----
-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
Added: xephyr-glx.patch
===================================================================
--- xephyr-glx.patch (rev 0)
+++ xephyr-glx.patch 2013-07-01 10:57:19 UTC (rev 189246)
@@ -0,0 +1,39 @@
+--- 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);
+ }
+
