This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-glide64.
commit dc09103cdd4e610f26ee451b5df12ec6cc769cd4
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date: Sun Apr 4 22:55:30 2010 +0200
Rebase patches against 1.99.4~hg20100403
---
debian/changelog | 4 +---
debian/patches/default-optimisations.patch | 20 +++++++++-----------
debian/patches/readonly_ini.patch | 18 ------------------
debian/patches/series | 1 -
4 files changed, 10 insertions(+), 33 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index df5e807..21d210f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,9 +16,7 @@ mupen64plus-video-glide64 (1.99.4~hg20100403-1) UNRELEASED; urgency=low
rice-texturepack-crash.patch, static-binutils-libs.patch,
system-libbz2.patch, system-liblzma.patch, system-libpng.patch,
system-zlib.patch, version-string.patch, xdg-basedir.patch, rice_fog.patch
- - Rebase default-optimisations.patch against 1.99.3
- - Add readonly_ini.patch, Don't try to open shared Glide64.ini with write
- access
+ - Rebase default-optimisations.patch against 1.99.4~hg20100403
* 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 77cf7a3..fd973b5 100644
--- a/debian/patches/default-optimisations.patch
+++ b/debian/patches/default-optimisations.patch
@@ -4,22 +4,20 @@ Author: Sven Eckelmann <sven.eckelmann at gmx.de>
---
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 17fdbfe0d3c3d39ff12449281c07b656ea2f9a10..1eb7131c211a484ba46425d75a08a1f1af7e2946 100644
+index f1f2dbcea9ee403b0c1a952192cef153139907e2..24e68a36ce46053da66aff336d1876545eeb0fad 100644
--- a/projects/unix/Makefile
+++ b/projects/unix/Makefile
-@@ -80,8 +80,8 @@ ifeq ("$(CPU)","NONE")
+@@ -85,7 +85,7 @@ ifeq ("$(CPU)","NONE")
endif
# base CFLAGS, LIBS, and LDFLAGS
--CFLAGS = -Wall -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -I../../src -I../../src/wrapper -DGCC
--LDFLAGS = -ldl -lpng
-+CFLAGS += -Wall -fno-strict-aliasing -I../../src -I../../src/wrapper -DGCC
-+LDFLAGS += -ldl -lpng
+-CFLAGS += -Wall -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -fvisibility=hidden -I../../src -I../../src/wrapper -DGCC
++CFLAGS += -Wall -fno-strict-aliasing -fvisibility=hidden -I../../src -I../../src/wrapper -DGCC
+ CXXFLAGS += -fvisibility-inlines-hidden
+ LDFLAGS += -ldl
- # 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
-@@ -105,9 +105,9 @@ ifeq ($(OS), LINUX)
- LDFLAGS += -lGL
+@@ -113,9 +113,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
@@ -30,7 +28,7 @@ index 17fdbfe0d3c3d39ff12449281c07b656ea2f9a10..1eb7131c211a484ba46425d75a08a1f1
endif
endif
endif
-@@ -122,9 +122,6 @@ ifeq ($(OS), OSX)
+@@ -130,9 +130,6 @@ ifeq ($(OS), OSX)
endif
endif
endif
diff --git a/debian/patches/readonly_ini.patch b/debian/patches/readonly_ini.patch
deleted file mode 100644
index cc61e24..0000000
--- a/debian/patches/readonly_ini.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Don't try to open shared Glide64.ini with write access
-Forwarded: not-needed
-Author: Sven Eckelmann <sven.eckelmann at gmx.de>
-
----
-diff --git a/src/Ini.cpp b/src/Ini.cpp
-index 5182909fb8352ffc59227d380d5238349f6359ef..68524a53e41e8efb55ce8b4753e03bbc36abbb03 100644
---- a/src/Ini.cpp
-+++ b/src/Ini.cpp
-@@ -137,7 +137,7 @@ BOOL INI_Open ()
- //strncat (path, "Glide64.ini", PATH_MAX - strlen(path));
- printf("opening %s\n", path);
- // Open the file
-- ini = fopen (path, "r+b");
-+ ini = fopen (path, "rb");
- if (ini == NULL)
- {
- printf("Could not find Glide64.ini!\n");
diff --git a/debian/patches/series b/debian/patches/series
index 39abfa8..e164d80 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
default-optimisations.patch
-readonly_ini.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-glide64.git