[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master-experimental, updated. debian/0.8.D.3-1-9-g82daea0

[Stephen Kitt]

The following commit has been merged in the master-experimental branch:
commit 169bc2d961523a1bdc7e773c43f8a0046e29fa2b
Author: Stephen Kitt <steve at sk2.org>
Date:   Mon Apr 18 11:29:46 2011 +0200

    Use system minilzo.

diff --git a/debian/changelog b/debian/changelog
index fc16acd..48aaae3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ mednafen (0.9.17.1-1) experimental; urgency=low
     Genesis / Mega Drive, Virtual Boy, and Super Nintendo Entertainment
     System.
   * Use external libvorbisidec instead of the bundled copy.
+  * Use external minilzo instead of the bundled copy.
 
  -- Stephen Kitt <steve at sk2.org>  Wed, 13 Apr 2011 22:33:57 +0200
 
diff --git a/debian/control b/debian/control
index a54d240..fb3d03f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Build-Depends: debhelper (>= 5), autotools-dev, x11proto-core-dev,
  libsndfile1-dev | libsndfile-dev,
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libjack-dev,
- libvorbisidec-dev
+ libvorbisidec-dev,
+ liblzo2-dev
 Standards-Version: 3.9.1
 Homepage: http://mednafen.sourceforge.net
 Vcs-Git: git://git.debian.org/git/pkg-games/mednafen.git
diff --git a/debian/rules b/debian/rules
index 90d9e7b..b90ead8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,13 @@ build: build-stamp
 build-stamp:  config.status
 	dh_testdir
 
+	# Update MiniLZO
+	cp src/compress/lzoconf.h src/compress/lzoconf.h.orig
+	cp src/compress/lzodefs.h src/compress/lzodefs.h.orig
+	cp src/compress/minilzo.c src/compress/minilzo.c.orig
+	cp src/compress/minilzo.h src/compress/minilzo.h.orig
+	cp /usr/share/lzo/minilzo/*.[ch] src/compress
+
 	# Add here commands to compile the package.
 	CFLAGS="$(CFLAGS) -Wl,-z,defs" CXXFLAGS="$(CFLAGS) -Wl,-z,defs"  $(MAKE)
 
@@ -45,6 +52,12 @@ clean:
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || make distclean
 
+	# Restore MiniLZO
+	[ ! -f src/compress/lzoconf.h.orig ] || mv src/compress/lzoconf.h.orig src/compress/lzoconf.h
+	[ ! -f src/compress/lzodefs.h.orig ] || mv src/compress/lzodefs.h.orig src/compress/lzodefs.h
+	[ ! -f src/compress/minilzo.c.orig ] || mv src/compress/minilzo.c.orig src/compress/minilzo.c
+	[ ! -f src/compress/minilzo.h.orig ] || mv src/compress/minilzo.h.orig src/compress/minilzo.h
+
 	dh_clean config.log m4/Makefile
 
 install: build

-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine