audio/cardinal: Update 22.02 -> 22.05

freebsd · May 21, 2022 · 935a195 · 935a195
1 parent 75bc08c
commit 935a195
Show file tree

Hide file tree

Showing 10 changed files with 919 additions and 69 deletions.
diff --git a/audio/cardinal/Makefile b/audio/cardinal/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cardinal
-DISTVERSION=	22.02
+DISTVERSION=	22.05
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/DISTRHO/Cardinal/releases/download/${DISTVERSION}/
 
@@ -12,6 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${LOCALBASE}/include/FuzzySearchDatabase.hpp:textproc/fuzzysearchdatabase \
 		bash:shells/bash
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
+		libfftw3f.so:math/fftw3-float \
 		libjansson.so:devel/jansson \
 		liblo.so:audio/liblo \
 		libpffft.so:math/pffft \

diff --git a/audio/cardinal/distinfo b/audio/cardinal/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1644950602
-SHA256 (cardinal-22.02.tar.xz) = 21594044e14615f7d3114d343429afef8c350d16fb74d329db415e055a03add3
-SIZE (cardinal-22.02.tar.xz) = 190648308
-SHA256 (b7d4847e1920a3d9c22e97dcd901360188e4c5a8.patch) = 92473b9f734b5665a2e9a697da85513efa46c546a388447b20f533d4bf7b0a95
-SIZE (b7d4847e1920a3d9c22e97dcd901360188e4c5a8.patch) = 2545
+TIMESTAMP = 1653111028
+SHA256 (cardinal-22.05.tar.xz) = 25ed44e06bba3d96cc04abeec788eb615cf847a0428e5222d19864cacb74d3be
+SIZE (cardinal-22.05.tar.xz) = 273896508
diff --git a/audio/cardinal/files/patch-b7d4847e1920a3d9c22e97dcd901360188e4c5a8.patch b/audio/cardinal/files/patch-b7d4847e1920a3d9c22e97dcd901360188e4c5a8.patch
diff --git a/audio/cardinal/files/patch-carla_source_Makefile.mk b/audio/cardinal/files/patch-carla_source_Makefile.mk
@@ -0,0 +1,11 @@
+--- carla/source/Makefile.mk.orig	2022-05-21 05:42:01 UTC
++++ carla/source/Makefile.mk
+@@ -86,7 +86,7 @@ endif
+
+ ifneq ($(MACOS),true)
+ ifneq ($(WIN32),true)
+-BASE_FLAGS += -fno-gnu-unique
++#BASE_FLAGS += -fno-gnu-unique
+ endif
+ endif
+
diff --git a/audio/cardinal/files/patch-carla_source_modules_AppConfig.h b/audio/cardinal/files/patch-carla_source_modules_AppConfig.h
@@ -1,6 +1,6 @@
 - for now treat FreeBSD as Linux for simplicity
 
---- carla/source/modules/AppConfig.h.orig	2022-01-30 04:43:57 UTC
+--- carla/source/modules/AppConfig.h.orig	2022-05-15 13:40:22 UTC
 +++ carla/source/modules/AppConfig.h
 @@ -27,7 +27,7 @@
  # define APPCONFIG_OS_WIN32
@@ -9,5 +9,5 @@
 -#elif defined(__linux__) || defined(__linux)
 +#elif defined(__linux__) || defined(__linux) || defined(__FreeBSD__)
  # define APPCONFIG_OS_LINUX
- #else
- # error Unsupported platform!
+ #elif defined(__FreeBSD__)
+ # define APPCONFIG_OS_FREEBSD
diff --git a/audio/cardinal/files/patch-dpf_Makefile.base.mk b/audio/cardinal/files/patch-dpf_Makefile.base.mk
@@ -0,0 +1,11 @@
+--- dpf/Makefile.base.mk.orig	2022-05-21 05:45:04 UTC
++++ dpf/Makefile.base.mk
+@@ -173,7 +173,7 @@ BASE_OPTS  = -O2 -ffast-math -fdata-sections -ffunctio
+ endif
+
+ ifneq ($(MACOS_OR_WINDOWS),true)
+-BASE_FLAGS += -fno-gnu-unique
++#BASE_FLAGS += -fno-gnu-unique
+ endif
+
+ ifeq ($(WINDOWS),true)
diff --git a/audio/cardinal/files/patch-src_Makefile b/audio/cardinal/files/patch-src_Makefile
@@ -1,8 +1,8 @@
 - use pffft from the package, see https://github.com/DISTRHO/Cardinal/issues/130
 
---- src/Makefile.orig	2022-02-06 00:30:19 UTC
+--- src/Makefile.orig	2022-05-15 13:39:19 UTC
 +++ src/Makefile
-@@ -50,7 +50,7 @@ BASE_FLAGS += -IRack/dep/glfw/include
+@@ -55,7 +55,7 @@ BASE_FLAGS += -IRack/dep/glfw/include
  BASE_FLAGS += -IRack/dep/nanosvg/src
  BASE_FLAGS += -IRack/dep/osdialog
  BASE_FLAGS += -IRack/dep/oui-blendish
@@ -11,7 +11,7 @@
 
  ifeq ($(DEBUG),true)
  BASE_FLAGS += -UDEBUG
-@@ -108,8 +108,8 @@ RACK_FILES += override/MenuBar.cpp
+@@ -122,8 +122,8 @@ RACK_FILES += override/MenuBar.cpp
  RACK_FILES += override/Model.cpp
  RACK_FILES += override/Scene.cpp
 

diff --git a/audio/cardinal/files/patch-src_Rack_Makefile b/audio/cardinal/files/patch-src_Rack_Makefile
@@ -1,4 +1,4 @@
---- src/Rack/Makefile.orig	2022-02-06 00:28:59 UTC
+--- src/Rack/Makefile.orig	2022-05-15 13:41:31 UTC
 +++ src/Rack/Makefile
 @@ -12,7 +12,7 @@ include arch.mk
  SOURCES += dep/nanovg/src/nanovg.c
@@ -9,3 +9,12 @@
  SOURCES += $(wildcard src/*.c src/*/*.c)
  SOURCES += $(wildcard src/*.cpp src/*/*.cpp)
 
+@@ -31,7 +31,7 @@ ifdef ARCH_LIN
+
+ 	# This prevents static variables in the DSO (dynamic shared object) from being preserved after dlclose().
+ 	# I don't really understand the side effects (see GCC manual), but so far tests are positive.
+-	FLAGS += -fno-gnu-unique
++	#FLAGS += -fno-gnu-unique
+
+ 	LDFLAGS += -Wl,--whole-archive
+ 	LDFLAGS += -static-libstdc++ -static-libgcc
diff --git a/audio/cardinal/files/patch-src_Rack_plugin.mk b/audio/cardinal/files/patch-src_Rack_plugin.mk
@@ -0,0 +1,11 @@
+--- src/Rack/plugin.mk.orig	2022-05-21 05:37:01 UTC
++++ src/Rack/plugin.mk
+@@ -26,7 +26,7 @@ include $(RACK_DIR)/arch.mk
+ ifdef ARCH_LIN
+ 	TARGET := plugin.so
+ 	# This prevents static variables in the DSO (dynamic shared object) from being preserved after dlclose().
+-	FLAGS += -fno-gnu-unique
++	#FLAGS += -fno-gnu-unique
+ 	# When Rack loads a plugin, it symlinks /tmp/Rack2 to its system dir, so the plugin can link to libRack.
+ 	LDFLAGS += -Wl,-rpath=/tmp/Rack2
+ 	# Since the plugin's compiler could be a different version than Rack's compiler, link libstdc++ and libgcc statically to avoid ABI issues.