xorg-server: Changes to 'ubuntu'
debian/changelog | 9 +++++
debian/patches/series | 2 +
debian/patches/xephyr-glx-register.patch | 39 ++++++++++++++++++++++
debian/patches/xfree86-no-xv-for-gpuscreens.patch | 36 ++++++++++++++++++++
4 files changed, 86 insertions(+)
New commits:
commit d55fcbec21660fe63640fff06f46ae40a9f83be7
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Mar 26 16:16:28 2013 +0100
release to raring
diff --git a/debian/changelog b/debian/changelog
index ed23f53..2d46fd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xorg-server (2:1.13.3-0ubuntu4) UNRELEASED; urgency=low
+xorg-server (2:1.13.3-0ubuntu4) raring; urgency=low
* Do not bother registering xv/xvmc on gpu screens.
- xfree86-no-xv-for-gpuscreens.patch
* Re-enable GLX on Xephyr. (LP: #1079096)
- xephyr-glx-register.patch
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 26 Mar 2013 14:24:27 +0100
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 26 Mar 2013 16:16:14 +0100
xorg-server (2:1.13.3-0ubuntu3) raring; urgency=low
commit e3c82a41a1107f16c4b636f6a7668df723c3a471
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Mar 26 15:21:43 2013 +0100
Do not bother registering xv/xvmc on gpu screens, and re-enable xephyr glx.
diff --git a/debian/changelog b/debian/changelog
index e29140e..ed23f53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.13.3-0ubuntu4) UNRELEASED; urgency=low
+
+ * Do not bother registering xv/xvmc on gpu screens.
+ - xfree86-no-xv-for-gpuscreens.patch
+ * Re-enable GLX on Xephyr. (LP: #1079096)
+ - xephyr-glx-register.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 26 Mar 2013 14:24:27 +0100
+
xorg-server (2:1.13.3-0ubuntu3) raring; urgency=low
* Refresh autoconfig-fixup-tell-changed-so-randr-clients-can-t.patch
diff --git a/debian/patches/series b/debian/patches/series
index c5c5417..1732dba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,6 +29,8 @@
233-xf86events-valgrind.patch
236-use-fbdev-for-poulsbo-oaktrail-medfield.patch
drm_device_keep_trying.patch
+xfree86-no-xv-for-gpuscreens.patch
+xephyr-glx-register.patch
## waiting for review by upstream
111_armel-drv-fallbacks.patch
diff --git a/debian/patches/xephyr-glx-register.patch b/debian/patches/xephyr-glx-register.patch
new file mode 100644
index 0000000..f394ed1
--- /dev/null
+++ b/debian/patches/xephyr-glx-register.patch
@@ -0,0 +1,39 @@
+--- a/hw/kdrive/ephyr/ephyrinit.c 2013-03-14 19:07:41.904335711 +0100
++++ b/hw/kdrive/ephyr/ephyrinit.c 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/debian/patches/xfree86-no-xv-for-gpuscreens.patch b/debian/patches/xfree86-no-xv-for-gpuscreens.patch
new file mode 100644
index 0000000..cfb0f08
--- /dev/null
+++ b/debian/patches/xfree86-no-xv-for-gpuscreens.patch
@@ -0,0 +1,36 @@
+diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c
+index 92d0f6d..a33366a 100644
+--- a/hw/xfree86/common/xf86xv.c
++++ b/hw/xfree86/common/xf86xv.c
+@@ -234,7 +234,7 @@ xf86XVScreenInit(ScreenPtr pScreen, XF86VideoAdaptorPtr * adaptors, int num)
+ XF86XVScreenPtr ScreenPriv;
+ XvScreenPtr pxvs;
+
+- if (num <= 0 || noXvExtension)
++ if (num <= 0 || noXvExtension || pScreen->isGPU)
+ return FALSE;
+
+ if (Success != XvScreenInit(pScreen))
+diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c
+index 78a32bf..a0f6fcd 100644
+--- a/hw/xfree86/common/xf86xvmc.c
++++ b/hw/xfree86/common/xf86xvmc.c
+@@ -148,11 +148,15 @@ xf86XvMCScreenInit(ScreenPtr pScreen,
+ {
+ XvMCAdaptorPtr pAdapt;
+ xf86XvMCScreenPtr pScreenPriv;
+- XvScreenPtr pxvs = (XvScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
+- XF86XvScreenKey);
++ XvScreenPtr pxvs;
+ int i, j;
+
+- if (noXvExtension)
++ if (noXvExtension || pScreen->isGPU || !XF86XvScreenKey)
++ return FALSE;
++
++ pxvs = (XvScreenPtr) dixLookupPrivate(&pScreen->devPrivates,
++ XF86XvScreenKey);
++ if (!pxvs)
+ return FALSE;
+
+ if (!(pAdapt = malloc(sizeof(XvMCAdaptorRec) * num_adaptors)))
Reply to: