summaryrefslogtreecommitdiffstats
path: root/src/id3lib-2-zlib.patch
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2014-08-30 00:58:30 (GMT)
committerTimothy Gu <timothygu99@gmail.com>2014-08-30 00:58:30 (GMT)
commit262aa647f04db4aac22a7301a5b22e0a08c01be6 (patch)
treea286337f657944774706f939a527b76f2fb7fd42 /src/id3lib-2-zlib.patch
parent92a09aeae43765202caf4152a6b4fa8902c1a386 (diff)
parent0e50d664f4efce912ee1a4ee62168c661d6f9199 (diff)
downloadmxe-262aa647f04db4aac22a7301a5b22e0a08c01be6.zip
mxe-262aa647f04db4aac22a7301a5b22e0a08c01be6.tar.gz
mxe-262aa647f04db4aac22a7301a5b22e0a08c01be6.tar.bz2
Merge branch 'stable'
Conflicts: Makefile src/gd.mk src/gdal.mk src/imagemagick.mk src/pcl.mk src/qt.mk
Diffstat (limited to 'src/id3lib-2-zlib.patch')
-rw-r--r--src/id3lib-2-zlib.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/id3lib-2-zlib.patch b/src/id3lib-2-zlib.patch
new file mode 100644
index 0000000..e937877
--- /dev/null
+++ b/src/id3lib-2-zlib.patch
@@ -0,0 +1,14 @@
+This patch was first introduced in version 3.8.3-3
+
+It fixes http://bugs.debian.org/208672
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -74,6 +74,8 @@
+
+ if ID3_NEEDZLIB
+ LDADD = $(top_builddir)/zlib/src/libz.la
++else
++libid3_la_LIBADD = -lz
+ endif
+
+ libid3_la_LDFLAGS = \