[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#656719: [RFC][PATCH v3 1/3] Add Gallium VDPAU and XvMC driver support (#656719)



From: Fabio Pedretti <fabio.ped@libero.it>
Date: Sun, 29 Jan 2012 21:00:57 +0100

Since version 8.0 Mesa provides XvMC and VDPAU Gallium3D video
acceleration drivers.

Fabio’s patch sent to the Debian BTS is adapted to comment the `ln -s`
call not working on my system and removing

    dri/usr/lib/*/libXvMC* \

from `debian/not_installed`.

Closes: #656719

[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=656719
--
TODO
1. Remove `/etc/XvMCConfig` which is under `/etc/X11/`.
---
 debian/changelog                |    7 +++++++
 debian/control                  |   22 ++++++++++++++++++++++
 debian/libg3dvl-mesa.install.in |    4 ++++
 debian/not-installed            |    4 +++-
 debian/rules                    |    5 ++++-
 5 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 debian/libg3dvl-mesa.install.in

diff --git a/debian/changelog b/debian/changelog
index 0eb66a1..a6900df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (8.0.3-2) UNRELEASED; urgency=low
+
+  * Enable Gallium VDPAU and XvMC driver support on at least
+    Radeon r300+ and r600+. (Closes: #656719) (LP: #1002224)
+
+ -- Fabio Pedretti <fabio.ped@libero.it>  Mon, 21 May 2012 12:46:40 +0300
+
 mesa (8.0.3-1) unstable; urgency=low
 
   [ Robert Hooker ]
diff --git a/debian/control b/debian/control
index ec59840..a9fcdd3 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,8 @@ Build-Depends:
  bison,
  llvm-2.9-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/
@@ -803,4 +805,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 afbf7dc..3ce6d56 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -18,7 +18,9 @@ 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/*/libXvMC* \
+	dri/usr/lib/*/vdpau/
 
 # Architecture-specific additional files:
 NOT_INSTALLED_i386 = \
diff --git a/debian/rules b/debian/rules
index 3bf3702..c1999da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -119,6 +119,7 @@ confflags-dri = \
 	--enable-glx-tls \
 	--enable-shared-glapi \
 	--enable-texture-float \
+	--enable-gallium-g3dvl \
 	--enable-xa \
 	$(confflags_DIRECT_RENDERING) \
 	$(confflags_EGL) \
@@ -214,6 +215,8 @@ $(STAMP_DIR)/stamp:
 $(QUILT_STAMPFN): $(STAMP_DIR)/stamp
 
 build: build-stamp
+	# XvMCConfig configuration file:
+	echo "ln -s build/dri/$(DEB_HOST_MULTIARCH)/gallium/XvMCConfig /etc/X11/XvMCConfig"
 
 build-stamp: $(BUILD_STAMPS)
 	>$@
@@ -294,7 +297,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:
-- 
1.7.10.4

Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: