[mupen64plus-video-rice] 37/191: Rebase patches against 1.99.4

Thu Nov 26 06:17:14 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 7e3cf75c3afb368c1b243a6fb7376a71f80b1554
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Wed Nov 24 20:52:00 2010 +0100

    Rebase patches against 1.99.4
---
 debian/changelog                           |  3 +-
 debian/patches/default-optimisations.patch | 10 +++---
 debian/patches/hurd_os.patch               |  4 +--
 debian/patches/path_max.patch              | 57 ------------------------------
 debian/patches/series                      |  1 -
 5 files changed, 8 insertions(+), 67 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e738903..d7f90c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,7 @@ mupen64plus-video-rice (1.99.4-1) UNRELEASED; urgency=low
       system-zlib.patch, version-string.patch, xdg-basedir.patch,
       rice_fog.patch, ftbfs-gvariant-type-conflicts.patch,
       dont-install-unneeded.patch, rice-ati-symbols.patch, link_gdk.patch
-    - Rebase default-optimisations.patch and path_max.patch against
-      1.99.4~hg20100403
+    - Rebase default-optimisations.patch against 1.99.4
     - Add hurd_os.patch, Add GNU/Hurd as operating system with "linux" userland
   * Convert to 3.0 (quilt) source format
   * debian/control:
diff --git a/debian/patches/default-optimisations.patch b/debian/patches/default-optimisations.patch
index 011966e..f198d64 100644
--- a/debian/patches/default-optimisations.patch
+++ b/debian/patches/default-optimisations.patch
@@ -4,19 +4,19 @@ Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 84febf78ca47e59b4dc8369bd9bc30f77aba2744..1758f9db0c1a9ad5cd127b347838e4415d2b37d5 100644
+index cc275e6f2dd4a02ef3a404789bf7cf56cbfc10c7..59771db3d22b89e7094d4ed99757bb29e575b620 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -84,7 +84,7 @@ ifeq ("$(CPU)","NONE")
+@@ -89,7 +89,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 -lpng
+ LDFLAGS += -lpng
  
-@@ -112,9 +112,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)
@@ -28,7 +28,7 @@ index 84febf78ca47e59b4dc8369bd9bc30f77aba2744..1758f9db0c1a9ad5cd127b347838e441
      endif
    endif
  endif
-@@ -129,9 +129,6 @@ ifeq ($(OS), OSX)
+@@ -135,9 +135,6 @@ ifeq ($(OS), OSX)
      endif
    endif
  endif
diff --git a/debian/patches/hurd_os.patch b/debian/patches/hurd_os.patch
index 435d622..32b7010 100644
--- a/debian/patches/hurd_os.patch
+++ b/debian/patches/hurd_os.patch
@@ -3,10 +3,10 @@ Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 1758f9db0c1a9ad5cd127b347838e4415d2b37d5..d77d9c3e6723e3e91bedf121d7861e3290485bb6 100644
+index 59771db3d22b89e7094d4ed99757bb29e575b620..3f8768be7cb28bc91fc8a568c937f021963e3a9b 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -34,6 +34,11 @@ ifeq ("$(UNAME)","linux")
+@@ -39,6 +39,11 @@ ifneq ("$(filter GNU hurd,$(UNAME))","")
    SO_EXTENSION = so
    SHARED = -shared
  endif
diff --git a/debian/patches/path_max.patch b/debian/patches/path_max.patch
deleted file mode 100644
index 87a3079..0000000
--- a/debian/patches/path_max.patch
+++ /dev/null
@@ -1,57 +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/Config.cpp b/src/Config.cpp
-index 032544322af554bfa2edf26fc5cc651ce0d940f4..68efb603949b98e62d096111adbcea26a3a5ae9a 100644
---- a/src/Config.cpp
-+++ b/src/Config.cpp
-@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #include <fstream>
- 
- #include <stdlib.h>
--#include <limits.h> // PATH_MAX
- 
- #include "osal_preproc.h"
- #include "m64p_types.h"
-diff --git a/src/osal_files.h b/src/osal_files.h
-index 6965bea7924665d75dd34bfb59ae9f844cca6cee..9b464499a50b0d837188981be3c04c3c83579aa4 100644
---- a/src/osal_files.h
-+++ b/src/osal_files.h
-@@ -40,10 +40,15 @@ extern "C" {
-   #include <limits.h>  // for PATH_MAX
-   #define OSAL_DIR_SEPARATOR_STR       "/"
-   #define OSAL_DIR_SEPARATOR_CHAR      '/'
-+
-+  /* PATH_MAX only may be defined by limits.h */
-+  #ifndef PATH_MAX
-+    #define PATH_MAX 4096
-+  #endif
- #endif
- 
- int osal_is_directory(const char* name);
--int osal_mkdirp(const char *dirpath, int mode);
-+int osal_mkdirp(const char *dirpath, int mode);
- 
- void * osal_search_dir_open(const char *pathname);
- const char *osal_search_dir_read_next(void * dir_handle);
-diff --git a/src/osal_files_unix.c b/src/osal_files_unix.c
-index 2c8c562c488373ce1ed5283d295ee2dce8d895ca..c586f9796d3666a49c6ccb97793805d00be7d51c 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> // PATH_MAX
- #include <dirent.h>
- 
- #include "osal_files.h"
diff --git a/debian/patches/series b/debian/patches/series
index 5fed16e..16e335d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 default-optimisations.patch
 hurd_os.patch
-path_max.patch

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

