Attachment #251737 for bug #278857




PORTNAME=	libopenshot-audio
DISTVERSIONPREFIX=	v
DISTVERSION=	0.3.3
PORTREVISION=	1
CATEGORIES=	audio multimedia

MAINTAINER=	tatsuki_makino@hotmail.com

GH_ACCOUNT=	OpenShot
USE_LDCONFIG=	yes
CMAKE_ON=	AUTO_INSTALL_DOCS
CMAKE_OFF=	APPIMAGE_BUILD
DEBUG_FLAGS?=	-g
DEBUG_FLAGS+=	-D_DEBUG -DJUCE_FORCE_DEBUG=1


DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
DOXYGEN_CMAKE_BOOL=	ENABLE_AUDIO_DOCS
DOXYGEN_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Doxygen
JACK_BUILD_DEPENDS=	${LOCALBASE}/include/jack/jack.h:audio/jack
JACK_RUN_DEPENDS=	${LOCALBASE}/lib/libjack.so:audio/jack
JACK_USES=		pkgconfig
JACK_CMAKE_BOOL=	ENABLE_JACK
JACK_CMAKE_ON=		-DJUCE_JACK_CLIENT_NAME:STRING=

Lines 1-3 Link Here

(-)b/audio/libopenshot-audio/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1682218800	1	TIMESTAMP = 1719370800
2	SHA256 (OpenShot-libopenshot-audio-v0.3.2_GH0.tar.gz) = f09d5251c934e6c14d98217b44574c508318c8575e47f5c48ffaf54d9bbce3e9	2	SHA256 (OpenShot-libopenshot-audio-v0.3.3_GH0.tar.gz) = 5c0f9972828a5cc1614e10d54bea8ebeabf3bfe361024f28516a856918f5e8f2
3	SIZE (OpenShot-libopenshot-audio-v0.3.2_GH0.tar.gz) = 1772366	3	SIZE (OpenShot-libopenshot-audio-v0.3.3_GH0.tar.gz) = 1772184




--- CMakeLists.txt.orig	2024-05-11 01:22:43 UTC
+++ CMakeLists.txt
@@ -175,6 +175,12 @@ set_target_properties(openshot-audio PROPERTIES
   EXPORT_NAME Audio  # Exports as OpenShot::Audio target
 )
 

 # Require language features we use
 if(CMAKE_VERSION VERSION_GREATER 3.8)
   target_compile_features(openshot-audio PUBLIC
@@ -193,7 +199,8 @@ endif()
 # Enable stack-unwinding support in c objects on gcc-based platforms.
 # Failing to do so will cause your program to be terminated when a png
 # or a jpeg exception is thrown on linux or macosx.

   target_compile_options(openshot-audio PRIVATE -fexceptions)
 endif()
 
@@ -256,8 +263,8 @@ if(UNIX AND NOT APPLE)
       INTERFACE_INCLUDE_DIRECTORIES ${ALSA_INCLUDE_DIR}
       INTERFACE_LINK_LIBRARIES ${ALSA_LIBRARIES})
   endif()

 else()
   # For EXPORTED Config
   set(NEED_ALSA FALSE)
@@ -265,10 +272,68 @@ endif()
 
 # ZLIB -- uses IMPORTED target ZLIB::ZLIB which has existed since CMake 3.1
 find_package(ZLIB REQUIRED)

+	endif(NOT JACK_FOUND)
+	if(NOT TARGET JACK::JACK)
+		add_library(JACK::JACK INTERFACE IMPORTED)
+		set_target_properties(JACK::JACK
+			PROPERTIES
+			INTERFACE_INCLUDE_DIRECTORIES ${JACK_INCLUDE_DIRS}
+			)
+	endif(NOT TARGET JACK::JACK)
+	target_link_libraries(openshot-audio PRIVATE JACK::JACK)
+	target_compile_definitions(openshot-audio PRIVATE JUCE_JACK=1)

Lines 363-369 lib/cmake/OpenShotAudio/OpenShotAudioConfigVersion.cmake Link Here

(-)b/audio/libopenshot-audio/pkg-plist (-2 / +1 lines)
363	lib/cmake/OpenShotAudio/OpenShotAudioTargets-%%CMAKE_BUILD_TYPE%%.cmake	363	lib/cmake/OpenShotAudio/OpenShotAudioTargets-%%CMAKE_BUILD_TYPE%%.cmake
364	lib/cmake/OpenShotAudio/OpenShotAudioTargets.cmake	364	lib/cmake/OpenShotAudio/OpenShotAudioTargets.cmake
365	lib/libopenshot-audio.so	365	lib/libopenshot-audio.so
366	lib/libopenshot-audio.so.0.3.2	366	lib/libopenshot-audio.so.0.3.3
367	lib/libopenshot-audio.so.9	367	lib/libopenshot-audio.so.9
368	share/man/man1/openshot-audio-demo.1.gz	368	share/man/man1/openshot-audio-demo.1.gz
369	@dir include/libopenshot-audio/juce_audio_devices/native/java/app/com/roli/juce	369	@dir include/libopenshot-audio/juce_audio_devices/native/java/app/com/roli/juce
370	-

Return to bug 278857

Lines 1-7 Link Here

(-)b/audio/libopenshot-audio/Makefile (-4 / +3 lines)
1	PORTNAME= libopenshot-audio	1	PORTNAME= libopenshot-audio
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.3.2	3	DISTVERSION= 0.3.3
4	PORTREVISION= 1
5	CATEGORIES= audio multimedia	4	CATEGORIES= audio multimedia
6		5
7	MAINTAINER= tatsuki_makino@hotmail.com	6	MAINTAINER= tatsuki_makino@hotmail.com
Lines 20-26 USE_GITHUB= yes Link Here
20	GH_ACCOUNT= OpenShot	19	GH_ACCOUNT= OpenShot
21	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
22	CMAKE_ON= AUTO_INSTALL_DOCS	21	CMAKE_ON= AUTO_INSTALL_DOCS
23	CMAKE_OFF= APPIMAGE_BUILD
24	DEBUG_FLAGS?= -g	22	DEBUG_FLAGS?= -g
25	DEBUG_FLAGS+= -D_DEBUG -DJUCE_FORCE_DEBUG=1	23	DEBUG_FLAGS+= -D_DEBUG -DJUCE_FORCE_DEBUG=1
26		24
Lines 31-37 DOXYGEN_IMPLIES= DOCS Link Here
31	DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen	29	DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen
32	DOXYGEN_CMAKE_BOOL= ENABLE_AUDIO_DOCS	30	DOXYGEN_CMAKE_BOOL= ENABLE_AUDIO_DOCS
33	DOXYGEN_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Doxygen	31	DOXYGEN_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Doxygen
34	JACK_LIB_DEPENDS= libjack.so:audio/jack	32	JACK_BUILD_DEPENDS= ${LOCALBASE}/include/jack/jack.h:audio/jack
		33	JACK_RUN_DEPENDS= ${LOCALBASE}/lib/libjack.so:audio/jack
35	JACK_USES= pkgconfig	34	JACK_USES= pkgconfig
36	JACK_CMAKE_BOOL= ENABLE_JACK	35	JACK_CMAKE_BOOL= ENABLE_JACK
37	JACK_CMAKE_ON= -DJUCE_JACK_CLIENT_NAME:STRING=	36	JACK_CMAKE_ON= -DJUCE_JACK_CLIENT_NAME:STRING=

Lines 1-6 Link Here

(-)b/audio/libopenshot-audio/files/patch-CMakeLists.txt (-7 / +8 lines)
1	--- CMakeLists.txt.orig 2023-04-17 13:00:42 UTC	1	--- CMakeLists.txt.orig 2024-05-11 01:22:43 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -184,6 +184,12 @@ set_target_properties(openshot-audio PROPERTIES	3	@@ -175,6 +175,12 @@ set_target_properties(openshot-audio PROPERTIES
4	EXPORT_NAME Audio # Exports as OpenShot::Audio target	4	EXPORT_NAME Audio # Exports as OpenShot::Audio target
5	)	5	)
6		6
Lines 13-19 Link Here
13	# Require language features we use	13	# Require language features we use
14	if(CMAKE_VERSION VERSION_GREATER 3.8)	14	if(CMAKE_VERSION VERSION_GREATER 3.8)
15	target_compile_features(openshot-audio PUBLIC	15	target_compile_features(openshot-audio PUBLIC
16	@@ -202,7 +208,8 @@ endif()	16	@@ -193,7 +199,8 @@ endif()
17	# Enable stack-unwinding support in c objects on gcc-based platforms.	17	# Enable stack-unwinding support in c objects on gcc-based platforms.
18	# Failing to do so will cause your program to be terminated when a png	18	# Failing to do so will cause your program to be terminated when a png
19	# or a jpeg exception is thrown on linux or macosx.	19	# or a jpeg exception is thrown on linux or macosx.
Lines 23-29 Link Here
23	target_compile_options(openshot-audio PRIVATE -fexceptions)	23	target_compile_options(openshot-audio PRIVATE -fexceptions)
24	endif()	24	endif()
25		25
26	@@ -265,8 +272,8 @@ if(UNIX AND NOT APPLE)	26	@@ -256,8 +263,8 @@ if(UNIX AND NOT APPLE)
27	INTERFACE_INCLUDE_DIRECTORIES ${ALSA_INCLUDE_DIR}	27	INTERFACE_INCLUDE_DIRECTORIES ${ALSA_INCLUDE_DIR}
28	INTERFACE_LINK_LIBRARIES ${ALSA_LIBRARIES})	28	INTERFACE_LINK_LIBRARIES ${ALSA_LIBRARIES})
29	endif()	29	endif()
Lines 34-40 Link Here
34	else()	34	else()
35	# For EXPORTED Config	35	# For EXPORTED Config
36	set(NEED_ALSA FALSE)	36	set(NEED_ALSA FALSE)
37	@@ -274,10 +281,67 @@ endif()	37	@@ -265,10 +272,68 @@ endif()
38		38
39	# ZLIB -- uses IMPORTED target ZLIB::ZLIB which has existed since CMake 3.1	39	# ZLIB -- uses IMPORTED target ZLIB::ZLIB which has existed since CMake 3.1
40	find_package(ZLIB REQUIRED)	40	find_package(ZLIB REQUIRED)
Lines 85-93 Link Here
85	+ endif(NOT JACK_FOUND)	85	+ endif(NOT JACK_FOUND)
86	+ if(NOT TARGET JACK::JACK)	86	+ if(NOT TARGET JACK::JACK)
87	+ add_library(JACK::JACK INTERFACE IMPORTED)	87	+ add_library(JACK::JACK INTERFACE IMPORTED)
88	+ set_target_properties(JACK::JACK PROPERTIES	88	+ set_target_properties(JACK::JACK
		89	+ PROPERTIES
89	+ INTERFACE_INCLUDE_DIRECTORIES ${JACK_INCLUDE_DIRS}	90	+ INTERFACE_INCLUDE_DIRECTORIES ${JACK_INCLUDE_DIRS}
90	+ INTERFACE_LINK_LIBRARIES ${JACK_LINK_LIBRARIES})	91	+ )
91	+ endif(NOT TARGET JACK::JACK)	92	+ endif(NOT TARGET JACK::JACK)
92	+ target_link_libraries(openshot-audio PRIVATE JACK::JACK)	93	+ target_link_libraries(openshot-audio PRIVATE JACK::JACK)
93	+ target_compile_definitions(openshot-audio PRIVATE JUCE_JACK=1)	94	+ target_compile_definitions(openshot-audio PRIVATE JUCE_JACK=1)