Set default for the -S option for images2mpeg to work correctly, bug #208133

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 x86_64

4 files changed, 85 insertions, 2 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index b999a6354ef4..e4a01eaad3ca 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/kipi-plugins
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.38 2008/06/29 15:56:50 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.39 2008/06/29 16:10:31 keytoaster Exp $
+
+*kipi-plugins-0.1.4-r2 (29 Jun 2008)
+
+  29 Jun 2008; Tobias Heinlein <keytoaster@gentoo.org>
+  +files/kipi-plugins-default_chroma_opt.patch,
+  +kipi-plugins-0.1.4-r2.ebuild, kipi-plugins-0.1.5.ebuild:
+  Set default for the -S option for images2mpeg to work correctly, bug
+  #208133
 
   29 Jun 2008; Tobias Heinlein <keytoaster@gentoo.org>
   kipi-plugins-0.1.4-r1.ebuild, kipi-plugins-0.1.5.ebuild:
diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-default_chroma_opt.patch b/media-plugins/kipi-plugins/files/kipi-plugins-default_chroma_opt.patch
new file mode 100644
index 000000000000..c25b86c8cc2d
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-default_chroma_opt.patch
@@ -0,0 +1,11 @@
+--- kipi-plugins/mpegencoder/images2mpg.old	2008-06-29 16:58:31.000000000 +0200
++++ kipi-plugins/mpegencoder/images2mpg	2008-06-29 16:58:53.000000000 +0200
+@@ -210,7 +210,7 @@
+ VIDEO_TYPE="PAL"
+ 
+ #Default Chroma subsampling mode (ppmtoy4m)
+-PPMTOY4M_CHROMA_OPT=""
++PPMTOY4M_CHROMA_OPT="-S 420mpeg2"
+ 
+ # Default verbosity level .
+ # 0 -> Just the error messages or warnings.
diff --git a/media-plugins/kipi-plugins/kipi-plugins-0.1.4-r2.ebuild b/media-plugins/kipi-plugins/kipi-plugins-0.1.4-r2.ebuild
new file mode 100644
index 000000000000..cc3cebfed6e9
--- /dev/null
+++ b/media-plugins/kipi-plugins/kipi-plugins-0.1.4-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.1.4-r2.ebuild,v 1.1 2008/06/29 16:10:31 keytoaster Exp $
+
+inherit kde eutils
+
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Plugins for the KDE Image Plugin Interface (libkipi)."
+HOMEPAGE="http://www.kipi-plugins.org/"
+SRC_URI="mirror://sourceforge/kipi/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="opengl gphoto2 ipod"
+
+DEPEND=">=media-libs/libkipi-0.1.5
+		>=media-libs/libkexiv2-0.1.5
+		>=media-libs/libkdcraw-0.1.1
+		gphoto2? ( >=media-libs/libgphoto2-2.3.1 )
+		>=media-libs/imlib2-1.1.0
+		>=media-gfx/imagemagick-6.2.4
+		>=media-video/mjpegtools-1.6.0
+		opengl? ( virtual/opengl )
+		>=media-libs/tiff-3.5
+		>=dev-libs/libxslt-1.1
+		ipod? ( >=media-libs/libgpod-0.4.2 )"
+RDEPEND="${DEPEND}
+		media-sound/vorbis-tools
+		virtual/mpg123"
+
+need-kde 3.5
+
+pkg_setup(){
+	if ! built_with_use media-libs/imlib2 X ; then
+		eerror "X support is required in media-libs/imlib2 in order to be able"
+		eerror "to compile media-plugins/kipi-plugins. Please, re-emerge"
+		eerror "media-libs/imlib2 with the 'X' USE flag enabled."
+		die
+	fi
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	# Fixes an automagic dependency on libgpod. cf bug 191195.
+	epatch "${FILESDIR}/${P}-ipod-191195.patch"
+
+	# remove configure script to trigger its rebuild during kde_src_compile
+	rm -f "${S}"/configure
+
+	# Set default for the -S option for images2mpeg to work correctly, bug #208133
+	epatch "${FILESDIR}/${PN}-default_chroma_opt.patch"
+}
+
+src_compile() {
+	myconf="$(use_with opengl) $(use_with gphoto2) $(use_with ipod libgpod)"
+	kde_src_compile all
+}
diff --git a/media-plugins/kipi-plugins/kipi-plugins-0.1.5.ebuild b/media-plugins/kipi-plugins/kipi-plugins-0.1.5.ebuild
index 3915eef73ff6..6d358fe115e2 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-0.1.5.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-0.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.1.5.ebuild,v 1.9 2008/06/29 15:56:50 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.1.5.ebuild,v 1.10 2008/06/29 16:10:31 keytoaster Exp $
 
 EAPI=1
 inherit kde eutils
@@ -49,6 +49,9 @@ src_unpack() {
 
 	# remove configure script to trigger its rebuild during kde_src_compile
 	rm -f "${S}"/configure
+
+	# Set default for the -S option for images2mpeg to work correctly, bug #208133
+	epatch "${FILESDIR}/${PN}-default_chroma_opt.patch"
 }
 
 src_compile() {