diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/00_create-libdir.patch | 17 | ||||
| -rw-r--r-- | debian/patches/01_fix-makefile.patch | 18 | ||||
| -rw-r--r-- | debian/patches/02_use-ieee-fp-on-s390-and-m68k.patch | 6 | ||||
| -rw-r--r-- | debian/patches/03_optional-progs-and-install.patch | 18 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
6 files changed, 20 insertions, 48 deletions
diff --git a/debian/changelog b/debian/changelog index 7ad50e01ff4..4292ed097bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ mesa (7.1~rc1-1) UNRELEASED; urgency=low + [ Julien Cristau ] * New upstream release candidate. * Build against libdrm >= 2.3.1. - -- Julien Cristau <[email protected]> Tue, 01 Jul 2008 13:42:31 +0200 + [ Timo Aaltonen ] + * Refresh patches, and drop obsolete 00_create-libdir.patch and + 01_fix-makefile.patch. + + -- Timo Aaltonen <[email protected]> Tue, 01 Jul 2008 16:05:21 +0300 mesa (7.0.3-4) unstable; urgency=low diff --git a/debian/patches/00_create-libdir.patch b/debian/patches/00_create-libdir.patch deleted file mode 100644 index cc59325ac74..00000000000 --- a/debian/patches/00_create-libdir.patch +++ /dev/null @@ -1,17 +0,0 @@ -Patch that allows the Mesa makefile to create a LIB_DIR that is more than one -level below TOP. - -This patch by Thierry Reding. -Not submitted to Mesa. - ---- a/src/Makefile -+++ b/src/Makefile -@@ -29,7 +29,7 @@ - done - - $(TOP)/$(LIB_DIR): -- -mkdir $(TOP)/$(LIB_DIR) -+ mkdir -p $(TOP)/$(LIB_DIR) - - - clean: diff --git a/debian/patches/01_fix-makefile.patch b/debian/patches/01_fix-makefile.patch deleted file mode 100644 index 41c1c707df4..00000000000 --- a/debian/patches/01_fix-makefile.patch +++ /dev/null @@ -1,18 +0,0 @@ -Do not build OSMesa for a standalone configuration, since Debian only ships -OSMesa in a separate package. - -This patch by Thierry Reding. - -Index: mesa/src/mesa/Makefile -=================================================================== ---- mesa.orig/src/mesa/Makefile 2007-04-25 01:44:31.000000000 +0200 -+++ mesa/src/mesa/Makefile 2007-04-25 01:44:58.000000000 +0200 -@@ -105,7 +105,7 @@ - $(OSMESA_DRIVER_OBJECTS) - - --stand-alone: depend subdirs $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) -+stand-alone: depend subdirs $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) - - osmesa-only: depend subdirs $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) - 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 8168f29d3ef..6d12ffff625 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 @@ -4,15 +4,15 @@ This patch by David Nusinow. Index: mesa/src/mesa/main/imports.h =================================================================== ---- mesa.orig/src/mesa/main/imports.h 2007-04-25 01:44:31.000000000 +0200 -+++ mesa/src/mesa/main/imports.h 2007-04-25 01:45:04.000000000 +0200 +--- 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 ***/ #if defined(__i386__) || defined(__386__) || defined(__sparc__) || \ - defined(__s390x__) || defined(__powerpc__) || \ + defined(__s390__) || defined(__s390x__) || defined(__powerpc__) || \ - defined(__amd64__) || defined(__x86_64__) || \ + defined(__x86_64__) || \ + defined(__m68k__) || \ defined(ia64) || defined(__ia64__) || \ defined(__hppa__) || defined(hpux) || \ diff --git a/debian/patches/03_optional-progs-and-install.patch b/debian/patches/03_optional-progs-and-install.patch index c00280353ec..211c7a9fb7e 100644 --- a/debian/patches/03_optional-progs-and-install.patch +++ b/debian/patches/03_optional-progs-and-install.patch @@ -10,18 +10,20 @@ Also remove references to GLU library since it is not required and we don't actually build it at this point. ---- mesa.orig/progs/xdemos/Makefile -+++ mesa/progs/xdemos/Makefile +Index: mesa/progs/xdemos/Makefile +=================================================================== +--- mesa.orig/progs/xdemos/Makefile 2008-07-01 15:26:56.000000000 +0300 ++++ mesa/progs/xdemos/Makefile 2008-07-01 15:48:47.000000000 +0300 @@ -10,7 +10,7 @@ LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS) -PROGS = \ +PROGS ?= \ + corender \ glthreads \ glxdemo \ - glxgears \ -@@ -55,6 +55,11 @@ +@@ -60,6 +60,11 @@ extra: $(EXTRA_PROGS) @@ -33,8 +35,10 @@ and we don't actually build it at this point. clean: -rm -f $(PROGS) $(EXTRA_PROGS) -rm -f *.o *~ ---- mesa.orig/progs/Makefile -+++ mesa/progs/Makefile +Index: mesa/progs/Makefile +=================================================================== +--- mesa.orig/progs/Makefile 2008-07-01 15:26:56.000000000 +0300 ++++ mesa/progs/Makefile 2008-07-01 15:48:07.000000000 +0300 @@ -21,8 +21,12 @@ fi \ done @@ -48,4 +52,4 @@ and we don't actually build it at this point. + done clean: - @for dir in $(SUBDIRS) tests ; do \ + -@for dir in $(SUBDIRS) tests ; do \ diff --git a/debian/patches/series b/debian/patches/series index b370d514349..abb18b908ed 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ -00_create-libdir.patch -01_fix-makefile.patch 02_use-ieee-fp-on-s390-and-m68k.patch 03_optional-progs-and-install.patch |