debian/changelog | 4 ++-- debian/control | 4 +++- debian/patches/04_osmesa_version.diff | 22 +++++++++------------- debian/rules | 2 ++ 4 files changed, 16 insertions(+), 16 deletions(-)
New commits: commit c319fd18417aea0d3d9fe1c025b5a26f2c350aa0 Author: Timo Aaltonen <tjaal...@ubuntu.com> Date: Fri Aug 17 10:39:36 2012 +0300 rules: Add --disable-shared-glapi to the swx11 targets. diff --git a/debian/changelog b/debian/changelog index 047dc65..a8963ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ mesa (8.1~git20120816.1597176f-1) UNRELEASED; urgency=low * control: Bump libdrm build-dep to 2.4.38. * control: Bump libwayland-dev build-dep to 0.95. * rules: Update the clean target. + * rules: Add --disable-shared-glapi to the swx11 targets. -- Julien Cristau <jcris...@debian.org> Fri, 03 Aug 2012 23:17:16 +0200 diff --git a/debian/rules b/debian/rules index bc4bf8d..b68dba6 100755 --- a/debian/rules +++ b/debian/rules @@ -127,6 +127,7 @@ confflags-swx11+glu = \ --with-gallium-drivers= \ --with-driver=xlib \ --disable-egl \ + --disable-shared-glapi \ CFLAGS="$(CFLAGS)" \ CXXFLAGS="$(CXXFLAGS)" @@ -136,6 +137,7 @@ confflags-swx11+glu-static = \ --with-driver=xlib \ --enable-static \ --disable-egl \ + --disable-shared-glapi \ CFLAGS="$(CFLAGS)" \ CXXFLAGS="$(CXXFLAGS)" commit a274e5e003a33d7c2fceb983d430e76039980ae9 Author: Timo Aaltonen <tjaal...@ubuntu.com> Date: Fri Aug 17 09:45:46 2012 +0300 revamp 04_osmesa_version.diff diff --git a/debian/patches/04_osmesa_version.diff b/debian/patches/04_osmesa_version.diff index bf21c2c..ffd47e0 100644 --- a/debian/patches/04_osmesa_version.diff +++ b/debian/patches/04_osmesa_version.diff @@ -1,15 +1,11 @@ ---- - src/mesa/drivers/osmesa/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/mesa/drivers/osmesa/Makefile.am -+++ b/src/mesa/drivers/osmesa/Makefile.am -@@ -35,7 +35,7 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1325,7 +1325,7 @@ + OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS" + fi - lib@OSMESA_LIB@_la_SOURCES = osmesa.c +-OSMESA_VERSION=`echo "$VERSION" | $SED 's/\./:/g'` ++OSMESA_VERSION="6:5:3" --lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -shared -no-undefined -+lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number 6.5.3 -shared -no-undefined - lib@OSMESA_LIB@_la_LIBADD = \ - $(top_builddir)/src/mesa/libmesa.la \ - $(top_builddir)/src/mapi/glapi/libglapi.la + AC_SUBST([OSMESA_LIB_DEPS]) + AC_SUBST([OSMESA_MESA_DEPS]) commit f79fdfe34a6e7a7e427000ebb6f2598a46c060e3 Author: Timo Aaltonen <tjaal...@ubuntu.com> Date: Fri Aug 17 07:25:18 2012 +0300 realized that we don't actually use dh-autoreconf, so b-depend on libtool instead diff --git a/debian/changelog b/debian/changelog index 4b29352..047dc65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,7 @@ mesa (8.1~git20120816.1597176f-1) UNRELEASED; urgency=low * Refresh patches - disable 05_kfreebsd-egl-x11.diff for now. - switch to llvm-3.1. - * control: Depend on dh-autoreconf, which pulls in libtool. Drop - autoconf, automake from Depends. + * control: Added libtool to build-depends. * rules: Drop special handling of config.{guess,sub}, not needed anymore. * rules, libosmesa*: Build only the 32bit OSMesa library. * control: Bump libdrm build-dep to 2.4.38. diff --git a/debian/control b/debian/control index 1a342fb..f0ed455 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org> Uploaders: Cyril Brulebois <k...@debian.org> Standards-Version: 3.8.4 Build-Depends: - dh-autoreconf, debhelper (>= 8.1.3), quilt (>= 0.40), pkg-config, @@ -19,6 +18,9 @@ Build-Depends: libxfixes-dev, libxdamage-dev, libxext-dev, + autoconf, + automake, + libtool, x11proto-dri2-dev (>= 2.6), linux-libc-dev (>= 2.6.31) [linux-any], libx11-xcb-dev, -- 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/e1t2kyv-0006r5...@vasks.debian.org