audio/giada: update 0.17.1 → 1.4.1

4 files changed, 97 insertions, 25 deletions

diff --git a/audio/giada/Makefile b/audio/giada/Makefile
index c545b3fbf06c..a3acb7700519 100644
--- a/audio/giada/Makefile
+++ b/audio/giada/Makefile
@@ -1,40 +1,48 @@
 PORTNAME=	giada
-DISTVERSIONPREFIX=	v
-DISTVERSION=	0.17.1
-PORTREVISION=	6
+DISTVERSION=	1.4.1
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Hardcore loop machine
-WWW=		https://www.giadamusic.com/
+WWW=		https://www.giadamusic.com/ \
+		https://github.com/monocasual/giada
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	nlohmann-json>0:devel/nlohmann-json
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
-		libfltk.so:x11-toolkits/fltk \
+		libatk-1.0.so:accessibility/at-spi2-core \
+		libdbus-1.so:devel/dbus \
+		libfmt.so:devel/libfmt \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz \
 		libjack.so:audio/jack \
-		libjansson.so:devel/jansson \
+		libpng16.so:graphics/png \
 		libpulse.so:audio/pulseaudio \
 		librtmidi.so:audio/rtmidi \
 		libsamplerate.so:audio/libsamplerate \
-		libsndfile.so:audio/libsndfile
-
-USES=		autoreconf compiler:c++14-lang gmake localbase pkgconfig xorg
-GH_TUPLE=	nlohmann:json:db78ac1d7716f56fc9f1b030b715f872f93964e4:json/src/deps/json \
-		monocasual:rtaudio:5386a90:rtaudio/src/deps/rtaudio
+		libsndfile.so:audio/libsndfile \
+		libwayland-client.so:graphics/wayland \
+		libxkbcommon.so:x11/libxkbcommon
 
+USES=		cmake compiler:c++17-lang gettext-runtime gl gnome jpeg localbase pkgconfig xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	monocasual
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--target=${OPSYS:tl}
-USE_XORG=	x11 xcursor xext xfixes xft xinerama xpm xrender
-
-CXXFLAGS+=	`pkg-config --cflags rtmidi`
-LDFLAGS+=	-lfltk
+GH_TUPLE=	cameron314:concurrentqueue:6dd38b8:concurrentqueue/src/deps/concurrentqueue \
+		fltk:fltk:a9b1113:fltk/src/deps/fltk \
+		juce-framework:JUCE:29396c2:juce/src/deps/juce \
+		monocasual:geompp:b6c6740:geompp/src/deps/geompp \
+		monocasual:mcl-atomic-swapper:4aa864c:mclatomicswapper/src/deps/mcl-atomic-swapper \
+		monocasual:mcl-audio-buffer:e6b00c8:mclaudiobuffer/src/deps/mcl-audio-buffer \
+		monocasual:mcl-utils:77a740e:mclutils/src/deps/mcl-utils \
+		monocasual:rtaudio:0f18dfd:rtaudio/src/deps/rtaudio
+USE_GNOME=	cairo gdkpixbuf glib20 gtk30 pango
+USE_GL=		egl
+USE_XORG=	ice sm x11 xcursor xext xfixes xft xinerama xpm xrender
+
+CMAKE_ON=	CMAKE_SKIP_RPATH
 
 PLIST_FILES=	bin/${PORTNAME}
 
diff --git a/audio/giada/distinfo b/audio/giada/distinfo
index f470c3cccba2..06e4f7f3ece5 100644
--- a/audio/giada/distinfo
+++ b/audio/giada/distinfo
@@ -1,7 +1,19 @@
-TIMESTAMP = 1612283126
-SHA256 (monocasual-giada-v0.17.1_GH0.tar.gz) = ab88b224e619d02d880a1af5a32699ab7baf9d40cd3852c2befd3f51bc94eee4
-SIZE (monocasual-giada-v0.17.1_GH0.tar.gz) = 373284
-SHA256 (nlohmann-json-db78ac1d7716f56fc9f1b030b715f872f93964e4_GH0.tar.gz) = 048aa963b1d551b99c8a4c05d8e666d50c282ba745623ac1c98c6c3300af38cf
-SIZE (nlohmann-json-db78ac1d7716f56fc9f1b030b715f872f93964e4_GH0.tar.gz) = 6883371
-SHA256 (monocasual-rtaudio-5386a90_GH0.tar.gz) = 6b0241315ea640f93764b0198d3a0f63d43c21ed977c6503ae215b6f04bff9c2
-SIZE (monocasual-rtaudio-5386a90_GH0.tar.gz) = 227980
+TIMESTAMP = 1778387576
+SHA256 (monocasual-giada-1.4.1_GH0.tar.gz) = 804c28d2edc3fc39aedd8dac300898e8a09d136fef26b2260107274ecd09d592
+SIZE (monocasual-giada-1.4.1_GH0.tar.gz) = 429324
+SHA256 (cameron314-concurrentqueue-6dd38b8_GH0.tar.gz) = 05ebdaffde61e9df9731c56be85d4909ac8af5b9fb2c3b811817d3e5584d49ae
+SIZE (cameron314-concurrentqueue-6dd38b8_GH0.tar.gz) = 1566391
+SHA256 (fltk-fltk-a9b1113_GH0.tar.gz) = ac359731ea7d6f9d4d5c381401b115f6cec11e89a1f71bcbb5c53c5d4c872a49
+SIZE (fltk-fltk-a9b1113_GH0.tar.gz) = 9121965
+SHA256 (juce-framework-JUCE-29396c2_GH0.tar.gz) = ca5ae7b7af29bb9ee619912b0f3e24e5b3eb7ae2289b8ccb90d670fcd6b745f1
+SIZE (juce-framework-JUCE-29396c2_GH0.tar.gz) = 22808337
+SHA256 (monocasual-geompp-b6c6740_GH0.tar.gz) = 9a65af362402ce5bd565fa52f2fa7af86cf4a96ed8b78430f65d32284ea2f66e
+SIZE (monocasual-geompp-b6c6740_GH0.tar.gz) = 17947
+SHA256 (monocasual-mcl-atomic-swapper-4aa864c_GH0.tar.gz) = 029ecaad4d1a640fda2541ca82655c6ec913b2a02c3b801023283cb706e23701
+SIZE (monocasual-mcl-atomic-swapper-4aa864c_GH0.tar.gz) = 16395
+SHA256 (monocasual-mcl-audio-buffer-e6b00c8_GH0.tar.gz) = 7e5f14da325876b958f47cd733b250a320efa18a2abcb2de2f6a597f86615ac8
+SIZE (monocasual-mcl-audio-buffer-e6b00c8_GH0.tar.gz) = 18039
+SHA256 (monocasual-mcl-utils-77a740e_GH0.tar.gz) = b2e132b3572855501c6730b2bc90397b1b251a5ced590e4527e7112876c3a09b
+SIZE (monocasual-mcl-utils-77a740e_GH0.tar.gz) = 19902
+SHA256 (monocasual-rtaudio-0f18dfd_GH0.tar.gz) = 1fcd162f14ef74a67bcbc6d6def805617e101b7232c064b44f72486578e3c02a
+SIZE (monocasual-rtaudio-0f18dfd_GH0.tar.gz) = 257395
diff --git a/audio/giada/files/patch-CMakeLists.txt b/audio/giada/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..815d05a3758c
--- /dev/null
+++ b/audio/giada/files/patch-CMakeLists.txt
@@ -0,0 +1,37 @@
+-- Add FreeBSD to install rules and exclude bundled FLTK/JUCE from installing
+-- their own files (headers, tools) into the stage directory.
+
+--- CMakeLists.txt.orig	2026-05-10 04:37:33 UTC
++++ CMakeLists.txt
+@@ -577,6 +577,8 @@ FetchContent_MakeAvailable(FLTK)
+ set(FLTK_BUILD_FORMS OFF CACHE BOOL "FLTK: don't build (X)Forms compatibility library")
+ 
+ FetchContent_MakeAvailable(FLTK)
++FetchContent_GetProperties(FLTK)
++set_property(DIRECTORY ${fltk_SOURCE_DIR} PROPERTY EXCLUDE_FROM_ALL TRUE)
+ list(APPEND LIBRARIES fltk::fltk fltk::images)
+ 
+ # Libsndfile
+@@ -770,7 +772,7 @@ endif()
+ # Extra parameters for audio plug-ins support.
+ # ------------------------------------------------------------------------------
+ 
+-add_subdirectory(${CMAKE_SOURCE_DIR}/src/deps/juce)
++add_subdirectory(${CMAKE_SOURCE_DIR}/src/deps/juce EXCLUDE_FROM_ALL)
+ 
+ list(APPEND LIBRARIES 
+ 	juce::juce_audio_utils
+@@ -829,9 +831,12 @@ target_compile_options(giada PRIVATE ${COMPILER_OPTION
+ # Install rules
+ # ------------------------------------------------------------------------------
+ 
+-if(DEFINED OS_LINUX)
++if(DEFINED OS_LINUX OR DEFINED OS_FREEBSD)
+ 	include(GNUInstallDirs)
+ 	install(TARGETS giada DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})
++endif()
++
++if(DEFINED OS_LINUX)
+ 	install(FILES ${CMAKE_SOURCE_DIR}/extras/com.giadamusic.Giada.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+ 	install(FILES ${CMAKE_SOURCE_DIR}/extras/com.giadamusic.Giada.metainfo.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo)
+ 	install(FILES ${CMAKE_SOURCE_DIR}/extras/giada-logo.svg RENAME com.giadamusic.Giada.svg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps)
diff --git a/audio/giada/files/patch-src_deps_mcl-utils_src_container.hpp b/audio/giada/files/patch-src_deps_mcl-utils_src_container.hpp
new file mode 100644
index 000000000000..fa9eaeb1fc0c
--- /dev/null
+++ b/audio/giada/files/patch-src_deps_mcl-utils_src_container.hpp
@@ -0,0 +1,15 @@
+-- Use std::views::zip+iota workaround for FreeBSD (clang 19 libc++ does not
+-- implement std::views::enumerate from C++23).
+-- https://github.com/llvm/llvm-project/issues/XXX
+
+--- src/deps/mcl-utils/src/container.hpp.orig	2026-05-10 04:33:57 UTC
++++ src/deps/mcl-utils/src/container.hpp
+@@ -120,7 +120,7 @@ auto enumerate(R&& r) noexcept
+ template <std::ranges::range R>
+ auto enumerate(R&& r) noexcept
+ {
+-#if MCL_OS_MAC
++#if MCL_OS_MAC || MCL_OS_FREEBSD
+ 	return std::views::zip(std::views::iota(std::size_t{0}), std::forward<R>(r));
+ #else
+ 	return std::views::enumerate(std::forward<R>(r));