debian/changelog | 24 ++++++++++++++++++------
debian/patches/12_fix_glapi_gen.diff | 19 +++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 5 ++---
4 files changed, 40 insertions(+), 9 deletions(-)
New commits:
commit 37e6cdbf1d53a02a739b92f738cc733a750577e6
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Tue Aug 20 19:03:04 2013 +0200
add some release notes
diff --git a/debian/changelog b/debian/changelog
index 55ea784..ee83faf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mesa (9.2~rc1-1ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from debian-experimental, remaining changes:
+ - Add support for aarch64.
+ - Build libgallium and libmesagallium shared.
+ - Enable mir support.
+
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Tue, 20 Aug 2013
18:51:03 +0200
+
mesa (9.2~rc1-1) experimental; urgency=low
* New upstream release.
commit 36a094ced0b3883c388b2f7425fc90479101eb06
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Tue Aug 20 17:27:40 2013 +0200
fixup packaging, release to experimental
diff --git a/debian/changelog b/debian/changelog
index e9eca9a..706ea50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,16 @@
-mesa (9.2~rc1-1) UNRELEASED; urgency=low
+mesa (9.2~rc1-1) experimental; urgency=low
- * Initial merge to 9.2 branch.
- * Refresh 06_kfreebsd-ftbfs.diff 06_kfreebsd-ftbfs.diff.
+ * New upstream release.
+ * Refresh patches for 9.2:
+ - 02_gbm_no_undefined.diff.
+ - 04_osmesa_version.diff
+ - 06_kfreebsd-ftbfs.diff
+ * Removed writes to srcdir, fixing parallel builds.
+ - 12_fix_glapi_gen.diff
* Require llvm-3.3-dev >= 1:3.3-4 and libelf-dev.
- * Refresh 02_gbm_no_undefined.diff.
- * libllvmradeon is always built statically now.
* Update symbols files.
- -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Wed, 14 Aug 2013
13:03:27 +0200
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Tue, 20 Aug 2013
15:42:31 +0200
mesa (9.1.6-2) unstable; urgency=low
diff --git a/debian/patches/12_fix_glapi_gen.diff
b/debian/patches/12_fix_glapi_gen.diff
new file mode 100644
index 0000000..2b183af
--- /dev/null
+++ b/debian/patches/12_fix_glapi_gen.diff
@@ -0,0 +1,19 @@
+diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
+index 9720059..d4fbd35 100644
+--- a/src/mapi/glapi/gen/Makefile.am
++++ b/src/mapi/glapi/gen/Makefile.am
+@@ -18,10 +18,10 @@ XORG_INDENT_FLAGS = -linux -bad -bap -blf -bli0 -cbi0 -cdw
-nce -cs -i4 -lc80 -p
+ -T _XFUNCPROTOBEGIN -T _XFUNCPROTOEND -T _X_EXPORT
+
+
+-MESA_DIR = $(top_srcdir)/src/mesa
+-MESA_GLAPI_DIR = $(top_srcdir)/src/mapi/glapi
+-MESA_MAPI_DIR = $(top_srcdir)/src/mapi
+-MESA_GLX_DIR = $(top_srcdir)/src/glx
++MESA_DIR = $(top_builddir)/src/mesa
++MESA_GLAPI_DIR = $(top_builddir)/src/mapi/glapi
++MESA_MAPI_DIR = $(top_builddir)/src/mapi
++MESA_GLX_DIR = $(top_builddir)/src/glx
+
+ MESA_GLAPI_OUTPUTS = \
+ $(MESA_GLAPI_DIR)/glapi_mapi_tmp.h \
diff --git a/debian/patches/series b/debian/patches/series
index f20129c..8a4d2c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
06_kfreebsd-ftbfs.diff
08-kfreebsd-gallium.diff
#11-hurd-ftbfs-again.diff
+12_fix_glapi_gen.diff
diff --git a/debian/rules b/debian/rules
index c0240b9..11267ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter
parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
endif
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -172,8 +173,6 @@ $(STAMP)-build-%: configure
dh_testdir
mkdir -p $(DEB_BUILD_DIR)/$*
- find $(CURDIR)/* -maxdepth 0 -not -path '$(DEB_BUILD_DIR)*' | \
- xargs cp -rlf -t $(DEB_BUILD_DIR)/$*
cd $(DEB_BUILD_DIR)/$* && \
../../configure --prefix=/usr --mandir=\$${prefix}/share/man \
@@ -182,7 +181,7 @@ $(STAMP)-build-%: configure
--localstatedir=/var --disable-silent-rules \
$(confflags) $(confflags-$*) \
ac_cv_path_LLVM_CONFIG=llvm-config-3.3
- cd $(DEB_BUILD_DIR)/$* && $(MAKE) $(if $(NUMJOBS),-j$(NUMJOBS))
+ cd $(DEB_BUILD_DIR)/$* && $(MAKE)
>$@
install: build
--
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/e1vbpkr-0002ir...@vasks.debian.org
