>> --- mesa-debian-originale/debian//control2012-01-23 13:39:09.471085849
+0100
>> +++ mesa-debian-test/debian//control 2012-01-21 20:29:38.350117156 +0100
>> @@ -32,6 +32,9 @@ Build-Depends:
>> bison,
>> llvm-2.9-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
>> # libwayland-dev,
>> + xserver-xorg-dev,
>> + libvdpau-dev,
>> + libxvmc-dev,
>
>outch, introducing a build-dep-loop between mesa and xorg-server… :/
Updated patch reflecting that xorg-server dependency was dropped in master and
8.0 branches of mesa. Note that, of course, non-linux support is incomplete,
but I'll leave it to someone else since it's probably broken anyway (e.g.
radeon and r200 drivers since mesa 8.0 require dri2 available only on linux).diff -purN mesa-debian-originale/debian//control mesa-debian-test/debian//control
--- mesa-debian-originale/debian//control 2012-01-23 13:39:09.471085849 +0100
+++ mesa-debian-test/debian//control 2012-01-25 18:20:20.398120851 +0100
@@ -32,6 +32,8 @@ Build-Depends:
bison,
llvm-2.9-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386],
# libwayland-dev,
+ 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/
@@ -753,4 +755,23 @@ Description: Mesa OpenGL utility library
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 -purN mesa-debian-originale/debian//libg3dvl-mesa.install.in mesa-debian-test/debian//libg3dvl-mesa.install.in
--- mesa-debian-originale/debian//libg3dvl-mesa.install.in 1970-01-01 01:00:00.0 +0100
+++ mesa-debian-test/debian//libg3dvl-mesa.install.in 2012-01-21 20:30:50.778476318 +0100
@@ -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 -purN mesa-debian-originale/debian//not-installed mesa-debian-test/debian//not-installed
--- mesa-debian-originale/debian//not-installed 2012-01-23 13:39:09.471085849 +0100
+++ mesa-debian-test/debian//not-installed 2012-01-21 20:33:27.303252476 +0100
@@ -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/
# Architecture-specific additional files:
NOT_INSTALLED_i386 = \
diff -purN mesa-debian-originale/debian//rules mesa-debian-test/debian//rules
--- mesa-debian-originale/debian//rules 2012-01-23 13:39:09.471085849 +0100
+++ mesa-debian-test/debian//rules 2012-01-23 13:32:38.901149146 +0100
@@ -113,6 +113,7 @@ confflags-dri = \
--enable-glx-tls \
--enable-shared-glapi \
--enable-texture-float \
+ --enable-gallium-g3dvl \
$(confflags_DIRECT_RENDERING) \
$(confflags_EGL) \
$(confflags_GALLIUM) \
@@ -204,6 +205,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)
>$@
@@ -286,7 +289,7 @@ endif
# 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:
