Attachment #209092 for bug #241911

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





PORTNAME=	libopenshot-audio
DISTVERSIONPREFIX=	v
DISTVERSION=	0.1.8-100
DISTVERSIONSUFFIX=	-g006fd01
DISTVERSIONSUFFIX=	-g9a1a609
CATEGORIES=	audio multimedia

MAINTAINER=	tatsuki_makino@hotmail.com

USE_GITHUB=	yes
GH_ACCOUNT=	OpenShot

CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_Doxygen\
		CMAKE_DISABLE_FIND_PACKAGE_ImageMagick\
		CMAKE_DISABLE_FIND_PACKAGE_PythonInterp

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)audio/libopenshot-audio/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1556290800	1	TIMESTAMP = 1573527600
2	SHA256 (OpenShot-libopenshot-audio-v0.1.8-39-g9a1a609_GH0.tar.gz) = 7acabb2938c179e22e474c80d8c61940d319007ed454521f215f7bf6b8f1d24c	2	SHA256 (OpenShot-libopenshot-audio-v0.1.8-100-g006fd01_GH0.tar.gz) = a9d0b47483b96aade1f9e3b8015755754361e908f4c39869a17bb42a74776f9c
3	SIZE (OpenShot-libopenshot-audio-v0.1.8-39-g9a1a609_GH0.tar.gz) = 1695347	3	SIZE (OpenShot-libopenshot-audio-v0.1.8-100-g006fd01_GH0.tar.gz) = 1712033




--- CMakeLists.txt.orig	2019-10-24 07:05:50 UTC
+++ CMakeLists.txt
@@ -192,7 +192,7 @@ 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)
 endif()
 
 		ELSE (APPLE)
-			SET_PROPERTY(GLOBAL PROPERTY JUCE_LINUX "JUCE_LINUX")
+			#SET_PROPERTY(GLOBAL PROPERTY JUCE_LINUX "JUCE_LINUX")
 			SET(EXTENSION "cpp")
 
 			find_package(ZLIB REQUIRED)
 			find_package(ALSA REQUIRED)
+			find_library(EXECINFO_LIBRARY NAMES execinfo)
 			include_directories(${ZLIB_INCLUDE_DIR} ${ALSA_INCLUDE_DIR})
-			ADD_DEFINITIONS(-DLINUX)
-			SET(JUCE_PLATFORM_SPECIFIC_LIBRARIES ${ZLIB_LIBRARIES} ${ALSA_LIBRARIES})
+			#ADD_DEFINITIONS(-DLINUX)
+			SET(JUCE_PLATFORM_SPECIFIC_LIBRARIES ${ZLIB_LIBRARIES} ${ALSA_LIBRARIES} ${EXECINFO_LIBRARY})
 			SET(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -std=c++11")
 		ENDIF(APPLE)
 	ENDIF(UNIX)
@@ -220,4 +221,4 @@ file(GLOB_RECURSE doc_files ${CMAKE_CURRENT_BINARY_DIR
 INSTALL(FILES ${doc_files} DESTINATION share/doc/libopenshot-audio)
 
 # Install manpage
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/openshot-audio-test-sound.1 DESTINATION share/man/man1)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/openshot-audio-test-sound.1 DESTINATION man/man1)




--- 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

Return to bug 241911

Lines 2-10 Link Here

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

Lines 1-27 Link Here

(-)audio/libopenshot-audio/files/patch-CMakeLists.txt (-25 / +9 lines)
1	--- CMakeLists.txt.orig 2019-04-17 16:56:20 UTC	1	--- CMakeLists.txt.orig 2019-10-24 07:05:50 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -147,14 +147,15 @@ ELSE (WIN32)	3	@@ -192,7 +192,7 @@ if(UNIX AND NOT APPLE)
4	SET(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -flax-vector-conversions")	4	INTERFACE_INCLUDE_DIRECTORIES ${ALSA_INCLUDE_DIR}
		5	INTERFACE_LINK_LIBRARIES ${ALSA_LIBRARIES})
		6	endif()
		7	- target_compile_definitions(openshot-audio PUBLIC LINUX)
		8	+ #target_compile_definitions(openshot-audio PUBLIC LINUX)
		9	target_link_libraries(openshot-audio PUBLIC ALSA::ALSA)
		10	endif()
5		11
6	ELSE (APPLE)
7	- SET_PROPERTY(GLOBAL PROPERTY JUCE_LINUX "JUCE_LINUX")
8	+ #SET_PROPERTY(GLOBAL PROPERTY JUCE_LINUX "JUCE_LINUX")
9	SET(EXTENSION "cpp")
10
11	find_package(ZLIB REQUIRED)
12	find_package(ALSA REQUIRED)
13	+ find_library(EXECINFO_LIBRARY NAMES execinfo)
14	include_directories(${ZLIB_INCLUDE_DIR} ${ALSA_INCLUDE_DIR})
15	- ADD_DEFINITIONS(-DLINUX)
16	- SET(JUCE_PLATFORM_SPECIFIC_LIBRARIES ${ZLIB_LIBRARIES} ${ALSA_LIBRARIES})
17	+ #ADD_DEFINITIONS(-DLINUX)
18	+ SET(JUCE_PLATFORM_SPECIFIC_LIBRARIES ${ZLIB_LIBRARIES} ${ALSA_LIBRARIES} ${EXECINFO_LIBRARY})
19	SET(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -std=c++11")
20	ENDIF(APPLE)
21	ENDIF(UNIX)
22	@@ -220,4 +221,4 @@ file(GLOB_RECURSE doc_files ${CMAKE_CURRENT_BINARY_DIR
23	INSTALL(FILES ${doc_files} DESTINATION share/doc/libopenshot-audio)
24
25	# Install manpage
26	-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/openshot-audio-test-sound.1 DESTINATION share/man/man1)
27	+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/openshot-audio-test-sound.1 DESTINATION man/man1)

Line 0 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