debian/changelog | 13 +++++++++++++ debian/libgl1-mesa-dri.install.linux.in | 2 +- debian/rules | 28 +++++++++++++++------------- 3 files changed, 29 insertions(+), 14 deletions(-)
New commits: commit 9cf1bba1d91758e8e7b3d3145004ab8ec1c5ddde Author: Timo Aaltonen <tjaal...@ubuntu.com> Date: Thu Feb 2 13:09:31 2012 +0200 release to precise diff --git a/debian/changelog b/debian/changelog index 35c170d..d07fcfa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mesa (8.0~rc2-0ubuntu3) precise; urgency=low + + * Merge from debian-experimental git. + - Install the llvmpipe swrast driver. + + -- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 02 Feb 2012 12:38:06 +0200 + mesa (8.0~rc2-0ubuntu2) precise; urgency=low * Add Pre-Depends: dpkg (>= 1.15.6~) to all -dbg packages. commit d35fc9e2d8d1a73fc519537a4702b2e6a9742924 Author: Timo Aaltonen <tjaal...@ubuntu.com> Date: Thu Feb 2 12:08:14 2012 +0200 rules: Handle installing r300_dri.so like other gallium drivers diff --git a/debian/changelog b/debian/changelog index 7e2f2a2..bab3925 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ mesa (8.0~rc2-1) UNRELEASED; urgency=low rest. * rules: No need to copy nouveau_vieux to the gallium dir, it's installed in libgl1-mesa-dri now. + * rules: Handle installing r300_dri.so like other gallium drivers, + in libgl1-mesa-dri.install.linux.in. [ Robert Hooker ] * Bump libdrm build dep to 2.4.30, x11proto-gl-dev to 1.4.14, and diff --git a/debian/libgl1-mesa-dri.install.linux.in b/debian/libgl1-mesa-dri.install.linux.in index 807486f..ee1acd8 100644 --- a/debian/libgl1-mesa-dri.install.linux.in +++ b/debian/libgl1-mesa-dri.install.linux.in @@ -2,6 +2,7 @@ build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri # This part is Linux-specific: +build/dri/${DEB_HOST_MULTIARCH}/gallium/r300_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri build/dri/${DEB_HOST_MULTIARCH}/gallium/r600_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri build/dri/${DEB_HOST_MULTIARCH}/gallium/nouveau_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri build/dri/${DEB_HOST_MULTIARCH}/gallium/vmwgfx_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri diff --git a/debian/rules b/debian/rules index c5d56ff..952d726 100755 --- a/debian/rules +++ b/debian/rules @@ -293,14 +293,13 @@ binary-arch: install rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so dh_install -s --fail-missing -ifneq (,$(filter r300,$(GALLIUM_DRIVERS))) - dh_install -plibgl1-mesa-dri build/dri/$(DEB_HOST_MULTIARCH)/gallium/r300_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri -endif + # If the llvmpipe driver was built, copy it to the package dir ifneq (,$(filter swrast,$(GALLIUM_DRIVERS))) dh_install -plibgl1-mesa-dri build/dri/$(DEB_HOST_MULTIARCH)/gallium/swrast_dri.so \ usr/lib/${DEB_HOST_MULTIARCH}/dri endif + dh_installman -s dh_lintian -s dh_link -s commit 989e935f2db156996d9d42a4b0043d83e3c2cd66 Author: Timo Aaltonen <tjaal...@ubuntu.com> Date: Thu Feb 2 11:09:36 2012 +0200 rules: No need to copy nouveau_vieux to the gallium dir, it's installed in libgl1-mesa-dri now. diff --git a/debian/changelog b/debian/changelog index fe6e144..7e2f2a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ mesa (8.0~rc2-1) UNRELEASED; urgency=low * Enable vmwgfx gallium driver & xatracker. (Closes: #652501). * Build llvmpipe swrast only on non-hurd x86, traditional for the rest. + * rules: No need to copy nouveau_vieux to the gallium dir, it's + installed in libgl1-mesa-dri now. [ Robert Hooker ] * Bump libdrm build dep to 2.4.30, x11proto-gl-dev to 1.4.14, and diff --git a/debian/libgl1-mesa-dri.install.linux.in b/debian/libgl1-mesa-dri.install.linux.in index 4dfc182..807486f 100644 --- a/debian/libgl1-mesa-dri.install.linux.in +++ b/debian/libgl1-mesa-dri.install.linux.in @@ -4,5 +4,4 @@ build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri # This part is Linux-specific: build/dri/${DEB_HOST_MULTIARCH}/gallium/r600_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri build/dri/${DEB_HOST_MULTIARCH}/gallium/nouveau_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri -build/dri/${DEB_HOST_MULTIARCH}/gallium/nouveau_vieux_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri build/dri/${DEB_HOST_MULTIARCH}/gallium/vmwgfx_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri diff --git a/debian/rules b/debian/rules index 2df88ec..c5d56ff 100755 --- a/debian/rules +++ b/debian/rules @@ -284,11 +284,6 @@ binary-arch: install # install the right files manually. rm -r debian/tmp/dri/usr/lib/$(DEB_HOST_MULTIARCH)/dri - # Move nouveau_vieux alongside nouveau to install in dri-experimental package -ifneq (,$(filter nouveau,$(DRI_DRIVERS))) - mv build/dri/$(DEB_HOST_MULTIARCH)/nouveau_vieux_dri.so build/dri/$(DEB_HOST_MULTIARCH)/gallium/ -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 commit 430ecac2aa9e7d81791040ba1849f706826839bb Author: Timo Aaltonen <tjaal...@ubuntu.com> Date: Thu Feb 2 10:35:36 2012 +0200 Build llvmpipe swrast only on non-hurd x86, traditional for the rest. diff --git a/debian/changelog b/debian/changelog index b84924f..fe6e144 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ mesa (8.0~rc2-1) UNRELEASED; urgency=low * libegl-mesa.symbols, libgles2-mesa.symbols: Add new symbols. * rules: Drop obsolete configure options. * Enable vmwgfx gallium driver & xatracker. (Closes: #652501). + * Build llvmpipe swrast only on non-hurd x86, traditional for the + rest. [ Robert Hooker ] * Bump libdrm build dep to 2.4.30, x11proto-gl-dev to 1.4.14, and diff --git a/debian/rules b/debian/rules index c097b9c..2df88ec 100755 --- a/debian/rules +++ b/debian/rules @@ -63,16 +63,17 @@ confflags-common = \ CFLAGS="$(CFLAGS)" \ CXXFLAGS="$(CXXFLAGS)" -DRI_DRIVERS = swrast +DRI_DRIVERS = +GALLIUM_DRIVERS = # hurd doesn't do direct rendering ifeq ($(DEB_HOST_ARCH_OS), hurd) confflags_DIRECT_RENDERING = --disable-driglx-direct confflags_EGL = --disable-egl confflags_GALLIUM = --with-gallium-drivers= + DRI_DRIVERS += swrast else EGL_DISPLAYS = x11 - GALLIUM_DRIVERS = swrast ifeq ($(DEB_HOST_ARCH_OS), linux) # Gallium drivers require libdrm-{nouveau,radeon}, only available on Linux @@ -87,9 +88,12 @@ else ifneq ($(DEB_HOST_ARCH), s390) DRI_DRIVERS += r200 radeon endif - ifeq ($(DEB_HOST_ARCH_CPU), i386) - DRI_DRIVERS += i915 i965 - else ifeq ($(DEB_HOST_ARCH_CPU), amd64) + +# Build the llvmpipe driver only on amd64, i386 until it's tested elsewhere + ifeq (,$(filter $(DEB_HOST_ARCH_CPU), amd64 i386)) + DRI_DRIVERS += swrast + else + GALLIUM_DRIVERS += swrast DRI_DRIVERS += i915 i965 endif @@ -297,6 +301,11 @@ endif ifneq (,$(filter r300,$(GALLIUM_DRIVERS))) dh_install -plibgl1-mesa-dri build/dri/$(DEB_HOST_MULTIARCH)/gallium/r300_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri endif +# If the llvmpipe driver was built, copy it to the package dir +ifneq (,$(filter swrast,$(GALLIUM_DRIVERS))) + dh_install -plibgl1-mesa-dri build/dri/$(DEB_HOST_MULTIARCH)/gallium/swrast_dri.so \ + usr/lib/${DEB_HOST_MULTIARCH}/dri +endif dh_installman -s dh_lintian -s dh_link -s -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rsv5m-0007gf...@vasks.debian.org