diff options
| author | Julien Cristau <[email protected]> | 2009-06-24 12:37:17 +0200 |
|---|---|---|
| committer | Julien Cristau <[email protected]> | 2009-06-24 12:37:17 +0200 |
| commit | ec4c889266934372b158bf54cddb8ea99c82ad8b (patch) | |
| tree | eb493b436b5beccb8ee6479f1f34be9121da4bd3 | |
| parent | c84a384fdfdbaae61d91f9ba632b1df391dc28af (diff) | |
Update 04_osmesa_version.diff, refresh 06_kfreebsd-ftbfs.diff.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/04_osmesa_version.diff | 15 | ||||
| -rw-r--r-- | debian/patches/06_kfreebsd-ftbfs.diff | 9 |
3 files changed, 10 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog index 862d9a3a9af..763ac1e90ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ mesa (7.4.4-1) UNRELEASED; urgency=low * New upstream release. + fixes a crash in swrast glXWaitX (closes: #528708) * Don't build hardware dri drivers on s390. + * Update 04_osmesa_version.diff, refresh 06_kfreebsd-ftbfs.diff. [ Brice Goglin ] * Enable motif in GLw, closes: #527483. diff --git a/debian/patches/04_osmesa_version.diff b/debian/patches/04_osmesa_version.diff index 108916c675c..68c3db0a3e4 100644 --- a/debian/patches/04_osmesa_version.diff +++ b/debian/patches/04_osmesa_version.diff @@ -2,18 +2,9 @@ Index: mesa/src/mesa/drivers/osmesa/Makefile =================================================================== --- mesa.orig/src/mesa/drivers/osmesa/Makefile +++ mesa/src/mesa/drivers/osmesa/Makefile -@@ -45,7 +45,7 @@ - - $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) - $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -- -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ -+ -major 6 -minor 5 -patch 3 \ - -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ - -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \ - $(OSMESA_LIB_DEPS) $(OBJECTS) -@@ -57,7 +57,7 @@ - # with all the other Mesa sources (compiled with -DCHAN_BITS=16/32 - osmesa16: $(OBJECTS) $(CORE_MESA) +@@ -39,7 +39,7 @@ + # -DCHAN_BITS=16/32. + $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(CORE_MESA) $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ - -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ + -major 6 -minor 5 -patch 3 \ diff --git a/debian/patches/06_kfreebsd-ftbfs.diff b/debian/patches/06_kfreebsd-ftbfs.diff index ee78b28ab2a..104967a7c7d 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 +@@ -683,7 +683,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" |