This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch armhf_test in repository mupen64plus-video-rice.
commit 89b5ee5f89953d7a9cc970f2666e199691ce729c Author: Sven Eckelmann <[email protected]> Date: Sat Jun 16 22:19:03 2012 +0200 Remove upstream merged patches --- debian/changelog | 2 ++ debian/patches/gcc_lto.patch | 28 ----------------- debian/patches/non-pic-build.patch | 63 -------------------------------------- debian/patches/series | 2 -- 4 files changed, 2 insertions(+), 93 deletions(-) diff --git a/debian/changelog b/debian/changelog index ce26359..0e65f10 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ mupen64plus-video-rice (1.99.5+4+90656ad47d82-1) UNRELEASED; urgency=low * New Upstream Snapshot from 90656ad47d8257490434b12ba1ed9b3dfacb41cc + * debian/patches: + - Remove upstream merged gcc_lto.patch, non-pic-build.patch -- Sven Eckelmann <[email protected]> Sat, 16 Jun 2012 22:17:39 +0200 diff --git a/debian/patches/gcc_lto.patch b/debian/patches/gcc_lto.patch deleted file mode 100644 index f1c7f0d..0000000 --- a/debian/patches/gcc_lto.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: Enable experimental support for link-time optimization -Author: Sven Eckelmann <[email protected]> - ---- -diff --git a/projects/unix/Makefile b/projects/unix/Makefile -index 1d3ee892166715fc67014afc6b55b279f3d4edfc..a0cebceba87490afbde6f846a2569926f6c59ade 100644 ---- a/projects/unix/Makefile -+++ b/projects/unix/Makefile -@@ -332,6 +332,7 @@ targets: - @echo " DESTDIR=path == path to prepend to all installation paths (only for packagers)" - @echo " Debugging Options:" - @echo " DEBUG=1 == add debugging symbols" -+ @echo " LTO=1 == enable experimental build with link-time optimization" - @echo " V=1 == show verbose compiler output" - - all: $(TARGET) -@@ -356,6 +357,11 @@ CFLAGS += -MD - -include $(OBJECTS:.o=.d) - - CXXFLAGS += $(CFLAGS) -+ifeq ($(LTO), 1) -+ CFLAGS += -flto -+ CXXFLAGS += -flto -+ LDFLAGS += -fuse-linker-plugin $(CXXFLAGS) -+endif - - # standard build rules - $(OBJDIR)/%.o: $(SRCDIR)/%.c diff --git a/debian/patches/non-pic-build.patch b/debian/patches/non-pic-build.patch deleted file mode 100644 index 2ea516c..0000000 --- a/debian/patches/non-pic-build.patch +++ /dev/null @@ -1,63 +0,0 @@ -Description: Fix symbol references for non-PIC builds -Author: Richard Goedeken <[email protected]> -Origin: upstream, https://bitbucket.org/richard42/mupen64plus-video-rice/changeset/09de024e3784 - ---- -diff --git a/src/FrameBuffer.cpp b/src/FrameBuffer.cpp -index f6c712f145358813b25a9a87426f11105ce4c942..ee61b2e969c8eb7cd6203d1f6b6a18b0cadf8649 100644 ---- a/src/FrameBuffer.cpp -+++ b/src/FrameBuffer.cpp -@@ -667,30 +667,30 @@ l1: mov esi, [ecx+ebx] - ); - #elif !defined(NO_ASM) - # if !defined(__PIC__) -- asm volatile("pusha \n" -- "mov pAsmStart, %%ecx \n" // = pStart -- "mov $0, %%edx \n" // The CRC -- "mov dwAsmHeight, %%eax \n" // = y -- "0: \n" //l2: -- "mov dwAsmdwBytesPerLine, %%ebx \n" // = x -- "sub $4, %%ebx \n" -- "1: \n" //l1: -- "mov (%%ecx,%%ebx), %%esi \n" -- "xor %%ebx, %%esi \n" -- "rol $4, %%edx \n" -- "add %%esi, %%edx \n" -- "sub $4, %%ebx \n" -- "jge 1b \n" //jge l1 -- "xor %%eax, %%esi \n" -- "add %%esi, %%edx \n" -- "add dwAsmPitch, %%ecx \n" -- "dec %%eax \n" -- "jge 0b \n" //jge l2 -+ asm volatile("pusha \n" -+ "mov %[pAsmStart], %%ecx \n" // = pStart -+ "mov $0, %%edx \n" // The CRC -+ "mov %[dwAsmHeight], %%eax \n" // = y -+ "0: \n" //l2: -+ "mov %[dwAsmdwBytesPerLine], %%ebx \n" // = x -+ "sub $4, %%ebx \n" -+ "1: \n" //l1: -+ "mov (%%ecx,%%ebx), %%esi \n" -+ "xor %%ebx, %%esi \n" -+ "rol $4, %%edx \n" -+ "add %%esi, %%edx \n" -+ "sub $4, %%ebx \n" -+ "jge 1b \n" //jge l1 -+ "xor %%eax, %%esi \n" -+ "add %%esi, %%edx \n" -+ "add %[dwAsmPitch], %%ecx \n" -+ "dec %%eax \n" -+ "jge 0b \n" //jge l2 - -- "mov %%edx, dwAsmCRC \n" -- "popa \n" -- : -- : -+ "mov %%edx, %[dwAsmCRC] \n" -+ "popa \n" -+ : [pAsmStart]"+m"(pAsmStart), [dwAsmHeight]"+m"(dwAsmHeight), [dwAsmCRC]"=m"(dwAsmCRC) -+ : [dwAsmdwBytesPerLine]"m"(dwAsmdwBytesPerLine), [dwAsmPitch]"m"(dwAsmPitch) - : "memory", "cc" - ); - # else // defined(__PIC__) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 61173d8..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -non-pic-build.patch -gcc_lto.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-rice.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
