[mupen64plus] 105/262: Remove 117-system-liblzma.patch due to missing xz-utils in unstable
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 1ea60c58f1715c9cc5d1dd95026e28cdc4f19416
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date: Tue Sep 1 17:35:52 2009 +0200
Remove 117-system-liblzma.patch due to missing xz-utils in unstable
---
debian/changelog | 6 +-
debian/control | 3 +-
debian/patches/117-system-liblzma.patch | 194 --------------------------------
debian/patches/series | 1 -
4 files changed, 3 insertions(+), 201 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 18263a8..05e8d7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,11 +7,9 @@ mupen64plus (1.5+dfsg1-2) UNRELEASED; urgency=low
for files for each user (Closes: #544428)
- 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
+ - Depend on libxdg-basedir-dev and pkg-config to support xdg-basedir
+ specification
* 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
diff --git a/debian/control b/debian/control
index 89a51d3..fdb839a 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +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, pkg-config, liblzma-dev,
- libxdg-basedir-dev
+ libglu1-mesa-dev | libglu-dev, binutils-dev, pkg-config, libxdg-basedir-dev
Package: mupen64plus
Architecture: any
diff --git a/debian/patches/117-system-liblzma.patch b/debian/patches/117-system-liblzma.patch
deleted file mode 100644
index 752e814..0000000
--- a/debian/patches/117-system-liblzma.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-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
-
-
-Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- 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(+), 22 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 01493e6..766c582 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 \
-@@ -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) $(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)
-@@ -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
-- $(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 2772545..0f2e95f 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 5ec3f40..2b41bdf 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 5c7b73c..d0b332e 100644
---- a/pre.mk
-+++ b/pre.mk
-@@ -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 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!)
---
-1.6.3.3
-
diff --git a/debian/patches/series b/debian/patches/series
index 61399c6..f769f4c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,4 +15,3 @@
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