Fix compilation, bug #532558 by ghost99 and jer; drop old.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

6 files changed, 44 insertions, 43 deletions

diff --git a/media-plugins/gst-plugins-modplug/ChangeLog b/media-plugins/gst-plugins-modplug/ChangeLog
index c4f193cd29ae..d55edd64ba6c 100644
--- a/media-plugins/gst-plugins-modplug/ChangeLog
+++ b/media-plugins/gst-plugins-modplug/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/gst-plugins-modplug
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-modplug/ChangeLog,v 1.71 2014/08/21 10:43:48 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-modplug/ChangeLog,v 1.72 2015/01/19 10:24:03 pacho Exp $
+
+  19 Jan 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/gst-plugins-modplug-0.10.23-include-header.patch,
+  -gst-plugins-modplug-0.10.23.ebuild, -gst-plugins-modplug-1.2.3.ebuild,
+  -gst-plugins-modplug-1.2.4.ebuild, gst-plugins-modplug-0.10.23-r1.ebuild:
+  Fix compilation, bug #532558 by ghost99 and jer; drop old.
 
   21 Aug 2014; Agostino Sarubbo <ago@gentoo.org>
   gst-plugins-modplug-0.10.23-r1.ebuild, gst-plugins-modplug-1.2.4-r1.ebuild:
diff --git a/media-plugins/gst-plugins-modplug/files/gst-plugins-modplug-0.10.23-include-header.patch b/media-plugins/gst-plugins-modplug/files/gst-plugins-modplug-0.10.23-include-header.patch
new file mode 100644
index 000000000000..86d69ea42f5f
--- /dev/null
+++ b/media-plugins/gst-plugins-modplug/files/gst-plugins-modplug-0.10.23-include-header.patch
@@ -0,0 +1,29 @@
+From fd4cb22ae42b146e327b12aa0507b59520ba1db2 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.5.3
+
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-0.10.23-r1.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-0.10.23-r1.ebuild
index eb0b9c61c802..5424e6274923 100644
--- a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-0.10.23-r1.ebuild
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-0.10.23-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-modplug/gst-plugins-modplug-0.10.23-r1.ebuild,v 1.6 2014/08/21 10:43:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-modplug/gst-plugins-modplug-0.10.23-r1.ebuild,v 1.7 2015/01/19 10:24:03 pacho Exp $
 
 EAPI="5"
 
@@ -12,3 +12,8 @@ IUSE=""
 
 RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# modplug: Specify directory when including stdafx.h, bug #532558
+	epatch "${FILESDIR}"/${PN}-0.10.23-include-header.patch
+}
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-0.10.23.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-0.10.23.ebuild
deleted file mode 100644
index 0bec0cccd025..000000000000
--- a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-0.10.23.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-modplug/gst-plugins-modplug-0.10.23.ebuild,v 1.5 2013/02/01 18:24:21 ago Exp $
-
-EAPI="5"
-
-inherit gst-plugins-bad
-
-KEYWORDS="~alpha amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="media-libs/libmodplug"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.2.3.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.2.3.ebuild
deleted file mode 100644
index 2c20a934af55..000000000000
--- a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.2.3.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.2.3.ebuild,v 1.5 2014/04/16 07:48:30 ago Exp $
-
-EAPI="5"
-
-inherit gst-plugins-bad
-
-KEYWORDS="~alpha amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="media-libs/libmodplug"
-DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.2.4.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.2.4.ebuild
deleted file mode 100644
index f38af8ece7cb..000000000000
--- a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.2.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.2.4.ebuild,v 1.1 2014/05/31 14:53:00 pacho Exp $
-
-EAPI="5"
-
-inherit gst-plugins-bad
-
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/libmodplug"
-DEPEND="${RDEPEND}"