Hello community, here is the log from the commit of package smplayer for openSUSE:Factory checked in at 2015-10-01 09:29:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/smplayer (Old) and /work/SRC/openSUSE:Factory/.smplayer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "smplayer" Changes: -------- --- /work/SRC/openSUSE:Factory/smplayer/smplayer.changes 2015-08-21 07:40:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.smplayer.new/smplayer.changes 2015-10-01 09:29:33.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Sep 29 22:10:04 UTC 2015 - [email protected] + +- Rename smplayer-default_ao.patch to smplayer-default_pulse.patch + and make respective changes. +- Minor spec cleanup. + +------------------------------------------------------------------- +Tue Sep 29 22:04:49 UTC 2015 - [email protected] + +- Update to 15.9.0, please see + + usr/share/doc/packages/smplayer/Changelog + +------------------------------------------------------------------- Old: ---- smplayer-14.9.0.6994.tar.bz2 smplayer-default_ao.patch New: ---- smplayer-15.9.0.tar.bz2 smplayer-default_pulse.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smplayer.spec ++++++ --- /var/tmp/diff_new_pack.1zOjAS/_old 2015-10-01 09:29:33.000000000 +0200 +++ /var/tmp/diff_new_pack.1zOjAS/_new 2015-10-01 09:29:33.000000000 +0200 @@ -17,23 +17,23 @@ Name: smplayer -Version: 14.9.0.6994 +Version: 15.9.0 Release: 0 Summary: Complete frontend for MPV License: GPL-2.0+ Group: Productivity/Multimedia/Video/Players -Url: http://smplayer.sourceforge.net/ -Source: http://downloads.sf.net/smplayer/smplayer-%{version}.tar.bz2 +Url: http://smplayer.es/ +Source0: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE smplayer-makeflags.patch -Patch0: smplayer-makeflags.patch -# PATCH-FIX-OPENSUSE smplayer-default_ao.patch -Patch1: smplayer-default_ao.patch +Patch0: %{name}-makeflags.patch +# PATCH-FIX-OPENSUSE smplayer-default_pulse.patch +Patch1: %{name}-default_pulse.patch # PATCH-FEATURE-OPENSUSE smplayer-default_mpv.patch [email protected] -- Use MPV by default. -Patch2: smplayer-default_mpv.patch +Patch2: %{name}-default_mpv.patch # PATCH-FIX-UPSTREAM smplayer-simple-resize.patch -Patch3: smplayer-simple-resize.patch +Patch3: %{name}-simple-resize.patch # PATCH-FIX-UPSTREAM smplayer-add_kde_protocols_to_desktop_file.patch -- To play network shared video correctly: #PM-48. -Patch4: smplayer-add_kde_protocols_to_desktop_file.patch +Patch4: %{name}-add_kde_protocols_to_desktop_file.patch BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: libstdc++-devel @@ -41,7 +41,7 @@ BuildRequires: zlib-devel # Either mpv >= 0.6.2 or MPlayer >= 1.0rc4_r32607. Requires: mpv >= 0.6.2 -Recommends: smplayer-lang = %{version} +Recommends: smplayer-lang Recommends: smplayer-skins Suggests: smplayer-themes Provides: smplayer-core = %{version} @@ -80,15 +80,9 @@ %lang_package %prep -%setup -q -n smplayer-%{version} +%setup -q %patch0 -%patch1 -sed -e '/^+\{3\}/!d;s|^+\{3\} \([^ ]*\).*$|\1|' < %{PATCH1} | xargs \ -%if 0%{?suse_version} >= 1210 - sed -i 's/@@DEFAULT@@/pulse/g' -%else - sed -i 's/@@DEFAULT@@/alsa/g' -%endif +%patch1 -p1 %patch2 %patch3 %patch4 @@ -133,7 +127,7 @@ for desktop in smplayer smplayer_enqueue; do %suse_update_desktop_file -r "$desktop" Qt AudioVideo Video Player done -%find_lang smplayer --with-qt +%find_lang %{name} --with-qt %post %desktop_database_post @@ -146,19 +140,17 @@ %files %defattr(-,root,root) %doc Changelog *.txt -%{_bindir}/smplayer -%{_datadir}/applications/smplayer.desktop -%{_datadir}/applications/smplayer_enqueue.desktop +%{_bindir}/%{name} +%{_datadir}/applications/%{name}*.desktop %dir %{_datadir}/icons/hicolor/*/ %dir %{_datadir}/icons/hicolor/*/apps/ -%{_datadir}/icons/hicolor/*/apps/smplayer.* -%dir %{_datadir}/smplayer/ -%{_datadir}/smplayer/shortcuts/ -%{_datadir}/smplayer/input.conf -%{_mandir}/man?/smplayer.?%{?ext_man} +%{_datadir}/icons/hicolor/*/apps/%{name}.* +%{_datadir}/%{name}/ +%exclude %{_datadir}/%{name}/translations/ +%{_mandir}/man?/%{name}.?%{?ext_man} -%files lang -f smplayer.lang +%files lang -f %{name}.lang %defattr(-,root,root) -%dir %{_datadir}/smplayer/translations/ +%dir %{_datadir}/%{name}/translations/ %changelog ++++++ smplayer-14.9.0.6994.tar.bz2 -> smplayer-15.9.0.tar.bz2 ++++++ ++++ 231016 lines of diff (skipped) ++++++ smplayer-default_pulse.patch ++++++ --- a/src/core.cpp +++ b/src/core.cpp @@ -1717,6 +1717,8 @@ void Core::startMplayer( QString file, d if (pref->ao != "player_default") { if (!pref->ao.isEmpty()) { proc->setOption("ao", pref->ao ); + } else { + proc->setOption("ao", "pulse," ); } } --- a/src/prefgeneral.cpp +++ b/src/prefgeneral.cpp @@ -193,6 +193,9 @@ void PrefGeneral::setData(Preferences * QString ao = pref->ao; + if (ao.isEmpty()) + ao = "pulse,"; + #ifdef Q_OS_OS2 if (ao.isEmpty()) { if (pref->mplayer_detected_version >= MPLAYER_KAI_VERSION) {
