From 28da1c0c40f7c9596155f6fe1522a5c719c6a53f Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 9 Mar 2025 20:26:50 +1000 Subject: [PATCH] qmmp-plugin-pack: fix build --- .../qmmp_plugin_pack-2.2.1.recipe | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/media-plugins/qmmp-plugin-pack/qmmp_plugin_pack-2.2.1.recipe b/media-plugins/qmmp-plugin-pack/qmmp_plugin_pack-2.2.1.recipe index 4fbf27a7b..0056c969c 100644 --- a/media-plugins/qmmp-plugin-pack/qmmp_plugin_pack-2.2.1.recipe +++ b/media-plugins/qmmp-plugin-pack/qmmp_plugin_pack-2.2.1.recipe @@ -1,14 +1,14 @@ SUMMARY="Plugin pack is a set of extra plugins for Qmmp" DESCRIPTION="Plugin List: * FFap - enhanced Monkey's Audio (APE) decoder (24-bit samples and embedded cue support) - * XMP - module player with use of the libxmp library + * modplug - module player with use of the libmodplug library * Sample Rate Converter - resampler based on libsamplerate library * Goom - audio visualization based on goom project * FFVideo - video playback engine based on FFmpeg library" HOMEPAGE="http://qmmp.ylsoftware.com/" COPYRIGHT="2006-2024 Qmmp Development Team" LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://qmmp.ylsoftware.com/files/qmmp-plugin-pack/2.2/qmmp-plugin-pack-$portVersion.tar.bz2" CHECKSUM_SHA256="bfb19dfc657a3b2d882bb1cf4069551488352ae920d8efac391d218c00770682" SOURCE_DIR="qmmp-plugin-pack-$portVersion" @@ -38,8 +38,8 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel qt6_tools${secondaryArchSuffix}_devel - devel:libavcodec$secondaryArchSuffix - devel:libavformat$secondaryArchSuffix + devel:libavcodec$secondaryArchSuffix >= 60 + devel:libavformat$secondaryArchSuffix >= 60 devel:libmodplug$secondaryArchSuffix devel:libqmmp$secondaryArchSuffix devel:libQt6Core$secondaryArchSuffix @@ -63,21 +63,17 @@ BUILD_PREREQUIRES=" BUILD() { - mkdir -p build - cd build - - cmake .. $cmakeDirArgs \ - -DCMAKE_INSTALL_PREFIX=$appsDir/Qmmp \ - -DCMAKE_INSTALL_BINDIR=$appsDir/Qmmp \ + cmake -S . -B build \ \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_DATADIR=$dataDir \ -DPLUGIN_DIR=$appsDir/Qmmp/plugins \ - -DCMAKE_BUILD_TYPE=RELEASE \ -DUSE_FFVIDEO=OFF - make $jobArgs + cmake --build build $jobArgs } INSTALL() { - cd build - make install + make -C build install + rm -rf $dataDir }