media-gfx/imageworsener: Bump to 0.9.5

(Portage version: 2.1.10.27/cvs/Linux x86_64)

4 files changed, 118 insertions, 1 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/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}"
+}