This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus-video-z64.
commit 9a348ed3902f60aa1b3855c5e4bb9127f0f22f1e Author: Sven Eckelmann <[email protected]> Date: Sun Aug 28 20:03:46 2011 +0200 Rebase patches against 1.99.5~hg20110828 --- debian/changelog | 3 + debian/patches/printf_fixup.patch | 20 +-- debian/patches/rewrite_makefile.patch | 261 ---------------------------------- debian/patches/series | 1 - 4 files changed, 13 insertions(+), 272 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8e6e93b..41c206f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ mupen64plus-video-z64 (1.99.5~hg20110828-1) UNRELEASED; urgency=low * debian/control: - Add virtual package libsdl-dev as alternative build dependency * Don't mix implicit and explicit rules to prevent FTBFS with make 3.82 + * debian/patches: + - Remove upstream merged patch rewrite_makefile.patch + - Rebase printf_fixup.patch against 1.99.5~hg20110828 -- Sven Eckelmann <[email protected]> Sun, 28 Aug 2011 19:01:20 +0200 diff --git a/debian/patches/printf_fixup.patch b/debian/patches/printf_fixup.patch index e5f7164..98d4ed3 100644 --- a/debian/patches/printf_fixup.patch +++ b/debian/patches/printf_fixup.patch @@ -6,10 +6,10 @@ Author: Sven Eckelmann <[email protected]> --- diff --git a/src/rdp.cpp b/src/rdp.cpp -index 2221f5e3d300ac70c1cf23fd531bb624c0742b70..e1abe35a3cbe2808fea71b2e6b81563a05468fe3 100644 +index a986e6cb0da48bf68df0d0e6c3875d718f2793f7..673522b78e4f0e9089e851ccff7d19c484edcb6b 100644 --- a/src/rdp.cpp +++ b/src/rdp.cpp -@@ -453,7 +453,7 @@ static void rdp_load_block(uint32_t w1, uint32_t w2) +@@ -456,7 +456,7 @@ static void rdp_load_block(uint32_t w1, uint32_t w2) tl * rdpTiWidth*4 + rdpTiAddress + sl*4, 0, ~0, ~0); if (tb+width/4 > 0x1000/4) { @@ -19,10 +19,10 @@ index 2221f5e3d300ac70c1cf23fd531bb624c0742b70..e1abe35a3cbe2808fea71b2e6b81563a } diff --git a/src/rdp.h b/src/rdp.h -index e663107a2cfe1c9c6cf2247b8b97a97711aa33a4..f06d4df353a9a36cf78896e3f07706af8f0470b6 100644 +index bbad3fd0ae694ed9c39bebd0fee890007c042500..6d21b1e77b4815671ec609d51bfb030f92f40b9f 100644 --- a/src/rdp.h +++ b/src/rdp.h -@@ -246,7 +246,7 @@ int rdp_dasm(uint32_t * rdp_cmd_data, int rdp_cmd_cur, int length, char *buffer) +@@ -247,7 +247,7 @@ int rdp_dasm(uint32_t * rdp_cmd_data, int rdp_cmd_cur, int length, char *buffer) void rdp_process_list(void); int rdp_store_list(void); @@ -31,7 +31,7 @@ index e663107a2cfe1c9c6cf2247b8b97a97711aa33a4..f06d4df353a9a36cf78896e3f07706af #ifdef RDP_DEBUG -@@ -257,6 +257,7 @@ extern int rdp_dump; +@@ -258,6 +258,7 @@ extern int rdp_dump; #define DUMP if (!rdp_dump) ; else LOG @@ -71,10 +71,10 @@ index 3150a5feb8ef12dfde4b672a8234196cba3cb501..275bba1c2fe8d0e9412d9ab3b7bc19dd buffer.area.xh>>2, buffer.area.xl>>2, buffer.area.yh>>2, buffer.area.yl>>2); diff --git a/src/rgl_debugger.cpp b/src/rgl_debugger.cpp -index 9f871a4c2b4255433d5df1e7004ee27e37efeb39..9783a95dbbc6d0056f64a1c386af4dd85f3c2b0d 100644 +index 3a55ea260bbaf8e1b4d9d586417ddc81c5d2148e..0be955f0572cf6726e0a451ea1edec329c388dc6 100644 --- a/src/rgl_debugger.cpp +++ b/src/rgl_debugger.cpp -@@ -183,8 +183,8 @@ void gglPrint(int x, int y, const char * text) +@@ -174,8 +174,8 @@ void gglPrint(int x, int y, const char * text) //printf("%s\n", text); } @@ -86,10 +86,10 @@ index 9f871a4c2b4255433d5df1e7004ee27e37efeb39..9783a95dbbc6d0056f64a1c386af4dd8 char buf[1024]; va_list ap; diff --git a/src/rgl_rendermode.cpp b/src/rgl_rendermode.cpp -index 0c9bf4eeb0c1d46d6781fbcc01f6376262cc187b..2b69d93404e877215821eb043faca7e699069e08 100644 +index 651c12770a666b28dbec64ec7318161db82ee15c..e1a33327b7df002984152478fbc71caac7172f12 100644 --- a/src/rgl_rendermode.cpp +++ b/src/rgl_rendermode.cpp -@@ -610,7 +610,7 @@ case 0: // c +@@ -604,7 +604,7 @@ case 0: // c break; case 1: // f LOGERROR("Unsupported src color : FRAG\n"); @@ -98,7 +98,7 @@ index 0c9bf4eeb0c1d46d6781fbcc01f6376262cc187b..2b69d93404e877215821eb043faca7e6 break; case 2: // b p += sprintf( -@@ -647,7 +647,7 @@ case 3: +@@ -641,7 +641,7 @@ case 3: c->dstBlend = dst; } else { LOGERROR("Unsuported blender :\n"); diff --git a/debian/patches/rewrite_makefile.patch b/debian/patches/rewrite_makefile.patch deleted file mode 100644 index ec60942..0000000 --- a/debian/patches/rewrite_makefile.patch +++ /dev/null @@ -1,261 +0,0 @@ -Description: Rewrite Makefile to fix flags and linking -Author: Sven Eckelmann <[email protected]> - ---- -diff --git a/projects/unix/Makefile b/projects/unix/Makefile -index 983c2655158bb4dfb954a97f7992bb09ae34d140..b131376885f686b4ddd90d93b0cfacdb9c46def5 100644 ---- a/projects/unix/Makefile -+++ b/projects/unix/Makefile -@@ -50,6 +50,12 @@ ifeq ("$(UNAME)","FreeBSD") - SO_EXTENSION = so - SHARED = -shared - endif -+ifeq ("$(UNAME)","OpenBSD") -+ OS = FREEBSD -+ SO_EXTENSION = so -+ SHARED = -shared -+ $(warning OS type "$(UNAME)" not officially supported.') -+endif - ifneq ("$(filter GNU/kFreeBSD kfreebsd,$(UNAME))","") - OS = LINUX - SO_EXTENSION = so -@@ -89,73 +95,86 @@ ifeq ("$(CPU)","NONE") - $(error CPU type "$(HOST_CPU)" not supported. Please file bug report at 'http://code.google.com/p/mupen64plus/issues') - endif - --# base CFLAGS, LIBS, and LDFLAGS --CFLAGS += -Wall -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -fvisibility=hidden -I../../src -+# base CFLAGS, LDLIBS, and LDFLAGS -+OPTFLAGS ?= -O3 -+CFLAGS += $(OPTFLAGS) -Wall -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src - CXXFLAGS += -fvisibility-inlines-hidden --LDFLAGS += -ldl -lGLEW -+LDFLAGS += $(SHARED) - - # Since we are building a shared library, we must compile with -fPIC for x86_64 CPUs. - # On 32-bit systems we do not want to use -fPIC because we don't have to and it has a big performance penalty on this arch - ifeq ($(ARCH_DETECTED), 64BITS) -- CFLAGS += -fpic -DPIC -+ PIC ?= 1 - endif -+ifeq ($(PIC), 1) -+ CFLAGS += -fPIC -+ LDFLAGS += -fPIC -+endif -+ - # tweak flags for 32-bit build on 64-bit system - ifeq ($(ARCH_DETECTED), 64BITS_32) - ifeq ($(OS), FREEBSD) - $(error Do not use the BITS=32 option with FreeBSD, use -m32 and -m elf_i386) - endif - CFLAGS += -m32 -- LDFLAGS += -m32 -m elf_i386 -+ LDFLAGS += -m32 -Wl,-m,elf_i386 - endif - - # set special flags per-system --ifeq ($(OS),FREEBSD) -- LDFLAGS += -lGL --endif - ifeq ($(OS), LINUX) -- LDFLAGS += -lGL - # only export api symbols - LDFLAGS += -Wl,-version-script,$(SRCDIR)/video_api_export.ver -- ifeq ($(CPU), X86) -- ifeq ($(ARCH_DETECTED), 64BITS) -- CFLAGS += -pipe -O3 -march=athlon64 -- else -- CFLAGS += -pipe -O3 -mmmx -msse -march=i686 -mtune=pentium-m -fomit-frame-pointer -- endif -- endif - endif - ifeq ($(OS), OSX) - ifeq ($(CPU), X86) - ifeq ($(ARCH_DETECTED), 64BITS) - CFLAGS += -pipe -O3 -arch x86_64 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk - LDFLAGS += -bundle -framework OpenGL -arch x86_64 -+ LDLIBS += -ldl - else - CFLAGS += -pipe -O3 -mmmx -msse -fomit-frame-pointer -arch i686 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk - LDFLAGS += -bundle -framework OpenGL -arch i686 -+ LDLIBS += -ldl - endif - endif - endif --ifeq ($(CPU), PPC) -- CFLAGS += -mcpu=powerpc -+ifeq ($(OS), LINUX) -+ LDLIBS += -ldl - endif -+ifeq ($(OS), FREEBSD) -+ LDLIBS += -lc -+endif -+ -+# test for essential build dependencies -+ifeq ($(shell which pkg-config 2>/dev/null),) -+ $(error pkg-config not found) -+endif -+ifeq ($(shell pkg-config --modversion gl 2>/dev/null),) -+ $(error No OpenGL development libraries found!) -+endif -+ifeq ($(shell pkg-config --modversion glew 2>/dev/null),) -+ $(error No GLEW development libraries found!) -+endif -+CFLAGS += $(shell pkg-config --cflags gl glew) -+LDLIBS += $(shell pkg-config --libs gl glew) - - # test for presence of SDL - ifeq ($(shell which sdl-config 2>/dev/null),) - $(error No SDL development libraries found!) - endif - ifeq ($(OS),FREEBSD) -- CFLAGS += `${SDL_CONFIG} --cflags` -- LDFLAGS += `${SDL_CONFIG} --libs` -+ CFLAGS += $(shell sdl-config --cflags) -+ LDLIBS += $(shell sdl-config --libs) - endif - ifeq ($(OS),OSX) -- CFLAGS += $(shell sdl-config --cflags) -DPIC -+ CFLAGS += $(shell sdl-config --cflags) - # sdl-config on mac screws up when we're trying to build a library and not an executable - # SDL 1.3 is supposed to fix that, if it's ever released -- LDFLAGS += -L/usr/local/lib -lSDL -Wl,-framework,Cocoa -+ LDLIBS += -L/usr/local/lib -lSDL -Wl,-framework,Cocoa - endif - ifeq ($(OS),LINUX) - CFLAGS += $(shell sdl-config --cflags) -- LDFLAGS += $(shell sdl-config --libs) -+ LDLIBS += $(shell sdl-config --libs) - endif - - # set mupen64plus core API header path -@@ -180,20 +199,31 @@ else - endif - endif - --# set shell function names --CC ?= gcc --CXX ?= g++ --INSTALL ?= install --ifeq ($(OS),OSX) -- STRIP ?= strip -x --else -- STRIP ?= strip -s -+# reduced compile output when running make without V=1 -+ifneq ($(findstring $(MAKEFLAGS),s),s) -+ifndef V -+ Q_CC = @echo ' CC '$@; -+ Q_CXX = @echo ' CXX '$@; -+ Q_LD = @echo ' LD '$@; - endif -+endif -+ -+# set base program pointers and flags -+CC ?= gcc -+CXX ?= g++ -+RM ?= rm -f -+INSTALL ?= install -+MKDIR ?= mkdir -p -+COMPILE.c = $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -+COMPILE.cc = $(Q_CXX)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -+LINK.o = $(Q_LD)$(CXX) $(LDFLAGS) $(TARGET_ARCH) - - # set special flags for given Makefile parameters - ifeq ($(DEBUG),1) - CFLAGS += -g -- STRIP = true # disable binary strip -+ INSTALL_STRIP_FLAG ?= -+else -+ INSTALL_STRIP_FLAG ?= -s - endif - - # set installation options -@@ -204,7 +234,10 @@ ifeq ($(SHAREDIR),) - SHAREDIR := $(PREFIX)/share/mupen64plus - endif - ifeq ($(LIBDIR),) -- LIBDIR := $(PREFIX)/lib/mupen64plus -+ LIBDIR := $(PREFIX)/lib -+endif -+ifeq ($(PLUGINDIR),) -+ PLUGINDIR := $(LIBDIR)/mupen64plus - endif - - SRCDIR = ../../src -@@ -229,7 +262,7 @@ SOURCE = \ - OBJECTS := $(patsubst $(SRCDIR)/%.c, $(OBJDIR)/%.o, $(filter %.c, $(SOURCE))) - OBJECTS += $(patsubst $(SRCDIR)/%.cpp, $(OBJDIR)/%.o, $(filter %.cpp, $(SOURCE))) - OBJDIRS = $(dir $(OBJECTS)) --$(shell mkdir -p $(OBJDIRS)) -+$(shell $(MKDIR) $(OBJDIRS)) - - # build targets - TARGET = mupen64plus-video-z64.$(SO_EXTENSION) -@@ -245,10 +278,13 @@ targets: - @echo " Options:" - @echo " BITS=32 == build 32-bit binaries on 64-bit machine" - @echo " APIDIR=path == path to find Mupen64Plus Core headers" -+ @echo " OPTFLAGS=flag == compiler optimization (default: -O3)" -+ @echo " PIC=(1|0) == Force enable/disable of position independent code" - @echo " Install Options:" - @echo " PREFIX=path == install/uninstall prefix (default: /usr/local)" - @echo " SHAREDIR=path == path to install shared data files (default: PREFIX/share/mupen64plus)" -- @echo " LIBDIR=path == path to install plugin libraries (default: PREFIX/lib/mupen64plus)" -+ @echo " LIBDIR=path == library prefix (default: PREFIX/lib)" -+ @echo " PLUGINDIR=path == path to install plugin libraries (default: LIBDIR/mupen64plus)" - @echo " DESTDIR=path == path to prepend to all installation paths (only for packagers)" - @echo " Debugging Options:" - @echo " DEBUG=1 == add debugging symbols" -@@ -257,16 +293,15 @@ targets: - all: $(TARGET) - - install: $(TARGET) -- $(INSTALL) -d -v "$(DESTDIR)$(LIBDIR)" -- $(INSTALL) -m 0644 $(TARGET) "$(DESTDIR)$(LIBDIR)" -- $(INSTALL) -d -v "$(DESTDIR)$(SHAREDIR)" -+ $(INSTALL) -d "$(DESTDIR)$(PLUGINDIR)" -+ $(INSTALL) -m 0644 $(TARGET) $(INSTALL_STRIP_FLAG) "$(DESTDIR)$(PLUGINDIR)" -+ $(INSTALL) -d "$(DESTDIR)$(SHAREDIR)" - - uninstall: -- rm -f "$(DESTDIR)$(LIBDIR)/$(TARGET)" -+ $(RM) "$(DESTDIR)$(PLUGINDIR)/$(TARGET)" - - clean: -- rm -rf ./_obj/* $(TARGET) -- rmdir ./_obj -+ $(RM) -r ./_obj $(TARGET) - - rebuild: clean all - -@@ -276,22 +311,14 @@ CFLAGS += -MD - - CXXFLAGS += $(CFLAGS) - --# reduced compile output when running make without V=1 --ifneq ($(findstring $(MAKEFLAGS),s),s) --ifndef V -- Q_CC = @echo ' CC '$@; -- Q_CXX = @echo ' CXX '$@; -- Q_LD = @echo ' LD '$@; --endif --endif -- --# build rules --$(TARGET): $(OBJECTS) -- $(Q_LD)$(CXX) $(SHARED) $^ $(LDFLAGS) -o $@ -- $(STRIP) $@ -- -+# standard build rules - $(OBJDIR)/%.o: $(SRCDIR)/%.c -- $(Q_CC)$(CC) -o $@ $(CFLAGS) -c $< -+ $(COMPILE.c) -o $@ $< - - $(OBJDIR)/%.o: $(SRCDIR)/%.cpp -- $(Q_CXX)$(CXX) -o $@ $(CXXFLAGS) -c $< -+ $(COMPILE.cc) -o $@ $< -+ -+$(TARGET): $(OBJECTS) -+ $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@ -+ -+.PHONY: all clean install uninstall targets diff --git a/debian/patches/series b/debian/patches/series index bc3dfe7..5a5a78d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -rewrite_makefile.patch printf_fixup.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-z64.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
