diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /media-gfx/exiv2/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'media-gfx/exiv2/files')
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch | 71 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.25-fix-install-dirs.patch | 64 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch | 22 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.25-fvisibility-hidden.patch | 19 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.25-hide-symbols.patch | 97 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.25-tools-optional.patch | 27 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.26-CVE-2017-9239.patch | 22 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.26-cmake1.patch | 22 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.26-cmake2.patch | 65 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.26-cmake3.patch | 53 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.26-cmake4.patch | 24 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.26-cmake5.patch | 33 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.26-cmake6.patch | 27 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.26-cmake7.patch | 38 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch | 70 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch | 27 |
16 files changed, 681 insertions, 0 deletions
diff --git a/media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch b/media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch new file mode 100644 index 000000000000..e2bf677b5125 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch @@ -0,0 +1,71 @@ +--- a/CMakeLists.txt 2015-07-19 16:04:35.363628707 +0200 ++++ b/CMakeLists.txt 2015-07-19 16:28:31.051680136 +0200 +@@ -216,9 +216,7 @@ + ADD_SUBDIRECTORY( xmpsdk ) + ADD_SUBDIRECTORY( src ) + +-IF( EXIV2_ENABLE_BUILD_SAMPLES ) +- ADD_SUBDIRECTORY( samples ) +-ENDIF( EXIV2_ENABLE_BUILD_SAMPLES ) ++ADD_SUBDIRECTORY( samples ) + + IF( EXIV2_ENABLE_BUILD_PO ) + ADD_SUBDIRECTORY( po ) +--- a/samples/CMakeLists.txt 2015-07-19 16:04:35.360628744 +0200 ++++ b/samples/CMakeLists.txt 2015-07-19 16:30:46.415987850 +0200 +@@ -20,7 +20,11 @@ + endif() + include_directories("${CMAKE_SOURCE_DIR}/include" "${CMAKE_SOURCE_DIR}/src") + +-SET( SAMPLES addmoddel.cpp ++SET( SAMPLES taglist.cpp ) ++ ++IF( EXIV2_ENABLE_BUILD_SAMPLES ) ++ SET( SAMPLES ${SAMPLES} ++ addmoddel.cpp + convert-test.cpp + easyaccess-test.cpp + exifcomment.cpp +@@ -38,7 +42,6 @@ + mmap-test.cpp + prevtest.cpp + stringto-test.cpp +- taglist.cpp + tiff-test.cpp + werror-test.cpp + write-test.cpp +@@ -47,6 +50,7 @@ + xmpparser-test.cpp + xmpsample.cpp + ) ++ENDIF() + + FOREACH(entry ${SAMPLES}) + STRING( REPLACE ".cpp" "" target ${entry}) +@@ -63,6 +67,7 @@ + SET( MC_SRC ${MC_SRC} ../src/getopt_win32.c ) + ENDIF( MSVC ) + ++IF( EXIV2_ENABLE_BUILD_SAMPLES ) + SET( MC_SRC ${MC_SRC} metacopy.cpp ../src/utils.cpp ) + ADD_EXECUTABLE( metacopy ${MC_SRC} ) + TARGET_LINK_LIBRARIES( metacopy exiv2lib ) +@@ -79,6 +84,7 @@ + SET_TARGET_PROPERTIES( exiv2json PROPERTIES OUTPUT_NAME exiv2json ) + TARGET_LINK_LIBRARIES( exiv2json exiv2lib ) + INSTALL( TARGETS exiv2json ${INSTALL_TARGET_STANDARD_ARGS} ) ++ENDIF() + + # That's all Folks! + ## +--- a/doc/templates/Makefile 2015-07-19 16:50:50.589933604 +0200 ++++ b/doc/templates/Makefile 2015-07-19 16:51:07.686719864 +0200 +@@ -143,7 +143,7 @@ + xmp_mwg-rs \ + xmp_mwg-kw + +-TAGLIST = ../../bin/taglist ++TAGLIST = ../../src/bin/taglist + + # ********************************************************************** + # ====================================================================== diff --git a/media-gfx/exiv2/files/exiv2-0.25-fix-install-dirs.patch b/media-gfx/exiv2/files/exiv2-0.25-fix-install-dirs.patch new file mode 100644 index 000000000000..bca79dd4d471 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.25-fix-install-dirs.patch @@ -0,0 +1,64 @@ +USE GNUInstallDirs to fix man page and multilib install + +See also: http://dev.exiv2.org/issues/1125 +Patch based on: http://pkgs.fedoraproject.org/cgit/exiv2.git/tree/exiv2-0.25-cmake_LIB_SUFFIX.patch + +--- b/config/CMakeChecks.txt 2015-07-19 14:23:11.606686135 +0200 ++++ b/config/CMakeChecks.txt 2015-06-22 08:41:22.913094633 -0500 +@@ -37,6 +37,8 @@ + INCLUDE( CheckCSourceCompiles ) + INCLUDE( CheckCXXSourceCompiles ) + ++INCLUDE( GNUInstallDirs ) ++ + INCLUDE( FindIconv ) + + SET( STDC_HEADERS ON ) +@@ -289,9 +291,9 @@ + + IF( NOT MSVC ) + CONFIGURE_FILE( config/exiv2.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc @ONLY ) +- INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc DESTINATION lib/pkgconfig ) ++ INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) + CONFIGURE_FILE( config/exiv2.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm) +- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm DESTINATION lib/pkgconfig ) ++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/exiv2.lsm DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) + ENDIF( NOT MSVC ) + + # ****************************************************************************** +--- a/src/CMakeLists.txt 2015-07-19 14:06:54.104906589 +0200 ++++ b/src/CMakeLists.txt 2015-07-19 14:12:37.982607526 +0200 +@@ -321,7 +321,7 @@ + + # ****************************************************************************** + # Man page +-INSTALL( FILES exiv2.1 DESTINATION man/man1 ) ++INSTALL( FILES exiv2.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 ) + + # That's all Folks! + ## +--- a/CMakeLists.txt 2015-06-15 10:32:21.000000000 -0500 ++++ b/CMakeLists.txt 2015-06-22 08:48:19.486245765 -0500 +@@ -25,7 +25,7 @@ if( POLICY CMP0042 ) + else() + SET(CMAKE_MACOSX_RPATH 1) + endif() +-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") ++#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") + + + SET( PACKAGE_COPYRIGHT "Andreas Huggel" ) +@@ -156,10 +156,10 @@ INCLUDE( config/CMakeChecks.txt ) + + SET( INSTALL_TARGET_STANDARD_ARGS + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) +-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") ++#SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") + + ## + # add sources from XMPSDK directory diff --git a/media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch b/media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch new file mode 100644 index 000000000000..c6d435d68bb8 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch @@ -0,0 +1,22 @@ +Fix exiv2.hpp if built with PNG support disabled (--without-zlib) + +Fixed upstream in >=0.26 + +See also: http://dev.exiv2.org/issues/1103 +Gentoo bug 1: https://bugs.gentoo.org/show_bug.cgi?id=552046 +Gentoo bug 2: https://bugs.gentoo.org/show_bug.cgi?id=535836 + +Index: exiv2.hpp +=================================================================== +--- a/include/exiv2/exiv2.hpp (revision 3887) ++++ b/include/exiv2/exiv2.hpp (revision 3888) +@@ -52,7 +52,9 @@ + #include "mrwimage.hpp" + #include "orfimage.hpp" + #include "pgfimage.hpp" ++#ifdef EXV_HAVE_LIBZ + #include "pngimage.hpp" ++#endif + #include "preview.hpp" + #include "properties.hpp" + #include "psdimage.hpp" diff --git a/media-gfx/exiv2/files/exiv2-0.25-fvisibility-hidden.patch b/media-gfx/exiv2/files/exiv2-0.25-fvisibility-hidden.patch new file mode 100644 index 000000000000..26c5c1d39d74 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.25-fvisibility-hidden.patch @@ -0,0 +1,19 @@ +Index: CMakeLists.txt +=================================================================== +--- a/xmpsdk/CMakeLists.txt (revision 3974) ++++ b/xmpsdk/CMakeLists.txt (revision 3975) +@@ -20,6 +20,14 @@ + ENDIF(NOT MSVC AND NOT CYGWIN AND NOT MSYS) + ENDFOREACH() + ++if(NOT MSVC) ++ # http://stackoverflow.com/questions/10046114/in-cmake-how-can-i-test-if-the-compiler-is-clang ++ if ( NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang") ++ # 1123 - hide xmpsdk symbols ++ add_definitions( -fvisibility=hidden -fvisibility-inlines-hidden ) ++ endif() ++endif() ++ + IF( EXIV2_ENABLE_XMP AND EXIV2_ENABLE_LIBXMP ) + ADD_LIBRARY( xmp STATIC ${XMPSRC} ) + GET_TARGET_PROPERTY( XMPLIB xmp LOCATION ) diff --git a/media-gfx/exiv2/files/exiv2-0.25-hide-symbols.patch b/media-gfx/exiv2/files/exiv2-0.25-hide-symbols.patch new file mode 100644 index 000000000000..7c8613db5e82 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.25-hide-symbols.patch @@ -0,0 +1,97 @@ +Index: a/samples/CMakeLists.txt +=================================================================== +--- a/samples/CMakeLists.txt (revision 3972) ++++ b/samples/CMakeLists.txt (revision 3973) +@@ -52,7 +52,7 @@ + STRING( REPLACE ".cpp" "" target ${entry}) + ADD_EXECUTABLE( ${target} ${target}.cpp ) + ADD_TEST( ${target}_test ${target} ) +- TARGET_LINK_LIBRARIES( ${target} exiv2lib ) ++ TARGET_LINK_LIBRARIES( ${target} PRIVATE exiv2lib ${EXPAT_LIBRARIES}) + #INSTALL( TARGETS ${target} ${INSTALL_TARGET_STANDARD_ARGS} ) + ENDFOREACH(entry ${SAMPLES}) + +Index: a/src/CMakeLists.txt +=================================================================== +--- a/src/CMakeLists.txt (revision 3972) ++++ b/src/CMakeLists.txt (revision 3973) +@@ -240,20 +240,20 @@ + + if ( MSVC ) + source_group("Header Files" FILES ${LIBEXIV2_HDR} ) +- TARGET_LINK_LIBRARIES( exiv2lib ${EXPAT_LIBRARIES} ) ++ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${EXPAT_LIBRARIES} ) + source_group("Header Files" FILES ${LIBCURL_HDR} ) +- TARGET_LINK_LIBRARIES( exiv2lib ${CURL_LIBRARIES} ) ++ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${CURL_LIBRARIES} ) + source_group("Header Files" FILES ${SSH_HDR} ) +- TARGET_LINK_LIBRARIES( exiv2lib ${SSH_LIBRARIES} ) ++ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${SSH_LIBRARIES} ) + else() + if ( NOT MINGW ) +- TARGET_LINK_LIBRARIES( exiv2lib dl ${EXPAT_LIBRARIES} ) +- TARGET_LINK_LIBRARIES( exiv2lib dl ${CURL_LIBRARIES} ) +- TARGET_LINK_LIBRARIES( exiv2lib dl ${SSH_LIBRARIES} ) ++ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE dl ${EXPAT_LIBRARIES} ) ++ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE dl ${CURL_LIBRARIES} ) ++ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE dl ${SSH_LIBRARIES} ) + else() +- TARGET_LINK_LIBRARIES( exiv2lib ${EXPAT_LIBRARIES} ) +- TARGET_LINK_LIBRARIES( exiv2lib ${CURL_LIBRARIES} ) +- TARGET_LINK_LIBRARIES( exiv2lib ${SSH_LIBRARIES} ) ++ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${EXPAT_LIBRARIES} ) ++ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${CURL_LIBRARIES} ) ++ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${SSH_LIBRARIES} ) + endif() + endif() + +@@ -262,33 +262,33 @@ + if ( MSVC ) + LINK_DIRECTORIES(${LIBRARY_OUTPUT_PATH}/$(ConfigurationName)) + endif(MSVC) +- TARGET_LINK_LIBRARIES( exiv2lib xmp ) ++ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE xmp ) + ENDIF() + + IF( EXIV2_ENABLE_PNG ) + IF( ZLIB_FOUND ) + IF( MSVC ) + if ( EXIV2_ENABLE_SHARED ) +- TARGET_LINK_LIBRARIES( exiv2lib optimized ${ZLIB_LIBRARIES} debug ${ZLIB_LIBRARIES}d ) ++ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE optimized ${ZLIB_LIBRARIES}.lib debug ${ZLIB_LIBRARIES}d.lib ) + else() +- TARGET_LINK_LIBRARIES( exiv2lib optimized zlibstatic.lib debug zlibstaticd.lib ) ++ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE optimized zlibstatic.lib debug zlibstaticd.lib ) + endif() + ELSE() +- TARGET_LINK_LIBRARIES( exiv2lib ${ZLIB_LIBRARIES} ) ++ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${ZLIB_LIBRARIES} ) + ENDIF() + ENDIF() + ENDIF() + + IF( EXIV2_ENABLE_NLS ) +- TARGET_LINK_LIBRARIES( exiv2lib ${LIBINTL_LIBRARIES} ) ++ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${LIBINTL_LIBRARIES} ) + ENDIF( EXIV2_ENABLE_NLS ) + + IF( ICONV_FOUND ) +- TARGET_LINK_LIBRARIES( exiv2lib ${ICONV_LIBRARIES} ) ++ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE ${ICONV_LIBRARIES} ) + ENDIF( ICONV_FOUND ) + + IF (CYGWIN OR MINGW) +- TARGET_LINK_LIBRARIES( exiv2lib psapi ) ++ TARGET_LINK_LIBRARIES( exiv2lib PRIVATE psapi ) + ENDIF(CYGWIN OR MINGW) + + +@@ -303,7 +303,7 @@ + # ****************************************************************************** + # connection test application + ADD_EXECUTABLE( conntest ${CONNTEST} ) +-TARGET_LINK_LIBRARIES( conntest exiv2lib ) ++TARGET_LINK_LIBRARIES( conntest PRIVATE exiv2lib ${CURL_LIBRARIES} ${SSH_LIBRARIES}) + + # ****************************************************************************** + # exifprint application diff --git a/media-gfx/exiv2/files/exiv2-0.25-tools-optional.patch b/media-gfx/exiv2/files/exiv2-0.25-tools-optional.patch new file mode 100644 index 000000000000..2bb030a4c4f2 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.25-tools-optional.patch @@ -0,0 +1,27 @@ +--- a/CMakeLists.txt 2015-06-15 17:32:21.000000000 +0200 ++++ b/CMakeLists.txt 2015-10-04 14:37:05.319679836 +0200 +@@ -55,6 +55,7 @@ + OPTION( EXIV2_ENABLE_WEBREADY "Build webready support into library" OFF ) + OPTION( EXIV2_ENABLE_CURL "USE Libcurl for HttpIo" ON ) + OPTION( EXIV2_ENABLE_SSH "USE Libssh for SshIo" ON ) ++OPTION( EXIV2_ENABLE_TOOLS "Build exiv2 executable" ON ) + + IF( MINGW OR UNIX ) + IF ( CMAKE_CXX_COMPILER STREQUAL "g++" OR CMAKE_C_COMPILER STREQUAL "gcc" ) +--- a/src/CMakeLists.txt 2015-06-14 11:12:19.000000000 +0200 ++++ b/src/CMakeLists.txt 2015-10-04 14:33:27.784399402 +0200 +@@ -296,9 +296,11 @@ + + # ****************************************************************************** + # exiv2 application +-ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ) +-TARGET_LINK_LIBRARIES( exiv2 exiv2lib ) +-INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} ) ++IF( EXIV2_ENABLE_TOOLS ) ++ ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ) ++ TARGET_LINK_LIBRARIES( exiv2 exiv2lib ) ++ INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} ) ++ENDIF( EXIV2_ENABLE_TOOLS ) + + # ****************************************************************************** + # connection test application diff --git a/media-gfx/exiv2/files/exiv2-0.26-CVE-2017-9239.patch b/media-gfx/exiv2/files/exiv2-0.26-CVE-2017-9239.patch new file mode 100644 index 000000000000..2a3e20c9fac2 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.26-CVE-2017-9239.patch @@ -0,0 +1,22 @@ +From 2f8681e120d277e418941c4361c83b5028f67fd8 Mon Sep 17 00:00:00 2001 +From: clanmills <robin@clanmills.com> +Date: Sat, 27 May 2017 10:18:17 +0100 +Subject: [PATCH] #1296 Fix submitted. + +--- + src/tiffcomposite.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp +index c6b860d8..0c9b9c4a 100644 +--- a/src/tiffcomposite.cpp ++++ b/src/tiffcomposite.cpp +@@ -1611,6 +1611,8 @@ namespace Exiv2 { + uint32_t TiffImageEntry::doWriteImage(IoWrapper& ioWrapper, + ByteOrder /*byteOrder*/) const + { ++ if ( !pValue() ) throw Error(21); // #1296 ++ + uint32_t len = pValue()->sizeDataArea(); + if (len > 0) { + #ifdef DEBUG diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake1.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake1.patch new file mode 100644 index 000000000000..672017e404b6 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.26-cmake1.patch @@ -0,0 +1,22 @@ +From d5ae1a7502cc3a19f2ca45f5f17f1ee8fc6ad979 Mon Sep 17 00:00:00 2001 +From: Timo Gurr <timo.gurr@gmail.com> +Date: Tue, 30 May 2017 20:25:28 +0200 +Subject: [PATCH] Use CMAKE_INSTALL_LOCALEDIR + +--- + config/CMakeChecks.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt +index 77922930..b3a888f2 100644 +--- a/config/CMakeChecks.txt ++++ b/config/CMakeChecks.txt +@@ -98,7 +98,7 @@ IF( EXIV2_ENABLE_NLS ) + #FIND_PACKAGE(Intl REQUIRED) + #INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) + IF( NOT LOCALEDIR ) +- SET( LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale" ) ++ SET( LOCALEDIR "${CMAKE_INSTALL_LOCALEDIR}" ) + IF( WIN32 ) + STRING( REPLACE "/" "\\\\" LOCALEDIR ${LOCALEDIR} ) + ENDIF( WIN32 ) diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake2.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake2.patch new file mode 100644 index 000000000000..76a194424866 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.26-cmake2.patch @@ -0,0 +1,65 @@ +From 3af0d1a6b2c12b7f62a293d19bdf235db75d6b07 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls <bernd.kuhls@t-online.de> +Date: Sat, 3 Jun 2017 17:18:24 +0200 +Subject: [PATCH] cmake: fix gettext support + +Building exiv2 with uclibc and gettext fails currently as detected +by the buildroot autobuilders: +http://autobuild.buildroot.net/results/def/defcdd3dd57b031c31bb16c0075f079a482bf52d/build-end.log +--- + config/CMakeChecks.txt | 12 ++++++++++-- + src/CMakeLists.txt | 6 +++--- + 2 files changed, 13 insertions(+), 5 deletions(-) + +diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt +index b3a888f2..f7621a92 100644 +--- a/config/CMakeChecks.txt ++++ b/config/CMakeChecks.txt +@@ -95,8 +95,16 @@ ELSE( EXIV2_ENABLE_SHARED ) + ENDIF( EXIV2_ENABLE_SHARED ) + + IF( EXIV2_ENABLE_NLS ) +- #FIND_PACKAGE(Intl REQUIRED) +- #INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) ++ FIND_PACKAGE(Intl) ++ if(Intl_FOUND) ++ INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) ++ find_library(LIBINTL_LIBRARY NAMES intl libintl) ++ if(libintl_FOUND) ++ SET(LIBINTL_LIBRARIES ${LIBINTL_LIBRARY}) ++ else(libintl_FOUND) ++ SET(LIBINTL_LIBRARIES) ++ endif() ++ endif() + IF( NOT LOCALEDIR ) + SET( LOCALEDIR "${CMAKE_INSTALL_LOCALEDIR}" ) + IF( WIN32 ) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index aecd6215..e2904c6f 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -316,13 +316,13 @@ msvc_runtime_configure(${EXIV2_ENABLE_SHARED} ${EXIV2_ENABLE_DYNAMIC_RUNTIME}) + # ****************************************************************************** + # exiv2 application + ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} ) +-TARGET_LINK_LIBRARIES( exiv2 exiv2lib ) ++TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} ) + INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} ) + + # ****************************************************************************** + # connection test application + ADD_EXECUTABLE( conntest ${CONNTEST} ) +-TARGET_LINK_LIBRARIES( conntest ${PRIVATE_VAR} exiv2lib ${CURL_LIBRARIES} ${SSH_LIBRARIES}) ++TARGET_LINK_LIBRARIES( conntest ${PRIVATE_VAR} exiv2lib ${CURL_LIBRARIES} ${SSH_LIBRARIES} ${LIBINTL_LIBRARIES} ) + + # ****************************************************************************** + # exifprint application +@@ -332,7 +332,7 @@ TARGET_LINK_LIBRARIES( conntest ${PRIVATE_VAR} exiv2lib ${CURL_LIBRARIES} ${SSH + # ****************************************************************************** + # remotetest application + ADD_EXECUTABLE( remotetest ${REMOTETEST} ) +-TARGET_LINK_LIBRARIES( remotetest exiv2lib ) ++TARGET_LINK_LIBRARIES( remotetest exiv2lib ${LIBINTL_LIBRARIES} ) + + # ****************************************************************************** + # Headers diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake3.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake3.patch new file mode 100644 index 000000000000..7a78d1c8bd86 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.26-cmake3.patch @@ -0,0 +1,53 @@ +From 8af901ce05aeeaa4f5033da99670091f857d5931 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls <bernd.kuhls@t-online.de> +Date: Sat, 3 Jun 2017 18:25:05 +0200 +Subject: [PATCH] cmake: always depend on threads, not only in the xmp case + +--- + CMakeLists.txt | 1 - + config/CMakeChecks.txt | 2 ++ + src/CMakeLists.txt | 2 ++ + 3 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7034bb67..64604c6f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -120,7 +120,6 @@ IF( EXIV2_ENABLE_XMP ) + IF (NOT MINGW) + set(THREADS_PREFER_PTHREAD_FLAG ON) + ENDIF() +- find_package(Threads REQUIRED) + ENDIF( EXIV2_ENABLE_XMP ) + + INCLUDE( config/CMakeChecks.txt ) +diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt +index f7621a92..0dfe96b7 100644 +--- a/config/CMakeChecks.txt ++++ b/config/CMakeChecks.txt +@@ -51,6 +51,8 @@ INCLUDE_DIRECTORIES( ${CMAKE_INCLUDE_PATH} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_C + LINK_DIRECTORIES( ${CMAKE_LIBRARY_PATH} ) + SET( CMAKE_REQUIRED_INCLUDES ${CMAKE_INCLUDE_PATH} ) + ++find_package(Threads REQUIRED) ++ + IF( EXIV2_ENABLE_PNG ) + FIND_PACKAGE( ZLIB REQUIRED ) + INCLUDE_DIRECTORIES( ${ZLIB_INCLUDE_DIR} ) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e2904c6f..dcfb37e1 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -268,10 +268,12 @@ else() + TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${EXPAT_LIBRARIES} ) + TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${CURL_LIBRARIES} ) + TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${SSH_LIBRARIES} ) ++ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${CMAKE_THREAD_LIBS_INIT} ) + else() + TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${EXPAT_LIBRARIES} ) + TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CURL_LIBRARIES} ) + TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${SSH_LIBRARIES} ) ++ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_THREAD_LIBS_INIT} ) + endif() + endif() + diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake4.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake4.patch new file mode 100644 index 000000000000..3824a5740005 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.26-cmake4.patch @@ -0,0 +1,24 @@ +From 23ac3eeced6a4de0d34ae162ac7784ab9b7e4310 Mon Sep 17 00:00:00 2001 +From: clanmills <robin@clanmills.com> +Date: Sat, 3 Jun 2017 20:58:08 +0100 +Subject: [PATCH] #7 Fix for libintl + +--- + config/CMakeChecks.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt +index 0dfe96b7..8c88aa27 100644 +--- a/config/CMakeChecks.txt ++++ b/config/CMakeChecks.txt +@@ -103,8 +103,8 @@ IF( EXIV2_ENABLE_NLS ) + find_library(LIBINTL_LIBRARY NAMES intl libintl) + if(libintl_FOUND) + SET(LIBINTL_LIBRARIES ${LIBINTL_LIBRARY}) +- else(libintl_FOUND) +- SET(LIBINTL_LIBRARIES) ++ else() ++ SET(LIBINTL_LIBRARIES -lintl) + endif() + endif() + IF( NOT LOCALEDIR ) diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake5.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake5.patch new file mode 100644 index 000000000000..0df4a19689fb --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.26-cmake5.patch @@ -0,0 +1,33 @@ +From 4e86c1d61c4b8ab2cbbb31db0031b8e1d1872231 Mon Sep 17 00:00:00 2001 +From: clanmills <robin@clanmills.com> +Date: Sun, 4 Jun 2017 07:41:03 +0100 +Subject: [PATCH] Fix https://github.com/Exiv2/exiv2/pull/6 for + Linux/Cygwin/MacOSX + +--- + config/CMakeChecks.txt | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt +index 8c88aa27..e6100c0f 100644 +--- a/config/CMakeChecks.txt ++++ b/config/CMakeChecks.txt +@@ -98,13 +98,16 @@ ENDIF( EXIV2_ENABLE_SHARED ) + + IF( EXIV2_ENABLE_NLS ) + FIND_PACKAGE(Intl) +- if(Intl_FOUND) ++ if(Intl_FOUND AND NOT MSVC) + INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) + find_library(LIBINTL_LIBRARY NAMES intl libintl) + if(libintl_FOUND) + SET(LIBINTL_LIBRARIES ${LIBINTL_LIBRARY}) + else() +- SET(LIBINTL_LIBRARIES -lintl) ++ SET(LIBINTL_LIBRARIES) ++ if ( APPLE OR CYGWIN ) ++ SET(LIBINTL_LIBRARIES -lintl) ++ endif() + endif() + endif() + IF( NOT LOCALEDIR ) diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake6.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake6.patch new file mode 100644 index 000000000000..105b5889fea6 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.26-cmake6.patch @@ -0,0 +1,27 @@ +From 88cf58613ffde4c907011bea82f61daae6006c3c Mon Sep 17 00:00:00 2001 +From: clanmills <robin@clanmills.com> +Date: Sun, 4 Jun 2017 09:07:14 +0100 +Subject: [PATCH] #8 Adding INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) + +--- + config/CMakeChecks.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt +index e6100c0f..b90d4fde 100644 +--- a/config/CMakeChecks.txt ++++ b/config/CMakeChecks.txt +@@ -102,11 +102,12 @@ IF( EXIV2_ENABLE_NLS ) + INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) + find_library(LIBINTL_LIBRARY NAMES intl libintl) + if(libintl_FOUND) ++ INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) + SET(LIBINTL_LIBRARIES ${LIBINTL_LIBRARY}) + else() + SET(LIBINTL_LIBRARIES) + if ( APPLE OR CYGWIN ) +- SET(LIBINTL_LIBRARIES -lintl) ++ SET(LIBINTL_LIBRARIES -lintl) + endif() + endif() + endif() diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake7.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake7.patch new file mode 100644 index 000000000000..0eff32a80d57 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.26-cmake7.patch @@ -0,0 +1,38 @@ +From 15e0b9052eacd3438c8b39bf3fdda5da69ec068a Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls <bernd.kuhls@t-online.de> +Date: Sun, 4 Jun 2017 10:13:14 +0200 +Subject: [PATCH] cmake: simplify libintl check + +According to https://cmake.org/cmake/help/v3.4/module/FindIntl.html +the FindIntl module already checks for libintl.so. +--- + config/CMakeChecks.txt | 15 ++++----------- + 1 file changed, 4 insertions(+), 11 deletions(-) + +diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt +index b90d4fde..0cd28ec7 100644 +--- a/config/CMakeChecks.txt ++++ b/config/CMakeChecks.txt +@@ -98,18 +98,11 @@ ENDIF( EXIV2_ENABLE_SHARED ) + + IF( EXIV2_ENABLE_NLS ) + FIND_PACKAGE(Intl) +- if(Intl_FOUND AND NOT MSVC) ++ if(Intl_FOUND) + INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) +- find_library(LIBINTL_LIBRARY NAMES intl libintl) +- if(libintl_FOUND) +- INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) +- SET(LIBINTL_LIBRARIES ${LIBINTL_LIBRARY}) +- else() +- SET(LIBINTL_LIBRARIES) +- if ( APPLE OR CYGWIN ) +- SET(LIBINTL_LIBRARIES -lintl) +- endif() +- endif() ++ SET(LIBINTL_LIBRARIES ${Intl_LIBRARIES}) ++ else() ++ SET(LIBINTL_LIBRARIES) + endif() + IF( NOT LOCALEDIR ) + SET( LOCALEDIR "${CMAKE_INSTALL_LOCALEDIR}" ) diff --git a/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch b/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch new file mode 100644 index 000000000000..a88867173df7 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch @@ -0,0 +1,70 @@ +--- a/CMakeLists.txt 2015-07-19 16:04:35.363628707 +0200 ++++ b/CMakeLists.txt 2015-07-19 16:28:31.051680136 +0200 +@@ -216,9 +216,7 @@ + ADD_SUBDIRECTORY( xmpsdk ) + ADD_SUBDIRECTORY( src ) + +-IF( EXIV2_ENABLE_BUILD_SAMPLES ) +- ADD_SUBDIRECTORY( samples ) +-ENDIF( EXIV2_ENABLE_BUILD_SAMPLES ) ++ADD_SUBDIRECTORY( samples ) + + IF( EXIV2_ENABLE_BUILD_PO ) + ADD_SUBDIRECTORY( po ) +--- a/samples/CMakeLists.txt 2015-07-19 16:04:35.360628744 +0200 ++++ b/samples/CMakeLists.txt 2015-07-19 16:30:46.415987850 +0200 +@@ -21,6 +21,10 @@ + include_directories("${CMAKE_SOURCE_DIR}/include" "${CMAKE_SOURCE_DIR}/src") + +-SET( SAMPLES addmoddel.cpp ++SET( SAMPLES taglist.cpp ) ++ ++IF( EXIV2_ENABLE_BUILD_SAMPLES ) ++ SET( SAMPLES ${SAMPLES} ++ addmoddel.cpp + convert-test.cpp + easyaccess-test.cpp + exifcomment.cpp +@@ -38,7 +42,6 @@ + mmap-test.cpp + prevtest.cpp + stringto-test.cpp +- taglist.cpp + tiff-test.cpp + werror-test.cpp + write-test.cpp +@@ -47,6 +50,7 @@ + xmpparser-test.cpp + xmpsample.cpp + ) ++ENDIF() + + FOREACH(entry ${SAMPLES}) + STRING( REPLACE ".cpp" "" target ${entry}) +@@ -63,6 +67,7 @@ + SET( MC_SRC ${MC_SRC} ../src/getopt_win32.c ) + ENDIF( MSVC ) + ++IF( EXIV2_ENABLE_BUILD_SAMPLES ) + SET( MC_SRC ${MC_SRC} metacopy.cpp ../src/utils.cpp ) + ADD_EXECUTABLE( metacopy ${MC_SRC} ) + TARGET_LINK_LIBRARIES( metacopy exiv2lib ) +@@ -79,6 +84,7 @@ + # ****************************************************************************** + # Man page + INSTALL( FILES exiv2samples.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 ) ++ENDIF() + + # That's all Folks! + ## +--- a/doc/templates/Makefile 2015-07-19 16:50:50.589933604 +0200 ++++ b/doc/templates/Makefile 2015-07-19 16:51:07.686719864 +0200 +@@ -143,7 +143,7 @@ + xmp_mwg-rs \ + xmp_mwg-kw + +-TAGLIST = ../../bin/taglist ++TAGLIST = ../../src/bin/taglist + + # ********************************************************************** + # ====================================================================== diff --git a/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch b/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch new file mode 100644 index 000000000000..045e9dc58f03 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch @@ -0,0 +1,27 @@ +--- a/CMakeLists.txt 2017-06-07 00:14:25.374608170 +0200 ++++ b/CMakeLists.txt 2017-06-07 00:17:00.680483299 +0200 +@@ -60,6 +60,7 @@ + OPTION( EXIV2_ENABLE_SSH "USE Libssh for SshIo" ON ) + SET ( EXIV2_ENABLE_DYNAMIC_RUNTIME OFF ) + ENDIF() ++OPTION( EXIV2_ENABLE_TOOLS "Build exiv2 executable" ON ) + + # set include path for FindXXX.cmake files + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/") +--- a/src/CMakeLists.txt 2017-06-07 00:14:25.368608098 +0200 ++++ b/src/CMakeLists.txt 2017-06-07 00:16:06.710831682 +0200 +@@ -317,9 +317,11 @@ + + # ****************************************************************************** + # exiv2 application +-ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} ) +-TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} ) +-INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} ) ++IF(EXIV2_ENABLE_TOOLS) ++ ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} ) ++ TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} ) ++ INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} ) ++ENDIF( EXIV2_ENABLE_TOOLS ) + + # ****************************************************************************** + # connection test application |