mesa: Changes to 'ubuntu'
debian/changelog | 8 ++++++++
debian/control | 22 ++++++++++++++++++++++
debian/libg3dvl-mesa.install.in | 4 ++++
debian/not-installed | 5 ++++-
debian/rules | 5 ++++-
5 files changed, 42 insertions(+), 2 deletions(-)
New commits:
commit 04d0857389f40992c7cfc6115c077c0a78f8a9b7
Author: Bryce Harrington <bryce@canonical.com>
Date: Thu Jun 21 15:35:03 2012 -0700
Add gallium vdpau and xvmc driver support
diff --git a/debian/changelog b/debian/changelog
index ba9be3d..77afb74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (8.0.2-0ubuntu4) UNRELEASED; urgency=low
+
+ * Add g3dvl.diff from Debian bug 656719: Enables gallium vdpau and xvmc
+ driver support on at least Radeon r300+ and r600+.
+ (LP: #1002224)
+
+ -- Timo <timo.jyrinki@iki.fi> Mon, 21 May 2012 12:46:40 +0300
+
mesa (8.0.3-0ubuntu1) quantal; urgency=low
* New upstream stable release.
diff --git a/debian/control b/debian/control
index 9f2e4c7..45b2549 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,8 @@ Build-Depends:
bison,
llvm-3.0-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
libwayland-dev (>= 0.85.0) [linux-any],
+ libvdpau-dev (>= 0.4.1) [linux-any],
+ libxvmc-dev (>= 1.0.6) [linux-any],
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git
Homepage: http://mesa3d.sourceforge.net/
@@ -791,4 +793,24 @@ Description: Mesa OpenGL utility library -- development files
For a complete description of GLU, please look at the libglu1-mesa
package.
+Package: libg3dvl-mesa
+Section: libs
+Architecture: linux-any
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Description: xvmc and vdpau Gallium3D video acceleration drivers
+
+Package: libg3dvl-mesa-dbg
+Section: debug
+Priority: extra
+Architecture: linux-any
+Depends:
+ libg3dvl-mesa (= ${binary:Version}),
+ ${misc:Depends},
+Description: xvmc and vdpau Gallium3D video acceleration drivers
+ .
+ This package contains the debugging symbols for the g3dvl libraries.
+
+
# vim: tw=0
diff --git a/debian/libg3dvl-mesa.install.in b/debian/libg3dvl-mesa.install.in
new file mode 100644
index 0000000..e013276
--- /dev/null
+++ b/debian/libg3dvl-mesa.install.in
@@ -0,0 +1,4 @@
+build/dri/${DEB_HOST_MULTIARCH}/gallium/libvdpau_* usr/lib/vdpau
+build/dri/${DEB_HOST_MULTIARCH}/gallium/libXvMC* usr/lib/dri
+build/dri/${DEB_HOST_MULTIARCH}/gallium/XvMCConfig usr/lib
+build/dri/${DEB_HOST_MULTIARCH}/gallium/XvMCConfig etc
diff --git a/debian/not-installed b/debian/not-installed
index 869f017..b20640a 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -18,7 +18,10 @@ NOT_INSTALLED := \
usr/include/GL/glx_mangle.h \
usr/include/GL/vms_x_fix.h \
usr/include/GL/wglext.h \
- usr/include/GL/wmesa.h
+ usr/include/GL/wmesa.h \
+ dri/usr/lib/*/libXvMC* \
+ dri/usr/*/libXvMC* \
+ dri/usr/lib/*/vdpau/
# Same for linux, kfreebsd, and hurd on i386:
NOT_INSTALLED_kfreebsd-i386 = $(NOT_INSTALLED_i386)
diff --git a/debian/rules b/debian/rules
index f0326a3..692c42d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,6 +115,7 @@ confflags-dri = \
--enable-shared-dricore \
--enable-shared-glapi \
--enable-texture-float \
+ --enable-gallium-g3dvl \
--enable-xa \
$(confflags_DIRECT_RENDERING) \
$(confflags_EGL) \
@@ -210,6 +211,8 @@ $(STAMP_DIR)/stamp:
$(QUILT_STAMPFN): $(STAMP_DIR)/stamp
build: build-stamp
+ # XvMCConfig configuration file:
+ ln -s /etc/X11/XvMCConfig build/dri/$(DEB_HOST_MULTIARCH)/gallium/XvMCConfig
build-stamp: $(BUILD_STAMPS)
# Build pot file for pkgstriptranslations
@@ -303,7 +306,7 @@ binary-arch: install
# Also get rid of other files which aren't installed. Do not
# use -f to ensure we notice disappearing files:
- set -e; for file in $(NOT_INSTALLED); do rm debian/tmp/$$file; done
+ set -e; for file in $(NOT_INSTALLED); do rm -r debian/tmp/$$file; done
# Files only in git, not in tarballs, OK to use rm -f here:
set -e; for file in $(NOT_INSTALLED_EITHER); do rm -f debian/tmp/$$file; done
# No need for this .so, libglapi is just a convenience library:
Reply to: