[Pkg-gstreamer-commits] [gst-plugins-bad1.0] 01/01: Fix build with the new modplug version by including the modplug headers properly

[Sebastian Dröge]

This is an automated email from the git hooks/post-receive script.

slomo pushed a commit to branch master
in repository gst-plugins-bad1.0.

commit 8ec43a9023674bed4392c68330aae724695e2a7d
Author: Sebastian Dröge <slomo at circular-chaos.org>
Date:   Tue Sep 10 11:13:26 2013 +0200

    Fix build with the new modplug version by including the modplug headers properly
---
 debian/changelog                         |    8 ++++++++
 debian/patches/03_modplug-includes.patch |   29 +++++++++++++++++++++++++++++
 debian/patches/series                    |    1 +
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2e54f2b..b5c2cc2 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 at 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 0000000..fdaed0c
--- /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 at 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 aa26555..10c753b 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-plugins-bad1.0.git