mesa: Changes to 'debian-experimental'
debian/changelog | 5 ++
debian/patches/01_fix-libdir.patch | 14 +++++++
debian/patches/series | 1
debian/rules | 73 +++++++++++++++++++++++++------------
debian/scripts/choose-configs | 24 ++++++------
5 files changed, 83 insertions(+), 34 deletions(-)
New commits:
commit 063a487fe12f186d7aab52ca788697572e42390f
Author: Timo Aaltonen <tjaalton@pris.hut.fi>
Date: Thu Jul 3 13:20:21 2008 +0300
Fix the configure.ac patch somewhat
workaround the problems by setting --libdir for all flavours, otherwise
the path used is /usr/usr/lib.
diff --git a/debian/patches/01_fix-libdir.patch b/debian/patches/01_fix-libdir.patch
index c041c94..95a7077 100644
--- a/debian/patches/01_fix-libdir.patch
+++ b/debian/patches/01_fix-libdir.patch
@@ -7,7 +7,7 @@ index f15d9ff..7de1017 100644
dnl LIB_DIR - library basename
-LIB_DIR=`echo $libdir | $SED 's%.*/%%'`
-+LIB_DIR=`echo $libdir | $SED 's%[^/]*/[^/]*/%%'`
++LIB_DIR=`echo $libdir | $SED 's%[[^/]*/[^/]]*/%%'`
AC_SUBST([LIB_DIR])
dnl Cache LDFLAGS so we can add EXTRA_LIB_PATH and restore it later
diff --git a/debian/rules b/debian/rules
index b91fb43..56bb67f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,12 +52,14 @@ QUILT_STAMPFN = $(STAMP_DIR)/patch
include /usr/share/quilt/quilt.make
confflags-common = --disable-glu --disable-glut --disable-glw \
+ --libdir=/usr/lib \
CFLAGS="$(CFLAGS)"
confflags-dri = --with-demos=xdemos \
--libdir=/usr/lib/glx \
--with-dri-driverdir=/usr/lib/dri \
- $(confflags-common)
+ --disable-glu --disable-glut --disable-glw \
+ CFLAGS="$(CFLAGS)"
confflags-osmesa = --with-driver=osmesa \
--with-demos= \
@@ -87,11 +89,13 @@ confflags-osmesa32-static = --with-driver=osmesa --with-osmesa-bits=32 \
$(confflags-common)
confflags-swx11+glu = --with-driver=xlib \
- --with-demos=
+ --with-demos= \
+ --libdir=/usr/lib
confflags-swx11+glu-static = --with-driver=xlib \
--enable-static \
- --with-demos=
+ --with-demos= \
+ --libdir=/usr/lib
confflags-swx11+glu-i386-i686 = --with-driver=xlib \
--with-demos= \
commit 99a35fd4e1002efc0f49f2deb2b3aed5892da02c
Author: Timo Aaltonen <tjaalton@pris.hut.fi>
Date: Thu Jul 3 09:31:23 2008 +0300
01_fix-libdir.patch: libdir handling is broken in configure.ac, fix it.
diff --git a/debian/changelog b/debian/changelog
index 2714139..9b53749 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,10 @@ mesa (7.1~rc1-1) UNRELEASED; urgency=low
* rules: Replace the old build system with the new autotools-based
system.
* Run autoreconf before building the various flavours..
+ * 01_fix-libdir.patch: libdir handling is broken in configure.ac, fix
+ it.
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Thu, 03 Jul 2008 00:20:15 +0300
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Thu, 03 Jul 2008 09:30:30 +0300
mesa (7.0.3-4) unstable; urgency=low
diff --git a/debian/patches/01_fix-libdir.patch b/debian/patches/01_fix-libdir.patch
new file mode 100644
index 0000000..c041c94
--- /dev/null
+++ b/debian/patches/01_fix-libdir.patch
@@ -0,0 +1,14 @@
+diff --git a/configure.ac b/configure.ac
+index f15d9ff..7de1017 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -64,7 +64,7 @@ m4_ifdef([PKG_PROG_PKG_CONFIG],[],[
+ PKG_PROG_PKG_CONFIG()
+
+ dnl LIB_DIR - library basename
+-LIB_DIR=`echo $libdir | $SED 's%.*/%%'`
++LIB_DIR=`echo $libdir | $SED 's%[^/]*/[^/]*/%%'`
+ AC_SUBST([LIB_DIR])
+
+ dnl Cache LDFLAGS so we can add EXTRA_LIB_PATH and restore it later
+
diff --git a/debian/patches/series b/debian/patches/series
index abb18b9..fa395b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+01_fix-libdir.patch
02_use-ieee-fp-on-s390-and-m68k.patch
03_optional-progs-and-install.patch
commit cbaac82c2cf7704203a7eeaa81b02fa6cebba40a
Author: Timo Aaltonen <tjaalton@pris.hut.fi>
Date: Thu Jul 3 09:26:46 2008 +0300
Further tweaks to the autoconf stuff. Getting closer but still not there
diff --git a/debian/rules b/debian/rules
index 96513e6..b91fb43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,14 +34,15 @@ DRI_CONFIGS =
include debian/scripts/choose-configs
# build the following configurations by default
-CONFIGS = osmesa \
+CONFIGS = $(SWX11_GLU_CONFIGS) \
+ dri \
+ osmesa \
osmesa-static \
osmesa16 \
osmesa16-static \
osmesa32 \
osmesa32-static
-
STAMP_DIR = debian/stamp
STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))
@@ -50,31 +51,53 @@ ARCH_INSTALL_STAMPS = $(addprefix $(STAMP)-install-, $(CONFIGS))
QUILT_STAMPFN = $(STAMP_DIR)/patch
include /usr/share/quilt/quilt.make
-confflags-osmesa = --enable-gl-osmesa \
- --with-demos=xdemos
+confflags-common = --disable-glu --disable-glut --disable-glw \
+ CFLAGS="$(CFLAGS)"
-confflags-osmesa-static = --enable-static \
- --with-driver=osmesa \
- --with-demos=
+confflags-dri = --with-demos=xdemos \
+ --libdir=/usr/lib/glx \
+ --with-dri-driverdir=/usr/lib/dri \
+ $(confflags-common)
-confflags-osmesa16 = --with-osmesa-bits=16 \
- --with-driver=osmesa \
- --with-demos=
+confflags-osmesa = --with-driver=osmesa \
+ --with-demos= \
+ $(confflags-common)
-confflags-osmesa16-static = --with-osmesa-bits=16 \
- --with-driver=osmesa \
+confflags-osmesa-static = --with-driver=osmesa \
--enable-static \
- --with-demos=
+ --with-demos= \
+ $(confflags-common)
+
+confflags-osmesa16 = --with-driver=osmesa --with-osmesa-bits=16 \
+ --with-demos= \
+ $(confflags-common)
+
+confflags-osmesa16-static = --with-driver=osmesa --with-osmesa-bits=16 \
+ --enable-static \
+ --with-demos= \
+ $(confflags-common)
+
+confflags-osmesa32 = --with-driver=osmesa --with-osmesa-bits=32 \
+ --with-demos= \
+ $(confflags-common)
+
+confflags-osmesa32-static = --with-driver=osmesa --with-osmesa-bits=32 \
+ --enable-static \
+ --with-demos= \
+ $(confflags-common)
-confflags-osmesa32 = --with-osmesa-bits=32 \
- --with-driver=osmesa \
- --with-demos=
+confflags-swx11+glu = --with-driver=xlib \
+ --with-demos=
-confflags-osmesa32-static = --with-osmesa-bits=32 \
- --with-driver=osmesa \
+confflags-swx11+glu-static = --with-driver=xlib \
--enable-static \
--with-demos=
+confflags-swx11+glu-i386-i686 = --with-driver=xlib \
+ --with-demos= \
+ --libdir=/usr/lib/i686/cmov \
+ CFLAGS="$(CFLAGS) -march=i686"
+
autoreconf:
autoreconf -vfi
@@ -99,8 +122,7 @@ $(STAMP)-build-%:
cd $(DEB_BUILD_DIR)/$* && \
../../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --sysconfdir=/etc \
- --localstatedir=/var $(confflags) $(confflags-$*) \
- CFLAGS="$(CFLAGS)"
+ --localstatedir=/var $(confflags) $(confflags-$*)
cd $(DEB_BUILD_DIR)/$* && $(MAKE)
touch $@
diff --git a/debian/scripts/choose-configs b/debian/scripts/choose-configs
index 16e0082..96050ec 100644
--- a/debian/scripts/choose-configs
+++ b/debian/scripts/choose-configs
@@ -8,18 +8,20 @@
# choose an architecture-specific build of swx11 and GLU if a matching
# configuration exists
-ifneq ($(wildcard configs/debian-swx11+glu-$(DEB_BUILD_ARCH)),)
- SWX11_GLU_CONFIGS := debian-swx11+glu-$(DEB_BUILD_ARCH)
-else
- SWX11_GLU_CONFIGS := debian-swx11+glu-any
-endif
+#ifneq ($(wildcard configs/debian-swx11+glu-$(DEB_BUILD_ARCH)),)
+# SWX11_GLU_CONFIGS := debian-swx11+glu-$(DEB_BUILD_ARCH)
+#else
+# SWX11_GLU_CONFIGS := debian-swx11+glu-any
+#endif
# same for static builds
-ifneq ($(wildcard configs/debian-swx11+glu-static-$(DEB_BUILD_ARCH)),)
- SWX11_GLU_CONFIGS += debian-swx11+glu-static-$(DEB_BUILD_ARCH)
-else
- SWX11_GLU_CONFIGS += debian-swx11+glu-static-any
-endif
+#ifneq ($(wildcard configs/debian-swx11+glu-static-$(DEB_BUILD_ARCH)),)
+# SWX11_GLU_CONFIGS += debian-swx11+glu-static-$(DEB_BUILD_ARCH)
+#else
+# SWX11_GLU_CONFIGS += debian-swx11+glu-static-any
+#endif
+
+SWX11_GLU_CONFIGS := swx11+glu swx11+glu-static
# and for the GLX/DRI-enabled libGL
ifneq ($(wildcard configs/debian-indirect-$(DEB_BUILD_ARCH)),)
@@ -36,7 +38,7 @@ endif
## CPU-optimized configurations ##############################################
ifeq ($(DEB_BUILD_ARCH), i386)
- SWX11_GLU_CONFIGS += debian-swx11+glu-i386-i686
+ SWX11_GLU_CONFIGS += swx11+glu-i386-i686
# DRI_CONFIGS += debian-dri-i386-i686
endif
commit 9d72de1fb2cc5c2efc79dfe5f275343307287b4a
Author: Timo Aaltonen <tjaalton@pris.hut.fi>
Date: Thu Jul 3 00:20:58 2008 +0300
Run autoreconf before building the various flavours.
diff --git a/debian/changelog b/debian/changelog
index 317b85b..2714139 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,9 @@ mesa (7.1~rc1-1) UNRELEASED; urgency=low
* Add gl.pc to libgl1-mesa-dev
* rules: Replace the old build system with the new autotools-based
system.
+ * Run autoreconf before building the various flavours..
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Wed, 02 Jul 2008 17:55:03 +0300
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Thu, 03 Jul 2008 00:20:15 +0300
mesa (7.0.3-4) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index ae0f744..96513e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,6 +75,9 @@ confflags-osmesa32-static = --with-osmesa-bits=32 \
--enable-static \
--with-demos=
+autoreconf:
+ autoreconf -vfi
+
# list the configurations that will built
configs:
@echo Building the following configurations: $(CONFIGS)
@@ -85,7 +88,7 @@ $(STAMP_DIR):
$(QUILT_STAMPFN): $(STAMP_DIR)
-build: patch $(BUILD_STAMPS)
+build: patch autoreconf $(BUILD_STAMPS)
$(STAMP)-build-%:
dh_testdir
Reply to: