Version bump wrt bug #419977. Drop unused dep on zlib. Respect LDFLAGS when tests are enabled. Add patch from Fedora to fix build with GCC 4.7.

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

5 files changed, 127 insertions, 10 deletions

diff --git a/media-libs/opengtl/ChangeLog b/media-libs/opengtl/ChangeLog
index 8fbc6b8def62..8db8be974966 100644
--- a/media-libs/opengtl/ChangeLog
+++ b/media-libs/opengtl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/opengtl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/ChangeLog,v 1.8 2012/05/30 15:46:07 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/ChangeLog,v 1.9 2012/06/07 10:50:51 kensington Exp $
+
+*opengtl-0.9.17 (07 Jun 2012)
+
+  07 Jun 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/opengtl-0.9.17-gcc-4.7.patch, +files/opengtl-0.9.17-ldflags.patch,
+  +opengtl-0.9.17.ebuild:
+  Version bump wrt bug #419977. Drop unused dep on zlib. Respect LDFLAGS when
+  tests are enabled. Add patch from Fedora to fix build with GCC 4.7.
 
   30 May 2012; Johannes Huber <johu@gentoo.org> opengtl-0.9.16.ebuild:
   Pin llvm version by Franz Fellner <alpine.art.de@googlemail.com> wrt bug
diff --git a/media-libs/opengtl/Manifest b/media-libs/opengtl/Manifest
index 6c4f0ab6351e..307db9a6a854 100644
--- a/media-libs/opengtl/Manifest
+++ b/media-libs/opengtl/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX opengtl-0.9.17-gcc-4.7.patch 1996 RMD160 bcc7b61c2e0ce953fbd9b4b78454603bd30dd084 SHA1 6ffa40d0e7c17df4831fad2e479847af01e328ba SHA256 36c0889bda87d746f7d33720efe863673def99be03da7435cec7a065a5076fa7
+AUX opengtl-0.9.17-ldflags.patch 613 RMD160 8a7fdd56dc737e455dc748a6a8c13fe949df602b SHA1 ef4b4897666390b7d64ded133a0cf73957a3b38c SHA256 d563584386bd04294f4f8934f78b290c2950120934353026a79857f14453d9d8
 DIST OpenGTL-0.9.15.2.tar.bz2 495966 RMD160 e77ba56b0dfe92361724aae02c5817248355b52d SHA1 b6beea4086a0907dcdb326d421d253f368689b45 SHA256 306427f2814439703f13b6ee17092c466172c4df57cdb896b6e5eadfa1154ae2
 DIST OpenGTL-0.9.16.tar.bz2 533833 RMD160 77cac5891ff5c620092c815d80681373cf3d9145 SHA1 3cfe4a08e5778c13f7e74dfc822adb68f97ad048 SHA256 81e81a53eeeb07e9e6a6ecfd0d960c10453fedc041ab7d885e66ee3053757107
+DIST OpenGTL-0.9.17.tar.bz2 534132 RMD160 f20591ca0c022bd3c5db3ef7672a105ec1c1188e SHA1 10369bd11109312466389b3b050469dd69e54d2b SHA256 89a37394fe71f2e771d7230333c86b93706f0083f86a58a86a670bca7e4f905e
 EBUILD opengtl-0.9.15.2.ebuild 959 RMD160 c5ecbef3d57687dd68870d37521c84fef933283c SHA1 be20a260eacc0ce762c181c897f66a3765923db1 SHA256 bf48e9189af3fd7845c83aaa97cc9f0c8dffa6b08ca4f11ed4e150f1addcc7e6
 EBUILD opengtl-0.9.16.ebuild 961 RMD160 2b76970e3c66270d33429a33f57592c9b12fadc4 SHA1 be377d8591269bac7fd2be37ee7f9f30254a5fe7 SHA256 ed7e224ae7611d6022cd9d1fa3e8036790360367bbf9d1ee62729c23e1b5aede
-MISC ChangeLog 1223 RMD160 c73f7a1dbdd4b0cf411eab46716e5ca458e17ec4 SHA1 29622963cee41bef996c831899a4bce821097b09 SHA256 284824f14c3b9aeadb0759048661e260b55450b32e2e2256d433812b11242104
+EBUILD opengtl-0.9.17.ebuild 1033 RMD160 dbb750d6cf3956a4ba070e9242aca917ea479804 SHA1 5fdff3b54c509dab74c989d1b70887c297be4a2a SHA256 253d15ef83d92ada99ed46069bceb1fab79f1e5d27d41cbda851fd357f29562b
+MISC ChangeLog 1567 RMD160 37255f2faca9eabd24c3c6212ba1372dd5ff6851 SHA1 ff9ef4778066cd95b88b6d4311521acfefdb88c4 SHA256 e7b6d57a7869b5dca4a346100ddd69cdfc5b21cb84cf4652b98d6fc98cffddda
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPxkC/AAoJEO+t9ga+3I3acYwH/R3L2z2AtWBeFEieE7eDB9Cp
-+faBFHRDaisjUE7fHRLhP6tNUGdXNqQ+3qeUyyI9wvS9xEoSDW34vn5ruv000m9g
-IPDPtWE02oZP1FFMUNhB5wYgsllmnWkb+zY4JNWy878pHJ5ibBjTs6wMRwOqEN00
-crSAfyX5LQ1jrmagcGj2lltV2kS1dD91357E7QGWnqLs4+IPRNFatQpDiBwnQK4s
-6nnm66HgUBw1Y+2zm2HIsuUdohEPpZPkhyZReDPi/ewmh+CCN1AdFuOlEZz0Vd/a
-X/f3eghldVhkhRcX7cjhtBqcI9aY3eQvYCgBY1hKvntJsL0wgDEEUtgxK8EsOXY=
-=OZIq
+iQEcBAEBAgAGBQJP0IdzAAoJEMbwO6tnXQ0s3nsH/2W95/tNH+RsVBVOEiUAcOOU
+JF2YFjUMpPF1xASWXCvfxXtp3s1RwYvrHB7BbOAdvNFMxI3Bh5ZLIINyoIh8UfZN
+yN+KkIHWqkX+z84N+oU09AtcRsgJI5PZSM7rP+sucwHaoK4NYzpanH6WZC7WiSLP
+YB/hT5l6WCK0B++hrJkBI3rhHpFCbrpwyzvFsyQeGTluINLu9KUuPvU4oe/9XwWX
+TFFe80qsFS0+ejLpewVmXpYk+oxnxCgCTRDAzUGdbT3UeBrLqFLfEGpWO/d5sZCa
+3xtUHIadOUQ9LPe1RVLmaOtqgk7zkhr3R7jR4IPXYm7q/KefjzKcwov/VR7PC+s=
+=Fsk7
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opengtl/files/opengtl-0.9.17-gcc-4.7.patch b/media-libs/opengtl/files/opengtl-0.9.17-gcc-4.7.patch
new file mode 100644
index 000000000000..c209bb9e581f
--- /dev/null
+++ b/media-libs/opengtl/files/opengtl-0.9.17-gcc-4.7.patch
@@ -0,0 +1,47 @@
+diff -up OpenGTL-0.9.15.2/OpenCTL/tests/library/TestCompileThreading.h.gcc47 OpenGTL-0.9.15.2/OpenCTL/tests/library/TestCompileThreading.h
+--- OpenGTL-0.9.15.2/OpenCTL/tests/library/TestCompileThreading.h.gcc47	2012-01-10 11:17:50.904275650 -0500
++++ OpenGTL-0.9.15.2/OpenCTL/tests/library/TestCompileThreading.h	2012-01-10 11:17:57.860216380 -0500
+@@ -19,6 +19,8 @@
+ 
+ #include "GTLTest/Thread.h"
+ 
++#include <unistd.h>
++
+ #ifdef GTLTEST_HAVE_THREAD
+ 
+ class MyThreadTCTLCT : public GTLTest::Thread
+diff -up OpenGTL-0.9.15.2/OpenCTL/tests/library/TestRuntimeThreading.h.gcc47 OpenGTL-0.9.15.2/OpenCTL/tests/library/TestRuntimeThreading.h
+--- OpenGTL-0.9.15.2/OpenCTL/tests/library/TestRuntimeThreading.h.gcc47	2012-01-10 11:18:19.128035026 -0500
++++ OpenGTL-0.9.15.2/OpenCTL/tests/library/TestRuntimeThreading.h	2012-01-10 11:18:28.365717117 -0500
+@@ -19,6 +19,8 @@
+ 
+ #include "GTLTest/Thread.h"
+ 
++#include <unistd.h>
++
+ #ifdef GTLTEST_HAVE_THREAD
+ 
+ class MyThreadTCTLRT : public GTLTest::Thread
+diff -up OpenGTL-0.9.15.2/OpenGTL/GTLCore/tests/TestMemoryManagerThread.h.gcc47 OpenGTL-0.9.15.2/OpenGTL/GTLCore/tests/TestMemoryManagerThread.h
+--- OpenGTL-0.9.15.2/OpenGTL/GTLCore/tests/TestMemoryManagerThread.h.gcc47	2011-10-30 10:32:09.000000000 -0400
++++ OpenGTL-0.9.15.2/OpenGTL/GTLCore/tests/TestMemoryManagerThread.h	2012-01-10 11:16:41.936863656 -0500
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include "GTLTest/Thread.h"
++#include <unistd.h>
+ 
+ #ifdef GTLTEST_HAVE_THREAD
+ 
+diff -up OpenGTL-0.9.15.2/OpenShiva/tests/library/TestKernelThreading.h.gcc47 OpenGTL-0.9.15.2/OpenShiva/tests/library/TestKernelThreading.h
+--- OpenGTL-0.9.15.2/OpenShiva/tests/library/TestKernelThreading.h.gcc47	2012-01-10 11:18:50.154530703 -0500
++++ OpenGTL-0.9.15.2/OpenShiva/tests/library/TestKernelThreading.h	2012-01-10 11:18:59.409451568 -0500
+@@ -21,6 +21,8 @@
+ #include "GTLCore/Image.h"
+ #include "GTLCore/Type.h"
+ 
++#include <unistd.h>
++
+ #ifdef GTLTEST_HAVE_THREAD
+ 
+ class MyThreadTCTLKT : public GTLTest::Thread
diff --git a/media-libs/opengtl/files/opengtl-0.9.17-ldflags.patch b/media-libs/opengtl/files/opengtl-0.9.17-ldflags.patch
new file mode 100644
index 000000000000..caac05be182a
--- /dev/null
+++ b/media-libs/opengtl/files/opengtl-0.9.17-ldflags.patch
@@ -0,0 +1,11 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -176,7 +176,7 @@
+         set( LCOV_RDIR "${CMAKE_BINARY_DIR}/lcov-report" )
+         add_definitions(-fprofile-arcs -ftest-coverage)
+         set (CMAKE_SHARED_LINKER_FLAGS  "${CMAKE_SHARED_LINKER_FLAGS} -fprofile-arcs -ftest-coverage")
+-        set (CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXEC_LINKER_FLAGS} -fprofile-arcs -ftest-coverage")
++        set (CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage")
+         add_custom_target( coverage-clean
+           COMMAND mkdir -p ${LCOV_RDIR}
+           COMMAND ${LCOV} -d ${CMAKE_BINARY_DIR} -z
diff --git a/media-libs/opengtl/opengtl-0.9.17.ebuild b/media-libs/opengtl/opengtl-0.9.17.ebuild
new file mode 100644
index 000000000000..cff5fbc6aae6
--- /dev/null
+++ b/media-libs/opengtl/opengtl-0.9.17.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opengtl/opengtl-0.9.17.ebuild,v 1.1 2012/06/07 10:50:51 kensington Exp $
+
+EAPI=4
+
+MY_P="OpenGTL-${PV}"
+
+inherit cmake-utils
+
+DESCRIPTION="Collection of libraries for graphics transformation algorithms"
+HOMEPAGE="http://opengtl.org/"
+SRC_URI="http://download.opengtl.org/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug test"
+
+RDEPEND="
+	media-libs/libpng
+	=sys-devel/llvm-3.1*
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/lcov )
+"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${P}-ldflags.patch"
+	"${FILESDIR}/${P}-gcc-4.7.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use debug OPENGTL_ENABLE_DEBUG_OUTPUT)
+		$(cmake-utils_use test OPENGTL_BUILD_TESTS)
+		$(cmake-utils_use test OPENGTL_CODE_COVERAGE)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newdoc OpenShiva/doc/reference/region.pdf OpenShiva.pdf
+}