summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/openjpeg')
-rw-r--r--media-libs/openjpeg/ChangeLog8
-rw-r--r--media-libs/openjpeg/Manifest13
-rw-r--r--media-libs/openjpeg/files/openjpeg-1.4-linking.patch11
-rw-r--r--media-libs/openjpeg/openjpeg-1.4.ebuild54
4 files changed, 79 insertions, 7 deletions
diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog
index 99e570021edb..1412b90e56a9 100644
--- a/media-libs/openjpeg/ChangeLog
+++ b/media-libs/openjpeg/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-libs/openjpeg
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.42 2011/03/25 09:48:06 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.43 2011/03/30 12:35:31 scarabeus Exp $
+
+*openjpeg-1.4 (30 Mar 2011)
+
+ 30 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> +openjpeg-1.4.ebuild,
+ +files/openjpeg-1.4-linking.patch:
+ Version bump. Move to cmake build system and make sure we link to lm.
25 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> openjpeg-1.3-r3.ebuild:
ppc64 stable wrt #356857
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index fcd4c890cbdd..02164be8fe4e 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -8,18 +8,19 @@ AUX openjpeg-1.3-codec-Makefile 722 RMD160 fdc0880dfab7f82d56716afb9b73a283953f0
AUX openjpeg-1.3-darwin.patch 1176 RMD160 b05ce81dfecfa41f15a4f70041a3fa04c70926cb SHA1 49b47307bc11334010c23082ccedc56fd8ba085d SHA256 f23683a40a73745ab1a1914ff75f4bd6da3aaccaeef088cf8c8a9ac6f6673a62
AUX openjpeg-1.3-freebsd.patch 672 RMD160 b368524439bd11d3c68bc6e2b4aa129c08e7dd5a SHA1 8d51276c8d1ade2a7fe8ff76937d87c69daa7e51 SHA256 ea7113fbe3cdc2bc3d9199b266824be74f3556025a512c0cd2435797aa385809
AUX openjpeg-1.3-r3-codec-Makefile 520 RMD160 c531f8b8d7bbd3b24606e52ad1d3cb32c485e08e SHA1 91fa1601c45549a4b6a4f7953339033afdc91a7f SHA256 4e9e389ad7cc05d41df63f0e4cb4a6fc5d107a02933dae14a40a5f788d9460cf
+AUX openjpeg-1.4-linking.patch 595 RMD160 6177609274bd222c2a73c4f56db0b234306c5b20 SHA1 41fbd01354e004f2333a8f4cc74ee5847e9340f8 SHA256 cc79c403d8c9530fe753c5f9cf58d4ab8f95935cf88e02edfe31c98f445b3d0a
DIST openjpeg_v1_3.tar.gz 1004678 RMD160 2a22cc123058b1974cd1bf3898044acabceba26c SHA1 8d6870d9500ea09e0b1d30b981bea1c8de534de4 SHA256 3bca2e1e040f9dcbbcb1e0627f17a76eeb95e153bf663d082070c044a21202bd
+DIST openjpeg_v1_4_sources_r697.tgz 2365447 RMD160 c0d88c4a312651bac17d50bd6917e1b678fcf8f7 SHA1 9ef6a08ecf5944962b4e2cd7569ac01a8eaa66d0 SHA256 493e4db087bf5c5485618a1e1cfd827c4fb2ad421a4342903b166b76cf094b73
EBUILD openjpeg-1.3-r2.ebuild 1377 RMD160 fdcd0f029eb7a6928b0466422a4f4a164cafb0ba SHA1 31fa28b2a3bab59a12c8051901a6efd05c4d6a51 SHA256 71c074f8d020d6cb61db8a8c0fc31ccf891c991d72ec8f30aa1009df46128be4
EBUILD openjpeg-1.3-r3.ebuild 1611 RMD160 9e9441319088983dfe7c5d68598c199940c22bdb SHA1 db31174ea977d7b0cbc747a4e1de07da952b7a15 SHA256 7eaea3ee9cb6c7fb436f67b41a0d6c7760aba6cef185ad7faf14b10ee93babdf
EBUILD openjpeg-1.3.ebuild 1219 RMD160 5e7b3d3a7c6d589caf0817ba98400960e99b7afa SHA1 f31d8abaa4b7c6904da50d345ec61d5ebe5c44e7 SHA256 579e8185a32741b71355f8aa86252f714eee7fcc89f0640eb0a65f8fb7ecf080
-MISC ChangeLog 5869 RMD160 44e588a4042508dddba8f42ceff599dfe937ea25 SHA1 6a57f724494d1625d6700d207b88f89b763996f8 SHA256 b7249afb9e69882687f98647c77d747bacc54cc2eb4400690fcf9a3a308e375e
+EBUILD openjpeg-1.4.ebuild 1298 RMD160 abab6fce68ee5cef0270ccac7c71a60e2ffd3bb4 SHA1 ee642353ee001fc5bb28a46f37d949a2e4e4cdcf SHA256 a62f23bef494522393508de8fa1606ef6006a7b6f361d5fa499bd2d148d50f81
+MISC ChangeLog 6084 RMD160 a09fd6ae4771654885d5a1aa1b11f493a5a2f15c SHA1 894bd459c94b222dcabc46c53cc58778a7a4b04b SHA256 c19c910018546bbc8dbfc1eee24a372686c28e8c561f85676c649f7e50f8f988
MISC metadata.xml 257 RMD160 80c1eb9046b53f99e237da460c933b844ccc7b63 SHA1 84398d153001807fcb12f140046c03c71f81afb3 SHA256 f59744ea0de26f01b0beefb513cb99989c8d295b37b738fbc7814a43ccfb9e59
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iJwEAQECAAYFAk2MZNsACgkQIiMqcbOVdxTiyQP/SoJ8Qe5wKDx4CCPQqVgoIkPT
-F8YGCgTj6ZoQtkBPoxoYrXYT3E0XO4+fGmJ4u6ku/lB+1WgFL637guJ77bDANC5j
-BM/jiq4EzEIw8Gehd3p7eML043yAbXlECEErxS4KYqitGIvzTtCwx+bQJev4gvaL
-+J0qd5nXNu7/qecCcQA=
-=twEZ
+iEYEARECAAYFAk2TIs4ACgkQHB6c3gNBRYd9CACfWWUlLN5kxBk9H2DSRXAkCA8r
+q5oAoITZaLUsxuGjUl+snr0c/5Yi5S4K
+=xQKB
-----END PGP SIGNATURE-----
diff --git a/media-libs/openjpeg/files/openjpeg-1.4-linking.patch b/media-libs/openjpeg/files/openjpeg-1.4-linking.patch
new file mode 100644
index 000000000000..a7963ce97d91
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-1.4-linking.patch
@@ -0,0 +1,11 @@
+diff -urN openjpeg_v1_4_sources_r697.old/libopenjpeg/CMakeLists.txt openjpeg_v1_4_sources_r697/libopenjpeg/CMakeLists.txt
+--- openjpeg_v1_4_sources_r697.old/libopenjpeg/CMakeLists.txt 2011-03-30 14:25:14.000000000 +0200
++++ openjpeg_v1_4_sources_r697/libopenjpeg/CMakeLists.txt 2011-03-30 14:25:50.000000000 +0200
+@@ -30,6 +30,7 @@
+ ENDIF(BUILD_SHARED_LIBS)
+ ENDIF(WIN32)
+ ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
++TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME} -lm)
+ SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
+
+ # Install library
diff --git a/media-libs/openjpeg/openjpeg-1.4.ebuild b/media-libs/openjpeg/openjpeg-1.4.ebuild
new file mode 100644
index 000000000000..a82f495d8620
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-1.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.4.ebuild,v 1.1 2011/03/30 12:35:31 scarabeus Exp $
+
+EAPI=4
+
+MY_P="${PN}_v${PV/./_}_sources_r697"
+
+inherit base cmake-utils multilib
+
+DESCRIPTION="An open-source JPEG 2000 codec written in C"
+HOMEPAGE="http://code.google.com/p/openjpeg/"
+SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="doc test"
+
+RDEPEND="
+ media-libs/libpng
+ media-libs/tiff
+ media-libs/lcms:2
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}/${P}-linking.patch"
+)
+
+src_prepare() {
+ # drop install of license file
+ sed -i -e 's:LICENSE::g' CMakeLists.txt || die
+
+ base_src_prepare
+}
+
+src_configure() {
+ # in the package dir are only useless modules
+ # but might be good for documentation :)
+ local mycmakeargs=(
+ "-DOPENJPEG_INSTALL_LIB_DIR=$(get_libdir)"
+ "-DOPENJPEG_INSTALL_DOC_DIR=share/doc/${PF}"
+ "-DOPENJPEG_INSTALL_PACKAGE_DIR=share/doc/${PF}"
+ $(cmake-utils_use_build test TESTING)
+ $(cmake-utils_use_build doc)
+ )
+
+ cmake-utils_src_configure
+}