Hello community, here is the log from the commit of package smplayer for openSUSE:Factory checked in at 2015-10-06 13:26:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-01 09:29:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.smplayer.new/smplayer.changes 2015-10-06 13:26:49.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Oct 4 11:42:29 UTC 2015 - sor.ale...@meowr.ru + +- Merge smplayer-default_pulse.patch and smplayer-default_mpv.patch + to smplayer-defaults.patch. +- Add dropping default icon theme to smplayer-defaults.patch. +- Disable "share widgets" and available upgrades checker. +- Rebase all patches. + +------------------------------------------------------------------- Old: ---- smplayer-default_mpv.patch smplayer-default_pulse.patch New: ---- smplayer-defaults.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smplayer.spec ++++++ --- /var/tmp/diff_new_pack.1aoBXn/_old 2015-10-06 13:26:50.000000000 +0200 +++ /var/tmp/diff_new_pack.1aoBXn/_new 2015-10-06 13:26:50.000000000 +0200 @@ -26,14 +26,12 @@ Source0: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE smplayer-makeflags.patch Patch0: %{name}-makeflags.patch -# PATCH-FIX-OPENSUSE smplayer-default_pulse.patch -Patch1: %{name}-default_pulse.patch -# PATCH-FEATURE-OPENSUSE smplayer-default_mpv.patch sor.ale...@meowr.ru -- Use MPV by default. -Patch2: %{name}-default_mpv.patch +# PATCH-FEATURE-OPENSUSE smplayer-defaults.patch sor.ale...@meowr.ru -- Use PulseAudio, MPV, and "Tango" icon theme by default. +Patch1: %{name}-defaults.patch # PATCH-FIX-UPSTREAM smplayer-simple-resize.patch -Patch3: %{name}-simple-resize.patch +Patch2: %{name}-simple-resize.patch # PATCH-FIX-UPSTREAM smplayer-add_kde_protocols_to_desktop_file.patch -- To play network shared video correctly: #PM-48. -Patch4: %{name}-add_kde_protocols_to_desktop_file.patch +Patch3: %{name}-add_kde_protocols_to_desktop_file.patch BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: libstdc++-devel @@ -81,11 +79,10 @@ %prep %setup -q -%patch0 +%patch0 -p1 %patch1 -p1 -%patch2 -%patch3 -%patch4 +%patch2 -p1 +%patch3 -p1 # Fix CRLF in .txt files. sed -i 's/\r$//' *.txt @@ -93,8 +90,11 @@ find . -type f -name '*.pro' | while read f; do cat << EOF >> "$f" -QMAKE_CFLAGS = %{optflags} -QMAKE_CXXFLAGS = %{optflags} +DEFINES += NO_DEBUG_ON_CONSOLE +DEFINES -= SHAREWIDGET +DEFINES -= UPDATE_CHECKER +QMAKE_CFLAGS += %{optflags} +QMAKE_CXXFLAGS += %{optflags} EOF done @@ -104,11 +104,10 @@ PREFIX=%{_prefix} \ %if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 QMAKE=%{_libqt5_bindir}/qmake \ - LRELEASE=%{_libqt5_bindir}/lrelease \ + LRELEASE=%{_libqt5_bindir}/lrelease %else - KDE_SUPPORT=1 \ + KDE_SUPPORT=1 %endif - QMAKE_OPTS=DEFINES+=NO_DEBUG_ON_CONSOLE %install %make_install \ @@ -123,7 +122,7 @@ rm -rf %{buildroot}%{_docdir}/%{name}/* -# Append Qt;KDE; categories in desktop files – fix for #PM-48. +# Append Qt; category in desktop files – fix for pm#48. for desktop in smplayer smplayer_enqueue; do %suse_update_desktop_file -r "$desktop" Qt AudioVideo Video Player done ++++++ smplayer-add_kde_protocols_to_desktop_file.patch ++++++ --- /var/tmp/diff_new_pack.1aoBXn/_old 2015-10-06 13:26:50.000000000 +0200 +++ /var/tmp/diff_new_pack.1aoBXn/_new 2015-10-06 13:26:50.000000000 +0200 @@ -1,6 +1,6 @@ ---- smplayer.desktop.orig 2014-08-30 01:56:00.000000000 +0300 -+++ smplayer.desktop 2014-09-07 15:28:13.132307160 +0300 -@@ -8,6 +8,7 @@ +--- a/smplayer.desktop ++++ b/smplayer.desktop +@@ -8,6 +8,7 @@ MimeType=audio/ac3;audio/mp4;audio/mpeg; Name=SMPlayer Type=Application X-KDE-StartupNotify=false ++++++ smplayer-defaults.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/preferences.cpp +++ b/src/preferences.cpp @@ -79,9 +79,9 @@ void Preferences::reset() { config_version = CURRENT_CONFIG_VERSION; #if defined(Q_OS_WIN) || defined(Q_OS_OS2) - mplayer_bin= "mplayer/mplayer.exe"; + mplayer_bin= "mplayer/mpv.exe"; #else - mplayer_bin = "mplayer"; + mplayer_bin = "mpv"; #endif vo = ""; @@ -420,7 +420,7 @@ void Preferences::reset() { allow_video_movement = false; gui = "DefaultGUI"; - iconset = "H2O"; + iconset = "Tango"; #if USE_MINIMUMSIZE @@ -558,7 +558,7 @@ void Preferences::reset() { #ifdef CHECK_UPGRADED smplayer_stable_version = ""; - check_if_upgraded = true; + check_if_upgraded = false; #endif #ifdef FONTCACHE_DIALOG smplayer_version = ""; --- 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) { ++++++ smplayer-makeflags.patch ++++++ --- /var/tmp/diff_new_pack.1aoBXn/_old 2015-10-06 13:26:50.000000000 +0200 +++ /var/tmp/diff_new_pack.1aoBXn/_new 2015-10-06 13:26:50.000000000 +0200 @@ -1,6 +1,6 @@ ---- Makefile.orig 2009-07-25 11:07:32.000000000 +0200 -+++ Makefile 2009-07-25 11:09:13.000000000 +0200 -@@ -31,7 +31,7 @@ +--- a/Makefile ++++ b/Makefile +@@ -31,7 +31,7 @@ ifdef KDE_SUPPORT # KDE paths, change if necessary KDE_INCLUDE_PATH=`kde-config --prefix`/include/ @@ -9,7 +9,7 @@ KDE_LIBS=-lkio QMAKE_OPTS=DEFINES+=KDE_SUPPORT INCLUDEPATH+=$(KDE_INCLUDE_PATH) \ -@@ -41,7 +41,7 @@ +@@ -41,7 +41,7 @@ endif src/smplayer: ./get_svn_revision.sh @@ -18,7 +18,7 @@ cd src && $(LRELEASE) smplayer.pro clean: -@@ -77,7 +77,6 @@ +@@ -90,7 +90,6 @@ install: src/smplayer install -m 644 smplayer_enqueue.desktop $(DESTDIR)$(KDE_APPLNK) -install -d $(DESTDIR)$(PREFIX)/share/man/man1/ install -m 644 man/smplayer.1 $(DESTDIR)$(PREFIX)/share/man/man1/ @@ -26,4 +26,3 @@ uninstall: -rm -f $(PREFIX)/bin/smplayer - ++++++ smplayer-simple-resize.patch ++++++ --- /var/tmp/diff_new_pack.1aoBXn/_old 2015-10-06 13:26:50.000000000 +0200 +++ /var/tmp/diff_new_pack.1aoBXn/_new 2015-10-06 13:26:50.000000000 +0200 @@ -1,6 +1,6 @@ ---- src/basegui.cpp.orig -+++ src/basegui.cpp -@@ -4890,6 +4890,8 @@ +--- a/src/basegui.cpp ++++ b/src/basegui.cpp +@@ -4958,6 +4958,8 @@ void BaseGui::gotCurrentTime(double sec) void BaseGui::changeSizeFactor(int factor) { // If fullscreen, don't resize! if (pref->fullscreen) return;
