diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/03_optional-progs-and-install.patch | 12 | ||||
| -rw-r--r-- | debian/patches/04_osmesa_version.diff | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/debian/patches/03_optional-progs-and-install.patch b/debian/patches/03_optional-progs-and-install.patch index 211c7a9fb7e..6eac84ae2ba 100644 --- a/debian/patches/03_optional-progs-and-install.patch +++ b/debian/patches/03_optional-progs-and-install.patch @@ -12,8 +12,8 @@ and we don't actually build it at this point. 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 +--- mesa.orig/progs/xdemos/Makefile ++++ mesa/progs/xdemos/Makefile @@ -10,7 +10,7 @@ LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS) @@ -21,9 +21,9 @@ Index: mesa/progs/xdemos/Makefile -PROGS = \ +PROGS ?= \ corender \ + glsync \ glthreads \ - glxdemo \ -@@ -60,6 +60,11 @@ +@@ -61,6 +61,11 @@ extra: $(EXTRA_PROGS) @@ -37,8 +37,8 @@ Index: mesa/progs/xdemos/Makefile -rm -f *.o *~ 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 +--- mesa.orig/progs/Makefile ++++ mesa/progs/Makefile @@ -21,8 +21,12 @@ fi \ done diff --git a/debian/patches/04_osmesa_version.diff b/debian/patches/04_osmesa_version.diff index 573439702cd..108916c675c 100644 --- a/debian/patches/04_osmesa_version.diff +++ b/debian/patches/04_osmesa_version.diff @@ -1,17 +1,17 @@ Index: mesa/src/mesa/drivers/osmesa/Makefile =================================================================== ---- mesa.orig/src/mesa/drivers/osmesa/Makefile 2008-09-12 10:44:02.000000000 +0300 -+++ mesa/src/mesa/drivers/osmesa/Makefile 2008-09-23 16:07:40.000000000 +0300 -@@ -46,7 +46,7 @@ +--- mesa.orig/src/mesa/drivers/osmesa/Makefile ++++ mesa/src/mesa/drivers/osmesa/Makefile +@@ -45,7 +45,7 @@ - $(TOP)/lib/$(OSMESA_LIB_NAME): $(OBJECTS) + $(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) -@@ -58,7 +58,7 @@ +@@ -57,7 +57,7 @@ # with all the other Mesa sources (compiled with -DCHAN_BITS=16/32 osmesa16: $(OBJECTS) $(CORE_MESA) $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ |