Hallo,

Update for SMPlayer to 18.6.0:

http://www.smplayer.info/en/changes

OK? Comments?

Cheers.-

--
Sending from my toaster.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/smplayer/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- Makefile    29 Jun 2018 22:16:34 -0000      1.52
+++ Makefile    8 Jul 2018 22:08:05 -0000
@@ -2,9 +2,8 @@
 
 COMMENT =              complete front-end for MPlayer and MPV
 
-DISTNAME =             smplayer-18.5.0
+DISTNAME =             smplayer-18.6.0
 CATEGORIES =           multimedia x11
-REVISION =             1
 
 HOMEPAGE =             http://smplayer.sourceforge.net/
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/smplayer/distinfo,v
retrieving revision 1.36
diff -u -p -r1.36 distinfo
--- distinfo    25 May 2018 10:19:49 -0000      1.36
+++ distinfo    8 Jul 2018 22:08:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (smplayer-18.5.0.tar.bz2) = NqOu2g8fy//fBQORhd12FgVRopBQVu+TP9O3cutHrTs=
-SIZE (smplayer-18.5.0.tar.bz2) = 5040367
+SHA256 (smplayer-18.6.0.tar.bz2) = HVv0sw9QHjiCXczEsS9fE3m83vfZglSdqcyXE6gwaF0=
+SIZE (smplayer-18.6.0.tar.bz2) = 5111791
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/smplayer/patches/patch-Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 patch-Makefile
--- patches/patch-Makefile      1 Mar 2017 13:04:15 -0000       1.6
+++ patches/patch-Makefile      8 Jul 2018 22:08:05 -0000
@@ -1,49 +1,50 @@
 $OpenBSD: patch-Makefile,v 1.6 2017/03/01 13:04:15 gonzalo Exp $
---- Makefile.orig      Sun Jan 29 21:25:26 2017
-+++ Makefile   Tue Feb 28 16:40:26 2017
+Index: Makefile
+--- Makefile.orig
++++ Makefile
 @@ -5,7 +5,7 @@ PREFIX=/usr/local
  CONF_PREFIX=$(PREFIX)
  
  DATA_PATH=$(PREFIX)/share/smplayer
--DOC_PATH=$(PREFIX)/share/doc/packages/smplayer
-+DOC_PATH=$(PREFIX)/share/doc/smplayer
+-DOC_PATH=$(PREFIX)/share/doc/smplayer
++DOC_PATH=$(PREFIX)/share/doc/packages/smplayer
  TRANSLATION_PATH=$(PREFIX)/share/smplayer/translations
  THEMES_PATH=$(PREFIX)/share/smplayer/themes
  SHORTCUTS_PATH=$(PREFIX)/share/smplayer/shortcuts
-@@ -13,14 +13,6 @@ SHORTCUTS_PATH=$(PREFIX)/share/smplayer/shortcuts
+@@ -13,6 +13,14 @@ SHORTCUTS_PATH=$(PREFIX)/share/smplayer/shortcuts
  ICONS_DIR=$(PREFIX)/share/icons/hicolor/
  APPLNK_DIR=$(PREFIX)/share/applications/
  
--QMAKE=qmake
--LRELEASE=lrelease
--
--DEFS=DATA_PATH=\\\"$(DATA_PATH)\\\" \
--     TRANSLATION_PATH=\\\"$(TRANSLATION_PATH)\\\" \
--     DOC_PATH=\\\"$(DOC_PATH)\\\" THEMES_PATH=\\\"$(THEMES_PATH)\\\" \
--     SHORTCUTS_PATH=\\\"$(SHORTCUTS_PATH)\\\"
--
++QMAKE=qmake
++LRELEASE=lrelease
++
++DEFS=DATA_PATH=\\\"$(DATA_PATH)\\\" \
++     TRANSLATION_PATH=\\\"$(TRANSLATION_PATH)\\\" \
++     DOC_PATH=\\\"$(DOC_PATH)\\\" THEMES_PATH=\\\"$(THEMES_PATH)\\\" \
++     SHORTCUTS_PATH=\\\"$(SHORTCUTS_PATH)\\\"
++
  all: src/smplayer webserver/simple_web_server
  
  src/smplayer:
-@@ -49,7 +41,7 @@ install: all
+@@ -41,7 +49,7 @@ install: all
        install -m 755 webserver/simple_web_server $(DESTDIR)$(PREFIX)/bin/
  
        -install -d $(DESTDIR)$(DOC_PATH)
--      tar -C docs/ --exclude=.svn -c -f - . | tar -C $(DESTDIR)$(DOC_PATH) -x 
-f -
-+      cp -r docs/* $(DESTDIR)$(DOC_PATH)
+-      cp -r docs/* $(DESTDIR)$(DOC_PATH)
++      tar -C docs/ --exclude=.svn -c -f - . | tar -C $(DESTDIR)$(DOC_PATH) -x 
-f -
  
        -install -d $(DESTDIR)$(SHORTCUTS_PATH)
        cp src/shortcuts/* $(DESTDIR)$(SHORTCUTS_PATH)
-@@ -78,9 +70,9 @@ install: all
+@@ -70,9 +78,9 @@ install: all
        -install -d $(DESTDIR)$(APPLNK_DIR)
        install -m 644 smplayer.desktop $(DESTDIR)$(APPLNK_DIR)
        install -m 644 smplayer_enqueue.desktop $(DESTDIR)$(APPLNK_DIR)
--      -install -d $(DESTDIR)$(PREFIX)/share/man/man1/
--      install -m 644 man/smplayer.1 $(DESTDIR)$(PREFIX)/share/man/man1/
--      gzip -9 -f $(DESTDIR)$(PREFIX)/share/man/man1/smplayer.1
-+      -install -d $(DESTDIR)$(PREFIX)/man/man1/
-+      install -m 644 man/smplayer.1 $(DESTDIR)$(PREFIX)/man/man1/
-+#     gzip -9 -f $(DESTDIR)$(PREFIX)/share/man/man1/smplayer.1
+-      -install -d $(DESTDIR)$(PREFIX)/man/man1/
+-      install -m 644 man/smplayer.1 $(DESTDIR)$(PREFIX)/man/man1/
+-#     gzip -9 -f $(DESTDIR)$(PREFIX)/share/man/man1/smplayer.1
++      -install -d $(DESTDIR)$(PREFIX)/share/man/man1/
++      install -m 644 man/smplayer.1 $(DESTDIR)$(PREFIX)/share/man/man1/
++      gzip -9 -f $(DESTDIR)$(PREFIX)/share/man/man1/smplayer.1
  
  uninstall:
        -rm -f $(PREFIX)/bin/smplayer
Index: patches/patch-src_preferences_cpp
===================================================================
RCS file: /cvs/ports/x11/smplayer/patches/patch-src_preferences_cpp,v
retrieving revision 1.15
diff -u -p -r1.15 patch-src_preferences_cpp
--- patches/patch-src_preferences_cpp   29 Jan 2018 15:02:10 -0000      1.15
+++ patches/patch-src_preferences_cpp   8 Jul 2018 22:08:05 -0000
@@ -2,30 +2,30 @@ $OpenBSD: patch-src_preferences_cpp,v 1.
 Index: src/preferences.cpp
 --- src/preferences.cpp.orig
 +++ src/preferences.cpp
-@@ -207,8 +207,8 @@ void Preferences::reset() {
+@@ -211,8 +211,8 @@ void Preferences::reset() {
         Drives (CD/DVD)
         *************** */
  
--      dvd_device = "";
--      cdrom_device = "";
-+      dvd_device = "/dev/cd0c";
-+      cdrom_device = "/dev/cd0c";
+-      dvd_device = "/dev/cd0c";
+-      cdrom_device = "/dev/cd0c";
++      dvd_device = "";
++      cdrom_device = "";
  #ifdef BLURAY_SUPPORT
        bluray_device = "";
  #endif
-@@ -330,13 +330,13 @@ void Preferences::reset() {
+@@ -334,13 +334,13 @@ void Preferences::reset() {
      mplayer_additional_audio_filters="";
  
  #ifdef LOG_MPLAYER
--      log_mplayer = true;
-+      log_mplayer = false;
+-      log_mplayer = false;
++      log_mplayer = true;
        verbose_log = false;
        autosave_mplayer_log = false;
        mplayer_log_saveto = "";
  #endif
  #ifdef LOG_SMPLAYER
--      log_smplayer = true;
-+      log_smplayer = false;
+-      log_smplayer = false;
++      log_smplayer = true;
        log_filter = ".*";
        save_smplayer_log = false;
  #endif
Index: patches/patch-src_prefgeneral_h
===================================================================
RCS file: /cvs/ports/x11/smplayer/patches/patch-src_prefgeneral_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_prefgeneral_h
--- patches/patch-src_prefgeneral_h     22 Sep 2016 14:05:48 -0000      1.2
+++ patches/patch-src_prefgeneral_h     8 Jul 2018 22:08:05 -0000
@@ -1,11 +1,12 @@
 $OpenBSD: patch-src_prefgeneral_h,v 1.2 2016/09/22 14:05:48 gonzalo Exp $
---- src/prefgeneral.h.orig     Fri Sep  2 19:23:16 2016
-+++ src/prefgeneral.h  Wed Sep 21 11:49:33 2016
-@@ -24,6 +24,7 @@
+Index: src/prefgeneral.h
+--- src/prefgeneral.h.orig
++++ src/prefgeneral.h
+@@ -24,7 +24,6 @@
  #include "inforeader.h"
  #include "deviceinfo.h"
  #include "preferences.h"
-+#include "filechooser.h"
+-#include "filechooser.h"
  
  #ifdef Q_OS_OS2
  #define MPLAYER_KAI_VERSION 30994
Index: patches/patch-webserver_Makefile
===================================================================
RCS file: /cvs/ports/x11/smplayer/patches/patch-webserver_Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 patch-webserver_Makefile
--- patches/patch-webserver_Makefile    1 Mar 2017 13:04:15 -0000       1.1
+++ patches/patch-webserver_Makefile    8 Jul 2018 22:08:05 -0000
@@ -1,12 +1,13 @@
 $OpenBSD: patch-webserver_Makefile,v 1.1 2017/03/01 13:04:15 gonzalo Exp $
---- webserver/Makefile.orig    Tue Feb 28 17:39:14 2017
-+++ webserver/Makefile Tue Feb 28 17:10:22 2017
+Index: webserver/Makefile
+--- webserver/Makefile.orig
++++ webserver/Makefile
 @@ -4,16 +4,6 @@ MODULE_CFLAGS=-DMG_DISABLE_DAV_AUTH -DMG_ENABLE_HTTP_C
  SOURCES = main.c mongoose.c
  CFLAGS = -O2 -W -Wall -Werror -Wno-unused-function $(CFLAGS_EXTRA) 
$(MODULE_CFLAGS)
  
 -ifeq ($(OS), Windows_NT)
--CFLAGS += -lws2_32
+-CFLAGS += -lws2_32 -Wno-format
 -CC = gcc
 -DEL_FILE = del
 -PROG := $(PROG).exe

Reply via email to