From 73ea6406596a557896ad74f6b8c46db4c80c9d83 Mon Sep 17 00:00:00 2001 From: gonzalo Date: Thu, 23 Apr 2015 14:47:10 +0000 Subject: [PATCH] Update for SMPlayer to 14.9.0.6690: * We added support for mpv, which is a player based on mplayer with * Now it's possible to select a secondary subtitle track which is displayed on top of the screen (mpv only). * New option to set a template for screenshots (mpv only). * Now it's possible to play videos from streaming sites (besides Youtube) like DailyMotion, Vimeo, Vevo and many more (mpv only). * Option to step back one frame (mpv only). Test on amd64 Thanks Daniel Jakots! OK benoit@ --- x11/smplayer/Makefile | 5 ++--- x11/smplayer/distinfo | 4 ++-- x11/smplayer/patches/patch-Makefile | 18 ++++-------------- x11/smplayer/patches/patch-src_preferences_cpp | 12 ++++++------ 4 files changed, 14 insertions(+), 25 deletions(-) diff --git a/x11/smplayer/Makefile b/x11/smplayer/Makefile index fd0fa96e009..63c77383239 100644 --- a/x11/smplayer/Makefile +++ b/x11/smplayer/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.19 2015/03/27 08:16:23 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.20 2015/04/23 14:47:10 gonzalo Exp $ COMMENT = complete front-end for MPlayer -DISTNAME = smplayer-14.9.0 -REVISION = 0 +DISTNAME = smplayer-14.9.0.6690 CATEGORIES = multimedia x11 diff --git a/x11/smplayer/distinfo b/x11/smplayer/distinfo index 9773b1f7a7c..da293c8a924 100644 --- a/x11/smplayer/distinfo +++ b/x11/smplayer/distinfo @@ -1,2 +1,2 @@ -SHA256 (smplayer-14.9.0.tar.bz2) = QprU7dbfH87dXqT6KwJOtaYclBL1J2Lp2anCJFt93xM= -SIZE (smplayer-14.9.0.tar.bz2) = 3716434 +SHA256 (smplayer-14.9.0.6690.tar.bz2) = Xsih0pEoKOmxn4AOM4Ap5nV/ww45dM9iohtn9GYyvFo= +SIZE (smplayer-14.9.0.6690.tar.bz2) = 3813209 diff --git a/x11/smplayer/patches/patch-Makefile b/x11/smplayer/patches/patch-Makefile index d5b95193b17..feb1f28cd62 100644 --- a/x11/smplayer/patches/patch-Makefile +++ b/x11/smplayer/patches/patch-Makefile @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile,v 1.3 2014/03/24 18:20:19 gonzalo Exp $ +$OpenBSD: patch-Makefile,v 1.4 2015/04/23 14:47:10 gonzalo Exp $ --- Makefile.orig Thu Nov 1 19:42:16 2012 -+++ Makefile Wed Jan 29 16:46:49 2014 ++++ Makefile Mon Jan 26 12:06:01 2015 @@ -5,7 +5,7 @@ PREFIX=/usr/local CONF_PREFIX=$(PREFIX) @@ -26,17 +26,7 @@ $OpenBSD: patch-Makefile,v 1.3 2014/03/24 18:20:19 gonzalo Exp $ ifdef KDE_SUPPORT # KDE paths, change if necessary -@@ -40,7 +31,8 @@ QMAKE_OPTS=DEFINES+=KDE_SUPPORT INCLUDEPATH+=$(KDE_INC - endif - - src/smplayer: -- ./get_svn_revision.sh -+# OpenBSD - this script doesnt work on OpenBSD and is not needed -+# ./get_svn_revision.sh - +cd src && $(QMAKE) $(QMAKE_OPTS) && $(DEFS) make - cd src && $(LRELEASE) smplayer.pro - -@@ -59,7 +51,7 @@ install: src/smplayer +@@ -59,7 +50,7 @@ install: src/smplayer install -m 644 Changelog *.txt $(DESTDIR)$(DOC_PATH) -install -d $(DESTDIR)$(DOC_PATH) @@ -45,7 +35,7 @@ $OpenBSD: patch-Makefile,v 1.3 2014/03/24 18:20:19 gonzalo Exp $ -install -d $(DESTDIR)$(SHORTCUTS_PATH) cp src/shortcuts/* $(DESTDIR)$(SHORTCUTS_PATH) -@@ -88,9 +80,9 @@ install: src/smplayer +@@ -88,9 +79,9 @@ install: src/smplayer -install -d $(DESTDIR)$(KDE_APPLNK) install -m 644 smplayer.desktop $(DESTDIR)$(KDE_APPLNK) install -m 644 smplayer_enqueue.desktop $(DESTDIR)$(KDE_APPLNK) diff --git a/x11/smplayer/patches/patch-src_preferences_cpp b/x11/smplayer/patches/patch-src_preferences_cpp index 9107ac42f2a..955bf3c9a6a 100644 --- a/x11/smplayer/patches/patch-src_preferences_cpp +++ b/x11/smplayer/patches/patch-src_preferences_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_preferences_cpp,v 1.5 2014/10/31 13:51:36 gonzalo Exp $ ---- src/preferences.cpp.orig Sat Aug 30 19:28:56 2014 -+++ src/preferences.cpp Wed Oct 22 13:01:25 2014 -@@ -136,7 +136,7 @@ void Preferences::reset() { +$OpenBSD: patch-src_preferences_cpp,v 1.6 2015/04/23 14:47:10 gonzalo Exp $ +--- src/preferences.cpp.orig Tue Jan 20 19:57:21 2015 ++++ src/preferences.cpp Mon Jan 26 12:05:36 2015 +@@ -138,7 +138,7 @@ void Preferences::reset() { softvol_max = 110; // 110 = default value in mplayer use_scaletempo = Detect; use_hwac3 = false; @@ -10,7 +10,7 @@ $OpenBSD: patch-src_preferences_cpp,v 1.5 2014/10/31 13:51:36 gonzalo Exp $ global_volume = true; volume = 50; -@@ -164,8 +164,8 @@ void Preferences::reset() { +@@ -166,8 +166,8 @@ void Preferences::reset() { Drives (CD/DVD) *************** */ @@ -21,7 +21,7 @@ $OpenBSD: patch-src_preferences_cpp,v 1.5 2014/10/31 13:51:36 gonzalo Exp $ #ifdef BLURAY_SUPPORT bluray_device = ""; #endif -@@ -290,13 +290,13 @@ void Preferences::reset() { +@@ -291,13 +291,13 @@ void Preferences::reset() { mplayer_additional_audio_filters=""; #ifdef LOG_MPLAYER