This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus-video-z64.
commit 2c892ad9fd908077b9442853b238d709e218cd7a Merge: 62c70b8 1936e02 Author: Sven Eckelmann <[email protected]> Date: Sat Jan 22 10:24:16 2011 +0100 Merge commit 'upstream/1.99.4' debian/changelog | 4 ++-- debian/patches/default-optimisations.patch | 8 ++++---- debian/patches/hurd_os.patch | 4 ++-- projects/unix/Makefile | 5 +++++ src/maingl.cpp | 2 +- 5 files changed, 14 insertions(+), 9 deletions(-) diff --cc debian/changelog index 6a7f974,0000000..16a5d8d mode 100644,000000..100644 --- a/debian/changelog +++ b/debian/changelog @@@ -1,271 -1,0 +1,271 @@@ - mupen64plus-video-z64 (1.99.4~hg20100403-1) UNRELEASED; urgency=low ++mupen64plus-video-z64 (1.99.4-1) UNRELEASED; urgency=low + - * New Upstream Snapshot from revision a6e71c3106d1 ++ * New Upstream Version + * Updated my maintainer e-mail address + * Split source package to match upstreams modular release packages + * debian/copyright: + - Update to DEP5 revision 164 + - Update copyright years + * debian/patches: + - Add hurd_os.patch, Add GNU/Hurd as operating system with "linux" userland + - Add printf_fixup.patch, Correct usage of printf format strings + - Rebase default-optimisations.patch against 1.99.4~hg20100403 + - Remove upstream merged patches: as-needed.patch, + correct_fpr32_mapping.patch, correct_security_printf.patch, + debian-archs.patch, dejavu-font.patch, destdir.patch, + dont-install-unneeded.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-gvariant-type-conflicts.patch, ftbfs-kfreebsd.patch, + glide64_hurd.patch, glide64-noasm.patch, gtk-open-filter.patch, + interpreter_x86_fldcw.patch, jttl_fix_romclosed.patch, link_gdk.patch, + load_aidacrate.patch, load_vistatus.patch, noexecstack.patch, + optional_signinfo.patch, osd-pause-crash.patch, path_max.patch, + pie_support.patch, plugin-searchpath.patch, remove-gln64.patch, + remove-nondfsg-icons.patch, resume_on_start.patch, rice-ati-symbols.patch, + rice-crash-vendorstring.patch, rice_fog.patch, rice_nodebug.patch, + rice-screenflickering.patch, rice-texturepack-crash.patch, + rsp_hle_bigendian.patch, rsp_ucode2_reset.patch, + static-binutils-libs.patch, system-libbz2.patch, system-liblzma.patch, + system-libpng.patch, system-zlib.patch, version-string.patch, + xdg-basedir.patch + + -- Sven Eckelmann <[email protected]> Mon, 15 Feb 2010 18:40:00 +0100 + +mupen64plus (1.5+dfsg1-14) experimental; urgency=low + + * Upgraded to policy 3.9.1, no changes required + * Upgrade debhelper compat to v8 + * debian/rules: + - set *FLAGS using dpkg-buildflags in debian/rules to work like + dpkg-buildpackage when called directly + - Use hardening-includes for CFLAGS and LDFLAGS hardened builds + - Use externally provided LDFLAGS + - Disable support for debugger due to missing pic/pie support of + libopcodes.a + * debian/patches: + - Add correct_security_printf.patch, Correct possible printf format string + vulnerability + - Add pie_support.patch, Add support for PIE/PIC + + -- Sven Eckelmann <[email protected]> Thu, 23 Sep 2010 13:52:32 +0200 + +mupen64plus (1.5+dfsg1-13) unstable; urgency=low + + * debian/patches: + - Add path_max.patch, Add dummy PATH_MAX on systems without it (Closes: + #588066) + - Add optional_signinfo.patch, Only use siginfo subsystem if system offers + it (Closes: #588066) + - Add glide64_hurd.patch, Define GNU/Hurd as UNIX system for glide64 + (Closes: #588066) + + -- Sven Eckelmann <[email protected]> Mon, 12 Jul 2010 23:20:02 +0200 + +mupen64plus (1.5+dfsg1-12) unstable; urgency=low + + * Use googlecode.debian.net instead of complex own filters for debian/watch + * Upgraded to policy 3.9.0, no changes required + * Build only on i386/amd64 because upstream doesn't to support more + * debian/patches: + - Add link_gdk.patch, Link directly against gdk-2.0 instead indirectly + through gtk+-2.0 + + -- Sven Eckelmann <[email protected]> Mon, 28 Jun 2010 21:31:48 +0200 + +mupen64plus (1.5+dfsg1-11) unstable; urgency=low + + * debian/patches: + - Rename ftbfs-gvariant-type-conflicts.path to + ftbfs-gvariant-type-conflicts.patch + - Add rice-ati-symbols.patch, Allow to load rice on systems with missing + opengl extensions + + -- Sven Eckelmann <[email protected]> Sun, 23 May 2010 11:55:23 +0200 + +mupen64plus (1.5+dfsg1-10) unstable; urgency=low + + [ Sven Eckelmann ] + * debian/patches: + - Add rsp_ucode2_reset.patch, Reset status of specific ucode2 hacks after + starting again + - Add rsp_hle_bigendian.patch, Fix wrong high level emulation of rsp on big + endian systems + - Add rice-crash-vendorstring.patch, Don't crash on long OpenGL vendor + string (Closes: #580480, LP: #575968) + + [ Piotr Ożarowski ] + * DMUA flag set to yes + + -- Sven Eckelmann <[email protected]> Thu, 06 May 2010 11:34:46 +0200 + +mupen64plus (1.5+dfsg1-9) unstable; urgency=low + + * debian/patches: + - Add ftbfs-gvariant-type-conflicts.path, Fix FTBFS due to glib's gvariant.h + type definitions (Closes: #577329) + - Add dont-install-unneeded.patch, Don't install files which aren't used by + us + * debian/rules: + - Enable parallel builds using dh's --parallel + - Inform about missing installed files using dh's --list-missing + - Share options between dh_auto_build and dh_auto_install + * debian/control: + - Depend on debhelper 7.4.10 for --parallel and --list-missing + + -- Sven Eckelmann <[email protected]> Sun, 11 Apr 2010 12:23:04 +0200 + +mupen64plus (1.5+dfsg1-8) unstable; urgency=low + + * debian/patches: + - Add rice_fog.patch, Reduce flickering when enabling fog in rice + - Update fix_readpng.patch, Fix FTBFS with libpng14 and remove coding style + only changes + * Convert to 3.0 (quilt) source format + * Remove outdated README.source + * debian/control: + - Remove shlibs:Depends for binary packages without shared libs dependencies + - Remove unneeded build dependency to quilt + - Upgraded to policy 3.8.4, no changes required + * Correct spelling errors found by lintian + * debian/copyright: Update copyright years + * Check all files ever published on the download page in debian/watch + + -- Sven Eckelmann <[email protected]> Mon, 15 Mar 2010 16:22:03 +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 --cc debian/patches/default-optimisations.patch index 113ab9e,0000000..c266953 mode 100644,000000..100644 --- a/debian/patches/default-optimisations.patch +++ b/debian/patches/default-optimisations.patch @@@ -1,40 -1,0 +1,40 @@@ +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 cee356aa824bd61368adf383e0b274e440a8728c..7eebe440b233664933be2505e66750e8b8ac12a4 100644 ++index 983c2655158bb4dfb954a97f7992bb09ae34d140..b7d824684c642c3e360e3efaba5c8fda316f7a46 100644 +--- a/projects/unix/Makefile ++++ b/projects/unix/Makefile - @@ -85,7 +85,7 @@ ifeq ("$(CPU)","NONE") ++@@ -90,7 +90,7 @@ ifeq ("$(CPU)","NONE") + endif + + # base CFLAGS, LIBS, and LDFLAGS +-CFLAGS += -Wall -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -fvisibility=hidden -I../../src ++CFLAGS += -Wall -fno-strict-aliasing -fvisibility=hidden -I../../src + CXXFLAGS += -fvisibility-inlines-hidden + LDFLAGS += -ldl -lGLEW + - @@ -113,9 +113,9 @@ ifeq ($(OS), LINUX) ++@@ -118,9 +118,9 @@ ifeq ($(OS), LINUX) + LDFLAGS += -Wl,-version-script,$(SRCDIR)/video_api_export.ver + 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 - @@ -130,9 +130,6 @@ ifeq ($(OS), OSX) ++@@ -135,9 +135,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 --cc debian/patches/hurd_os.patch index 11a70c8,0000000..e5b2bcf mode 100644,000000..100644 --- a/debian/patches/hurd_os.patch +++ b/debian/patches/hurd_os.patch @@@ -1,20 -1,0 +1,20 @@@ +Description: Add GNU/Hurd as operating system with "linux" userland +Author: Sven Eckelmann <[email protected]> + +--- +diff --git a/projects/unix/Makefile b/projects/unix/Makefile - index 7eebe440b233664933be2505e66750e8b8ac12a4..b7d824684c642c3e360e3efaba5c8fda316f7a46 100644 ++index b7d824684c642c3e360e3efaba5c8fda316f7a46..d0a32e26ae83d6ba02cf2e38d91946c88e8f3da2 100644 +--- a/projects/unix/Makefile ++++ b/projects/unix/Makefile - @@ -35,6 +35,11 @@ ifeq ("$(UNAME)","linux") ++@@ -40,6 +40,11 @@ ifneq ("$(filter GNU hurd,$(UNAME))","") + SO_EXTENSION = so + SHARED = -shared + endif ++ifneq ("$(filter GNU hurd,$(UNAME))","") ++ OS = LINUX ++ SO_EXTENSION = so ++ SHARED = -shared ++endif + ifeq ("$(UNAME)","Darwin") + OS = OSX + SO_EXTENSION = dylib -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-z64.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
