gentoo resync : 15.01.2020

3 files changed, 96 insertions, 22 deletions

diff --git a/media-libs/simage/files/simage-1.7.1-disable-examples.patch b/media-libs/simage/files/simage-1.7.1-disable-examples.patch
new file mode 100644
index 000000000000..9e43e073ccd1
--- /dev/null
+++ b/media-libs/simage/files/simage-1.7.1-disable-examples.patch
@@ -0,0 +1,44 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5536922..07df95a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -482,23 +482,23 @@ endif()
+ # Build examples

+ # ############################################################################

+ 

+-set(SIMAGE_EXAMPLE_SOURCE

+-  ${CMAKE_CURRENT_SOURCE_DIR}/examples/audio2raw.c

+-  ${CMAKE_CURRENT_SOURCE_DIR}/examples/img2avi.c

++#set(SIMAGE_EXAMPLE_SOURCE

++#  ${CMAKE_CURRENT_SOURCE_DIR}/examples/audio2raw.c

++#  ${CMAKE_CURRENT_SOURCE_DIR}/examples/img2avi.c

+ #  ${CMAKE_CURRENT_SOURCE_DIR}/examples/mpeg2enc.cpp # requires Coin to build

+-  ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-convert.c

+-  ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-read-line-test.c

+-)

+-

+-foreach(_source ${SIMAGE_EXAMPLE_SOURCE})

+-  get_filename_component(_example ${_source} NAME_WE)

+-  add_executable(${_example} ${_source})

+-  target_compile_definitions(${_example} PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES)

+-  target_link_libraries(${_example} simage)

+-  if(UNIX)

+-    target_link_libraries(${_example} m)

+-  endif()

+-endforeach()

++#  ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-convert.c

++#  ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-read-line-test.c

++#)

++

++#foreach(_source ${SIMAGE_EXAMPLE_SOURCE})

++#  get_filename_component(_example ${_source} NAME_WE)

++#  add_executable(${_example} ${_source})

++#  target_compile_definitions(${_example} PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES)

++#  target_link_libraries(${_example} simage)

++#  if(UNIX)

++#    target_link_libraries(${_example} m)

++#  endif()

++#endforeach()

+ 

+ # ############################################################################

+ # Build tests

diff --git a/media-libs/simage/files/simage-1.7.1-fix-examples-linking.patch b/media-libs/simage/files/simage-1.7.1-fix-examples-linking.patch
deleted file mode 100644
index 756ddea5c73f..000000000000
--- a/media-libs/simage/files/simage-1.7.1-fix-examples-linking.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8225dc4..de89fd0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -494,7 +494,7 @@ foreach(_source ${SIMAGE_EXAMPLE_SOURCE})
-   get_filename_component(_example ${_source} NAME_WE)

-   add_executable(${_example} ${_source})

-   target_compile_definitions(${_example} PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES)

--  target_link_libraries(${_example} simage)

-+  target_link_libraries(${_example} simage sndfile)

-   if(UNIX)

-     target_link_libraries(${_example} m)

-   endif()

-@@ -507,7 +507,7 @@ endforeach()
- enable_testing()

- 

- add_executable(loaders tests/loaders.c)

--target_link_libraries(loaders simage)

-+target_link_libraries(loaders simage sndfile)

- target_compile_definitions(loaders PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES)

- if(UNIX)

-   target_link_libraries(loaders m)

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
index 000000000000..ced49159ba69
--- /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

+ # ############################################################################

+ 

+-enable_testing()

+-

+-add_executable(loaders tests/loaders.c)

+-target_link_libraries(loaders simage)

+-target_compile_definitions(loaders PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES)

+-if(UNIX)

+-  target_link_libraries(loaders m)

+-endif()

+-

+-add_test(

+-  loaders

+-  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/loaders

+-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.gif

+-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.jpg

+-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.png

+-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.rgb

+-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tga

+-  ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tif

+-)

++if(TESTS)

++  enable_testing()

++

++  add_executable(loaders tests/loaders.c)

++  target_link_libraries(loaders simage)

++  target_compile_definitions(loaders PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES)

++  if(UNIX)

++    target_link_libraries(loaders m)

++    target_link_libraries(loaders sndfile)

++  endif()

++

++  add_test(

++    loaders

++    ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/loaders

++    ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.gif

++    ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.jpg

++    ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.png

++    ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.rgb

++    ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tga

++    ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tif

++  )

++endif()

+ 

+ # Add a target to generate API documentation with Doxygen

+ if(SIMAGE_BUILD_DOCUMENTATION)