diff options
| author | Julien Cristau <jcristau@debian.org> | 2008-02-23 16:08:53 +0100 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2008-02-23 16:08:53 +0100 |
| commit | ea9c6d3d9e9d27c8ba90c98ca671cff6e333c620 (patch) | |
| tree | 21342a546f7e10e5e7ad75442b707089ffa016d1 | |
| parent | eaac94c35af22606047dd22f8238406134a795c9 (diff) | |
03_optional-progs-and-install.patch: partly applied upstream, fixed up
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/03_optional-progs-and-install.patch | 38 |
2 files changed, 16 insertions, 23 deletions
diff --git a/debian/changelog b/debian/changelog index 34fbf40944..c348a3e994 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mesa (7.0.3~rc2-1) UNRELEASED; urgency=low * New upstream release candidate. + + 03_optional-progs-and-install.patch: partly applied upstream, fixed up * Stop building with -O0 on hppa. Bug #451047 should be fixed in recent gcc versions. diff --git a/debian/patches/03_optional-progs-and-install.patch b/debian/patches/03_optional-progs-and-install.patch index f802a42960..c00280353e 100644 --- a/debian/patches/03_optional-progs-and-install.patch +++ b/debian/patches/03_optional-progs-and-install.patch @@ -10,39 +10,31 @@ Also remove references to GLU library since it is not required and we don't actually build it at this point. -Index: mesa/progs/xdemos/Makefile -=================================================================== ---- mesa.orig/progs/xdemos/Makefile 2007-11-11 00:34:12.000000000 +0100 -+++ mesa/progs/xdemos/Makefile 2007-11-11 02:07:52.000000000 +0100 -@@ -6,11 +6,11 @@ +--- mesa.orig/progs/xdemos/Makefile ++++ mesa/progs/xdemos/Makefile +@@ -10,7 +10,7 @@ - INCDIR = $(TOP)/include + LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS) --LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) -+LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) - --LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) -+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(APP_LIB_DEPS) - --PROGS = glthreads \ -+PROGS ?= glthreads \ +-PROGS = \ ++PROGS ?= \ + glthreads \ glxdemo \ glxgears \ - glxgears_fbconfig \ -@@ -46,6 +46,9 @@ +@@ -55,6 +55,11 @@ + extra: $(EXTRA_PROGS) - default: $(PROGS) +install: $(PROGS) + $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/bin + $(INSTALL) -m 755 $(PROGS) $(DESTDIR)$(INSTALL_DIR)/bin - ++ ++ clean: - -rm -f $(PROGS) -Index: mesa/progs/Makefile -=================================================================== ---- mesa.orig/progs/Makefile 2007-11-11 00:34:12.000000000 +0100 -+++ mesa/progs/Makefile 2007-11-11 02:06:48.000000000 +0100 + -rm -f $(PROGS) $(EXTRA_PROGS) + -rm -f *.o *~ +--- mesa.orig/progs/Makefile ++++ mesa/progs/Makefile @@ -21,8 +21,12 @@ fi \ done |