Attachment #211576 for bug #244062

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

Lines 2-9 Link Here

(-)audio/libopenshot-audio/Makefile (-3 / +2 lines)
2		2
3	PORTNAME= libopenshot-audio	3	PORTNAME= libopenshot-audio
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 0.1.8-100	5	DISTVERSION= 0.1.9
6	DISTVERSIONSUFFIX= -g006fd01	6	DISTVERSIONSUFFIX= -6-g836e49f
7	CATEGORIES= audio multimedia	7	CATEGORIES= audio multimedia
8		8
9	MAINTAINER= tatsuki_makino@hotmail.com	9	MAINTAINER= tatsuki_makino@hotmail.com
Lines 21-27 Link Here
21	GH_ACCOUNT= OpenShot	21	GH_ACCOUNT= OpenShot
22		22
23	CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Doxygen\	23	CMAKE_ON= CMAKE_DISABLE_FIND_PACKAGE_Doxygen\
24	CMAKE_DISABLE_FIND_PACKAGE_ImageMagick\
25	CMAKE_DISABLE_FIND_PACKAGE_PythonInterp	24	CMAKE_DISABLE_FIND_PACKAGE_PythonInterp
26		25
27	.include <bsd.port.mk>	26	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)audio/libopenshot-audio/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1573527600	1	TIMESTAMP = 1581390000
2	SHA256 (OpenShot-libopenshot-audio-v0.1.8-100-g006fd01_GH0.tar.gz) = a9d0b47483b96aade1f9e3b8015755754361e908f4c39869a17bb42a74776f9c	2	SHA256 (OpenShot-libopenshot-audio-v0.1.9-6-g836e49f_GH0.tar.gz) = 5cc647309f77072288a52e736cc680685df997740e30ed8eb73ff7a811dfa8ef
3	SIZE (OpenShot-libopenshot-audio-v0.1.8-100-g006fd01_GH0.tar.gz) = 1712033	3	SIZE (OpenShot-libopenshot-audio-v0.1.9-6-g836e49f_GH0.tar.gz) = 1711868




--- CMakeLists.txt.orig	2020-02-08 23:21:29 UTC
+++ CMakeLists.txt
@@ -192,8 +192,14 @@ 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_compile_definitions(openshot-audio PUBLIC LINUX)
   target_link_libraries(openshot-audio PUBLIC ALSA::ALSA)
+
+	find_library(EXECINFO_LIBRARY NAMES execinfo)
+	if(NOT EXECINFO_LIBRARY)
+		message(FATAL_ERROR "${EXECINFO_LIBRARY}")
+	endif(NOT EXECINFO_LIBRARY)
+	target_link_libraries(openshot-audio PUBLIC ${EXECINFO_LIBRARY})
 endif()
 
 # ZLIB -- uses IMPORTED target ZLIB::ZLIB which has existed since CMake 3.1




--- src/CMakeLists.txt.orig	2019-10-24 07:05:50 UTC
+++ src/CMakeLists.txt
@@ -26,8 +26,13 @@
 
 
 ############### TEST EXECUTABLES ################
+find_library(EXECINFO_LIBRARY NAMES execinfo)
+if(NOT EXECINFO_LIBRARY)
+	message(FATAL_ERROR "${EXECINFO_LIBRARY}")
+endif(NOT EXECINFO_LIBRARY)
 add_executable(openshot-audio-test-sound Main.cpp)
 target_link_libraries(openshot-audio-test-sound openshot-audio)
+target_link_libraries(openshot-audio-test-sound ${EXECINFO_LIBRARY})
 set_target_properties(openshot-audio-test-sound PROPERTIES
 	CXX_STANDARD 11
 	CXX_STANDARD_REQUIRED YES

Lines 324-331 Link Here

(-)audio/libopenshot-audio/pkg-plist (-2 / +2 lines)
324	include/libopenshot-audio/juce_events/timers/juce_MultiTimer.h	324	include/libopenshot-audio/juce_events/timers/juce_MultiTimer.h
325	include/libopenshot-audio/juce_events/timers/juce_Timer.h	325	include/libopenshot-audio/juce_events/timers/juce_Timer.h
326	lib/libopenshot-audio.so	326	lib/libopenshot-audio.so
327	lib/libopenshot-audio.so.0.1.8	327	lib/libopenshot-audio.so.0.1.9
328	lib/libopenshot-audio.so.6	328	lib/libopenshot-audio.so.7
329	man/man1/openshot-audio-test-sound.1.gz	329	man/man1/openshot-audio-test-sound.1.gz
330	@dir include/libopenshot-audio/juce_audio_devices/native/java/app/com/roli/juce	330	@dir include/libopenshot-audio/juce_audio_devices/native/java/app/com/roli/juce
331	@dir include/libopenshot-audio/juce_core/native/java/app/com/roli/juce	331	@dir include/libopenshot-audio/juce_core/native/java/app/com/roli/juce

Return to bug 244062

Lines 1-6 Link Here

(-)audio/libopenshot-audio/files/patch-CMakeLists.txt (-2 / +9 lines)
1	--- CMakeLists.txt.orig 2019-10-24 07:05:50 UTC	1	--- CMakeLists.txt.orig 2020-02-08 23:21:29 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -192,7 +192,7 @@ if(UNIX AND NOT APPLE)	3	@@ -192,8 +192,14 @@ if(UNIX AND NOT APPLE)
4	INTERFACE_INCLUDE_DIRECTORIES ${ALSA_INCLUDE_DIR}	4	INTERFACE_INCLUDE_DIRECTORIES ${ALSA_INCLUDE_DIR}
5	INTERFACE_LINK_LIBRARIES ${ALSA_LIBRARIES})	5	INTERFACE_LINK_LIBRARIES ${ALSA_LIBRARIES})
6	endif()	6	endif()
Lines 7-11 Link Here
7	- target_compile_definitions(openshot-audio PUBLIC LINUX)	7	- target_compile_definitions(openshot-audio PUBLIC LINUX)
8	+ #target_compile_definitions(openshot-audio PUBLIC LINUX)	8	+ #target_compile_definitions(openshot-audio PUBLIC LINUX)
9	target_link_libraries(openshot-audio PUBLIC ALSA::ALSA)	9	target_link_libraries(openshot-audio PUBLIC ALSA::ALSA)
		10	+
		11	+ find_library(EXECINFO_LIBRARY NAMES execinfo)
		12	+ if(NOT EXECINFO_LIBRARY)
		13	+ message(FATAL_ERROR "${EXECINFO_LIBRARY}")
		14	+ endif(NOT EXECINFO_LIBRARY)
		15	+ target_link_libraries(openshot-audio PUBLIC ${EXECINFO_LIBRARY})
10	endif()	16	endif()
11		17
		18	# ZLIB -- uses IMPORTED target ZLIB::ZLIB which has existed since CMake 3.1

Lines 1-16 Link Here

(-)audio/libopenshot-audio/files/patch-src_CMakeLists.txt (-16 lines)
1	--- src/CMakeLists.txt.orig 2019-10-24 07:05:50 UTC
2	+++ src/CMakeLists.txt
3	@@ -26,8 +26,13 @@
4
5
6	############### TEST EXECUTABLES ################
7	+find_library(EXECINFO_LIBRARY NAMES execinfo)
8	+if(NOT EXECINFO_LIBRARY)
9	+ message(FATAL_ERROR "${EXECINFO_LIBRARY}")
10	+endif(NOT EXECINFO_LIBRARY)
11	add_executable(openshot-audio-test-sound Main.cpp)
12	target_link_libraries(openshot-audio-test-sound openshot-audio)
13	+target_link_libraries(openshot-audio-test-sound ${EXECINFO_LIBRARY})
14	set_target_properties(openshot-audio-test-sound PROPERTIES
15	CXX_STANDARD 11
16	CXX_STANDARD_REQUIRED YES