rpms/qmmp-plugins-freeworld/devel .cvsignore, 1.8, 1.9 qmmp-plugins-freeworld.spec, 1.11, 1.12 sources, 1.8, 1.9

[Karel Volný]

Author: kvolny

Update of /cvs/free/rpms/qmmp-plugins-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15448

Modified Files:
	.cvsignore qmmp-plugins-freeworld.spec sources 
Log Message:
* Tue Jun 15 2010 Karel Volný <kvolny at redhat.com> 0.4.0-1
- version bump
- new MMS transport plugin
- BuildRequires libmms-devel for MMS support
- BuildRequires enca-devel for encoding detection



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Apr 2010 12:03:18 -0000	1.8
+++ .cvsignore	15 Jun 2010 09:05:32 -0000	1.9
@@ -1 +1 @@
-qmmp-0.3.4.tar.bz2
+qmmp-0.4.0.tar.bz2


Index: qmmp-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/devel/qmmp-plugins-freeworld.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qmmp-plugins-freeworld.spec	20 Apr 2010 12:03:18 -0000	1.11
+++ qmmp-plugins-freeworld.spec	15 Jun 2010 09:05:32 -0000	1.12
@@ -1,5 +1,5 @@
 Name:		qmmp-plugins-freeworld
-Version:	0.3.4
+Version:	0.4.0
 Release:	1%{?dist}
 Summary:	Plugins for qmmp (Qt-based multimedia player)
 
@@ -14,8 +14,10 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:	cmake ffmpeg-devel >= 0.4.9-0.47.20080614
+BuildRequires:	enca-devel
 BuildRequires:	faad2-devel
 BuildRequires:	libmad-devel qt-devel >= 4.3
+BuildRequires:	libmms-devel
 BuildRequires:	taglib-devel libcurl-devel
 BuildRequires:	qmmp%{?_isa} = %{version}
 Requires:	qmmp%{?_isa} = %{version}
@@ -37,12 +39,15 @@
 	-e 's|<avformat.h|<libavformat/avformat.h|g' \
 	-e 's|g/avformat.h|g/libavformat/avformat.h|g' \
 	src/plugins/Input/ffmpeg/decoder_ffmpeg.h \
-	src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp \
-	src/plugins/Input/ffmpeg/detailsdialog.cpp
+	src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
 
 
 %build
+# the plugin groups, as separated by newlines, are:
+# Transport, Input, Output, Effect, Visual, General, File Dialogs
 %cmake \
+	-D USE_CURL:BOOL=FALSE \
+\
 	-D USE_FLAC:BOOL=FALSE \
 	-D USE_VORBIS:BOOL=FALSE \
 	-D USE_MPC:BOOL=FALSE \
@@ -51,15 +56,20 @@
 	-D USE_WAVPACK:BOOL=FALSE \
 	-D USE_CUE:BOOL=FALSE \
 	-D USE_CDA:BOOL=FALSE \
+\
 	-D USE_ALSA:BOOL=FALSE \
 	-D USE_OSS:BOOL=FALSE \
 	-D USE_JACK:BOOL=FALSE \
 	-D USE_PULSE:BOOL=FALSE \
+	-D USE_NULL:BOOL=FALSE \
+\
 	-D USE_SRC:BOOL=FALSE \
 	-D USE_BS2B:BOOL=FALSE \
+	-D USE_LADSPA:BOOL=FALSE \
+\
 	-D USE_ANALYZER:BOOL=FALSE \
 	-D USE_PROJECTM:BOOL=FALSE \
-	-D USE_DBUS:BOOL=FALSE \
+\
 	-D USE_MPRIS:BOOL=FALSE \
 	-D USE_SCROBBLER:BOOL=FALSE \
 	-D USE_STATICON:BOOL=FALSE \
@@ -68,22 +78,29 @@
 	-D USE_HAL:BOOL=FALSE \
 	-D USE_HOTKEY:BOOL=FALSE \
 	-D USE_FILEOPS:BOOL=FALSE \
+	-D USE_COVER:BOOL=FALSE \
+	-D USE_KDENOTIFY:BOOL=FALSE \
+\
 	-D USE_QMMP_DIALOG:BOOL=FALSE \
+\
 	-D CMAKE_INSTALL_PREFIX=/usr \
 	-D LIB_DIR=%{_lib} \
 	./
+
+make VERBOSE=1 %{?_smp_mflags} -C src/plugins/Engines/mplayer
 make VERBOSE=1 %{?_smp_mflags} -C src/plugins/Input/aac
 make VERBOSE=1 %{?_smp_mflags} -C src/plugins/Input/ffmpeg
 make VERBOSE=1 %{?_smp_mflags} -C src/plugins/Input/mad
-make VERBOSE=1 %{?_smp_mflags} -C src/plugins/Input/mplayer
+make VERBOSE=1 %{?_smp_mflags} -C src/plugins/Transports/mms
 
 
 %install
 rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install -C src/plugins/Engines/mplayer
 make DESTDIR=%{buildroot} install -C src/plugins/Input/aac
 make DESTDIR=%{buildroot} install -C src/plugins/Input/ffmpeg
 make DESTDIR=%{buildroot} install -C src/plugins/Input/mad
-make DESTDIR=%{buildroot} install -C src/plugins/Input/mplayer
+make DESTDIR=%{buildroot} install -C src/plugins/Transports/mms
 
 
 %clean
@@ -92,8 +109,12 @@
 
 %files
 %defattr(0755,root,root,0755)
-%dir %{_libdir}/qmmp/Input
+# there's only mplayer plugin now, so own the directory
+%dir %{_libdir}/qmmp/Engines
+%{_libdir}/qmmp/Engines/*.so
+# Input & Transports dirs are owned by qmmp already
 %{_libdir}/qmmp/Input/*.so
+%{_libdir}/qmmp/Transports/*.so
 
 
 %post -p /sbin/ldconfig
@@ -102,6 +123,12 @@
 
 
 %changelog
+* Tue Jun 15 2010 Karel Volný <kvolny at redhat.com> 0.4.0-1
+- version bump
+- new MMS transport plugin
+- BuildRequires libmms-devel for MMS support
+- BuildRequires enca-devel for encoding detection
+
 * Tue Apr 20 2010 Karel Volný <kvolny at redhat.com> 0.3.4-1
 - version bump
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	20 Apr 2010 12:03:18 -0000	1.8
+++ sources	15 Jun 2010 09:05:32 -0000	1.9
@@ -1 +1 @@
-000eed2eb5fbbcc1937f490dddf3609c  qmmp-0.3.4.tar.bz2
+8f6fa78e42e91379d6a2309b4c056f80  qmmp-0.4.0.tar.bz2