[mupen64plus-video-arachnoid] 35/147: Merge commit 'upstream/1.99.4'

Sven Eckelmann ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:09:45 UTC 2015


This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-arachnoid.

commit fde2ff1cced1143652cc5730d4b86eeaab498658
Merge: 57773e4 919b636
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Jan 22 10:23:21 2011 +0100

    Merge commit 'upstream/1.99.4'

 debian/changelog                           |  4 ++--
 debian/patches/default-optimisations.patch | 10 +++++-----
 debian/patches/hurd_os.patch               |  4 ++--
 projects/msvc9/GraphicsPlugin.sln          |  0
 projects/msvc9/GraphicsPlugin.vcproj       |  0
 projects/unix/Makefile                     |  5 +++++
 src/Assembler/assembler.h                  |  0
 src/Combiner/AdvancedCombinerManager.cpp   |  0
 src/Combiner/AdvancedCombinerManager.h     |  0
 src/Combiner/AdvancedTexEnvCombiner.cpp    |  0
 src/Combiner/AdvancedTexEnvCombiner.h      |  0
 src/Combiner/CombinerBase.cpp              |  0
 src/Combiner/CombinerBase.h                |  0
 src/Combiner/CombinerCache.cpp             |  0
 src/Combiner/CombinerCache.h               |  0
 src/Combiner/CombinerStageCreator.cpp      |  0
 src/Combiner/CombinerStageCreator.h        |  0
 src/Combiner/CombinerStageMerger.cpp       |  0
 src/Combiner/CombinerStageMerger.h         |  0
 src/Combiner/CombinerStructs.h             |  0
 src/Combiner/DummyCombiner.cpp             |  0
 src/Combiner/DummyCombiner.h               |  0
 src/Combiner/SimpleTexEnvCombiner.cpp      |  0
 src/Combiner/SimpleTexEnvCombiner.h        |  0
 src/DisplayListParser.cpp                  |  0
 src/DisplayListParser.h                    |  0
 src/ExtensionChecker.cpp                   |  0
 src/ExtensionChecker.h                     |  0
 src/FogManager.cpp                         |  0
 src/FogManager.h                           |  0
 src/GBI/GBI.cpp                            |  0
 src/GBI/GBI.h                              |  0
 src/GBI/GBIDefs.h                          |  0
 src/GraphicsPlugin.cpp                     |  0
 src/GraphicsPlugin.h                       |  0
 src/Memory.cpp                             |  0
 src/Memory.h                               |  0
 src/MultiTexturingExt.cpp                  |  0
 src/MultiTexturingExt.h                    |  0
 src/N64Games.h                             |  0
 src/OpenGL.h                               |  0
 src/OpenGLManager.cpp                      |  0
 src/OpenGLManager.h                        |  0
 src/RDP/RDP.cpp                            |  0
 src/RDP/RDP.h                              |  0
 src/RDP/RDPInstructions.cpp                |  0
 src/RDP/RDPInstructions.h                  |  0
 src/RDP/RDPUCodeStructs.h                  |  0
 src/RSP/RSP.cpp                            |  0
 src/RSP/RSP.h                              |  0
 src/RSP/RSPLightManager.cpp                |  0
 src/RSP/RSPLightManager.h                  |  0
 src/RSP/RSPMatrixManager.cpp               |  0
 src/RSP/RSPMatrixManager.h                 |  0
 src/RSP/RSPVertexManager.cpp               |  0
 src/RSP/RSPVertexManager.h                 |  0
 src/RomDetector.cpp                        |  0
 src/RomDetector.h                          |  0
 src/SecondaryColorExt.cpp                  |  0
 src/SecondaryColorExt.h                    |  0
 src/UCodeDefs.h                            |  0
 src/VI.cpp                                 |  0
 src/VI.h                                   |  0
 src/config/Config.cpp                      |  0
 src/config/Config.h                        |  0
 src/config/ConfigMap.h                     |  0
 src/config/StringFunctions.cpp             |  0
 src/config/StringFunctions.h               |  0
 src/config/StringValue.h                   |  0
 src/framebuffer/FrameBuffer.cpp            |  0
 src/framebuffer/FrameBuffer.h              |  0
 src/hash/CRCCalculator.cpp                 |  0
 src/hash/CRCCalculator.h                   |  0
 src/hash/CRCCalculator2.cpp                |  0
 src/hash/CRCCalculator2.h                  |  0
 src/log/Logger.cpp                         |  0
 src/log/Logger.h                           |  0
 src/m64p.h                                 |  0
 src/main.cpp                               |  2 +-
 src/math/MathLib.h                         |  0
 src/math/Matrix4.cpp                       |  0
 src/math/Matrix4.h                         |  0
 src/osal_dynamiclib.h                      |  0
 src/osal_dynamiclib_unix.cpp               |  0
 src/osal_dynamiclib_win32.cpp              |  0
 src/renderer/OpenGL2DRenderer.cpp          |  0
 src/renderer/OpenGL2DRenderer.h            |  0
 src/renderer/OpenGLRenderer.cpp            |  0
 src/renderer/OpenGLRenderer.h              |  0
 src/texture/CachedTexture.cpp              |  0
 src/texture/CachedTexture.h                |  0
 src/texture/ImageFormatSelector.cpp        |  0
 src/texture/ImageFormatSelector.h          |  0
 src/texture/TextureCache.cpp               |  0
 src/texture/TextureCache.h                 |  0
 src/texture/TextureLoader.cpp              |  0
 src/texture/TextureLoader.h                |  0
 src/ucodes/UCode0.cpp                      |  0
 src/ucodes/UCode0.h                        |  0
 src/ucodes/UCode1.cpp                      |  0
 src/ucodes/UCode1.h                        |  0
 src/ucodes/UCode10.cpp                     |  0
 src/ucodes/UCode10.h                       |  0
 src/ucodes/UCode2.cpp                      |  0
 src/ucodes/UCode2.h                        |  0
 src/ucodes/UCode3.cpp                      |  0
 src/ucodes/UCode3.h                        |  0
 src/ucodes/UCode4.cpp                      |  0
 src/ucodes/UCode4.h                        |  0
 src/ucodes/UCode5.cpp                      |  0
 src/ucodes/UCode5.h                        |  0
 src/ucodes/UCode6.cpp                      |  0
 src/ucodes/UCode6.h                        |  0
 src/ucodes/UCode7.cpp                      |  0
 src/ucodes/UCode7.h                        |  0
 src/ucodes/UCode8.cpp                      |  0
 src/ucodes/UCode8.h                        |  0
 src/ucodes/UCode9.cpp                      |  0
 src/ucodes/UCode9.h                        |  0
 src/ucodes/UCodeIdentificationData.h       |  0
 src/ucodes/UCodeSelector.cpp               |  0
 src/ucodes/UCodeSelector.h                 |  0
 src/utils/MemoryLeakDetector.h             |  0
 123 files changed, 15 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index e590bed,0000000..604c18c
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,270 -1,0 +1,270 @@@
- mupen64plus-video-arachnoid (1.99.4~hg20100403-1) UNRELEASED; urgency=low
++mupen64plus-video-arachnoid (1.99.4-1) UNRELEASED; urgency=low
 +
-   * New Upstream Snapshot from revision 9303884602db
++  * 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
 +    - 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 <sven at narfation.org>  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 <sven at narfation.org>  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 <sven at narfation.org>  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 <sven at narfation.org>  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 <sven at narfation.org>  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 <sven at narfation.org>  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 <sven at narfation.org>  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 <sven at narfation.org>  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 <sven at narfation.org>  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 <sven at narfation.org>  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 <sven at narfation.org>  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 <sven at narfation.org>  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 <sven at narfation.org>  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 <sven at narfation.org>  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 <sven at narfation.org>  Mon, 17 Aug 2009 10:18:49 +0200
diff --cc debian/patches/default-optimisations.patch
index 7a62974,0000000..57850dc
mode 100644,000000..100644
--- a/debian/patches/default-optimisations.patch
+++ b/debian/patches/default-optimisations.patch
@@@ -1,55 -1,0 +1,55 @@@
 +Description: Don't override optimisations set by build environment
 +Forwarded: not-needed
 +Author: Sven Eckelmann <sven at narfation.org>
 +
 +---
 +diff --git a/projects/unix/Makefile b/projects/unix/Makefile
- index f452fd6eb0dd2d2be7b7cd91e5bb49050dcc4f6d..e4b5ecdd731e6edaab8bb902d0ff904824bd78f0 100644
++index 762c0318deb37dab32d8b3d3f41937803d0704a7..001a9abf50494e8ad77ee44c8a383cba15b7d0e1 100755
 +--- a/projects/unix/Makefile
 ++++ b/projects/unix/Makefile
- @@ -74,12 +74,12 @@ ifneq ("$(filter ppc64 powerpc64,$(HOST_CPU))","")
++@@ -79,12 +79,12 @@ ifneq ("$(filter ppc64 powerpc64,$(HOST_CPU))","")
 + endif
 + 
 + # base CFLAGS, LIBS, and LDFLAGS
 +-CFLAGS += -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -fvisibility=hidden -I../../src \
 ++CFLAGS += -fno-strict-aliasing -fvisibility=hidden -I../../src \
 + 		 -I../../src/hash -I../../src/ucodes -I../../src/GBI -I../../src/RDP -I../../src/utils \
 + 		 -I../../src/log -I../../src/RSP -I../../src/framebuffer -I../../src/math -I../../src/renderer \
 + 		 -I../../src/Assembler -I../../src/texture -I../../src/config -I../../src/Combiner 
 + ifneq ($(OS), FREEBSD)
 +-  CFLAGS += -pipe -O3
 ++  CFLAGS += -pipe
 + endif
 + CXXFLAGS += -fvisibility-inlines-hidden
 + 
- @@ -133,9 +133,9 @@ endif
++@@ -138,9 +138,9 @@ endif
 + ifneq ($(OS), FREEBSD)
 +   ifeq ($(CPU), X86)
 +     ifeq ($(ARCH_DETECTED), 64BITS)
 +-      CFLAGS += -march=athlon64
 ++      CFLAGS += 
 +     else
 +-      CFLAGS += -mmmx -msse -march=i686 -mtune=pentium-m -fomit-frame-pointer
 ++      CFLAGS += -mmmx -msse -fomit-frame-pointer
 +     endif
 +     # tweak flags for 32-bit build on 64-bit system
 +     ifeq ($(ARCH_DETECTED), 64BITS_32)
- @@ -148,9 +148,6 @@ else
++@@ -153,9 +153,6 @@ else
 +     $(error Do not use the BITS=32 option with FreeBSD, use -m32 and -m elf_i386)
 +   endif
 + endif
 +-ifeq ($(CPU), PPC)
 +-  CFLAGS += -mcpu=powerpc
 +-endif
 + 
 + # set shell function names
 + # set shell function names
- @@ -166,7 +163,7 @@ endif
++@@ -171,7 +168,7 @@ endif
 + 
 + # set special flags for given Makefile parameters
 + ifeq ($(DEBUG),1)
 +-  CFLAGS += -g  -fno-inline -Werror
 ++  CFLAGS += -g
 +   STRIP = true # disable binary strip
 + endif
 + 
diff --cc debian/patches/hurd_os.patch
index 3f755d5,0000000..ffdc8b6
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 <sven at narfation.org>
 +
 +---
 +diff --git a/projects/unix/Makefile b/projects/unix/Makefile
- index e4b5ecdd731e6edaab8bb902d0ff904824bd78f0..001a9abf50494e8ad77ee44c8a383cba15b7d0e1 100644
++index 001a9abf50494e8ad77ee44c8a383cba15b7d0e1..8699d3132a558a109928caee05b78d822c5e38c5 100755
 +--- a/projects/unix/Makefile
 ++++ b/projects/unix/Makefile
- @@ -32,6 +32,11 @@ ifeq ("$(UNAME)","linux")
++@@ -37,6 +37,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
 +   LDFLAGS += -liconv -lpng

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



More information about the Pkg-games-commits mailing list