mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 14:38:51 +02:00
libopenshot: bump version
This commit is contained in:
Gerasim Troeglazov
@@ -4,11 +4,11 @@ dedicated to delivering high quality video editing, animation, and playback \
|
|||||||
solutions to the world. This is the same library which powers \
|
solutions to the world. This is the same library which powers \
|
||||||
OpenShot Video Editor (version 2.0+). C++, Python are fully supported."
|
OpenShot Video Editor (version 2.0+). C++, Python are fully supported."
|
||||||
HOMEPAGE="https://www.openshot.org/"
|
HOMEPAGE="https://www.openshot.org/"
|
||||||
COPYRIGHT="2008-2019 OpenShot Studios, LLC"
|
COPYRIGHT="2008-2020 OpenShot Studios, LLC"
|
||||||
LICENSE="GNU LGPL v3"
|
LICENSE="GNU LGPL v3"
|
||||||
REVISION="6"
|
REVISION="1"
|
||||||
SOURCE_URI="https://github.com/OpenShot/libopenshot/archive/v$portVersion.tar.gz"
|
SOURCE_URI="https://github.com/OpenShot/libopenshot/archive/v$portVersion.tar.gz"
|
||||||
CHECKSUM_SHA256="8536b0a790b0d98ed4c3b10e11d1b34ae68ccbc710887e3703a5143d95598746"
|
CHECKSUM_SHA256="8ae7d226fbd2efbc84da4f7d9d8c7f3cc9616e4de46e1233e3b0a84ac0a429bc"
|
||||||
SOURCE_FILENAME="libopenshot-$portVersion.tar.gz"
|
SOURCE_FILENAME="libopenshot-$portVersion.tar.gz"
|
||||||
PATCHES="libopenshot-$portVersion.patchset"
|
PATCHES="libopenshot-$portVersion.patchset"
|
||||||
|
|
||||||
@@ -107,19 +107,6 @@ BUILD_PREREQUIRES="
|
|||||||
cmd:swig$secondaryArchSuffix
|
cmd:swig$secondaryArchSuffix
|
||||||
"
|
"
|
||||||
|
|
||||||
if [ -z "$secondaryArchSuffix" ]; then
|
|
||||||
ARCHITECTURES_doc="any"
|
|
||||||
|
|
||||||
PROVIDES_doc="
|
|
||||||
libopenshot_audio_doc = $portVersion
|
|
||||||
"
|
|
||||||
|
|
||||||
BUILD_PREREQUIRES+="
|
|
||||||
cmd:dot
|
|
||||||
cmd:doxygen
|
|
||||||
"
|
|
||||||
fi
|
|
||||||
|
|
||||||
defineDebugInfoPackage libopenshot$secondaryArchSuffix \
|
defineDebugInfoPackage libopenshot$secondaryArchSuffix \
|
||||||
$libDir/libopenshot.so.$portVersion
|
$libDir/libopenshot.so.$portVersion
|
||||||
|
|
||||||
@@ -133,14 +120,13 @@ BUILD()
|
|||||||
|
|
||||||
cmake . $cmakeDirArgs \
|
cmake . $cmakeDirArgs \
|
||||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||||
|
-DLIBOPENSHOT_AUDIO_INCLUDE_DIR=/system/$relativeIncludeDir/libopenshot-audio/JuceLibraryCode \
|
||||||
-DPYTHON_MODULE_PATH=$installLocation \
|
-DPYTHON_MODULE_PATH=$installLocation \
|
||||||
-DENABLE_RUBY=OFF \
|
-DENABLE_RUBY=OFF \
|
||||||
|
-DENABLE_TESTS=OFF \
|
||||||
|
-DENABLE_DOCS=OFF \
|
||||||
-DUSE_SYSTEM_JSONCPP=ON
|
-DUSE_SYSTEM_JSONCPP=ON
|
||||||
make $jobArgs
|
make $jobArgs
|
||||||
|
|
||||||
if [ -z "$secondaryArchSuffix" ]; then
|
|
||||||
make $jobArgs doc
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
INSTALL()
|
INSTALL()
|
||||||
@@ -152,19 +138,12 @@ INSTALL()
|
|||||||
packageEntries devel \
|
packageEntries devel \
|
||||||
$developDir
|
$developDir
|
||||||
|
|
||||||
if [ -z "$secondaryArchSuffix" ]; then
|
|
||||||
install -d -m 755 $developDocDir
|
|
||||||
mv -T $docDir/libopenshot $developDocDir
|
|
||||||
rm -rf $documentationDir
|
|
||||||
packageEntries doc \
|
|
||||||
$developDir
|
|
||||||
fi
|
|
||||||
|
|
||||||
python=$portPackageLinksDir/cmd~python${PYTHON_VERSION}/bin/python${PYTHON_VERSION}m
|
python=$portPackageLinksDir/cmd~python${PYTHON_VERSION}/bin/python${PYTHON_VERSION}m
|
||||||
pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
|
pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
|
||||||
pythonLocation=$prefix/lib/python$pythonVersion
|
pythonLocation=$prefix/lib/python$pythonVersion
|
||||||
installLocation=$pythonLocation/vendor-packages
|
installLocation=$pythonLocation/vendor-packages
|
||||||
pythonDebugInfoDir=$(getPackagePrefix python3_debuginfo)/$relativeDebugInfoDir
|
pythonDebugInfoDir=$(getPackagePrefix python3_debuginfo)/$relativeDebugInfoDir
|
||||||
|
mv $pythonLocation/dist-packages $pythonLocation/vendor-packages
|
||||||
extractDebugInfo $installLocation/_openshot.so \
|
extractDebugInfo $installLocation/_openshot.so \
|
||||||
"$pythonDebugInfoDir/_openshot.so(libopenshot_python3-$portFullVersion).debuginfo"
|
"$pythonDebugInfoDir/_openshot.so(libopenshot_python3-$portFullVersion).debuginfo"
|
||||||
# python package
|
# python package
|
||||||
@@ -1,234 +0,0 @@
|
|||||||
From 3474924f0f5ad8792ae2c25a9dd373218abbe71f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
||||||
Date: Sat, 6 Oct 2018 11:05:15 +1000
|
|
||||||
Subject: Fix build for Haiku
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index eaf7d65..82d8e9a 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -33,6 +33,7 @@ MESSAGE("questions or issues, please visit <http://www.openshot.org/>.")
|
|
||||||
|
|
||||||
################ ADD CMAKE MODULES ##################
|
|
||||||
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
|
|
||||||
+include(GNUInstallDirs)
|
|
||||||
|
|
||||||
################ GET VERSION INFORMATION FROM VERSION.H ##################
|
|
||||||
MESSAGE("--------------------------------------------------------------")
|
|
||||||
@@ -86,5 +87,4 @@ add_subdirectory(tests)
|
|
||||||
# Find Doxygen (used for documentation)
|
|
||||||
include(cmake/Modules/UseDoxygen.cmake)
|
|
||||||
|
|
||||||
-file(GLOB_RECURSE doc_files ${CMAKE_CURRENT_BINARY_DIR}/doc/html/*.*)
|
|
||||||
-INSTALL(FILES ${doc_files} DESTINATION share/doc/libopenshot)
|
|
||||||
+INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html/ DESTINATION ${CMAKE_INSTALL_DOCDIR}/libopenshot OPTIONAL)
|
|
||||||
diff --git a/cmake/Modules/FindOpenShotAudio.cmake b/cmake/Modules/FindOpenShotAudio.cmake
|
|
||||||
index 1de4529..112f3bb 100644
|
|
||||||
--- a/cmake/Modules/FindOpenShotAudio.cmake
|
|
||||||
+++ b/cmake/Modules/FindOpenShotAudio.cmake
|
|
||||||
@@ -9,9 +9,9 @@ message("$ENV{LIBOPENSHOT_AUDIO_DIR}")
|
|
||||||
|
|
||||||
# Find the base directory of juce includes
|
|
||||||
find_path(LIBOPENSHOT_AUDIO_BASE_DIR JuceHeader.h
|
|
||||||
- PATHS $ENV{LIBOPENSHOT_AUDIO_DIR}/include/libopenshot-audio/
|
|
||||||
- /usr/include/libopenshot-audio/
|
|
||||||
- /usr/local/include/libopenshot-audio/ )
|
|
||||||
+ HINTS ENV LIBOPENSHOT_AUDIO_DIR
|
|
||||||
+ PATH_SUFFIXES include/libopenshot-audio
|
|
||||||
+ libopenshot-audio )
|
|
||||||
|
|
||||||
# Get a list of all header file paths
|
|
||||||
FILE(GLOB_RECURSE JUCE_HEADER_FILES
|
|
||||||
@@ -32,21 +32,14 @@ ENDFOREACH(HEADER_PATH)
|
|
||||||
# Remove duplicates from the header directories list
|
|
||||||
LIST(REMOVE_DUPLICATES HEADER_DIRECTORIES)
|
|
||||||
|
|
||||||
-# Find the libopenshot-audio.so (check env var first)
|
|
||||||
-find_library(LIBOPENSHOT_AUDIO_LIBRARY
|
|
||||||
- NAMES libopenshot-audio openshot-audio
|
|
||||||
- PATHS $ENV{LIBOPENSHOT_AUDIO_DIR}/lib/ NO_DEFAULT_PATH)
|
|
||||||
-
|
|
||||||
-# Find the libopenshot-audio.so / libopenshot-audio.dll library (fallback)
|
|
||||||
find_library(LIBOPENSHOT_AUDIO_LIBRARY
|
|
||||||
NAMES libopenshot-audio openshot-audio
|
|
||||||
- HINTS $ENV{LIBOPENSHOT_AUDIO_DIR}/lib/
|
|
||||||
- /usr/lib/
|
|
||||||
- /usr/lib/libopenshot-audio/
|
|
||||||
- /usr/local/lib/ )
|
|
||||||
+ HINTS ENV LIBOPENSHOT_AUDIO_DIR
|
|
||||||
+ PATH_SUFFIXES
|
|
||||||
+ lib/libopenshot-audio
|
|
||||||
+ lib )
|
|
||||||
|
|
||||||
set(LIBOPENSHOT_AUDIO_LIBRARIES ${LIBOPENSHOT_AUDIO_LIBRARY})
|
|
||||||
-set(LIBOPENSHOT_AUDIO_LIBRARY ${LIBOPENSHOT_AUDIO_LIBRARIES})
|
|
||||||
|
|
||||||
# Seems to work fine with just the base dir (rather than all the actual include folders)
|
|
||||||
set(LIBOPENSHOT_AUDIO_INCLUDE_DIR ${LIBOPENSHOT_AUDIO_BASE_DIR} )
|
|
||||||
@@ -55,5 +48,5 @@ set(LIBOPENSHOT_AUDIO_INCLUDE_DIRS ${LIBOPENSHOT_AUDIO_BASE_DIR} )
|
|
||||||
include(FindPackageHandleStandardArgs)
|
|
||||||
# handle the QUIETLY and REQUIRED arguments and set LIBOPENSHOT_AUDIO_FOUND to TRUE
|
|
||||||
# if all listed variables are TRUE
|
|
||||||
-find_package_handle_standard_args(LIBOPENSHOT_AUDIO DEFAULT_MSG
|
|
||||||
- LIBOPENSHOT_AUDIO_LIBRARY LIBOPENSHOT_AUDIO_INCLUDE_DIR)
|
|
||||||
+find_package_handle_standard_args(LIBOPENSHOT_AUDIO DEFAULT_MSG
|
|
||||||
+ LIBOPENSHOT_AUDIO_LIBRARY LIBOPENSHOT_AUDIO_INCLUDE_DIRS)
|
|
||||||
diff --git a/cmake/Modules/FindUnitTest++.cmake b/cmake/Modules/FindUnitTest++.cmake
|
|
||||||
index 545f62a..978b075 100644
|
|
||||||
--- a/cmake/Modules/FindUnitTest++.cmake
|
|
||||||
+++ b/cmake/Modules/FindUnitTest++.cmake
|
|
||||||
@@ -1,49 +1,39 @@
|
|
||||||
# Locate UNITTEST
|
|
||||||
# This module defines
|
|
||||||
# UNITTEST++_LIBRARY
|
|
||||||
-# UNITTEST++_FOUND, if false, do not try to link to gdal
|
|
||||||
+# UNITTEST++_FOUND, if false, do not try to link to gdal
|
|
||||||
# UNITTEST++_INCLUDE_DIR, where to find the headers
|
|
||||||
|
|
||||||
FIND_PATH(UNITTEST++_INCLUDE_DIR UnitTest++.h
|
|
||||||
- ${UNITTEST_DIR}/include/unittest++
|
|
||||||
- $ENV{UNITTEST_DIR}/include/unittest++
|
|
||||||
- $ENV{UNITTEST_DIR}/src
|
|
||||||
- $ENV{UNITTEST_DIR}
|
|
||||||
- ~/Library/Frameworks
|
|
||||||
- /Library/Frameworks
|
|
||||||
- /usr/local/include
|
|
||||||
- /usr/include
|
|
||||||
- /usr/include/unittest++
|
|
||||||
- /usr/include/UnitTest++ # Fedora
|
|
||||||
- /usr/include/unittest-cpp # openSUSE
|
|
||||||
- /usr/local/include/UnitTest++/ # Arch
|
|
||||||
- /sw/include # Fink
|
|
||||||
- /opt/local/include # DarwinPorts
|
|
||||||
- /opt/local/include/UnitTest++
|
|
||||||
- /opt/csw/include # Blastwave
|
|
||||||
- /opt/include
|
|
||||||
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment]/include
|
|
||||||
- /usr/freeware/include
|
|
||||||
+ HINTS
|
|
||||||
+ ENV UNITTEST_DIR
|
|
||||||
+ PATHS
|
|
||||||
+ [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment]
|
|
||||||
+ ~/Library/Frameworks
|
|
||||||
+ /Library/Frameworks
|
|
||||||
+ $ENV{UNITTEST_DIR}/src
|
|
||||||
+ PATH_SUFFIXES
|
|
||||||
+ include/unittest++
|
|
||||||
+ include/UnitTest++
|
|
||||||
+ include/unittest-cpp
|
|
||||||
+ include
|
|
||||||
+ unittest++
|
|
||||||
+ UnitTest++
|
|
||||||
+ unittest-cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
-FIND_LIBRARY(UNITTEST++_LIBRARY
|
|
||||||
+FIND_LIBRARY(UNITTEST++_LIBRARY
|
|
||||||
NAMES unittest++ UnitTest++
|
|
||||||
+ HINTS
|
|
||||||
+ ENV UNITTEST_DIR
|
|
||||||
PATHS
|
|
||||||
- ${UNITTEST_DIR}/lib
|
|
||||||
- $ENV{UNITTEST_DIR}/lib
|
|
||||||
- $ENV{UNITTEST_DIR}/build
|
|
||||||
- $ENV{UNITTEST_DIR}
|
|
||||||
- ~/Library/Frameworks
|
|
||||||
- /Library/Frameworks
|
|
||||||
- /usr/local/lib
|
|
||||||
- /usr/lib
|
|
||||||
- /usr/lib64/ # Fedora
|
|
||||||
- /sw/lib
|
|
||||||
- /opt/local/lib
|
|
||||||
- /opt/csw/lib
|
|
||||||
- /opt/lib
|
|
||||||
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment]/lib
|
|
||||||
- /usr/freeware/lib64
|
|
||||||
+ [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment]
|
|
||||||
+ $ENV{UNITTEST_DIR}/build
|
|
||||||
+ ~/Library/Frameworks
|
|
||||||
+ /Library/Frameworks
|
|
||||||
+ PATH_SUFFIXES
|
|
||||||
+ lib
|
|
||||||
+ lib64
|
|
||||||
)
|
|
||||||
|
|
||||||
SET(UNITTEST++_FOUND "NO")
|
|
||||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
||||||
index d71067a..31549e5 100644
|
|
||||||
--- a/src/CMakeLists.txt
|
|
||||||
+++ b/src/CMakeLists.txt
|
|
||||||
@@ -293,7 +293,7 @@ set_target_properties(openshot
|
|
||||||
PROPERTIES
|
|
||||||
VERSION ${PROJECT_VERSION}
|
|
||||||
SOVERSION ${SO_VERSION}
|
|
||||||
- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
|
|
||||||
+ INSTALL_NAME_DIR ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
)
|
|
||||||
|
|
||||||
############### LINK LIBRARY #################
|
|
||||||
@@ -387,12 +387,12 @@ set(LIB_INSTALL_DIR lib${LIB_SUFFIX}) # determine correct lib folder
|
|
||||||
|
|
||||||
# Install primary library
|
|
||||||
INSTALL( TARGETS openshot
|
|
||||||
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
|
|
||||||
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
|
|
||||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
COMPONENT library )
|
|
||||||
|
|
||||||
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/
|
|
||||||
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/libopenshot
|
|
||||||
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libopenshot
|
|
||||||
FILES_MATCHING PATTERN "*.h")
|
|
||||||
|
|
||||||
############### CPACK PACKAGING ##############
|
|
||||||
diff --git a/src/CrashHandler.cpp b/src/CrashHandler.cpp
|
|
||||||
index e7827d0..8b4e4ed 100644
|
|
||||||
--- a/src/CrashHandler.cpp
|
|
||||||
+++ b/src/CrashHandler.cpp
|
|
||||||
@@ -197,7 +197,7 @@ void CrashHandler::printStackTrace(FILE *out, unsigned int max_frames)
|
|
||||||
}
|
|
||||||
SymCleanup(process);
|
|
||||||
|
|
||||||
-#else
|
|
||||||
+#elif !defined(__HAIKU__)
|
|
||||||
// Linux and Mac stack unwinding
|
|
||||||
// Storage array for stack trace address data
|
|
||||||
void* addrlist[max_frames+1];
|
|
||||||
@@ -317,4 +317,4 @@ void CrashHandler::printStackTrace(FILE *out, unsigned int max_frames)
|
|
||||||
|
|
||||||
fprintf(out, "---- End of Stack Trace ----\n");
|
|
||||||
ZmqLogger::Instance()->LogToFile("---- End of Stack Trace ----\n");
|
|
||||||
-}
|
|
||||||
\ No newline at end of file
|
|
||||||
+}
|
|
||||||
--
|
|
||||||
2.19.0
|
|
||||||
|
|
||||||
|
|
||||||
From 573bd3c4130a336996274aaab2565e575dbc1cb4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
||||||
Date: Sat, 6 Oct 2018 11:35:18 +1000
|
|
||||||
Subject: Don't use relative path for haiku
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt
|
|
||||||
index 80f012e..16741f0 100644
|
|
||||||
--- a/src/bindings/python/CMakeLists.txt
|
|
||||||
+++ b/src/bindings/python/CMakeLists.txt
|
|
||||||
@@ -53,9 +53,10 @@ IF (PYTHONLIBS_FOUND)
|
|
||||||
OUTPUT_VARIABLE _ABS_PYTHON_MODULE_PATH
|
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE )
|
|
||||||
GET_FILENAME_COMPONENT(_ABS_PYTHON_MODULE_PATH "${_ABS_PYTHON_MODULE_PATH}" ABSOLUTE)
|
|
||||||
+IF (NOT HAIKU)
|
|
||||||
FILE(RELATIVE_PATH _REL_PYTHON_MODULE_PATH ${CMAKE_INSTALL_PREFIX} ${_ABS_PYTHON_MODULE_PATH})
|
|
||||||
SET(PYTHON_MODULE_PATH ${_REL_PYTHON_MODULE_PATH})
|
|
||||||
-
|
|
||||||
+ENDIF(NOT HAIKU)
|
|
||||||
############### INSTALL HEADERS & LIBRARY ################
|
|
||||||
### Install Python bindings
|
|
||||||
INSTALL(TARGETS _openshot DESTINATION ${PYTHON_MODULE_PATH} )
|
|
||||||
--
|
|
||||||
2.19.0
|
|
||||||
|
|
||||||
103
media-libs/libopenshot/patches/libopenshot-0.2.5.patchset
Normal file
103
media-libs/libopenshot/patches/libopenshot-0.2.5.patchset
Normal file
@@ -0,0 +1,103 @@
|
|||||||
|
From a4d9aa58d1b61dacda7fb64e13328f3a240f17f0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||||
|
Date: Sat, 2 May 2020 21:02:14 +1000
|
||||||
|
Subject: Fix build for Haiku
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 470db45..54a3313 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -38,6 +38,7 @@ For more information, please visit <http://www.openshot.org/>.
|
||||||
|
|
||||||
|
################ ADD CMAKE MODULES ##################
|
||||||
|
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
|
||||||
|
+include(GNUInstallDirs)
|
||||||
|
|
||||||
|
################ PROJECT VERSION ####################
|
||||||
|
set(PROJECT_VERSION_FULL "0.2.5")
|
||||||
|
diff --git a/include/FFmpegUtilities.h b/include/FFmpegUtilities.h
|
||||||
|
index 62d64df..f107ccf 100644
|
||||||
|
--- a/include/FFmpegUtilities.h
|
||||||
|
+++ b/include/FFmpegUtilities.h
|
||||||
|
@@ -45,6 +45,10 @@
|
||||||
|
#define HAVE_HW_ACCEL (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 107, 100))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+ #ifdef __HAIKU__
|
||||||
|
+ #undef HAVE_HW_ACCEL
|
||||||
|
+ #endif
|
||||||
|
+
|
||||||
|
// Include the FFmpeg headers
|
||||||
|
extern "C" {
|
||||||
|
#include <libavcodec/avcodec.h>
|
||||||
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||||
|
index a544982..9f527ae 100644
|
||||||
|
--- a/src/CMakeLists.txt
|
||||||
|
+++ b/src/CMakeLists.txt
|
||||||
|
@@ -77,7 +77,7 @@ ENDIF (ImageMagick_FOUND)
|
||||||
|
|
||||||
|
################# LIBOPENSHOT-AUDIO ###################
|
||||||
|
# Find JUCE-based openshot Audio libraries
|
||||||
|
-FIND_PACKAGE(OpenShotAudio 0.2.0 REQUIRED)
|
||||||
|
+FIND_PACKAGE(OpenShotAudio REQUIRED)
|
||||||
|
|
||||||
|
# Include Juce headers (needed for compile)
|
||||||
|
include_directories(${LIBOPENSHOT_AUDIO_INCLUDE_DIRS})
|
||||||
|
@@ -426,13 +426,13 @@ set(LIB_INSTALL_DIR lib${LIB_SUFFIX}) # determine correct lib folder
|
||||||
|
|
||||||
|
# Install primary library
|
||||||
|
INSTALL(TARGETS openshot
|
||||||
|
- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
|
||||||
|
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
|
||||||
|
- RUNTIME DESTINATION ${LIB_INSTALL_DIR}
|
||||||
|
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
|
+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
|
COMPONENT library )
|
||||||
|
|
||||||
|
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/
|
||||||
|
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/libopenshot
|
||||||
|
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libopenshot
|
||||||
|
FILES_MATCHING PATTERN "*.h")
|
||||||
|
|
||||||
|
############### CPACK PACKAGING ##############
|
||||||
|
diff --git a/src/CrashHandler.cpp b/src/CrashHandler.cpp
|
||||||
|
index 1782f5b..1d8d54c 100644
|
||||||
|
--- a/src/CrashHandler.cpp
|
||||||
|
+++ b/src/CrashHandler.cpp
|
||||||
|
@@ -200,7 +200,7 @@ void CrashHandler::printStackTrace(FILE *out, unsigned int max_frames)
|
||||||
|
}
|
||||||
|
SymCleanup(process);
|
||||||
|
|
||||||
|
-#else
|
||||||
|
+#elif !defined(__HAIKU__)
|
||||||
|
// Linux and Mac stack unwinding
|
||||||
|
// Storage array for stack trace address data
|
||||||
|
void* addrlist[max_frames+1];
|
||||||
|
@@ -320,4 +320,4 @@ void CrashHandler::printStackTrace(FILE *out, unsigned int max_frames)
|
||||||
|
|
||||||
|
fprintf(out, "---- End of Stack Trace ----\n");
|
||||||
|
ZmqLogger::Instance()->LogToFile("---- End of Stack Trace ----\n");
|
||||||
|
-}
|
||||||
|
\ No newline at end of file
|
||||||
|
+}
|
||||||
|
diff --git a/src/bindings/python/CMakeLists.txt b/src/bindings/python/CMakeLists.txt
|
||||||
|
index 21405f6..c1f48b8 100644
|
||||||
|
--- a/src/bindings/python/CMakeLists.txt
|
||||||
|
+++ b/src/bindings/python/CMakeLists.txt
|
||||||
|
@@ -90,9 +90,11 @@ print( get_python_lib( plat_specific=True, prefix='${CMAKE_INSTALL_PREFIX}' ) )"
|
||||||
|
|
||||||
|
GET_FILENAME_COMPONENT(_ABS_PYTHON_MODULE_PATH
|
||||||
|
"${_ABS_PYTHON_MODULE_PATH}" ABSOLUTE)
|
||||||
|
+IF (NOT HAIKU)
|
||||||
|
FILE(RELATIVE_PATH _REL_PYTHON_MODULE_PATH
|
||||||
|
${CMAKE_INSTALL_PREFIX} ${_ABS_PYTHON_MODULE_PATH})
|
||||||
|
SET(PYTHON_MODULE_PATH ${_ABS_PYTHON_MODULE_PATH})
|
||||||
|
+ENDIF(NOT HAIKU)
|
||||||
|
endif()
|
||||||
|
message("PYTHON_MODULE_PATH: ${PYTHON_MODULE_PATH}")
|
||||||
|
|
||||||
|
--
|
||||||
|
2.26.0
|
||||||
|
|
||||||
Reference in New Issue
Block a user