[mupen64plus] 96/262: Use liblzma from debian instead of buildin
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 05:59:21 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 12c724872bb7167b02fea5733581d762cc7a4225
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date: Tue Aug 25 15:24:12 2009 +0200
Use liblzma from debian instead of buildin
---
debian/changelog | 9 ++
debian/control | 2 +-
debian/patches/114-system-liblzma.patch | 189 ++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 200 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 6558d9e..c3feddd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mupen64plus (1.5+dfsg1-2) UNRELEASED; urgency=low
+
+ * debian/patches
+ - Add 114-system-liblzma.patch, use liblzma from debian instead of buildin
+ * debian/control:
+ - Depend on liblzma-dev and pkg-config for lzma and xz support
+
+ -- Sven Eckelmann <sven.eckelmann at gmx.de> Tue, 25 Aug 2009 15:21:33 +0200
+
mupen64plus (1.5+dfsg1-1) unstable; urgency=low
* Initial release (Closes: #513322)
diff --git a/debian/control b/debian/control
index 4c841eb..747571d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7), libsdl1.2-dev,
libsdl-ttf2.0-dev, libfreetype6-dev, libglib2.0-dev, libgtk2.0-dev,
libsamplerate0-dev, libpng12-dev | libpng-dev, libbz2-dev,
zlib1g-dev | libz-dev, libgl1-mesa-dev | libgl-dev,
- libglu1-mesa-dev | libglu-dev, binutils-dev
+ libglu1-mesa-dev | libglu-dev, binutils-dev, pkg-config, liblzma-dev
Package: mupen64plus
Architecture: any
diff --git a/debian/patches/114-system-liblzma.patch b/debian/patches/114-system-liblzma.patch
new file mode 100644
index 0000000..43ced79
--- /dev/null
+++ b/debian/patches/114-system-liblzma.patch
@@ -0,0 +1,189 @@
+From 2e610df0652e2b715afc88bf77e7f7623538d497 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
+
+
+Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
+---
+ Makefile | 8 +++-----
+ main/gui_gtk/main_gtk.c | 3 ++-
+ main/gui_qt4/globals.h | 1 +
+ main/rom.c | 24 ++++++++++--------------
+ main/romcache.c | 2 +-
+ pre.mk | 5 +++++
+ 6 files changed, 22 insertions(+), 21 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index be81163..839ab60 100644
+--- a/Makefile
++++ b/Makefile
+@@ -110,9 +110,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 \
+@@ -237,8 +234,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
+ STATIC_LIBS =
++CFLAGS+=$(LZMA_FLAGS)
+
+ # add extra objects and libraries for selected options
+ ifeq ($(DBG), 1)
+@@ -334,7 +332,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 e8c0fd6..26d8add 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, "*.[zZ]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 3532951..62cd91e 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 74c9643..9f69740 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 5f31cc8..54f8169 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 d2eb261..f596c77 100644
+--- a/pre.mk
++++ b/pre.mk
+@@ -101,6 +101,11 @@ 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
++# set GTK flags and libraries
++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)
+--
+1.6.3.3
+
diff --git a/debian/patches/series b/debian/patches/series
index f5b37a4..20b0e2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
111-rice-texturepack-crash.patch
112-rice-screenflickering.patch
113-static-binutils-libs.patch
+114-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