media-gfx/imageworsener: Bump to 0.9.5

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

5 files changed, 127 insertions, 8 deletions

diff --git a/media-gfx/imageworsener/ChangeLog b/media-gfx/imageworsener/ChangeLog
index 9a3e84727c77..63d2f9de9550 100644
--- a/media-gfx/imageworsener/ChangeLog
+++ b/media-gfx/imageworsener/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/imageworsener
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imageworsener/ChangeLog,v 1.8 2011/09/02 22:00:02 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imageworsener/ChangeLog,v 1.9 2011/10/20 00:47:21 sping Exp $
+
+*imageworsener-0.9.5 (20 Oct 2011)
+
+  20 Oct 2011; Sebastian Pipping <sping@gentoo.org>
+  +imageworsener-0.9.5.ebuild,
+  +files/imageworsener-0.9.5-disable-webp-tests.patch,
+  +files/imageworsener-0.9.5-webp.patch:
+  Bump to 0.9.5. Upstream has moved to CMake, libwebp detection needed
+  patching, libwebp 0.1.2 too old, bug #387761 opened for that.
 
 *imageworsener-0.9.4 (02 Sep 2011)
 
diff --git a/media-gfx/imageworsener/Manifest b/media-gfx/imageworsener/Manifest
index cca0e2fe84b7..59e84745f73b 100644
--- a/media-gfx/imageworsener/Manifest
+++ b/media-gfx/imageworsener/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX imageworsener-0.9.5-disable-webp-tests.patch 964 RMD160 6de3531d7e81bd85e765eb94e10e68851fa1fd7b SHA1 4cfc004a80abdc1dec8c65cae014ea6996001604 SHA256 4722825146d0ec7c72c56782032b494c1efae987d4851a8ffed878d753d4ebdc
+AUX imageworsener-0.9.5-webp.patch 805 RMD160 999557739af85b9e3fae12cafd880e4be42ab7e5 SHA1 4bf5da976e3fc373e76e7c980897c25d355a6a81 SHA256 494b90acd9609ab122928369fd94e355f898c4ca63a2854ebbdb39d364ac35aa
 DIST imageworsener-src-0.9.2.tar.gz 211670 RMD160 beb6a4be6c021117007f7bb779c628b0f40f1722 SHA1 c56203eb350d5fb385d9d8633b35cdc8f71bbee4 SHA256 f9fa780841d9019817a9bcdccecf6652b2900c3ae7e96b63a60420cd3ac27248
 DIST imageworsener-src-0.9.3.tar.gz 225767 RMD160 441a90aa66ed2b2fb213cba35f917b09fee5cc0d SHA1 30b23e16334c2c2a569926c311ed4e28bd678226 SHA256 1ed35c5f1f0c4347033c476b909ad9647b70706708941482f73e069b1daa00ff
 DIST imageworsener-src-0.9.4.tar.gz 233170 RMD160 668e38fc925692bfddf9f91e4d9bd647fc2ee639 SHA1 f6e8c52a8108cbb957fe4585a30a3cdbd478ad85 SHA256 dae22b503d4512652494958a5e3039b6549fca700e7f11349b05e4bbe7ff8268
+DIST imageworsener-src-0.9.5.tar.gz 241698 RMD160 bb619561da553f8fc670c1b2e36bbb5b4f866b98 SHA1 98908daf4867ade7653317188a85061dd5bc623d SHA256 bdc2e3a5e1ca18f0f34bdeacb6a0e1a67559c6504868cb2dcbf307aedc196fdd
 EBUILD imageworsener-0.9.2.ebuild 884 RMD160 4edb2f622f3f3a60e99a2de0a41be753364303f8 SHA1 fc3b96259f444403394161a453bdd136addd2c77 SHA256 34c639d47e0b7da12ab6b1474e08686d631d9a4d9db218ba9fbdeb8b9cf2f349
 EBUILD imageworsener-0.9.3.ebuild 915 RMD160 6e47b2daa0023ed4d58eeb0960f0ec0b4d723b87 SHA1 b9e90249ea3b4d85320a72d8ffc44a51ec6ada5e SHA256 7993afe2ddb85c06374fa5cabc87720d9fb76a5bd660be2c2272952715e29962
 EBUILD imageworsener-0.9.4.ebuild 912 RMD160 c718d3a966d3a5f2b3ca933170eef44d6032dcb8 SHA1 78d1a2a6525a16ceaacddf815cdd833981e0b58e SHA256 b1f9d73d5acd422f8eddbe76f36fdb6a742800875adf7c0f84ea19afdf629a18
-MISC ChangeLog 1266 RMD160 f4ddda7a0969be90f6ec63487f2107df4262938c SHA1 6d6fcdc315907966f2d14ed9e093b0e440134687 SHA256 322853d2138ca14fb6edbb314efb729f1e3de9b836efd1bf7397bf3fa5cb277a
+EBUILD imageworsener-0.9.5.ebuild 1134 RMD160 fa4ed47247ace8c585a3f8bd13385f490963d9ed SHA1 631d4adb649f2f3fe58cc6cc79450a3ae8c38fff SHA256 4cb2e2af620969e7617afaf1b921b826e3f5ed0ff0e0a84f1eb4baf24081f48a
+MISC ChangeLog 1617 RMD160 8bb5a81167b0e5dfffc40c4fcd802dc575949971 SHA1 a0076251003b537b3081b05ed6922d52f1c4d226 SHA256 e645f6912ac2ca86787347bde965946e1f71ffc023bfe154a05ce07c02045bb4
 MISC metadata.xml 322 RMD160 3f81d1aac2d1c0e2dda5ecb58f1761d2e7543b1e SHA1 debe07c5c6597a20a6ca6932fc17974d7db76f19 SHA256 baae59b5e1a61c90864f40c25538fcafaab451b905218ddc5f9335bb3fe1a44d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59ov4ACgkQfXuS5UK5QB2p7wP8DcFcQl86Hd2FQyHkX3vt9cUO
-i4rm6nVNcpNrZUAJgO1Z3hq2rueg0C+aOac6pKKWAN7JVya1jUZKQMa9XsPy2/dG
-LqpwGutruK5R7zNLR/n93hJnoF6xXB7QWJMHlDBNz4l3zKXfGLXYa0U3h4n9qiT+
-ul7ZVdVdJRhbJwU/iJw=
-=pRqd
+iEYEARECAAYFAk6fb5oACgkQsAvGakAaFgA/+ACdEPVSHfcBk65/zO0FvhLuJ/oV
+OxIAoMC0mjTiGRNhNjQ7lzLgfHjKi6uG
+=srq9
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/imageworsener/files/imageworsener-0.9.5-disable-webp-tests.patch b/media-gfx/imageworsener/files/imageworsener-0.9.5-disable-webp-tests.patch
new file mode 100644
index 000000000000..41b15fb55f6a
--- /dev/null
+++ b/media-gfx/imageworsener/files/imageworsener-0.9.5-disable-webp-tests.patch
@@ -0,0 +1,31 @@
+--- tests/runtest	2011-10-08 04:02:28.000000000 +0200
++++ test/runtest	2011-10-20 02:36:57.839706231 +0200
+@@ -58,7 +58,7 @@
+ 	mkdir actual
+ fi
+ 
+-rm -f actual/*.png actual/*.jpg actual/*.bmp actual/*.tif actual/*.miff actual/*.webp
++rm -f actual/*.png actual/*.jpg actual/*.bmp actual/*.tif actual/*.miff
+ 
+ echo "Creating images..."
+ 
+@@ -156,10 +156,6 @@
+ $IW srcimg/g8a.png actual/miff32.miff -width 11 -depth 32
+ $IW srcimg/rgb16.png actual/miff64.miff -width 11 -depth 64
+ 
+-# Test writing WebP
+-$IW srcimg/rgb16.png actual/webp1.webp -width 23
+-$IW srcimg/g8.png actual/webp2.webp -width 24 -grayscale
+-
+ # Extra pixel density tests
+ $IW srcimg/rgb8x1.png actual/dens-1.png $DCMPR $SCALE -filter mix
+ $IW srcimg/rgb8x2.png actual/dens-2.png $DCMPR $SCALE -filter mix
+@@ -200,7 +196,7 @@
+ 
+ FAIL=0
+ for ff in expected/*.png expected/*.jpg expected/*.bmp expected/*.tif \
+- expected/*.miff expected/*.webp
++ expected/*.miff
+ do
+ 	f=${ff#expected/}
+ 	#echo $f
diff --git a/media-gfx/imageworsener/files/imageworsener-0.9.5-webp.patch b/media-gfx/imageworsener/files/imageworsener-0.9.5-webp.patch
new file mode 100644
index 000000000000..64cf57481558
--- /dev/null
+++ b/media-gfx/imageworsener/files/imageworsener-0.9.5-webp.patch
@@ -0,0 +1,29 @@
+--- CMakeLists.txt	2011-10-08 04:02:28.000000000 +0200
++++ CMakeLists.txt	2011-10-20 02:18:25.705609820 +0200
+@@ -51,7 +51,6 @@
+ 
+ set(IW_SUPPORT_JPEG 0)
+ set(IW_SUPPORT_PNG 0)
+-set(IW_SUPPORT_WEBP 0)
+ 
+ find_package(JPEG)
+ if(JPEG_FOUND)
+@@ -101,7 +102,6 @@
+ endif()
+ 
+ if(EXISTS "${LIBWEBP_LIBFILE}")
+-  set(IW_SUPPORT_WEBP 1)
+   set(WEBP_INCLUDE_DIR "${LIBWEBP_DIR}/src")
+   set(WEBP_LIBRARIES "${LIBWEBP_LIBFILE}")
+   message(STATUS "Found WebP: ${WEBP_LIBRARIES}")
+@@ -132,8 +132,8 @@
+ target_link_libraries(imagew imageworsener)
+ 
+ if(IW_SUPPORT_WEBP)
+-  include_directories(${WEBP_INCLUDE_DIR})
+-  target_link_libraries(imagew ${WEBP_LIBRARIES})
++  include_directories(/usr/include/wepb)
++  target_link_libraries(imagew webp)
+ endif()
+ if(IW_SUPPORT_PNG)
+   include_directories(${PNG_INCLUDE_DIR})
diff --git a/media-gfx/imageworsener/imageworsener-0.9.5.ebuild b/media-gfx/imageworsener/imageworsener-0.9.5.ebuild
new file mode 100644
index 000000000000..a5f731fad825
--- /dev/null
+++ b/media-gfx/imageworsener/imageworsener-0.9.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imageworsener/imageworsener-0.9.5.ebuild,v 1.1 2011/10/20 00:47:21 sping Exp $
+
+EAPI="2"
+
+CMAKE_IN_SOURCE_BUILD=1
+CMAKE_VERBOSE=1
+inherit eutils cmake-utils
+
+MY_P="${PN}-src-${PV}"
+MY_PN="imagew"
+
+DESCRIPTION="Utility for image scaling and processing"
+HOMEPAGE="http://entropymine.com/imageworsener/"
+SRC_URI="http://entropymine.com/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"  # TODO webp
+
+DEPEND="media-libs/libpng:0
+	virtual/jpeg"
+	# TODO webp? ( >=media-libs/libwebp-0.1.3 )
+	# TODO test? ( >=media-libs/libwebp-0.1.3 )
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# TODO bring back webp tests
+	epatch "${FILESDIR}"/${P}-webp.patch \
+			"${FILESDIR}"/${P}-disable-webp-tests.patch
+}
+
+src_configure() {
+	mycmakeargs=( -DIW_SUPPORT_WEBP=0 )
+	cmake-utils_src_configure
+}
+
+src_install() {
+	dobin ${MY_PN} || die "dobin failed."
+	dodoc readme.txt technical.txt changelog.txt || die
+}
+
+src_test() {
+	cd "${S}/tests" || die
+	./runtest "${S}/${MY_PN}"
+}