[SCM] milkytracker/master: Add disable-lha-support patch
ghedo-guest at users.alioth.debian.org
ghedo-guest at users.alioth.debian.org
Wed Dec 29 19:12:42 UTC 2010
The following commit has been merged in the master branch:
commit f78c334af16026c97aaf34bc2c37ed8926f2815b
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date: Wed Dec 29 18:26:24 2010 +0100
Add disable-lha-support patch
diff --git a/debian/patches/0003-disable-lha-support.patch b/debian/patches/0003-disable-lha-support.patch
new file mode 100644
index 0000000..ed86150
--- /dev/null
+++ b/debian/patches/0003-disable-lha-support.patch
@@ -0,0 +1,165 @@
+From: Alessandro Ghedini <al3xbio at gmail.com>
+Date: Wed, 29 Dec 2010 16:44:03 +0100
+Subject: [PATCH] disable lha support
+
+Support to LHA compression has been disabled due to dependencies on the
+non-free lha sources (see lha Debian package).
+---
+ src/compression/Makefile.am | 15 ++++++---------
+ src/compression/Makefile.in | 34 +++++++---------------------------
+ src/tracker/Makefile.am | 4 +---
+ src/tracker/Makefile.in | 4 +---
+ 4 files changed, 15 insertions(+), 42 deletions(-)
+
+diff --git a/src/compression/Makefile.am b/src/compression/Makefile.am
+index 5b19cf3..0cb00af 100644
+--- a/src/compression/Makefile.am
++++ b/src/compression/Makefile.am
+@@ -1,22 +1,19 @@
+ noinst_LIBRARIES = libcompression.a
+
+ libcompression_a_SOURCES = PP20.cpp ZipExtractor.cpp zziplib/MyIO.cpp \
+-Decompressor.cpp DecompressorUMX.cpp DecompressorPP20.cpp lha/unlha.cpp \
+-DecompressorZIP.cpp DecompressorLHA.cpp DecompressorGZIP.cpp \
++Decompressor.cpp DecompressorUMX.cpp DecompressorPP20.cpp \
++DecompressorZIP.cpp DecompressorGZIP.cpp \
+ DecompressorLZX.cpp unlzx.cpp
+
+-noinst_HEADERS = PP20.h ZipExtractor.h zziplib/MyIO.h DecompressorLHA.h \
++noinst_HEADERS = PP20.h ZipExtractor.h zziplib/MyIO.h \
+ DecompressorUMX.h DecompressorGZIP.h AIFFWriter.h Decompressor.h \
+-DecompressorPP20.h DecompressorQT.h lha/lharc.h DecompressorZIP.h \
+-DecompressorLZX.h unlzx.h \
+-lha/dhuf.inl lha/extract.inl lha/header.inl lha/huf.inl lha/larc.inl \
+-lha/lharc.h lha/lhext.inl lha/maketbl.inl lha/shuf.inl lha/slidehuf.h \
+-lha/slide.inl lha/unlha32.h
++DecompressorPP20.h DecompressorQT.h DecompressorZIP.h \
++DecompressorLZX.h unlzx.h
+
+ EXTRA_DIST = DecompressorQT.mm AIFFWriter.m
+
+ INCLUDES = -I$(top_srcdir)/src/milkyplay -I$(top_srcdir)/src/ppui \
+ -I$(top_srcdir)/src/ppui/osinterface/posix/ \
+--I$(top_srcdir)/src/compression/lha -I$(top_srcdir)/src/compression/zziplib/
++-I$(top_srcdir)/src/compression/zziplib/
+
+ #INCLUDES = -I../ppui -I../ppui/osinterface -I../ppui/osinterface/posix
+diff --git a/src/compression/Makefile.in b/src/compression/Makefile.in
+index 25a979b..bde5db8 100644
+--- a/src/compression/Makefile.in
++++ b/src/compression/Makefile.in
+@@ -52,8 +52,7 @@ libcompression_a_LIBADD =
+ am_libcompression_a_OBJECTS = PP20.$(OBJEXT) ZipExtractor.$(OBJEXT) \
+ MyIO.$(OBJEXT) Decompressor.$(OBJEXT) \
+ DecompressorUMX.$(OBJEXT) DecompressorPP20.$(OBJEXT) \
+- unlha.$(OBJEXT) DecompressorZIP.$(OBJEXT) \
+- DecompressorLHA.$(OBJEXT) DecompressorGZIP.$(OBJEXT) \
++ DecompressorZIP.$(OBJEXT) DecompressorGZIP.$(OBJEXT) \
+ DecompressorLZX.$(OBJEXT) unlzx.$(OBJEXT)
+ libcompression_a_OBJECTS = $(am_libcompression_a_OBJECTS)
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+@@ -212,22 +211,19 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ noinst_LIBRARIES = libcompression.a
+ libcompression_a_SOURCES = PP20.cpp ZipExtractor.cpp zziplib/MyIO.cpp \
+-Decompressor.cpp DecompressorUMX.cpp DecompressorPP20.cpp lha/unlha.cpp \
+-DecompressorZIP.cpp DecompressorLHA.cpp DecompressorGZIP.cpp \
++Decompressor.cpp DecompressorUMX.cpp DecompressorPP20.cpp \
++DecompressorZIP.cpp DecompressorGZIP.cpp \
+ DecompressorLZX.cpp unlzx.cpp
+
+-noinst_HEADERS = PP20.h ZipExtractor.h zziplib/MyIO.h DecompressorLHA.h \
++noinst_HEADERS = PP20.h ZipExtractor.h zziplib/MyIO.h \
+ DecompressorUMX.h DecompressorGZIP.h AIFFWriter.h Decompressor.h \
+-DecompressorPP20.h DecompressorQT.h lha/lharc.h DecompressorZIP.h \
+-DecompressorLZX.h unlzx.h \
+-lha/dhuf.inl lha/extract.inl lha/header.inl lha/huf.inl lha/larc.inl \
+-lha/lharc.h lha/lhext.inl lha/maketbl.inl lha/shuf.inl lha/slidehuf.h \
+-lha/slide.inl lha/unlha32.h
++DecompressorPP20.h DecompressorQT.h DecompressorZIP.h \
++DecompressorLZX.h unlzx.h
+
+ EXTRA_DIST = DecompressorQT.mm AIFFWriter.m
+ INCLUDES = -I$(top_srcdir)/src/milkyplay -I$(top_srcdir)/src/ppui \
+ -I$(top_srcdir)/src/ppui/osinterface/posix/ \
+--I$(top_srcdir)/src/compression/lha -I$(top_srcdir)/src/compression/zziplib/
++-I$(top_srcdir)/src/compression/zziplib/
+
+ all: all-recursive
+
+@@ -279,7 +275,6 @@ distclean-compile:
+
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/Decompressor.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DecompressorGZIP.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DecompressorLHA.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DecompressorLZX.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DecompressorPP20.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DecompressorUMX.Po at am__quote@
+@@ -287,7 +282,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/MyIO.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/PP20.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ZipExtractor.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/unlha.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/unlzx.Po at am__quote@
+
+ .cpp.o:
+@@ -318,20 +312,6 @@ MyIO.obj: zziplib/MyIO.cpp
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o MyIO.obj `if test -f 'zziplib/MyIO.cpp'; then $(CYGPATH_W) 'zziplib/MyIO.cpp'; else $(CYGPATH_W) '$(srcdir)/zziplib/MyIO.cpp'; fi`
+
+-unlha.o: lha/unlha.cpp
+- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT unlha.o -MD -MP -MF $(DEPDIR)/unlha.Tpo -c -o unlha.o `test -f 'lha/unlha.cpp' || echo '$(srcdir)/'`lha/unlha.cpp
+- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/unlha.Tpo $(DEPDIR)/unlha.Po
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lha/unlha.cpp' object='unlha.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o unlha.o `test -f 'lha/unlha.cpp' || echo '$(srcdir)/'`lha/unlha.cpp
+-
+-unlha.obj: lha/unlha.cpp
+- at am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT unlha.obj -MD -MP -MF $(DEPDIR)/unlha.Tpo -c -o unlha.obj `if test -f 'lha/unlha.cpp'; then $(CYGPATH_W) 'lha/unlha.cpp'; else $(CYGPATH_W) '$(srcdir)/lha/unlha.cpp'; fi`
+- at am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/unlha.Tpo $(DEPDIR)/unlha.Po
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lha/unlha.cpp' object='unlha.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o unlha.obj `if test -f 'lha/unlha.cpp'; then $(CYGPATH_W) 'lha/unlha.cpp'; else $(CYGPATH_W) '$(srcdir)/lha/unlha.cpp'; fi`
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+diff --git a/src/tracker/Makefile.am b/src/tracker/Makefile.am
+index 306cdf7..9dbf69d 100644
+--- a/src/tracker/Makefile.am
++++ b/src/tracker/Makefile.am
+@@ -60,13 +60,11 @@ INCLUDES = -I$(top_srcdir)/src/${RTMIDI_DIR} -I$(top_srcdir)/src/compression \
+ # the DecompressorXXX files as unused and therefore won't pull them in:
+ compressionLib = $(top_builddir)/src/compression/Decompressor.o \
+ $(top_builddir)/src/compression/DecompressorGZIP.o \
+-$(top_builddir)/src/compression/DecompressorLHA.o \
+ $(top_builddir)/src/compression/DecompressorPP20.o \
+ $(top_builddir)/src/compression/DecompressorUMX.o \
+ $(top_builddir)/src/compression/DecompressorZIP.o \
+ $(top_builddir)/src/compression/MyIO.o $(top_builddir)/src/compression/PP20.o \
+-$(top_builddir)/src/compression/ZipExtractor.o \
+-$(top_builddir)/src/compression/unlha.o
++$(top_builddir)/src/compression/ZipExtractor.o
+
+ # add -lGL for experimental OpenGL support (and see ../ppui/Makefile.am)
+ milkytracker_LDADD = $(top_builddir)/src/milkyplay/libmilkyplay.a \
+diff --git a/src/tracker/Makefile.in b/src/tracker/Makefile.in
+index e314242..f88052b 100644
+--- a/src/tracker/Makefile.in
++++ b/src/tracker/Makefile.in
+@@ -278,13 +278,11 @@ INCLUDES = -I$(top_srcdir)/src/${RTMIDI_DIR} -I$(top_srcdir)/src/compression \
+ # the DecompressorXXX files as unused and therefore won't pull them in:
+ compressionLib = $(top_builddir)/src/compression/Decompressor.o \
+ $(top_builddir)/src/compression/DecompressorGZIP.o \
+-$(top_builddir)/src/compression/DecompressorLHA.o \
+ $(top_builddir)/src/compression/DecompressorPP20.o \
+ $(top_builddir)/src/compression/DecompressorUMX.o \
+ $(top_builddir)/src/compression/DecompressorZIP.o \
+ $(top_builddir)/src/compression/MyIO.o $(top_builddir)/src/compression/PP20.o \
+-$(top_builddir)/src/compression/ZipExtractor.o \
+-$(top_builddir)/src/compression/unlha.o
++$(top_builddir)/src/compression/ZipExtractor.o
+
+
+ # add -lGL for experimental OpenGL support (and see ../ppui/Makefile.am)
+--
diff --git a/debian/patches/series b/debian/patches/series
index 26a7fff..df221f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
0001-remove-bundled-zziplib-and-zlib.patch
0002-fix-64bit-build.patch
+0003-disable-lha-support.patch
--
milkytracker packaging
More information about the pkg-multimedia-commits
mailing list