[mupen64plus-rsp-z64] 56/140: Remove upstream merged patches
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:05:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch master
in repository mupen64plus-rsp-z64.
commit 11ba4ed36555de2f8ef19ab7e055ae00362259cc
Author: Sven Eckelmann <sven at narfation.org>
Date: Sun Aug 28 19:50:13 2011 +0200
Remove upstream merged patches
---
debian/changelog | 2 +
debian/patches/rewrite_makefile.patch | 220 ----------------------------------
debian/patches/series | 1 -
3 files changed, 2 insertions(+), 221 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2d8d6f1..36fe8f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mupen64plus-rsp-z64 (1.99.5~hg20110828-1) UNRELEASED; urgency=low
* New upstream snapshot from revision 92aaf5a6c5ef
* Don't mix implicit and explicit rules to prevent FTBFS with make 3.82
+ * debian/patches:
+ - Remove upstream merged patch rewrite_makefile.patch
-- Sven Eckelmann <sven at narfation.org> Sun, 28 Aug 2011 18:59:29 +0200
diff --git a/debian/patches/rewrite_makefile.patch b/debian/patches/rewrite_makefile.patch
deleted file mode 100644
index dc16d0c..0000000
--- a/debian/patches/rewrite_makefile.patch
+++ /dev/null
@@ -1,220 +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
-old mode 100755
-new mode 100644
-index d890f3228f6dc9e4f0aec0724839b5ce9876893f..5c38773f52bd22392760c8d2468a8375add26dd4
---- 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
-@@ -88,51 +94,53 @@ 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 += -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), 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
-+ LDLIBS += -ldl
-+endif
-+ifeq ($(OS), FREEBSD)
-+ LDLIBS += -lc
- 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 += -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 += -arch i686
-+ LDLIBS += -ldl
- endif
- endif
- endif
--ifeq ($(CPU), PPC)
-- CFLAGS += -mcpu=powerpc
--endif
-
- # set mupen64plus core API header path
- ifneq ("$(APIDIR)","")
-@@ -156,20 +164,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
-@@ -177,7 +196,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
-@@ -195,7 +217,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-z64.$(SO_EXTENSION)
-@@ -211,9 +233,12 @@ 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"
-@@ -222,15 +247,14 @@ targets:
- 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
-
-@@ -240,23 +264,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 c753e70..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-rewrite_makefile.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-rsp-z64.git
More information about the Pkg-games-commits
mailing list