[mupen64plus-core] 06/310: Add initial build support for 1.99.3
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:56:53 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 0b49c7984de44b4170769d95f016d26a01e31247
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date: Mon Feb 15 18:41:35 2010 +0100
Add initial build support for 1.99.3
---
debian/changelog | 13 +--
debian/control | 163 +++++++++++++++++++++++++++++
debian/libmupen64plus-dev.install | 1 +
debian/libmupen64plus2.docs | 2 +
debian/libmupen64plus2.install | 2 +
debian/patches/default-optimisations.patch | 40 +++++++
debian/patches/dejavu-font.patch | 27 +++++
debian/patches/series | 2 +
debian/rules | 29 +++++
9 files changed, 273 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4de5e44..889fcae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,7 @@ mupen64plus-core (1.99.3-1) UNRELEASED; urgency=low
* Split source package to match upstreams modular release packages
* debian/patches:
- Remove upstream merged patches: as-needed.patch,
- correct_fpr32_mapping.patch, debian-archs.patch,
- default-optimisations.patch, dejavu-font.patch, destdir.patch,
+ correct_fpr32_mapping.patch, debian-archs.patch, destdir.patch,
fix-7z-subfolder.patch, fix-desktop-file.patch, fix_r0_override.patch,
fix_readpng.patch, ftbfs-debugger.patch, ftbfs-dynarec.patch,
ftbfs-glibc210.patch, ftbfs-kfreebsd.patch, glide64-noasm.patch,
@@ -13,15 +12,17 @@ mupen64plus-core (1.99.3-1) UNRELEASED; urgency=low
noexecstack.patch, osd-pause-crash.patch, plugin-searchpath.patch,
remove-gln64.patch, remove-nondfsg-icons.patch, resume_on_start.patch,
rice_nodebug.patch, rice-screenflickering.patch,
- rice-texturepack-crash.patch, static-binutils-libs.patch,
- system-libbz2.patch, system-liblzma.patch, system-libpng.patch,
- system-zlib.patch, version-string.patch, xdg-basedir.patch
+ rice-texturepack-crash.patch, system-libbz2.patch, system-liblzma.patch,
+ system-libpng.patch, system-zlib.patch, version-string.patch,
+ xdg-basedir.patch, static-binutils-libs.patch
+ - Rebase default-optimisations.patch and dejavu-font.patch against 1.99.3
* Convert to 3.0 (quilt) source format
* debian/control:
- Remove unneeded build dependency to quilt
- Upgraded to policy 3.8.4, no changes required
+ * Provide metapackages for audio, input, rsp, ui and video plugins
- -- Sven Eckelmann <sven.eckelmann at gmx.de> Mon, 19 Oct 2009 23:23:05 +0200
+ -- Sven Eckelmann <sven.eckelmann at gmx.de> Mon, 15 Feb 2010 14:44:27 +0100
mupen64plus (1.5+dfsg1-7) unstable; urgency=low
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..7ff0e3b
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,163 @@
+Source: mupen64plus-core
+Section: games
+Priority: optional
+Maintainer: Tobias Loose <TobiasLoose at gmx.de>
+Uploaders: Sven Eckelmann <sven.eckelmann at gmx.de>
+Homepage: http://code.google.com/p/mupen64plus/
+Standards-Version: 3.8.4
+Vcs-Browser: http://git.debian.org/?p=collab-maint/mupen64plus-core.git
+Vcs-Git: git://git.debian.org/git/collab-maint/mupen64plus-core.git
+Build-Depends: debhelper (>= 7.0.50), libfreetype6-dev, libsdl1.2-dev,
+ libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
+ libpng12-dev | libpng-dev, zlib1g-dev | libz-dev, binutils-dev
+
+Package: mupen64plus
+Architecture: all
+Depends: ${misc:Depends},
+ mupen64plus-ui-all | mupen64plus-ui-1
+Description: plugin-based Nintendo 64 emulator
+ N64 Emulator for Linux that works with many ROMs that are publically available.
+ It has the following features:
+ * loading of compressed roms
+ * cheat system
+ * exchangeable plugins for graphics, sound and input emulation
+ * multiple save states
+ * fullscreen support
+ * high quality texture filter for many graphic plugins
+ * support for external hi-res texture packs
+ * integrated graphical debugger for development
+
+Package: mupen64plus-audio-all
+Architecture: all
+Depends: ${misc:Depends},
+ mupen64plus-audio-sdl
+Description: plugin-based Nintendo 64 emulator
+ N64 Emulator for Linux that works with many ROMs that are publically available.
+ It has the following features:
+ * loading of compressed roms
+ * cheat system
+ * exchangeable plugins for graphics, sound and input emulation
+ * multiple save states
+ * fullscreen support
+ * high quality texture filter for many graphic plugins
+ * support for external hi-res texture packs
+ * integrated graphical debugger for development
+
+Package: mupen64plus-input-all
+Architecture: all
+Depends: ${misc:Depends},
+ mupen64plus-input-sdl
+Description: plugin-based Nintendo 64 emulator
+ N64 Emulator for Linux that works with many ROMs that are publically available.
+ It has the following features:
+ * loading of compressed roms
+ * cheat system
+ * exchangeable plugins for graphics, sound and input emulation
+ * multiple save states
+ * fullscreen support
+ * high quality texture filter for many graphic plugins
+ * support for external hi-res texture packs
+ * integrated graphical debugger for development
+
+Package: mupen64plus-rsp-all
+Architecture: all
+Depends: ${misc:Depends},
+ mupen64plus-rsp-hle
+Description: plugin-based Nintendo 64 emulator
+ N64 Emulator for Linux that works with many ROMs that are publically available.
+ It has the following features:
+ * loading of compressed roms
+ * cheat system
+ * exchangeable plugins for graphics, sound and input emulation
+ * multiple save states
+ * fullscreen support
+ * high quality texture filter for many graphic plugins
+ * support for external hi-res texture packs
+ * integrated graphical debugger for development
+
+Package: mupen64plus-ui-all
+Architecture: all
+Depends: ${misc:Depends},
+ mupen64plus-ui-console
+Description: plugin-based Nintendo 64 emulator
+ N64 Emulator for Linux that works with many ROMs that are publically available.
+ It has the following features:
+ * loading of compressed roms
+ * cheat system
+ * exchangeable plugins for graphics, sound and input emulation
+ * multiple save states
+ * fullscreen support
+ * high quality texture filter for many graphic plugins
+ * support for external hi-res texture packs
+ * integrated graphical debugger for development
+
+Package: mupen64plus-video-all
+Architecture: all
+Depends: ${misc:Depends},
+ mupen64plus-video-rice
+Description: plugin-based Nintendo 64 emulator
+ N64 Emulator for Linux that works with many ROMs that are publically available.
+ It has the following features:
+ * loading of compressed roms
+ * cheat system
+ * exchangeable plugins for graphics, sound and input emulation
+ * multiple save states
+ * fullscreen support
+ * high quality texture filter for many graphic plugins
+ * support for external hi-res texture packs
+ * integrated graphical debugger for development
+
+Package: libmupen64plus2
+Architecture: i386 amd64 kfreebsd-amd64 kfreebsd-i386
+Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu-core
+Conflicts: mupen64plus (<< 1.99.1)
+Replaces: mupen64plus (<< 1.99.1)
+Description: plugin-based Nintendo 64 emulator
+ N64 Emulator for Linux that works with many ROMs that are publically available.
+ It has the following features:
+ * loading of compressed roms
+ * cheat system
+ * exchangeable plugins for graphics, sound and input emulation
+ * multiple save states
+ * fullscreen support
+ * high quality texture filter for many graphic plugins
+ * support for external hi-res texture packs
+ * integrated graphical debugger for development
+
+Package: libmupen64plus2-dbg
+Section: debug
+Priority: extra
+Architecture: i386 amd64 kfreebsd-amd64 kfreebsd-i386
+Depends: ${misc:Depends},
+ libmupen64plus2 (= ${binary:Version})
+Description: mupen64plus debug symbols package
+ N64 Emulator for Linux that works with many ROMs that are publically available.
+ It has the following features:
+ * loading of compressed roms
+ * cheat system
+ * exchangeable plugins for graphics, sound and input emulation
+ * multiple save states
+ * fullscreen support
+ * high quality texture filter for many graphic plugins
+ * support for external hi-res texture packs
+ * integrated graphical debugger for development
+ .
+ This package contains the debug files.
+
+Package: libmupen64plus-dev
+Section: libdevel
+Architecture: i386 amd64 kfreebsd-amd64 kfreebsd-i386
+Depends: ${misc:Depends}, libmupen64plus2 (= ${binary:Version})
+Description: mupen64plus development package
+ N64 Emulator for Linux that works with many ROMs that are publically available.
+ It has the following features:
+ * loading of compressed roms
+ * cheat system
+ * exchangeable plugins for graphics, sound and input emulation
+ * multiple save states
+ * fullscreen support
+ * high quality texture filter for many graphic plugins
+ * support for external hi-res texture packs
+ * integrated graphical debugger for development
+ .
+ This package contains everything which is needed to build against mupen64plus.
diff --git a/debian/libmupen64plus-dev.install b/debian/libmupen64plus-dev.install
new file mode 100644
index 0000000..ca2f377
--- /dev/null
+++ b/debian/libmupen64plus-dev.install
@@ -0,0 +1 @@
+usr/include/mupen64plus/
diff --git a/debian/libmupen64plus2.docs b/debian/libmupen64plus2.docs
new file mode 100644
index 0000000..d2753a5
--- /dev/null
+++ b/debian/libmupen64plus2.docs
@@ -0,0 +1,2 @@
+README
+RELEASE
diff --git a/debian/libmupen64plus2.install b/debian/libmupen64plus2.install
new file mode 100644
index 0000000..64837a9
--- /dev/null
+++ b/debian/libmupen64plus2.install
@@ -0,0 +1,2 @@
+usr/lib/
+usr/share/mupen64plus/
\ No newline at end of file
diff --git a/debian/patches/default-optimisations.patch b/debian/patches/default-optimisations.patch
new file mode 100644
index 0000000..41608f5
--- /dev/null
+++ b/debian/patches/default-optimisations.patch
@@ -0,0 +1,40 @@
+Description: Don't override optimisations set by build environment
+Forwarded: not-needed
+Author: Sven Eckelmann <sven.eckelmann at gmx.de>
+
+---
+diff --git a/projects/unix/Makefile b/projects/unix/Makefile
+index 480252a7ce912669279e209fa101722b7b27c71e..201c5366844d18f42c906c3a0be6cd0e6762b161 100644
+--- a/projects/unix/Makefile
++++ b/projects/unix/Makefile
+@@ -74,7 +74,7 @@ ifeq ("$(CPU)","NONE")
+ endif
+
+ # base CFLAGS, LIBS, and LDFLAGS
+-CFLAGS = -Wall -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -I../../src
++CFLAGS += -Wall -fno-strict-aliasing -I../../src
+ LIBS = -ldl -lpng -lz -lm -lfreetype
+
+ # Since we are building a shared library, we must compile with -fPIC for x86_64 CPUs.
+@@ -105,9 +105,9 @@ ifeq ($(OS), LINUX)
+ LIBS += -L/usr/X11R6/lib -lGL -lGLU
+ ifeq ($(CPU), X86)
+ ifeq ($(ARCH_DETECTED), 64BITS)
+- CFLAGS += -pipe -O3 -march=athlon64
++ CFLAGS += -pipe
+ else
+- CFLAGS += -pipe -O3 -mmmx -msse -march=i686 -mtune=pentium-m
++ CFLAGS += -pipe -mmmx -msse
+ ifneq ($(PROFILE), 1)
+ CFLAGS += -fomit-frame-pointer
+ endif
+@@ -131,9 +131,6 @@ ifeq ($(OS), OSX)
+ endif
+ endif
+ endif
+-ifeq ($(CPU), PPC)
+- CFLAGS += -mcpu=powerpc
+-endif
+ ifeq ($(CPU_ENDIANNESS), BIG)
+ CFLAGS += -D_BIG_ENDIAN
+ endif
diff --git a/debian/patches/dejavu-font.patch b/debian/patches/dejavu-font.patch
new file mode 100644
index 0000000..4bdaa15
--- /dev/null
+++ b/debian/patches/dejavu-font.patch
@@ -0,0 +1,27 @@
+Description: Use font from ttf-dejavu-core
+Forwarded: not-needed
+Author: Sven Eckelmann <sven.eckelmann at gmx.de> Please enter the commit message for your changes. Lines starting
+
+---
+diff --git a/src/osd/osd.cpp b/src/osd/osd.cpp
+index b62f391f97d7697ef4f877f8f567ddedab869115..d6775c6a9d45a17a1f0b2728060bed3c564e4491 100644
+--- a/src/osd/osd.cpp
++++ b/src/osd/osd.cpp
+@@ -36,7 +36,7 @@ extern "C" {
+ #include "plugin/plugin.h"
+ }
+
+-#define FONT_FILENAME "font.ttf"
++#define FONT_FILENAME "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf"
+
+ typedef void (APIENTRYP PTRGLACTIVETEXTURE)(GLenum texture);
+ static PTRGLACTIVETEXTURE pglActiveTexture = NULL;
+@@ -211,7 +211,7 @@ void osd_init(int width, int height)
+ {
+ const char *fontpath;
+
+- fontpath = ConfigGetSharedDataFilepath(FONT_FILENAME);
++ fontpath = FONT_FILENAME;
+
+ l_font = new OGLFT::Monochrome(fontpath, (float) height / 35.0f); // make font size proportional to screen height
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ac97675
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+default-optimisations.patch
+dejavu-font.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..c7a4eae
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,29 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+%:
+ dh $@
+
+get-orig-source:
+ uscan --verbose --force-download
+
+override_dh_auto_build:
+ cd "$(CURDIR)/projects/unix/" && \
+ LDFLAGS='-Wl,--as-needed' $(MAKE) UNAME='$(DEB_HOST_ARCH_OS)' HOST_CPU='$(DEB_HOST_GNU_CPU)' DEBUG=1 all
+
+override_dh_auto_clean:
+ cd "$(CURDIR)/projects/unix/" && \
+ $(MAKE) clean
+
+override_dh_auto_install:
+ cd "$(CURDIR)/projects/unix/" && \
+ $(MAKE) DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr/ LDCONFIG=true install
+ cp -d "$(CURDIR)/projects/unix/libmupen64plus.so.2" "$(CURDIR)/debian/tmp/usr/lib/"
+
+override_dh_strip:
+ dh_strip -a --dbg-package=libmupen64plus2-dbg
+
+.PHONY: get-orig-source
--
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