xorg-server: Changes to 'ubuntu+1'
ChangeLog| 446
++
Xext/xtest.c | 17
Xi/exevents.c|2
configure.ac |6
debian/changelog | 24
debian/patches/165_man_xorg_conf_no_device_ident.patch | 15
debian/patches/233-xf86events-valgrind.patch | 16
debian/patches/236-use-fbdev-for-poulsbo-oaktrail-medfield.patch | 88 -
debian/patches/series| 10
dix/devices.c| 46 -
dix/events.c |6
dix/getevents.c | 75 +
dix/ptrveloc.c | 38
hw/dmx/config/xdmxconfig.c |3
hw/xfree86/common/xf86Events.c |4
hw/xfree86/common/xf86Module.h |2
hw/xfree86/common/xf86pciBus.c | 64 +
hw/xfree86/man/xorg.conf.man | 11
hw/xfree86/os-support/linux/lnx_acpi.c |9
include/input.h |3
include/inputstr.h |8
include/list.h |2
include/misc.h |1
include/protocol-versions.h |2
os/log.c | 21
os/utils.c | 32
randr/randrstr.h |2
randr/rrcrtc.c |5
test/signal-logging.c| 200 ++--
xkb/xkbActions.c | 147 ++-
30 files changed, 927 insertions(+), 378 deletions(-)
New commits:
commit 4db5dbfa92b3e7b4d8be8300cf9a3c60d5eecfa7
Author: Timo Aaltonen
Date: Fri Feb 15 10:39:20 2013 +0200
drop upstreamed patches
diff --git a/debian/changelog b/debian/changelog
index 85bae61..3452327 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ xorg-server (2:1.13.99.902-0ubuntu1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* Merge from unreleased debian git.
* 500_pointer_barrier_thresholds.diff: Dropped, implemented upstream.
+ * Dropped upstreamed patches:
+165_man_xorg_conf_no_device_ident.patch
+233-xf86events-valgrind.patch
+236-use-fbdev-for-poulsbo-oaktrail-medfield.patch
[ Bryce Harrington ]
* 157_check_null_modes.patch: Dropped, patch included upstream.
diff --git a/debian/patches/165_man_xorg_conf_no_device_ident.patch
b/debian/patches/165_man_xorg_conf_no_device_ident.patch
deleted file mode 100644
index caa5b7c..000
--- a/debian/patches/165_man_xorg_conf_no_device_ident.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man
-index c1b3c4f..8f5e5ca 100644
a/hw/xfree86/man/xorg.conf.man
-+++ b/hw/xfree86/man/xorg.conf.man
-@@ -1821,9 +1821,7 @@ sections have the following format:
- .PP
- The
- .B Identifier
--and
--.B Device
--entries are mandatory.
-+entry is mandatory.
- All others are optional.
- .PP
- The
diff --git a/debian/patches/233-xf86events-valgrind.patch
b/debian/patches/233-xf86events-valgrind.patch
deleted file mode 100644
index 2d49ca5..000
--- a/debian/patches/233-xf86events-valgrind.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
-index 3ad34b5..4bc5f66 100644
a/hw/xfree86/common/xf86Events.c
-+++ b/hw/xfree86/common/xf86Events.c
-@@ -271,9 +271,9 @@ xf86Wakeup(pointer blockData, int err, pointer pReadmask)
- }
-
- if (err >= 0) { /* we don't want the handlers called if
select() */
--IHPtr ih; /* returned with an error condition, do we?
*/
-+IHPtr ih, ih_tmp; /* returned with an error condition, do we?
*/
-
--for (ih = InputHandlers; ih; ih = ih->next) {
-+nt_list_for_each_entry_safe(ih, ih_tmp, InputHandlers, next) {
- if (ih->enabled && ih->fd >= 0 && ih->ihproc &&
- (FD_ISSET(ih->fd, ((fd_set *) pReadmask)) != 0)) {
- ih->ihproc(ih->fd, ih->data);
diff --git a/debian/patches/236-use-fbdev-for-poulsbo-oaktrail-medfield.patch
b/debian/patches/236-use-fbdev-for-poulsbo-oaktrail-medfield.patch
deleted file mode 100644
index dbf210d..000
--- a/debian/patches/236-use-fbdev-for-p
xorg-server: Changes to 'upstream-experimental'
Xext/xtest.c | 17 +-
Xi/exevents.c |2
configure.ac |6
dix/devices.c | 46 ++-
dix/events.c |6
dix/getevents.c| 75 ++--
dix/ptrveloc.c | 38 +++---
hw/dmx/config/xdmxconfig.c |3
hw/xfree86/common/xf86Events.c |4
hw/xfree86/common/xf86Module.h |2
hw/xfree86/common/xf86pciBus.c | 64 +-
hw/xfree86/man/xorg.conf.man | 11 -
hw/xfree86/os-support/linux/lnx_acpi.c |9 -
include/input.h|3
include/inputstr.h |8 -
include/list.h |2
include/misc.h |1
include/protocol-versions.h|2
os/log.c | 21 ++-
os/utils.c | 32 +
randr/randrstr.h |2
randr/rrcrtc.c |5
test/signal-logging.c | 200 -
xkb/xkbActions.c | 147 ++--
24 files changed, 468 insertions(+), 238 deletions(-)
New commits:
commit 955d434f4d755d00a24ae4068b9957765989d672
Author: Keith Packard
Date: Wed Feb 13 21:39:37 2013 -0800
Update to version 1.3.99.902 (1.14 RC2)
Signed-off-by: Keith Packard
diff --git a/configure.ac b/configure.ac
index 435a38f..53335b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.13.99.901,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2012-12-19"
-RELEASE_NAME="Egg Nog"
+AC_INIT([xorg-server], 1.13.99.902,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2013-02-12"
+RELEASE_NAME="Ginger Beer"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 7115f6c709898a5124b67e19c61dc01334471358
Author: Aaron Plattner
Date: Wed Jan 23 16:58:47 2013 -0800
randr: unref the provider shared pixmap the appropriate number of times
When an RandR shared pixmap is created in rrCreateSharedPixmap, it has a
refcnt
of 1. Then, PixmapShareToSlave bumps the refcnt to 2. However, there's no
corresponding PixmapUnshareFromSlave where the refcnt can be decreased
again,
and there's no convenient common place where the refcnt can be decremented
when
the slave pixmap is destroyed.
Fix this by just unreffing the pixmap twice in RRCrtcDetachScanoutPixmap.
Signed-off-by: Aaron Plattner
Reviewed-by: Dave Airlie
Signed-off-by: Keith Packard
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
index e82d050..6e2eca5 100644
--- a/randr/rrcrtc.c
+++ b/randr/rrcrtc.c
@@ -372,6 +372,11 @@ RRCrtcDetachScanoutPixmap(RRCrtcPtr crtc)
ret = pScrPriv->rrCrtcSetScanoutPixmap(crtc, NULL);
if (crtc->scanout_pixmap) {
master->StopPixmapTracking(mscreenpix, crtc->scanout_pixmap);
+/*
+ * Unref the pixmap twice: once for the original reference, and once
+ * for the reference implicitly added by PixmapShareToSlave.
+ */
+master->DestroyPixmap(crtc->scanout_pixmap->master_pixmap);
master->DestroyPixmap(crtc->scanout_pixmap->master_pixmap);
crtc->pScreen->DestroyPixmap(crtc->scanout_pixmap);
}
commit da92690107d90061205340d4cdc98b73b59db9b2
Author: Aaron Plattner
Date: Mon Feb 11 14:31:56 2013 -0800
xf86: use nt_list_for_each_entry_safe to walk InputHandlers in xf86Wakeup
This is necessary when the input handler deletes itself from the
list. Bug found by Maarten Lankhorst, this patch uses the list macros
instead of open-coding the fix.
Signed-off-by: Keith Packard
Reviewed-by: Peter Hutterer
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 377e936..d92174e 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -272,9 +272,9 @@ xf86Wakeup(pointer blockData, int err, pointer pReadmask)
}
if (err >= 0) { /* we don't want the handlers called if
select() */
-IHPtr ih; /* returned with an error condition, do we?
*/
+IHPtr ih, ih_tmp; /* returned with an error condition, do we?
*/
-for (ih = InputHandlers; ih; ih = ih->next) {
+nt_list_for_each_entry_safe(ih, ih_tmp, InputHandlers, next) {
if (ih->enabled && ih->fd >= 0 && ih->ihproc &&
(FD_ISSET(ih->fd, ((fd_set *) pReadmask)) != 0)) {
ih->ihproc(ih->fd, ih->data);
commit d0a14877872b6a33172fb8c8f335792a28b9499b
Author: Bryce Harrington
Date: Fri Feb 8 15:56:02 2013 -0800
xf
xorg-server: Changes to 'debian-experimental'
ChangeLog | 446 + Xext/xtest.c | 17 - Xi/exevents.c |2 configure.ac |6 debian/changelog |2 dix/devices.c | 46 ++- dix/events.c |6 dix/getevents.c| 75 - dix/ptrveloc.c | 38 +- hw/dmx/config/xdmxconfig.c |3 hw/xfree86/common/xf86Events.c |4 hw/xfree86/common/xf86Module.h |2 hw/xfree86/common/xf86pciBus.c | 64 hw/xfree86/man/xorg.conf.man | 11 hw/xfree86/os-support/linux/lnx_acpi.c |9 include/input.h|3 include/inputstr.h |8 include/list.h |2 include/misc.h |1 include/protocol-versions.h|2 os/log.c | 21 + os/utils.c | 32 ++ randr/randrstr.h |2 randr/rrcrtc.c |5 test/signal-logging.c | 200 +++--- xkb/xkbActions.c | 147 ++ 26 files changed, 915 insertions(+), 239 deletions(-) New commits: commit f3226a7f923ced291634087fd4d6ba33430a3d35 Author: Timo Aaltonen Date: Fri Feb 15 09:57:32 2013 +0200 update the changelogs diff --git a/ChangeLog b/ChangeLog index f010b72..e428d98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,407 @@ +commit 955d434f4d755d00a24ae4068b9957765989d672 +Author: Keith Packard +Date: Wed Feb 13 21:39:37 2013 -0800 + +Update to version 1.3.99.902 (1.14 RC2) + +Signed-off-by: Keith Packard + +commit 7115f6c709898a5124b67e19c61dc01334471358 +Author: Aaron Plattner +Date: Wed Jan 23 16:58:47 2013 -0800 + +randr: unref the provider shared pixmap the appropriate number of times + +When an RandR shared pixmap is created in rrCreateSharedPixmap, it has a refcnt +of 1. Then, PixmapShareToSlave bumps the refcnt to 2. However, there's no +corresponding PixmapUnshareFromSlave where the refcnt can be decreased again, +and there's no convenient common place where the refcnt can be decremented when +the slave pixmap is destroyed. + +Fix this by just unreffing the pixmap twice in RRCrtcDetachScanoutPixmap. + +Signed-off-by: Aaron Plattner +Reviewed-by: Dave Airlie +Signed-off-by: Keith Packard + +commit da92690107d90061205340d4cdc98b73b59db9b2 +Author: Aaron Plattner +Date: Mon Feb 11 14:31:56 2013 -0800 + +xf86: use nt_list_for_each_entry_safe to walk InputHandlers in xf86Wakeup + +This is necessary when the input handler deletes itself from the +list. Bug found by Maarten Lankhorst, this patch uses the list macros +instead of open-coding the fix. + +Signed-off-by: Keith Packard +Reviewed-by: Peter Hutterer + +commit d0a14877872b6a33172fb8c8f335792a28b9499b +Author: Bryce Harrington +Date: Fri Feb 8 15:56:02 2013 -0800 + +xfree86: Man page shouldn't say Device is mandatory anymore + +man xorg.conf states that the 'Device' identifier is required in the +'Screen' section, yet current xserver defaults properly and boots up +fine without it. + +Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=20742 +Signed-off-by: Bryce Harrington +Signed-off-by: Keith Packard + +commit 5e91054aa070ea09b61325b7ec479d767b02730e +Author: Bryce Harrington +Date: Fri Feb 8 15:56:01 2013 -0800 + +xfree86: Use fbdev/vesa driver on Oaktrail, Medfield, CDV rather than -intel + +Instead of defaulting to -intel for Oaktrail, Medfield, and CDV chips, +default to -fbdev. For Poulsbo (only), attempt to use -psb if it's +installed, and fallback to fbdev otherwise. All other Intel chips +should use -intel. + +This fixed an issue where -intel would load on these chips and cause a +boot failure. Newer -intel drivers avoid the boot hang, but it's still +the wrong driver to load, so why take chances. + +The patch was originally created by Stefan Dirsch for OpenSUSE. We have +included it in our stable release (Ubuntu "quantal" 12.10) since +December. + +ref: https://bugzilla.novell.com/show_bug.cgi?id=772279 +ref: https://bugs.launchpad.net/ubuntu/+bug/1069031 +Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=60514 +Signed-off-by: Bryce Harrington +Signed-off-by: Keith Packard + +commit c1602d1c17967bdd4db9db19b3a9c0dfca6a58aa +Author: Dave Airlie +Date: Tue Feb 5 07:46:06 2013 -0800 + +randr: bump advertised RandR version to 1.4 + +Signed-off-by: Dave Airlie +Reviewed-by: Aaron Plattner +Tested-by: Aaron Plattner +Signed-off-by: Keith Packard + +commit 9f79e93b6b34160
Bug#691699: libxkbcommon: upgrade to 0.2.0
On 11.02.2013 20:40, Jakub Wilk wrote: * Julien Cristau , 2013-02-10, 12:16: if you need it, feel free to review and upload libxkbcommon 0.2.0 to experimental, Timo updated the packaging in git but I haven't had a chance to look yet. All right... What about Michael's patches 003 till 006? Were there rejected, forgotten, or what? :) 0003 was already fixed, 0004 added, change to source format 3.0 won't happen for pkg-xorg packages anytime soon, and because of that 0006 is rejected. Replaced the current tarball target with a more generic one (used by wayland/weston too). The copyright file reads: | There's currently no released tarball for this library. It is built | from the git upstream repository located at: | http://cgit.freedesktop.org/xorg/lib/libxkbcommon/ The above is not true anymore. The rest of the copyright file doesn't look up-to-date either. fixed the header, don't have time to go through the rest atm, patches to also convert it to format 1.0 welcome. Now that upstream released stuff, it would be a good idea to add a watch file. it's there as you noticed, directory listings seem to be blocked though The new version FTBFS on kfreebsd: |dh_auto_test | make[1]: > ... (It builds successfully with DEB_BUILD_OPTIONS=nocheck, FWIW.) fixed by adding override_dh_auto_test: for !linux. Could you make the build log verbose (i.e. don't hide compiler command-lines)? Passing --disable-silent-rules to configure, or V=1 to make should do the trick. why? lintian emits (among others): I: libxkbcommon0: spelling-error-in-binary usr/lib/i386-linux-gnu/libxkbcommon.so.0.0.0 Assigment Assignment X: libxkbcommon0: shlib-calls-exit usr/lib/i386-linux-gnu/libxkbcommon.so.0.0.0 You might want to bring it upstream. ok This upload will make weston installable. Am I right that the current version of weston 0.85.0-1 won't build against the new libxkbcommon, and therefore a sourceful upload (of a new upstream version, I presume?) will be needed? haven't tried, maybe so It might be a good idea to add build-dependency on "dpkg-dev (>= 1.16.0)", which is needed for multi-arch support. debhelper in the main archive has this dependency itself, but the one in squeeze backports doesn't. Why would you want libxkbcommon in squeeze backports? -- t -- 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/511e5d8d.9080...@ubuntu.com
libxkbcommon: Changes to 'debian-unstable'
debian/changelog |5 -
debian/control |1 +
debian/copyright |4 +---
debian/rules | 24 +++-
4 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit b751b429470a7b7cd4515167ec120fa4e5d728c9
Author: Timo Aaltonen
Date: Fri Feb 15 18:07:48 2013 +0200
rules: Don't run tests on !linux.
diff --git a/debian/changelog b/debian/changelog
index aafce91..8b55d74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ libxkbcommon (0.2.0-1) UNRELEASED; urgency=low
* copyright: Remove the note about no tarballs, add upstream url.
* control: Added homepage.
* rules: Replace old tarball target with generic gentarball target.
+ * rules: Don't run tests on !linux.
-- Timo Aaltonen Thu, 16 Aug 2012 21:37:51 +0300
diff --git a/debian/rules b/debian/rules
index a4fd666..7fc8ca3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
# We need to point to xkb-data's files. The default should be OK but
# let's be cautious:
override_dh_auto_configure:
@@ -10,6 +12,10 @@ override_dh_install:
find debian/tmp -name '*.la' -delete
dh_install --fail-missing
+ifneq ($(DEB_HOST_ARCH_OS), linux)
+override_dh_auto_test:
+endif
+
%:
dh $@ --with autoreconf
commit ac473fc1db3fbf91f573642cc50d1460a9e5543a
Author: Timo Aaltonen
Date: Fri Feb 15 17:57:28 2013 +0200
rules: Replace old tarball target with generic gentarball target.
diff --git a/debian/changelog b/debian/changelog
index 09454d6..aafce91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ libxkbcommon (0.2.0-1) UNRELEASED; urgency=low
* Add libxkbcommon0.symbols.
* copyright: Remove the note about no tarballs, add upstream url.
* control: Added homepage.
+ * rules: Replace old tarball target with generic gentarball target.
-- Timo Aaltonen Thu, 16 Aug 2012 21:37:51 +0300
diff --git a/debian/rules b/debian/rules
index 5d70418..a4fd666 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,16 +14,8 @@ override_dh_install:
dh $@ --with autoreconf
-# Until upstream releases something:
-tarball: source=libxkbcommon
-tarball: version=$(shell dpkg-parsechangelog|grep ^Version:|sed 's/Version:
\(.*\)~.*$$/\1/')
-tarball: new_rev=$(shell dpkg-parsechangelog|grep ^Version:|sed 's/Version:
.*~\(.*\)-.*$$/\1/')
-tarball:
- @if [ -z "$(REV)" ]; then \
- echo "E: Set REV to the revision you want packaged"; \
- exit 1; \
- fi
- # Actual work:
- git archive --format=tar --prefix=$(source)-$(version)~$(new_rev)/ \
- $(REV) | gzip -9 >
../$(source)_$(version)~$(new_rev).orig.tar.gz
- @echo "I: If you're happy with the results, please use pristine-tar
commit."
+# For maintainer use only, generate a tarball
+gentarball: SOURCE=$(shell dpkg-parsechangelog|awk '/^Source:/ {print $$2}')
+gentarball: UV=$(shell dpkg-parsechangelog|awk '/^Version:/ {print $$2}'|sed
's/-.*$$//')
+gentarball:
+ git archive --format=tar upstream-unstable --prefix=$(SOURCE)-$(UV)/ |
gzip -9 > ../$(SOURCE)_$(UV).orig.tar.gz
commit 66853ff8a33db2ce7bb5a2968ab69da00a6f29f2
Author: Timo Aaltonen
Date: Fri Feb 15 17:42:38 2013 +0200
control: Added homepage.
diff --git a/debian/changelog b/debian/changelog
index ebddf00..09454d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ libxkbcommon (0.2.0-1) UNRELEASED; urgency=low
* Use source format 1.0.
* Add libxkbcommon0.symbols.
* copyright: Remove the note about no tarballs, add upstream url.
+ * control: Added homepage.
-- Timo Aaltonen Thu, 16 Aug 2012 21:37:51 +0300
diff --git a/debian/control b/debian/control
index 6a5a9e7..ef6c2ff 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends:
x11proto-kb-dev (>= 1.0.5),
xkb-data,
Standards-Version: 3.9.4
+Homepage: http://www.xkbcommon.org/
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxkbcommon
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxkbcommon.git
commit 36cad0aa2b176ea356da4937d4642672d6889cfb
Author: Timo Aaltonen
Date: Tue Feb 12 21:28:15 2013 +0200
changelog cleanup
diff --git a/debian/changelog b/debian/changelog
index 0977f72..ebddf00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,6 @@ libxkbcommon (0.2.0-1) UNRELEASED; urgency=low
* libxkbcommon-dev.install: Add new headers, rename existing.
* control: Update Standards-Version, no changes.
* watch: Updated.
- * libxkbcommon-dev.install: Add xkbcommon-compat.h.
* control: Remove the comments about the experimental status, this is
an actual release.
* control: Use debhelper 9 and convert to multiarch.
commit f9d387d872b6abcbe60716ead52614af660331db
Author: Timo Aaltonen
Date: Tue Feb 12 21:27:50 2013 +0200
copyright: Remove the note about no tarballs
mesa: Changes to 'debian-experimental'
debian/changelog |3 +++ debian/control |2 +- 2 files changed, 4 insertions(+), 1 deletion(-) New commits: commit a62e061f63738a1bc018f392478d7e64d9d9e33c Author: Sven Joachim Date: Fri Feb 15 17:32:21 2013 +0100 Bump libdrm-dev build-dependency to 2.4.42 Needed as of commit 4bc85f9aac46d2442eb6194bd15c5995b281071f. diff --git a/debian/changelog b/debian/changelog index 7a4006e..dfed47c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -62,6 +62,9 @@ mesa (9.1~git20130207.f1c46c84-1) UNRELEASED; urgency=low * Recommend libtxc-dxtn0 in libgl1-mesa-dri for easier use with multiarch installs (Closes: #668645). + [ Sven Joachim ] + * Bump libdrm-dev build-dependency to 2.4.42. + -- Julien Cristau Fri, 03 Aug 2012 23:17:16 +0200 mesa (8.0.4-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 8f19566..4b05862 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 8.1.3), quilt (>= 0.40), pkg-config, - libdrm-dev (>= 2.4.39) [!hurd-any], + libdrm-dev (>= 2.4.42) [!hurd-any], libx11-dev, x11proto-gl-dev (>= 1.4.14), libxxf86vm-dev, -- 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/e1u6oe1-0007l4...@vasks.debian.org
mesa: Changes to 'debian-experimental'
debian/changelog |1 + debian/control |1 + 2 files changed, 2 insertions(+) New commits: commit 1a3cbef010e9e3b37fc0c8f46d7b73941f20b0b7 Author: Timo Aaltonen Date: Fri Feb 15 21:40:24 2013 +0200 control: Add libxcb-dri2-0-dev to libgl1-mesa-dev depends. diff --git a/debian/changelog b/debian/changelog index dfed47c..ed86a15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,7 @@ mesa (9.1~git20130207.f1c46c84-1) UNRELEASED; urgency=low * rules: Add files to clean. * 16-avoid-symbols-from-static-llvm.diff: Temporary patch to keep libxatracker1.symbols sane. + * control: Add libxcb-dri2-0-dev to libgl1-mesa-dev depends. [ Steve Langasek ] * Install all dri drivers from the DESTDIR tree, instead of copying them diff --git a/debian/control b/debian/control index 4b05862..662ef1d 100644 --- a/debian/control +++ b/debian/control @@ -706,6 +706,7 @@ Depends: libdrm-dev (>= 2.4.24) [!hurd-any], libx11-dev, libx11-xcb-dev, + libxcb-dri2-0-dev, libxcb-glx0-dev, libxdamage-dev, libxext-dev, -- 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/e1u6rfl-00056l...@vasks.debian.org
mesa: Changes to 'ubuntu'
debian/changelog |6 -- debian/control|3 ++- debian/patches/04_osmesa_version.diff | 27 ++- 3 files changed, 24 insertions(+), 12 deletions(-) New commits: commit 1a3cbef010e9e3b37fc0c8f46d7b73941f20b0b7 Author: Timo Aaltonen Date: Fri Feb 15 21:40:24 2013 +0200 control: Add libxcb-dri2-0-dev to libgl1-mesa-dev depends. diff --git a/debian/changelog b/debian/changelog index dfed47c..ed86a15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,7 @@ mesa (9.1~git20130207.f1c46c84-1) UNRELEASED; urgency=low * rules: Add files to clean. * 16-avoid-symbols-from-static-llvm.diff: Temporary patch to keep libxatracker1.symbols sane. + * control: Add libxcb-dri2-0-dev to libgl1-mesa-dev depends. [ Steve Langasek ] * Install all dri drivers from the DESTDIR tree, instead of copying them diff --git a/debian/control b/debian/control index 4b05862..662ef1d 100644 --- a/debian/control +++ b/debian/control @@ -706,6 +706,7 @@ Depends: libdrm-dev (>= 2.4.24) [!hurd-any], libx11-dev, libx11-xcb-dev, + libxcb-dri2-0-dev, libxcb-glx0-dev, libxdamage-dev, libxext-dev, commit a62e061f63738a1bc018f392478d7e64d9d9e33c Author: Sven Joachim Date: Fri Feb 15 17:32:21 2013 +0100 Bump libdrm-dev build-dependency to 2.4.42 Needed as of commit 4bc85f9aac46d2442eb6194bd15c5995b281071f. diff --git a/debian/changelog b/debian/changelog index 7a4006e..dfed47c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -62,6 +62,9 @@ mesa (9.1~git20130207.f1c46c84-1) UNRELEASED; urgency=low * Recommend libtxc-dxtn0 in libgl1-mesa-dri for easier use with multiarch installs (Closes: #668645). + [ Sven Joachim ] + * Bump libdrm-dev build-dependency to 2.4.42. + -- Julien Cristau Fri, 03 Aug 2012 23:17:16 +0200 mesa (8.0.4-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 8f19566..4b05862 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 8.1.3), quilt (>= 0.40), pkg-config, - libdrm-dev (>= 2.4.39) [!hurd-any], + libdrm-dev (>= 2.4.42) [!hurd-any], libx11-dev, x11proto-gl-dev (>= 1.4.14), libxxf86vm-dev, commit c263b342fdaabffbced5960c090dc1033b944ffc Author: Robert Hooker Date: Thu Feb 14 18:10:04 2013 -0500 Revert "debian/patches04_osmesa_version.diff: Switch to a less fragile way of forcing the version" This reverts commit a208628411c8141a99ab2e118c5aef4a9fe87402. It doesn't actually work, sorry about that! diff --git a/debian/changelog b/debian/changelog index 4d8af4f..7a4006e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,8 +61,6 @@ mesa (9.1~git20130207.f1c46c84-1) UNRELEASED; urgency=low * Drop xutils-dev build dep, makedepend is no longer required * Recommend libtxc-dxtn0 in libgl1-mesa-dri for easier use with multiarch installs (Closes: #668645). - * 04_osmesa_version.diff: Switch to a less fragile way of forcing the version -(Closes: 697745) -- Julien Cristau Fri, 03 Aug 2012 23:17:16 +0200 diff --git a/debian/patches/04_osmesa_version.diff b/debian/patches/04_osmesa_version.diff index 3232216..bad5f7b 100644 --- a/debian/patches/04_osmesa_version.diff +++ b/debian/patches/04_osmesa_version.diff @@ -1,11 +1,20 @@ a/configure.ac -+++ b/configure.ac -@@ -25,7 +25,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_R - m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) +--- a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am +@@ -37,7 +37,7 @@ + nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy.cpp + lib@OSMESA_LIB@_la_SOURCES = osmesa.c - dnl Set internal versions --OSMESA_VERSION=8 -+OSMESA_VERSION=6:5:3 - AC_SUBST([OSMESA_VERSION]) +-lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -no-undefined ++lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number 6:5:3 -no-undefined - dnl Versions for external dependencies + if HAVE_SHARED_GLAPI + GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la +@@ -55,7 +55,7 @@ + all-local: lib@OSMESA_LIB@.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR); + ln -f .libs/lib@OSMESA_LIB@.so $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so; +- ln -f .libs/lib@OSMESA_LIB@.so.@OSMESA_VERSION@ $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.@OSMESA_VERSION@; ++ ln -f .libs/lib@OSMESA_LIB@.so.6.5.3 $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.6.5.3; + endif + + pkgconfigdir = $(libdir)/pkgconfig -- 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/e1u6rge-00058l...@vasks.debian.org
xorg-server: Changes to 'ubuntu+1'
debian/serverminver |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e90e6b2c6e646703c909c2b0e33fbf8a1c45a5f1 Author: Timo Aaltonen Date: Fri Feb 15 20:48:16 2013 +0200 bump minor input abi diff --git a/debian/serverminver b/debian/serverminver index 2c9fb36..0f9556a 100644 --- a/debian/serverminver +++ b/debian/serverminver @@ -1,3 +1,3 @@ 2:1.13.99.901 ABI_VIDEODRV_VERSION:14.1 -ABI_XINPUT_VERSION:19.0 +ABI_XINPUT_VERSION:19.1 -- 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/e1u6rht-0005eu...@vasks.debian.org
xorg-server: Changes to 'debian-experimental'
debian/serverminver |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e90e6b2c6e646703c909c2b0e33fbf8a1c45a5f1 Author: Timo Aaltonen Date: Fri Feb 15 20:48:16 2013 +0200 bump minor input abi diff --git a/debian/serverminver b/debian/serverminver index 2c9fb36..0f9556a 100644 --- a/debian/serverminver +++ b/debian/serverminver @@ -1,3 +1,3 @@ 2:1.13.99.901 ABI_VIDEODRV_VERSION:14.1 -ABI_XINPUT_VERSION:19.0 +ABI_XINPUT_VERSION:19.1 -- 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/e1u6rht-0005ef...@vasks.debian.org
