Attachment #225792 for bug #256590

View | Details | Raw Unified | Return to bug 256590
Collapse All | Expand All




PORTNAME=	libopenshot-audio
DISTVERSIONPREFIX=	v
DISTVERSION=	0.2.0-59
DISTVERSIONSUFFIX=	-g92ff608
CATEGORIES=	audio multimedia

MAINTAINER=	tatsuki_makino@hotmail.com

LICENSE_FILE=	${WRKSRC}/COPYING

RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
LIB_DEPENDS=	libasound.so:audio/alsa-lib \
		libsysinfo.so:devel/libsysinfo

USES=		cmake compiler:c++11-lang
USE_LDCONFIG=	yes
USE_GITHUB=	yes
GH_ACCOUNT=	OpenShot

Lines 1-3 Link Here

(-)audio/libopenshot-audio/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1613703600	1	TIMESTAMP = 1622257200
2	SHA256 (OpenShot-libopenshot-audio-v0.2.0-29-gcdfe5a1_GH0.tar.gz) = ac50e8f79440b365121e9c59644e33f25c174e4d2c5418b7e8fa9b011b7b5723	2	SHA256 (OpenShot-libopenshot-audio-v0.2.0-59-g92ff608_GH0.tar.gz) = 757c4305a99427955299f9c32214d1df63a5e42e49a76690d24b9d24764661a7
3	SIZE (OpenShot-libopenshot-audio-v0.2.0-29-gcdfe5a1_GH0.tar.gz) = 1720976	3	SIZE (OpenShot-libopenshot-audio-v0.2.0-59-g92ff608_GH0.tar.gz) = 1711214




--- CMakeLists.txt.orig	2021-05-09 14:57:33 UTC
+++ CMakeLists.txt
@@ -170,6 +170,13 @@ set_target_properties(openshot-audio PROPERTIES
   EXPORT_NAME Audio  # Exports as OpenShot::Audio target
 )
 
+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+	find_package(Threads REQUIRED)
+	if(Threads_FOUND)
+		target_link_libraries(openshot-audio PRIVATE ${CMAKE_THREAD_LIBS_INIT})
+	endif(Threads_FOUND)
+endif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+
 # Require language features we use
 if(CMAKE_VERSION VERSION_GREATER 3.8)
   target_compile_features(openshot-audio PUBLIC
@@ -188,7 +195,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.
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
+    CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
   target_compile_options(openshot-audio PRIVATE -fexceptions)
 endif()
 
@@ -249,8 +257,8 @@ if(UNIX AND NOT APPLE)
       INTERFACE_INCLUDE_DIRECTORIES ${ALSA_INCLUDE_DIR}
       INTERFACE_LINK_LIBRARIES ${ALSA_LIBRARIES})
   endif()
-  target_compile_definitions(openshot-audio PUBLIC LINUX)
-  target_link_libraries(openshot-audio PUBLIC ALSA::ALSA)
+  #target_compile_definitions(openshot-audio PUBLIC LINUX)
+  target_link_libraries(openshot-audio PRIVATE ALSA::ALSA)
 else()
   # For EXPORTED Config
   set(NEED_ALSA FALSE)
@@ -258,10 +266,24 @@ endif()
 
 # ZLIB -- uses IMPORTED target ZLIB::ZLIB which has existed since CMake 3.1
 find_package(ZLIB REQUIRED)
-target_link_libraries(openshot-audio PUBLIC ZLIB::ZLIB)
+target_link_libraries(openshot-audio PRIVATE ZLIB::ZLIB)
 
+# EXECINFO, SYSINFO
+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+	find_library(EXECINFO_LIBRARY NAMES execinfo)
+	if(NOT EXECINFO_LIBRARY)
+		message(FATAL_ERROR "${EXECINFO_LIBRARY}")
+	endif(NOT EXECINFO_LIBRARY)
+	target_link_libraries(openshot-audio PRIVATE ${EXECINFO_LIBRARY})
+	find_library(SYSINFO_LIBRARY NAMES sysinfo)
+	if(NOT SYSINFO_LIBRARY)
+		message(FATAL_ERROR "${SYSINFO_LIBRARY}")
+	endif(NOT SYSINFO_LIBRARY)
+	target_link_libraries(openshot-audio PRIVATE ${SYSINFO_LIBRARY})
+endif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+
 # Link with dynamic loader for platform
-target_link_libraries(openshot-audio PUBLIC ${CMAKE_DL_LIBS})
+target_link_libraries(openshot-audio PRIVATE ${CMAKE_DL_LIBS})
 
 # Create an alias so our EXPORT target name works internally, as well
 add_library(OpenShot::Audio ALIAS openshot-audio)




--- JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h.orig	2021-05-09 14:57:33 UTC
+++ JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h
@@ -272,6 +272,9 @@
  #include <sys/wait.h>
  #include <utime.h>
  #include <poll.h>
+ #include <net/if_dl.h>
+ #include <pthread_np.h>
+ #include <sys/sysinfo.h>
 
 //==============================================================================
 #elif JUCE_ANDROID




--- JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp.orig	2021-05-09 14:57:33 UTC
+++ JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp
@@ -139,8 +139,13 @@ static String getLocaleValue (nl_item key)
 
 int SystemStats::getMemorySizeInMegabytes()
 {
+#if JUCE_BSD
+#else
     struct sysinfo sysi;
 
     if (sysinfo (&sysi) == 0)
         return (int) (sysi.totalram * sysi.mem_unit / (1024 * 1024));
+#endif
 
     return 0;
 }
@@ -139,8 +142,13 @@ static String getLocaleValue (nl_item key)
     return result;
 }
 




bin/openshot-audio-demo
include/libopenshot-audio/AppConfig.h
include/libopenshot-audio/JuceHeader.h
include/libopenshot-audio/OpenShotAudio.h
include/libopenshot-audio/juce_audio_basics/audio_play_head/juce_AudioPlayHead.h
include/libopenshot-audio/juce_audio_basics/buffers/juce_AudioChannelSet.h
include/libopenshot-audio/juce_audio_basics/buffers/juce_AudioDataConverters.h

include/libopenshot-audio/juce_events/native/juce_win32_WinRTWrapper.h
include/libopenshot-audio/juce_events/timers/juce_MultiTimer.h
include/libopenshot-audio/juce_events/timers/juce_Timer.h
lib/cmake/OpenShotAudio/FindASIO.cmake
lib/cmake/OpenShotAudio/OpenShotAudioConfig.cmake
lib/cmake/OpenShotAudio/OpenShotAudioConfigVersion.cmake
lib/cmake/OpenShotAudio/OpenShotAudioTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/OpenShotAudio/OpenShotAudioTargets.cmake
lib/libopenshot-audio.so
lib/libopenshot-audio.so.0.2.0
lib/libopenshot-audio.so.7
man/man1/openshot-audio-demo.1.gz
@dir include/libopenshot-audio/juce_audio_devices/native/java/app/com/roli/juce
@dir include/libopenshot-audio/juce_core/native/java/app/com/roli/juce
@dir include/libopenshot-audio/juce_core/native/javacore/app/com/roli/juce

Return to bug 256590

Lines 1-7 Link Here

(-)audio/libopenshot-audio/Makefile (-4 / +5 lines)
1	PORTNAME= libopenshot-audio	1	PORTNAME= libopenshot-audio
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 0.2.0-29	3	DISTVERSION= 0.2.0-59
4	DISTVERSIONSUFFIX= -gcdfe5a1	4	DISTVERSIONSUFFIX= -g92ff608
5	CATEGORIES= audio multimedia	5	CATEGORIES= audio multimedia
6		6
7	MAINTAINER= tatsuki_makino@hotmail.com	7	MAINTAINER= tatsuki_makino@hotmail.com
Lines 11-19 LICENSE= GPLv3+ Link Here
11	LICENSE_FILE= ${WRKSRC}/COPYING	11	LICENSE_FILE= ${WRKSRC}/COPYING
12		12
13	RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins	13	RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
14	LIB_DEPENDS= libasound.so:audio/alsa-lib	14	LIB_DEPENDS= libasound.so:audio/alsa-lib \
		15	libsysinfo.so:devel/libsysinfo
15		16
16	USES= cmake compiler:c++11-lang dos2unix	17	USES= cmake compiler:c++11-lang
17	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
18	USE_GITHUB= yes	19	USE_GITHUB= yes
19	GH_ACCOUNT= OpenShot	20	GH_ACCOUNT= OpenShot

Lines 1-18 Link Here

(-)audio/libopenshot-audio/files/patch-CMakeLists.txt (-7 / +53 lines)
1	--- CMakeLists.txt.orig 2020-09-11 12:10:25 UTC	1	--- CMakeLists.txt.orig 2021-05-09 14:57:33 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -218,8 +218,14 @@ if(UNIX AND NOT APPLE)	3	@@ -170,6 +170,13 @@ set_target_properties(openshot-audio PROPERTIES
		4	EXPORT_NAME Audio # Exports as OpenShot::Audio target
		5	)
		6
		7	+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
		8	+ find_package(Threads REQUIRED)
		9	+ if(Threads_FOUND)
		10	+ target_link_libraries(openshot-audio PRIVATE ${CMAKE_THREAD_LIBS_INIT})
		11	+ endif(Threads_FOUND)
		12	+endif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
		13	+
		14	# Require language features we use
		15	if(CMAKE_VERSION VERSION_GREATER 3.8)
		16	target_compile_features(openshot-audio PUBLIC
		17	@@ -188,7 +195,8 @@ endif()
		18	# Enable stack-unwinding support in c objects on gcc-based platforms.
		19	# Failing to do so will cause your program to be terminated when a png
		20	# or a jpeg exception is thrown on linux or macosx.
		21	-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
		22	+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
		23	+ CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
		24	target_compile_options(openshot-audio PRIVATE -fexceptions)
		25	endif()
		26
		27	@@ -249,8 +257,8 @@ if(UNIX AND NOT APPLE)
4	INTERFACE_INCLUDE_DIRECTORIES ${ALSA_INCLUDE_DIR}	28	INTERFACE_INCLUDE_DIRECTORIES ${ALSA_INCLUDE_DIR}
5	INTERFACE_LINK_LIBRARIES ${ALSA_LIBRARIES})	29	INTERFACE_LINK_LIBRARIES ${ALSA_LIBRARIES})
6	endif()	30	endif()
7	- target_compile_definitions(openshot-audio PUBLIC LINUX)	31	- target_compile_definitions(openshot-audio PUBLIC LINUX)
		32	- target_link_libraries(openshot-audio PUBLIC ALSA::ALSA)
8	+ #target_compile_definitions(openshot-audio PUBLIC LINUX)	33	+ #target_compile_definitions(openshot-audio PUBLIC LINUX)
9	target_link_libraries(openshot-audio PUBLIC ALSA::ALSA)	34	+ target_link_libraries(openshot-audio PRIVATE ALSA::ALSA)
10	+	35	else()
		36	# For EXPORTED Config
		37	set(NEED_ALSA FALSE)
		38	@@ -258,10 +266,24 @@ endif()
		39
		40	# ZLIB -- uses IMPORTED target ZLIB::ZLIB which has existed since CMake 3.1
		41	find_package(ZLIB REQUIRED)
		42	-target_link_libraries(openshot-audio PUBLIC ZLIB::ZLIB)
		43	+target_link_libraries(openshot-audio PRIVATE ZLIB::ZLIB)
		44
		45	+# EXECINFO, SYSINFO
		46	+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
11	+ find_library(EXECINFO_LIBRARY NAMES execinfo)	47	+ find_library(EXECINFO_LIBRARY NAMES execinfo)
12	+ if(NOT EXECINFO_LIBRARY)	48	+ if(NOT EXECINFO_LIBRARY)
13	+ message(FATAL_ERROR "${EXECINFO_LIBRARY}")	49	+ message(FATAL_ERROR "${EXECINFO_LIBRARY}")
14	+ endif(NOT EXECINFO_LIBRARY)	50	+ endif(NOT EXECINFO_LIBRARY)
15	+ target_link_libraries(openshot-audio PUBLIC ${EXECINFO_LIBRARY})	51	+ target_link_libraries(openshot-audio PRIVATE ${EXECINFO_LIBRARY})
16	endif()	52	+ find_library(SYSINFO_LIBRARY NAMES sysinfo)
		53	+ if(NOT SYSINFO_LIBRARY)
		54	+ message(FATAL_ERROR "${SYSINFO_LIBRARY}")
		55	+ endif(NOT SYSINFO_LIBRARY)
		56	+ target_link_libraries(openshot-audio PRIVATE ${SYSINFO_LIBRARY})
		57	+endif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
		58	+
		59	# Link with dynamic loader for platform
		60	-target_link_libraries(openshot-audio PUBLIC ${CMAKE_DL_LIBS})
		61	+target_link_libraries(openshot-audio PRIVATE ${CMAKE_DL_LIBS})
17		62
18	# ZLIB -- uses IMPORTED target ZLIB::ZLIB which has existed since CMake 3.1	63	# Create an alias so our EXPORT target name works internally, as well
		64	add_library(OpenShot::Audio ALIAS openshot-audio)

Lines 1-11 Link Here

(-)audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__BasicNativeHeaders.h (-2 / +3 lines)
1	--- JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h.orig 2020-09-11 12:10:25 UTC	1	--- JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h.orig 2021-05-09 14:57:33 UTC
2	+++ JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h	2	+++ JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h
3	@@ -272,6 +272,8 @@	3	@@ -272,6 +272,9 @@
4	#include <sys/wait.h>	4	#include <sys/wait.h>
5	#include <utime.h>	5	#include <utime.h>
6	#include <poll.h>	6	#include <poll.h>
7	+ #include <net/if_dl.h>	7	+ #include <net/if_dl.h>
8	+ #include <pthread_np.h>	8	+ #include <pthread_np.h>
		9	+ #include <sys/sysinfo.h>
9		10
10	//==============================================================================	11	//==============================================================================
11	#elif JUCE_ANDROID	12	#elif JUCE_ANDROID

Lines 1-6 Link Here

(-)audio/libopenshot-audio/pkg-plist (-2 / +8 lines)
1	bin/openshot-audio-test-sound	1	bin/openshot-audio-demo
2	include/libopenshot-audio/AppConfig.h	2	include/libopenshot-audio/AppConfig.h
3	include/libopenshot-audio/JuceHeader.h	3	include/libopenshot-audio/JuceHeader.h
		4	include/libopenshot-audio/OpenShotAudio.h
4	include/libopenshot-audio/juce_audio_basics/audio_play_head/juce_AudioPlayHead.h	5	include/libopenshot-audio/juce_audio_basics/audio_play_head/juce_AudioPlayHead.h
5	include/libopenshot-audio/juce_audio_basics/buffers/juce_AudioChannelSet.h	6	include/libopenshot-audio/juce_audio_basics/buffers/juce_AudioChannelSet.h
6	include/libopenshot-audio/juce_audio_basics/buffers/juce_AudioDataConverters.h	7	include/libopenshot-audio/juce_audio_basics/buffers/juce_AudioDataConverters.h
Lines 322-331 include/libopenshot-audio/juce_events/native/juce_win32_HiddenMessageWindow.h Link Here
322	include/libopenshot-audio/juce_events/native/juce_win32_WinRTWrapper.h	323	include/libopenshot-audio/juce_events/native/juce_win32_WinRTWrapper.h
323	include/libopenshot-audio/juce_events/timers/juce_MultiTimer.h	324	include/libopenshot-audio/juce_events/timers/juce_MultiTimer.h
324	include/libopenshot-audio/juce_events/timers/juce_Timer.h	325	include/libopenshot-audio/juce_events/timers/juce_Timer.h
		326	lib/cmake/OpenShotAudio/FindASIO.cmake
		327	lib/cmake/OpenShotAudio/OpenShotAudioConfig.cmake
		328	lib/cmake/OpenShotAudio/OpenShotAudioConfigVersion.cmake
		329	lib/cmake/OpenShotAudio/OpenShotAudioTargets-%%CMAKE_BUILD_TYPE%%.cmake
		330	lib/cmake/OpenShotAudio/OpenShotAudioTargets.cmake
325	lib/libopenshot-audio.so	331	lib/libopenshot-audio.so
326	lib/libopenshot-audio.so.0.2.0	332	lib/libopenshot-audio.so.0.2.0
327	lib/libopenshot-audio.so.7	333	lib/libopenshot-audio.so.7
328	man/man1/openshot-audio-test-sound.1.gz	334	man/man1/openshot-audio-demo.1.gz
329	@dir include/libopenshot-audio/juce_audio_devices/native/java/app/com/roli/juce	335	@dir include/libopenshot-audio/juce_audio_devices/native/java/app/com/roli/juce
330	@dir include/libopenshot-audio/juce_core/native/java/app/com/roli/juce	336	@dir include/libopenshot-audio/juce_core/native/java/app/com/roli/juce
331	@dir include/libopenshot-audio/juce_core/native/javacore/app/com/roli/juce	337	@dir include/libopenshot-audio/juce_core/native/javacore/app/com/roli/juce