[mupen64plus-core] 116/310: Fix installation of cheat database
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:57: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-core.
commit 1890496d327efc8edf322d41d20b1edc08f7502b
Author: Sven Eckelmann <sven at narfation.org>
Date: Sat Oct 8 20:43:13 2011 +0200
Fix installation of cheat database
---
debian/changelog | 2 +
debian/patches/dejavu-font.patch | 9 ++-
debian/patches/n64_cic_nus_6105.patch | 4 +-
debian/patches/rewrite_makefile.patch | 105 +++++++++++++++++++++++++++++-----
4 files changed, 99 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ca7f736..058e710 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ mupen64plus-core (1.99.4-4) UNRELEASED; urgency=low
- Add new_minizip.patch, Import minizip from zlib 1.2.5
- Add savestatepath_config.patch, Read option SaveStatePath from config when
set
+ - Update rewrite_makefile.patch and dejavu-font.patch; Fix installation of
+ cheat database
-- Sven Eckelmann <sven at narfation.org> Sat, 20 Aug 2011 21:53:01 +0200
diff --git a/debian/patches/dejavu-font.patch b/debian/patches/dejavu-font.patch
index f49ffdb..6facb3c 100644
--- a/debian/patches/dejavu-font.patch
+++ b/debian/patches/dejavu-font.patch
@@ -4,15 +4,14 @@ Author: Sven Eckelmann <sven at narfation.org> Please enter the commit message for
---
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index d56839f4fb47f17da3882eff1ac02df6516706b7..b310cc00b4642f15c779e5685bec7bf46e94ff30 100644
+index 18a55e455ec1f54306de7eb4e821249f53d8c021..120f4af702f1fc41bd9908960b29484f0af565b0 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
-@@ -399,7 +399,7 @@ install: $(TARGET)
- $(INSTALL) -d "$(DESTDIR)$(LIBDIR)"
+@@ -417,6 +417,7 @@ install: $(TARGET)
$(INSTALL) -m 0644 $(INSTALL_STRIP_FLAG) $(TARGET) "$(DESTDIR)$(LIBDIR)"
$(INSTALL) -d "$(DESTDIR)$(SHAREDIR)"
-- $(INSTALL) -m 0644 ../../data/* "$(DESTDIR)$(SHAREDIR)"
-+ $(INSTALL) -m 0644 ../../data/mupen64plus.* "$(DESTDIR)$(SHAREDIR)"
+ $(INSTALL) -m 0644 ../../data/* "$(DESTDIR)$(SHAREDIR)"
++ $(RM) "$(DESTDIR)$(SHAREDIR)"/font.ttf
$(INSTALL) -d "$(DESTDIR)$(INCDIR)"
$(INSTALL) -m 0644 ../../src/api/m64p_*.h "$(DESTDIR)$(INCDIR)"
-$(LDCONFIG) "$(DESTDIR)$(LIBDIR)"
diff --git a/debian/patches/n64_cic_nus_6105.patch b/debian/patches/n64_cic_nus_6105.patch
index cb6f0e0..c0ec520 100644
--- a/debian/patches/n64_cic_nus_6105.patch
+++ b/debian/patches/n64_cic_nus_6105.patch
@@ -25,10 +25,10 @@ index ab3f9cbbe141fca43e5331f62c7b4db048c31524..02c42d639a8fcd338fc1a632d210f3ff
The zlib/libpng license:
* Adler-32 by Mark Adler
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index b310cc00b4642f15c779e5685bec7bf46e94ff30..2a7f564b8e4341b6f8a93f813de706d84863d376 100644
+index 120f4af702f1fc41bd9908960b29484f0af565b0..93fa9928c257e6125c8664f9517d801a51ecce69 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
-@@ -282,6 +282,7 @@ SOURCE = \
+@@ -288,6 +288,7 @@ SOURCE = \
$(SRCDIR)/memory/dma.c \
$(SRCDIR)/memory/flashram.c \
$(SRCDIR)/memory/memory.c \
diff --git a/debian/patches/rewrite_makefile.patch b/debian/patches/rewrite_makefile.patch
index 3e6f35d..b5cf8f6 100644
--- a/debian/patches/rewrite_makefile.patch
+++ b/debian/patches/rewrite_makefile.patch
@@ -3,7 +3,7 @@ Author: Sven Eckelmann <sven at narfation.org>
---
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index cf8e6ae7d0849ceea929a18b1628d8b50b3020da..d56839f4fb47f17da3882eff1ac02df6516706b7 100644
+index cf8e6ae7d0849ceea929a18b1628d8b50b3020da..18a55e455ec1f54306de7eb4e821249f53d8c021 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
@@ -39,6 +39,10 @@ endif
@@ -17,7 +17,49 @@ index cf8e6ae7d0849ceea929a18b1628d8b50b3020da..d56839f4fb47f17da3882eff1ac02df6
ifneq ("$(filter GNU/kFreeBSD kfreebsd,$(UNAME))","")
OS = LINUX
endif
-@@ -76,23 +80,29 @@ ifeq ("$(CPU)","NONE")
+@@ -53,46 +57,61 @@ ifneq ("$(filter x86_64 amd64,$(HOST_CPU))","")
+ CPU := X86
+ ifeq ("$(BITS)", "32")
+ ARCH_DETECTED := 64BITS_32
++ PIC ?= 0
+ else
+ ARCH_DETECTED := 64BITS
++ PIC ?= 1
+ endif
+ endif
+ ifneq ("$(filter pentium i%86,$(HOST_CPU))","")
+ CPU := X86
+ ARCH_DETECTED := 32BITS
++ PIC ?= 0
++endif
++ifneq ("$(filter ppc powerpc,$(HOST_CPU))","")
++ CPU := PPC
++ ARCH_DETECTED := 32BITS
++ BIG_ENDIAN := 1
++ PIC ?= 1
++ NO_ASM := 1
++ $(warning Architecture "$(HOST_CPU)" not officially supported.')
++endif
++ifneq ("$(filter ppc64 powerpc64,$(HOST_CPU))","")
++ CPU := PPC
++ ARCH_DETECTED := 64BITS
++ BIG_ENDIAN := 1
++ PIC ?= 1
++ NO_ASM := 1
++ $(warning Architecture "$(HOST_CPU)" not officially supported.')
+ endif
+-# PPC doesn't work yet
+-#ifneq ("$(filter ppc powerpc,$(HOST_CPU))","")
+-# CPU := PPC
+-# ARCH_DETECTED := 32BITS
+-# NO_ASM := 1
+-#endif
+-#ifneq ("$(filter ppc64 powerpc64,$(HOST_CPU))","")
+-# CPU := PPC
+-# ARCH_DETECTED := 64BITS
+-# NO_ASM := 1
+-#endif
+ ifeq ("$(CPU)","NONE")
$(error CPU type "$(HOST_CPU)" not supported. Please file bug report at 'http://code.google.com/p/mupen64plus/issues')
endif
@@ -30,15 +72,19 @@ index cf8e6ae7d0849ceea929a18b1628d8b50b3020da..d56839f4fb47f17da3882eff1ac02df6
-LIBS += -lpng -lz -lm -lfreetype
+LDLIBS += -lm
- # 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)
+-# 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
++# Since we are building a shared library, we must compile with -fPIC on some architectures
++# On 32-bit x86 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 ($(PIC), 1)
+ CFLAGS += -fPIC
+ LDFLAGS += -fPIC
+ endif
++
++ifeq ($(BIG_ENDIAN), 1)
++ CFLAGS += -DM64P_BIG_ENDIAN
+endif
+
# tweak flags for 32-bit build on 64-bit system
@@ -52,7 +98,7 @@ index cf8e6ae7d0849ceea929a18b1628d8b50b3020da..d56839f4fb47f17da3882eff1ac02df6
endif
# set special flags per-system
-@@ -100,30 +110,20 @@ ifeq ($(OS), FREEBSD)
+@@ -100,30 +119,20 @@ ifeq ($(OS), FREEBSD)
TARGET = libmupen64plus.so.2.0.0
SONAME = libmupen64plus.so.2
LDFLAGS += -Wl,-Bsymbolic -shared -Wl,-export-dynamic -Wl,-soname,$(SONAME)
@@ -86,7 +132,7 @@ index cf8e6ae7d0849ceea929a18b1628d8b50b3020da..d56839f4fb47f17da3882eff1ac02df6
ifeq ($(CPU), X86)
ifeq ($(ARCH_DETECTED), 64BITS)
CFLAGS += -pipe -O3 -arch x86_64 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk
-@@ -137,38 +137,67 @@ ifeq ($(OS), OSX)
+@@ -137,38 +146,67 @@ ifeq ($(OS), OSX)
endif
endif
endif
@@ -170,7 +216,7 @@ index cf8e6ae7d0849ceea929a18b1628d8b50b3020da..d56839f4fb47f17da3882eff1ac02df6
endif
# compiler/linker flags for various compile-time options.
-@@ -180,11 +209,13 @@ endif
+@@ -180,11 +218,13 @@ endif
ifeq ($(PROFILE), 1)
CFLAGS += -pg -g
LDFLAGS += -pg
@@ -186,7 +232,38 @@ index cf8e6ae7d0849ceea929a18b1628d8b50b3020da..d56839f4fb47f17da3882eff1ac02df6
endif
endif
# 3. other options given to the makefile on the command line
-@@ -322,14 +353,14 @@ ifeq ($(DEBUGGER), 1)
+@@ -245,9 +285,6 @@ SOURCE = \
+ $(SRCDIR)/main/ini_reader.c \
+ $(SRCDIR)/main/savestates.c \
+ $(SRCDIR)/main/adler32.c \
+- $(SRCDIR)/main/zip/ioapi.c \
+- $(SRCDIR)/main/zip/zip.c \
+- $(SRCDIR)/main/zip/unzip.c \
+ $(SRCDIR)/memory/dma.c \
+ $(SRCDIR)/memory/flashram.c \
+ $(SRCDIR)/memory/memory.c \
+@@ -313,23 +350,34 @@ endif
+
+ ifeq ($(LIRC), 1)
+ SOURCE += $(SRCDIR)/main/lirc.c
+- LIBS += -llirc_client
++ LDLIBS += -llirc_client
+ endif
+
++ifeq ($(shell pkg-config --modversion minizip 2>/dev/null),)
++ SOURCE += \
++ $(SRCDIR)/main/zip/ioapi.c \
++ $(SRCDIR)/main/zip/zip.c \
++ $(SRCDIR)/main/zip/unzip.c
++else
++ CFLAGS += $(shell pkg-config --cflags minizip) -DLIBMINIZIP
++ LDLIBS += $(shell pkg-config --libs minizip)
++endif
++
++
+ ifeq ($(DEBUGGER), 1)
+ SOURCE += \
+ $(SRCDIR)/debugger/debugger.c \
$(SRCDIR)/debugger/dbg_decoder.c \
$(SRCDIR)/debugger/dbg_memory.c \
$(SRCDIR)/debugger/dbg_breakpoints.c
@@ -203,7 +280,7 @@ index cf8e6ae7d0849ceea929a18b1628d8b50b3020da..d56839f4fb47f17da3882eff1ac02df6
# build targets
targets:
-@@ -344,6 +375,8 @@ targets:
+@@ -344,6 +392,8 @@ targets:
@echo " LIRC=1 == enable LIRC support"
@echo " NO_ASM=1 == build without assembly (no dynamic recompiler or MMX/SSE code)"
@echo " SHAREDIR=path == extra path to search for shared data files"
@@ -212,7 +289,7 @@ index cf8e6ae7d0849ceea929a18b1628d8b50b3020da..d56839f4fb47f17da3882eff1ac02df6
@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)"
-@@ -358,28 +391,31 @@ targets:
+@@ -358,28 +408,31 @@ targets:
@echo " DBG_COUNT=1 == print R4300 instruction count totals (64-bit dynarec only)"
@echo " DBG_COMPARE=1 == enable core-synchronized r4300 debugging"
@echo " DBG_PROFILE=1 == dump profiling data for r4300 dynarec to data file"
@@ -256,7 +333,7 @@ index cf8e6ae7d0849ceea929a18b1628d8b50b3020da..d56839f4fb47f17da3882eff1ac02df6
# build dependency files
CFLAGS += -MD
-@@ -387,23 +423,15 @@ CFLAGS += -MD
+@@ -387,23 +440,15 @@ CFLAGS += -MD
CXXFLAGS += $(CFLAGS)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git
More information about the Pkg-games-commits
mailing list