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, 2 insertions(+), 42 deletions(-)
New commits:
commit 7a5ebdac3433d68df3899fedfdbe48c05195de07
Author: Bryce Harrington <bryce@canonical.com>
Date: Tue Jun 26 12:44:03 2012 -0700
Revert "Add gallium vdpau and xvmc driver support"
This reverts commit 04d0857389f40992c7cfc6115c077c0a78f8a9b7.
Timo says...
"The commit should probably be reverted for now, since it looks like the
current version is not complete. Might be best to wait until it's
committed to Debian, which should happen soon enough for quantal."
diff --git a/debian/changelog b/debian/changelog
index 77afb74..ba9be3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,3 @@
-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 45b2549..9f2e4c7 100644
--- a/debian/control
+++ b/debian/control
@@ -33,8 +33,6 @@ 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/
@@ -793,24 +791,4 @@ 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
deleted file mode 100644
index e013276..0000000
--- a/debian/libg3dvl-mesa.install.in
+++ /dev/null
@@ -1,4 +0,0 @@
-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 b20640a..869f017 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -18,10 +18,7 @@ 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 \
- dri/usr/lib/*/libXvMC* \
- dri/usr/*/libXvMC* \
- dri/usr/lib/*/vdpau/
+ usr/include/GL/wmesa.h
# Same for linux, kfreebsd, and hurd on i386:
NOT_INSTALLED_kfreebsd-i386 = $(NOT_INSTALLED_i386)
diff --git a/debian/rules b/debian/rules
index 692c42d..f0326a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,7 +115,6 @@ confflags-dri = \
--enable-shared-dricore \
--enable-shared-glapi \
--enable-texture-float \
- --enable-gallium-g3dvl \
--enable-xa \
$(confflags_DIRECT_RENDERING) \
$(confflags_EGL) \
@@ -211,8 +210,6 @@ $(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
@@ -306,7 +303,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 -r debian/tmp/$$file; done
+ set -e; for file in $(NOT_INSTALLED); do rm 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: