Skip to content
Snippets Groups Projects
Commit e32cf560 authored by Muhammad Moinur Rahman's avatar Muhammad Moinur Rahman
Browse files

audio/hydrogen: Fix build with llvm16

- Update version 1.1.1=>1.2.0
- Pet portclippy

Changelog: http://hydrogen-music.org/release-120

Approved by:	portmgr (blanket)
Sponsored by:	The FreeBSD Foundation
parent c58486e4
No related branches found
No related tags found
No related merge requests found
PORTNAME= hydrogen
DISTVERSION= 1.1.1
PORTREVISION= 1
DISTVERSION= 1.2.0
#PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= https://github.com/hydrogen-music/${PORTNAME}/releases/download/${DISTVERSION}/ \
SF/hydrogen/Hydrogen/${DISTVERSION}%20Sources/
......@@ -17,67 +17,63 @@ LIB_DEPENDS= libsndfile.so:audio/libsndfile \
USES= cmake compiler:c++17-lang desktop-file-utils pkgconfig \
localbase qt:5
USE_QT= core gui network widgets xml xmlpatterns buildtools:build \
linguisttools:build qmake:build testlib:build
USE_LDCONFIG= yes
USE_QT= core gui network widgets xml xmlpatterns buildtools:build \
linguisttools:build qmake:build svg testlib:build
CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR=${LOCALBASE}/man
OPTIONS_SINGLE= EXPORT
OPTIONS_SINGLE_EXPORT= LIBARCHIVE LIBTAR
OPTIONS_DEFINE= ALSA DEBUG JACK LADSPA LASH OSS PORTAUDIO \
PULSEAUDIO RDF TEST
OPTIONS_DEFAULT= JACK LADSPA LIBARCHIVE OSS RDF
OPTIONS_SINGLE= EXPORT
OPTIONS_SINGLE_EXPORT= LIBARCHIVE LIBTAR
EXPORT_DESC= Export support for drumkit
LIBARCHIVE_DESC= LibArchive support
LIBTAR_DESC= Libtar support
RDF_DESC= RDF File support
ALSA_CMAKE_BOOL= WANT_ALSA
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
ALSA_RUN_DEPENDS= alsa-plugins>=0:audio/alsa-plugins
ALSA_CMAKE_BOOL= WANT_ALSA
DEBUG_CMAKE_BOOL= WANT_DEBUG
JACK_CMAKE_BOOL= WANT_JACK WANT_JACKSESSION
JACK_LIB_DEPENDS= libjack.so:audio/jack
JACK_CMAKE_BOOL= WANT_JACK WANT_JACKSESSION
LADSPA_CMAKE_BOOL= WANT_LADSPA
LADSPA_CMAKE_ON= -DLADSPA_LIBRARIES:STRING=${LOCALBASE}/lib/ladspa
LADSPA_BUILD_DEPENDS= ladspa>=0:audio/ladspa
LADSPA_RUN_DEPENDS= analyseplugin:audio/ladspa
LADSPA_CMAKE_BOOL= WANT_LADSPA
LADSPA_CMAKE_ON= -DLADSPA_LIBRARIES:STRING=${LOCALBASE}/lib/ladspa
LASH_CMAKE_BOOL= WANT_LASH
LASH_LIB_DEPENDS= liblash.so:audio/lash
LASH_CMAKE_BOOL= WANT_LASH
LIBARCHIVE_DESC= LibArchive support
LIBARCHIVE_CMAKE_BOOL= WANT_LIBARCHIVE
LIBARCHIVE_USES= libarchive
LIBARCHIVE_CMAKE_BOOL= WANT_LIBARCHIVE
LIBTAR_DESC= Libtar support
LIBTAR_LIB_DEPENDS= libtar.so:devel/libtar
LIBTAR_CMAKE_BOOL= WANT_LIBTAR
LIBTAR_CMAKE_ON= -DCMAKE_REQUIRED_INCLUDES:STRING=${LOCALBASE}/include/
LIBTAR_LIB_DEPENDS= libtar.so:devel/libtar
OSS_CMAKE_BOOL= WANT_OSS
PORTAUDIO_CMAKE_BOOL= WANT_PORTAUDIO
PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio
PORTAUDIO_CMAKE_BOOL= WANT_PORTAUDIO
PULSEAUDIO_CMAKE_BOOL= WANT_PULSEAUDIO
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
PULSEAUDIO_CMAKE_BOOL= WANT_PULSEAUDIO
RDF_DESC= RDF File support
RDF_LIB_DEPENDS= liblrdf.so:textproc/liblrdf
RDF_CMAKE_BOOL= WANT_LRDF
RDF_CMAKE_ON= -DLRDF_INCLUDE_DIR:STRING=${LOCALBASE}/include/raptor2
RDF_LIB_DEPENDS= liblrdf.so:textproc/liblrdf
TEST_CMAKE_BOOL= WANT_CPPUNIT
TEST_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/cppunit.pc:devel/cppunit
TEST_CMAKE_BOOL= WANT_CPPUNIT
TEST_LDFLAGS= -lexecinfo
post-patch:
@${REINPLACE_CMD} 's|EXISTS(tar|EXISTS(${LOCALBASE}/lib/libtar.so|g' \
${WRKSRC}/CMakeLists.txt
do-test-TEST-on:
cd ${WRKSRC} && ./src/tests/tests
......
TIMESTAMP = 1666087845
SHA256 (hydrogen-1.1.1.tar.gz) = 692ef6acd94102ec9c576cf28ce8572431f669f0516c7465b6b79fc3e15e0180
SIZE (hydrogen-1.1.1.tar.gz) = 16438242
TIMESTAMP = 1689956565
SHA256 (hydrogen-1.2.0.tar.gz) = 92393b1aabdf5f0aea4398dd66e7d6a27cc9db17ecdcde4dacd5af6b0cf400ee
SIZE (hydrogen-1.2.0.tar.gz) = 12911501
--- CMakeLists.txt.orig 2017-11-21 17:47:16 UTC
--- CMakeLists.txt.orig 2023-03-31 14:32:25 UTC
+++ CMakeLists.txt
@@ -206,6 +206,11 @@ ENDIF()
@@ -206,9 +206,9 @@ CHECK_INCLUDE_FILES(sys/stat.h HAVE_SYS_STAT_H)
CHECK_INCLUDE_FILES(libtar.h HAVE_LIBTAR_H)
CHECK_INCLUDE_FILES(execinfo.h HAVE_EXECINFO_H)
FIND_PACKAGE(Backtrace)
-CHECK_LIBRARY_EXISTS(tar tar_open "" HAVE_LIBTAR_OPEN)
-CHECK_LIBRARY_EXISTS(tar tar_close "" HAVE_LIBTAR_CLOSE)
-CHECK_LIBRARY_EXISTS(tar tar_extract_all "" HAVE_LIBTAR_EXTRACT_ALL)
+CHECK_LIBRARY_EXISTS(/usr/local/lib/libtar.so tar_open "" HAVE_LIBTAR_OPEN)
+CHECK_LIBRARY_EXISTS(/usr/local/lib/libtar.so tar_close "" HAVE_LIBTAR_CLOSE)
+CHECK_LIBRARY_EXISTS(/usr/local/lib/libtar.so tar_extract_all "" HAVE_LIBTAR_EXTRACT_ALL)
IF(HAVE_LIBTAR_H AND HAVE_LIBTAR_OPEN AND HAVE_LIBTAR_CLOSE AND HAVE_LIBTAR_EXTRACT_ALL)
SET(LIBTAR_OK TRUE)
ELSE()
@@ -222,6 +222,11 @@ ENDIF()
FIND_HELPER(LIBARCHIVE libarchive archive.h archive)
IF( WANT_LIBARCHIVE AND LIBARCHIVE_FOUND)
SET(WANT_LIBTAR FALSE)
......@@ -12,7 +25,7 @@
ENDIF()
FIND_HELPER(LIBSNDFILE sndfile sndfile.h sndfile)
FIND_HELPER(ALSA alsa alsa/asoundlib.h asound )
@@ -215,6 +220,8 @@ FIND_HELPER(OSC liblo lo/lo.h lo)
@@ -231,6 +236,8 @@ FIND_HELPER(OSC liblo lo/lo.h lo)
IF("${CMAKE_SYSTEM_NAME}" MATCHES "NetBSD")
FIND_HELPER(OSS oss sys/soundcard.h ossaudio )
......
--- src/core/Logger.cpp.orig 2022-10-17 00:49:12 UTC
+++ src/core/Logger.cpp
@@ -65,6 +65,7 @@ void* loggerThread_func( void* param ) {
Logger::queue_t::iterator it, last;
while ( logger->__running ) {
+ pthread_mutex_lock( &logger->__mutex );
pthread_cond_wait( &logger->__messages_available, &logger->__mutex );
pthread_mutex_unlock( &logger->__mutex );
if( !queue->empty() ) {
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment