[mupen64plus-ui-console] 69/172: Remove upstream merged patches
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:07:32 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-ui-console.
commit db786587be8286252fa898710346846711bd43fe
Author: Sven Eckelmann <sven at narfation.org>
Date: Sun Aug 28 19:52:38 2011 +0200
Remove upstream merged patches
---
debian/changelog | 3 +
debian/patches/big_endian_conflict.patch | 19 ---
debian/patches/rewrite_makefile.patch | 200 -------------------------------
debian/patches/series | 2 -
4 files changed, 3 insertions(+), 221 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 62722df..92857fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ mupen64plus-ui-console (1.99.4+23+86aec84c1b27-1) UNRELEASED; urgency=low
* New upstream snapshot from revision 86aec84c1b2735ff5d4d3f4f6b0342497d4dc5ae
* Don't mix implicit and explicit rules to prevent FTBFS with make 3.82
+ * debian/patches:
+ - Remove upstream merged patches big_endian_conflict.patch,
+ rewrite_makefile.patch
-- Sven Eckelmann <sven at narfation.org> Sun, 28 Aug 2011 18:59:48 +0200
diff --git a/debian/patches/big_endian_conflict.patch b/debian/patches/big_endian_conflict.patch
deleted file mode 100644
index 947ec1a..0000000
--- a/debian/patches/big_endian_conflict.patch
+++ /dev/null
@@ -1,19 +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-ui-console/changeset/c8d7df4d5615
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/cheat.h b/src/cheat.h
-index 611121aa0fefdff74ac692e5a09816cb52906b1d..e44ac05cf2b5e7a58eb5be08408c752cb81c650a 100644
---- a/src/cheat.h
-+++ b/src/cheat.h
-@@ -22,7 +22,7 @@
- #ifndef CHEAT_H
- #define CHEAT_H
-
--#ifdef _BIG_ENDIAN
-+#ifdef M64P_BIG_ENDIAN
- #define sl(mot) mot
- #else
- #define sl(mot) (((mot & 0xFF) << 24) | ((mot & 0xFF00) << 8) | ((mot & 0xFF0000) >> 8) | ((mot & 0xFF000000) >> 24))
diff --git a/debian/patches/rewrite_makefile.patch b/debian/patches/rewrite_makefile.patch
deleted file mode 100644
index e985946..0000000
--- a/debian/patches/rewrite_makefile.patch
+++ /dev/null
@@ -1,200 +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 0d4e5f641b19ce31d2dc295025df2afbaecb9041..00afe887ed9c30ea09ed2cf9e285e300a5840ad4 100644
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -38,6 +38,10 @@ endif
- ifeq ("$(UNAME)","FreeBSD")
- OS = FREEBSD
- endif
-+ifeq ("$(UNAME)","OpenBSD")
-+ OS = FREEBSD
-+ $(warning OS type "$(UNAME)" not officially supported.')
-+endif
- ifneq ("$(filter GNU/kFreeBSD kfreebsd,$(UNAME))","")
- OS = LINUX
- endif
-@@ -74,25 +78,23 @@ 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 -I../../src
--LDFLAGS += -lpthread
-+# base CFLAGS, LDLIBS, and LDFLAGS
-+OPTFLAGS ?= -O3
-+CFLAGS += $(OPTFLAGS) -ffast-math -fno-strict-aliasing -pthread -I../../src
-+LDLIBS += -pthread
-+
-+ifeq ($(PIE), 1)
-+ CFLAGS += -fPIE
-+ LDFLAGS += -fPIE -pie
-+endif
-
- # set special flags per-system
- ifeq ($(OS), LINUX)
-- ifeq ($(CPU), X86)
-- ifeq ($(ARCH_DETECTED), 64BITS)
-- CFLAGS += -pipe -O3 -march=athlon64
-- LDFLAGS += -ldl
-- else
-- CFLAGS += -pipe -O3 -mmmx -msse -march=i686 -mtune=pentium-m -fomit-frame-pointer
-- LDFLAGS += -ldl
-- endif
-- endif
-+ LDLIBS += -ldl
- endif
- ifeq ($(OS), OSX)
- # The mac version of SDL requires inclusion of SDL_main in the executable
-- LDFLAGS += -ldl $(shell sdl-config --libs)
-+ LDLIBS += -ldl $(shell sdl-config --libs)
- ifeq ($(CPU), X86)
- ifeq ($(ARCH_DETECTED), 64BITS)
- CFLAGS += -pipe -O3 -arch x86_64 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk
-@@ -103,9 +105,6 @@ ifeq ($(OS), OSX)
- endif
- endif
- endif
--ifeq ($(CPU), PPC)
-- CFLAGS += -mcpu=powerpc
--endif
-
- # tweak flags for 32-bit build on 64-bit system
- ifeq ($(ARCH_DETECTED), 64BITS_32)
-@@ -113,7 +112,7 @@ ifeq ($(ARCH_DETECTED), 64BITS_32)
- $(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 mupen64plus core API header path
-@@ -138,15 +137,22 @@ 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_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
-+LINK.o = $(Q_LD)$(CC) $(LDFLAGS) $(TARGET_ARCH)
-
- # set special flags for given Makefile parameters
- # note: COREDIR _must_ end in a slash if you want it to work; not necessary for the others
-@@ -161,7 +167,9 @@ ifneq ($(SHAREDIR),)
- endif
- ifeq ($(DEBUG),1)
- CFLAGS += -g
-- STRIP = true # disable binary strip
-+ INSTALL_STRIP_FLAG ?=
-+else
-+ INSTALL_STRIP_FLAG ?= -s
- endif
-
- # set installation options
-@@ -172,7 +180,7 @@ ifeq ($(BINDIR),)
- BINDIR := $(PREFIX)/bin
- endif
- ifeq ($(MANDIR),)
-- MANDIR := $(PREFIX)/man/man6
-+ MANDIR := $(PREFIX)/share/man
- endif
-
- SRCDIR = ../../src
-@@ -191,7 +199,7 @@ SOURCE = \
- # generate a list of object files build, make a temporary directory for them
- OBJECTS := $(patsubst $(SRCDIR)/%.c, $(OBJDIR)/%.o, $(filter %.c, $(SOURCE)))
- OBJDIRS = $(dir $(OBJECTS))
--$(shell mkdir -p $(OBJDIRS))
-+$(shell $(MKDIR) $(OBJDIRS))
-
- # build targets
- TARGET = mupen64plus
-@@ -209,47 +217,42 @@ targets:
- @echo " PLUGINDIR=path == default path to search for plugins"
- @echo " SHAREDIR=path == default path to search for shared data files"
- @echo " APIDIR=path == path to find Mupen64Plus Core headers"
-+ @echo " OPTFLAGS=flags == compiler optimization (default: -O3)"
-+ @echo " PIE=(1|0) == Force enable/disable of position independent executables"
- @echo " Install Options:"
- @echo " PREFIX=path == install/uninstall prefix (default: /usr/local/)"
- @echo " BINDIR=path == path to install mupen64plus binary (default: PREFIX/bin/)"
-- @echo " MANDIR=path == path to install mupen64plus manual page (default: PREFIX/man/man6/)"
-+ @echo " MANDIR=path == path to install mupen64plus manual page (default: PREFIX/share/man)"
- @echo " DESTDIR=path == path to prepend to all installation paths (only for packagers)"
- @echo " Debugging Options:"
- @echo " DEBUG=1 == add debugging symbols to application binary"
-+ @echo " V=1 == show verbose compiler output"
-
- all: $(TARGET)
-
- clean:
-- rm -rf ./_obj/* $(TARGET)
-- rmdir ./_obj
-+ $(RM) -r ./_obj $(TARGET)
-
- rebuild: clean all
-
- install: $(TARGET)
-- $(INSTALL) -d -v "$(DESTDIR)$(BINDIR)"
-- $(INSTALL) -m 0755 $(TARGET) "$(DESTDIR)$(BINDIR)"
-- $(INSTALL) -d -v "$(DESTDIR)$(MANDIR)"
-- $(INSTALL) -m 0644 ../../doc/mupen64plus.6.gz "$(DESTDIR)$(MANDIR)"
-+ $(INSTALL) -d "$(DESTDIR)$(BINDIR)"
-+ $(INSTALL) -m 0755 $(INSTALL_STRIP_FLAG) $(TARGET) "$(DESTDIR)$(BINDIR)"
-+ $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6"
-+ $(INSTALL) -m 0644 ../../doc/mupen64plus.6.gz "$(DESTDIR)$(MANDIR)/man6"
-
- uninstall:
-- rm -f "$(DESTDIR)$(BINDIR)/$(TARGET)" "$(DESTDIR)$(MANDIR)/mupen64plus.6.gz"
-+ $(RM) "$(DESTDIR)$(BINDIR)/$(TARGET)" "$(DESTDIR)$(MANDIR)/man6/mupen64plus.6.gz"
-
- # build dependency files
- CFLAGS += -MD
- -include $(OBJECTS:.o=.d)
-
--# reduced compile output when running make without V=1
--ifneq ($(findstring $(MAKEFLAGS),s),s)
--ifndef V
-- Q_CC = @echo ' CC '$@;
-- Q_LD = @echo ' LD '$@;
--endif
--endif
--
--# build rules
--$(TARGET): $(OBJECTS)
-- $(Q_LD)$(CC) $^ $(LDFLAGS) $(SRC_LIBS) -o $@
-- $(STRIP) $@
--
-+# standard build rules
- $(OBJDIR)/%.o: $(SRCDIR)/%.c
-- $(Q_CC)$(CC) -o $@ $(CFLAGS) -c $<
-+ $(COMPILE.c) -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 724b713..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-rewrite_makefile.patch
-big_endian_conflict.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-ui-console.git
More information about the Pkg-games-commits
mailing list