diff --git a/phonon-4.4.3-flac_mimetype.patch b/phonon-4.4.3-flac_mimetype.patch new file mode 100644 index 0000000..eef6a9f --- /dev/null +++ b/phonon-4.4.3-flac_mimetype.patch @@ -0,0 +1,15 @@ +diff -up phonon-4.4.3/gstreamer/backend.cpp.flac_mimetype phonon-4.4.3/gstreamer/backend.cpp +--- phonon-4.4.3/gstreamer/backend.cpp.flac_mimetype 2010-11-24 12:26:19.000000000 -0600 ++++ phonon-4.4.3/gstreamer/backend.cpp 2010-11-30 07:29:31.005424613 -0600 +@@ -265,6 +265,11 @@ QStringList Backend::availableMimeTypes( + if (!availableMimeTypes.contains("audio/ogg")) /* *.oga */ + availableMimeTypes.append("audio/ogg"); + } ++ if (availableMimeTypes.contains("audio/x-flac")) { ++ if (!availableMimeTypes.contains("audio/flac")) { ++ availableMimeTypes.append("audio/flac"); ++ } ++ } + availableMimeTypes.sort(); + return availableMimeTypes; + } diff --git a/phonon.spec b/phonon.spec index f6ee3b3..17a2c8d 100644 --- a/phonon.spec +++ b/phonon.spec @@ -2,7 +2,7 @@ Summary: Multimedia framework api Name: phonon Version: 4.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: System Environment/Libraries License: LGPLv2+ URL: http://phonon.kde.org/ @@ -23,6 +23,9 @@ Source16: hi128-phonon-gstreamer.png Patch52: phonon-4.3.50-gstreamer-fix-seekable-query-failed.patch Patch53: phonon-4.3.50-phonon-allow-stop-empty-source.patch +## Ubuntu/upstreamable patches +Patch60: phonon-4.4.3-flac_mimetype.patch + ## Upstream patches BuildRequires: automoc4 >= 0.9.86 @@ -83,6 +86,7 @@ Provides: %{name}-backend-gst = %{version}-%{release} %patch52 -p1 -b .gstreamer-fix-seekable-query-failed %patch53 -p1 -b .phonon-allow-stop-empty-source +%patch60 -p1 -b .flac_mimetype %build @@ -198,6 +202,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: %changelog +* Tue Nov 30 2010 Rex Dieter - 4.4.3-2 +- recognize audio/flac in gstreamer backend (kde#257488) + * Wed Nov 24 2010 Rex Dieter - 4.4.3-1 - phonon-4.4.3