[mupen64plus] 104/262: Reorder patch files
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:59:22 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.
commit 8e469137df2752285d29f366c931503ad3239f71
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date: Tue Sep 1 17:33:38 2009 +0200
Reorder patch files
---
debian/changelog | 11 ++++----
...-subfolder.patch => 114-fix-7z-subfolder.patch} | 7 +++--
...116-xdg-basedir.patch => 115-xdg-basedir.patch} | 27 +++++++++----------
...ftbfs-dynarec.patch => 116-ftbfs-dynarec.patch} | 6 ++---
...stem-liblzma.patch => 117-system-liblzma.patch} | 31 +++++++++++-----------
debian/patches/series | 8 +++---
6 files changed, 44 insertions(+), 46 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 42c5d3a..18263a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,20 @@
mupen64plus (1.5+dfsg1-2) UNRELEASED; urgency=low
* debian/patches
- - Add 114-system-liblzma.patch, use liblzma from debian instead of buildin
- (Closes: #543552)
- - Add 115-fix-7z-subfolder.patch, fix crash in romcache when reading 7zip
+ - Add 114-fix-7z-subfolder.patch, fix crash in romcache when reading 7zip
archive with subfolders
- - Add 116-xdg-basedir.patch, Use "XDG Base Directory" compliant directories
+ - Add 115-xdg-basedir.patch, Use "XDG Base Directory" compliant directories
for files for each user (Closes: #544428)
- - Add 117-ftbfs-dynarec.patch, Don't try to compile dynarec on architectures
+ - Add 116-ftbfs-dynarec.patch, Don't try to compile dynarec on architectures
without dynarec support (Closes: #544548)
+ - Add 117-system-liblzma.patch, use liblzma from debian instead of buildin
+ (Closes: #543552)
* debian/control:
- Depend on liblzma-dev and pkg-config for lzma and xz support
- Depend on libxdg-basedir-dev to support xdg-basedir standard
* Add README.source with informations about patch management
* Add NEWS.Debian with information about migration of old data and
configuration to new xdg compliant directories
- *
-- Sven Eckelmann <sven.eckelmann at gmx.de> Tue, 25 Aug 2009 15:21:33 +0200
diff --git a/debian/patches/115-fix-7z-subfolder.patch b/debian/patches/114-fix-7z-subfolder.patch
similarity index 81%
rename from debian/patches/115-fix-7z-subfolder.patch
rename to debian/patches/114-fix-7z-subfolder.patch
index 963858f..9f603db 100644
--- a/debian/patches/115-fix-7z-subfolder.patch
+++ b/debian/patches/114-fix-7z-subfolder.patch
@@ -1,19 +1,18 @@
-From 9cd178b17fa2b552f68c16e71a5d513bd3f05bd3 Mon Sep 17 00:00:00 2001
+From d47c2f2289468f2a1588c572171854d95469177f Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann at gmx.de>
Date: Wed, 26 Aug 2009 23:48:26 +0200
Subject: [PATCH] Don't segfault when caching 7z archive with subfolders
-
Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
---
main/rom.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/main/rom.c b/main/rom.c
-index 9f69740..0f2e95f 100644
+index 74c9643..2772545 100644
--- a/main/rom.c
+++ b/main/rom.c
-@@ -411,6 +411,8 @@ unsigned char* load_archive_rom(const char* filename, int* romsize, unsigned cha
+@@ -415,6 +415,8 @@ unsigned char* load_archive_rom(const char* filename, int* romsize, unsigned cha
printf("7zip Error# %d\n", status);
break;
}
diff --git a/debian/patches/116-xdg-basedir.patch b/debian/patches/115-xdg-basedir.patch
similarity index 98%
rename from debian/patches/116-xdg-basedir.patch
rename to debian/patches/115-xdg-basedir.patch
index 79c678a..d9d4b8d 100644
--- a/debian/patches/116-xdg-basedir.patch
+++ b/debian/patches/115-xdg-basedir.patch
@@ -1,4 +1,4 @@
-From 1561fa13d87d6d6fe59374406e538bb8a4cfa028 Mon Sep 17 00:00:00 2001
+From 2492ef7700bb2f1fb787c24d2c54c07d18d92eb5 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann at gmx.de>
Date: Mon, 31 Aug 2009 23:29:24 +0200
Subject: [PATCH] Use XDG Base Directory compliant directories
@@ -37,7 +37,7 @@ that platform was not changed.
Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
---
- Makefile | 4 +-
+ Makefile | 3 +-
blight_input/Input_1.1.h | 22 +++++++
doc/Audio_1.1.h | 22 +++++++
doc/Audio_1.2.h | 22 +++++++
@@ -58,21 +58,20 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
rice_video/TextureFilters.cpp | 8 +-
rice_video/Video.cpp | 80 +++++++++++++++++++++++++-
rsp_hle/Audio_1.1.h | 22 +++++++
- 21 files changed, 474 insertions(+), 32 deletions(-)
+ 21 files changed, 474 insertions(+), 31 deletions(-)
diff --git a/Makefile b/Makefile
-index 839ab60..76c6489 100644
+index be81163..dac741e 100644
--- a/Makefile
+++ b/Makefile
-@@ -234,9 +234,9 @@ SHARE = $(shell grep CONFIG_PATH config.h | cut -d '"' -f 2)
+@@ -237,8 +237,9 @@ SHARE = $(shell grep CONFIG_PATH config.h | cut -d '"' -f 2)
# set primary objects and libraries for all outputs
ALL = mupen64plus $(PLUGINS)
OBJECTS = $(OBJ_CORE) $(OBJ_DYNAREC) $(OBJ_OPENGL)
--LIBS = $(SDL_LIBS) $(LIBGL_LIBS) $(LZMA_LIBS) -lbz2
-+LIBS = $(SDL_LIBS) $(LIBGL_LIBS) $(LZMA_LIBS) $(XDGBASEDIR_LIBS) -lbz2
+-LIBS = $(SDL_LIBS) $(LIBGL_LIBS) -lbz2
++LIBS = $(SDL_LIBS) $(LIBGL_LIBS) $(XDGBASEDIR_LIBS) -lbz2
STATIC_LIBS =
--CFLAGS+=$(LZMA_FLAGS)
-+CFLAGS+=$(LZMA_FLAGS) $(XDGBASEDIR_FLAGS)
++CFLAGS+= $(XDGBASEDIR_FLAGS)
# add extra objects and libraries for selected options
ifeq ($(DBG), 1)
@@ -720,7 +719,7 @@ index 35f4f43..4b6264a 100644
const char *audio_name,
const char *input_name,
diff --git a/main/romcache.c b/main/romcache.c
-index 54f8169..2b41bdf 100644
+index 5f31cc8..5ec3f40 100644
--- a/main/romcache.c
+++ b/main/romcache.c
@@ -258,7 +258,7 @@ int rom_cache_system(void* _arg)
@@ -733,12 +732,12 @@ index 54f8169..2b41bdf 100644
}
diff --git a/pre.mk b/pre.mk
-index 0a2d965..d0b332e 100644
+index d2eb261..5c7b73c 100644
--- a/pre.mk
+++ b/pre.mk
-@@ -110,6 +110,15 @@ endif
- LZMA_FLAGS = $(shell pkg-config liblzma --cflags)
- LZMA_LIBS = $(shell pkg-config liblzma --libs)
+@@ -101,6 +101,15 @@ GTK_FLAGS = $(shell pkg-config gtk+-2.0 --cflags)
+ GTK_LIBS = $(shell pkg-config gtk+-2.0 --libs)
+ GTHREAD_LIBS = $(shell pkg-config gthread-2.0 --libs)
+# test for presence of libxdg-basedir
+ifeq ("$(shell pkg-config libxdg-basedir --modversion )", "")
diff --git a/debian/patches/117-ftbfs-dynarec.patch b/debian/patches/116-ftbfs-dynarec.patch
similarity index 92%
rename from debian/patches/117-ftbfs-dynarec.patch
rename to debian/patches/116-ftbfs-dynarec.patch
index cd2d0cd..7127f1a 100644
--- a/debian/patches/117-ftbfs-dynarec.patch
+++ b/debian/patches/116-ftbfs-dynarec.patch
@@ -1,4 +1,4 @@
-From 640af01e873cab03a811c37bc3b2a247bb5f12b4 Mon Sep 17 00:00:00 2001
+From 312a8ee05deb0716aac8dec6695a28542b0ba92c Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann at gmx.de>
Date: Tue, 1 Sep 2009 14:14:53 +0200
Subject: [PATCH] Don't try to compile dynarec with not unknown dynarec architecture
@@ -12,10 +12,10 @@ Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/Makefile b/Makefile
-index 76c6489..cdf6380 100644
+index dac741e..01493e6 100644
--- a/Makefile
+++ b/Makefile
-@@ -154,22 +154,24 @@ ifneq ($(NO_ASM), 1)
+@@ -157,22 +157,24 @@ ifneq ($(NO_ASM), 1)
DYNAREC = x86
endif
endif
diff --git a/debian/patches/114-system-liblzma.patch b/debian/patches/117-system-liblzma.patch
similarity index 91%
rename from debian/patches/114-system-liblzma.patch
rename to debian/patches/117-system-liblzma.patch
index fc7a24e..752e814 100644
--- a/debian/patches/114-system-liblzma.patch
+++ b/debian/patches/117-system-liblzma.patch
@@ -1,4 +1,4 @@
-From 99c3d4e67b8f00bcd3d233e242a3a246faad84ec Mon Sep 17 00:00:00 2001
+From d9c6af0b9dbe969e264dfa5ed84a734926d89503 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann at gmx.de>
Date: Tue, 25 Aug 2009 15:19:39 +0200
Subject: [PATCH] Use liblzma from system instead of buildin one
@@ -6,16 +6,16 @@ Subject: [PATCH] Use liblzma from system instead of buildin one
Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
---
- Makefile | 8 +++-----
+ Makefile | 9 +++------
main/gui_gtk/main_gtk.c | 3 ++-
main/gui_qt4/globals.h | 1 +
main/rom.c | 24 ++++++++++--------------
main/romcache.c | 2 +-
pre.mk | 9 +++++++++
- 6 files changed, 26 insertions(+), 21 deletions(-)
+ 6 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/Makefile b/Makefile
-index be81163..839ab60 100644
+index 01493e6..766c582 100644
--- a/Makefile
+++ b/Makefile
@@ -110,9 +110,6 @@ OBJ_CORE = \
@@ -28,18 +28,19 @@ index be81163..839ab60 100644
main/7zip/7zAlloc.o \
main/7zip/7zBuffer.o \
main/7zip/7zCrc.o \
-@@ -237,8 +234,9 @@ SHARE = $(shell grep CONFIG_PATH config.h | cut -d '"' -f 2)
+@@ -239,9 +236,9 @@ SHARE = $(shell grep CONFIG_PATH config.h | cut -d '"' -f 2)
# set primary objects and libraries for all outputs
ALL = mupen64plus $(PLUGINS)
OBJECTS = $(OBJ_CORE) $(OBJ_DYNAREC) $(OBJ_OPENGL)
--LIBS = $(SDL_LIBS) $(LIBGL_LIBS) -lbz2
-+LIBS = $(SDL_LIBS) $(LIBGL_LIBS) $(LZMA_LIBS) -lbz2
+-LIBS = $(SDL_LIBS) $(LIBGL_LIBS) $(XDGBASEDIR_LIBS) -lbz2
++LIBS = $(SDL_LIBS) $(LIBGL_LIBS) $(LZMA_LIBS) $(XDGBASEDIR_LIBS) -lbz2
STATIC_LIBS =
-+CFLAGS+=$(LZMA_FLAGS)
+-CFLAGS+= $(XDGBASEDIR_FLAGS)
++CFLAGS+= $(LZMA_FLAGS) $(XDGBASEDIR_FLAGS)
# add extra objects and libraries for selected options
ifeq ($(DBG), 1)
-@@ -334,7 +332,7 @@ endif
+@@ -337,7 +334,7 @@ endif
clean-core:
ifneq ($(OS), WINDOWS)
$(RM_F) ./r4300/*.o ./r4300/x86/*.o ./r4300/x86_64/*.o ./memory/*.o ./debugger/*.o ./opengl/*.o
@@ -81,7 +82,7 @@ index 3532951..62cd91e 100644
QStringList romDirectories();
QIcon icon(QString iconName);
diff --git a/main/rom.c b/main/rom.c
-index 74c9643..9f69740 100644
+index 2772545..0f2e95f 100644
--- a/main/rom.c
+++ b/main/rom.c
@@ -29,7 +29,7 @@
@@ -156,7 +157,7 @@ index 74c9643..9f69740 100644
romread = 1;
}
diff --git a/main/romcache.c b/main/romcache.c
-index 5f31cc8..54f8169 100644
+index 5ec3f40..2b41bdf 100644
--- a/main/romcache.c
+++ b/main/romcache.c
@@ -76,7 +76,7 @@ static char cache_filename[PATH_MAX];
@@ -169,7 +170,7 @@ index 5f31cc8..54f8169 100644
static void scan_dir(const char* dirname, int* romcounter);
diff --git a/pre.mk b/pre.mk
-index d2eb261..0a2d965 100644
+index 5c7b73c..d0b332e 100644
--- a/pre.mk
+++ b/pre.mk
@@ -101,6 +101,15 @@ GTK_FLAGS = $(shell pkg-config gtk+-2.0 --cflags)
@@ -185,9 +186,9 @@ index d2eb261..0a2d965 100644
+LZMA_FLAGS = $(shell pkg-config liblzma --cflags)
+LZMA_LIBS = $(shell pkg-config liblzma --libs)
+
- # set Qt flags and libraries
- # some distros append -qt4 to the binaries so look for those first
- ifeq ($(GUI), QT4)
+ # test for presence of libxdg-basedir
+ ifeq ("$(shell pkg-config libxdg-basedir --modversion )", "")
+ $(error No libxdg-basedir development libraries found!)
--
1.6.3.3
diff --git a/debian/patches/series b/debian/patches/series
index 6de220e..61399c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,7 +12,7 @@
111-rice-texturepack-crash.patch
112-rice-screenflickering.patch
113-static-binutils-libs.patch
-114-system-liblzma.patch
-115-fix-7z-subfolder.patch
-116-xdg-basedir.patch
-117-ftbfs-dynarec.patch
+114-fix-7z-subfolder.patch
+115-xdg-basedir.patch
+116-ftbfs-dynarec.patch
+117-system-liblzma.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git
More information about the Pkg-games-commits
mailing list