[mupen64plus-rsp-hle] 70/167: Remove upstream merged patches
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:02:24 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-rsp-hle.
commit b80e316dd3d8a0f8d7c671b058c27f146e3b0193
Author: Sven Eckelmann <sven at narfation.org>
Date: Sun Aug 28 19:48:42 2011 +0200
Remove upstream merged patches
---
debian/changelog | 3 +
debian/patches/big_endian_conflict.patch | 58 ---------
debian/patches/endianness_xor.patch | 95 --------------
debian/patches/rewrite_makefile.patch | 207 -------------------------------
debian/patches/series | 3 -
5 files changed, 3 insertions(+), 363 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 548212b..12c0a6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ mupen64plus-rsp-hle (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 patches big_endian_conflict.patch,
+ endianness_xor.patch, rewrite_makefile.patch
-- Sven Eckelmann <sven at narfation.org> Sun, 28 Aug 2011 18:59:11 +0200
diff --git a/debian/patches/big_endian_conflict.patch b/debian/patches/big_endian_conflict.patch
deleted file mode 100644
index 3609b04..0000000
--- a/debian/patches/big_endian_conflict.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: Don't use _BIG_ENDIAN to check for endianness
- _BIG_ENDIAN is always enabled on some systems and would create wrong results.
-Origin: upstream, https://bitbucket.org/richard42/mupen64plus-rsp-hle/changeset/8cbd4b98438d
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/hle.h b/src/hle.h
-index 82fb09058deddb83ec3ad8e7ea09853d19886a7c..eef4b461635da56cee3ed6e4ea44a44d7dacd922 100644
---- a/src/hle.h
-+++ b/src/hle.h
-@@ -26,7 +26,7 @@
-
- #define RSP_HLE_VERSION 0x016304
-
--#ifdef _BIG_ENDIAN
-+#ifdef M64P_BIG_ENDIAN
- #define S 0
- #define S16 0
- #define S8 0
-diff --git a/src/ucode1.cpp b/src/ucode1.cpp
-index 0c0ad75fcd1fe274e0ed43b532f1673ce175ec25..3843143e795a653a9fbf1bcf5dfb1b63df24ba7c 100644
---- a/src/ucode1.cpp
-+++ b/src/ucode1.cpp
-@@ -860,7 +860,7 @@ static void INTERLEAVE (void) { // Works... - 3-11-01
- Left2=*(inSrcL++);
- Right2=*(inSrcR++);
-
--#ifdef _BIG_ENDIAN
-+#ifdef M64P_BIG_ENDIAN
- *(outbuff++)=Right;
- *(outbuff++)=Left;
- *(outbuff++)=Right2;
-diff --git a/src/ucode2.cpp b/src/ucode2.cpp
-index 0ab3591c1bd528a360a85000b3b72fcfdabc2edc..b1688477a6b70ef267b4fabbec5591d8f3078ce3 100644
---- a/src/ucode2.cpp
-+++ b/src/ucode2.cpp
-@@ -710,7 +710,7 @@ static void INTERLEAVE2 (void) { // Needs accuracy verification...
- Left2=*(inSrcL++);
- Right2=*(inSrcR++);
-
--#ifdef _BIG_ENDIAN
-+#ifdef M64P_BIG_ENDIAN
- *(outbuff++)=Right;
- *(outbuff++)=Left;
- *(outbuff++)=Right2;
-diff --git a/src/ucode3.cpp b/src/ucode3.cpp
-index ad8db73c6375d698045bcf0c1d81e89779b115e1..c0a36a0bbb4153f417f77bbe45f170ca72d8d30c 100644
---- a/src/ucode3.cpp
-+++ b/src/ucode3.cpp
-@@ -939,7 +939,7 @@ static void INTERLEAVE3 (void) { // Needs accuracy verification...
- Left2=*(inSrcL++);
- Right2=*(inSrcR++);
-
--#ifdef _BIG_ENDIAN
-+#ifdef M64P_BIG_ENDIAN
- *(outbuff++)=Right;
- *(outbuff++)=Left;
- *(outbuff++)=Right2;
diff --git a/debian/patches/endianness_xor.patch b/debian/patches/endianness_xor.patch
deleted file mode 100644
index c9c0248..0000000
--- a/debian/patches/endianness_xor.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Description: Add parentheses around arithmetic in operand of ‘^’
-Origin: upstream, https://bitbucket.org/richard42/mupen64plus-rsp-hle/changeset/f084f76c4780
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/ucode1.cpp b/src/ucode1.cpp
-index 3843143e795a653a9fbf1bcf5dfb1b63df24ba7c..7d0c40fd4ea8daa90669f4b82f20ecedb47e6f06 100644
---- a/src/ucode1.cpp
-+++ b/src/ucode1.cpp
-@@ -825,17 +825,17 @@ static void LOADADPCM (void) { // Loads an ADPCM table - Works 100% Now 03-13-01
- //assert ((inst1&0xffff) <= 0x80);
- u16 *table = (u16 *)(rsp.RDRAM+v0);
- for (u32 x = 0; x < ((inst1&0xffff)>>0x4); x++) {
-- adpcmtable[0x0+(x<<3)^S] = table[0];
-- adpcmtable[0x1+(x<<3)^S] = table[1];
-+ adpcmtable[(0x0+(x<<3))^S] = table[0];
-+ adpcmtable[(0x1+(x<<3))^S] = table[1];
-
-- adpcmtable[0x2+(x<<3)^S] = table[2];
-- adpcmtable[0x3+(x<<3)^S] = table[3];
-+ adpcmtable[(0x2+(x<<3))^S] = table[2];
-+ adpcmtable[(0x3+(x<<3))^S] = table[3];
-
-- adpcmtable[0x4+(x<<3)^S] = table[4];
-- adpcmtable[0x5+(x<<3)^S] = table[5];
-+ adpcmtable[(0x4+(x<<3))^S] = table[4];
-+ adpcmtable[(0x5+(x<<3))^S] = table[5];
-
-- adpcmtable[0x6+(x<<3)^S] = table[6];
-- adpcmtable[0x7+(x<<3)^S] = table[7];
-+ adpcmtable[(0x6+(x<<3))^S] = table[6];
-+ adpcmtable[(0x7+(x<<3))^S] = table[7];
- table += 8;
- }
- }
-diff --git a/src/ucode2.cpp b/src/ucode2.cpp
-index b1688477a6b70ef267b4fabbec5591d8f3078ce3..858ee38cb568947abf01ae15b6ebaa5a6be3e9a9 100644
---- a/src/ucode2.cpp
-+++ b/src/ucode2.cpp
-@@ -56,17 +56,17 @@ static void LOADADPCM2 (void) { // Loads an ADPCM table - Works 100% Now 03-13-0
- u16 *table = (u16 *)(rsp.RDRAM+v0); // Zelda2 Specific...
-
- for (u32 x = 0; x < ((inst1&0xffff)>>0x4); x++) {
-- adpcmtable[0x0+(x<<3)^S] = table[0];
-- adpcmtable[0x1+(x<<3)^S] = table[1];
-+ adpcmtable[(0x0+(x<<3))^S] = table[0];
-+ adpcmtable[(0x1+(x<<3))^S] = table[1];
-
-- adpcmtable[0x2+(x<<3)^S] = table[2];
-- adpcmtable[0x3+(x<<3)^S] = table[3];
-+ adpcmtable[(0x2+(x<<3))^S] = table[2];
-+ adpcmtable[(0x3+(x<<3))^S] = table[3];
-
-- adpcmtable[0x4+(x<<3)^S] = table[4];
-- adpcmtable[0x5+(x<<3)^S] = table[5];
-+ adpcmtable[(0x4+(x<<3))^S] = table[4];
-+ adpcmtable[(0x5+(x<<3))^S] = table[5];
-
-- adpcmtable[0x6+(x<<3)^S] = table[6];
-- adpcmtable[0x7+(x<<3)^S] = table[7];
-+ adpcmtable[(0x6+(x<<3))^S] = table[6];
-+ adpcmtable[(0x7+(x<<3))^S] = table[7];
- table += 8;
- }
- }
-diff --git a/src/ucode3.cpp b/src/ucode3.cpp
-index c0a36a0bbb4153f417f77bbe45f170ca72d8d30c..75c1e3e6e1e845bcff0b0cb00b08ed37d74eb346 100644
---- a/src/ucode3.cpp
-+++ b/src/ucode3.cpp
-@@ -534,17 +534,17 @@ static void LOADADPCM3 (void) { // Loads an ADPCM table - Works 100% Now 03-13-0
- //assert ((inst1&0xffff) <= 0x80);
- u16 *table = (u16 *)(rsp.RDRAM+v0);
- for (u32 x = 0; x < ((inst1&0xffff)>>0x4); x++) {
-- adpcmtable[0x0+(x<<3)^S] = table[0];
-- adpcmtable[0x1+(x<<3)^S] = table[1];
-+ adpcmtable[(0x0+(x<<3))^S] = table[0];
-+ adpcmtable[(0x1+(x<<3))^S] = table[1];
-
-- adpcmtable[0x2+(x<<3)^S] = table[2];
-- adpcmtable[0x3+(x<<3)^S] = table[3];
-+ adpcmtable[(0x2+(x<<3))^S] = table[2];
-+ adpcmtable[(0x3+(x<<3))^S] = table[3];
-
-- adpcmtable[0x4+(x<<3)^S] = table[4];
-- adpcmtable[0x5+(x<<3)^S] = table[5];
-+ adpcmtable[(0x4+(x<<3))^S] = table[4];
-+ adpcmtable[(0x5+(x<<3))^S] = table[5];
-
-- adpcmtable[0x6+(x<<3)^S] = table[6];
-- adpcmtable[0x7+(x<<3)^S] = table[7];
-+ adpcmtable[(0x6+(x<<3))^S] = table[6];
-+ adpcmtable[(0x7+(x<<3))^S] = table[7];
- table += 8;
- }
- }
diff --git a/debian/patches/rewrite_makefile.patch b/debian/patches/rewrite_makefile.patch
deleted file mode 100644
index c4805ea..0000000
--- a/debian/patches/rewrite_makefile.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-Description: Rewrite Makefile to fix flags and linking
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index d7b6a1ce850e9cb6dac4ef8f5d3952d1eb2d99f0..b998287ae0bbab8a0ba11544f6931e9dd22a715d 100644
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -49,6 +49,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
-@@ -87,35 +93,35 @@ 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 += -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -fvisibility=hidden -I../../src
-+# base CFLAGS, LDLIBS, and LDFLAGS
-+OPTFLAGS ?= -O3
-+CFLAGS += $(OPTFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src
- CXXFLAGS += -fvisibility-inlines-hidden
-+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), LINUX)
- # only export api symbols
- LDFLAGS += -Wl,-version-script,$(SRCDIR)/rsp_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)
-@@ -128,9 +134,6 @@ ifeq ($(OS), OSX)
- endif
- endif
- endif
--ifeq ($(CPU), PPC)
-- CFLAGS += -mcpu=powerpc
--endif
-
- # set mupen64plus core API header path
- ifneq ("$(APIDIR)","")
-@@ -154,20 +157,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
-@@ -175,7 +189,10 @@ ifeq ($(PREFIX),)
- PREFIX := /usr/local
- endif
- ifeq ($(LIBDIR),)
-- LIBDIR := $(PREFIX)/lib/mupen64plus
-+ LIBDIR := $(PREFIX)/lib
-+endif
-+ifeq ($(PLUGINDIR),)
-+ PLUGINDIR := $(LIBDIR)/mupen64plus
- endif
-
- SRCDIR = ../../src
-@@ -194,7 +211,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-rsp-hle.$(SO_EXTENSION)
-@@ -210,25 +227,28 @@ 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 " 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"
-+ @echo " V=1 == show verbose compiler output"
-
- all: $(TARGET)
-
- install: $(TARGET)
-- $(INSTALL) -d -v "$(DESTDIR)$(LIBDIR)"
-- $(INSTALL) -m 0644 $(TARGET) "$(DESTDIR)$(LIBDIR)"
-+ $(INSTALL) -d "$(DESTDIR)$(PLUGINDIR)"
-+ $(INSTALL) -m 0644 $(INSTALL_STRIP_FLAG) $(TARGET) "$(DESTDIR)$(PLUGINDIR)"
-
- uninstall:
-- rm -f "$(DESTDIR)$(LIBDIR)/$(TARGET)"
-+ $(RM) "$(DESTDIR)$(PLUGINDIR)/$(TARGET)"
-
- clean:
-- rm -rf ./_obj/* $(TARGET)
-- rmdir ./_obj
-+ $(RM) -r ./_obj $(TARGET)
-
- rebuild: clean all
-
-@@ -238,23 +258,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
deleted file mode 100644
index f7ea7a0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-rewrite_makefile.patch
-big_endian_conflict.patch
-endianness_xor.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-rsp-hle.git
More information about the Pkg-games-commits
mailing list