[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam-software-compilation] project/bundles/3rdparty/ext_exiv2: polish
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2016-11-30 21:49:55
Message-ID: E1cCClH-0007HO-5I () code ! kde ! org
[Download RAW message or body]

Git commit ceef5d70c9e21be1fba4c32f7b1c214836eb465d by Gilles Caulier.
Committed on 30/11/2016 at 21:49.
Pushed by cgilles into branch 'master'.

polish

M  +5    -6    project/bundles/3rdparty/ext_exiv2/CMakeLists.txt
D  +0    -30   project/bundles/3rdparty/ext_exiv2/exiv2-config-macports.patch

https://commits.kde.org/digikam-software-compilation/ceef5d70c9e21be1fba4c32f7b1c214836eb465d


diff --git a/project/bundles/3rdparty/ext_exiv2/CMakeLists.txt \
b/project/bundles/3rdparty/ext_exiv2/CMakeLists.txt index 558c0b0..8230f97 100755
--- a/project/bundles/3rdparty/ext_exiv2/CMakeLists.txt
+++ b/project/bundles/3rdparty/ext_exiv2/CMakeLists.txt
@@ -52,15 +52,14 @@ elseif(APPLE)
 
         SVN_REPOSITORY svn://dev.exiv2.org/svn/trunk
 
-        PATCH_COMMAND ${PATCH_COMMAND} -p0 -i \
                ${CMAKE_CURRENT_SOURCE_DIR}/exiv2-trunk.patch &&
-                      ${PATCH_COMMAND} -p0 -i \
                ${CMAKE_CURRENT_SOURCE_DIR}/exiv2-config-macports.patch
-
+        PATCH_COMMAND ${PATCH_COMMAND} -p0 -i \
${CMAKE_CURRENT_SOURCE_DIR}/exiv2-trunk.patch  
-        CONFIGURE_COMMAND <SOURCE_DIR>/bootstrap.macports ${PREFIX_ext_exiv2} \
relwithdebinfo x86_64 +        CONFIGURE_COMMAND cp -f \
${CMAKE_CURRENT_SOURCE_DIR}/../../../../bootstrap.macports <SOURCE_DIR>/. && +        \
<SOURCE_DIR>/bootstrap.macports ${PREFIX_ext_exiv2} relwithdebinfo x86_64 \
"-DEXIV2_ENABLE_SHARED=ON -DEXIV2_ENABLE_XMP=ON -DEXIV2_ENABLE_LIBXMP=ON \
-DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PRINTUCS2=ON \
-DEXIV2_ENABLE_LENSDATA=ON -DEXIV2_ENABLE_COMMERCIAL=OFF \
-DEXIV2_ENABLE_BUILD_SAMPLES=OFF -DEXIV2_ENABLE_BUILD_PO=OFF -DEXIV2_ENABLE_VIDEO=OFF \
-DEXIV2_ENABLE_WEBREADY=OFF -DEXIV2_ENABLE_CURL=OFF -DEXIV2_ENABLE_SSH=OFF"  
-        BUILD_COMMAND cd <SOURCE_DIR>/build.cmake && make -j
+        BUILD_COMMAND cd <SOURCE_DIR>/build && make -j
 
-        INSTALL_COMMAND cd <SOURCE_DIR>/build.cmake && make install/fast
+        INSTALL_COMMAND cd <SOURCE_DIR>/build && make install/fast
 
         BUILD_IN_SOURCE 1
 
diff --git a/project/bundles/3rdparty/ext_exiv2/exiv2-config-macports.patch \
b/project/bundles/3rdparty/ext_exiv2/exiv2-config-macports.patch deleted file mode \
100644 index 9a66953..0000000
--- a/project/bundles/3rdparty/ext_exiv2/exiv2-config-macports.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: bootstrap.macports
-===================================================================
---- bootstrap.macports	(revision 4686)
-+++ bootstrap.macports	(working copy)
-@@ -63,17 +63,17 @@
-       -DEXIV2_ENABLE_SHARED=ON \
-       -DEXIV2_ENABLE_XMP=ON \
-       -DEXIV2_ENABLE_LIBXMP=ON \
--      -DEXIV2_ENABLE_VIDEO=ON \
-       -DEXIV2_ENABLE_PNG=ON \
--      -DEXIV2_ENABLE_NLS=ON \
-+      -DEXIV2_ENABLE_NLS=OFF \
-       -DEXIV2_ENABLE_PRINTUCS2=ON \
-       -DEXIV2_ENABLE_LENSDATA=ON \
-       -DEXIV2_ENABLE_COMMERCIAL=OFF \
--      -DEXIV2_ENABLE_BUILD_SAMPLES=ON \
--      -DEXIV2_ENABLE_BUILD_PO=ON \
--      -DEXIV2_ENABLE_VIDEO=ON \
--      -DEXIV2_ENABLE_WEBREADY=ON \
--      -DEXIV2_ENABLE_CURL=ON \
--      -DEXIV2_ENABLE_SSH=ON \
-+      -DEXIV2_ENABLE_BUILD_SAMPLES=OFF \
-+      -DEXIV2_ENABLE_BUILD_PO=OFF \
-+      -DEXIV2_ENABLE_VIDEO=OFF \
-+      -DEXIV2_ENABLE_WEBREADY=OFF \
-+      -DEXIV2_ENABLE_CURL=OFF \
-+      -DEXIV2_ENABLE_SSH=OFF \
-+      -DEXV_WANT_VISIBILITY_SUPPORT=ON \
-       -Wno-dev \
-       ..


[prev in list] [next in list] [prev in thread] [next in thread]