[mupen64plus] 154/262: Merge commit 'debian/1.5+dfsg1-6' into experimental
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:59:29 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 e89750b3eee288a7e60d25b039079a3c962934d6
Merge: 82519d5 05203b4
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date: Sat Oct 10 06:22:55 2009 +0200
Merge commit 'debian/1.5+dfsg1-6' into experimental
Conflicts:
debian/changelog
debian/changelog | 29 ++-
debian/patches/fix_r0_override.patch | 467 +++++++++++++++++++++++++++++++++++
debian/patches/load_aidacrate.patch | 178 +++++++++++++
debian/patches/load_vistatus.patch | 135 ++++++++++
debian/patches/osd-pause-crash.patch | 71 ++++++
debian/patches/resume_on_start.patch | 24 ++
debian/patches/series | 7 +-
debian/patches/system-liblzma.patch | 2 +-
8 files changed, 904 insertions(+), 9 deletions(-)
diff --cc debian/changelog
index 5acfea0,b7631b7..4f3db9b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,6 +1,16 @@@
- mupen64plus (1.5+dfsg1-6) UNRELEASED; urgency=low
++mupen64plus (1.5+dfsg1-7) UNRELEASED; urgency=low
+
++ * debian/patches:
++ - Add system-liblzma.patch, use liblzma from debian instead of buildin
++ (Closes: #543552)
++ * debian/control:
++ - Depend on liblzma-dev for lzma and xz support
++
++ -- Sven Eckelmann <sven.eckelmann at gmx.de> Sat, 10 Oct 2009 06:21:07 +0200
++
+ mupen64plus (1.5+dfsg1-6) unstable; urgency=low
+
+ * debian/patches:
- Add Origin information to patches
- Update fix_readpng.patch, Backport actual commit from upstream
- Update ftbfs-glibc210.patch, Backport actual commit from upstream
diff --cc debian/patches/series
index ca64fbc,59e99aa..e25eb7a
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -27,5 -27,9 +27,10 @@@ fix_readpng.patc
jttl_fix_romclosed.patch
rice_nodebug.patch
interpreter_x86_fldcw.patch
- system-liblzma.patch
correct_fpr32_mapping.patch
+ load_aidacrate.patch
+ load_vistatus.patch
+ fix_r0_override.patch
+ resume_on_start.patch
+ osd-pause-crash.patch
++system-liblzma.patch
diff --cc debian/patches/system-liblzma.patch
index e51f44a,0000000..da2e9a1
mode 100644,000000..100644
--- a/debian/patches/system-liblzma.patch
+++ b/debian/patches/system-liblzma.patch
@@@ -1,181 -1,0 +1,181 @@@
+Description: Use liblzma from system instead of buildin one
+Bug: http://code.google.com/p/mupen64plus/issues/detail?id=255
+Bug-Debian: http://bugs.debian.org/543552
+Author: Sven Eckelmann <sven.eckelmann at gmx.de>
+
+---
+diff --git a/Makefile b/Makefile
+index 2368afa38816069f4fd176c1936c23f40d277095..59e0f4cefe29e702c894bea5edb321d3681a76e5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -103,9 +103,6 @@ OBJ_CORE = \
+ main/savestates.o \
+ main/zip/ioapi.o \
+ main/zip/unzip.o \
+- main/lzma/buffer.o \
+- main/lzma/io.o \
+- main/lzma/main.o \
+ main/7zip/7zAlloc.o \
+ main/7zip/7zBuffer.o \
+ main/7zip/7zCrc.o \
+@@ -232,9 +229,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) $(XDGBASEDIR_LIBS) -lbz2
++LIBS = $(SDL_LIBS) $(LIBGL_LIBS) $(LZMA_LIBS) $(XDGBASEDIR_LIBS) -lbz2
+ STATIC_LIBS =
+-CFLAGS+= $(XDGBASEDIR_FLAGS)
++CFLAGS+= $(LZMA_FLAGS) $(XDGBASEDIR_FLAGS)
+
+ # add extra objects and libraries for selected options
+ ifeq ($(DBG), 1)
+@@ -330,7 +327,7 @@ endif
+ clean-core:
+ ifneq ($(OS), WINDOWS)
+ $(RM_F) ./r4300/*.o ./r4300/x86/*.o ./r4300/x86_64/*.o ./memory/*.o ./debugger/*.o ./opengl/*.o
+- $(RM_F) ./main/*.o ./main/version.h ./main/zip/*.o ./main/lzma/*.o ./main/7zip/*.o ./main/gui_gtk/*.o ./main/gui_gtk/debugger/*.o
++ $(RM_F) ./main/*.o ./main/version.h ./main/zip/*.o ./main/7zip/*.o ./main/gui_gtk/*.o ./main/gui_gtk/debugger/*.o
+ $(RM_F) mupen64plus mupen64plus.desktop
+ $(RM_F) main/gui_qt4/moc_* main/gui_qt4/ui_*.h main/gui_qt4/*.o main/gui_qt4/*.a main/gui_qt4/Makefile
+ $(RM_F) translations/*.qm
+diff --git a/main/gui_gtk/main_gtk.c b/main/gui_gtk/main_gtk.c
- index 41d382ebd2650dd48f5b93bf788ee32fca26e807..2583533e75d6e1379b814517a571d5748100b622 100644
++index 66f6777069564031e560b9194123038194f36f9a..c1363b7a0d152186cdc6442227133c57cd278f19 100644
+--- a/main/gui_gtk/main_gtk.c
++++ b/main/gui_gtk/main_gtk.c
+@@ -423,13 +423,14 @@ static void callback_open_rom(GtkWidget* widget, gpointer data)
+
+ /* Add filter for rom file types. */
+ GtkFileFilter* file_filter = gtk_file_filter_new();
+- gtk_file_filter_set_name(file_filter, "N64 ROM (*.z64, *.v64, *.n64, *.gz, *.zip. *.bz2, *.lzma *.7z)");
++ gtk_file_filter_set_name(file_filter, "N64 ROM (*.z64, *.v64, *.n64, *.gz, *.zip. *.bz2, *.lzma *.xz *.7z)");
+ gtk_file_filter_add_mime_type(file_filter, "application/x-gzip");
+ gtk_file_filter_add_mime_type(file_filter, "application/zip");
+ gtk_file_filter_add_mime_type(file_filter, "application/x-bzip2");
+ gtk_file_filter_add_mime_type(file_filter, "application/x-7z");
+ gtk_file_filter_add_pattern(file_filter, "*.[zZnNvV]64");
+ gtk_file_filter_add_pattern(file_filter, "*.lzma");
++ gtk_file_filter_add_pattern(file_filter, "*.xz");
+ gtk_file_filter_add_pattern(file_filter, "*.7z");
+
+ gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(file_chooser), file_filter);
+diff --git a/main/gui_qt4/globals.h b/main/gui_qt4/globals.h
+index 3532951d78a97f259ec5db55cd2ce068aa91c0de..62cd91e96d4b4d6a47a9a36c5a2d172200a881c7 100644
+--- a/main/gui_qt4/globals.h
++++ b/main/gui_qt4/globals.h
+@@ -34,6 +34,7 @@ const QStringList RomExtensions = QStringList() << "*.rom"
+ << "*.n64"
+ << "*.bz2"
+ << "*.lzma"
++ << "*.xz"
+ << "*.7z";
+ QStringList romDirectories();
+ QIcon icon(QString iconName);
+diff --git a/main/rom.c b/main/rom.c
+index 2772545a45eda189f88476f6097aef3a065a663e..0f2e95ff3a35e5cab25d95c175d5b1b2daa18613 100644
+--- a/main/rom.c
++++ b/main/rom.c
+@@ -29,7 +29,7 @@
+
+ #include "zip/unzip.h"
+ #include <bzlib.h>
+-#include "lzma/lzmadec.h"
++#include <lzma.h>
+ #include "7zip/7zExtract.h"
+ #include "7zip/7zCrc.h"
+
+@@ -188,18 +188,14 @@ unsigned char* load_single_rom(const char* filename, int* romsize, unsigned char
+ /* LZMA roms. */
+ fseek(romfile, 0L, SEEK_SET);
+ int lzmastatus;
+- lzmadec_stream stream;
+- stream.lzma_alloc = NULL;
+- stream.lzma_free = NULL;
+- stream.opaque = NULL;
+- stream.avail_in = 0;
+- stream.next_in = NULL;
++ lzma_stream stream = LZMA_STREAM_INIT;
++ const uint64_t MAX_LZMA_BYTES = 256*1024*1024;
+
+ /* Minimum size to get decoded blocks back is 45.
+ LZMA has 13 byte headers, likely 32 byte internal buffer. */
+ unsigned char* buffer_in = (unsigned char*)malloc(45*sizeof(unsigned char));
+ unsigned char* buffer_out = (unsigned char*)malloc(45*128*sizeof(unsigned char));
+- if(buffer_in==NULL||buffer_out==NULL||lzmadec_init(&stream)!=LZMADEC_OK)
++ if(buffer_in==NULL||buffer_out==NULL||lzma_auto_decoder(&stream, MAX_LZMA_BYTES, 0)!=LZMA_OK)
+ {
+ fprintf(stderr, "%s, %d: Out of memory!\n", __FILE__, __LINE__);
+ return NULL;
+@@ -212,8 +208,8 @@ unsigned char* load_single_rom(const char* filename, int* romsize, unsigned char
+ stream.next_out = buffer_out;
+ stream.avail_out = 45;
+
+- lzmastatus = lzmadec_decode (&stream, (stream.avail_in==0));
+- if(lzmastatus==LZMADEC_OK&&is_valid_rom(buffer_out))
++ lzmastatus = lzma_code (&stream, (stream.avail_in==0)?LZMA_FINISH:LZMA_RUN);
++ if(lzmastatus==LZMA_OK&&is_valid_rom(buffer_out))
+ {
+ *compressiontype = LZMA_COMPRESSION;
+ int oldsize;
+@@ -229,14 +225,14 @@ unsigned char* load_single_rom(const char* filename, int* romsize, unsigned char
+ }
+
+ memcpy(localrom,buffer_out, *romsize);
+- while(lzmastatus==LZMADEC_OK)
++ while(lzmastatus==LZMA_OK)
+ {
+ fread(buffer_in, sizeof(unsigned char), CHUNKSIZE, romfile);
+ stream.next_in = buffer_in;
+ stream.avail_in = CHUNKSIZE;
+ stream.next_out = buffer_out;
+ stream.avail_out = CHUNKSIZE*128;
+- lzmastatus = lzmadec_decode (&stream, (stream.avail_in==0));
++ lzmastatus = lzma_code (&stream, (stream.avail_in==0)?LZMA_FINISH:LZMA_RUN);
+
+ oldsize = *romsize;
+ *romsize += CHUNKSIZE*128-stream.avail_out;
+@@ -250,9 +246,9 @@ unsigned char* load_single_rom(const char* filename, int* romsize, unsigned char
+ memcpy(localrom+oldsize,buffer_out,CHUNKSIZE*128-stream.avail_out);
+ }
+
+- if(lzmastatus==LZMADEC_STREAM_END)
++ if(lzmastatus==LZMA_STREAM_END)
+ {
+- lzmadec_end(&stream);
++ lzma_end(&stream);
+ localrom = (unsigned char*)realloc(localrom,*loadlength*sizeof(unsigned char));
+ romread = 1;
+ }
+diff --git a/main/romcache.c b/main/romcache.c
+index 5ec3f4024173f940f0d1168e588561271dda48c3..2b41bdf25dc5c7952191586ed83c34cf7465ab97 100644
+--- a/main/romcache.c
++++ b/main/romcache.c
+@@ -76,7 +76,7 @@ static char cache_filename[PATH_MAX];
+
+ static const char* romextensions[] =
+ {
+- ".v64", ".z64", ".n64", ".gz", ".zip", ".bz2", ".lzma", ".7z", NULL
++ ".v64", ".z64", ".n64", ".gz", ".zip", ".bz2", ".lzma", ".xz",".7z", NULL
+ };
+
+ static void scan_dir(const char* dirname, int* romcounter);
+diff --git a/pre.mk b/pre.mk
+index d2083403872123c8cd2a87e050cf850e208dfa0a..dd6e58fb421deb770402288d1af6da4c2cdc0a17 100644
+--- a/pre.mk
++++ b/pre.mk
+@@ -212,6 +212,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 liblzma
++ifeq ("$(shell pkg-config liblzma --modversion )", "")
++ $(error No liblzma development libraries found!)
++endif
++
++# set LZMA flags and libraries
++LZMA_FLAGS = $(shell pkg-config liblzma --cflags)
++LZMA_LIBS = $(shell pkg-config liblzma --libs)
++
+ # test for presence of libxdg-basedir
+ ifeq ("$(shell pkg-config libxdg-basedir --modversion )", "")
+ $(error No libxdg-basedir development libraries found!)
--
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