Author: kvolny
Update of /cvs/free/rpms/qmmp-plugins-freeworld/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25396
Modified Files:
.cvsignore qmmp-plugins-freeworld.spec sources
Log Message:
* Thu Sep 16 2010 Karel Volný <kvolny(a)redhat.com> 0.4.2-1
- version bump
- fixes possible freezes with mplayer plugin
- 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/F-13/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 21 Apr 2010 09:01:19 -0000 1.8
+++ .cvsignore 16 Sep 2010 10:23:08 -0000 1.9
@@ -1 +1 @@
-qmmp-0.3.4.tar.bz2
+qmmp-0.4.2.tar.bz2
Index: qmmp-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/F-13/qmmp-plugins-freeworld.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qmmp-plugins-freeworld.spec 21 Apr 2010 09:01:19 -0000 1.11
+++ qmmp-plugins-freeworld.spec 16 Sep 2010 10:23:08 -0000 1.12
@@ -1,5 +1,5 @@
Name: qmmp-plugins-freeworld
-Version: 0.3.4
+Version: 0.4.2
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,13 @@
%changelog
+* Thu Sep 16 2010 Karel Volný <kvolny(a)redhat.com> 0.4.2-1
+- version bump
+- fixes possible freezes with mplayer plugin
+- new MMS transport plugin
+- BuildRequires libmms-devel for MMS support
+- BuildRequires enca-devel for encoding detection
+
* Tue Apr 20 2010 Karel Volný <kvolny(a)redhat.com> 0.3.4-1
- version bump
Index: sources
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/F-13/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 21 Apr 2010 09:01:19 -0000 1.8
+++ sources 16 Sep 2010 10:23:08 -0000 1.9
@@ -1 +1 @@
-000eed2eb5fbbcc1937f490dddf3609c qmmp-0.3.4.tar.bz2
+4ae6d4db68852bf985d3f0f94fc210a9 qmmp-0.4.2.tar.bz2