[mupen64plus-ui-console] 38/172: Rebase patches against 1.99.4

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-ui-console.

commit 5ca7fc8ab36c9a308a7506a091427ad1a389c136
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Wed Nov 24 20:45:40 2010 +0100

    Rebase patches against 1.99.4
---
 debian/changelog                           |  4 +---
 debian/patches/default-optimisations.patch | 13 +++++++------
 debian/patches/hurd_os.patch               | 18 ------------------
 debian/patches/path_max.patch              | 28 ----------------------------
 debian/patches/series                      |  2 --
 5 files changed, 8 insertions(+), 57 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 24ca50b..c0fe7c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,9 +18,7 @@ mupen64plus-ui-console (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
-    - Add hurd_os.patch, Add GNU/Hurd as operating system with "linux" userland
+    - Rebase default-optimisations.patch against 1.99.4
   * Convert to 3.0 (quilt) source format
   * debian/control:
     - Remove unneeded build dependency to quilt
diff --git a/debian/patches/default-optimisations.patch b/debian/patches/default-optimisations.patch
index d71bf4f..816b52c 100644
--- a/debian/patches/default-optimisations.patch
+++ b/debian/patches/default-optimisations.patch
@@ -4,15 +4,15 @@ Author: Sven Eckelmann <sven.eckelmann at gmx.de>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index d7ca29c5977509e45c18b9ac2d57ccb10e147a93..85a0ceaa296d28203510aeb8ca3afae78d1b2813 100644
+index 0d4e5f641b19ce31d2dc295025df2afbaecb9041..b8ab1995a988e5e0518ff6a9ec20918e09bc98da 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -73,15 +73,15 @@ endif
+@@ -76,16 +76,16 @@ endif
  
  # base CFLAGS, LIBS, and LDFLAGS
  CFLAGS += -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -I../../src
--LDFLAGS += -ldl -lpthread
-+LDFLAGS += -ldl
+-LDFLAGS += -lpthread
++LDFLAGS += 
  
  # set special flags per-system
  ifeq ($(OS), LINUX)
@@ -20,13 +20,14 @@ index d7ca29c5977509e45c18b9ac2d57ccb10e147a93..85a0ceaa296d28203510aeb8ca3afae7
      ifeq ($(ARCH_DETECTED), 64BITS)
 -      CFLAGS += -pipe -O3 -march=athlon64
 +      CFLAGS += -pipe
+       LDFLAGS += -ldl
      else
 -      CFLAGS += -pipe -O3 -mmmx -msse -march=i686 -mtune=pentium-m -fomit-frame-pointer
 +      CFLAGS += -pipe -mmmx -msse -fomit-frame-pointer
+       LDFLAGS += -ldl
      endif
    endif
- endif
-@@ -98,9 +98,6 @@ ifeq ($(OS), OSX)
+@@ -103,9 +103,6 @@ ifeq ($(OS), OSX)
      endif
    endif
  endif
diff --git a/debian/patches/hurd_os.patch b/debian/patches/hurd_os.patch
deleted file mode 100644
index 2ec4dd6..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 85a0ceaa296d28203510aeb8ca3afae78d1b2813..8480f9df63711242fe4f812d747a588ee2ad8795 100644
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -29,6 +29,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 2a3cc14..0000000
--- a/debian/patches/path_max.patch
+++ /dev/null
@@ -1,28 +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_preproc.h b/src/osal_preproc.h
-index 2b69de042ee01f6dd3f3e69e69350d9a221b3315..8503ff69821ec2c86b405204507e291a2f8e160c 100644
---- a/src/osal_preproc.h
-+++ b/src/osal_preproc.h
-@@ -54,6 +54,11 @@
-   #define OSAL_DLL_EXTENSION           ".so"
-   #define osal_insensitive_strcmp(x, y) strcasecmp(x, y)
- 
-+  /* PATH_MAX only may be defined by limits.h */
-+  #ifndef PATH_MAX
-+    #define PATH_MAX 4096
-+  #endif
-+
- #endif
- 
- #endif /* #define OSAL_PREPROC_H */
diff --git a/debian/patches/series b/debian/patches/series
index 5fed16e..e164d80 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 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-ui-console.git