This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus-video-glide64.
commit c45fdb5d4546c801648cd487a591be98c4320a59 Author: Sven Eckelmann <[email protected]> Date: Sun Aug 28 19:57:45 2011 +0200 Rebase patches against 1.99.5~hg20110828 --- debian/changelog | 4 + debian/patches/default_settings.patch | 19 --- debian/patches/portable_mm_store_ps.patch | 45 ------ debian/patches/printf_fixup.patch | 24 +-- debian/patches/rewrite_makefile.patch | 259 ------------------------------ debian/patches/series | 3 - 6 files changed, 16 insertions(+), 338 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5ade7e8..258d78f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ mupen64plus-video-glide64 (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: + - Remore upstream merged patches: default_settings.patch, + portable_mm_store_ps.patch, rewrite_makefile.patch + - Rebase printf_fixup.patch against 1.99.5~hg20110828 -- Sven Eckelmann <[email protected]> Sun, 28 Aug 2011 19:00:29 +0200 diff --git a/debian/patches/default_settings.patch b/debian/patches/default_settings.patch deleted file mode 100644 index e755116..0000000 --- a/debian/patches/default_settings.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Load default settings in the PluginStartup - Load default settings in the PluginStartup function so they are available - before a game runs -Origin: upstream, https://bitbucket.org/wahrhaft/mupen64plus-video-glide64/changeset/f955c5740719/raw/mupen64plus-video-glide64-f955c5740719.diff -Author: Jon 'wahrhaft' Ring <[email protected]> - ---- -diff --git a/src/Main.cpp b/src/Main.cpp -index e332ceb369bd9528dc4ac9a576df026bd1995936..9f151440b858e912eaaebfcd614819b32d365b0a 100755 ---- a/src/Main.cpp -+++ b/src/Main.cpp -@@ -987,6 +987,7 @@ EXPORT m64p_error CALL PluginStartup(m64p_dynlib_handle CoreLibHandle, void *Con - { - SetConfigDir(configDir); - CoreVideo_Init(); -+ ReadSettings(); - return M64ERR_SUCCESS; - } - else diff --git a/debian/patches/portable_mm_store_ps.patch b/debian/patches/portable_mm_store_ps.patch deleted file mode 100644 index 28b5c45..0000000 --- a/debian/patches/portable_mm_store_ps.patch +++ /dev/null @@ -1,45 +0,0 @@ -Description: Use more portable _mm_store_ps instead of GCC specific function -Origin: upstream, https://bitbucket.org/wahrhaft/mupen64plus-video-glide64/changeset/2bc96306ec92 -Author: Sven Eckelmann <[email protected]> - ---- -diff --git a/src/3dmath.cpp b/src/3dmath.cpp -index 0d1768b199d0f5ae1fca502359e5efcfb7f3cbff..2c01e9ea5bc1f94d0361fb9a18c077cf8fb0c71a 100755 ---- a/src/3dmath.cpp -+++ b/src/3dmath.cpp -@@ -40,6 +40,7 @@ - #include "m64p_config.h" - #include "m64p_vidext.h" - #include "3dmath.h" -+#include <xmmintrin.h> - - void calc_light (VERTEX *v) - { -@@ -193,23 +194,23 @@ void __stdcall MulMatricesSSE(float m1[4][4],float m2[4][4],float r[4][4]) - - // Fill tmp with four copies of leftrow[0] - v4sf tmp = leftrow; -- tmp = __builtin_ia32_shufps (tmp, tmp, 0); -+ tmp = _mm_shuffle_ps (tmp, tmp, 0); - // Calculate the four first summands - v4sf destrow = tmp * row0; - - // Fill tmp with four copies of leftrow[1] - tmp = leftrow; -- tmp = __builtin_ia32_shufps (tmp, tmp, 1 + (1 << 2) + (1 << 4) + (1 << 6)); -+ tmp = _mm_shuffle_ps (tmp, tmp, 1 + (1 << 2) + (1 << 4) + (1 << 6)); - destrow += tmp * row1; - - // Fill tmp with four copies of leftrow[2] - tmp = leftrow; -- tmp = __builtin_ia32_shufps (tmp, tmp, 2 + (2 << 2) + (2 << 4) + (2 << 6)); -+ tmp = _mm_shuffle_ps (tmp, tmp, 2 + (2 << 2) + (2 << 4) + (2 << 6)); - destrow += tmp * row2; - - // Fill tmp with four copies of leftrow[3] - tmp = leftrow; -- tmp = __builtin_ia32_shufps (tmp, tmp, 3 + (3 << 2) + (3 << 4) + (3 << 6)); -+ tmp = _mm_shuffle_ps (tmp, tmp, 3 + (3 << 2) + (3 << 4) + (3 << 6)); - destrow += tmp * row3; - - __builtin_ia32_storeups(r[i], destrow); diff --git a/debian/patches/printf_fixup.patch b/debian/patches/printf_fixup.patch index a69818e..788f838 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/Debugger.cpp b/src/Debugger.cpp -index 88b2faad4394909c2bf9f99b23929e7ff68cb6ba..1dd50d683258449572d648acbe894b99c8f48f34 100755 +index d68a89b22690b193e5222d6f9dc3fc7bb4e5f04e..fda064399150b6677cceaeb671043b90958368ff 100755 --- a/src/Debugger.cpp +++ b/src/Debugger.cpp -@@ -1013,7 +1013,6 @@ void debug_keys () +@@ -1014,7 +1014,6 @@ void debug_keys () // // output - output debugger text // @@ -58,18 +58,18 @@ index e76d54ad45b3b2eea7087de20038151b5bcc3c40..9e5463b3ffa5d8244e423058a6e04e94 { #ifdef RDP_ERROR_LOG diff --git a/src/m64p.h b/src/m64p.h -index fc22fbf157b7c9e1507c6a2430268afc71d4c4f8..af6e1bbb8be0772b38eeee282b9ee459c4a9815e 100755 +index c9a6b75e696d9116b16d8d61e40909f2667b1b5f..a23d6b1ae94c47510110361852082a7087707b62 100755 --- a/src/m64p.h +++ b/src/m64p.h -@@ -28,7 +28,7 @@ - #include "m64p_vidext.h" - #include <stdio.h> - --void WriteLog(m64p_msg_level level, const char *msg, ...); -+void WriteLog(m64p_msg_level level, const char *msg, ...) __attribute__ ((format (printf, 2, 3))); - - //The Glide API originally used an integer to pick an enumerated resolution. - //To accomodate arbitrary resolutions, pack it into a 32-bit struct +@@ -37,7 +37,7 @@ + #define VIDEXT_API_VERSION 0x020000 + + #define VERSION_PRINTF_SPLIT(x) (((x) >> 16) & 0xffff), (((x) >> 8) & 0xff), ((x) & 0xff) +-void WriteLog(m64p_msg_level level, const char *msg, ...); ++void WriteLog(m64p_msg_level level, const char *msg, ...) __attribute__ ((format (printf, 2, 3))); + + //The Glide API originally used an integer to pick an enumerated resolution. + //To accomodate arbitrary resolutions, pack it into a 32-bit struct diff --git a/src/wrapper/combiner.cpp b/src/wrapper/combiner.cpp index 6f2f189083942180eb331d155ea84494ddbeb84f..484a880f4a0d07dfc55c64200d5487b22b7f90c1 100644 --- a/src/wrapper/combiner.cpp diff --git a/debian/patches/rewrite_makefile.patch b/debian/patches/rewrite_makefile.patch deleted file mode 100644 index 8cfb177..0000000 --- a/debian/patches/rewrite_makefile.patch +++ /dev/null @@ -1,259 +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 0e8bf208113b0449193a8746d8e0b88d7259692f..4bc6c3b71bb94489880303f7cf420e8154f7238d 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,81 @@ 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 -I../../src/wrapper -DGCC -+# base CFLAGS, LDLIBS, and LDFLAGS -+OPTFLAGS ?= -O3 -+CFLAGS += $(OPTFLAGS) -Wall -ffast-math -msse -fno-strict-aliasing -fvisibility=hidden -I../../src -I../../src/wrapper -DGCC - CXXFLAGS += -fvisibility-inlines-hidden --LDFLAGS += -ldl -+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 -+ LDLIBS += -ldl - 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), 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 -+CFLAGS += $(shell pkg-config --cflags gl) -+LDLIBS += $(shell pkg-config --libs gl) -+ - # 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 +194,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 - ifeq ($(NO_ASM), 1) - CFLAGS += -DNO_ASM -@@ -207,7 +232,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 -@@ -244,7 +272,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-glide64.$(SO_EXTENSION) -@@ -261,10 +289,13 @@ targets: - @echo " BITS=32 == build 32-bit binaries on 64-bit machine" - @echo " NO_ASM=1 == build without inline assembly code (x86 MMX/SSE)" - @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" -@@ -273,18 +304,17 @@ 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 $(INSTALL_STRIP_FLAG) $(TARGET) "$(DESTDIR)$(PLUGINDIR)" -+ $(INSTALL) -d "$(DESTDIR)$(SHAREDIR)" - $(INSTALL) -m 0644 "../../data/Glide64.ini" "$(DESTDIR)$(SHAREDIR)" - - uninstall: -- rm -f "$(DESTDIR)$(LIBDIR)/$(TARGET)" -- rm -f "$(DESTDIR)$(SHAREDIR)/Glide64.ini" -+ $(RM) "$(DESTDIR)$(PLUGINDIR)/$(TARGET)" -+ $(RM) "$(DESTDIR)$(SHAREDIR)/Glide64.ini" - - clean: -- rm -rf ./_obj/* $(TARGET) -- rmdir ./_obj -+ $(RM) -r ./_obj $(TARGET) - - rebuild: clean all - -@@ -294,22 +324,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 34d1f18..5a5a78d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1 @@ -rewrite_makefile.patch printf_fixup.patch -default_settings.patch -portable_mm_store_ps.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-glide64.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
