Unified
Split
Showing
with
129 additions
and 21 deletions.
- +23 −0 dev-libs/unittest++/patches/unittest++-1.6.1.patchset
- +71 −0 dev-libs/unittest++/unittest++-1.6.1.recipe
- +14 −1 media-libs/libopenshot/libopenshot-0.1.1.recipe
- +21 −20 media-libs/libopenshot/patches/libopenshot-0.1.1.patchset
| @@ -0,0 +1,23 @@ | ||
| From e9bd231d1a65425721a94b945973fc8dd26a42a3 Mon Sep 17 00:00:00 2001 | ||
| From: Jerome Duval <jerome.duval@gmail.com> | ||
| Date: Thu, 2 Jun 2016 19:49:48 +0200 | ||
| Subject: Haiku patch | ||
|
|
||
|
|
||
| diff --git a/UnitTest++/Config.h b/UnitTest++/Config.h | ||
| index ff62b4e..4bd31fe 100644 | ||
| --- a/UnitTest++/Config.h | ||
| +++ b/UnitTest++/Config.h | ||
| @@ -21,7 +21,8 @@ | ||
| #endif | ||
|
|
||
| #if defined(unix) || defined(__unix__) || defined(__unix) || defined(linux) || \ | ||
| - defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) | ||
| + defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) \ | ||
| + || defined (__HAIKU__) | ||
| #define UNITTEST_POSIX | ||
| #endif | ||
|
|
||
| -- | ||
| 2.2.2 | ||
|
|
| @@ -0,0 +1,71 @@ | ||
| SUMMARY="A lightweight unit testing framework for C++" | ||
| DESCRIPTION="UnitTest++ was designed to do test-driven development on a wide \ | ||
| variety of platforms. Simplicity, portability, speed, and small footprint \ | ||
| are all very important aspects of UnitTest++. UnitTest++ is mostly standard \ | ||
| C++ and makes minimal use of advanced library and language features, which \ | ||
| means it should be easily portable to just about any platform." | ||
| HOMEPAGE="http://unittest-cpp.github.io" | ||
| COPYRIGHT="2006 Noel Llopis and Charles Nicholson" | ||
| LICENSE="MIT" | ||
| REVISION="1" | ||
| SOURCE_URI="https://github.com/unittest-cpp/unittest-cpp/archive/v$portVersion.tar.gz" | ||
| SOURCE_FILENAME="unittest-cpp-$portVersion.tar.gz" | ||
| CHECKSUM_SHA256="1cc9071be01db190f26868fefb6a7af49ee56a339fc3b08d1a1e9eeca5376c45" | ||
| SOURCE_DIR="unittest-cpp-$portVersion" | ||
| PATCHES="unittest++-$portVersion.patchset" | ||
|
|
||
| ARCHITECTURES="x86_gcc2 x86 x86_64" | ||
| SECONDARY_ARCHITECTURES="x86 x86_gcc2" | ||
|
|
||
| PROVIDES=" | ||
| unittest++$secondaryArchSuffix = $portVersion | ||
| lib:libunittest++$secondaryArchSuffix = $portVersion compat >= 1 | ||
| " | ||
| REQUIRES=" | ||
| haiku$secondaryArchSuffix | ||
| " | ||
|
|
||
| PROVIDES_devel=" | ||
| unittest++${secondaryArchSuffix}_devel = $portVersion | ||
| devel:libunittest++$secondaryArchSuffix = $portVersion compat >= 1 | ||
| " | ||
| REQUIRES_devel=" | ||
| unittest++$secondaryArchSuffix == $portVersion base | ||
| " | ||
|
|
||
| BUILD_REQUIRES=" | ||
| haiku${secondaryArchSuffix}_devel | ||
| " | ||
| BUILD_PREREQUIRES=" | ||
| cmd:cmake | ||
| cmd:gcc$secondaryArchSuffix | ||
| cmd:make | ||
| " | ||
|
|
||
| BUILD() | ||
| { | ||
| cmake -DCMAKE_INSTALL_PREFIX=$prefix . | ||
| make $jobArgs | ||
| } | ||
|
|
||
| INSTALL() | ||
| { | ||
| make install | ||
|
|
||
| mkdir -p $includeDir | ||
| mv $prefix/include/UnitTest++ $includeDir/ | ||
| rmdir $prefix/include | ||
|
|
||
| if [ -n "$secondaryArchSuffix" ]; then | ||
| mkdir -p $libDir | ||
| mv $prefix/lib/lib* $prefix/lib/cmake $libDir/ | ||
| fi | ||
|
|
||
| prepareInstalledDevelLibs libUnitTest++ | ||
| packageEntries devel $relativeDevelopDir | ||
| } | ||
|
|
||
| TEST() | ||
| { | ||
| ./TestUnitTest++ | ||
| } |
| @@ -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 | ||
| } | ||
|
|
||
| @@ -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 | ||