[xmms2] Patch for libmodplug pkgconfig header dir output change

[Mamoru TASAKA]

commit 2ec912dc45e50c844547b5443538e788cffe91bf
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Wed May 7 15:51:46 2014 +0900

    Patch for libmodplug pkgconfig header dir output change
    
      (c.f. Debian bug 652139, 724487)
    - Patch for vorbisenc pkgconfig libs dir output change

 xmms2-0.8DrO_o-libmodplug-pkgconfig-change.patch |   11 ++++++++
 xmms2-0.8DrO_o-vorbis-pkgconfig-libs.patch       |   30 ++++++++++++++++++++++
 xmms2.spec                                       |   13 ++++++++-
 3 files changed, 53 insertions(+), 1 deletions(-)
---
diff --git a/xmms2-0.8DrO_o-libmodplug-pkgconfig-change.patch b/xmms2-0.8DrO_o-libmodplug-pkgconfig-change.patch
new file mode 100644
index 0000000..66964e7
--- /dev/null
+++ b/xmms2-0.8DrO_o-libmodplug-pkgconfig-change.patch
@@ -0,0 +1,11 @@
+--- xmms2-0.8DrO_o/src/plugins/modplug/modplug.c.header	2011-10-21 04:26:08.000000000 +0900
++++ xmms2-0.8DrO_o/src/plugins/modplug/modplug.c	2014-05-07 14:31:14.830068685 +0900
+@@ -9,7 +9,7 @@
+ #include "xmms/xmms_sample.h"
+ #include "xmms/xmms_medialib.h"
+ #include "xmms/xmms_log.h"
+-#include <modplug.h>
++#include <libmodplug/modplug.h>
+ 
+ #include <glib.h>
+ #include <string.h>
diff --git a/xmms2-0.8DrO_o-vorbis-pkgconfig-libs.patch b/xmms2-0.8DrO_o-vorbis-pkgconfig-libs.patch
new file mode 100644
index 0000000..c8243ba
--- /dev/null
+++ b/xmms2-0.8DrO_o-vorbis-pkgconfig-libs.patch
@@ -0,0 +1,30 @@
+--- xmms2-0.8DrO_o/src/clients/vistest/wscript.vorbis	2011-10-21 04:26:08.000000000 +0900
++++ xmms2-0.8DrO_o/src/clients/vistest/wscript	2014-05-07 15:33:45.670355972 +0900
+@@ -23,12 +23,12 @@
+             t.install_path = None
+ 
+ 
+-    if bld.env.LIB_vorbisenc:
++    if bld.env.LIB_vorbisenc and bld.env.LIB_vorbis:
+         t = bld(features = 'c cprogram',
+             target = 'xmms2-ripper',
+             source = 'ripper.c',
+             includes = '. ../../.. ../../include',
+-            uselib = 'vorbisenc',
++            uselib = 'vorbisenc vorbis ogg',
+             use = 'xmmsclient'
+             )
+         if not bld.env.INSTALL_VIS_REFERENCE_CLIENTS:
+@@ -56,6 +56,12 @@
+     conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc',
+             args='--cflags --libs', mandatory=False)
+ 
++    conf.check_cfg(package='vorbis', uselib_store='vorbis',
++            args='--cflags --libs', mandatory=False)
++
++    conf.check_cfg(package='ogg', uselib_store='ogg',
++            args='--cflags --libs', mandatory=False)
++
+     if conf.check_cfg(package='libvisual-0.4', uselib_store='visual',
+             args='--cflags --libs', mandatory=False):
+         conf.check_cfg(package='sdl', uselib_store='sdl',
diff --git a/xmms2.spec b/xmms2.spec
index afe166a..4f673ec 100644
--- a/xmms2.spec
+++ b/xmms2.spec
@@ -5,7 +5,7 @@
 Name:			xmms2
 Summary: 		A modular audio framework and plugin architecture
 Version:		0.8
-Release:		16%{?dist}
+Release:		17%{?dist}
 License:		LGPLv2+ and GPLv2+ and BSD
 Group:			Applications/Multimedia
 # We can't use the upstream source tarball as-is, because it includes an mp4 decoder.
@@ -23,6 +23,10 @@ Patch4:			xmms2-0.8DrO_o-no-O0.patch
 Patch5:			xmms2-0.8DrO_o-moresaneversioning.patch
 # Fix xsubpp location
 Patch6:			xmms2-0.8DrO_o-xsubpp-fix.patch
+# libmodplug 0.8.8.5 changed pkgconfig includedir output
+Patch7:			xmms2-0.8DrO_o-libmodplug-pkgconfig-change.patch
+# libvorbis 1.3.4 changed pkgconfig libs output
+Patch8:			xmms2-0.8DrO_o-vorbis-pkgconfig-libs.patch
 URL:			http://wiki.xmms2.xmms.se/
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:		sqlite-devel, flac-devel, libofa-devel
@@ -112,6 +116,8 @@ it executes the command passed as argument directly.
 %patch2 -p1 -b .default-output-pulse
 %patch4 -p1 -b .noO0
 %patch5 -p1 -b .versionsanity
+%patch7 -p1 -b .modplug_header
+%patch8 -p1 -b .vorbis_libs
 
 # This header doesn't need to be executable
 chmod -x src/include/xmmsclient/xmmsclient++/dict.h
@@ -210,6 +216,11 @@ rm -rf %{buildroot}
 %{_bindir}/nyxmms2
 
 %changelog
+* Wed May  7 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 0.8-17
+- Patch for libmodplug pkgconfig header dir output change
+  (c.f. Debian bug 652139, 724487)
+- Patch for vorbisenc pkgconfig libs dir output change
+
 * Tue May  6 2014 Tom Callaway <spot at fedoraproject.org> - 0.8-16
 - rebuild for new ruby