debian/changelog | 10 ++++
debian/libgl1-mesa-dev.install | 1
debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch | 12 ++---
debian/patches/03_optional-progs-and-install.patch | 2
debian/patches/05_hurd-ftbfs.diff | 41 +------------------
debian/patches/06_kfreebsd-ftbfs.diff | 9 ++--
6 files changed, 27 insertions(+), 48 deletions(-)
New commits:
commit 4bcb9cc14f1133b9ff6225de8d340d34b9aa5642
Author: Julien Cristau <jcris...@debian.org>
Date: Sun May 31 13:15:00 2009 +0200
Update patches
+ 02_use-ieee-fp-on-s390-and-m68k.patch moved from imports.h to compiler.h
+ 03_optional-progs-and-install.patch refreshed
+ 05_hurd-ftbfs.diff partly applied upstream
+ 06_kfreebsd-ftbfs.diff refreshed
diff --git a/debian/changelog b/debian/changelog
index 68266f3..9fb8943 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,13 @@ mesa (7.5~rc2-1) UNRELEASED; urgency=low
* New upstream release candidate.
* rules: Disable EGL.
+ [ Julien Cristau ]
+ * Update patches:
+ + 02_use-ieee-fp-on-s390-and-m68k.patch moved from imports.h to compiler.h
+ + 03_optional-progs-and-install.patch refreshed
+ + 05_hurd-ftbfs.diff partly applied upstream
+ + 06_kfreebsd-ftbfs.diff refreshed
+
-- Timo Aaltonen <tjaal...@ubuntu.com> Mon, 18 May 2009 15:12:17 +0300
mesa (7.4.1-1) unstable; urgency=low
diff --git a/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
b/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
index 6d12fff..445dc7e 100644
--- a/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
+++ b/debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch
@@ -2,13 +2,13 @@ Patch that fixes Debian bug #349437.
This patch by David Nusinow.
-Index: mesa/src/mesa/main/imports.h
+Index: mesa/src/mesa/main/compiler.h
===================================================================
---- mesa.orig/src/mesa/main/imports.h 2008-07-01 15:26:57.000000000 +0300
-+++ mesa/src/mesa/main/imports.h 2008-07-01 15:45:49.000000000 +0300
-@@ -158,8 +158,9 @@
- *** USE_IEEE: Determine if we're using IEEE floating point
- ***/
+--- mesa.orig/src/mesa/main/compiler.h
++++ mesa/src/mesa/main/compiler.h
+@@ -345,8 +345,9 @@
+ * USE_IEEE: Determine if we're using IEEE floating point
+ */
#if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
- defined(__s390x__) || defined(__powerpc__) || \
+ defined(__s390__) || defined(__s390x__) || defined(__powerpc__) || \
diff --git a/debian/patches/03_optional-progs-and-install.patch
b/debian/patches/03_optional-progs-and-install.patch
index 6eac84a..7e0d365 100644
--- a/debian/patches/03_optional-progs-and-install.patch
+++ b/debian/patches/03_optional-progs-and-install.patch
@@ -23,7 +23,7 @@ Index: mesa/progs/xdemos/Makefile
corender \
glsync \
glthreads \
-@@ -61,6 +61,11 @@
+@@ -62,6 +62,11 @@
extra: $(EXTRA_PROGS)
diff --git a/debian/patches/05_hurd-ftbfs.diff
b/debian/patches/05_hurd-ftbfs.diff
index 7037a1d..c6aab53 100644
--- a/debian/patches/05_hurd-ftbfs.diff
+++ b/debian/patches/05_hurd-ftbfs.diff
@@ -13,38 +13,16 @@ Index: mesa/src/glx/x11/dri2.c
#define NEED_REPLIES
#include <X11/Xlibint.h>
-@@ -299,3 +300,4 @@
+@@ -369,3 +370,4 @@
UnlockDisplay(dpy);
SyncHandle();
}
+#endif
-Index: mesa/include/GL/internal/dri_interface.h
-===================================================================
---- mesa.orig/include/GL/internal/dri_interface.h
-+++ mesa/include/GL/internal/dri_interface.h
-@@ -41,7 +41,7 @@
- #define DRI_INTERFACE_H
-
- /* For archs with no drm.h */
--#if !defined(__APPLE__) && !defined(__CYGWIN__)
-+#if !defined(__APPLE__) && !defined(__CYGWIN__) && !defined(__GNU__)
- #include <drm.h>
- #else
- typedef unsigned int drm_context_t;
Index: mesa/configure.ac
===================================================================
--- mesa.orig/configure.ac
+++ mesa/configure.ac
-@@ -87,7 +87,7 @@
- DEFINES=""
- AC_SUBST([DEFINES])
- case "$host_os" in
--linux*|*-gnu*)
-+linux*|*-gnu*|gnu*)
- DEFINES="$DEFINES -D_GNU_SOURCE -DPTHREADS"
- ;;
- solaris*)
-@@ -490,6 +490,13 @@
+@@ -526,6 +526,13 @@
enable_xcb=no
fi
@@ -58,7 +36,7 @@ Index: mesa/configure.ac
dnl
dnl libGL configuration per driver
dnl
-@@ -523,11 +530,13 @@
+@@ -559,11 +566,13 @@
AC_MSG_ERROR([Can't use static libraries for DRI drivers])
fi
@@ -77,7 +55,7 @@ Index: mesa/configure.ac
# find the DRI deps for libGL
if test "$x11_pkgconfig" = yes; then
-@@ -594,12 +603,6 @@
+@@ -630,12 +639,6 @@
[DRI_DRIVER_INSTALL_DIR="$withval"],
[DRI_DRIVER_INSTALL_DIR='${libdir}/dri'])
AC_SUBST([DRI_DRIVER_INSTALL_DIR])
@@ -90,14 +68,3 @@ Index: mesa/configure.ac
dnl Which drivers to build - default is chosen by platform
AC_ARG_WITH([dri-drivers],
[AS_HELP_STRING([--with-dri-drivers@<:@=DIRS...@:>@],
-@@ -698,6 +701,10 @@
- unichrome savage sis swrast"
- fi
- ;;
-+ gnu*)
-+ DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
-+ DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS"
-+ ;;
- solaris*)
- DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
- DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"
diff --git a/debian/patches/06_kfreebsd-ftbfs.diff
b/debian/patches/06_kfreebsd-ftbfs.diff
index ee78b28..a4a593e 100644
--- a/debian/patches/06_kfreebsd-ftbfs.diff
+++ b/debian/patches/06_kfreebsd-ftbfs.diff
@@ -4,9 +4,11 @@ mesa fails to build on GNU/kFreeBSD, since some parts are not
enabled.
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524690
---- mesa-7.4.orig/configure.ac
-+++ mesa-7.4/configure.ac
-@@ -680,7 +680,7 @@
+Index: mesa/configure.ac
+===================================================================
+--- mesa.orig/configure.ac
++++ mesa/configure.ac
+@@ -719,7 +719,7 @@
;;
esac
;;
@@ -14,3 +16,4 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524690
+ freebsd* | dragonfly* | kfreebsd*-gnu*)
DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
+ DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"
commit 537f3e7a1ef969b191f3d751f17563ab620d3676
Author: Julien Cristau <jcris...@debian.org>
Date: Sun May 31 12:52:47 2009 +0200
Install dri.pc, which will be needed to build xorg-server 1.7.
diff --git a/debian/changelog b/debian/changelog
index 7863ac1..68266f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mesa (7.5~rc2-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Don't build hardware dri drivers on s390.
+ * Install dri.pc, which will be needed to build xorg-server 1.7.
[ Brice Goglin ]
* Enable motif in GLw, closes: #527483.
diff --git a/debian/libgl1-mesa-dev.install b/debian/libgl1-mesa-dev.install
index dac5ebd..456c089 100644
--- a/debian/libgl1-mesa-dev.install
+++ b/debian/libgl1-mesa-dev.install
@@ -1,2 +1,3 @@
usr/lib/libGL.so
usr/lib/pkgconfig/gl.pc
+usr/lib/glx/pkgconfig/dri.pc usr/lib/pkgconfig/
commit 2096234053c45a91afdfb85fb80667a5eccaec48
Author: Julien Cristau <jcris...@debian.org>
Date: Sat May 30 21:08:54 2009 +0200
clarify changelog: this is only a release candidate
diff --git a/debian/changelog b/debian/changelog
index fd1f17f..7863ac1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ mesa (7.5~rc2-1) UNRELEASED; urgency=low
* Enable motif in GLw, closes: #527483.
[ Timo Aaltonen ]
- * New upstream release.
+ * New upstream release candidate.
* rules: Disable EGL.
-- Timo Aaltonen <tjaal...@ubuntu.com> Mon, 18 May 2009 15:12:17 +0300
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
