Bug#697745: mesa: [PATCH] minor packaging cleanups

[Fabio Pedretti <fabio.ped@libero.it>]

Package: mesa
Version: debian-experimental branch
Severity: wishlist

Dear Maintainers,

here are some cleanup suggestions and patches for debian-experimental:

1) remove explicit forcing of --enable-shared-glapi , it is already
enabled by default where it is useful (i.e. match what debian is using);

2) remove 13-llvm-config-pick-a-version.diff patch and rather just add
--with-llvm-prefix=/usr/lib/llvm-3.2 config flag;

3) add empty LDFLAGS along CFLAGS and CXXFLAGS, useful for building
with -flto (patch attached);

4) recommends-dxtn.patch: Recommends libtxc-dxtn0 (already reported as
bug 668645) (patch attached).

Thanks 

diff --git a/debian/rules b/debian/rules
index 248e7a0..f6e50cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,12 +7,15 @@
 
 CFLAGS = -Wall -g
 CXXFLAGS = -Wall -g
+LDFLAGS =
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 	CXXFLAGS += -O0
+	LDFLAGS +=
 else
 	CFLAGS += -O2
 	CXXFLAGS += -O2
+	LDFLAGS +=
 endif
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -54,7 +57,8 @@ include /usr/share/quilt/quilt.make
 
 confflags-common = \
 	CFLAGS="$(CFLAGS)" \
-	CXXFLAGS="$(CXXFLAGS)"
+	CXXFLAGS="$(CXXFLAGS)" \
+	LDFLAGS="$(LDFLAGS)"
 
 DRI_DRIVERS =
 GALLIUM_DRIVERS =
@@ -136,7 +140,8 @@ confflags-swx11 = \
 	--disable-egl \
 	--disable-shared-glapi \
 	CFLAGS="$(CFLAGS)" \
-	CXXFLAGS="$(CXXFLAGS)"
+	CXXFLAGS="$(CXXFLAGS)" \
+	LDFLAGS="$(LDFLAGS)"
 
 confflags-swx11-static = \
 	--disable-dri \
@@ -147,7 +152,8 @@ confflags-swx11-static = \
 	--disable-egl \
 	--disable-shared-glapi \
 	CFLAGS="$(CFLAGS)" \
-	CXXFLAGS="$(CXXFLAGS)"
+	CXXFLAGS="$(CXXFLAGS)" \
+	LDFLAGS="$(LDFLAGS)"
 
 confflags-swx11-i386-i686 = \
 	--disable-dri \
@@ -157,7 +163,8 @@ confflags-swx11-i386-i686 = \
 	--disable-egl \
 	--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov \
 	CFLAGS="$(CFLAGS) -march=i686" \
-	CXXFLAGS="$(CXXFLAGS) -march=i686"
+	CXXFLAGS="$(CXXFLAGS) -march=i686" \
+	LDFLAGS="$(LDFLAGS)"
 
 configure: $(QUILT_STAMPFN) configure.ac
 	autoreconf -vfi

--- a/debian/control
+++ b/debian/control
@@ -603,6 +603,7 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
+Recommends: libtxc-dxtn0
 Suggests: libglide3
 Conflicts: xlibmesa-dri (<< 1:7.0.0)
 Replaces: xlibmesa-dri (<< 1:7.0.0), libgl1-mesa-dri-experimental (<< 7.11.1)