mesa: Changes to 'ubuntu'
debian/changelog | 14 ++++++++++++++
debian/control | 13 +++++++++++++
debian/libvdpau1-drivers-mesa.install.in | 1 +
debian/rules | 5 ++++-
4 files changed, 32 insertions(+), 1 deletion(-)
New commits:
commit 412841f5c3f8e645e45d270f6cd466674c7a56af
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Feb 20 21:57:24 2014 +0200
release to trusty
diff --git a/debian/changelog b/debian/changelog
index 537dfdf..6bb81e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (10.1.0~rc1-1ubuntu4) trusty; urgency=medium
+
+ * Merge from debian git
+ - Enable building drivers for libvdpau1
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 20 Feb 2014 21:46:24 +0200
+
mesa (10.1.0~rc1-2) UNRELEASED; urgency=medium
* Add missing depends to keep lib(e)gl1-dev usable.
commit 9559b86f515721152a0a2ce2347f1b61102d3f61
Author: Maarten Lankhorst <dev@mblankhorst.nl>
Date: Thu Feb 20 20:10:17 2014 +0100
Enable building drivers for libvdpau1.
diff --git a/debian/changelog b/debian/changelog
index 9d7b37f..f344f79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
mesa (10.1.0~rc1-2) UNRELEASED; urgency=medium
* Add missing depends to keep lib(e)gl1-dev usable.
+ * Enable building drivers for libvdpau1.
-- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 20 Feb 2014 19:12:12 +0100
diff --git a/debian/control b/debian/control
index da62960..daad9e8 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends:
libxfixes-dev,
libxdamage-dev,
libxext-dev,
+ libvdpau-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
autoconf,
automake,
libtool,
@@ -750,4 +751,16 @@ Description: Mesa Off-screen rendering extension -- development files
.
For more information on OSmesa see the libosmesa6 package.
+Package: libvdpau1-drivers-mesa
+Section: libs
+Architecture: amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf
+Depends:
+ libvdpau1,
+ ${shlib:Depends},
+ ${misc:Depends},
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Description: Mesa acceleration support for vdpau.
+ This package enables support for VDPAU for some gallium drivers.
+
# vim: tw=0
diff --git a/debian/libvdpau1-drivers-mesa.install.in b/debian/libvdpau1-drivers-mesa.install.in
new file mode 100644
index 0000000..50c703c
--- /dev/null
+++ b/debian/libvdpau1-drivers-mesa.install.in
@@ -0,0 +1 @@
+dri/usr/lib/${DEB_HOST_MULTIARCH}/vdpau/*.so* usr/lib/${DEB_HOST_MULTIARCH}/vdpau/
diff --git a/debian/rules b/debian/rules
index d20bc1f..e8a3bfa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,6 +96,9 @@ else
ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf))
confflags_GALLIUM += --enable-gallium-llvm
confflags_GALLIUM += --with-llvm-shared-libs
+ confflags_GALLIUM += --enable-vdpau
+ else
+ confflags_GALLIUM += --disable-vdpau
endif
confflags_DIRECT_RENDERING = --enable-driglx-direct
@@ -115,7 +118,7 @@ confflags-dri = \
--enable-shared-glapi \
--enable-texture-float \
--enable-xa \
- --disable-xvmc --disable-vdpau \
+ --disable-xvmc \
$(confflags_DIRECT_RENDERING) \
$(confflags_EGL) \
$(confflags_GALLIUM) \
commit 81da9a5250d91b60d19b826f45d0abb035f61b7b
Author: Maarten Lankhorst <dev@mblankhorst.nl>
Date: Thu Feb 20 19:12:44 2014 +0100
Add missing depends to keep lib(e)gl1-dev usable.
diff --git a/debian/changelog b/debian/changelog
index 2676c1d..9d7b37f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.1.0~rc1-2) UNRELEASED; urgency=medium
+
+ * Add missing depends to keep lib(e)gl1-dev usable.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Thu, 20 Feb 2014 19:12:12 +0100
+
mesa (10.1.0~rc1-1) experimental; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index d040f08..da62960 100644
--- a/debian/control
+++ b/debian/control
@@ -295,6 +295,10 @@ Depends:
libxfixes-dev,
libxcb-glx0-dev,
libxcb-dri2-0-dev,
+ libxcb-dri3-dev,
+ libxcb-present-dev,
+ libxcb-sync-dev,
+ libxshmfence-dev,
libx11-xcb-dev,
libwayland-dev,
${misc:Depends},
@@ -672,6 +676,10 @@ Depends:
libdrm-dev (>= 2.4.45) [!hurd-any],
libx11-dev,
libx11-xcb-dev,
+ libxcb-dri3-dev,
+ libxcb-present-dev,
+ libxcb-sync-dev,
+ libxshmfence-dev,
libxcb-dri2-0-dev,
libxcb-glx0-dev,
libxdamage-dev,
Reply to: