[SCM] cmus/master.stable: Fix FTBFS related to the libmodplug upgrade in DSA 2751, patch as used in 2.5.0-4.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Jun 18 14:40:24 UTC 2014


The following commit has been merged in the master.stable branch:
commit e0c536daedaa69973596c322086405af00bb0455
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Jun 18 14:00:19 2014 +0100

    Fix FTBFS related to the libmodplug upgrade in DSA 2751, patch as used in 2.5.0-4.
    
    Closes: #724181

diff --git a/debian/patches/11-fix_modplug_detection.patch b/debian/patches/11-fix_modplug_detection.patch
new file mode 100644
index 0000000..0cc9ba8
--- /dev/null
+++ b/debian/patches/11-fix_modplug_detection.patch
@@ -0,0 +1,19 @@
+Description: Horrible fix for misdetection of modplug.
+Author: Alessio Treglia <alessio at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724181
+Forwarded: no
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- cmus.orig/Makefile
++++ cmus/Makefile
+@@ -90,7 +90,7 @@ ip-$(CONFIG_FFMPEG)	+= ffmpeg.so
+ $(flac-objs):		CFLAGS += $(FLAC_CFLAGS)
+ $(mad-objs):		CFLAGS += $(MAD_CFLAGS)
+ $(mikmod-objs):		CFLAGS += $(MIKMOD_CFLAGS)
+-$(modplug-objs):	CFLAGS += $(MODPLUG_CFLAGS)
++$(modplug-objs):	CFLAGS += $(MODPLUG_CFLAGS) -I/usr/include/libmodplug
+ $(mpc-objs):		CFLAGS += $(MPC_CFLAGS)
+ $(vorbis-objs):		CFLAGS += $(VORBIS_CFLAGS)
+ $(wavpack-objs):	CFLAGS += $(WAVPACK_CFLAGS)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b76d9da
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+11-fix_modplug_detection.patch

-- 
cmus packaging



More information about the pkg-multimedia-commits mailing list