* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/
@ 2015-10-04 14:51 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2015-10-04 14:51 UTC (permalink / raw
To: gentoo-commits
commit: 3e09d75a96b8f864847a96daee2e255bda10f0d2
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Aug 16 11:21:38 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 4 14:21:51 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e09d75a
media-gfx/exiv2: Version bump
Switch to cmake
Add patch based on Fedora to fix multilib
Package-Manager: portage-2.2.20.1
media-gfx/exiv2/Manifest | 1 +
media-gfx/exiv2/exiv2-0.25.ebuild | 124 +++++++++++++++++++++
media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch | 71 ++++++++++++
.../exiv2/files/exiv2-0.25-fix-install-dirs.patch | 64 +++++++++++
.../exiv2/files/exiv2-0.25-tools-optional.patch | 27 +++++
media-gfx/exiv2/metadata.xml | 9 +-
6 files changed, 291 insertions(+), 5 deletions(-)
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index f3ef648..5cd1ff1 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1 +1,2 @@
DIST exiv2-0.24.tar.gz 4635028 SHA256 f4a443e6c7fb9d9f5e787732f76969a64c72c4c04af69b10ed57f949c2dfef8e SHA512 e2d5d076c09a36d88472485c9d9d99b5a50aea1ab59b1e5c9301b1ce9fe2b2af02acae2662c9ff56b4c749a224688387ba58334d31b74f04f3d2d3d3c0e387e9 WHIRLPOOL b5b7eb544975d8e14739b39fc294279b58369944172684c0f881348ebf47ef0f9ccd18e8bc41113d9da3a72f8d6c048641f547a7071a7ca6d93d1d30ea2d7aed
+DIST exiv2-0.25.tar.gz 5434325 SHA256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 SHA512 08d4e655ffdde715e0214f4bef01d55aba9b8ba517456a60e254a0f8541c20479e407545db28ca90a69dee8def6941fdd88f9a557fb382ebebe49e363aca8e8e WHIRLPOOL f9e7a6947dac5870e0574253b8c1cb1e7d31a916a9e1c4417c73168046c0b4bed90b9c77253444604163bcf6dca204dab92a52cb03bdcb0f85c807327623f8ac
diff --git a/media-gfx/exiv2/exiv2-0.25.ebuild b/media-gfx/exiv2/exiv2-0.25.ebuild
new file mode 100644
index 0000000..252166b
--- /dev/null
+++ b/media-gfx/exiv2/exiv2-0.25.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit eutils cmake-multilib python-any-r1
+
+DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
+HOMEPAGE="http://www.exiv2.org/"
+SRC_URI="http://www.exiv2.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/14"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE_LINGUAS="bs de es fi fr gl ms pl pt ru sk sv ug uk vi"
+IUSE="doc examples nls png webready xmp $(printf 'linguas_%s ' ${IUSE_LINGUAS})"
+
+RDEPEND="
+ >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+ png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ webready? (
+ net-libs/libssh[${MULTILIB_USEDEP}]
+ net-misc/curl[${MULTILIB_USEDEP}]
+ )
+ xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+ doc? (
+ app-doc/doxygen
+ dev-libs/libxslt
+ virtual/pkgconfig
+ media-gfx/graphviz
+ ${PYTHON_DEPS}
+ )
+ nls? ( sys-devel/gettext )
+"
+
+DOCS=( README doc/ChangeLog doc/cmd.txt )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.25-fix-docs.patch"
+ "${FILESDIR}/${PN}-0.25-fix-install-dirs.patch"
+ "${FILESDIR}/${PN}-0.25-tools-optional.patch"
+)
+
+pkg_setup() {
+ use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ rm -r msvc* build || die "Failed to remove msvc dirs"
+
+ if [[ ${PV} != *9999 ]] ; then
+ if [[ -d po ]] ; then
+ pushd po > /dev/null || die
+ for lang in *.po; do
+ if ! has ${lang%.po} ${LINGUAS} ; then
+ rm -rf ${lang} || die
+ fi
+ done
+ popd > /dev/null || die
+ else
+ die "Failed to prepare LINGUAS - po directory moved?"
+ fi
+ fi
+
+ # convert docs to UTF-8
+ local i
+ for i in doc/cmd.txt; do
+ einfo "Converting "${i}" to UTF-8"
+ iconv -f LATIN1 -t UTF-8 "${i}" > "${i}.tmp" || die
+ mv -f "${i}.tmp" "${i}" || die
+ done
+
+ if use doc; then
+ einfo "Updating doxygen config"
+ doxygen &>/dev/null -u config/Doxyfile || die
+ fi
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DEXIV2_ENABLE_BUILD_PO=YES
+ -DEXIV2_ENABLE_BUILD_SAMPLES=NO
+ -DEXIV2_ENABLE_CURL=$(usex webready)
+ -DEXIV2_ENABLE_NLS=$(usex nls)
+ -DEXIV2_ENABLE_PNG=$(usex png)
+ -DEXIV2_ENABLE_SSH=$(usex webready)
+ -DEXIV2_ENABLE_WEBREADY=$(usex webready)
+ -DEXIV2_ENABLE_XMP=$(usex xmp)
+ -DEXIV2_ENABLE_LIBXMP=NO
+ $(multilib_is_native_abi || \
+ echo -DEXIV2_ENABLE_TOOLS=NO)
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+
+ if multilib_is_native_abi; then
+ use doc && emake -j1 doc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --all
+
+ use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt}
+ use doc && dodoc -r "${S}"/doc/html
+
+ if use examples; then
+ docinto examples
+ dodoc samples/*.cpp
+ fi
+}
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 0000000..e2bf677
--- /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 0000000..bca79dd
--- /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-tools-optional.patch b/media-gfx/exiv2/files/exiv2-0.25-tools-optional.patch
new file mode 100644
index 0000000..2bb030a
--- /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/metadata.xml b/media-gfx/exiv2/metadata.xml
index 0bb7de6..795480e 100644
--- a/media-gfx/exiv2/metadata.xml
+++ b/media-gfx/exiv2/metadata.xml
@@ -4,12 +4,11 @@
<herd>graphics</herd>
<herd>kde</herd>
<longdescription lang="en">
- Exiv2 is a C++ library and a command line utility to read and
- write EXIF and IPTC image metadata.
+ Exiv2 is a C++ library and command line utility to read and
+ write EXIF, IPTC and XMP image metadata.
</longdescription>
<use>
- <flag name='contrib'>
- Build additional contrib components
- </flag>
+ <flag name='contrib'>Build additional contrib components</flag>
+ <flag name='webready'>Support reading metadata over the internet</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/
@ 2015-10-04 21:07 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2015-10-04 21:07 UTC (permalink / raw
To: gentoo-commits
commit: 51705fa041e00146b4149e757115dbd20f3a161a
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Oct 4 17:45:46 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 4 20:58:37 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51705fa0
media-gfx/exiv2: Fix header if USE=-png
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
Package-Manager: portage-2.2.20.1
.../{exiv2-0.25.ebuild => exiv2-0.25-r1.ebuild} | 1 +
.../exiv2/files/exiv2-0.25-fix-without-zlib.patch | 22 ++++++++++++++++++++++
2 files changed, 23 insertions(+)
diff --git a/media-gfx/exiv2/exiv2-0.25.ebuild b/media-gfx/exiv2/exiv2-0.25-r1.ebuild
similarity index 98%
rename from media-gfx/exiv2/exiv2-0.25.ebuild
rename to media-gfx/exiv2/exiv2-0.25-r1.ebuild
index 252166b..bc2577b 100644
--- a/media-gfx/exiv2/exiv2-0.25.ebuild
+++ b/media-gfx/exiv2/exiv2-0.25-r1.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
"${FILESDIR}/${PN}-0.25-fix-docs.patch"
"${FILESDIR}/${PN}-0.25-fix-install-dirs.patch"
"${FILESDIR}/${PN}-0.25-tools-optional.patch"
+ "${FILESDIR}/${PN}-0.25-fix-without-zlib.patch"
)
pkg_setup() {
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 0000000..c6d435d
--- /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"
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/
@ 2016-01-13 14:47 Michael Palimaka
0 siblings, 0 replies; 16+ messages in thread
From: Michael Palimaka @ 2016-01-13 14:47 UTC (permalink / raw
To: gentoo-commits
commit: 36045f8ebb08d9578f62520bf6d37f26d39bad1d
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Dec 31 11:04:29 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 14:46:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36045f8e
media-gfx/exiv2: Add upstream cmake patches to fix visibility
Prevent random segfaults in applications due to exiv2 leaking symbols.
Package-Manager: portage-2.2.24
media-gfx/exiv2/exiv2-0.25-r2.ebuild | 128 +++++++++++++++++++++
.../files/exiv2-0.25-fvisibility-hidden.patch | 19 +++
.../exiv2/files/exiv2-0.25-hide-symbols.patch | 97 ++++++++++++++++
3 files changed, 244 insertions(+)
diff --git a/media-gfx/exiv2/exiv2-0.25-r2.ebuild b/media-gfx/exiv2/exiv2-0.25-r2.ebuild
new file mode 100644
index 0000000..90f52ed
--- /dev/null
+++ b/media-gfx/exiv2/exiv2-0.25-r2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit eutils cmake-multilib python-any-r1
+
+DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
+HOMEPAGE="http://www.exiv2.org/"
+SRC_URI="http://www.exiv2.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/14"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE_LINGUAS="bs de es fi fr gl ms pl pt ru sk sv ug uk vi"
+IUSE="doc examples nls png webready xmp $(printf 'linguas_%s ' ${IUSE_LINGUAS})"
+
+RDEPEND="
+ >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+ png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ webready? (
+ net-libs/libssh[${MULTILIB_USEDEP}]
+ net-misc/curl[${MULTILIB_USEDEP}]
+ )
+ xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+ doc? (
+ app-doc/doxygen
+ dev-libs/libxslt
+ virtual/pkgconfig
+ media-gfx/graphviz
+ ${PYTHON_DEPS}
+ )
+ nls? ( sys-devel/gettext )
+"
+
+DOCS=( README doc/ChangeLog doc/cmd.txt )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.25-fix-install-dirs.patch"
+ "${FILESDIR}/${PN}-0.25-fix-without-zlib.patch"
+ "${FILESDIR}/${PN}-0.25-hide-symbols.patch"
+ "${FILESDIR}/${PN}-0.25-fvisibility-hidden.patch"
+ # TODO: Take to upstream
+ "${FILESDIR}/${PN}-0.25-fix-docs.patch"
+ "${FILESDIR}/${PN}-0.25-tools-optional.patch"
+)
+
+pkg_setup() {
+ use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ rm -r msvc* build || die "Failed to remove msvc dirs"
+
+ if [[ ${PV} != *9999 ]] ; then
+ if [[ -d po ]] ; then
+ pushd po > /dev/null || die
+ for lang in *.po; do
+ if ! has ${lang%.po} ${LINGUAS} ; then
+ rm -rf ${lang} || die
+ fi
+ done
+ popd > /dev/null || die
+ else
+ die "Failed to prepare LINGUAS - po directory moved?"
+ fi
+ fi
+
+ # convert docs to UTF-8
+ local i
+ for i in doc/cmd.txt; do
+ einfo "Converting "${i}" to UTF-8"
+ iconv -f LATIN1 -t UTF-8 "${i}" > "${i}.tmp" || die
+ mv -f "${i}.tmp" "${i}" || die
+ done
+
+ if use doc; then
+ einfo "Updating doxygen config"
+ doxygen &>/dev/null -u config/Doxyfile || die
+ fi
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DEXIV2_ENABLE_BUILD_PO=YES
+ -DEXIV2_ENABLE_BUILD_SAMPLES=NO
+ -DEXIV2_ENABLE_CURL=$(usex webready)
+ -DEXIV2_ENABLE_NLS=$(usex nls)
+ -DEXIV2_ENABLE_PNG=$(usex png)
+ -DEXIV2_ENABLE_SSH=$(usex webready)
+ -DEXIV2_ENABLE_WEBREADY=$(usex webready)
+ -DEXIV2_ENABLE_XMP=$(usex xmp)
+ -DEXIV2_ENABLE_LIBXMP=NO
+ $(multilib_is_native_abi || \
+ echo -DEXIV2_ENABLE_TOOLS=NO)
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+
+ if multilib_is_native_abi; then
+ use doc && emake -j1 doc
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --all
+
+ use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt}
+ use doc && dodoc -r "${S}"/doc/html
+
+ if use examples; then
+ docinto examples
+ dodoc samples/*.cpp
+ fi
+}
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 0000000..26c5c1d
--- /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 0000000..7c8613d
--- /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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/
@ 2017-06-07 6:10 Andreas Sturmlechner
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2017-06-07 6:10 UTC (permalink / raw
To: gentoo-commits
commit: 30f7dfcd4f9710d6f01ec079cb9ed71424347e5b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 6 21:46:40 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 7 06:09:51 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30f7dfcd
media-gfx/exiv2: 0.26 version bump
Gentoo-bug: 621028
Package-Manager: Portage-2.3.5, Repoman-2.3.1
media-gfx/exiv2/Manifest | 1 +
media-gfx/exiv2/exiv2-0.26.ebuild | 133 +++++++++++++++++++++
.../exiv2/files/exiv2-0.26-CVE-2017-9239.patch | 22 ++++
media-gfx/exiv2/files/exiv2-0.26-cmake1.patch | 22 ++++
media-gfx/exiv2/files/exiv2-0.26-cmake2.patch | 65 ++++++++++
media-gfx/exiv2/files/exiv2-0.26-cmake3.patch | 53 ++++++++
media-gfx/exiv2/files/exiv2-0.26-cmake4.patch | 24 ++++
media-gfx/exiv2/files/exiv2-0.26-cmake5.patch | 33 +++++
media-gfx/exiv2/files/exiv2-0.26-cmake6.patch | 27 +++++
media-gfx/exiv2/files/exiv2-0.26-cmake7.patch | 38 ++++++
media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch | 70 +++++++++++
.../exiv2/files/exiv2-0.26-tools-optional.patch | 27 +++++
12 files changed, 515 insertions(+)
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 8fdb578e3db..d21df6ad91f 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1 +1,2 @@
DIST exiv2-0.25.tar.gz 5434325 SHA256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 SHA512 08d4e655ffdde715e0214f4bef01d55aba9b8ba517456a60e254a0f8541c20479e407545db28ca90a69dee8def6941fdd88f9a557fb382ebebe49e363aca8e8e WHIRLPOOL f9e7a6947dac5870e0574253b8c1cb1e7d31a916a9e1c4417c73168046c0b4bed90b9c77253444604163bcf6dca204dab92a52cb03bdcb0f85c807327623f8ac
+DIST exiv2-0.26-trunk.tar.gz 5699163 SHA256 0c625cbeb494aa1b9221280a5b053b54d0c9720d48fa9120cef7c6f93efd4dc3 SHA512 d9f354f8458d7803140b442b2a8de3c8904b1e20916cf62d7176f51524e6ff7def26d3b6fa016abc49f8140295eea624151c54dbae0676a61529c2cf33335b0c WHIRLPOOL 0d36063ee659d0a798957e9a2478337f5e8061b467df8fb86b194830ac6ec751a75e1492ad7cbf4ed31c836b9c320f037af3708920b28b07c8970840e255d711
diff --git a/media-gfx/exiv2/exiv2-0.26.ebuild b/media-gfx/exiv2/exiv2-0.26.ebuild
new file mode 100644
index 00000000000..2b8fd2b3b26
--- /dev/null
+++ b/media-gfx/exiv2/exiv2-0.26.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
+HOMEPAGE="http://www.exiv2.org/"
+SRC_URI="http://www.exiv2.org/builds/${P}-trunk.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/26"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE_LINGUAS="bs de es fi fr gl ms pl pt ru sk sv ug uk vi"
+IUSE="doc examples nls png webready xmp $(printf 'linguas_%s ' ${IUSE_LINGUAS})"
+
+RDEPEND="
+ >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+ png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ webready? (
+ net-libs/libssh[${MULTILIB_USEDEP}]
+ net-misc/curl[${MULTILIB_USEDEP}]
+ )
+ xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+ doc? (
+ app-doc/doxygen
+ dev-libs/libxslt
+ media-gfx/graphviz
+ virtual/pkgconfig
+ ${PYTHON_DEPS}
+ )
+ nls? ( sys-devel/gettext )
+"
+
+DOCS=( README doc/ChangeLog doc/cmd.txt )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-cmake{1,2,3,4,5,6,7}.patch
+ "${FILESDIR}"/${P}-CVE-2017-9239.patch
+ # TODO: Take to upstream
+ "${FILESDIR}"/${P}-fix-docs.patch
+ "${FILESDIR}"/${P}-tools-optional.patch
+)
+
+pkg_setup() {
+ use doc && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+ # FIXME @upstream: MacOS cruft is breaking the buildsystem, so don't let it in...
+ tar -C "${WORKDIR}" --exclude=.* -xpf "${DISTDIR}/${A}" --gz 2> /dev/null ||
+ elog "${my_tar}: tar extract command failed at least partially - continuing"
+ mv "${PN}-trunk" "${S}" || die "Failed to create source dir ${S}"
+}
+
+src_prepare() {
+ if [[ ${PV} != *9999 ]] ; then
+ if [[ -d po ]] ; then
+ pushd po > /dev/null || die
+ local lang
+ for lang in *.po; do
+ if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
+ case ${lang} in
+ CMakeLists.txt | \
+ ${PN}.pot) ;;
+ *) rm -r ${lang} || die ;;
+ esac
+ fi
+ done
+ popd > /dev/null || die
+ else
+ die "Failed to prepare LINGUAS - po directory moved?"
+ fi
+ fi
+
+ # FIXME @upstream:
+ einfo "Converting doc/cmd.txt to UTF-8"
+ iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
+ mv -f doc/cmd.txt.tmp doc/cmd.txt || die
+
+ if use doc; then
+ einfo "Updating doxygen config"
+ doxygen &>/dev/null -u config/Doxyfile || die
+ fi
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DEXIV2_ENABLE_BUILD_PO=YES
+ -DEXIV2_ENABLE_BUILD_SAMPLES=NO
+ -DEXIV2_ENABLE_NLS=$(usex nls)
+ -DEXIV2_ENABLE_PNG=$(usex png)
+ -DEXIV2_ENABLE_CURL=$(usex webready)
+ -DEXIV2_ENABLE_SSH=$(usex webready)
+ -DEXIV2_ENABLE_WEBREADY=$(usex webready)
+ -DEXIV2_ENABLE_XMP=$(usex xmp)
+ -DEXIV2_ENABLE_LIBXMP=NO
+ $(multilib_is_native_abi || \
+ echo -DEXIV2_ENABLE_TOOLS=NO)
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+
+ if multilib_is_native_abi; then
+ use doc && emake -j1 doc
+ fi
+}
+
+multilib_src_install_all() {
+ use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
+ use doc && HTML_DOCS=( "${S}"/doc/html/. )
+
+ einstalldocs
+ find "${D}" -name '*.la' -delete || die
+
+ if use examples; then
+ docinto -r examples
+ dodoc samples/*.cpp
+ fi
+}
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 00000000000..2a3e20c9fac
--- /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 00000000000..672017e404b
--- /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 00000000000..76a19442486
--- /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 00000000000..7a78d1c8bd8
--- /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 00000000000..3824a574000
--- /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 00000000000..0df4a19689f
--- /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 00000000000..105b5889fea
--- /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 00000000000..0eff32a80d5
--- /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 00000000000..a88867173df
--- /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 00000000000..045e9dc58f0
--- /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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/
@ 2017-10-15 7:46 Andreas Sturmlechner
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2017-10-15 7:46 UTC (permalink / raw
To: gentoo-commits
commit: a9ff0ac0ad160dc9244ead00171f4502a8f869bf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 15 07:45:55 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 07:45:55 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9ff0ac0
media-gfx/exiv2: Disable broken ccache usage
Reported-by: Michał Górny <mgorny <AT> gentoo.org>
Gentoo-bug: 634302
Package-Manager: Portage-2.3.11, Repoman-2.3.3
media-gfx/exiv2/exiv2-0.26_p20171013.ebuild | 8 ++-
.../exiv2/files/exiv2-0.26_p20171013-ccache.patch | 62 ++++++++++++++++++++++
2 files changed, 68 insertions(+), 2 deletions(-)
diff --git a/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild b/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild
index 9aa6302ffd0..edc5b163138 100644
--- a/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild
+++ b/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild
@@ -41,7 +41,10 @@ DEPEND="${RDEPEND}
DOCS=( README.md doc/ChangeLog doc/cmd.txt )
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-ccache.patch" # bug 634302
+)
pkg_setup() {
use doc && python-any-r1_pkg_setup
@@ -82,7 +85,8 @@ src_prepare() {
multilib_src_configure() {
local mycmakeargs=(
- -DEXIV2_BUILD_SAMPLES=NO
+ -DBUILD_WITH_CCACHE=OFF
+ -DEXIV2_BUILD_SAMPLES=OFF
-DEXIV2_BUILD_PO=$(usex nls)
-DEXIV2_ENABLE_NLS=$(usex nls)
-DEXIV2_ENABLE_PNG=$(usex png)
diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20171013-ccache.patch b/media-gfx/exiv2/files/exiv2-0.26_p20171013-ccache.patch
new file mode 100644
index 00000000000..ece62cedce9
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.26_p20171013-ccache.patch
@@ -0,0 +1,62 @@
+From 9686aa8857bcd992ee4f23d20e80dfc31679f67a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 15 Oct 2017 09:28:09 +0200
+Subject: [PATCH] Add build switch to disable auto ccache
+
+Current usage of ccache leads to sandbox issues.
+Be able to switch it off for package managers that already can
+make use of ccache for build.
+---
+ CMakeLists.txt | 1 +
+ config/findDependencies.cmake | 12 +++++++-----
+ config/printSummary.cmake | 1 +
+ 3 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 80fa907c..a60d4b2e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,6 +41,7 @@ option( EXIV2_ENABLE_SSH "USE Libssh for SshIo"
+ option( EXIV2_BUILD_SAMPLES "Build sample applications" ON )
+ option( EXIV2_BUILD_PO "Build translations files" OFF )
+ option( EXIV2_BUILD_EXIV2_COMMAND "Build exiv2 command-line executable" ON )
++option( BUILD_WITH_CCACHE "Use ccache to speed up compile time" ON )
+
+ if ( EXIV2_ENABLE_WEBREADY )
+ set ( EXIV2_ENABLE_CURL ON )
+diff --git a/config/findDependencies.cmake b/config/findDependencies.cmake
+index 16967763..d6af9488 100644
+--- a/config/findDependencies.cmake
++++ b/config/findDependencies.cmake
+@@ -58,9 +58,11 @@ if( EXIV2_ENABLE_BUILD_PO )
+ endif()
+ endif()
+
+-find_program(CCACHE_FOUND ccache)
+-if(CCACHE_FOUND)
+- message(STATUS "Program ccache found")
+- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+- set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
++if( BUILD_WITH_CCACHE )
++ find_program(CCACHE_FOUND ccache)
++ if(CCACHE_FOUND)
++ message(STATUS "Program ccache found")
++ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
++ set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
++ endif()
+ endif()
+diff --git a/config/printSummary.cmake b/config/printSummary.cmake
+index 21e444a4..62ba4e98 100644
+--- a/config/printSummary.cmake
++++ b/config/printSummary.cmake
+@@ -40,6 +40,7 @@ endif()
+ OptionOutput( "Building exiv2 command: " EXIV2_BUILD_EXIV2_COMMAND )
+ OptionOutput( "Building samples: " EXIV2_BUILD_SAMPLES )
+ OptionOutput( "Building PO files: " EXIV2_BUILD_PO )
++OptionOutput( "Using ccache: " BUILD_WITH_CCACHE )
+
+
+ message( STATUS "------------------------------------------------------------------" )
+--
+2.14.2
+
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/
@ 2017-10-18 0:35 Andreas Sturmlechner
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2017-10-18 0:35 UTC (permalink / raw
To: gentoo-commits
commit: 81778186e30816cb54047015642b12e791f979ce
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 18 00:27:14 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 00:28:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81778186
media-gfx/exiv2: Drop old snapshot
It was based on master when it was not clear there was going
to be a stable branch.
Package-Manager: Portage-2.3.11, Repoman-2.3.3
media-gfx/exiv2/Manifest | 1 -
media-gfx/exiv2/exiv2-0.26_p20171013.ebuild | 122 ---------------------
.../exiv2/files/exiv2-0.26_p20171013-ccache.patch | 62 -----------
.../exiv2/files/exiv2-0.26_p20171013-cmake.patch | 47 --------
4 files changed, 232 deletions(-)
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 4c27da12d82..db32671e88e 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,3 +1,2 @@
DIST exiv2-0.25.tar.gz 5434325 SHA256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 SHA512 08d4e655ffdde715e0214f4bef01d55aba9b8ba517456a60e254a0f8541c20479e407545db28ca90a69dee8def6941fdd88f9a557fb382ebebe49e363aca8e8e WHIRLPOOL f9e7a6947dac5870e0574253b8c1cb1e7d31a916a9e1c4417c73168046c0b4bed90b9c77253444604163bcf6dca204dab92a52cb03bdcb0f85c807327623f8ac
-DIST exiv2-0.26_p20171013.tar.gz 25801252 SHA256 137178f0dfc2734b174ba71b8b18d5852fcd5c6f7835eeb1b58f42b93eed7317 SHA512 4e8b10b8593a80615f5deb9fed3420f118338f1161b99c0b86456686fe8d511bb5df956ee25ed5edf990b34bab9efda64be5c80f6efbd78e6e497cb85e2a3ad5 WHIRLPOOL e32b9d98fa5be77bbf50bf275a95db8e9d15b0d40d762bdf512cb8d02f009fc452921df194121cd32d9780de1c83afd0da5cd75ef653a9ba1459f18884f71ffe
DIST exiv2-0.26_p20171018.tar.gz 28370645 SHA256 7dea665ff7e58a7a858b1aa624d75f27f8b8b154cce645ef970344982c9de449 SHA512 fb4c867a5879ab46f31a1a8a7f8d24395620d6ff2a1088bc9d8d589ca110fad063e19266f4e2b75ad7bebc5b87141ed95db8e214220670a4d11092dfe654558c WHIRLPOOL b2c5060fbbb177479ffd8fbf68957d2329c0383da673b3555f602e574ee90672f55dd6105dcb25e47c9efde97dd4721d05596b22ab9f954bf9e502ffac0ee45c
diff --git a/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild b/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild
deleted file mode 100644
index edc5b163138..00000000000
--- a/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=269370863ecd61dd038eed3b96ecd65898d3bb6e
-LINGUAS="bs de es fi fr gl ms pl pt ru sk sv ug uk vi"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit cmake-multilib python-any-r1 vcs-snapshot
-
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="http://www.exiv2.org/"
-SRC_URI="https://github.com/Exiv2/${PN}/tarball/${COMMIT} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="doc examples nls png webready xmp $(printf 'linguas_%s ' ${LINGUAS})"
-
-RDEPEND="
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
- png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- webready? (
- net-libs/libssh[${MULTILIB_USEDEP}]
- net-misc/curl[${MULTILIB_USEDEP}]
- )
- xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
- doc? (
- ${PYTHON_DEPS}
- app-doc/doxygen
- dev-libs/libxslt
- media-gfx/graphviz
- virtual/pkgconfig
- )
- nls? ( sys-devel/gettext )
-"
-
-DOCS=( README.md doc/ChangeLog doc/cmd.txt )
-
-PATCHES=(
- "${FILESDIR}/${P}-cmake.patch"
- "${FILESDIR}/${P}-ccache.patch" # bug 634302
-)
-
-pkg_setup() {
- use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- if [[ ${PV} != *9999 ]] ; then
- if [[ -d po ]] ; then
- pushd po > /dev/null || die
- local lang
- for lang in *.po; do
- if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
- case ${lang} in
- CMakeLists.txt | \
- ${PN}.pot) ;;
- *) rm -r ${lang} || die ;;
- esac
- fi
- done
- popd > /dev/null || die
- else
- die "Failed to prepare LINGUAS - po directory moved?"
- fi
- fi
-
- # FIXME @upstream:
- einfo "Converting doc/cmd.txt to UTF-8"
- iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
- mv -f doc/cmd.txt.tmp doc/cmd.txt || die
-
- if use doc; then
- einfo "Updating doxygen config"
- doxygen &>/dev/null -u config/Doxyfile || die
- fi
-
- cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_WITH_CCACHE=OFF
- -DEXIV2_BUILD_SAMPLES=OFF
- -DEXIV2_BUILD_PO=$(usex nls)
- -DEXIV2_ENABLE_NLS=$(usex nls)
- -DEXIV2_ENABLE_PNG=$(usex png)
- -DEXIV2_ENABLE_CURL=$(usex webready)
- -DEXIV2_ENABLE_SSH=$(usex webready)
- -DEXIV2_ENABLE_WEBREADY=$(usex webready)
- -DEXIV2_ENABLE_XMP=$(usex xmp)
- $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
- )
-
- cmake-utils_src_configure
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
-
- if multilib_is_native_abi; then
- use doc && emake -j1 doc
- fi
-}
-
-multilib_src_install_all() {
- use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
- use doc && HTML_DOCS=( "${S}"/doc/html/. )
-
- einstalldocs
- find "${D}" -name '*.la' -delete || die
-
- if use examples; then
- docinto examples
- dodoc samples/*.cpp
- fi
-}
diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20171013-ccache.patch b/media-gfx/exiv2/files/exiv2-0.26_p20171013-ccache.patch
deleted file mode 100644
index ece62cedce9..00000000000
--- a/media-gfx/exiv2/files/exiv2-0.26_p20171013-ccache.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 9686aa8857bcd992ee4f23d20e80dfc31679f67a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 15 Oct 2017 09:28:09 +0200
-Subject: [PATCH] Add build switch to disable auto ccache
-
-Current usage of ccache leads to sandbox issues.
-Be able to switch it off for package managers that already can
-make use of ccache for build.
----
- CMakeLists.txt | 1 +
- config/findDependencies.cmake | 12 +++++++-----
- config/printSummary.cmake | 1 +
- 3 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 80fa907c..a60d4b2e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -41,6 +41,7 @@ option( EXIV2_ENABLE_SSH "USE Libssh for SshIo"
- option( EXIV2_BUILD_SAMPLES "Build sample applications" ON )
- option( EXIV2_BUILD_PO "Build translations files" OFF )
- option( EXIV2_BUILD_EXIV2_COMMAND "Build exiv2 command-line executable" ON )
-+option( BUILD_WITH_CCACHE "Use ccache to speed up compile time" ON )
-
- if ( EXIV2_ENABLE_WEBREADY )
- set ( EXIV2_ENABLE_CURL ON )
-diff --git a/config/findDependencies.cmake b/config/findDependencies.cmake
-index 16967763..d6af9488 100644
---- a/config/findDependencies.cmake
-+++ b/config/findDependencies.cmake
-@@ -58,9 +58,11 @@ if( EXIV2_ENABLE_BUILD_PO )
- endif()
- endif()
-
--find_program(CCACHE_FOUND ccache)
--if(CCACHE_FOUND)
-- message(STATUS "Program ccache found")
-- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-- set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-+if( BUILD_WITH_CCACHE )
-+ find_program(CCACHE_FOUND ccache)
-+ if(CCACHE_FOUND)
-+ message(STATUS "Program ccache found")
-+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-+ set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-+ endif()
- endif()
-diff --git a/config/printSummary.cmake b/config/printSummary.cmake
-index 21e444a4..62ba4e98 100644
---- a/config/printSummary.cmake
-+++ b/config/printSummary.cmake
-@@ -40,6 +40,7 @@ endif()
- OptionOutput( "Building exiv2 command: " EXIV2_BUILD_EXIV2_COMMAND )
- OptionOutput( "Building samples: " EXIV2_BUILD_SAMPLES )
- OptionOutput( "Building PO files: " EXIV2_BUILD_PO )
-+OptionOutput( "Using ccache: " BUILD_WITH_CCACHE )
-
-
- message( STATUS "------------------------------------------------------------------" )
---
-2.14.2
-
diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch b/media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch
deleted file mode 100644
index c10f125415b..00000000000
--- a/media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 57883ee664260f5a1b382575e7477ad34c86ce7d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Fri, 13 Oct 2017 18:54:11 +0200
-Subject: [PATCH] Fix build with EXIV2_BUILD_EXIV2_COMMAND=OFF
-
----
- src/CMakeLists.txt | 17 ++++++++++++-----
- 1 file changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index fe49a0a6..f75cbf1b 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -291,21 +291,28 @@ if(EXIV2_BUILD_EXIV2_COMMAND)
- if ( BUILD_SHARED_LIBS )
- target_compile_definitions(exiv2 PRIVATE EXV_HAVE_DLL )
- endif()
-+ # modify source lists to suit environment
-+
-+ # TODO This should not be needed here! we need to fix the previous TODO
-+ target_include_directories(exiv2 PRIVATE ${CMAKE_SOURCE_DIR}/include/)
-+
-+ if(NOT EXV_HAVE_TIMEGM )
-+ target_sources(exiv2 PRIVATE localtime.c)
-+ endif()
-+
-+ if (MSVC)
-+ target_sources(exiv2 PRIVATE getopt_win32.c)
-+ endif()
- install(TARGETS exiv2 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
-
--# TODO This should not be needed here! we need to fix the previous TODO
--target_include_directories(exiv2 PRIVATE ${CMAKE_SOURCE_DIR}/include/)
--
- # modify source lists to suit environment
- if(NOT EXV_HAVE_TIMEGM )
- target_sources(exiv2lib PRIVATE localtime.c)
-- target_sources(exiv2 PRIVATE localtime.c)
- endif()
-
- if (MSVC)
- target_sources(exiv2lib PRIVATE getopt_win32.c)
-- target_sources(exiv2 PRIVATE getopt_win32.c)
- endif()
-
- # ******************************************************************************
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/
@ 2017-11-19 15:23 Andreas Sturmlechner
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2017-11-19 15:23 UTC (permalink / raw
To: gentoo-commits
commit: cdb23e8b3608be50daebdeb5d904b179a58d8339
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 15:23:00 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 15:23:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb23e8b
media-gfx/exiv2: Security cleanup
Bug: https://bugs.gentoo.org/621028
Package-Manager: Portage-2.3.14, Repoman-2.3.6
media-gfx/exiv2/Manifest | 1 -
media-gfx/exiv2/exiv2-0.25-r2.ebuild | 127 ---------------------
media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch | 71 ------------
.../exiv2/files/exiv2-0.25-fix-install-dirs.patch | 64 -----------
.../exiv2/files/exiv2-0.25-fix-without-zlib.patch | 22 ----
.../files/exiv2-0.25-fvisibility-hidden.patch | 19 ---
.../exiv2/files/exiv2-0.25-hide-symbols.patch | 97 ----------------
.../exiv2/files/exiv2-0.25-tools-optional.patch | 27 -----
8 files changed, 428 deletions(-)
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index f37e0231887..44859a8fee7 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,2 +1 @@
-DIST exiv2-0.25.tar.gz 5434325 SHA256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 SHA512 08d4e655ffdde715e0214f4bef01d55aba9b8ba517456a60e254a0f8541c20479e407545db28ca90a69dee8def6941fdd88f9a557fb382ebebe49e363aca8e8e WHIRLPOOL f9e7a6947dac5870e0574253b8c1cb1e7d31a916a9e1c4417c73168046c0b4bed90b9c77253444604163bcf6dca204dab92a52cb03bdcb0f85c807327623f8ac
DIST exiv2-0.26_p20171104.tar.gz 28368697 SHA256 f7a46c0b1d3d3c30518202e62dbe086029f584a064bbb531a0ab11270a454007 SHA512 6f6a884d7978e54dceb9ce45248cd0425ff469887c85ef52b0e38cb755970f69fce96b4b5317c8e8070b833f72ca214696042aac71292a6f9c3440f6a369d474 WHIRLPOOL 7baf5fcde327b2e1decde48f44b616f98fab7c65d22ee5e94e0b356fad4d7950c116db17a94b3c91954ac1565c3fe2853b83262c0a4597744dea708b304dce09
diff --git a/media-gfx/exiv2/exiv2-0.25-r2.ebuild b/media-gfx/exiv2/exiv2-0.25-r2.ebuild
deleted file mode 100644
index 5f2ca76c7da..00000000000
--- a/media-gfx/exiv2/exiv2-0.25-r2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit eutils cmake-multilib python-any-r1
-
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="http://www.exiv2.org/"
-SRC_URI="http://www.exiv2.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/14"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE_LINGUAS="bs de es fi fr gl ms pl pt ru sk sv ug uk vi"
-IUSE="doc examples nls png webready xmp $(printf 'linguas_%s ' ${IUSE_LINGUAS})"
-
-RDEPEND="
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
- png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- webready? (
- net-libs/libssh[${MULTILIB_USEDEP}]
- net-misc/curl[${MULTILIB_USEDEP}]
- )
- xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
- doc? (
- app-doc/doxygen
- dev-libs/libxslt
- virtual/pkgconfig
- media-gfx/graphviz
- ${PYTHON_DEPS}
- )
- nls? ( sys-devel/gettext )
-"
-
-DOCS=( README doc/ChangeLog doc/cmd.txt )
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.25-fix-install-dirs.patch"
- "${FILESDIR}/${PN}-0.25-fix-without-zlib.patch"
- "${FILESDIR}/${PN}-0.25-hide-symbols.patch"
- "${FILESDIR}/${PN}-0.25-fvisibility-hidden.patch"
- # TODO: Take to upstream
- "${FILESDIR}/${PN}-0.25-fix-docs.patch"
- "${FILESDIR}/${PN}-0.25-tools-optional.patch"
-)
-
-pkg_setup() {
- use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- rm -r msvc* build || die "Failed to remove msvc dirs"
-
- if [[ ${PV} != *9999 ]] ; then
- if [[ -d po ]] ; then
- pushd po > /dev/null || die
- for lang in *.po; do
- if ! has ${lang%.po} ${LINGUAS} ; then
- rm -rf ${lang} || die
- fi
- done
- popd > /dev/null || die
- else
- die "Failed to prepare LINGUAS - po directory moved?"
- fi
- fi
-
- # convert docs to UTF-8
- local i
- for i in doc/cmd.txt; do
- einfo "Converting "${i}" to UTF-8"
- iconv -f LATIN1 -t UTF-8 "${i}" > "${i}.tmp" || die
- mv -f "${i}.tmp" "${i}" || die
- done
-
- if use doc; then
- einfo "Updating doxygen config"
- doxygen &>/dev/null -u config/Doxyfile || die
- fi
-
- cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DEXIV2_ENABLE_BUILD_PO=YES
- -DEXIV2_ENABLE_BUILD_SAMPLES=NO
- -DEXIV2_ENABLE_CURL=$(usex webready)
- -DEXIV2_ENABLE_NLS=$(usex nls)
- -DEXIV2_ENABLE_PNG=$(usex png)
- -DEXIV2_ENABLE_SSH=$(usex webready)
- -DEXIV2_ENABLE_WEBREADY=$(usex webready)
- -DEXIV2_ENABLE_XMP=$(usex xmp)
- -DEXIV2_ENABLE_LIBXMP=NO
- $(multilib_is_native_abi || \
- echo -DEXIV2_ENABLE_TOOLS=NO)
- )
-
- cmake-utils_src_configure
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
-
- if multilib_is_native_abi; then
- use doc && emake -j1 doc
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files --all
-
- use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt}
- use doc && dodoc -r "${S}"/doc/html
-
- if use examples; then
- docinto examples
- dodoc samples/*.cpp
- fi
-}
diff --git a/media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch b/media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch
deleted file mode 100644
index e2bf677b512..00000000000
--- a/media-gfx/exiv2/files/exiv2-0.25-fix-docs.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- 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
deleted file mode 100644
index bca79dd4d47..00000000000
--- a/media-gfx/exiv2/files/exiv2-0.25-fix-install-dirs.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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
deleted file mode 100644
index c6d435d68bb..00000000000
--- a/media-gfx/exiv2/files/exiv2-0.25-fix-without-zlib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index 26c5c1d39d7..00000000000
--- a/media-gfx/exiv2/files/exiv2-0.25-fvisibility-hidden.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 7c8613db5e8..00000000000
--- a/media-gfx/exiv2/files/exiv2-0.25-hide-symbols.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-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
deleted file mode 100644
index 2bb030a4c4f..00000000000
--- a/media-gfx/exiv2/files/exiv2-0.25-tools-optional.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/
@ 2018-08-07 7:06 Andreas Sturmlechner
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2018-08-07 7:06 UTC (permalink / raw
To: gentoo-commits
commit: 62dd0d84ce139e725fb8890b85fc1cfbff2e0c4e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 7 00:08:53 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 7 07:05:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62dd0d84
media-gfx/exiv2: Fix build with clang
Reported-by: David Carlos Manuelda <StormByte <AT> gmail.com>
Closes: https://bugs.gentoo.org/662934
Package-Manager: Portage-2.3.44, Repoman-2.3.10
media-gfx/exiv2/exiv2-0.26_p20180319.ebuild | 3 +-
.../files/exiv2-0.26_p20180319-clang-fix.patch | 47 ++++++++++++++++++++++
2 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
index 478ea7a79b1..eb2572dfcf3 100644
--- a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
+++ b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild
@@ -48,9 +48,10 @@ DOCS=( README doc/ChangeLog doc/cmd.txt )
S="${WORKDIR}/${PN^}-${PN}-${COMMIT:0:7}"
PATCHES=(
- # master, pending backports for 0.26
+ # 0.26 branch
"${FILESDIR}"/${P}-CVE-2018-4868.patch
"${FILESDIR}"/${P}-CVE-2017-18005.patch
+ "${FILESDIR}"/${P}-clang-fix.patch
# TODO: Take to upstream
"${FILESDIR}"/${PN}-0.26-fix-docs.patch
"${FILESDIR}"/${PN}-0.26-tools-optional.patch
diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch b/media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch
new file mode 100644
index 00000000000..a80543a5ecd
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch
@@ -0,0 +1,47 @@
+From 176ba44cc31064183fdfbce55a7dd7e6b5e2a962 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dan.cermak@cgc-instruments.com>
+Date: Fri, 8 Jun 2018 23:46:04 +0200
+Subject: [PATCH] Fix C & C++ flag adding in CMakeLists.txt
+
+---
+ CMakeLists.txt | 22 ++++++++++++----------
+ 1 file changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2e179bf5..98a172ed 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -74,21 +74,23 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/")
+
+ if( MINGW OR UNIX )
+ if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
+- ADD_DEFINITIONS(-Wall
+- -Wcast-align
+- -Wpointer-arith
+- -Wformat-security
+- -Wmissing-format-attribute
+- -Woverloaded-virtual
+- -W
+- )
++ string(CONCAT WARNING_FLAGS " -Wall"
++ " -Wcast-align"
++ " -Wpointer-arith"
++ " -Wformat-security"
++ " -Wmissing-format-attribute"
++ " -Woverloaded-virtual"
++ " -W"
++ )
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}")
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}")
+ ENDIF()
+
+ message(STATUS "Compiler info: ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) ; version: ${CMAKE_CXX_COMPILER_VERSION}")
+ IF ( CYGWIN OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0))
+- ADD_DEFINITIONS( -std=gnu++98 ) # to support snprintf
++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98" ) # to support snprintf
+ ELSE()
+- ADD_DEFINITIONS( -std=c++98 )
++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98" )
+ ENDIF()
+
+ ENDIF( MINGW OR UNIX )
\ No newline at end of file
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/
@ 2018-12-25 21:23 Andreas Sturmlechner
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2018-12-25 21:23 UTC (permalink / raw
To: gentoo-commits
commit: da7926182391bd95b006f7fc6ac44cac3e54bf40
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 25 14:33:32 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 25 21:23:19 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da792618
media-gfx/exiv2: 0.27.0 version bump
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/exiv2/Manifest | 1 +
media-gfx/exiv2/exiv2-0.27.0.ebuild | 107 +++++++++++++++++++++
.../exiv2-0.27.0-png-broken-icc-profile.patch | 34 +++++++
3 files changed, 142 insertions(+)
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 017a87d6e8b..2a0cbfc6029 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1 +1,2 @@
DIST exiv2-0.26_p20180811d.tar.xz 1722216 BLAKE2B 9e1c8307eb923c340894c82c37e9f6c31d82ff1b1de3c79d4ec9b0ec9428ad1d05f945e9a4e440028335857e7fc32d50cdc5245842d743e017037bd641b654db SHA512 5453650888440028acb139a02b387eab0232551c97256ce88dd626fa4cc8800ec02ad66e093c314bbfdc60726995b6c8482572d1ffaec73a265209c98c901780
+DIST exiv2-0.27.0-Source.tar.gz 27222970 BLAKE2B a935f6a41e322dda14d11400801f6b98fd3254af45a44d9d6e9f90d955cc58bb6f7477c49f1f99612a519216cdc954bacea74c68f76545c662db37849e99367e SHA512 3037d8e84b414e3915b807c5bea39f903668c0774f9dbc1367e23c595d5abaf318c746009e994234bcaf0088ad32a820ea42c9c77c9a53c65a7b5d7781a2c6d4
diff --git a/media-gfx/exiv2/exiv2-0.27.0.ebuild b/media-gfx/exiv2/exiv2-0.27.0.ebuild
new file mode 100644
index 00000000000..c45a92101c2
--- /dev/null
+++ b/media-gfx/exiv2/exiv2-0.27.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999 ]]; then
+ EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
+ inherit git-r3
+else
+ SRC_URI="http://exiv2.dyndns.org/builds/${P}-Source.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+fi
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
+HOMEPAGE="http://www.exiv2.org/"
+
+LICENSE="GPL-2"
+SLOT="0/27"
+IUSE="doc examples nls +png webready +xmp"
+
+RDEPEND="
+ >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+ png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+ webready? (
+ net-libs/libssh[${MULTILIB_USEDEP}]
+ net-misc/curl[${MULTILIB_USEDEP}]
+ )
+ xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ doc? (
+ ${PYTHON_DEPS}
+ app-doc/doxygen
+ dev-libs/libxslt
+ media-gfx/graphviz
+ virtual/pkgconfig
+ )
+ nls? ( sys-devel/gettext )
+"
+
+DOCS=( README.md doc/ChangeLog doc/cmd.txt )
+
+S="${S}-Source"
+
+PATCHES=(
+ # pending upstream
+ "${FILESDIR}"/${P}-png-broken-icc-profile.patch
+)
+
+pkg_setup() {
+ use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # FIXME @upstream:
+ einfo "Converting doc/cmd.txt to UTF-8"
+ iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
+ mv -f doc/cmd.txt.tmp doc/cmd.txt || die
+
+ if use doc; then
+ einfo "Updating doxygen config"
+ doxygen &>/dev/null -u config/Doxyfile || die
+ fi
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DEXIV2_BUILD_SAMPLES=NO
+ -DEXIV2_BUILD_PO=$(usex nls)
+ -DEXIV2_ENABLE_NLS=$(usex nls)
+ -DEXIV2_ENABLE_PNG=$(usex png)
+ -DEXIV2_ENABLE_CURL=$(usex webready)
+ -DEXIV2_ENABLE_SSH=$(usex webready)
+ -DEXIV2_ENABLE_WEBREADY=$(usex webready)
+ -DEXIV2_ENABLE_XMP=$(usex xmp)
+ $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+
+ if multilib_is_native_abi; then
+ use doc && emake -j1 doc
+ fi
+}
+
+multilib_src_install_all() {
+ use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
+ use doc && HTML_DOCS=( "${S}"/doc/html/. )
+
+ einstalldocs
+ find "${D}" -name '*.la' -delete || die
+
+ if use examples; then
+ docinto examples
+ dodoc samples/*.cpp
+ fi
+}
diff --git a/media-gfx/exiv2/files/exiv2-0.27.0-png-broken-icc-profile.patch b/media-gfx/exiv2/files/exiv2-0.27.0-png-broken-icc-profile.patch
new file mode 100644
index 00000000000..ae0a0ee30dc
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.27.0-png-broken-icc-profile.patch
@@ -0,0 +1,34 @@
+diff --git a/src/pngimage.cpp b/src/pngimage.cpp
+index 90844d09..b5b0cd24 100644
+--- a/src/pngimage.cpp
++++ b/src/pngimage.cpp
+@@ -501,7 +501,20 @@ namespace Exiv2 {
+ }
+ else if (!memcmp(cheaderBuf.pData_ + 4, "iCCP", 4))
+ {
+- zlibToDataBuf(cdataBuf.pData_ +12+1,dataOffset-13,iccProfile_); // +1 = 'compressed' flag
++ // The ICC profile name can vary from 1-79 characters.
++ uint32_t iccOffset = 0;
++ while (iccOffset < 80 && iccOffset < dataOffset) {
++
++ const byte* profileName = cdataBuf.pData_ + iccOffset;
++ ++iccOffset;
++
++ if (*profileName == 0x00)
++ break;
++ }
++
++ ++iccOffset; // +1 = 'compressed' flag
++
++ zlibToDataBuf(cdataBuf.pData_ +iccOffset,dataOffset-iccOffset,iccProfile_);
+ #ifdef DEBUG
+ std::cout << "Exiv2::PngImage::readMetadata: Found iCCP chunk length: " << dataOffset << std::endl;
+ std::cout << "Exiv2::PngImage::readMetadata: iccProfile.size_ : " << iccProfile_.size_ << std::endl;
+@@ -662,6 +675,7 @@ namespace Exiv2 {
+
+ // calculate CRC
+ uLong tmp = crc32(0L, Z_NULL, 0);
++ tmp = crc32(tmp, (const Bytef*)type ,typeLen);
+ tmp = crc32(tmp, (const Bytef*)header ,headerLen);
+ tmp = crc32(tmp, (const Bytef*)compressed.pData_,compressed.size_);
+ byte crc[4];
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/
@ 2019-01-12 22:06 Andreas Sturmlechner
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2019-01-12 22:06 UTC (permalink / raw
To: gentoo-commits
commit: 273151668540b3fe89620f1fe4bb9d648f89dadb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 12 21:54:56 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 12 22:06:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27315166
media-gfx/exiv2: Fix pkgconfig
Closes: https://bugs.gentoo.org/675240
Thanks-to: Mike Auty <ikelos <AT> gentoo.org>
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/exiv2/exiv2-0.27.0-r2.ebuild | 109 +++++++++++++++++++++
.../exiv2/files/exiv2-0.27.0-fix-pkgconfig.patch | 24 +++++
2 files changed, 133 insertions(+)
diff --git a/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild b/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild
new file mode 100644
index 00000000000..4b30b442529
--- /dev/null
+++ b/media-gfx/exiv2/exiv2-0.27.0-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999 ]]; then
+ EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
+ inherit git-r3
+else
+ SRC_URI="http://exiv2.dyndns.org/builds/${P}a-Source.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+fi
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
+HOMEPAGE="http://www.exiv2.org/"
+
+LICENSE="GPL-2"
+SLOT="0/27"
+IUSE="doc examples nls +png webready +xmp"
+
+RDEPEND="
+ >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+ png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+ webready? (
+ net-libs/libssh[${MULTILIB_USEDEP}]
+ net-misc/curl[${MULTILIB_USEDEP}]
+ )
+ xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ doc? (
+ ${PYTHON_DEPS}
+ app-doc/doxygen
+ dev-libs/libxslt
+ media-gfx/graphviz
+ virtual/pkgconfig
+ )
+ nls? ( sys-devel/gettext )
+"
+
+DOCS=( README.md doc/ChangeLog doc/cmd.txt )
+
+S="${S}-Source"
+
+PATCHES=(
+ # pending upstream
+ "${FILESDIR}"/${P}-png-broken-icc-profile.patch
+ # bug 675240
+ "${FILESDIR}"/${P}-fix-pkgconfig.patch
+)
+
+pkg_setup() {
+ use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # FIXME @upstream:
+ einfo "Converting doc/cmd.txt to UTF-8"
+ iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
+ mv -f doc/cmd.txt.tmp doc/cmd.txt || die
+
+ if use doc; then
+ einfo "Updating doxygen config"
+ doxygen &>/dev/null -u config/Doxyfile || die
+ fi
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DEXIV2_BUILD_SAMPLES=NO
+ -DEXIV2_BUILD_PO=$(usex nls)
+ -DEXIV2_ENABLE_NLS=$(usex nls)
+ -DEXIV2_ENABLE_PNG=$(usex png)
+ -DEXIV2_ENABLE_CURL=$(usex webready)
+ -DEXIV2_ENABLE_SSH=$(usex webready)
+ -DEXIV2_ENABLE_WEBREADY=$(usex webready)
+ -DEXIV2_ENABLE_XMP=$(usex xmp)
+ $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+
+ if multilib_is_native_abi; then
+ use doc && emake -j1 doc
+ fi
+}
+
+multilib_src_install_all() {
+ use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
+ use doc && HTML_DOCS=( "${S}"/doc/html/. )
+
+ einstalldocs
+ find "${D}" -name '*.la' -delete || die
+
+ if use examples; then
+ docinto examples
+ dodoc samples/*.cpp
+ fi
+}
diff --git a/media-gfx/exiv2/files/exiv2-0.27.0-fix-pkgconfig.patch b/media-gfx/exiv2/files/exiv2-0.27.0-fix-pkgconfig.patch
new file mode 100644
index 00000000000..5fc430e915d
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.27.0-fix-pkgconfig.patch
@@ -0,0 +1,24 @@
+From e706cca19027dbdf53aeac2041ecce9ccb313c17 Mon Sep 17 00:00:00 2001
+From: Luis Diaz Mas <piponazo@gmail.com>
+Date: Sat, 12 Jan 2019 13:39:12 +0100
+Subject: [PATCH] Fixes in .pc file for being compatible with more
+ distributions
+
+---
+ cmake/exiv2.pc.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/exiv2.pc.in b/cmake/exiv2.pc.in
+index e477696d5..9018472be 100644
+--- a/cmake/exiv2.pc.in
++++ b/cmake/exiv2.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/lib
+-includedir=${prefix}/include
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+
+ Name: exiv2
+ Description: @PROJECT_DESCRIPTION@
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/
@ 2021-06-20 20:53 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2021-06-20 20:53 UTC (permalink / raw
To: gentoo-commits
commit: bd8ae2f9ca37af01f66e7dd91713cfaab3fc8694
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 20 20:40:58 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 20 20:53:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd8ae2f9
media-gfx/exiv2: add 0.27.4
Bug: https://bugs.gentoo.org/785646
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/exiv2/Manifest | 1 +
media-gfx/exiv2/exiv2-0.27.4.ebuild | 115 +++++++++++++++++++++
.../exiv2/files/exiv2-0.27.4-gtest-1.11.patch | 32 ++++++
3 files changed, 148 insertions(+)
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 53c6bf2b073..ff5c5104d27 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1 +1,2 @@
DIST exiv2-0.27.3-Source.tar.gz 26447901 BLAKE2B ac13e6d8fce83923278cfeb628f143310a3c62b42936c8ed8b302a2c3df4c36f5666fa749adfb1d745e42da8f519762532e6fc281993aa55bcd7ce56e08c6e3e SHA512 3f5758ee862b811eeb89cc75fc2bbd8bf10329efa2ce1e68555cdc7729faa6cfd1603e0cc859fbdbe6d8fd5e53bd9b9e6d869d8a20ed17497bf87ce78c005de9
+DIST exiv2-0.27.4-Source.tar.gz 32055837 BLAKE2B 9c31c08fafb38895fa7812a8c7a195335e80a6b9c15f7b5f3750f5ab30903c4c3bbf9aee5a7293a7d437d15a49a9cb7b45a3133cbb36ee62081efae0dd67b61a SHA512 f6798baafb36a54ba5bc65c2d28d4f4469e298582c90b417eb437b5dbda8e11963fb3314e8419717b3815ee8c3a68955cddc79e45351d9f2c165a0b73eb7b7be
diff --git a/media-gfx/exiv2/exiv2-0.27.4.ebuild b/media-gfx/exiv2/exiv2-0.27.4.ebuild
new file mode 100644
index 00000000000..58cc73bd59c
--- /dev/null
+++ b/media-gfx/exiv2/exiv2-0.27.4.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999 ]]; then
+ EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
+ inherit git-r3
+else
+ SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+ S="${WORKDIR}/${P}-Source"
+fi
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
+HOMEPAGE="https://www.exiv2.org/"
+
+LICENSE="GPL-2"
+SLOT="0/27"
+IUSE="doc examples nls +png test webready +xmp"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ doc? (
+ ${PYTHON_DEPS}
+ app-doc/doxygen
+ dev-libs/libxslt
+ media-gfx/graphviz
+ virtual/pkgconfig
+ )
+ nls? ( sys-devel/gettext )
+"
+DEPEND="
+ >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+ png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+ test? ( dev-cpp/gtest )
+ webready? (
+ >net-libs/libssh-0.9.1[${MULTILIB_USEDEP}]
+ net-misc/curl[${MULTILIB_USEDEP}]
+ )
+ xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md doc/ChangeLog doc/cmd.txt )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.27.4-gtest-1.11.patch
+)
+
+pkg_setup() {
+ use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # FIXME @upstream:
+ einfo "Converting doc/cmd.txt to UTF-8"
+ iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
+ mv -f doc/cmd.txt.tmp doc/cmd.txt || die
+
+ cmake_src_prepare
+
+ sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_CXX_STANDARD=14
+ -DEXIV2_BUILD_SAMPLES=NO
+ -DEXIV2_ENABLE_NLS=$(usex nls)
+ -DEXIV2_ENABLE_PNG=$(usex png)
+ -DEXIV2_ENABLE_CURL=$(usex webready)
+ -DEXIV2_ENABLE_SSH=$(usex webready)
+ -DEXIV2_ENABLE_WEBREADY=$(usex webready)
+ -DEXIV2_ENABLE_XMP=$(usex xmp)
+ $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
+ $(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc))
+ $(multilib_is_native_abi && echo -DEXIV2_BUILD_UNIT_TESTS=$(usex test))
+ -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+ )
+
+ cmake_src_configure
+}
+
+multilib_src_compile() {
+ cmake_src_compile
+
+ if multilib_is_native_abi; then
+ use doc && eninja doc
+ fi
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi; then
+ cd "${BUILD_DIR}"/bin || die
+ ./unit_tests || die "Failed to run tests"
+ fi
+}
+
+multilib_src_install_all() {
+ use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
+
+ einstalldocs
+ find "${D}" -name '*.la' -delete || die
+
+ if use examples; then
+ docinto examples
+ dodoc samples/*.cpp
+ fi
+}
diff --git a/media-gfx/exiv2/files/exiv2-0.27.4-gtest-1.11.patch b/media-gfx/exiv2/files/exiv2-0.27.4-gtest-1.11.patch
new file mode 100644
index 00000000000..bb368d367cb
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.27.4-gtest-1.11.patch
@@ -0,0 +1,32 @@
+https://github.com/Exiv2/exiv2/pull/1722
+
+From f01805f68eb19f56b0415a50a1128cbbdd82bff4 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Fri, 18 Jun 2021 18:53:46 +0200
+Subject: [PATCH] Fix build with gtest 1.11
+
+INSTANTIATE_TYPED_TEST_CASE_P requires a non-empty prefix now
+---
+ unitTests/test_slice.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/unitTests/test_slice.cpp b/unitTests/test_slice.cpp
+index ccf80d98d..59171cfcf 100644
+--- a/unitTests/test_slice.cpp
++++ b/unitTests/test_slice.cpp
+@@ -440,12 +440,12 @@ REGISTER_TYPED_TEST_CASE_P(slice, atAccess, iteratorAccess, constructionFailsFro
+ constMethodsPreserveConst);
+
+ typedef ::testing::Types<const std::vector<int>, std::vector<int>, int*, const int*> test_types_t;
+-INSTANTIATE_TYPED_TEST_CASE_P(, slice, test_types_t);
++INSTANTIATE_TYPED_TEST_CASE_P(slice, slice, test_types_t);
+
+ REGISTER_TYPED_TEST_CASE_P(mutableSlice, iterators, at);
+ typedef ::testing::Types<std::vector<int>, int*> mut_test_types_t;
+-INSTANTIATE_TYPED_TEST_CASE_P(, mutableSlice, mut_test_types_t);
++INSTANTIATE_TYPED_TEST_CASE_P(slice, mutableSlice, mut_test_types_t);
+
+ REGISTER_TYPED_TEST_CASE_P(dataBufSlice, successfulConstruction, failedConstruction);
+ typedef ::testing::Types<DataBuf&, const DataBuf&> data_buf_types_t;
+-INSTANTIATE_TYPED_TEST_CASE_P(, dataBufSlice, data_buf_types_t);
++INSTANTIATE_TYPED_TEST_CASE_P(slice, dataBufSlice, data_buf_types_t);
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/
@ 2022-08-18 18:43 Sam James
0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2022-08-18 18:43 UTC (permalink / raw
To: gentoo-commits
commit: 7a3e067c600566c5d1815b8666ea29fe4b6b3906
Author: Alfred Persson Forsberg <cat <AT> catcream <DOT> org>
AuthorDate: Tue Aug 16 20:05:59 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 18:42:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a3e067c
media-gfx/exiv2: fix test for musl
This is fixed upstream. See the patch file for upstream commits. It only
patches broken tests, not tested code, so no revbump is needed.
Closes: https://bugs.gentoo.org/836230
Signed-off-by: Alfred Persson Forsberg <cat <AT> catcream.org>
Closes: https://github.com/gentoo/gentoo/pull/26884
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/exiv2/exiv2-0.27.5-r1.ebuild | 4 ++
.../exiv2/files/exiv2-0.27.5-musl-tests.patch | 56 ++++++++++++++++++++++
2 files changed, 60 insertions(+)
diff --git a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild b/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
index 8655bd0c7eac..e262b7b9c5c8 100644
--- a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
+++ b/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
@@ -50,6 +50,10 @@ DEPEND="${DEPEND}
DOCS=( README.md doc/ChangeLog doc/cmd.txt )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.27.5-musl-tests.patch
+)
+
pkg_setup() {
use doc && python-any-r1_pkg_setup
}
diff --git a/media-gfx/exiv2/files/exiv2-0.27.5-musl-tests.patch b/media-gfx/exiv2/files/exiv2-0.27.5-musl-tests.patch
new file mode 100644
index 000000000000..3fa70d739f4a
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.27.5-musl-tests.patch
@@ -0,0 +1,56 @@
+https://github.com/Exiv2/exiv2/commit/82adcb1f86def0555b25713a8b84dba84944b275 (1)
+https://github.com/Exiv2/exiv2/commit/7d8cd00778c3eee9f32af04b009d8a5651eb53e7 (2)
+
+This is basically just commit (1). Though it wasn't directly applicable so I just merged it with (2).
+Easier and it makes the file same as upstream.
+
+diff -u b/unitTests/test_futils.cpp b/unitTests/test_futils.cpp
+--- b/unitTests/test_futils.cpp
++++ b/unitTests/test_futils.cpp
+@@ -42,21 +42,8 @@
+ std::string tmpFile("tmp.dat");
+ std::ofstream auxFile(tmpFile.c_str());
+ auxFile.close();
+-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW__) || defined(__MSYS__)
+- const char * expectedString = "No error (errno = 0)";
+-#elif defined(__APPLE__)
+- const char * expectedString = "Undefined error: 0 (errno = 0)";
+-#elif defined(__sun__)
+- const char * expectedString = "Error 0 (errno = 0)";
+-#elif defined(__FreeBSD__)
+- const char * expectedString = "No error: 0 (errno = 0)";
+-#elif defined(__NetBSD__)
+- const char * expectedString = "Undefined error: 0 (errno = 0)";
+-#else
+- const char * expectedString = "Success (errno = 0)";
+-#endif
+ std::remove(tmpFile.c_str());
+- ASSERT_STREQ(expectedString, strError().c_str());
++ ASSERT_TRUE(strError().find("(errno = 0)") != std::string::npos);
+ }
+
+ TEST(strError, returnNoSuchFileOrDirectoryWhenTryingToOpenNonExistingFile)
+@@ -68,22 +55,7 @@
+ TEST(strError, doNotRecognizeUnknownError)
+ {
+ errno = 9999;
+-#if defined(__MINGW__) || defined(__MSYS__) || defined(__CYGWIN__)
+- const char * expectedString = "Unknown error 9999 (errno = 9999)";
+-#elif defined(_WIN32)
+- const char * expectedString = "Unknown error (errno = 9999)";
+-#elif defined(__APPLE__)
+- const char * expectedString = "Unknown error: 9999 (errno = 9999)";
+-#elif defined(__sun__)
+- const char * expectedString = "Unknown error (errno = 9999)";
+-#elif defined(__FreeBSD__)
+- const char * expectedString = "Unknown error: 9999 (errno = 9999)";
+-#elif defined(__NetBSD__)
+- const char * expectedString = "Unknown error: 9999 (errno = 9999)";
+-#else
+- const char * expectedString = "Unknown error 9999 (errno = 9999)";
+-#endif
+- ASSERT_STREQ(expectedString, strError().c_str());
++ ASSERT_TRUE(strError().find("(errno = 9999)") != std::string::npos);
+ }
+
+ TEST(getEnv, getsDefaultValueWhenExpectedEnvVariableDoesNotExist)
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/
@ 2023-01-25 19:07 Andreas Sturmlechner
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2023-01-25 19:07 UTC (permalink / raw
To: gentoo-commits
commit: 8cd6e09b9b12d1ff05005cae40f6778a7482919d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 18:47:23 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 19:07:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cd6e09b
media-gfx/exiv2: add 0.27.6
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/exiv2/Manifest | 1 +
media-gfx/exiv2/exiv2-0.27.6.ebuild | 115 ++++++++++++++++++++++
media-gfx/exiv2/files/exiv2-0.27.6-jxl-mime.patch | 69 +++++++++++++
3 files changed, 185 insertions(+)
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index a9c896be4e08..5a905dcc84d7 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1 +1,2 @@
DIST exiv2-0.27.5-Source.tar.gz 32720608 BLAKE2B 803cb853fd049b28d309952c2332589a8544ff90c16fc1a588b6f1a2d4ae5e96da7ae746cf2247954ac54e155b84e0ad1f4f2d89f22d07e7bbd34038f0e292a5 SHA512 0f2d2dfbc976052a428dfeb597225d3ea3c725f584d05b99316bd4aa9cbf0ba5e1e37bcde71f9041975cf003b4fdb578c559adb144268d784bfd64494f451491
+DIST exiv2-0.27.6-Source.tar.gz 32280263 BLAKE2B a025452b7e70aef109a2f7831ba5c0528b0cb8fda92e5959a5927abd442d650f8d40cc47f56d8f87508e5f37e8378728f99e3a4fa96e7a0319cb4542659d9a60 SHA512 045d7fb391202b53897336094812600680141a292367a9194e9529bccb8ab54465190ea0f0636970114402a38840b33b2fcf2edf7b6c616f3e585fa295a887a4
diff --git a/media-gfx/exiv2/exiv2-0.27.6.ebuild b/media-gfx/exiv2/exiv2-0.27.6.ebuild
new file mode 100644
index 000000000000..93b4c20729ea
--- /dev/null
+++ b/media-gfx/exiv2/exiv2-0.27.6.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/${PN^}/${PN}/releases/download/v${PV}/${P}-Source.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+ S="${WORKDIR}/${P}-Source"
+fi
+
+PYTHON_COMPAT=( python3_{9..11} )
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
+HOMEPAGE="https://exiv2.org/"
+
+LICENSE="GPL-2"
+# In 0.27.5, ABI seemed to be broken for bmff functions
+SLOT="0/27.5"
+IUSE="+bmff doc examples nls +png test webready +xmp"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+ png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+ webready? (
+ >net-libs/libssh-0.9.1[sftp,${MULTILIB_USEDEP}]
+ net-misc/curl[${MULTILIB_USEDEP}]
+ )
+ xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
+"
+DEPEND="${DEPEND}
+ test? ( dev-cpp/gtest )
+"
+BDEPEND="
+ doc? (
+ ${PYTHON_DEPS}
+ app-doc/doxygen
+ dev-libs/libxslt
+ media-gfx/graphviz
+ virtual/pkgconfig
+ )
+ nls? ( sys-devel/gettext )
+"
+
+DOCS=( README.md doc/ChangeLog doc/cmd.txt )
+
+PATCHES=( "${FILESDIR}"/${P}-jxl-mime.patch )
+
+pkg_setup() {
+ use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # FIXME @upstream:
+ einfo "Converting doc/cmd.txt to UTF-8"
+ iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
+ mv -f doc/cmd.txt.tmp doc/cmd.txt || die
+
+ cmake_src_prepare
+
+ sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_CXX_STANDARD=14
+ -DEXIV2_BUILD_SAMPLES=NO
+ -DEXIV2_ENABLE_NLS=$(usex nls)
+ -DEXIV2_ENABLE_PNG=$(usex png)
+ -DEXIV2_ENABLE_CURL=$(usex webready)
+ -DEXIV2_ENABLE_SSH=$(usex webready)
+ -DEXIV2_ENABLE_WEBREADY=$(usex webready)
+ -DEXIV2_ENABLE_XMP=$(usex xmp)
+ -DEXIV2_ENABLE_BMFF=$(usex bmff)
+ $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
+ $(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc))
+ $(multilib_is_native_abi && echo -DEXIV2_BUILD_UNIT_TESTS=$(usex test))
+ -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+ )
+
+ cmake_src_configure
+}
+
+multilib_src_compile() {
+ cmake_src_compile
+
+ if multilib_is_native_abi; then
+ use doc && eninja doc
+ fi
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi; then
+ cd "${BUILD_DIR}"/bin || die
+ ./unit_tests || die "Failed to run tests"
+ fi
+}
+
+multilib_src_install_all() {
+ use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
+
+ einstalldocs
+ find "${D}" -name '*.la' -delete || die
+
+ if use examples; then
+ docinto examples
+ dodoc samples/*.cpp
+ fi
+}
diff --git a/media-gfx/exiv2/files/exiv2-0.27.6-jxl-mime.patch b/media-gfx/exiv2/files/exiv2-0.27.6-jxl-mime.patch
new file mode 100644
index 000000000000..b23e38736dca
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.27.6-jxl-mime.patch
@@ -0,0 +1,69 @@
+From 8f889c132ec48d8be7e155fc6d84254ffbb527df Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Peter=20Kov=C3=A1=C5=99?= <peter.kovar@reflexion.tv>
+Date: Sun, 1 Aug 2021 13:56:48 +0200
+Subject: [PATCH 1/3] Corrected JPEG XL file type
+
+---
+ src/bmffimage.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp
+index 3d7c23e936..2440b4afd4 100644
+--- a/src/bmffimage.cpp
++++ b/src/bmffimage.cpp
+@@ -56,7 +56,8 @@
+ #define TAG_heix 0x68656978 /**< "heix" HEIC */
+ #define TAG_mif1 0x6d696631 /**< "mif1" HEIF */
+ #define TAG_crx 0x63727820 /**< "crx " Canon CR3 */
+-#define TAG_jxl 0x4a584c20 /**< "JXL " JPEG XL */
++#define TAG_JXL 0x4a584c20 /**< "JXL " JPEG XL */
++#define TAG_jxl 0x6a786c20 /**< "jxl " JPEG XL file type */
+ #define TAG_moov 0x6d6f6f76 /**< "moov" Movie */
+ #define TAG_meta 0x6d657461 /**< "meta" Metadata */
+ #define TAG_mdat 0x6d646174 /**< "mdat" Media data */
+
+From 1d095cf75132e548213d740efc402b77178b2add Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Peter=20Kov=C3=A1=C5=99?= <peter.kovar@reflexion.tv>
+Date: Thu, 5 Aug 2021 10:04:51 +0200
+Subject: [PATCH 2/3] Removed tag handled separately
+
+---
+ src/bmffimage.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp
+index 2440b4afd4..9964a42bc2 100644
+--- a/src/bmffimage.cpp
++++ b/src/bmffimage.cpp
+@@ -56,7 +56,6 @@
+ #define TAG_heix 0x68656978 /**< "heix" HEIC */
+ #define TAG_mif1 0x6d696631 /**< "mif1" HEIF */
+ #define TAG_crx 0x63727820 /**< "crx " Canon CR3 */
+-#define TAG_JXL 0x4a584c20 /**< "JXL " JPEG XL */
+ #define TAG_jxl 0x6a786c20 /**< "jxl " JPEG XL file type */
+ #define TAG_moov 0x6d6f6f76 /**< "moov" Movie */
+ #define TAG_meta 0x6d657461 /**< "meta" Metadata */
+
+From af0954ca0cce961d9ea95e728d964f0717d34bfd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?=
+ <miloskomarcevic@aim.com>
+Date: Thu, 12 Aug 2021 16:19:06 +0200
+Subject: [PATCH 3/3] Update test for image/jxl
+
+---
+ tests/bugfixes/github/test_issue_1503.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/bugfixes/github/test_issue_1503.py b/tests/bugfixes/github/test_issue_1503.py
+index 51c0769135..3f88d26805 100644
+--- a/tests/bugfixes/github/test_issue_1503.py
++++ b/tests/bugfixes/github/test_issue_1503.py
+@@ -33,7 +33,7 @@ class issue_1503_jxl_bmff(metaclass=system_tests.CaseMeta):
+ Xmp.photoshop.DateCreated XmpText 10 2004-06-21
+ ""","""File name : $filename
+ File size : 32892 Bytes
+-MIME type : image/generic
++MIME type : image/jxl
+ Image size : 200 x 130
+ Thumbnail : image/jpeg, 4196 Bytes
+ Camera make : NIKON CORPORATION
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/
@ 2023-02-27 18:43 Andreas Sturmlechner
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2023-02-27 18:43 UTC (permalink / raw
To: gentoo-commits
commit: 076c0de0e5b6263423cea844bcfd3e5562ef85e7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 18:36:36 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 18:42:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=076c0de0
media-gfx/exiv2: drop 0.27.5-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/exiv2/Manifest | 1 -
media-gfx/exiv2/exiv2-0.27.5-r1.ebuild | 115 ---------------------
.../exiv2/files/exiv2-0.27.5-musl-tests.patch | 56 ----------
3 files changed, 172 deletions(-)
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 5a905dcc84d7..30159e1ec4d9 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,2 +1 @@
-DIST exiv2-0.27.5-Source.tar.gz 32720608 BLAKE2B 803cb853fd049b28d309952c2332589a8544ff90c16fc1a588b6f1a2d4ae5e96da7ae746cf2247954ac54e155b84e0ad1f4f2d89f22d07e7bbd34038f0e292a5 SHA512 0f2d2dfbc976052a428dfeb597225d3ea3c725f584d05b99316bd4aa9cbf0ba5e1e37bcde71f9041975cf003b4fdb578c559adb144268d784bfd64494f451491
DIST exiv2-0.27.6-Source.tar.gz 32280263 BLAKE2B a025452b7e70aef109a2f7831ba5c0528b0cb8fda92e5959a5927abd442d650f8d40cc47f56d8f87508e5f37e8378728f99e3a4fa96e7a0319cb4542659d9a60 SHA512 045d7fb391202b53897336094812600680141a292367a9194e9529bccb8ab54465190ea0f0636970114402a38840b33b2fcf2edf7b6c616f3e585fa295a887a4
diff --git a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild b/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
deleted file mode 100644
index e6e220a5330b..000000000000
--- a/media-gfx/exiv2/exiv2-0.27.5-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
- inherit git-r3
-else
- SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
- S="${WORKDIR}/${P}-Source"
-fi
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="https://exiv2.org/"
-
-LICENSE="GPL-2"
-# In 0.27.5, ABI seemed to be broken for bmff functions
-SLOT="0/27.5"
-IUSE="+bmff doc examples nls +png test webready +xmp"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
- png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
- webready? (
- >net-libs/libssh-0.9.1[sftp,${MULTILIB_USEDEP}]
- net-misc/curl[${MULTILIB_USEDEP}]
- )
- xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-"
-DEPEND="${DEPEND}
- test? ( dev-cpp/gtest )
-"
-BDEPEND="
- doc? (
- ${PYTHON_DEPS}
- app-doc/doxygen
- dev-libs/libxslt
- media-gfx/graphviz
- virtual/pkgconfig
- )
- nls? ( sys-devel/gettext )
-"
-
-DOCS=( README.md doc/ChangeLog doc/cmd.txt )
-
-PATCHES=( "${FILESDIR}"/${PN}-0.27.5-musl-tests.patch )
-
-pkg_setup() {
- use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # FIXME @upstream:
- einfo "Converting doc/cmd.txt to UTF-8"
- iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
- mv -f doc/cmd.txt.tmp doc/cmd.txt || die
-
- cmake_src_prepare
-
- sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DCMAKE_CXX_STANDARD=14
- -DEXIV2_BUILD_SAMPLES=NO
- -DEXIV2_ENABLE_NLS=$(usex nls)
- -DEXIV2_ENABLE_PNG=$(usex png)
- -DEXIV2_ENABLE_CURL=$(usex webready)
- -DEXIV2_ENABLE_SSH=$(usex webready)
- -DEXIV2_ENABLE_WEBREADY=$(usex webready)
- -DEXIV2_ENABLE_XMP=$(usex xmp)
- -DEXIV2_ENABLE_BMFF=$(usex bmff)
- $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
- $(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc))
- $(multilib_is_native_abi && echo -DEXIV2_BUILD_UNIT_TESTS=$(usex test))
- -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
- )
-
- cmake_src_configure
-}
-
-multilib_src_compile() {
- cmake_src_compile
-
- if multilib_is_native_abi; then
- use doc && eninja doc
- fi
-}
-
-multilib_src_test() {
- if multilib_is_native_abi; then
- cd "${BUILD_DIR}"/bin || die
- ./unit_tests || die "Failed to run tests"
- fi
-}
-
-multilib_src_install_all() {
- use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
-
- einstalldocs
- find "${D}" -name '*.la' -delete || die
-
- if use examples; then
- docinto examples
- dodoc samples/*.cpp
- fi
-}
diff --git a/media-gfx/exiv2/files/exiv2-0.27.5-musl-tests.patch b/media-gfx/exiv2/files/exiv2-0.27.5-musl-tests.patch
deleted file mode 100644
index 3fa70d739f4a..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.27.5-musl-tests.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://github.com/Exiv2/exiv2/commit/82adcb1f86def0555b25713a8b84dba84944b275 (1)
-https://github.com/Exiv2/exiv2/commit/7d8cd00778c3eee9f32af04b009d8a5651eb53e7 (2)
-
-This is basically just commit (1). Though it wasn't directly applicable so I just merged it with (2).
-Easier and it makes the file same as upstream.
-
-diff -u b/unitTests/test_futils.cpp b/unitTests/test_futils.cpp
---- b/unitTests/test_futils.cpp
-+++ b/unitTests/test_futils.cpp
-@@ -42,21 +42,8 @@
- std::string tmpFile("tmp.dat");
- std::ofstream auxFile(tmpFile.c_str());
- auxFile.close();
--#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW__) || defined(__MSYS__)
-- const char * expectedString = "No error (errno = 0)";
--#elif defined(__APPLE__)
-- const char * expectedString = "Undefined error: 0 (errno = 0)";
--#elif defined(__sun__)
-- const char * expectedString = "Error 0 (errno = 0)";
--#elif defined(__FreeBSD__)
-- const char * expectedString = "No error: 0 (errno = 0)";
--#elif defined(__NetBSD__)
-- const char * expectedString = "Undefined error: 0 (errno = 0)";
--#else
-- const char * expectedString = "Success (errno = 0)";
--#endif
- std::remove(tmpFile.c_str());
-- ASSERT_STREQ(expectedString, strError().c_str());
-+ ASSERT_TRUE(strError().find("(errno = 0)") != std::string::npos);
- }
-
- TEST(strError, returnNoSuchFileOrDirectoryWhenTryingToOpenNonExistingFile)
-@@ -68,22 +55,7 @@
- TEST(strError, doNotRecognizeUnknownError)
- {
- errno = 9999;
--#if defined(__MINGW__) || defined(__MSYS__) || defined(__CYGWIN__)
-- const char * expectedString = "Unknown error 9999 (errno = 9999)";
--#elif defined(_WIN32)
-- const char * expectedString = "Unknown error (errno = 9999)";
--#elif defined(__APPLE__)
-- const char * expectedString = "Unknown error: 9999 (errno = 9999)";
--#elif defined(__sun__)
-- const char * expectedString = "Unknown error (errno = 9999)";
--#elif defined(__FreeBSD__)
-- const char * expectedString = "Unknown error: 9999 (errno = 9999)";
--#elif defined(__NetBSD__)
-- const char * expectedString = "Unknown error: 9999 (errno = 9999)";
--#else
-- const char * expectedString = "Unknown error 9999 (errno = 9999)";
--#endif
-- ASSERT_STREQ(expectedString, strError().c_str());
-+ ASSERT_TRUE(strError().find("(errno = 9999)") != std::string::npos);
- }
-
- TEST(getEnv, getsDefaultValueWhenExpectedEnvVariableDoesNotExist)
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/
@ 2023-06-12 17:45 Andreas Sturmlechner
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2023-06-12 17:45 UTC (permalink / raw
To: gentoo-commits
commit: 4ff4e50c60628752438bb6360e69060e3792a46e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 12 16:31:10 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 12 17:44:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ff4e50c
media-gfx/exiv2: drop 0.27.6
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/exiv2/Manifest | 1 -
media-gfx/exiv2/exiv2-0.27.6.ebuild | 115 ----------------------
media-gfx/exiv2/files/exiv2-0.27.6-jxl-mime.patch | 69 -------------
3 files changed, 185 deletions(-)
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 916f62c55182..cfec01b0cc0e 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,3 +1,2 @@
-DIST exiv2-0.27.6-Source.tar.gz 32280263 BLAKE2B a025452b7e70aef109a2f7831ba5c0528b0cb8fda92e5959a5927abd442d650f8d40cc47f56d8f87508e5f37e8378728f99e3a4fa96e7a0319cb4542659d9a60 SHA512 045d7fb391202b53897336094812600680141a292367a9194e9529bccb8ab54465190ea0f0636970114402a38840b33b2fcf2edf7b6c616f3e585fa295a887a4
DIST exiv2-0.27.7-Source.tar.gz 32290404 BLAKE2B ac83c36dd15c7f6aa2d6607542a12b981d1b58bed671047d3dbfdc9eea64a977630863e4c4abe1e9c2e3e8af05adf6849a05d70e42cde4bb0d6f4a3fbb9b2e49 SHA512 8f12b056439867a05b6dfe4b93a82e02d9e5032554b590e399bcf38d73208a783f8349e66870cc030ad2a47650389d96522b60086b308145121646c9fa93d8ae
DIST exiv2-0.28.0.tar.gz 45138274 BLAKE2B 6ccdc4e6a7dbd4aa2a892e61306f0c63659d804075cae9e771096cfdc21ec0aff0df22232c036551f4e321f497184e7ad100fb9c2011c14cd0315e8118c3e85f SHA512 35e483c6123f099167ed8647fae7c6e5512434c24d0afe684180ba6a5114068d5678280a01c8e6cfee0d1e555e1dc2a1606989d46950ce3ef1a3859caeed4dad
diff --git a/media-gfx/exiv2/exiv2-0.27.6.ebuild b/media-gfx/exiv2/exiv2-0.27.6.ebuild
deleted file mode 100644
index 6a06383db4a0..000000000000
--- a/media-gfx/exiv2/exiv2-0.27.6.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/${PN^}/${PN}/releases/download/v${PV}/${P}-Source.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
- S="${WORKDIR}/${P}-Source"
-fi
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="https://exiv2.org/"
-
-LICENSE="GPL-2"
-# In 0.27.5, ABI seemed to be broken for bmff functions
-SLOT="0/27.5"
-IUSE="+bmff doc examples nls +png test webready +xmp"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
- png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
- webready? (
- >net-libs/libssh-0.9.1[sftp,${MULTILIB_USEDEP}]
- net-misc/curl[${MULTILIB_USEDEP}]
- )
- xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-"
-DEPEND="${DEPEND}
- test? ( dev-cpp/gtest )
-"
-BDEPEND="
- doc? (
- ${PYTHON_DEPS}
- app-doc/doxygen
- dev-libs/libxslt
- media-gfx/graphviz
- virtual/pkgconfig
- )
- nls? ( sys-devel/gettext )
-"
-
-DOCS=( README.md doc/ChangeLog doc/cmd.txt )
-
-PATCHES=( "${FILESDIR}"/${P}-jxl-mime.patch )
-
-pkg_setup() {
- use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # FIXME @upstream:
- einfo "Converting doc/cmd.txt to UTF-8"
- iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
- mv -f doc/cmd.txt.tmp doc/cmd.txt || die
-
- cmake_src_prepare
-
- sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DCMAKE_CXX_STANDARD=14
- -DEXIV2_BUILD_SAMPLES=NO
- -DEXIV2_ENABLE_NLS=$(usex nls)
- -DEXIV2_ENABLE_PNG=$(usex png)
- -DEXIV2_ENABLE_CURL=$(usex webready)
- -DEXIV2_ENABLE_SSH=$(usex webready)
- -DEXIV2_ENABLE_WEBREADY=$(usex webready)
- -DEXIV2_ENABLE_XMP=$(usex xmp)
- -DEXIV2_ENABLE_BMFF=$(usex bmff)
- $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
- $(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc))
- $(multilib_is_native_abi && echo -DEXIV2_BUILD_UNIT_TESTS=$(usex test))
- -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
- )
-
- cmake_src_configure
-}
-
-multilib_src_compile() {
- cmake_src_compile
-
- if multilib_is_native_abi; then
- use doc && eninja doc
- fi
-}
-
-multilib_src_test() {
- if multilib_is_native_abi; then
- cd "${BUILD_DIR}"/bin || die
- ./unit_tests || die "Failed to run tests"
- fi
-}
-
-multilib_src_install_all() {
- use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
-
- einstalldocs
- find "${D}" -name '*.la' -delete || die
-
- if use examples; then
- docinto examples
- dodoc samples/*.cpp
- fi
-}
diff --git a/media-gfx/exiv2/files/exiv2-0.27.6-jxl-mime.patch b/media-gfx/exiv2/files/exiv2-0.27.6-jxl-mime.patch
deleted file mode 100644
index b23e38736dca..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.27.6-jxl-mime.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 8f889c132ec48d8be7e155fc6d84254ffbb527df Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Peter=20Kov=C3=A1=C5=99?= <peter.kovar@reflexion.tv>
-Date: Sun, 1 Aug 2021 13:56:48 +0200
-Subject: [PATCH 1/3] Corrected JPEG XL file type
-
----
- src/bmffimage.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp
-index 3d7c23e936..2440b4afd4 100644
---- a/src/bmffimage.cpp
-+++ b/src/bmffimage.cpp
-@@ -56,7 +56,8 @@
- #define TAG_heix 0x68656978 /**< "heix" HEIC */
- #define TAG_mif1 0x6d696631 /**< "mif1" HEIF */
- #define TAG_crx 0x63727820 /**< "crx " Canon CR3 */
--#define TAG_jxl 0x4a584c20 /**< "JXL " JPEG XL */
-+#define TAG_JXL 0x4a584c20 /**< "JXL " JPEG XL */
-+#define TAG_jxl 0x6a786c20 /**< "jxl " JPEG XL file type */
- #define TAG_moov 0x6d6f6f76 /**< "moov" Movie */
- #define TAG_meta 0x6d657461 /**< "meta" Metadata */
- #define TAG_mdat 0x6d646174 /**< "mdat" Media data */
-
-From 1d095cf75132e548213d740efc402b77178b2add Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Peter=20Kov=C3=A1=C5=99?= <peter.kovar@reflexion.tv>
-Date: Thu, 5 Aug 2021 10:04:51 +0200
-Subject: [PATCH 2/3] Removed tag handled separately
-
----
- src/bmffimage.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp
-index 2440b4afd4..9964a42bc2 100644
---- a/src/bmffimage.cpp
-+++ b/src/bmffimage.cpp
-@@ -56,7 +56,6 @@
- #define TAG_heix 0x68656978 /**< "heix" HEIC */
- #define TAG_mif1 0x6d696631 /**< "mif1" HEIF */
- #define TAG_crx 0x63727820 /**< "crx " Canon CR3 */
--#define TAG_JXL 0x4a584c20 /**< "JXL " JPEG XL */
- #define TAG_jxl 0x6a786c20 /**< "jxl " JPEG XL file type */
- #define TAG_moov 0x6d6f6f76 /**< "moov" Movie */
- #define TAG_meta 0x6d657461 /**< "meta" Metadata */
-
-From af0954ca0cce961d9ea95e728d964f0717d34bfd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?=
- <miloskomarcevic@aim.com>
-Date: Thu, 12 Aug 2021 16:19:06 +0200
-Subject: [PATCH 3/3] Update test for image/jxl
-
----
- tests/bugfixes/github/test_issue_1503.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/bugfixes/github/test_issue_1503.py b/tests/bugfixes/github/test_issue_1503.py
-index 51c0769135..3f88d26805 100644
---- a/tests/bugfixes/github/test_issue_1503.py
-+++ b/tests/bugfixes/github/test_issue_1503.py
-@@ -33,7 +33,7 @@ class issue_1503_jxl_bmff(metaclass=system_tests.CaseMeta):
- Xmp.photoshop.DateCreated XmpText 10 2004-06-21
- ""","""File name : $filename
- File size : 32892 Bytes
--MIME type : image/generic
-+MIME type : image/jxl
- Image size : 200 x 130
- Thumbnail : image/jpeg, 4196 Bytes
- Camera make : NIKON CORPORATION
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/
@ 2024-04-09 20:02 Andreas Sturmlechner
0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2024-04-09 20:02 UTC (permalink / raw
To: gentoo-commits
commit: d6aee3e115eda4618765835194dc9dc766473cc1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 9 19:49:27 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 9 20:01:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6aee3e1
media-gfx/exiv2: drop 0.28.1-r2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/exiv2/Manifest | 1 -
media-gfx/exiv2/exiv2-0.28.1-r2.ebuild | 133 ----------------------
media-gfx/exiv2/files/exiv2-0.28.1-exiv2lib.patch | 31 -----
3 files changed, 165 deletions(-)
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 0d500799da92..4e187fdd9709 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,2 +1 @@
-DIST exiv2-0.28.1.tar.gz 45225200 BLAKE2B a26f8e54cf6284c56ff429c13d5a8985dc6181a36b4c13ea6f2e59bc00016a2a8d915ddbc0cedb441b8283e30f18312a500900ffd89ca984006ac84807a03852 SHA512 7b872a3c0cbe343014b1ca4618cecaf6ee8d78dec7ef83accfce95cb8eadc6b52116977a41e1f1be5c6149a47bdd9457fadc08d73708aa2a6ab69795fd3de23b
DIST exiv2-0.28.2.tar.gz 45224206 BLAKE2B 9d1d05c99804032dfb9b740e543d1e3cceae011b17853c8565ccad87e726ce1d0f410c13bf4fa8839bc8e0fecdf170a3acac568f14aad4628b3b844f6c21dd7e SHA512 197cc607c0271b5731714713283756250031cef81ba7ed5d9c3e222b4c2397966cc2bbdbceaae706598329dde6f8a9729597d0ae4c36ac264c76546942e4e37b
diff --git a/media-gfx/exiv2/exiv2-0.28.1-r2.ebuild b/media-gfx/exiv2/exiv2-0.28.1-r2.ebuild
deleted file mode 100644
index bd92d0fbec8b..000000000000
--- a/media-gfx/exiv2/exiv2-0.28.1-r2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="https://exiv2.org/"
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/Exiv2/exiv2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-fi
-
-LICENSE="GPL-2"
-# Upstream hope to have stable ABI in 1.0. Until then, go off ${PV}.
-# We may be able to change it to $(ver_cut 1-2) once e.g.
-# https://github.com/Exiv2/exiv2/pull/917 is merged.
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+bmff doc examples nls +png test webready +xmp"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/inih[${MULTILIB_USEDEP}]
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
- png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
- webready? (
- net-misc/curl[${MULTILIB_USEDEP}]
- )
- xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-"
-DEPEND="
- ${DEPEND}
- test? ( dev-cpp/gtest )
-"
-BDEPEND="
- doc? (
- ${PYTHON_DEPS}
- app-text/doxygen
- dev-libs/libxslt
- media-gfx/graphviz
- virtual/pkgconfig
- )
- test? ( ${PYTHON_DEPS} )
- nls? ( sys-devel/gettext )
-"
-
-DOCS=( README.md doc/ChangeLog doc/cmd.txt )
-
-# https://github.com/Exiv2/exiv2/pull/2832
-PATCHES=( "${FILESDIR}/${P}-exiv2lib.patch" ) # bug 917483
-
-pkg_setup() {
- if use doc || use test ; then
- python-any-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- # FIXME @upstream:
- einfo "Converting doc/cmd.txt to UTF-8"
- iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
- mv -f doc/cmd.txt.tmp doc/cmd.txt || die
-
- cmake_src_prepare
-
- sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DEXIV2_BUILD_SAMPLES=NO
- -DEXIV2_ENABLE_BROTLI=OFF
- -DEXIV2_ENABLE_NLS=$(usex nls)
- -DEXIV2_ENABLE_PNG=$(usex png)
- -DEXIV2_ENABLE_CURL=$(usex webready)
- -DEXIV2_ENABLE_INIH=ON # must be enabled (bug #921937)
- -DEXIV2_ENABLE_WEBREADY=$(usex webready)
- -DEXIV2_ENABLE_XMP=$(usex xmp)
- -DEXIV2_ENABLE_BMFF=$(usex bmff)
-
- # We let users control this.
- -DBUILD_WITH_CCACHE=OFF
- # Our toolchain sets this by default.
- -DBUILD_WITH_STACK_PROTECTOR=OFF
-
- $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
- $(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc))
- $(multilib_is_native_abi && echo -DEXIV2_BUILD_UNIT_TESTS=$(usex test))
- -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
- )
-
- if use doc || use test ; then
- mycmakeargs+=(
- -DPython3_EXECUTABLE="${PYTHON}"
- )
- fi
-
- cmake_src_configure
-}
-
-multilib_src_compile() {
- cmake_src_compile
-
- if multilib_is_native_abi; then
- use doc && eninja doc
- fi
-}
-
-multilib_src_test() {
- if multilib_is_native_abi; then
- cd "${BUILD_DIR}"/bin || die
- ./unit_tests || die "Failed to run tests"
- fi
-}
-
-multilib_src_install_all() {
- use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
-
- einstalldocs
- find "${D}" -name '*.la' -delete || die
-
- if use examples; then
- docinto examples
- dodoc samples/*.cpp
- fi
-}
diff --git a/media-gfx/exiv2/files/exiv2-0.28.1-exiv2lib.patch b/media-gfx/exiv2/files/exiv2-0.28.1-exiv2lib.patch
deleted file mode 100644
index dba8fd3e2896..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.28.1-exiv2lib.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4f6d0b806714a702ccbe9e10c5155eb6a1699380 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino@tiscali.it>
-Date: Tue, 14 Nov 2023 07:23:32 +0100
-Subject: [PATCH] cmake: restore a "exiv2lib" target
-
-Commit a8c3455e5cd7ee65acc5f398581e1386f7df5108 and
-commit eb05551ed2d21079299f2f4da2f463df6857b884 changed the target of
-the exiv2 library ("exiv2lib"), exporting it in the "Exiv2" namespace,
-so making it usable as "Exiv2::exiv2lib" instead. An ALIAS to "exiv2lib"
-was added, however cmake does not install or export ALIAS targets [1].
-
-Hence, restore compatibility with the existing cmake users of exiv2:
-manually create an ALIAS target in the cmake config files after all the
-targets are loaded and checked.
-
-[1] https://cmake.org/cmake/help/latest/command/add_library.html
----
- cmake/exiv2Config.cmake.in | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/cmake/exiv2Config.cmake.in b/cmake/exiv2Config.cmake.in
-index 63c9362ff7..c9e2eba9b5 100644
---- a/cmake/exiv2Config.cmake.in
-+++ b/cmake/exiv2Config.cmake.in
-@@ -14,3 +14,6 @@ endif()
- include("${CMAKE_CURRENT_LIST_DIR}/exiv2Export.cmake")
-
- check_required_components(exiv2)
-+
-+# compatibility with non-aliased users
-+add_library(exiv2lib ALIAS Exiv2::exiv2lib)
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2024-04-09 20:02 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-19 15:23 [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/files/, media-gfx/exiv2/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-04-09 20:02 Andreas Sturmlechner
2023-06-12 17:45 Andreas Sturmlechner
2023-02-27 18:43 Andreas Sturmlechner
2023-01-25 19:07 Andreas Sturmlechner
2022-08-18 18:43 Sam James
2021-06-20 20:53 Sam James
2019-01-12 22:06 Andreas Sturmlechner
2018-12-25 21:23 Andreas Sturmlechner
2018-08-07 7:06 Andreas Sturmlechner
2017-10-18 0:35 Andreas Sturmlechner
2017-10-15 7:46 Andreas Sturmlechner
2017-06-07 6:10 Andreas Sturmlechner
2016-01-13 14:47 Michael Palimaka
2015-10-04 21:07 Michał Górny
2015-10-04 14:51 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox