media-libs/simage: fixed tests in 1.7.1-r1

1) fixed building tests
2) organized deps

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/media-libs/simage/files/simage-1.7.1-tests-conditional.patch b/media-libs/simage/files/simage-1.7.1-tests-conditional.patch
new file mode 100644 (file)
index 0000000..ced4915
--- /dev/null
+++ b/media-libs/simage/files/simage-1.7.1-tests-conditional.patch
@@ -0,0 +1,52 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5536922..b6de403 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -504,25 +504,28 @@ endforeach()
+ # Build tests\r
+ # ############################################################################\r
+ \r
+-enable_testing()\r
+-\r
+-add_executable(loaders tests/loaders.c)\r
+-target_link_libraries(loaders simage)\r
+-target_compile_definitions(loaders PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES)\r
+-if(UNIX)\r
+-  target_link_libraries(loaders m)\r
+-endif()\r
+-\r
+-add_test(\r
+-  loaders\r
+-  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/loaders\r
+-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.gif\r
+-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.jpg\r
+-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.png\r
+-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.rgb\r
+-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tga\r
+-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tif\r
+-)\r
++if(TESTS)\r
++  enable_testing()\r
++\r
++  add_executable(loaders tests/loaders.c)\r
++  target_link_libraries(loaders simage)\r
++  target_compile_definitions(loaders PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES)\r
++  if(UNIX)\r
++    target_link_libraries(loaders m)\r
++    target_link_libraries(loaders sndfile)\r
++  endif()\r
++\r
++  add_test(\r
++    loaders\r
++    ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/loaders\r
++    ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.gif\r
++    ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.jpg\r
++    ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.png\r
++    ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.rgb\r
++    ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tga\r
++    ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tif\r
++  )\r
++endif()\r
+ \r
+ # Add a target to generate API documentation with Doxygen\r
+ if(SIMAGE_BUILD_DOCUMENTATION)\r

diff --git a/media-libs/simage/simage-1.7.1-r1.ebuild b/media-libs/simage/simage-1.7.1-r1.ebuild
index 5117be12735c7d9b3d955b9b1d347b75c6832348..34859fa678e4fe7455e4ed4b31f2c706ef126cae 100644 (file)
--- a/media-libs/simage/simage-1.7.1-r1.ebuild
+++ b/media-libs/simage/simage-1.7.1-r1.ebuild
@@ -12,8 +12,12 @@ SRC_URI="https://bitbucket.org/Coin3D/simage/downloads/${P}-src.zip"
 LICENSE="public-domain mpeg2enc"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
-IUSE="debug gif jpeg png qt5 sndfile tiff vorbis"
+IUSE="debug gif jpeg png qt5 sndfile test tiff vorbis"
+RESTRICT="!test? ( test )"
 
+BDEPEND="
+       app-arch/unzip
+"
 RDEPEND="
        gif? ( media-libs/giflib )
        jpeg? ( virtual/jpeg:0= )
@@ -31,7 +35,7 @@ RDEPEND="
 "
 DEPEND="
        ${RDEPEND}
-       app-arch/unzip
+       test? ( media-libs/libsndfile )
 "
 
 S="${WORKDIR}/${PN}"
@@ -42,6 +46,7 @@ PATCHES=(
        # make the dep unconditional or not build the examples. i chose the latter way.
        # btw, examples are not installed anyway, they are just compiled.
        "${FILESDIR}/${P}-disable-examples.patch"
+       "${FILESDIR}/${P}-tests-conditional.patch"
        "${FILESDIR}/${P}-disable-gif-quantize-buffer.patch"
 )
 
@@ -71,6 +76,7 @@ src_configure() {
                -DSIMAGE_RGB_SUPPORT=ON
                -DSIMAGE_TGA_SUPPORT=ON
                -DSIMAGE_XWD_SUPPORT=ON
+               -DTESTS=$(usex test)
        )
 
        cmake-utils_src_configure