diff --git a/media-sound/qmmp/additional-files/BenuAmp.wsz b/media-sound/qmmp/additional-files/BenuAmp.wsz new file mode 100644 index 000000000..d98d8bc32 Binary files /dev/null and b/media-sound/qmmp/additional-files/BenuAmp.wsz differ diff --git a/media-sound/qmmp/additional-files/Rugged.wsz b/media-sound/qmmp/additional-files/Rugged.wsz new file mode 100755 index 000000000..3c2d3377d Binary files /dev/null and b/media-sound/qmmp/additional-files/Rugged.wsz differ diff --git a/media-sound/qmmp/additional-files/qmmp.rdef.in b/media-sound/qmmp/additional-files/qmmp.rdef.in index 0dcea3550..203b1fcf5 100644 --- a/media-sound/qmmp/additional-files/qmmp.rdef.in +++ b/media-sound/qmmp/additional-files/qmmp.rdef.in @@ -1,5 +1,5 @@ -resource app_flags B_SINGLE_LAUNCH; +resource app_flags B_MULTIPLE_LAUNCH; resource app_version { major = @MAJOR@, diff --git a/media-sound/qmmp/patches/qmmp-1.2.0.patchset b/media-sound/qmmp/patches/qmmp-1.2.0.patchset index 3f0307d0e..940098be3 100644 --- a/media-sound/qmmp/patches/qmmp-1.2.0.patchset +++ b/media-sound/qmmp/patches/qmmp-1.2.0.patchset @@ -1,4 +1,4 @@ -From 03d33373f4542751aef3c00076fc56b48d397dc8 Mon Sep 17 00:00:00 2001 +From 42b234b71cfc75d88f7954a48dc3cfd1eab021f2 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 28 Nov 2017 00:42:45 +1000 Subject: Fix build for Haiku @@ -253,7 +253,7 @@ index de0e271..a8173f8 100644 2.15.0 -From 7a227b91321efe994837f69705594382188c0463 Mon Sep 17 00:00:00 2001 +From 57dc32beb35771fa790587982bb41d625abff59e Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 28 Nov 2017 00:46:04 +1000 Subject: Add mediakit output plugin @@ -721,3 +721,26 @@ index 0000000..f678c61 -- 2.15.0 + +From 50c8b80d4a6f0c7fe59c9c0781c4b6e1407c1efd Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Tue, 28 Nov 2017 17:50:44 +1000 +Subject: Fix skins directory for Haiku + + +diff --git a/src/plugins/Ui/skinned/skinreader.cpp b/src/plugins/Ui/skinned/skinreader.cpp +index 160e9b4..6c66770 100644 +--- a/src/plugins/Ui/skinned/skinreader.cpp ++++ b/src/plugins/Ui/skinned/skinreader.cpp +@@ -49,7 +49,7 @@ void SkinReader::generateThumbs() + QDir dir(Qmmp::configDir() + "skins"); + dir.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks); + QFileInfoList f = dir.entryInfoList(); +-#if defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN) ++#if (defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN)) || defined(Q_OS_HAIKU) + dir.setPath(qApp->applicationDirPath()+"/skins"); + #else + dir.setPath(qApp->applicationDirPath()+"/../share/qmmp/skins"); +-- +2.15.0 + diff --git a/media-sound/qmmp/qmmp-1.2.0.recipe b/media-sound/qmmp/qmmp-1.2.0.recipe index 8e9c36582..a1a94ae5c 100644 --- a/media-sound/qmmp/qmmp-1.2.0.recipe +++ b/media-sound/qmmp/qmmp-1.2.0.recipe @@ -4,14 +4,19 @@ The user interface is similar to winamp or xmms." HOMEPAGE="http://qmmp.ylsoftware.com/" COPYRIGHT="2006-2017 Qmmp Development Team" LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://sourceforge.net/projects/qmmp-dev/files/qmmp/qmmp-$portVersion.tar.bz2" CHECKSUM_SHA256="8020c92e5dd75ed9ab34fd5d1bb524e01f2f361dafd2fe9a3073ae97f5896c9e" -ADDITIONAL_FILES="qmmp.rdef.in" PATCHES="qmmp-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" +ADDITIONAL_FILES=" + qmmp.rdef.in + BenuAmp.wsz + Rugged.wsz + " + PROVIDES=" qmmp$secondaryArchSuffix = $portVersion app:Qmmp$secondaryArchSuffix = $portVersion @@ -104,10 +109,9 @@ INSTALL() mv -f $appsDir/Qmmp/lib/pkgconfig $libDir mkdir -p $includeDir mv -f $appsDir/Qmmp/include/* $includeDir - rm -rf $appsDir/Qmmp/bin \ - $appsDir/Qmmp/include \ - $appsDir/Qmmp/lib \ - $appsDir/Qmmp/share + rm -rf $appsDir/Qmmp/{bin,include,lib,share} + mkdir -p $appsDir/Qmmp/skins + cp -f $portDir/additional-files/*.wsz $appsDir/Qmmp/skins fixPkgconfig prepareInstalledDevelLibs libqmmp libqmmpui