This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus-video-glide64.
commit 3f18080e2eacc919c3019b67e1977ae6d90e385c Author: Sven Eckelmann <[email protected]> Date: Wed Mar 3 19:49:29 2010 +0100 Add initial build support for 1.99.3 --- debian/changelog | 163 +++++++++++++++++++++++++++++ debian/compat | 1 + debian/control | 47 +++++++++ debian/copyright | 24 +++++ debian/gbp.conf | 3 + debian/mupen64plus-video-glide64.docs | 0 debian/mupen64plus-video-glide64.install | 2 + debian/patches/default-optimisations.patch | 42 ++++++++ debian/patches/readonly_ini.patch | 18 ++++ debian/patches/series | 2 + debian/rules | 23 ++++ debian/source/format | 1 + debian/watch | 4 + 13 files changed, 330 insertions(+) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..2ecd055 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,163 @@ +mupen64plus-video-glide64 (0~hg20100228-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, 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, + 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 + - Rebase default-optimisations.patch against 1.99.3 + - Add readonly_ini.patch, Don't try to open shared Glide64.ini with write + access + * 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 <[email protected]> Mon, 15 Feb 2010 18:40:00 +0100 + +mupen64plus (1.5+dfsg1-7) unstable; urgency=low + + * debian/patches: + - Correct minor dep3 patch tagging format problems + - Update correct_fpr32_mapping.patch, prevent corruption of upper registers + in a register pair due to sign extension + - Add system-liblzma.patch, use liblzma from debian instead of buildin + (Closes: #543552) + * debian/control: + - Depend on liblzma-dev for lzma and xz support + + -- Sven Eckelmann <[email protected]> Mon, 19 Oct 2009 12:38:26 +0200 + +mupen64plus (1.5+dfsg1-6) unstable; urgency=low + + * debian/patches: + - Add Origin information to patches + - Update fix_readpng.patch, Backport actual commit from upstream + - Update ftbfs-glibc210.patch, Backport actual commit from upstream + - Update noexecstack.patch, Backport actual commit from upstream + - Update jttl_fix_romclosed.patch, Backport actual commit from upstream + - Add correct_fpr32_mapping.patch, Correct emulation of shared 32 bit wide + and 64 bit wide FPR in MIPS I and MIPS III mode + - Remove load-fpr-location.patch which is replaced by + correct_fpr32_mapping.patch + - Add load_aidacrate.patch, Set aiDacrate during savestate load to fix + slowdowns after savestate load + - Add load_vistatus.patch, Set video width and status during savestate load + - Add fix_r0_override.patch, Don't allow to override r0 register + - Add resume_on_start.patch, Resume when pressing on start when in pause + mode to prevent corruption + - Add osd-pause-crash.patch, Fix OSD crash after pause-stop-start-pause of + emulator + + -- Sven Eckelmann <[email protected]> Thu, 08 Oct 2009 13:29:25 +0200 + +mupen64plus (1.5+dfsg1-5) unstable; urgency=low + + * debian/patches: + - Change to dep3 patch tagging guidelines + - Remove number before patches as order is given by debian/patches/series + - Add gtk-open-filter.patch, Show files with .n64 and .v64 extension in + filtered open file dialog (Closes: #546046) + - Add noexecstack.patch, Don't enable executable stack by default + (Closes: #547644) + - Add fix_readpng.patch, Fix crash when loading png due to reordering + optimizer + - Add jttl_fix_romclosed.patch, Stop audio processing thread before freeing + buffers to fix segfault during stop of emulation + - Add rice_nodebug.patch, Don't enable excessive debug functionality in + rice_video + - Add interpreter_x86_fldcw.patch, Correctly set floating point control word + - Add load-fpr-location.patch, Set register bank location when loading + savestate + + -- Sven Eckelmann <[email protected]> Mon, 28 Sep 2009 15:23:17 +0200 + +mupen64plus (1.5+dfsg1-4) unstable; urgency=low + + * debian/patches; + - Update 119-debian-archs.patch, Correct detection of armel cpu endianness + (Closes: #545463) + - Add 120-ftbfs-glibc210, Fix FTBFS using g++-4.4 and glibc 2.10 due to + missing const keywords (Closes: #545462) + - Add 121-version-string.patch, remove misleading "-development" in version + string + - Add 122-default-optimisations.patch, Don't override optimisations set by + debian build environment + + -- Sven Eckelmann <[email protected]> Tue, 08 Sep 2009 22:17:00 +0200 + +mupen64plus (1.5+dfsg1-3) unstable; urgency=low + + * debian/rules: + - Set host architecture to support build of i386 running on x86_64 kernel + (Closes: #544670) + - Don't set NO_ASM parameter anymore as it is handled by + 119-debian-archs.patch + * debian/patches: + - Add 119-debian-archs.patch, Define wordsize and endianness of + architectures supported by debian (Closes: #544673) + - Update 118-ftbfs-debugger.patch, define dummy functions to decompile + recompiled code on non-x86 architectures (Closes: #544662) + + -- Sven Eckelmann <[email protected]> Wed, 02 Sep 2009 23:18:11 +0200 + +mupen64plus (1.5+dfsg1-2) unstable; urgency=low + + * debian/patches + - Add 114-fix-7z-subfolder.patch, fix crash in romcache when reading 7zip + archive with subfolders + - Add 115-xdg-basedir.patch, Use "XDG Base Directory" compliant directories + for files for each user (Closes: #544428) + - Add 116-ftbfs-dynarec.patch, Don't try to compile dynarec on architectures + without support (Closes: #544548) + - Add 117-ftbfs-kfreebsd.patch, Don't stop compilation due to unknown OS + kFreeBSD (Closes: #544550) + - Add 118-ftbfs-debugger.patch, Define CHECK_MEM for non-x86 systems to + prevent FTBFS due to dynarec checks (Closes: #544549) + * debian/control: + - Depend on libxdg-basedir-dev and pkg-config to support xdg-basedir + specification + * debian/rules: + - Disable assembler optimized parts on unsupported architectures + * Add README.source with information about patch management + * Add NEWS.Debian with information about migration of old data and + configuration to new xdg compliant directories + + -- Sven Eckelmann <[email protected]> Tue, 01 Sep 2009 20:40:30 +0200 + +mupen64plus (1.5+dfsg1-1) unstable; urgency=low + + * Initial release (Closes: #513322) + * debian/patches: + - Add 100-fix-desktop-file.patch, fix desktop file + - Add 101-destdir.patch, fix usage of DESTDIR in install target + - Add 102-plugin-searchpath.patch, add search path for plugins + - Add 103-dejavu-font.patch, use font from ttf-dejavu-core package + - Add 104-as-needed.patch, allow --as-needed to reduce number of linked + libraries + - Add 105-system-libpng.patch, use libpng from debian instead of buildin + - Add 106-system-zlib.patch, use zlib from debian instead of buildin + - Add 107-system-libbz2.patch, use libbz2 from debian instead of buildin + - Add 108-remove-gln64.patch, don't try to build glN64 removed from dfsg tar + - Add 109-remove-nondfsg-icons.patch, don't include non-dfsg icons which are + removed from dfsg tarball + - Add 110-glide64-noasm.patch, don't use x86-asm on non-x86 plattforms + in glide64 + - Add 111-rice-texturepack-crash.patch, Fix crash when loading textures + from texturepacks with rice_video + - Add 112-rice-screenflickering.patch, Reduce screenflickering in some games + when using rice_video + - Add 113-static-binutils-libs.patch, Link static against binutils libraries + with unstable abi + + -- Sven Eckelmann <[email protected]> Mon, 17 Aug 2009 10:18:49 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +7 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..b235fe0 --- /dev/null +++ b/debian/control @@ -0,0 +1,47 @@ +Source: mupen64plus-video-glide64 +Section: games +Priority: optional +Maintainer: Tobias Loose <[email protected]> +Uploaders: Sven Eckelmann <[email protected]> +Homepage: http://code.google.com/p/mupen64plus/ +Standards-Version: 3.8.4 +Vcs-Browser: http://git.debian.org/?p=collab-maint/mupen64plus-video-glide64.git +Vcs-Git: git://git.debian.org/git/collab-maint/mupen64plus-video-glide64.git +Build-Depends: debhelper (>= 7.3.7), libmupen64plus-dev, libsdl1.2-dev, + libgl1-mesa-dev | libgl-dev + +Package: mupen64plus-video-glide64 +Architecture: i386 amd64 kfreebsd-amd64 kfreebsd-i386 +Depends: ${shlibs:Depends}, ${misc:Depends} +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-glide64-dbg +Section: debug +Priority: extra +Architecture: i386 amd64 kfreebsd-amd64 kfreebsd-i386 +Depends: ${misc:Depends}, + mupen64plus-video-glide64 (= ${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/copyright b/debian/copyright new file mode 100644 index 0000000..b657dbc --- /dev/null +++ b/debian/copyright @@ -0,0 +1,24 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Name: mupen64plus-video-glide64 +Maintainer: Jon 'wahrhaft' Ring <[email protected]> +Source: http://bitbucket.org/wahrhaft/mupen64plus-video-glide64/ + +Files: * +Copyright: 2009, Jon 'wahrhaft' Ring <[email protected]> +License: GPL-2+ + +Files: projects/unix/Makefile +Copyright: 2007-2008, Jesse 'DarkJezter' Dean + 2007-2008, Scott 'Tillin9' Knauert + 2007-2009, Richard 'Richard42' Goedeken <[email protected]> + 2010, Jon 'wahrhaft' Ring <[email protected]> +License: GPL-2+ + +Files: debian/* +Copyright: 2009-2010, Sven Eckelmann <[email protected]> + 2009-2010, Tobias Loose <[email protected]> +License: GPL-2+ + +License: GPL-2+ + On Debian systems the full text of the GNU General Public License can be found + in the `/usr/share/common-licenses/GPL-2' file. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..5474c60 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +pristine-tar = True +sign-tags = True diff --git a/debian/mupen64plus-video-glide64.docs b/debian/mupen64plus-video-glide64.docs new file mode 100644 index 0000000..e69de29 diff --git a/debian/mupen64plus-video-glide64.install b/debian/mupen64plus-video-glide64.install new file mode 100644 index 0000000..18c70a5 --- /dev/null +++ b/debian/mupen64plus-video-glide64.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..77cf7a3 --- /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 <[email protected]> + +--- +diff --git a/projects/unix/Makefile b/projects/unix/Makefile +index 17fdbfe0d3c3d39ff12449281c07b656ea2f9a10..1eb7131c211a484ba46425d75a08a1f1af7e2946 100644 +--- a/projects/unix/Makefile ++++ b/projects/unix/Makefile +@@ -80,8 +80,8 @@ ifeq ("$(CPU)","NONE") + endif + + # base CFLAGS, LIBS, and LDFLAGS +-CFLAGS = -Wall -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -I../../src -I../../src/wrapper -DGCC +-LDFLAGS = -ldl -lpng ++CFLAGS += -Wall -fno-strict-aliasing -I../../src -I../../src/wrapper -DGCC ++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 +@@ -105,9 +105,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 +@@ -122,9 +122,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/readonly_ini.patch b/debian/patches/readonly_ini.patch new file mode 100644 index 0000000..cc61e24 --- /dev/null +++ b/debian/patches/readonly_ini.patch @@ -0,0 +1,18 @@ +Description: Don't try to open shared Glide64.ini with write access +Forwarded: not-needed +Author: Sven Eckelmann <[email protected]> + +--- +diff --git a/src/Ini.cpp b/src/Ini.cpp +index 5182909fb8352ffc59227d380d5238349f6359ef..68524a53e41e8efb55ce8b4753e03bbc36abbb03 100644 +--- a/src/Ini.cpp ++++ b/src/Ini.cpp +@@ -137,7 +137,7 @@ BOOL INI_Open () + //strncat (path, "Glide64.ini", PATH_MAX - strlen(path)); + printf("opening %s\n", path); + // Open the file +- ini = fopen (path, "r+b"); ++ ini = fopen (path, "rb"); + if (ini == NULL) + { + printf("Could not find Glide64.ini!\n"); diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..39abfa8 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +default-optimisations.patch +readonly_ini.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..e8f853f --- /dev/null +++ b/debian/rules @@ -0,0 +1,23 @@ +#!/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) +MAKEOPTIONS = UNAME='$(DEB_HOST_ARCH_OS)' HOST_CPU='$(DEB_HOST_GNU_CPU)' APIDIR=/usr/include/mupen64plus/ DEBUG=1 PREFIX=/usr/ + +%: + dh $@ --sourcedirectory="projects/unix" + +get-orig-source: + uscan --verbose --force-download + +override_dh_auto_build: + LDFLAGS='-Wl,--as-needed' dh_auto_build -- all $(MAKEOPTIONS) + +override_dh_auto_install: + dh_auto_install -- $(MAKEOPTIONS) + +override_dh_strip: + dh_strip -a --dbg-package=mupen64plus-video-glide64-dbg + +.PHONY: get-orig-source diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..d87e26b --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +version=3 + +http://bitbucket.org/wahrhaft/mupen64plus-video-glide64/downloads/ \ + /wahrhaft/mupen64plus-video-glide64/downloads/mupen64plus-video-glide64-src-(.*).tar.gz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-glide64.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
