mesa: Changes to 'ubuntu'
debian/changelog | 33 + debian/libxatracker2.symbols | 10 +- debian/rules |6 +++--- 3 files changed, 33 insertions(+), 16 deletions(-) New commits: commit 6c1fc18ed16cbbf7ec84bdf601b1698b4285be50 Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Mon Dec 9 19:20:40 2013 +0100 Do not require libdrm-intel on arm, fixes FTBFS regression. diff --git a/debian/changelog b/debian/changelog index b6a61bb..f82a9cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mesa (10.0.0-1ubuntu2) trusty; urgency=low + + * Do not require libdrm-intel on arm, fixes FTBFS regression. + + -- Maarten Lankhorst maarten.lankho...@ubuntu.com Mon, 09 Dec 2013 19:20:07 +0100 + mesa (10.0.0-1ubuntu1) trusty; urgency=low * Merge from released debian-experimental, changes: diff --git a/debian/rules b/debian/rules index 08b3b7e..1736a07 100755 --- a/debian/rules +++ b/debian/rules @@ -82,6 +82,7 @@ else # Radeonsi needs LLVM, so only build it on the subset of archs # where we have LLVM enabled. GALLIUM_DRIVERS += radeonsi + DRI_DRIVERS += i915 i965 else EXTRA_SED=-e/libllvmradeon/ s/^/\#/ endif @@ -93,7 +94,6 @@ else DRI_DRIVERS += swrast else GALLIUM_DRIVERS += swrast - DRI_DRIVERS += i915 i965 endif # LLVM is required for r300g and recommended for swrastg on x86: commit d9f357520940b72c0dd43b7e71e141953fa210c3 Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Mon Dec 9 12:00:45 2013 +0100 release to trusty diff --git a/debian/changelog b/debian/changelog index 7ce3ffd..b6a61bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -mesa (10.0.0-1ubuntu1) UNRELEASED; urgency=low +mesa (10.0.0-1ubuntu1) trusty; urgency=low * Merge from released debian-experimental, changes: - Reset versions on libxatracker2 symbols. - Enable llvmpipe on armhf. - -- Maarten Lankhorst maarten.lankho...@ubuntu.com Mon, 09 Dec 2013 11:55:04 +0100 + -- Maarten Lankhorst maarten.lankho...@ubuntu.com Mon, 09 Dec 2013 11:59:03 +0100 mesa (10.0.0-1) experimental; urgency=low commit 9b82bcf55038997c1231f1d6c25928e24bb0eb37 Author: Maarten Lankhorst maarten.lankho...@canonical.com Date: Mon Dec 9 11:58:52 2013 +0100 annotate changelog diff --git a/debian/changelog b/debian/changelog index e205ed5..7ce3ffd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,10 @@ -mesa (10.0.0-0ubuntu1) trusty; urgency=low +mesa (10.0.0-1ubuntu1) UNRELEASED; urgency=low - * Merge from unreleased debian-experimental. - * Drop upstreamed aarch64 patch. - * Refresh patches. - * Disable 118-dricore-gallium.patch for now, requires porting. + * Merge from released debian-experimental, changes: +- Reset versions on libxatracker2 symbols. +- Enable llvmpipe on armhf. - -- Maarten Lankhorst maarten.lankho...@ubuntu.com Mon, 09 Dec 2013 11:11:41 +0100 + -- Maarten Lankhorst maarten.lankho...@ubuntu.com Mon, 09 Dec 2013 11:55:04 +0100 mesa (10.0.0-1) experimental; urgency=low @@ -27,6 +26,15 @@ mesa (10.0.0-1) experimental; urgency=low -- Julien Cristau jcris...@debian.org Sun, 08 Dec 2013 15:17:17 +0100 +mesa (10.0.0-0ubuntu1) trusty; urgency=low + + * Merge from unreleased debian-experimental. + * Drop upstreamed aarch64 patch. + * Refresh patches. + * Disable 118-dricore-gallium.patch for now, requires porting. + + -- Maarten Lankhorst maarten.lankho...@ubuntu.com Mon, 09 Dec 2013 11:11:41 +0100 + mesa (9.2.2-1ubuntu2) trusty; urgency=medium * Build without Mir backend on ppc64. commit acfa63a7eb2d63a184d335fc47f502834c2aecfe Author: Julien Cristau jcris...@debian.org Date: Sun Dec 8 15:44:45 2013 +0100 Upload to experimental diff --git a/debian/changelog b/debian/changelog index 817388f..1046d57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mesa (10.0.0-1) UNRELEASED; urgency=low +mesa (10.0.0-1) experimental; urgency=low [ Emilio Pozuelo Monfort ] * debian/control: @@ -16,7 +16,7 @@ mesa (10.0.0-1) UNRELEASED; urgency=low [ Timo Aaltonen ] * rules: Enable llvmpipe on armhf, should work now. - -- Emilio Pozuelo Monfort po...@debian.org Sun, 27 Oct 2013 20:49:30 +0100 + -- Julien Cristau jcris...@debian.org Sun, 08 Dec 2013 15:17:17 +0100 mesa (9.2.2-1) unstable; urgency=low commit 07241d21dff73df3135f2bf4a5f0a592b52999c4 Author: Julien Cristau jcris...@debian.org Date: Sun Dec 8 12:08:30 2013 +0100 Unversion symbols in libxatracker2.symbols New SONAME → new package → no need to track old versions. diff --git a/debian/libxatracker2.symbols b/debian/libxatracker2.symbols index bebe01e..c362a39 100644 --- a/debian/libxatracker2.symbols +++ b/debian/libxatracker2.symbols @@ -1,5 +1,5 @@ libxatracker.so.2 libxatracker2 #MINVER# - driver_descriptor@Base 9.1~ + driver_descriptor@Base 0
mesa: Changes to 'debian-experimental'
debian/changelog |7 +++
debian/rules | 18 +++---
2 files changed, 14 insertions(+), 11 deletions(-)
New commits:
commit 77287b475df75b6b136069141e8e139485363210
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date: Tue Dec 10 11:13:13 2013 +0100
Enable radeonsi on arm, and drop EXTRA_SED.
libllvmradeon.so no longer exists
diff --git a/debian/changelog b/debian/changelog
index b6b855f..a0bbd74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
mesa (10.0.0-2) UNRELEASED; urgency=low
* Do not attempt to build i915 and i965 on arm.
+ * Enable radeonsi on arm.
-- Maarten Lankhorst maarten.lankho...@ubuntu.com Tue, 10 Dec 2013
10:20:24 +0100
diff --git a/debian/rules b/debian/rules
index a910dba..eaf7e8d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,12 +73,10 @@ else
ifeq (,$(filter $(DEB_HOST_ARCH), s390 s390x))
DRI_DRIVERS += r200 radeon nouveau
endif
-ifneq (,$(filter $(DEB_HOST_ARCH_CPU), amd64 i386))
+ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 armhf))
# Radeonsi needs LLVM, so only build it on the subset of archs
# where we have LLVM enabled.
GALLIUM_DRIVERS += radeonsi
-else
- EXTRA_SED=-e/libllvmradeon/ s/^/\#/
endif
endif
@@ -197,7 +195,6 @@ install: build
for file in debian/*.in; \
do \
sed -es,\$${DEB_HOST_MULTIARCH},$(DEB_HOST_MULTIARCH),g \
- $(EXTRA_SED) \
$${file} $${file%%.in}; \
done
commit 01ac02c1b74e6f830b6aec120481a9edc2528e0a
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date: Tue Dec 10 11:12:39 2013 +0100
Do not attempt to build i915 and i965 on arm.
diff --git a/debian/changelog b/debian/changelog
index 1046d57..b6b855f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.0.0-2) UNRELEASED; urgency=low
+
+ * Do not attempt to build i915 and i965 on arm.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com Tue, 10 Dec 2013
10:20:24 +0100
+
mesa (10.0.0-1) experimental; urgency=low
[ Emilio Pozuelo Monfort ]
diff --git a/debian/rules b/debian/rules
index 74cdfc8..a910dba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,19 +82,18 @@ else
endif
endif
-
-# Build the llvmpipe driver only on amd64, i386, and arm until it's tested
elsewhere
- ifeq (,$(filter $(DEB_HOST_ARCH_CPU), amd64 i386 arm))
- DRI_DRIVERS += swrast
- else
- GALLIUM_DRIVERS += swrast
+ # Build intel drivers on archs where libdrm-intel is installed
+ ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386
x32))
DRI_DRIVERS += i915 i965
endif
- # LLVM is required for r300g and recommended for swrastg on x86:
+ # LLVM is required for r300g and llvmpipe:
ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386
armhf))
confflags_GALLIUM += --enable-gallium-llvm
confflags_GALLIUM += --with-llvm-shared-libs
+ GALLIUM_DRIVERS += swrast
+ else
+ DRI_DRIVERS += swrast
endif
confflags_DIRECT_RENDERING = --enable-driglx-direct
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vqkqq-000855...@moszumanska.debian.org
xserver-xorg-input-synaptics: Changes to 'debian-unstable'
ChangeLog | 44 + configure.ac |2 debian/changelog |8 ++ debian/control |2 debian/patches/02-do-not-use-synaptics-for-keyboards.patch | 43 +--- debian/patches/03-bug-return-val.patch | 10 +- src/eventcomm.c|1 src/properties.c | 13 +++ src/synaptics.c|9 ++ src/synapticsstr.h | 10 ++ 10 files changed, 111 insertions(+), 31 deletions(-) New commits: commit 618602cd2bde02dc346eda66498846c68acde5dd Author: Michele Cane michele.c...@gmail.com Date: Tue Dec 10 13:42:57 2013 +0100 Refresh patches. diff --git a/debian/changelog b/debian/changelog index 5290a37..c4b7b97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xserver-xorg-input-synaptics (1.7.2-1) UNRELEASED; urgency=medium * New upstream release. * Bump Standard-Version to 3.9.5, no changes needed. + * Refresh patches. -- Michele Cane michele.c...@gmail.com Tue, 10 Dec 2013 13:38:48 +0100 diff --git a/debian/patches/02-do-not-use-synaptics-for-keyboards.patch b/debian/patches/02-do-not-use-synaptics-for-keyboards.patch index a7c70bf..b6741c4 100644 --- a/debian/patches/02-do-not-use-synaptics-for-keyboards.patch +++ b/debian/patches/02-do-not-use-synaptics-for-keyboards.patch @@ -1,11 +1,11 @@ do not use the synaptics driver for devices advertising themselves as keyboards http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524130 -Index: xserver-xorg-input-synaptics/conf/11-x11-synaptics.fdi +Index: xserver-xorg-input-synaptics.git/conf/11-x11-synaptics.fdi === xserver-xorg-input-synaptics.orig/conf/11-x11-synaptics.fdi 2009-11-21 13:15:39.064182104 +0900 -+++ xserver-xorg-input-synaptics/conf/11-x11-synaptics.fdi 2009-11-21 13:16:23.404256090 +0900 -@@ -2,27 +2,31 @@ +--- xserver-xorg-input-synaptics.git.orig/conf/11-x11-synaptics.fdi 2013-12-10 13:41:43.646594748 +0100 xserver-xorg-input-synaptics.git/conf/11-x11-synaptics.fdi 2013-12-10 13:41:43.642594750 +0100 +@@ -9,27 +9,31 @@ deviceinfo version=0.2 device match key=info.capabilities contains=input.touchpad @@ -15,21 +15,6 @@ Index: xserver-xorg-input-synaptics/conf/11-x11-synaptics.fdi -!-- EXAMPLES: - Maximum movement of the finger for detecting a tap - merge key=input.x11_options.MaxTapMove type=string2000/merge -- -- Enable vertical scrolling when dragging along the right edge -- merge key=input.x11_options.VertEdgeScroll type=stringtrue/merge -- -- Enable vertical scrolling when dragging with two fingers anywhere on the touchpad -- merge key=input.x11_options.VertTwoFingerScroll type=stringtrue/merge -- -- Enable horizontal scrolling when dragging with two fingers anywhere on the touchpad -- merge key=input.x11_options.HorizTwoFingerScroll type=stringtrue/merge -- -- If on, circular scrolling is used -- merge key=input.x11_options.CircularScrolling type=stringtrue/merge -- -- For other possible options, check CONFIGURATION DETAILS in synaptics man page ---- + !-- do not use the synaptics driver for devices advertising + themselves as keyboards -- + match key=info.capabilities contains_not=input.keyboard @@ -39,19 +24,29 @@ Index: xserver-xorg-input-synaptics/conf/11-x11-synaptics.fdi + !-- EXAMPLES: + Maximum movement of the finger for detecting a tap + merge key=input.x11_options.MaxTapMove type=string2000/merge -+ + +- Enable vertical scrolling when dragging along the right edge +- merge key=input.x11_options.VertEdgeScroll type=stringtrue/merge + Enable vertical scrolling when dragging along the right edge + merge key=input.x11_options.VertEdgeScroll type=stringtrue/merge -+ + +- Enable vertical scrolling when dragging with two fingers anywhere on the touchpad +- merge key=input.x11_options.VertTwoFingerScroll type=stringtrue/merge + Enable vertical scrolling when dragging with two fingers anywhere on the touchpad + merge key=input.x11_options.VertTwoFingerScroll type=stringtrue/merge -+ + +- Enable horizontal scrolling when dragging with two fingers anywhere on the touchpad +- merge key=input.x11_options.HorizTwoFingerScroll type=stringtrue/merge + Enable horizontal scrolling when dragging with two fingers anywhere on the touchpad + merge key=input.x11_options.HorizTwoFingerScroll type=stringtrue/merge -+ + +- If on, circular scrolling is used +- merge
xserver-xorg-input-synaptics: Changes to 'upstream-unstable'
configure.ac |2 +-
src/eventcomm.c|1 +
src/properties.c | 13 +
src/synaptics.c|9 +
src/synapticsstr.h | 10 ++
5 files changed, 34 insertions(+), 1 deletion(-)
New commits:
commit 88d926d12a1f5c06ee2825de5bc4bec29c78
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Mon Dec 9 11:28:23 2013 +1000
synaptics 1.7.2
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
diff --git a/configure.ac b/configure.ac
index 5dfbc4e..a9b8b2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-synaptics],
-[1.7.1],
+[1.7.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-synaptics])
AC_CONFIG_SRCDIR([Makefile.am])
commit 61243ada3e1e10f6d32a899a6cc595efa244eb25
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Wed Dec 4 07:58:26 2013 +1000
eventcomm: ungrab the device on DeviceOff
For symmetry, the kernel should ungrab when we close the fd.
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
[modified for the 1.7 branch which isn't using libevdev yet]
(cherry picked from commit 5d391e352f4e502ada6444a7ce860683e3480fbf)
diff --git a/src/eventcomm.c b/src/eventcomm.c
index 258a538..a9a344b 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -206,6 +206,7 @@ static Bool
EventDeviceOffHook(InputInfoPtr pInfo)
{
UninitializeTouch(pInfo);
+SYSCALL(ioctl(pInfo-fd, EVIOCGRAB, (pointer) 0));
return Success;
}
commit 09ac39309fbee01aa047dab1b0f577dc2571cdd1
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Thu Dec 5 09:31:11 2013 +1000
Add missing property handler for the pressure motion factor
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit 29318c1d94510cfb6d5d712e912af111f99edb42)
diff --git a/src/properties.c b/src/properties.c
index dd88fc7..797f1da 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -650,6 +650,19 @@ SetProperty(DeviceIntPtr dev, Atom property,
XIPropertyValuePtr prop,
para-press_motion_min_z = press[0];
para-press_motion_max_z = press[1];
}
+else if (property == prop_pressuremotion_factor) {
+float *press;
+
+if (prop-size != 2 || prop-format != 32 || prop-type != float_type)
+return BadMatch;
+
+press = (float *) prop-data;
+if (press[0] press[1])
+return BadValue;
+
+para-press_motion_min_factor = press[0];
+para-press_motion_max_factor = press[1];
+}
else if (property == prop_grab) {
if (prop-size != 1 || prop-format != 8 || prop-type != XA_INTEGER)
return BadMatch;
commit f4ddbde165843924195b08551d7d6d6200c44b23
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Fri Jul 19 11:08:43 2013 +1000
Disable driver scaling for input ABI 19.2
For absolute devices in relative mode, i.e. touchpads, the server now takes
device resolution into account. Doing so means that the driver mustn't
scale, so we deactivate those bits in the driver.
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
(cherry picked from commit 0fb59b3487d57523a03f078a2061e2ea0cacbc7c)
diff --git a/src/synaptics.c b/src/synaptics.c
index eb38271..e391a98 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -133,9 +133,11 @@ static int DeviceOff(DeviceIntPtr);
static int DeviceClose(DeviceIntPtr);
static Bool QueryHardware(InputInfoPtr);
static void ReadDevDimensions(InputInfoPtr);
+#ifndef NO_DRIVER_SCALING
static void ScaleCoordinates(SynapticsPrivate * priv,
struct SynapticsHwState *hw);
static void CalculateScalingCoeffs(SynapticsPrivate * priv);
+#endif
static void SanitizeDimensions(InputInfoPtr pInfo);
void InitDeviceProperties(InputInfoPtr pInfo);
@@ -829,7 +831,10 @@ SynapticsPreInit(InputDriverPtr drv, InputInfoPtr pInfo,
int flags)
set_default_parameters(pInfo);
+#ifndef NO_DRIVER_SCALING
CalculateScalingCoeffs(priv);
+#endif
+
priv-comm.buffer = XisbNew(pInfo-fd, INPUT_BUFFER_SIZE);
@@ -2863,7 +2868,9 @@ HandleState(InputInfoPtr pInfo, struct SynapticsHwState
*hw, CARD32 now,
* calculations that require unadjusted coordinates, for example edge
* detection.
*/
+#ifndef NO_DRIVER_SCALING
ScaleCoordinates(priv, hw);
+#endif
}
dx = dy = 0;
@@ -2987,6 +2994,7 @@ QueryHardware(InputInfoPtr pInfo)
return TRUE;
}
+#ifndef NO_DRIVER_SCALING
static void
ScaleCoordinates(SynapticsPrivate * priv, struct SynapticsHwState *hw)
{
@@ -3016,3 +3024,4 @@ CalculateScalingCoeffs(SynapticsPrivate * priv)
priv-vert_coeff = 1;
}
}
+#endif
diff --git a/src/synapticsstr.h b/src/synapticsstr.h
index 428befa..a9901a2 100644
--- a/src/synapticsstr.h
+++ b/src/synapticsstr.h
@@ -28,6 +28,14 @@
xorg-server: Changes to 'ubuntu'
debian/changelog |5 +
debian/patches/series|7 --
debian/patches/xrandr-rroutputchanged-main.patch | 62 +++
3 files changed, 67 insertions(+), 7 deletions(-)
New commits:
commit f552c6766710c4acb911c325db18d1ae571ed593
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date: Tue Dec 10 15:09:16 2013 +0100
release to trusty
diff --git a/debian/changelog b/debian/changelog
index 87f94d8..773dbf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.14.4.901-0ubuntu1) UNRELEASED; urgency=low
+xorg-server (2:1.14.4.901-0ubuntu1) trusty; urgency=low
* New upstream release with some optimus fixes.
* Include a patch to fix gpu screen output hotplugging. (LP: #1259561)
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com Thu, 05 Dec 2013
10:20:54 +0100
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com Tue, 10 Dec 2013
15:09:07 +0100
xorg-server (2:1.14.4-1ubuntu1) trusty; urgency=low
commit 748e24d0b77ae64eb0b55c2cd05ff05c3d69c51d
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date: Tue Dec 10 15:08:48 2013 +0100
Include a patch to fix gpu screen output hotplugging. (LP: #1259561)
diff --git a/debian/changelog b/debian/changelog
index c0fa970..87f94d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-server (2:1.14.4.901-0ubuntu1) UNRELEASED; urgency=low
* New upstream release with some optimus fixes.
+ * Include a patch to fix gpu screen output hotplugging. (LP: #1259561)
-- Maarten Lankhorst maarten.lankho...@ubuntu.com Thu, 05 Dec 2013
10:20:54 +0100
diff --git a/debian/patches/series b/debian/patches/series
index 3b0b8b5..c6fc055 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -39,14 +39,11 @@ no-nv.patch
## upstream patches
-# hybrid graphics fixes for xserver 1.13
+# hybrid graphics fixes
228_autobind_gpu.patch
xf86-fixup-detection.patch
xf86-inactive-gpuscreen.patch
-
-# hotplug fixes
-
-# fixes for reverse optimus, cherry-picked from fedora X
+xrandr-rroutputchanged-main.patch
rrcrtc-brackets-are-hard.patch
config-add-no-removal.patch
diff --git a/debian/patches/xrandr-rroutputchanged-main.patch
b/debian/patches/xrandr-rroutputchanged-main.patch
new file mode 100644
index 000..5affb72
--- /dev/null
+++ b/debian/patches/xrandr-rroutputchanged-main.patch
@@ -0,0 +1,62 @@
+From: Alberto Milone alberto.mil...@canonical.com
+Subject: [PATCH 1/1] randr: make RROutputChanged change the main protocol
screen not the gpu screen
+Date: Sun, 8 Dec 2013 12:08:41 +0100
+Message-Id: 1386500921-20165-1-git-send-email-alberto.mil...@canonical.com
+
+We only set changes on the main protocol screen as, for example
+in RRSetChanged() and RRTellChanged(), therefore we should follow
+the same logic when reporting that an output changed in
+RROutputChanged().
+
+This means that RRTellChanged() will then update the relevant
+timestamps also when events come from gpu screens.
+
+Signed-off-by: Alberto Milone alberto.mil...@canonical.com
+---
+ randr/rroutput.c | 26 +-
+ 1 file changed, 21 insertions(+), 5 deletions(-)
+
+diff --git a/randr/rroutput.c b/randr/rroutput.c
+index 2b0b82f..8229046 100644
+--- a/randr/rroutput.c
b/randr/rroutput.c
+@@ -31,15 +31,31 @@ RESTYPE RROutputType;
+ void
+ RROutputChanged(RROutputPtr output, Bool configChanged)
+ {
++/* set changed bits on the master screen only */
+ ScreenPtr pScreen = output-pScreen;
+
+ output-changed = TRUE;
+-if (pScreen) {
+-rrScrPriv(pScreen);
+-RRSetChanged(pScreen);
+-if (configChanged)
+-pScrPriv-configChanged = TRUE;
++if (!pScreen)
++return;
++
++ScreenPtr master;
++rrScrPriv(pScreen);
++rrScrPrivPtr mastersp;
++
++if (pScreen-isGPU) {
++master = pScreen-current_master;
++if (!master)
++return;
++mastersp = rrGetScrPriv(master);
+ }
++else {
++master = pScreen;
++mastersp = pScrPriv;
++}
++
++RRSetChanged(pScreen);
++if (configChanged)
++mastersp-configChanged = TRUE;
+ }
+
+ /*
+--
+1.7.9.5
+
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vqo4o-00048o...@moszumanska.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog| 16 +
debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch | 122
+++---
2 files changed, 108 insertions(+), 30 deletions(-)
New commits:
commit ccc15e4f21a531dca745730393515008e148e389
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date: Tue Dec 10 15:25:46 2013 +0100
release to trusty
diff --git a/debian/changelog b/debian/changelog
index da33b7e..e2d2033 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg-server (2:1.14.4.901-0ubuntu2) UNRELEASED; urgency=low
+xorg-server (2:1.14.4.901-0ubuntu2) trusty; urgency=low
* Re-apply security update again.
- -- Maarten Lankhorst maarten.lankho...@ubuntu.com Tue, 10 Dec 2013
15:24:16 +0100
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com Tue, 10 Dec 2013
15:25:04 +0100
xorg-server (2:1.14.4.901-0ubuntu1) trusty; urgency=low
commit 4ac6bdabc87cec94c98c43cfd502e58abf8616f5
Author: Maarten Lankhorst maarten.lankho...@canonical.com
Date: Tue Dec 10 15:25:00 2013 +0100
Re-apply security update again.
* SECURITY UPDATE: unsafe use of xkb cache files
- debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch:
updated to not use xkb cache files in /tmp when running a non-root
server.
- CVE-2013-1056
diff --git a/debian/changelog b/debian/changelog
index 773dbf6..da33b7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.14.4.901-0ubuntu2) UNRELEASED; urgency=low
+
+ * Re-apply security update again.
+
+ -- Maarten Lankhorst maarten.lankho...@ubuntu.com Tue, 10 Dec 2013
15:24:16 +0100
+
xorg-server (2:1.14.4.901-0ubuntu1) trusty; urgency=low
* New upstream release with some optimus fixes.
@@ -5,6 +11,16 @@ xorg-server (2:1.14.4.901-0ubuntu1) trusty; urgency=low
-- Maarten Lankhorst maarten.lankho...@ubuntu.com Tue, 10 Dec 2013
15:09:07 +0100
+xorg-server (2:1.14.4-1ubuntu2) trusty; urgency=low
+
+ * SECURITY UPDATE: unsafe use of xkb cache files
+- debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch:
+ updated to not use xkb cache files in /tmp when running a non-root
+ server.
+- CVE-2013-1056
+
+ -- Marc Deslauriers marc.deslauri...@ubuntu.com Fri, 06 Dec 2013 11:15:23
-0500
+
xorg-server (2:1.14.4-1ubuntu1) trusty; urgency=low
* Merge released debian-unstable.
diff --git a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
index 279fc10..c5a08bc 100644
--- a/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
+++ b/debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch
@@ -1,8 +1,10 @@
-diff --git a/configure.ac b/configure.ac
-index 2693ce7..6665c10 100644
a/configure.ac
-+++ b/configure.ac
-@@ -515,9 +515,9 @@ AC_MSG_RESULT([$FONTPATH])
+Last-Update: 2013-09-19
+
+Index: xorg-server-1.14.2.901/configure.ac
+===
+--- xorg-server-1.14.2.901.orig/configure.ac 2013-09-19 11:43:53.948797077
-0400
xorg-server-1.14.2.901/configure.ac2013-09-19 11:43:53.944797077
-0400
+@@ -517,9 +517,9 @@
AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to
XKB base dir (default: ${datadir}/X11/xkb)]),
[ XKBPATH=$withval ],
[ XKBPATH=${datadir}/X11/xkb ])
@@ -14,7 +16,7 @@ index 2693ce7..6665c10 100644
AC_ARG_WITH(default-xkb-rules,
AS_HELP_STRING([--with-default-xkb-rules=RULES],
[Keyboard ruleset (default: base/evdev)]),
[ XKB_DFLT_RULES=$withval ],
-@@ -1204,7 +1204,7 @@ AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN_DIRECTORY,
[Path to XKB bin dir])
+@@ -1225,7 +1225,7 @@
dnl Make sure XKM_OUTPUT_DIR is an absolute path
XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then
@@ -23,11 +25,11 @@ index 2693ce7..6665c10 100644
fi
dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
-diff --git a/xkb/README.compiled b/xkb/README.compiled
-index 71caa2f..a4a2ae0 100644
a/xkb/README.compiled
-+++ b/xkb/README.compiled
-@@ -4,10 +4,10 @@ current keymap and/or any scratch keymaps used by clients.
The X server
+Index: xorg-server-1.14.2.901/xkb/README.compiled
+===
+--- xorg-server-1.14.2.901.orig/xkb/README.compiled2013-09-19
11:43:53.948797077 -0400
xorg-server-1.14.2.901/xkb/README.compiled 2013-09-19 11:43:53.944797077
-0400
+@@ -4,10 +4,10 @@
or some other tool might destroy or replace the files in this directory,
so it is not a safe place to store compiled keymaps for long periods of
time. The default keymap for any server is usually stored in:
@@ -42,11 +44,11 @@ index
x11proto-present_1.0-1_amd64.changes ACCEPTED into unstable, unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Format: 1.8 Date: Sun, 24 Nov 2013 14:12:07 +0100 Source: x11proto-present Binary: x11proto-present-dev Architecture: source all Version: 1.0-1 Distribution: sid Urgency: low Maintainer: Debian X Strike Force debian-x@lists.debian.org Changed-By: Julien Cristau jcris...@debian.org Description: x11proto-present-dev - X11 Present extension wire protocol Changes: x11proto-present (1.0-1) unstable; urgency=low . * Initial release. Checksums-Sha1: cc129592866831b817b6a0baa607f8897aa045f2 1911 x11proto-present_1.0-1.dsc 8913be7a53c259f91d2dbcb7cd5b2acff3c30cf7 132283 x11proto-present_1.0.orig.tar.gz c571bbcf980db243f6e9d1b9815df2ef24aac029 1814 x11proto-present_1.0-1.diff.gz 866fc080bc75cd448da713361c24005324c7bddc 11704 x11proto-present-dev_1.0-1_all.deb Checksums-Sha256: 263299d3640f6472f2fa51f4f4cde9c53a3cb1485d13a403a4f2dd490269f625 1911 x11proto-present_1.0-1.dsc 02f8042cb351dd5c3699a0dbdb2ab25f86532efe3e1e3e97897e7f44b5c67040 132283 x11proto-present_1.0.orig.tar.gz bf7c9229b9f8878573cbb7ebddd5e9d75747e806899544bcd4fa724c66a9e868 1814 x11proto-present_1.0-1.diff.gz 595308ded4828d9eba3b7a53d4c36488e77f841bc0784e3169238ded776f1fcb 11704 x11proto-present-dev_1.0-1_all.deb Files: 0921142380685ae40b256a6de3dfcc78 1911 x11 optional x11proto-present_1.0-1.dsc 57eaf4bb58e86476ec89cfb42d675961 132283 x11 optional x11proto-present_1.0.orig.tar.gz 09a900b8409b88e946262c8bab3594f9 1814 x11 optional x11proto-present_1.0-1.diff.gz aa701cc7f35f3e86faf6fc49c394e15c 11704 x11 optional x11proto-present-dev_1.0-1_all.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.15 (GNU/Linux) iQIcBAEBAgAGBQJSkfuRAAoJEDEBgAUJBeQMyAoP/i4SiahjghUZUr5s7mpDKC9J r34TlmZM+vsFMZ1OlTpA4l81USnRvLU2qqIySm2rqnOAacSYqBGCJSBnrZ4hhTuP LW1dxUoRxRppm6UU2UOV1PJsDuNDaLaUfTmpn3ciD82uZpkMiwTKxJqGiaMYCkBJ uIQCJQnWHwx1WdMGYJQDO0QG7PikYSfzt2cSKIkYh+ghgQuIs1hqh+lYSh1ZFRXj Jl4ZxC6hiy0NNJGeOv7sysV5VwtfCneT3Wc5PU4Wy42WbTjVYfhdM/66qQxN+Yrf hvWCjv30SlU5nF5gvUAAh+hRZSeruhYnPrcVmlgCoO2oVfa5+H5zCluAcxrmHI6Y AfwQuszkmL5Hfcjrnt8hL6BHkapOc7GOYWyPZIIu8sfh0eHd+0GTW7O67MjPm/wS NOvRtmwcQ1g0hu2qpI4fBeTQj7DMtW7/Xcw7pV2t3djOEBad63lhM6XZgA92dp2b 8amToFXhIZ+d4Dlc+ld2LxtLU6RLZMTdaJtoLlPcTzkBXBqmzmb9xDdzDK5ZuRxS GbvulntP+/fbkPVWaGdp94tuMY47Ba149nE8kAX52jYPXDt9dl0ZHjOZClIeRJNh N6Kva8XPZuctWku8SbwALlQLcxulpQ9KZBf2CF5xWdWeNpY8sMuFQr8hbYBmToDM LH/n95dxEVU55o4OkTzg =WoTj -END PGP SIGNATURE- Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1vqwhe-0003md...@franck.debian.org
x11proto-dri3_1.0-1_amd64.changes ACCEPTED into unstable, unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Format: 1.8 Date: Sun, 24 Nov 2013 14:18:54 +0100 Source: x11proto-dri3 Binary: x11proto-dri3-dev Architecture: source all Version: 1.0-1 Distribution: sid Urgency: low Maintainer: Debian X Strike Force debian-x@lists.debian.org Changed-By: Julien Cristau jcris...@debian.org Description: x11proto-dri3-dev - X11 DRI3 extension wire protocol Changes: x11proto-dri3 (1.0-1) unstable; urgency=low . * Initial release. Checksums-Sha1: 556269b0d94135475ba7b8f12bcfe980e9ad68e2 1878 x11proto-dri3_1.0-1.dsc d6d1ed90553370299c82446dac1dbcc76ddc53fd 128371 x11proto-dri3_1.0.orig.tar.gz da2a9f1bc6956b3d284567d54baa8d4732038431 1780 x11proto-dri3_1.0-1.diff.gz 444d1d3278caf6de334ee73a40d87b2411108871 7570 x11proto-dri3-dev_1.0-1_all.deb Checksums-Sha256: cae70d35ce41776e67ceafce8339f2b355933dc419b269d75be745dd1f79ff94 1878 x11proto-dri3_1.0-1.dsc e1a0dad3009ecde52c0bf44187df5f95cc9a7cc0e76dfc2f2bbf3e909fe03fa9 128371 x11proto-dri3_1.0.orig.tar.gz b0a56489f3c459763f13e79169ae9faaf1e6bde02424d3a9f905f3fbc529a2df 1780 x11proto-dri3_1.0-1.diff.gz 52876bd3bd85559d0627f8d4147c9de55ba5803a1d201a05fa2341fe4eab8901 7570 x11proto-dri3-dev_1.0-1_all.deb Files: 34d629c94cf4336e199a1cbb1f3e7dab 1878 x11 optional x11proto-dri3_1.0-1.dsc 25e84a49a076862277ee12aebd49ff5f 128371 x11 optional x11proto-dri3_1.0.orig.tar.gz 154650ca9b49417a1c3a2022f27cc647 1780 x11 optional x11proto-dri3_1.0-1.diff.gz 2a277e4468985606854b26c09d8f6f75 7570 x11 optional x11proto-dri3-dev_1.0-1_all.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.15 (GNU/Linux) iQIcBAEBAgAGBQJSkf2CAAoJEDEBgAUJBeQM9KMP/1Z9AJvY/dQ/FtHv7yjRS21v vwsTP4VVsPdiQrTcYNn6A4j0GDAAPrEaMiqhzB85eaww7iCCKEIy3hpbfi2Iz8Zt 6BUlu6/N1oB7Lsvt0/mhCWYuhSd591CTXbN7eH7VmU4X81sO7e4CQWkR8T+T2UmI aTdP6bLQGt/ENF587XKvU6FnKZuXnEpop4NnU148QdUV2KoHkBTC4MZKeN05xpXW nW7gPH7FIfSvjPbIbWtBF7ZEhkeLYfIGwCxbqSYS8E9GL9GYNE/WaM/U7Np7wR8J I5Ffr4W0ZjNLZ8W4bKuNfi6nGz7YJwvyKNAOODl8zs6zP3exUkm57fSlPlEtQWGg MmFJYHkTTRvSaOYr4DbA2z9iB7IsqrWyJNEQ5aNhWqoh5xjRN+8MQJViHfCwABxZ fwDzZW3ZZs/ZxU2M2DnszOm0i7kprmTXe2mNfSU1vDrkHuACy7P1XXm52nfWiBAy ZTMo3/kIP5f245yzvFUaT4RFyhMmOLZFaXB8pyKkxG4kyl8GZF9uP3HtqEEmTXlj LTDKD5kWevlVP1hK2Us1csOt+ATWqhAVXh9kiXIdsDrcziShFOPkQ8Nwxa6zHjmz oniLzJzw0ILNNdfT/U7IGokhW/BglK/TSzOfegH9phmdK9vyTMvIvgrVl8vjtUBv u0cL/9FKMVidG9t6mpXZ =NBfq -END PGP SIGNATURE- Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1vqwhd-0003mn...@franck.debian.org
libxshmfence_1.1-1_amd64.changes ACCEPTED into unstable, unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Format: 1.8 Date: Tue, 03 Dec 2013 20:28:43 +0100 Source: libxshmfence Binary: libxshmfence1 libxshmfence-dev Architecture: source amd64 Version: 1.1-1 Distribution: sid Urgency: low Maintainer: Debian X Strike Force debian-x@lists.debian.org Changed-By: Julien Cristau jcris...@debian.org Description: libxshmfence-dev - X shared memory fences - development files libxshmfence1 - X shared memory fences - shared library Changes: libxshmfence (1.1-1) unstable; urgency=low . [ Maarten Lankhorst ] * New upstream release. - add build-deps on pkg-config and x11proto-core-dev * Add symbols file. * libxshmfence is now built for any arch. . [ Julien Cristau ] * Allow parallel builds. * Show test log on error, and disable silent build rules. * Force shared-memory-dir to /tmp. My schroots don't have world-writable /run/shm so the test fails. Checksums-Sha1: 68f406635b8e062c6b304dcca0866d15cb144e1f 1922 libxshmfence_1.1-1.dsc 71641e9ec82333ee44ad452d48037330c5b18804 353601 libxshmfence_1.1.orig.tar.gz d4fcde64bf64a28bd1f11c2ba4e7e7fd35e7ae9f 2079 libxshmfence_1.1-1.diff.gz 3a81fb327ce473ca420a7c40ce6f3a2316a9a7b9 6390 libxshmfence1_1.1-1_amd64.deb 3baa0bbe497d1cc312f530f17c8d158b72a27602 5808 libxshmfence-dev_1.1-1_amd64.deb Checksums-Sha256: 06b010a9d9538a80796e500dd3ba4898792f2d4b7cd88a6b63aeca94b1952e71 1922 libxshmfence_1.1-1.dsc 36a6c67c71c6f262be0f2f29349d33ad157ba1fea64a55acd35b90c3816a4cdc 353601 libxshmfence_1.1.orig.tar.gz d68021e2b11121e143db42838be55ca530f6ae91d4f993511a851793e731e77a 2079 libxshmfence_1.1-1.diff.gz dd9752c51a7bb0c9e93fd78e337410009ddc4ae26fc970e84388753786c77d8a 6390 libxshmfence1_1.1-1_amd64.deb 4c62b003311751a0a27b52e10b259a414320fc9d0d0704e67c079ecb3bead40d 5808 libxshmfence-dev_1.1-1_amd64.deb Files: 6a398307c7279b56d8746186e535daf7 1922 libs optional libxshmfence_1.1-1.dsc 323bb06c70765a2395df1d9c7ec3d14a 353601 libs optional libxshmfence_1.1.orig.tar.gz 2c5d534a3448f7e39c0e910241473cf2 2079 libs optional libxshmfence_1.1-1.diff.gz 3b2e065d92b161f9f4f4642807425b38 6390 libs optional libxshmfence1_1.1-1_amd64.deb 878e5d5d4b63e975cee5f7f96f4c4d63 5808 libdevel optional libxshmfence-dev_1.1-1_amd64.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.15 (GNU/Linux) iQIcBAEBAgAGBQJSnjH9AAoJEDEBgAUJBeQMtFUQAPTnv12FDcwFNnL2HXj8epOt Y6AMhCOfjJu6KFyr38NFqFGBqSrfqVqaSppIwgX1AOpQB4HQUDlC6c7Mp1MNsEOO dUxMGraMSqQr2Nz7W9hfKZvAIhBLhUOZgoN82m+k2gNCsKFTF2dcSkMSQhpxWkyy W0P20SQs9C8P3m2yPZpX1XtJOMESPsXD1ZAr8tAPfgtUcaqvqPWygHVG6bSEa9Cf u8rZhxZMNRbKYDANeiHNKZqwQNoS3ZKyh3yv4om7saMzv3FsjwRzIeieSBXfBG2a Q4tDla1eh1gEY7DkktWa/+p3yZUOH4Wq9yJpmON7ecefSvD04wpZIzov3tzh8ps5 yZ1RVDZ4PyCYBrDpv/UscydgS5Ny6m+v+25OgS9XXUk5pJXJTiRHmN5Z/GB/yMWQ 3Iiaaw1BTClH9/j13/iK5QwsKIe5roWLevP6X33hckgzlgUHD/00paB82m74AKoq +8Zj+1sEgafWh3171QMakZcedze5/6hNW3BAhVnUvohiYGEv/NJaKRG1PJZJqTA7 IFy/Jg19GxlfrQ3oFAYzjtxY0fpTyObQDZD9Z3u3Sb9z0lCBI0wJE43I8ppv3501 SngsRupqkQDQxGJ3fdffShPO451iOi3S1sMzrgbNVIOb9aNTCvT++h5QWAeZNifz UiaLuEuF0g9SJX2fKSoA =qqAu -END PGP SIGNATURE- Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1vqwhd-0003m7...@franck.debian.org
libxshmfence_1.0-1_amd64.changes ACCEPTED into unstable, unstable
Accepted: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Format: 1.8 Date: Sun, 24 Nov 2013 15:20:54 +0100 Source: libxshmfence Binary: libxshmfence1 libxshmfence-dev Architecture: source amd64 Version: 1.0-1 Distribution: sid Urgency: low Maintainer: Debian X Strike Force debian-x@lists.debian.org Changed-By: Julien Cristau jcris...@debian.org Description: libxshmfence-dev - X shared memory fences - development files libxshmfence1 - X shared memory fences - shared library Changes: libxshmfence (1.0-1) unstable; urgency=low . * Initial release. Checksums-Sha1: 01ce5ae8e8f1d58f4205678e44e0f012887f9a02 1897 libxshmfence_1.0-1.dsc 05d70451f8441209e32fa4558d676554d00ce641 306605 libxshmfence_1.0.orig.tar.gz 71d7deca25bce53319534d2d8deb6face31448fc 1683 libxshmfence_1.0-1.diff.gz 8e39672fe5ce145cd8222728c822692b6f833b77 4418 libxshmfence1_1.0-1_amd64.deb 111e724663b87444ed071b2ad055c23ab287fe51 3762 libxshmfence-dev_1.0-1_amd64.deb Checksums-Sha256: 73f85e4229f30d34c024be00eb485d5e0a6a0522795f9bcccbbda8b67749650a 1897 libxshmfence_1.0-1.dsc c3cae4af04323f6fcefd77a16ed1f83b0cf98f161e66623359a975aacc8fa10e 306605 libxshmfence_1.0.orig.tar.gz 6a29dc8b7a98e8664194fa224f2adf903cf9fb477e20154a79e5c542a0d818cf 1683 libxshmfence_1.0-1.diff.gz 57e1be10da28bb1011de7555d66c76ac5475d6bbdcc126d557e093a847d67184 4418 libxshmfence1_1.0-1_amd64.deb eb98577c61333dc00701dd9698ed88bc60068bb30dc86bf4ca9ae55c777a801a 3762 libxshmfence-dev_1.0-1_amd64.deb Files: fa8cd9eee6bf54e733866c0d499e405a 1897 libs optional libxshmfence_1.0-1.dsc 351e5154bef5163544960d02959c3f1e 306605 libs optional libxshmfence_1.0.orig.tar.gz 4e68f0c186e73c23c4a5b8be588ed228 1683 libs optional libxshmfence_1.0-1.diff.gz 9ec05d139dad46e4788bf02d4364f7b0 4418 libs optional libxshmfence1_1.0-1_amd64.deb 30b09d499c8757fdd97ac42a9dea2e4f 3762 libdevel optional libxshmfence-dev_1.0-1_amd64.deb -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.15 (GNU/Linux) iQIcBAEBAgAGBQJSkgv5AAoJEDEBgAUJBeQMR6AP/jpk2Vf613Oi5174k76rQ6qb TVAdczpd/yIr3uRmXxpvfRFCqpeK/zCle0b3lZ8ILKdRa8Ee6cLzLNMXinCdVDXJ JM2b7qIVH0Hi0rmzHGzNYktkVUiYm6sDd/j73H9ld2y3lg0y1w0bvD+vRp30PVcr 5cfjq7sgh//v25FwKZ430tZg+b9yaDvoTUV8lL/c1EgnIrsSLkgqYiE0AQTWS27o sVOyzokHcsUWCfpNz83g9eVfc98jMN2pJf+q7M8booGVPMzsHCvJLS5GIi3uC+pA wpwEi7tTU1WjVXNuiH7jBb35NCjgYVY9gM36+8LIONqOiG2x3ANtxtruTi+PgLfj LG4BY84HWjJ8FF8Lx+nooqNBJ/ls/hb6gU481lqPFnxL2bX68CuVKKnqhR4UNmpW Q54q7NfxfQ+FbKUVfJLbvLji60L+kZiKogVgungufqXZdRI9OCMkV+cCH69AYrnv tx2tsxWA8ad9rKMLaysmMSTGl9RLNgRD19GKeWVOukbQGgWn4y8QMBMeAM0+uWYP jOLayp8ffe0adrT5lY/oqr+eOTzLimbsQDkydksia8w3GtfQVlOIrOp8RkAZkF3r x9R/RdBupQ4n1/qKNFPqG1Ekfz7QLvWUhyZct8NnL5tzVjIlACjpJgu6PAm21/mv HR6X8qvsK+HuUthq9jgO =D5JB -END PGP SIGNATURE- Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1vqwhd-0003lr...@franck.debian.org
mesa: Changes to 'ubuntu'
debian/changelog |9
debian/patches/egl-platform-mir.patch | 855 +++---
2 files changed, 695 insertions(+), 169 deletions(-)
New commits:
commit b12216e5d09fa3fe8d64337f593397be35c6b0c3
Author: Christopher James Halse Rogers christopher.halse.rog...@canonical.com
Date: Wed Dec 11 12:45:35 2013 +0800
Update Mir EGL platform patch
diff --git a/debian/changelog b/debian/changelog
index f82a9cb..8bcdeab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa (10.0.0-1ubuntu3) trusty; urgency=low
+
+ * Refresh Mir EGL platform patch.
++ Adds EGL_KHR_image support, needed for nested Mir-on-Mir support
++ Adds resize support (LP: #1227744)
++ Properly free()s surface front and back buffers on destroy (LP: #1211982)
+
+ -- Christopher James Halse Rogers r...@ubuntu.com Wed, 11 Dec 2013
12:24:46 +0800
+
mesa (10.0.0-1ubuntu2) trusty; urgency=low
* Do not require libdrm-intel on arm, fixes FTBFS regression.
diff --git a/debian/patches/egl-platform-mir.patch
b/debian/patches/egl-platform-mir.patch
index 611d105..00d6b7f 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -137,7 +137,7 @@
char *
--- /dev/null
+++ b/src/egl/drivers/dri2/platform_mir.c
-@@ -0,0 +1,347 @@
+@@ -0,0 +1,435 @@
+/*
+ * Copyright © 2012 Canonical, Inc
+ *
@@ -171,6 +171,7 @@
+
+#include stdlib.h
+#include string.h
++#include unistd.h
+
+static __DRIbuffer *
+dri2_get_buffers_with_format(__DRIdrawable * driDrawable,
@@ -283,6 +284,12 @@
+ assert(buffer_package.data_items == 0);
+ assert(buffer_package.fd_items == 1);
+
++ /* Mir ABIs prior to release 0.1.2 lacked width and height */
++ if (buffer_package.width buffer_package.height) {
++ surf-base.Width = buffer_package.width;
++ surf-base.Height = buffer_package.height;
++ }
++
+ surf-dri_buffers[__DRI_BUFFER_BACK_LEFT]-name = 0;
+ surf-dri_buffers[__DRI_BUFFER_BACK_LEFT]-fd = buffer_package.fd[0];
+ surf-dri_buffers[__DRI_BUFFER_BACK_LEFT]-pitch = buffer_package.stride;
@@ -333,10 +340,28 @@
+ if(!mir_advance_colour_buffer(dri2_surf))
+ goto cleanup_surf;
+
-+ dri2_surf-dri_drawable =
-+ (*dri2_dpy-dri2-createNewDrawable) (dri2_dpy-dri_screen,
-+dri2_conf-dri_double_config,
-+dri2_surf);
++ if (dri2_dpy-gbm_dri) {
++ struct gbm_dri_surface *surf = malloc(sizeof *surf);
++
++ dri2_surf-gbm_surf = surf;
++ surf-base.gbm = dri2_dpy-gbm_dri-base;
++ surf-base.width = dri2_surf-base.Width;
++ surf-base.height = dri2_surf-base.Height;
++ surf-base.format = GBM_FORMAT_ARGB;
++ surf-base.flags = GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING;
++ surf-dri_private = dri2_surf;
++
++ dri2_surf-dri_drawable =
++ (*dri2_dpy-dri2-createNewDrawable) (dri2_dpy-dri_screen,
++dri2_conf-dri_double_config,
++dri2_surf-gbm_surf);
++ }
++ else {
++ dri2_surf-dri_drawable =
++ (*dri2_dpy-dri2-createNewDrawable) (dri2_dpy-dri_screen,
++dri2_conf-dri_double_config,
++dri2_surf);
++ }
+
+ if (dri2_surf-dri_drawable == NULL) {
+ _eglError(EGL_BAD_ALLOC, dri2-createNewDrawable);
@@ -370,7 +395,10 @@
+ dri2_surf-dri_buffers[i]);
+ }
+ }
++ free(dri2_surf-dri_buffers[__DRI_BUFFER_FRONT_LEFT]);
++ free(dri2_surf-dri_buffers[__DRI_BUFFER_BACK_LEFT]);
+
++ free(dri2_surf-gbm_surf);
+ free(surf);
+
+ return EGL_TRUE;
@@ -413,10 +441,56 @@
+ return 0;
+}
+
++static _EGLImage *
++dri2_create_image_khr_pixmap(_EGLDisplay *disp, _EGLContext *ctx,
++ EGLClientBuffer buffer, const EGLint *attr_list)
++{
++ struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
++ struct gbm_dri_bo *dri_bo = gbm_dri_bo((struct gbm_bo *) buffer);
++ struct dri2_egl_image *dri2_img;
++
++ dri2_img = malloc(sizeof *dri2_img);
++ if (!dri2_img) {
++ _eglError(EGL_BAD_ALLOC, dri2_create_image_khr_pixmap);
++ return NULL;
++ }
++
++ if (!_eglInitImage(dri2_img-base, disp)) {
++ free(dri2_img);
++ return NULL;
++ }
++
++
++ dri2_img-dri_image = dri2_dpy-image-dupImage(dri_bo-image, dri2_img);
++ if (dri2_img-dri_image == NULL) {
++ free(dri2_img);
++ _eglError(EGL_BAD_ALLOC, dri2_create_image_khr_pixmap);
++ return NULL;
++ }
++
++ return dri2_img-base;
++}
++
++static _EGLImage *
++dri2_mir_create_image_khr(_EGLDriver *drv, _EGLDisplay *disp,
++ _EGLContext *ctx, EGLenum target,
++ EGLClientBuffer buffer, const EGLint *attr_list)
++{
++ (void) drv;
++
++ switch (target) {
