[mupen64plus] 83/262: Revert "Use system unlzma instead of buildin"

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit 88fc203f43f316013b8140359874e95f69bcab49
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Mon Jun 15 09:54:08 2009 +0200

    Revert "Use system unlzma instead of buildin"
---
 debian/changelog                       |  1 -
 debian/control                         |  2 +-
 debian/patches/111-system-unlzma.patch | 52 ----------------------------------
 debian/patches/series                  |  1 -
 4 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d07017..0fae8c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,5 @@ mupen64plus (1.5+dfsg1-1) unstable; urgency=low
       removed from dfsg tarball
     - Add 110-glide64-noasm.patch, don't use x86-asm on non-x86 plattforms
       in glide64
-    - Add 111-system-unlzma.patch, use system unlzma instead of buildin
 
  -- Sven Eckelmann <sven.eckelmann at gmx.de>  Sat, 13 Jun 2009 23:45:54 +0200
diff --git a/debian/control b/debian/control
index 2316be1..1b6130c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Vcs-Browser: http://git.debian.org/?p=collab-maint/mupen64plus.git
 Vcs-Git: git://git.debian.org/git/collab-maint/mupen64plus.git
 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, lzma-dev,
+ libsamplerate0-dev, libpng12-dev | libpng-dev, libbz2-dev,
  zlib1g-dev | libz-dev, libgl1-mesa-dev | libgl-dev,
  libglu1-mesa-dev | libglu-dev
 
diff --git a/debian/patches/111-system-unlzma.patch b/debian/patches/111-system-unlzma.patch
deleted file mode 100644
index bcf39e2..0000000
--- a/debian/patches/111-system-unlzma.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From de2aa1de042bf6e2ac4d78f234ec3a0b6c53456f Mon Sep 17 00:00:00 2001
-From: Sven Eckelmann <sven.eckelmann at gmx.de>
-Date: Sat, 13 Jun 2009 22:37:08 +0200
-Subject: [PATCH] Use liblzma.a from system instead of buildin one
-
-
-Signed-off-by: Sven Eckelmann <sven.eckelmann at gmx.de>
----
- Makefile             |    3 +--
- main/7zip/7zDecode.c |    4 ++--
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 4926931..fb4adcf 100644
---- a/Makefile
-+++ b/Makefile
-@@ -122,7 +122,6 @@ OBJ_CORE = \
- 	main/7zip/7zIn.o \
- 	main/7zip/7zItem.o \
- 	main/7zip/7zMain.o \
--	main/7zip/LzmaDecode.o \
- 	main/7zip/BranchX86.o \
- 	main/7zip/BranchX86_2.o \
- 	memory/dma.o \
-@@ -237,7 +236,7 @@ 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) -lbz2 -lunlzma_r
- 
- # add extra objects and libraries for selected options
- ifeq ($(DBG), 1)
-diff --git a/main/7zip/7zDecode.c b/main/7zip/7zDecode.c
-index 58d3223..c100eeb 100755
---- a/main/7zip/7zDecode.c
-+++ b/main/7zip/7zDecode.c
-@@ -24,9 +24,9 @@
- 
- #include "7zDecode.h"
- #ifdef _SZ_ONE_DIRECTORY
--#include "LzmaDecode.h"
-+#include <LzmaDecode.h>
- #else
--#include "LzmaDecode.h"
-+#include <LzmaDecode.h>
- #include "BranchX86.h"
- #include "BranchX86_2.h"
- #endif
--- 
-1.6.3.1
-
diff --git a/debian/patches/series b/debian/patches/series
index e686369..26acd18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +9,3 @@
 108-remove-gln64.patch
 109-remove-nondfsg-icons.patch
 110-glide64-noasm.patch
-111-system-unlzma.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git