haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 06:28:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

libopenshot: enable unit tests.

Browse Source
This commit is contained in:
Jerome Duval
2016-06-02 21:50:52 +02:00
parent 169e6a7a89
commit c778c3087e
2 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
media-libs/libopenshot/libopenshot-0.1.1.recipe
View File

@@ -9,7 +9,7 @@ LICENSE="GNU LGPL v3"
SOURCE_URI="https://github.com/OpenShot/libopenshot/archive/v$portVersion.tar.gz"
SOURCE_FILENAME="libopenshot-$portVersion.tar.gz"
CHECKSUM_SHA256="735322c73f6e8ea7bac059970f247c906b4c35f83fad5e5efd9a77adead20d0c"
REVISION="1"
REVISION="2"
PATCHES="libopenshot-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -49,6 +49,7 @@ BUILD_REQUIRES="
devel:libQt5Network$secondaryArchSuffix
devel:libQt5Widgets$secondaryArchSuffix
devel:libMagick++_6.Q16$secondaryArchSuffix
unittest++${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
cmd:cmake
@@ -61,6 +62,13 @@ BUILD_PREREQUIRES="
BUILD()
{
local UNITTEST_SUBDIR=
if [ -n "$secondaryArchSuffix" ]; then
UNITTEST_SUBDIR="$secondaryArchSuffix/"
fi
export UNITTEST_INCLUDE_DIR=$portPackageLinksDir/unittest++${secondaryArchSuffix}_devel/develop/headers$UNITTEST_SUBDIR/UnitTest++
export UNITTEST_LIB_DIR=$portPackageLinksDir/unittest++${secondaryArchSuffix}_devel/develop/lib$UNITTEST_SUBDIR
cmake . -DCMAKE_INSTALL_PREFIX=$prefix \
-DENABLE_RUBY=OFF
make $jobArgs
@@ -90,3 +98,8 @@ INSTALL()
$developDir
}
TEST()
{
make $jobArgs test
}

41
media-libs/libopenshot/patches/libopenshot-0.1.1.patchset
View File

@@ -1,28 +1,9 @@
From 15e385fe34b84b81c9cb834dd05192089de2a769 Mon Sep 17 00:00:00 2001
From 59f03d79adc89d91c74cf4eba5199228992078a5 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 1 Jun 2016 12:35:16 +0200
Subject: Haiku patch
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1de241a..779bdc6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,11 +77,11 @@ FILE(GLOB QT_HEADER_FILES "${QT_HEADER_DIR}/*.h")
############## PROCESS SUB-DIRECTORIES ##############
add_subdirectory(src)
-add_subdirectory(tests)
+#add_subdirectory(tests)
################### DOCUMENTATION ###################
# 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)
\ No newline at end of file
+INSTALL(FILES ${doc_files} DESTINATION share/doc/libopenshot)
diff --git a/cmake/Modules/FindOpenShotAudio.cmake b/cmake/Modules/FindOpenShotAudio.cmake
index 720b93a..bca4aee 100644
--- a/cmake/Modules/FindOpenShotAudio.cmake
@@ -37,6 +18,26 @@ index 720b93a..bca4aee 100644
# Get a list of all header file paths
FILE(GLOB_RECURSE JUCE_HEADER_FILES
diff --git a/cmake/Modules/FindUnitTest++.cmake b/cmake/Modules/FindUnitTest++.cmake
index 545f62a..edcc511 100644
--- a/cmake/Modules/FindUnitTest++.cmake
+++ b/cmake/Modules/FindUnitTest++.cmake
@@ -9,6 +9,7 @@ FIND_PATH(UNITTEST++_INCLUDE_DIR UnitTest++.h
$ENV{UNITTEST_DIR}/include/unittest++
$ENV{UNITTEST_DIR}/src
$ENV{UNITTEST_DIR}
+ $ENV{UNITTEST_INCLUDE_DIR}
~/Library/Frameworks
/Library/Frameworks
/usr/local/include
@@ -33,6 +34,7 @@ FIND_LIBRARY(UNITTEST++_LIBRARY
$ENV{UNITTEST_DIR}/lib
$ENV{UNITTEST_DIR}/build
$ENV{UNITTEST_DIR}
+ $ENV{UNITTEST_LIB_DIR}
~/Library/Frameworks
/Library/Frameworks
/usr/local/lib
diff --git a/include/ChunkReader.h b/include/ChunkReader.h
index dd61257..250d133 100644
--- a/include/ChunkReader.h