diff options
author | Sebastian Dröge <slomo@circular-chaos.org> | 2013-09-10 11:13:26 +0200 |
---|---|---|
committer | Sebastian Dröge <slomo@circular-chaos.org> | 2013-09-10 11:13:26 +0200 |
commit | 8ec43a9023674bed4392c68330aae724695e2a7d (patch) | |
tree | 67f571ece532e44bebdd037f9538329bc336da10 | |
parent | 71d41db99cef8c64e934388b76a0362cecb0265f (diff) |
Fix build with the new modplug version by including the modplug headers properlydebian/1.0.10-3
-rw-r--r-- | debian/changelog | 8 | ||||
-rw-r--r-- | debian/patches/03_modplug-includes.patch | 29 | ||||
-rw-r--r-- | debian/patches/series | 1 |
3 files changed, 38 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 2e54f2b9..b5c2cc24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gst-plugins-bad1.0 (1.0.10-3) unstable; urgency=low + + * debian/patches/03_modplug-includes.patch: + + Fix build with the new modplug version by including the + modplug headers properly. Thanks to Iain Lane for the patch. + + -- Sebastian Dröge <slomo@debian.org> Tue, 10 Sep 2013 11:12:25 +0200 + gst-plugins-bad1.0 (1.0.10-2) unstable; urgency=low * debian/patches/02_soundtouch-int.patch: diff --git a/debian/patches/03_modplug-includes.patch b/debian/patches/03_modplug-includes.patch new file mode 100644 index 00000000..fdaed0ca --- /dev/null +++ b/debian/patches/03_modplug-includes.patch @@ -0,0 +1,29 @@ +From c1d20ea244baf2c87ac3a98e4bfa55c542d646f4 Mon Sep 17 00:00:00 2001 +From: Iain Lane <iain.lane@canonical.com> +Date: Tue, 10 Sep 2013 08:48:32 +0000 +Subject: [PATCH] modplug: Specify directory when including stdafx.h + +modplug stopped exposing their directory in their pcfile, meaining +consumers accessing the headers directly fail to build. + +http://sourceforge.net/p/modplug-xmms/git/ci/75e9b166982ed637b59ef7cbc1835a09f768923e/ +--- + ext/modplug/gstmodplug.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/modplug/gstmodplug.cc b/ext/modplug/gstmodplug.cc +index 47154cf..a968c4a 100644 +--- a/ext/modplug/gstmodplug.cc ++++ b/ext/modplug/gstmodplug.cc +@@ -54,7 +54,7 @@ + #define WORDS_BIGENDIAN 0 + #endif + +-#include <stdafx.h> ++#include <libmodplug/stdafx.h> + #include <libmodplug/sndfile.h> + + #include "gstmodplug.h" +-- +1.8.3.2 + diff --git a/debian/patches/series b/debian/patches/series index aa26555b..10c753b8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 01_fix-modplug-linking.patch 02_soundtouch-int.patch +03_modplug-includes.patch 99_ltmain_as-needed.patch |