Fixes for bug #118162.

(Portage version: 2.0.53)

5 files changed, 66 insertions, 1 deletions

diff --git a/www-apps/gallery/ChangeLog b/www-apps/gallery/ChangeLog
index aed38c0eb84c..722eebc079fd 100644
--- a/www-apps/gallery/ChangeLog
+++ b/www-apps/gallery/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/gallery
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.44 2006/01/06 14:03:16 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/ChangeLog,v 1.45 2006/01/07 15:46:45 rl03 Exp $
+
+*gallery-2.0.2-r1 (07 Jan 2006)
+
+  07 Jan 2006; Renat Lumpau <rl03@gentoo.org>
+  +files/FfmpegToolkit.class.patch, +gallery-2.0.2-r1.ebuild:
+  Fixes for bug #118162.
 
   06 Jan 2006; Simon Stelling <blubb@gentoo.org> gallery-1.5.1.ebuild,
   gallery-2.0.2.ebuild:
diff --git a/www-apps/gallery/Manifest b/www-apps/gallery/Manifest
index d127923a7260..c3bde0d36aca 100644
--- a/www-apps/gallery/Manifest
+++ b/www-apps/gallery/Manifest
@@ -1,12 +1,15 @@
 MD5 685d561b2037d51c77d8d1cbe9dbc268 ChangeLog 9960
+MD5 88069f3f6c274e4285bbbba7f5cb5a4f files/FfmpegToolkit.class.patch 576
 MD5 57ed8c8bd13cb72d366ece232dcc2fe9 files/digest-gallery-1.5.1 66
 MD5 9e64f054eb28e98d82b04443023befed files/digest-gallery-1.5.2_rc1 70
 MD5 60f82816cecf216b054f0e889324bcde files/digest-gallery-1.5_p1 68
 MD5 2766aeba32226962ae298487f56c37aa files/digest-gallery-2.0.2 71
+MD5 2766aeba32226962ae298487f56c37aa files/digest-gallery-2.0.2-r1 71
 MD5 d86a2cffa618ecf7fe9a2b001be69523 files/postinstall-en.txt 430
 MD5 d8aa1a55fbfe46c99088bb0c360794f2 files/postinstall-en2.txt 770
 MD5 506282253bfebd77cf1392f54b3e6e5d gallery-1.5.1.ebuild 984
 MD5 cc9c3d2625009ec17b02e5645fcd5556 gallery-1.5.2_rc1.ebuild 990
 MD5 7cae145d1aa9b7900fb4b1b00ebdc774 gallery-1.5_p1.ebuild 980
+MD5 fa4285566ef6532adcc08c00d12bbd5d gallery-2.0.2-r1.ebuild 1122
 MD5 0d436b8c7053ab86427e53909ec8ca05 gallery-2.0.2.ebuild 995
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
diff --git a/www-apps/gallery/files/FfmpegToolkit.class.patch b/www-apps/gallery/files/FfmpegToolkit.class.patch
new file mode 100644
index 000000000000..e909c22e42cd
--- /dev/null
+++ b/www-apps/gallery/files/FfmpegToolkit.class.patch
@@ -0,0 +1,12 @@
+diff -u -r1.18 -r1.19
+--- gallery2/modules/ffmpeg/classes/FfmpegToolkit.class	2005/08/23 03:49:42	1.18
++++ gallery2/modules/ffmpeg/classes/FfmpegToolkit.class	2005/10/23 01:41:30	1.19
+@@ -96,7 +96,7 @@
+ 	$outputMimeType = null;
+ 	switch($operationName) {
+ 	case 'convert-to-image/jpeg':
+-	    $args = array('-f', 'singlejpeg', '-t', '0.001', '-y', $tmpFilename);
++	    $args = array('-f', 'mjpeg', '-t', '0.001', '-y', $tmpFilename);
+ 	    if (isset($context['ffmpeg.offset'])) {
+ 		array_unshift($args, '-ss', $context['ffmpeg.offset']);
+ 		unset($context['ffmpeg.offset']);
diff --git a/www-apps/gallery/files/digest-gallery-2.0.2-r1 b/www-apps/gallery/files/digest-gallery-2.0.2-r1
new file mode 100644
index 000000000000..8b3cfffb105f
--- /dev/null
+++ b/www-apps/gallery/files/digest-gallery-2.0.2-r1
@@ -0,0 +1 @@
+MD5 b833b195d1713745b97be0abfec221f6 gallery-2.0.2-full.tar.gz 5426443
diff --git a/www-apps/gallery/gallery-2.0.2-r1.ebuild b/www-apps/gallery/gallery-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..e1c2cc9d3496
--- /dev/null
+++ b/www-apps/gallery/gallery-2.0.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gallery/gallery-2.0.2-r1.ebuild,v 1.1 2006/01/07 15:46:45 rl03 Exp $
+
+inherit webapp eutils
+
+DESCRIPTION="Web based (PHP Script) photo album viewer/creator"
+HOMEPAGE="http://gallery.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="ffmpeg gd imagemagick netpbm mysql postgres"
+
+RDEPEND="virtual/httpd-php
+	>=media-gfx/jhead-2.2
+	app-arch/unzip
+	media-libs/jpeg
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20051216 )
+	gd? ( >=media-libs/gd-2 )
+	netpbm? ( >=media-libs/netpbm-9.12 )
+	imagemagick? ( >=media-gfx/imagemagick-5.4.9.1-r1 )
+	mysql? ( dev-db/mysql )
+	postgres? ( >=dev-db/postgresql-7 )
+"
+
+S=${WORKDIR}/${PN}2
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/FfmpegToolkit.class.patch # bug 118162
+}
+
+src_install() {
+	webapp_src_preinst
+
+	cp -R * ${D}/${MY_HTDOCSDIR}
+	dohtml README.html
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en2.txt
+	webapp_src_install
+}