From 520520ffb8503602c5eff07c27621ffcb9184dc0 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Thu, 31 Mar 2016 22:06:37 +0000 Subject: [PATCH] smplayer: bump to version 16.4.0. --- .../{smplayer.rdef => smplayer-16.4.0.rdef} | 6 +- ...6966.patchset => smplayer-16.4.0.patchset} | 8 +- media-video/smplayer/smplayer-15.11.0.recipe | 58 --------------- media-video/smplayer/smplayer-16.4.0.recipe | 73 +++++++++++++++++++ 4 files changed, 80 insertions(+), 65 deletions(-) rename media-video/smplayer/additional-files/{smplayer.rdef => smplayer-16.4.0.rdef} (99%) rename media-video/smplayer/patches/{smplayer_x86-14.9.0.6966.patchset => smplayer-16.4.0.patchset} (91%) delete mode 100644 media-video/smplayer/smplayer-15.11.0.recipe create mode 100644 media-video/smplayer/smplayer-16.4.0.recipe diff --git a/media-video/smplayer/additional-files/smplayer.rdef b/media-video/smplayer/additional-files/smplayer-16.4.0.rdef similarity index 99% rename from media-video/smplayer/additional-files/smplayer.rdef rename to media-video/smplayer/additional-files/smplayer-16.4.0.rdef index f3aec08c9..12e4e5707 100644 --- a/media-video/smplayer/additional-files/smplayer.rdef +++ b/media-video/smplayer/additional-files/smplayer-16.4.0.rdef @@ -3,13 +3,13 @@ resource app_signature "application/x-vnd.SMPlayer"; resource app_version { - major = 15, - middle = 9, + major = 16, + middle = 4, minor = 0, variety = B_APPV_FINAL, internal = 0, short_info = "SMPlayer", - long_info = "SMPlayer ©2006-2015 Ricardo Villalba" + long_info = "SMPlayer ©2006-2016 Ricardo Villalba" }; resource app_flags B_SINGLE_LAUNCH; diff --git a/media-video/smplayer/patches/smplayer_x86-14.9.0.6966.patchset b/media-video/smplayer/patches/smplayer-16.4.0.patchset similarity index 91% rename from media-video/smplayer/patches/smplayer_x86-14.9.0.6966.patchset rename to media-video/smplayer/patches/smplayer-16.4.0.patchset index 3cce9fb1c..6688328e2 100644 --- a/media-video/smplayer/patches/smplayer_x86-14.9.0.6966.patchset +++ b/media-video/smplayer/patches/smplayer-16.4.0.patchset @@ -47,7 +47,7 @@ diff --git a/src/prefgeneral.cpp b/src/prefgeneral.cpp index f6f798d..c4e7608 100644 --- a/src/prefgeneral.cpp +++ b/src/prefgeneral.cpp -@@ -175,9 +175,13 @@ void PrefGeneral::setData(Preferences * pref) { +@@ -190,9 +190,13 @@ void PrefGeneral::setData(Preferences * pref) { #ifdef Q_OS_OS2 vo = "kva"; #else @@ -61,7 +61,7 @@ index f6f798d..c4e7608 100644 } setVO( vo ); -@@ -192,6 +196,11 @@ void PrefGeneral::setData(Preferences * pref) { +@@ -207,6 +211,11 @@ void PrefGeneral::setData(Preferences * pref) { } } #endif @@ -73,7 +73,7 @@ index f6f798d..c4e7608 100644 setAO( ao ); -@@ -948,9 +957,13 @@ void PrefGeneral::createHelp() { +@@ -984,9 +993,13 @@ void PrefGeneral::createHelp() { #ifdef Q_OS_OS2 .arg("kva") #else @@ -101,7 +101,7 @@ diff --git a/src/smplayer.cpp b/src/smplayer.cpp index 62c0a08..bccad3a 100644 --- a/src/smplayer.cpp +++ b/src/smplayer.cpp -@@ -540,10 +540,14 @@ void SMPlayer::showInfo() { +@@ -555,10 +555,14 @@ void SMPlayer::showInfo() { #ifdef Q_OS_OS2 .arg("eCS (OS/2)") #else diff --git a/media-video/smplayer/smplayer-15.11.0.recipe b/media-video/smplayer/smplayer-15.11.0.recipe deleted file mode 100644 index bfde7046d..000000000 --- a/media-video/smplayer/smplayer-15.11.0.recipe +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY="Great Qt GUI front-end for mplayer/mpv" -DESCRIPTION="SMPlayer intends to be a complete front-end for MPlayer, from \ -basic features like playing videos, DVDs, and VCDs to more advanced features \ -like support for MPlayer filters and more." -HOMEPAGE="http://smplayer.sourceforge.net" -COPYRIGHT="2006-2015 Ricardo Villalba" -LICENSE="GNU GPL v2" -REVISION="1" -SOURCE_URI="http://sourceforge.net/projects/smplayer/files/SMPlayer/$portVersion/smplayer-$portVersion.tar.bz2" -CHECKSUM_SHA256="968901fa2c86c13934c5228a8ae8a74188cdb27e49ecc05546e71eac642f19c1" -PATCHES="smplayer_x86-14.9.0.6966.patchset" -ADDITIONAL_FILES="smplayer.rdef" - -ARCHITECTURES="x86" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - smplayer$secondaryArchSuffix = $portVersion - app:SMPlayer - " -REQUIRES=" - haiku$secondaryArchSuffix - libqt4$secondaryArchSuffix >= 4.8 - lib:libz$secondaryArchSuffix - cmd:mplayer - cmd:smtube$secondaryArchSuffix - " - -BUILD_REQUIRES=" - libqt4${secondaryArchSuffix}_devel >= 4.8 - devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:gcc$secondaryArchSuffix - cmd:make - " - -BUILD() -{ - # TODO: fix paths - # DATA_PATH - # DOC_PATH - # TRANSLATION_PATH - # THEMES_PATH - # SHORTCUTS_PATH - echo "SVN-r6966" > svn_revision - make $jobArgs -} - -INSTALL() -{ - mkdir -p $appsDir/SMPlayer - cp src/smplayer $appsDir/SMPlayer/SMPlayer - addResourcesToBinaries $portDir/additional-files/smplayer.rdef \ - $appsDir/SMPlayer/SMPlayer - addAppDeskbarSymlink $appsDir/SMPlayer/SMPlayer -} diff --git a/media-video/smplayer/smplayer-16.4.0.recipe b/media-video/smplayer/smplayer-16.4.0.recipe new file mode 100644 index 000000000..c8661d112 --- /dev/null +++ b/media-video/smplayer/smplayer-16.4.0.recipe @@ -0,0 +1,73 @@ +SUMMARY="Great Qt GUI front-end for mplayer/mpv" +DESCRIPTION="SMPlayer intends to be a complete front-end for MPlayer, from \ +basic features like playing videos, DVDs, and VCDs to more advanced features \ +like support for MPlayer filters and more." +HOMEPAGE="http://smplayer.sourceforge.net" +COPYRIGHT="2006-2015 Ricardo Villalba" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://downloads.sf.net/smplayer/smplayer-$portVersion.tar.bz2" +CHECKSUM_SHA256="de4169c7e3a1d8bf6f3c9a77fa0a8c24c1f63db3f2b8a325bc6761c0a9d2d2ec" +PATCHES="smplayer-$portVersion.patchset" +ADDITIONAL_FILES="smplayer-$portVersion.rdef" + +ARCHITECTURES="!x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="!x86_gcc2 x86" + +# On x86_gcc2 we don't want to install the commands in bin//, but in bin/. +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + + +PROVIDES=" + smplayer$secondaryArchSuffix = $portVersion + app:SMPlayer = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + libqt4$secondaryArchSuffix >= 4.8 + lib:libz$secondaryArchSuffix + cmd:mplayer + cmd:smtube$commandSuffix + " + +BUILD_REQUIRES=" + libqt4${secondaryArchSuffix}_devel >= 4.8 + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel + cmd:gcc$secondaryArchSuffix + cmd:make + " + +BUILD() +{ + # TODO: fix paths + # DATA_PATH + # DOC_PATH + # TRANSLATION_PATH + # THEMES_PATH + # SHORTCUTS_PATH + make $jobArgs +} + +INSTALL() +{ + smplayerDir=$appsDir/SMPlayer + mkdir -p $smplayerDir + cp src/smplayer $smplayerDir/SMPlayer$commandSuffix + addResourcesToBinaries $portDir/additional-files/smplayer-$portVersion.rdef \ + $smplayerDir/SMPlayer$commandSuffix + mkdir -p $commandBinDir + if [ -n "$commandSuffix" ]; then + mkdir -p $prefix/bin + symlinkRelative -s $smplayerDir/SMPlayer$commandSuffix $prefix/bin + fi + symlinkRelative -s $smplayerDir/SMPlayer$commandSuffix $commandBinDir/smplayer + addAppDeskbarSymlink $smplayerDir/SMPlayer +}