rpms/xmms2-nonfree/devel fix_vorbis_dso.patch, NONE, 1.1 xmms2-nonfree.spec, 1.10, 1.11

[Leigh Scott]

Author: leigh123linux

Update of /cvs/nonfree/rpms/xmms2-nonfree/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8371

Modified Files:
	xmms2-nonfree.spec 
Added Files:
	fix_vorbis_dso.patch 
Log Message:
* Mon Aug 25 2014 Leigh Scott <leigh123linux at googlemail.com> - 0.8-5
- Fix vorbis DSO build failure


fix_vorbis_dso.patch:
 wscript |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE fix_vorbis_dso.patch ---
--- a/src/clients/vistest/wscript
+++ b/src/clients/vistest/wscript
@@ -23,12 +23,12 @@ def build(bld):
             t.install_path = None
 
 
-    if bld.env.LIB_vorbisenc:
+    if bld.env.LIB_vorbisenc and bld.env.LIB_vorbis and bld.env.LIB_ogg:
         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:
@@ -55,6 +55,10 @@ def configure(conf):
 
     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):


Index: xmms2-nonfree.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xmms2-nonfree/devel/xmms2-nonfree.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xmms2-nonfree.spec	12 Mar 2013 21:52:03 -0000	1.10
+++ xmms2-nonfree.spec	25 Aug 2014 11:07:00 -0000	1.11
@@ -3,7 +3,7 @@
 Name:			xmms2-nonfree
 Summary:		Nonfree plugins for XMMS2
 Version:		0.8
-Release:		4%{?dist}
+Release:		5%{?dist}
 License:		LGPLv2+ and GPLv2+
 Group:			Applications/Multimedia
 # Fedora's xmms2 has to use a sanitized tarball, we don't.
@@ -12,6 +12,7 @@
 Patch0:			xmms2-0.8DrO_o-use-libdir.patch
 # Don't add extra CFLAGS, we're smart enough, thanks.
 Patch1:			xmms2-0.8DrO_o-no-O0.patch
+Patch2:                 fix_vorbis_dso.patch
 
 URL:			http://wiki.xmms2.xmms.se/
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,6 +67,7 @@
 
 %patch0 -p1 -b .plugins-use-libdir
 %patch1 -p1 -b .noO0
+%patch2 -p1 -b .fix_vorbis_dso
 
 # For some reasons RPMFusion's sidplay libraries are moved to a
 # non-standard location. xmms2 can't detect this unless:
@@ -176,6 +178,9 @@
 %{_libdir}/xmms2/libxmms_sid.so
 
 %changelog
+* Mon Aug 25 2014 Leigh Scott <leigh123linux at googlemail.com> - 0.8-5
+- Fix vorbis DSO build failure
+
 * Tue Mar 12 2013 Nicolas Chauvet <kwizart at gmail.com> - 0.8-4
 - https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild