exiv2 0.25
authorYaakov Selkowitz <yselkowi@redhat.com>
Mon, 26 Oct 2015 23:48:25 +0000 (18:48 -0500)
committerYaakov Selkowitz <yselkowi@redhat.com>
Mon, 26 Oct 2015 23:48:25 +0000 (18:48 -0500)
0.17.1-no-undefined.patch [deleted file]
0.24-autoconf.patch [deleted file]
0.25-find-libintl.patch [new file with mode: 0644]
exiv2.cygport

diff --git a/0.17.1-no-undefined.patch b/0.17.1-no-undefined.patch
deleted file mode 100644 (file)
index a4b4d02..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- origsrc/exiv2-0.17.1/src/Makefile  2008-04-14 22:46:01.000000000 -0500
-+++ src/exiv2-0.17.1/src/Makefile      2008-06-22 04:28:38.468750000 -0500
-@@ -237,7 +237,7 @@
- bin: lib $(BINARY) $(EXIV2BIN) $(MCBIN) path-test
- lib: $(OBJ)
--      $(LIBTOOL) --mode=link $(LINK.cc) -o $(LIBRARY) $(LOBJ) -rpath $(libdir) -version-info $(EXIV2_LTVERSION) $(LIBS)
-+      $(LIBTOOL) --mode=link $(LINK.cc) -o $(LIBRARY) $(LOBJ) -rpath $(libdir) -version-info $(EXIV2_LTVERSION) -no-undefined $(LIBS)
-       @touch lib
- path-test: path-test.o utils.o
diff --git a/0.24-autoconf.patch b/0.24-autoconf.patch
deleted file mode 100644 (file)
index 15fe28f..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
---- origsrc/exiv2-0.24/config/configure.ac     2013-07-23 21:47:31.000000000 -0500
-+++ src/exiv2-0.24/config/configure.ac 2014-04-30 19:04:51.899862500 -0500
-@@ -36,6 +36,7 @@ AC_CANONICAL_HOST
- # i18n support
- # ---------------------------------------------------------------------------
- AM_GNU_GETTEXT([external])
-+AM_GNU_GETTEXT_VERSION([0.18.1])
- # ---------------------------------------------------------------------------
- # Libtool support
-@@ -111,12 +112,12 @@ AC_ARG_ENABLE(visibility,
- AC_MSG_RESULT($VISIBILITY_SUPPORT)
- if test "$VISIBILITY_SUPPORT" = "yes"; then
-     # Sun Studio C++ compiler (which apparently ignores -fvisibility-inlines-hidden)
--    AX_CXX_CHECK_FLAG(-xldscope=hidden,[],[],[VISIBILITY_SUPPORT=yes],[VISIBILITY_SUPPORT=no])
-+    AX_CHECK_COMPILE_FLAG(-xldscope=hidden,[],[],[VISIBILITY_SUPPORT=yes],[VISIBILITY_SUPPORT=no])
-     if test "$VISIBILITY_SUPPORT" = "yes"; then
-         CXXFLAGS="${CXXFLAGS} -xldscope=hidden"
-     else
-         # GNU g++
--        AX_CXX_CHECK_FLAG(-fvisibility-inlines-hidden,[],[],[VISIBILITY_SUPPORT=yes],[VISIBILITY_SUPPORT=no])
-+        AX_CHECK_COMPILE_FLAG(-fvisibility-inlines-hidden,[],[],[VISIBILITY_SUPPORT=yes],[VISIBILITY_SUPPORT=no])
-         if test "$VISIBILITY_SUPPORT" = "yes"; then
-            CXXFLAGS="${CXXFLAGS} -fvisibility=hidden -fvisibility-inlines-hidden"
-         fi
---- origsrc/exiv2-0.24/src/Makefile    2014-04-30 19:02:47.009503400 -0500
-+++ src/exiv2-0.24/src/Makefile        2014-04-30 19:10:28.462600500 -0500
-@@ -94,10 +94,8 @@ CCSRC =  asfvideo.cpp          \
-        orfimage.cpp          \
-        panasonicmn.cpp       \
-        pgfimage.cpp
--ifdef HAVE_LIBZ
- CCSRC += pngimage.cpp      \
-        pngchunk.cpp
--endif
- CCSRC += preview.cpp       \
-        properties.cpp        \
-        psdimage.cpp          \
diff --git a/0.25-find-libintl.patch b/0.25-find-libintl.patch
new file mode 100644 (file)
index 0000000..a51e52d
--- /dev/null
@@ -0,0 +1,29 @@
+--- origsrc/exiv2-0.25/config/CMakeChecks.txt  2015-04-30 10:31:18.000000000 -0500
++++ src/exiv2-0.25/config/CMakeChecks.txt      2015-10-26 10:57:55.775278600 -0500
+@@ -38,6 +38,7 @@ INCLUDE( CheckCSourceCompiles )
+ INCLUDE( CheckCXXSourceCompiles )
+ INCLUDE( FindIconv )
++INCLUDE( FindIntl )
+ SET( STDC_HEADERS ON )
+ SET( HAVE_DECL_STRERROR_R 0 )
+@@ -107,6 +108,7 @@ ELSE( EXIV2_ENABLE_SHARED )
+ ENDIF( EXIV2_ENABLE_SHARED )
+ IF( EXIV2_ENABLE_NLS )
++    SET( ENABLE_NLS 1 )
+     IF( NOT LOCALEDIR )
+         SET( LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale" )
+         IF( WIN32 )
+--- origsrc/exiv2-0.25/src/CMakeLists.txt      2015-10-26 03:33:23.828439800 -0500
++++ src/exiv2-0.25/src/CMakeLists.txt  2015-10-26 10:56:30.452094600 -0500
+@@ -280,7 +280,7 @@ IF( EXIV2_ENABLE_PNG )
+ ENDIF()
+ IF( EXIV2_ENABLE_NLS )
+-    TARGET_LINK_LIBRARIES( exiv2lib ${LIBINTL_LIBRARIES} )
++    TARGET_LINK_LIBRARIES( exiv2lib ${Intl_LIBRARIES} )
+ ENDIF( EXIV2_ENABLE_NLS )
+ IF( ICONV_FOUND )
index f9cea50663891af3986104d42016ef8d5cf78a94..fb9957d498dccfb24e49f39398ffca5b0a6b15be 100644 (file)
@@ -1,6 +1,8 @@
+inherit cmake
+
 NAME="exiv2"
-VERSION=0.24
-RELEASE=2
+VERSION=0.25
+RELEASE=1
 CATEGORY="Libs"
 SUMMARY="Exiv, IPTC, and XMP image metadata library"
 DESCRIPTION="Exiv2 is a C++ library and a command line utility to access
@@ -8,26 +10,26 @@ Exiv, IPTC, and XMP image metadata."
 HOMEPAGE="http://www.exiv2.org/"
 SRC_URI="http://www.exiv2.org/exiv2-${VERSION}.tar.gz"
 PATCH_URI="
-       http://pkgs.fedoraproject.org/cgit/exiv2.git/plain/exiv2-0.24-CVE-2014-9449.patch
-       0.17.1-no-undefined.patch
-       0.24-autoconf.patch
+       http://pkgs.fedoraproject.org/cgit/exiv2.git/plain/exiv2-0.24-cmake_mandir.patch
+       0.25-find-libintl.patch
 "
 
-PKG_NAMES="${NAME} lib${NAME}_13 lib${NAME}-devel"
+PKG_NAMES="${NAME} lib${NAME}_14 lib${NAME}-devel"
 exiv2_CATEGORY="Graphics"
 exiv2_SUMMARY=${SUMMARY/library/utility}
 exiv2_CONTENTS="--exclude=html usr/bin/*.exe usr/share/"
-libexiv2_13_CONTENTS="usr/bin/cygexiv2-13.dll"
+libexiv2_14_CONTENTS="usr/bin/cygexiv2-14.dll"
 libexiv2_devel_CONTENTS="usr/include/ usr/lib/"
 
-src_compile() {
-       cd ${S}
-       rm -f config/aclocal.m4
-       ln -s config/configure.ac .
-       NO_AUTOHEADER=1 cygautoreconf
-       rm configure.ac
-       lndirs
+DIFF_EXCLUDES="exv_conf.h svn_version.h"
+
+CYGCMAKE_ARGS="
+       -DEXIV2_ENABLE_BUILD_PO:BOOL=ON
+       -DEXIV2_ENABLE_BUILD_SAMPLES:BOOL=OFF
+"
+
+src_install() {
        cd ${B}
-       cygconf --disable-visibility
-       cygmake
+       cyginstall
+       rm -f ${D}/usr/lib/pkgconfig/*.lsm
 }
This page took 0.025725 seconds and 5 git commands to generate.