From 63970490679ab1d728d9e0d46a41b321f46cdd4e Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 30 Oct 2023 06:23:39 +0000 Subject: [PATCH] hydrogen, revbump, 32bit fixes (#9692) --- media-sound/hydrogen/hydrogen-1.2.2.recipe | 59 ++++++++++++++----- .../hydrogen/patches/hydrogen-1.2.2.patchset | 36 +++-------- 2 files changed, 52 insertions(+), 43 deletions(-) diff --git a/media-sound/hydrogen/hydrogen-1.2.2.recipe b/media-sound/hydrogen/hydrogen-1.2.2.recipe index abf1c91f2..501e23fda 100644 --- a/media-sound/hydrogen/hydrogen-1.2.2.recipe +++ b/media-sound/hydrogen/hydrogen-1.2.2.recipe @@ -11,9 +11,10 @@ Main features: * MIDI learning via Shift+MouseClick on many gui-cotrollers combined with a midi settings editor. * Unique human velocity, human time, pitch and swing functions." HOMEPAGE="http://hydrogen-music.org/" -COPYRIGHT="2023 Hydrogen developers" +COPYRIGHT="2002-2008 Alessandro Cominu + 2008-2023 The hydrogen development team" LICENSE="GNU GPL v2" -REVISION="3" +REVISION="4" SOURCE_URI="https://github.com/hydrogen-music/hydrogen/archive/refs/tags/$portVersion.tar.gz" CHECKSUM_SHA256="b38173b28cc260e5e02a7300f171cf7fefafd8c3763f31f6f8b2aafccb4bc7b5" SOURCE_DIR="hydrogen-$portVersion" @@ -24,14 +25,15 @@ ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" PROVIDES=" - hydrogen + hydrogen$secondaryArchSuffix = $portVersion cmd:h2cli$secondaryArchSuffix cmd:h2player$secondaryArchSuffix - cmd:hydrogen$secondaryArchSuffix + app:Hydrogen " REQUIRES=" haiku$secondaryArchSuffix ladspa_sdk$secondaryArchSuffix + cmd:rubberband lib:libarchive$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix lib:libcppunit$secondaryArchSuffix @@ -52,6 +54,14 @@ REQUIRES=" lib:libz$secondaryArchSuffix " +PROVIDES_devel=" + hydrogen${secondaryArchSuffix}_devel = $portVersion + devel:libhydrogen_core_$portVersion$secondaryArchSuffix + " +REQUIRES_devel=" + hydrogen$secondaryArchSuffix == $portVersion base + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel ladspa_sdk${secondaryArchSuffix}_devel @@ -76,34 +86,55 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" cmd:cmake + cmd:dot cmd:doxygen +# cmd:epstopdf cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix cmd:clang_tidy >= 12 cmd:linguist$secondaryArchSuffix >= 5 cmd:lrelease$secondaryArchSuffix >= 5 cmd:make +# cmd:perl cmd:pkg_config$secondaryArchSuffix - cmd:rubberband " BUILD() { cmake -Bbuild -S. $cmakeDirArgs \ - -DCMAKE_BUILD_TYPE=Release \ - -DWANT_PORTAUDIO=ON \ - -DWANT_PORTMIDI=ON \ - -DCMAKE_INSTALL_PREFIX=$prefix + -DCMAKE_BUILD_TYPE=Release \ + -DWANT_DEBUG=NO \ + -DWANT_PORTAUDIO=ON \ + -DWANT_PORTMIDI=ON \ + -DWANT_SHARED=OFF make -C build $jobArgs + make -C build doc } INSTALL() { - mkdir -p $appsDir/Hydrogen make -C build install - rm $libDir/libhydrogen-core-$portVersion.a - mv $binDir/hydrogen$secondaryArchSuffix $appsDir/Hydrogen/Hydrogen + + # install documentation + mkdir -p $developDocDir + cp -r build/docs/html $developDocDir + + # we are not linux + rm -rf $dataDir/{applications,icons,metainfo} + + mkdir -p $appsDir + mv $binDir/hydrogen $appsDir/Hydrogen + addResourcesToBinaries $portDir/additional-files/Hydrogen.rdef \ - $appsDir/Hydrogen/Hydrogen - addAppDeskbarSymlink $appsDir/Hydrogen/Hydrogen + $appsDir/Hydrogen + + addAppDeskbarSymlink $appsDir/Hydrogen + + prepareInstalledDevelLib libhydrogen-core-1.2.2 + + packageEntries devel \ + $developDir + + # clean up empty directory + rm -r $libDir } diff --git a/media-sound/hydrogen/patches/hydrogen-1.2.2.patchset b/media-sound/hydrogen/patches/hydrogen-1.2.2.patchset index 7b7f9fde8..5c639ba36 100644 --- a/media-sound/hydrogen/patches/hydrogen-1.2.2.patchset +++ b/media-sound/hydrogen/patches/hydrogen-1.2.2.patchset @@ -1,39 +1,17 @@ -From 4f1d72e8e66b4f64002abf6fccef98281aa03fa4 Mon Sep 17 00:00:00 2001 +From 7ee4a89354dc9540514b82044333dce07919efa7 Mon Sep 17 00:00:00 2001 From: hfsfox Date: Fri, 6 Oct 2023 06:43:28 +0300 Subject: fix data paths diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1fe4013..3097589 100644 +index 1fe4013..e7474bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -51,6 +51,9 @@ OPTION(WANT_DEBUG "Build with debug information" ON) - IF(APPLE) - OPTION(WANT_SHARED "Build the core library shared." OFF) - OPTION(WANT_ALSA "Include ALSA (Advanced Linux Sound Architecture) support" OFF) -+ELSEIF(HAIKU) -+ OPTION(WANT_SHARED "Build the core library shared." OFF) -+ OPTION(WANT_ALSA "Include ALSA (Advanced Linux Sound Architecture) support" ON) - ELSE() - OPTION(WANT_SHARED "Build the core library shared." ON) - OPTION(WANT_ALSA "Include ALSA (Advanced Linux Sound Architecture) support" ON) -@@ -202,13 +205,23 @@ IF(WIN32) - SET(H2_LIB_PATH ".") - SET(H2_DATA_PATH ".") - SET(H2_SYS_PATH "hydrogen") -+ELSEIF(HAIKU) -+ SET(H2_BIN_PATH ${CMAKE_INSTALL_BINDIR}) -+ SET(H2_LIB_PATH ${CMAKE_INSTALL_LIBDIR}) -+ SET(H2_DATA_PATH "data/Hydrogen") -+ SET(H2_SYS_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/Hydrogen") - ELSE() - SET(H2_BIN_PATH ${CMAKE_INSTALL_BINDIR}) - SET(H2_LIB_PATH ${CMAKE_INSTALL_LIBDIR}) +@@ -208,7 +208,11 @@ ELSE() SET(H2_DATA_PATH "${CMAKE_INSTALL_DATADIR}/hydrogen") SET(H2_SYS_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/hydrogen") ENDIF() -+ +IF(HAIKU) +SET(H2_USR_PATH "config/settings/hydrogen") +ELSE() @@ -43,23 +21,23 @@ index 1fe4013..3097589 100644 SET(MAX_INSTRUMENTS 1000 CACHE STRING "Maximum number of instruments") SET(MAX_COMPONENTS 32 CACHE STRING "Maximum number of components") diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt -index ae513e1..91be7c2 100644 +index ae513e1..e2afe52 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -81,6 +81,13 @@ TARGET_LINK_LIBRARIES(hydrogen Qt5::Svg ) -+IF(HAIKU) ++if(HAIKU) +TARGET_LINK_LIBRARIES(hydrogen + network + bsd +) -+ENDIF() ++endif() + IF(Backtrace_FOUND) TARGET_LINK_LIBRARIES(hydrogen ${Backtrace_LIBRARIES} -- -2.37.3 +2.42.0