rpms/phonon/devel phonon-4.2.70-xine-pulseaudio.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 phonon.spec, 1.12, 1.13 sources, 1.5, 1.6
Lorenzo Villani
arbiter at fedoraproject.org
Fri Nov 21 22:17:38 UTC 2008
Author: arbiter
Update of /cvs/pkgs/rpms/phonon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14152
Modified Files:
.cvsignore phonon.spec sources
Added Files:
phonon-4.2.70-xine-pulseaudio.patch
Log Message:
- 4.2.80 (for kde 4.2) and xine-pulseaudio patch (need review), xine is now in phonon -> phonon-backend-xine package
phonon-4.2.70-xine-pulseaudio.patch:
--- NEW FILE phonon-4.2.70-xine-pulseaudio.patch ---
diff -Naur phonon-4.2.70.20081022svn873961/xine/backend.cpp phonon-4.2.70.20081022svn873961.xine-pa/xine/backend.cpp
--- phonon-4.2.70.20081022svn873961/xine/backend.cpp 2008-10-17 23:48:34.000000000 +0200
+++ phonon-4.2.70.20081022svn873961.xine-pa/xine/backend.cpp 2008-10-22 20:24:45.000000000 +0200
@@ -627,7 +627,7 @@
"in KDE2 and KDE3. Its use is discuraged.</p></html>"),
/*icon name */"audio-backend-arts", outputPlugins[i]);
} else if (0 == strcmp(outputPlugins[i], "pulseaudio")) {
- addAudioOutput(nextIndex++, 10, tr("PulseAudio"),
+ addAudioOutput(nextIndex++, 2000, tr("PulseAudio"),
xine_get_audio_driver_plugin_description(m_xine, outputPlugins[i]),
/*icon name */"audio-backend-pulseaudio", outputPlugins[i]);
} else if (0 == strcmp(outputPlugins[i], "esd")) {
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 30 Sep 2008 14:05:11 -0000 1.5
+++ .cvsignore 21 Nov 2008 22:17:08 -0000 1.6
@@ -1,2 +1 @@
-phonon-4.2.0.tar.bz2
-gstreamer-logo.svg
+phonon-4.2.80.20081121svn887051.tar.bz2
Index: phonon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/phonon.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- phonon.spec 30 Sep 2008 15:02:52 -0000 1.12
+++ phonon.spec 21 Nov 2008 22:17:08 -0000 1.13
@@ -1,13 +1,21 @@
+%define alphatag .20081121svn887051
Summary: Multimedia framework api
-Name: phonon
-Version: 4.2.0
-Release: 7%{?dist}
+Name: phonon
+Version: 4.2.80
+Release: 0.1%{?alphatag}%{?dist}
Group: System Environment/Libraries
License: LGPLv2+
URL: http://phonon.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/phonon-%{version}.tar.bz2
+### SNAPSHOT
+#Source0:VAR svnrel echo $(date +%Y%m%d)svn$(svn info svn://anonsvn.kde.org/home/kde/trunk/kdesupport/phonon | grep 'Rev:' | cut -d" " -f4)
+#Source0:CMD svn export svn://anonsvn.kde.org/home/kde/trunk/kdesupport/phonon phonon-%{version}.%{svnrel}
+#Source0:CMD tar cjf %{_sourcedir}/phonon-%{version}.%{svnrel}.tar.bz2 phonon-%{version}.%{svnrel}
+#Source0:CMD rm -rf phonon-%{version}.%{svnrel}
+Source0: phonon-%{version}%{?alphatag}.tar.bz2
+### Original sources
+#Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/phonon-%{version}.tar.bz2
Source1: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg
# Make PulseAudio the default again when listed by the backend.
# Note that this currently only works for the Xine backend. Device selection in
@@ -16,10 +24,11 @@
# "sink". So it never lists "PulseAudio" as a supported device, you have to pick
# it as a "sink", and then the device setting is ignored entirely.
Patch0: phonon-4.2.0-pulseaudio.patch
+Patch1: phonon-4.2.70-xine-pulseaudio.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: automoc4
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6.0
BuildRequires: glib2-devel
BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-base-devel
@@ -27,6 +36,7 @@
BuildRequires: libxml2-devel
BuildRequires: qt4-devel >= 4.4.0
BuildRequires: ImageMagick
+BuildRequires: xine-lib-devel
## hard-code phonon-backend-xine, for now, so yum doesn't choose -gstreamer by default
Requires: phonon-backend-xine
@@ -37,7 +47,7 @@
%package backend-gstreamer
Summary: Gstreamer phonon backend
-Group: Applications/Multimedia
+Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
Provides: phonon-backend = %{version}-%{release}
Obsoletes: %{name}-backend-gst < 4.2.0-4
@@ -47,6 +57,18 @@
%description backend-gstreamer
%{summary}.
+%package backend-xine
+Summary: Gstreamer xine backend
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Provides: phonon-xine = %{version}-%{release}
+Obsoletes: %{name}-backend-xine < 4.2.0-4
+Provides: %{name}-backend-xine = %{version}-%{release}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
+%description backend-xine
+%{summary}.
+
%package devel
Summary: Developer files for %{name}
Group: Development/Libraries
@@ -58,8 +80,9 @@
%prep
-%setup -q
+%setup -q -n phonon-%{version}%{?alphatag}
%patch0 -p1 -b .pulseaudio
+%patch1 -p1 -b .xine-pulseaudio
%build
@@ -68,13 +91,13 @@
%{cmake} ..
popd
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
%install
-rm -rf %{buildroot}
+rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}-gstreamer.svg
for i in 16 22 32 48 64 128; do
@@ -85,11 +108,10 @@
%clean
-rm -rf %{buildroot}
+rm -rf %{buildroot}
%post -p /sbin/ldconfig
-
%postun -p /sbin/ldconfig
%post -n %{name}-backend-gstreamer
@@ -100,7 +122,7 @@
%files
%defattr(-,root,root,-)
-%doc COPYING.LIB
+%doc COPYING.LIB
%{_libdir}/libphonon*.so.*
%{_datadir}/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
# kde4-specific dirs
@@ -114,6 +136,14 @@
%_datadir/icons/hicolor/*/*/*.png
%_datadir/icons/hicolor/*/*/*.svg
+%files backend-xine
+%defattr(-,root,root,-)
+%{_kde4_libdir}/kde4/plugins/phonon_backend/phonon_xine.so
+%{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
+%_datadir/icons/hicolor/*/*/*.png
+%_datadir/icons/hicolor/*/*/*.svg
+%_datadir/icons/oxygen/*/*/*
+
%files devel
%defattr(-,root,root,-)
%dir %{_includedir}/KDE
@@ -124,6 +154,15 @@
%changelog
+* Fri Nov 21 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.2.80-0.1.20081121svn887051
+- Use subversion (4.2.80) snapshot
+- phonon-backend-xine subpkg
+- make VERBOSE=1
+- make install/fast
+- Xine backend is in phonon now, add xine-lib-devel as BR
+- BR cmake >= 2.6.0
+- forward-port xine pulseaudio patch
+
* Tue Sep 30 2008 Than Ngo <than at redhat.com> 4.2.0-7
- fix tranparent issue by convert
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/phonon/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 30 Sep 2008 14:05:12 -0000 1.5
+++ sources 21 Nov 2008 22:17:08 -0000 1.6
@@ -1,2 +1 @@
-de80b0f055886a6946acc7886713e23e phonon-4.2.0.tar.bz2
-8e3924f417fea67f72b2105faed2119c gstreamer-logo.svg
+72addffa84bca58ea78fe01d8312ab47 phonon-4.2.80.20081121svn887051.tar.bz2
More information about the fedora-extras-commits
mailing list