[mupen64plus-core] 48/310: Rebase patches against 1.99.4

Thu Nov 26 05:57:08 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 120fb6cc0106e50698364504cc07cb75a4e7bdfd
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Wed Nov 24 20:25:44 2010 +0100

    Rebase patches against 1.99.4
---
 debian/changelog                           |  5 ++--
 debian/patches/default-optimisations.patch | 10 ++++----
 debian/patches/dejavu-font.patch           |  4 +--
 debian/patches/hurd_os.patch               | 18 --------------
 debian/patches/path_max.patch              | 40 ------------------------------
 debian/patches/series                      |  2 --
 6 files changed, 9 insertions(+), 70 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 939ff57..d8edb27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,10 +17,9 @@ mupen64plus-core (1.99.4-1) UNRELEASED; urgency=low
       system-libpng.patch, system-zlib.patch, version-string.patch,
       xdg-basedir.patch, static-binutils-libs.patch, rice_fog.patch,
       ftbfs-gvariant-type-conflicts.patch, dont-install-unneeded.patch,
-      rice-ati-symbols.patch, link_gdk.patch
-    - Rebase default-optimisations.patch, dejavu-font.patch and path_max.patch
+      rice-ati-symbols.patch, link_gdk.patch, path_max.patch
+    - Rebase default-optimisations.patch and dejavu-font.patch
       against 1.99.4~hg20100511
-    - Add hurd_os.patch, Add GNU/Hurd as operating system with "linux" userland
     - Add printf_fixup.patch, Correct usage of printf format strings
   * Convert to 3.0 (quilt) source format
   * debian/control:
diff --git a/debian/patches/default-optimisations.patch b/debian/patches/default-optimisations.patch
index a2fbe80..3b98908 100644
--- a/debian/patches/default-optimisations.patch
+++ b/debian/patches/default-optimisations.patch
@@ -4,17 +4,17 @@ Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 6f9487ffc6c4bf60dcca4af8dc4fa950243f688e..960441e9fadbb42aa8e4c1ede4610fe9f9e01fbc 100644
+index cf8e6ae7d0849ceea929a18b1628d8b50b3020da..5b6d106d1eab917fdbef4a1d9d8531b6ca8eabbe 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -74,15 +74,12 @@ ifeq ("$(CPU)","NONE")
+@@ -77,15 +77,12 @@ 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
- LIBS += -ldl -lpng -lz -lm -lfreetype
+ LIBS += -lpng -lz -lm -lfreetype
  
 -# 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
@@ -26,7 +26,7 @@ index 6f9487ffc6c4bf60dcca4af8dc4fa950243f688e..960441e9fadbb42aa8e4c1ede4610fe9
  # tweak flags for 32-bit build on 64-bit system
  ifeq ($(ARCH_DETECTED), 64BITS_32)
    ifeq ($(OS), FREEBSD)
-@@ -108,9 +105,9 @@ ifeq ($(OS), LINUX)
+@@ -111,9 +108,9 @@ ifeq ($(OS), LINUX)
    LDFLAGS += -Wl,-version-script,$(SRCDIR)/api/api_export.ver
    ifeq ($(CPU), X86)
      ifeq ($(ARCH_DETECTED), 64BITS)
@@ -38,7 +38,7 @@ index 6f9487ffc6c4bf60dcca4af8dc4fa950243f688e..960441e9fadbb42aa8e4c1ede4610fe9
        ifneq ($(PROFILE), 1)
          CFLAGS += -fomit-frame-pointer
        endif
-@@ -134,9 +131,6 @@ ifeq ($(OS), OSX)
+@@ -137,9 +134,6 @@ ifeq ($(OS), OSX)
      endif
    endif
  endif
diff --git a/debian/patches/dejavu-font.patch b/debian/patches/dejavu-font.patch
index 4fce6b0..9658cac 100644
--- a/debian/patches/dejavu-font.patch
+++ b/debian/patches/dejavu-font.patch
@@ -4,10 +4,10 @@ Author: Sven Eckelmann <sven.eckelmann at gmx.de> Please enter the commit message f
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 960441e9fadbb42aa8e4c1ede4610fe9f9e01fbc..ddcf56543fc3a4f1f565309e1c6be620cd2f8ba5 100644
+index 5b6d106d1eab917fdbef4a1d9d8531b6ca8eabbe..76022627dd390aaa94c7f95ae27a3c70d7caac89 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -360,7 +360,7 @@ install: $(TARGET)
+@@ -359,7 +359,7 @@ install: $(TARGET)
  	$(INSTALL) -d -v "$(DESTDIR)$(LIBDIR)"
  	$(INSTALL) -m 0644 $(TARGET) "$(DESTDIR)$(LIBDIR)"
  	$(INSTALL) -d -v "$(DESTDIR)$(SHAREDIR)"
diff --git a/debian/patches/hurd_os.patch b/debian/patches/hurd_os.patch
deleted file mode 100644
index 0fed132..0000000
--- a/debian/patches/hurd_os.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Add GNU/Hurd as operating system with "linux" userland
-Author: Sven Eckelmann <sven.eckelmann at gmx.de>
-
----
-diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index ddcf56543fc3a4f1f565309e1c6be620cd2f8ba5..af9ae714db546894cec458db67f30d643a8442b2 100644
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -30,6 +30,9 @@ endif
- ifeq ("$(UNAME)","linux")
-   OS = LINUX
- endif
-+ifneq ("$(filter GNU hurd,$(UNAME))","")
-+  OS = LINUX
-+endif
- ifeq ("$(UNAME)","Darwin")
-   OS = OSX
- endif
diff --git a/debian/patches/path_max.patch b/debian/patches/path_max.patch
deleted file mode 100644
index 7d4122a..0000000
--- a/debian/patches/path_max.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Add dummy PATH_MAX on systems without it
- Posix only defines that PATH_MAX may is defined through limits.h. GNU/Hurd has
- removed this definition without violating the standards.
- .
- Mupen64Plus still relies on it and we work around that problem by defining
- PATH_MAX as 4096 in all places it is needed. This is not 100% correct as their
- are ways to generate longer paths, but mupen64plus must be heavily refactored
- in some places to fix the actual problem.
-Bug-Debian: http://bugs.debian.org/588066
-Author: Sven Eckelmann <sven.eckelmann at gmx.de>
-
----
-diff --git a/src/osal/files.h b/src/osal/files.h
-index ca1e8ec92753a979f53f83261138cd38f50d0dab..864eca1f712ebb76cc67cf0cf7b8636ab3e3b994 100644
---- a/src/osal/files.h
-+++ b/src/osal/files.h
-@@ -35,6 +35,11 @@
-   #define OSAL_DIR_SEPARATOR           '/'
-   #include <limits.h>  // for PATH_MAX
-   #include <unistd.h>  // for unlink()
-+
-+  /* PATH_MAX only may be defined by limits.h */
-+  #ifndef PATH_MAX
-+    #define PATH_MAX 4096
-+  #endif
- #endif
- 
- extern int osal_mkdirp(const char *dirpath, int mode);
-diff --git a/src/osal/files_unix.c b/src/osal/files_unix.c
-index c151157c1343376c7fbe8f4a9a11a944221b17e6..b17a451dea1a07f78d82110999e48e884bdc6295 100644
---- a/src/osal/files_unix.c
-+++ b/src/osal/files_unix.c
-@@ -29,7 +29,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
--#include <limits.h>
- 
- #include "files.h"
- #include "api/m64p_types.h"
diff --git a/debian/patches/series b/debian/patches/series
index 9ea6570..040b99c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 default-optimisations.patch
 dejavu-font.patch
-hurd_os.patch
-path_max.patch
 printf_fixup.patch

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

