diff --git a/smplayer-16.4.0.tar.bz2 b/smplayer-16.4.0.tar.bz2 deleted file mode 100644 index 6c22d8a..0000000 --- a/smplayer-16.4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de4169c7e3a1d8bf6f3c9a77fa0a8c24c1f63db3f2b8a325bc6761c0a9d2d2ec -size 4020567 diff --git a/smplayer-16.6.0.tar.bz2 b/smplayer-16.6.0.tar.bz2 new file mode 100644 index 0000000..4c55db7 --- /dev/null +++ b/smplayer-16.6.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10220981f7260ec5f3e7201a5b5b8b534a61056f616811a118d59a8a5696d346 +size 4154300 diff --git a/smplayer-defaults.patch b/smplayer-defaults.patch index ed1c462..0417913 100644 --- a/smplayer-defaults.patch +++ b/smplayer-defaults.patch @@ -1,29 +1,31 @@ +--- a/src/basegui.cpp ++++ b/src/basegui.cpp +@@ -204,11 +204,7 @@ BaseGui::BaseGui( QWidget* parent, Qt::W + #if STYLE_SWITCHING + qApp->setStyleSheet(""); + +- #if QT_VERSION >= 0x050000 +- default_style = "fusion"; +- #else + default_style = qApp->style()->objectName(); +- #endif + + #ifdef Q_OS_LINUX + // Some controls aren't displayed correctly with the adwaita style --- a/src/core.cpp +++ b/src/core.cpp -@@ -1719,6 +1719,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," ); - } +@@ -1715,6 +1715,8 @@ void Core::startMplayer( QString file, d + QString ao = pref->ao; + if (!ao.endsWith(",")) ao += ","; + proc->setOption("ao", ao); ++ } else { ++ proc->setOption("ao", "pulse," ); } + #if !defined(Q_OS_WIN) && !defined(Q_OS_OS2) --- 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 = ""; -@@ -422,7 +422,7 @@ void Preferences::reset() { +@@ -439,7 +439,7 @@ void Preferences::reset() { allow_video_movement = false; gui = "DefaultGUI"; @@ -32,7 +34,7 @@ #if USE_MINIMUMSIZE -@@ -575,7 +575,7 @@ void Preferences::reset() { +@@ -593,7 +593,7 @@ void Preferences::reset() { #ifdef CHECK_UPGRADED smplayer_stable_version = ""; @@ -43,13 +45,13 @@ smplayer_version = ""; --- a/src/prefgeneral.cpp +++ b/src/prefgeneral.cpp -@@ -231,6 +231,9 @@ void PrefGeneral::setData(Preferences * +@@ -545,6 +545,9 @@ void PrefGeneral::setVO( QString vo_driv + } - QString ao = pref->ao; - -+ if (ao.isEmpty()) -+ ao = "pulse,"; + void PrefGeneral::setAO( QString ao_driver ) { ++ if (ao_driver.isEmpty()) ++ ao_driver = "pulse,"; + - #ifdef Q_OS_OS2 - if (ao.isEmpty()) { - if (pref->mplayer_detected_version >= MPLAYER_KAI_VERSION) { + int idx = ao_combo->findData( ao_driver ); + if (idx != -1) { + ao_combo->setCurrentIndex(idx); diff --git a/smplayer-simple-resize.patch b/smplayer-simple-resize.patch index fafd182..517e646 100644 --- a/smplayer-simple-resize.patch +++ b/smplayer-simple-resize.patch @@ -1,6 +1,6 @@ --- a/src/basegui.cpp +++ b/src/basegui.cpp -@@ -5163,6 +5163,8 @@ void BaseGui::gotCurrentTime(double sec) +@@ -5262,6 +5262,8 @@ void BaseGui::gotCurrentTime(double sec) void BaseGui::changeSizeFactor(int factor) { // If fullscreen, don't resize! if (pref->fullscreen) return; diff --git a/smplayer.changes b/smplayer.changes index 06f3bf2..fab3870 100644 --- a/smplayer.changes +++ b/smplayer.changes @@ -1,3 +1,63 @@ +------------------------------------------------------------------- +Mon Jun 13 10:01:00 UTC 2016 - sor.alexei@meowr.ru + +- Update to version 16.6.0: + * The mpcgui works now with Qt 5 as well. + * Settings for streams can also be remembered. + * Support for high DPI (requires Qt 5.4 or greater). + * Better support for touch screens. + * Fixes for Qt 5. + * Add new menu 'view'. + * (Videopreview) Fix show duration with Qt 5. + * Move the OSD menu to the view menu. + * Add a tablet mode (menu Options). + When enabled, it changes some elements of the GUI so that's + easy to use it on a touch screen. + * Hide some options from menus in tablet mode. + * Now it's possible to add the recents menu to a toolbar. + * New option 'Send video to screen' in the video menu. + This option allows to display the video (in fullscreen) on a + second screen while controlling the player in the computer's + screen. + * Add an option to show information about the connected screens + (menu View). + * Don't use a dockable playlist on Linux with Qt 5 because the + dockable one causes trouble when Compiz is enabled. + * Disable the secondary subtitles and frame step back when using + mplayer, and the karaoke filter when using mpv. + * Add close buttons to the audio and video equalisers. + * Don't use the language toolbar. + * Add the audio and subtitle track menus to the toolbar and + increase the default size of the toolbar icons. + * Improve drag & drop on the main window. Now it allows to drop + several directories and files. + * Change the default values for outline and shadow of the ASS style. + * Use MPV as default if available. + * Remove the border of the tooltips. Otherwise, for some reason, + the text is not shown complete. + * Increase the height of the audio equaliser. + * Set the OSD to Seek as default. + * Set the drag function to MoveWindow as default. + * Add an option to set the cache to auto in + Preferences -> Performance. + * Don't change the playlist to floating state when entering + fullscreen, if using Qt5 on Linux. Seems to fix a problem when + using Compiz. + * Possibility to display the section area in the preferences + dialog in icon mode. + * Add options in Preferences -> Interface to configure the + high DPI support. + * Don't use a border in the style of the tooltip. For some + reason the text is cut off with it. + * Add a quick access menu. + * Add an option to display the format info in the status bar. + * Disable the global shortcuts when opening the preferences dialog. + * Use the mplayer/mpv default video and audio output. + * Add option "remember settings for streams" in + Preferences -> General. + * Use the style 'fusion' as default with Qt 5. +- Rebase smplayer-defaults.patch, smplayer-simple-resize.patch. + ------------------------------------------------------------------- Sun Apr 3 11:25:43 UTC 2016 - sor.alexei@meowr.ru diff --git a/smplayer.spec b/smplayer.spec index af38587..cb431f0 100644 --- a/smplayer.spec +++ b/smplayer.spec @@ -17,7 +17,7 @@ Name: smplayer -Version: 16.4.0 +Version: 16.6.0 Release: 0 Summary: Complete frontend for MPV License: GPL-2.0+ @@ -26,7 +26,7 @@ Url: http://smplayer.es/ Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE smplayer-makeflags.patch Patch0: %{name}-makeflags.patch -# PATCH-FEATURE-OPENSUSE smplayer-defaults.patch sor.alexei@meowr.ru -- Use PulseAudio, MPV, and "Tango" icon theme by default. +# PATCH-FEATURE-OPENSUSE smplayer-defaults.patch sor.alexei@meowr.ru -- Use PulseAudio, system Qt5 theme, and "Tango" icon theme by default. Patch1: %{name}-defaults.patch # PATCH-FIX-UPSTREAM smplayer-simple-resize.patch Patch2: %{name}-simple-resize.patch @@ -35,6 +35,7 @@ Patch3: %{name}-add_kde_protocols_to_desktop_file.patch BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: libstdc++-devel +BuildRequires: pkg-config BuildRequires: update-desktop-files BuildRequires: zlib-devel # Either mpv >= 0.6.2 or MPlayer >= 1.0rc4_r32607. @@ -46,7 +47,8 @@ Provides: smplayer-core = %{version} Provides: smplayer-qt5 = %{version} Obsoletes: smplayer-qt5 < %{version} Obsoletes: smplayer-qt5-lang < %{version} -%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 +%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120100 +BuildRequires: libQt5Gui-private-headers-devel BuildRequires: libqt5-qttools-devel BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Core) @@ -91,6 +93,7 @@ find . -type f -name '*.pro' | while read f; do cat << EOF >> "$f" DEFINES += NO_DEBUG_ON_CONSOLE +# I really dislike networks such as Facebook, Twitter. DEFINES -= SHARE_WIDGET DEFINES -= UPDATE_CHECKER QMAKE_CFLAGS += %{optflags} @@ -102,7 +105,7 @@ done make \ MAKEFLAGS="%{?_smp_mflags}" \ PREFIX=%{_prefix} \ -%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 +%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120100 QMAKE=%{_libqt5_bindir}/qmake \ LRELEASE=%{_libqt5_bindir}/lrelease %else @@ -111,7 +114,7 @@ make \ %install %make_install \ -%if 0%{?suse_version} <= 1320 && 0%{?suse_version} != 1315 +%if 0%{?suse_version} <= 1320 && 0%{?sle_version} < 120100 KDE_PREFIX=%{_prefix} \ DOC_PATH=%{_docdir}/%{name} \ KDE_INCLUDE_PATH=%{_includedir} \