[mupen64plus-video-rice] 06/191: Add initial build support for 1.99.3

Thu Nov 26 06:17:09 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-video-rice.

commit 68170cade57ff4d9a746cb347d1044081d727c61
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Mon Feb 15 21:02:59 2010 +0100

    Add initial build support for 1.99.3
---
 debian/changelog                           | 14 ++++-----
 debian/control                             | 49 ++++++++++++++++++++++++++++++
 debian/mupen64plus-video-rice.docs         |  2 ++
 debian/mupen64plus-video-rice.install      |  2 ++
 debian/patches/default-optimisations.patch | 42 +++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 debian/rules                               | 28 +++++++++++++++++
 7 files changed, 131 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c5ef951..a84a889 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,12 +3,11 @@ mupen64plus-video-rice (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,
-      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,
-      gtk-open-filter.patch, interpreter_x86_fldcw.patch,
+      correct_fpr32_mapping.patch, debian-archs.patch, dejavu-font.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, gtk-open-filter.patch, interpreter_x86_fldcw.patch,
       jttl_fix_romclosed.patch, load_aidacrate.patch, load_vistatus.patch,
       noexecstack.patch, osd-pause-crash.patch, plugin-searchpath.patch,
       remove-gln64.patch, remove-nondfsg-icons.patch, resume_on_start.patch,
@@ -16,12 +15,13 @@ mupen64plus-video-rice (1.99.3-1) UNRELEASED; urgency=low
       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
+    - Rebase default-optimisations.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
 
- -- 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 18:40:00 +0100
 
 mupen64plus (1.5+dfsg1-7) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..74f56dc
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,49 @@
+Source: mupen64plus-video-rice
+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-video-rice.git
+Vcs-Git: git://git.debian.org/git/collab-maint/mupen64plus-video-rice.git
+Build-Depends: debhelper (>= 7.0.50), libmupen64plus-dev, libsdl1.2-dev,
+ libgl1-mesa-dev | libgl-dev, libpng12-dev | libpng-dev
+
+Package: mupen64plus-video-rice
+Architecture: i386 amd64 kfreebsd-amd64 kfreebsd-i386
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: mupen64plus (<< 1.99.1)
+Replaces: mupen64plus (<< 1.99.1)
+Provides: mupen64plus-video-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-video-rice-dbg
+Section: debug
+Priority: extra
+Architecture: i386 amd64 kfreebsd-amd64 kfreebsd-i386
+Depends: ${misc:Depends},
+ mupen64plus-video-rice (= ${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.
diff --git a/debian/mupen64plus-video-rice.docs b/debian/mupen64plus-video-rice.docs
new file mode 100644
index 0000000..d2753a5
--- /dev/null
+++ b/debian/mupen64plus-video-rice.docs
@@ -0,0 +1,2 @@
+README
+RELEASE
diff --git a/debian/mupen64plus-video-rice.install b/debian/mupen64plus-video-rice.install
new file mode 100644
index 0000000..18c70a5
--- /dev/null
+++ b/debian/mupen64plus-video-rice.install
@@ -0,0 +1,2 @@
+usr/lib/mupen64plus/
+usr/share/mupen64plus/
diff --git a/debian/patches/default-optimisations.patch b/debian/patches/default-optimisations.patch
new file mode 100644
index 0000000..0f70345
--- /dev/null
+++ b/debian/patches/default-optimisations.patch
@@ -0,0 +1,42 @@
+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 231b89a25537d24cd80ca3d077ade8084f88489e..54e393e9ba2ef87d04b873a73b64115921c21adb 100644
+--- a/projects/unix/Makefile
++++ b/projects/unix/Makefile
+@@ -84,8 +84,8 @@ ifeq ("$(CPU)","NONE")
+ endif
+ 
+ # base CFLAGS, LIBS, and LDFLAGS
+-CFLAGS = -Wall -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -I../../src
+-LDFLAGS = -ldl -lpng
++CFLAGS += -Wall -fno-strict-aliasing -I../../src
++LDFLAGS += -ldl -lpng
+ 
+ # 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
+@@ -109,9 +109,9 @@ ifeq ($(OS), LINUX)
+   LDFLAGS += -lGL
+   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 -fomit-frame-pointer
++      CFLAGS += -pipe -mmmx -msse -fomit-frame-pointer
+     endif
+   endif
+ endif
+@@ -126,9 +126,6 @@ ifeq ($(OS), OSX)
+     endif
+   endif
+ endif
+-ifeq ($(CPU), PPC)
+-  CFLAGS += -mcpu=powerpc
+-endif
+ 
+ # test for presence of SDL
+ ifeq ($(shell which sdl-config 2>/dev/null),)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e164d80
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+default-optimisations.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..ec67941
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,28 @@
+#!/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)' APIDIR=/usr/include/mupen64plus/ 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/ install
+
+override_dh_strip:
+	dh_strip -a --dbg-package=mupen64plus-video-rice-dbg
+
+.PHONY: get-orig-source

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-rice.git

