old

Package-Manager: portage-2.2.0_alpha96/cvs/Linux x86_64

6 files changed, 21 insertions, 268 deletions

diff --git a/media-libs/libquicktime/ChangeLog b/media-libs/libquicktime/ChangeLog
index a9a5c9e66b92..37f19268011f 100644
--- a/media-libs/libquicktime/ChangeLog
+++ b/media-libs/libquicktime/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libquicktime
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.180 2012/03/30 13:06:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/ChangeLog,v 1.181 2012/03/30 13:08:56 ssuominen Exp $
+
+  30 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -libquicktime-1.2.2.ebuild, -files/libquicktime-1.2.2-ffmpeg07.patch,
+  -libquicktime-1.2.3.ebuild:
+  old
 
   30 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
   libquicktime-1.2.3-r1.ebuild:
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index f2b777cdbe8b..d5ec01dec2ea 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libquicktime-1.2.2-ffmpeg07.patch 1501 RMD160 7e77a3b9e701df3a4afe0f183f3910084ee74cd6 SHA1 403e67b051797fe53957ab7c18fbca2222c331f6 SHA256 1624395f92dfde2091fd662a14cea629791787949e3c9091ba81fce57d375369
-DIST libquicktime-1.2.2.tar.gz 1012400 RMD160 3c9ebdcbfa94f26b4f6c686dc1d2318586edfa4f SHA1 fc2e9754f6cb8a817ce9a7ac91912af56667ee09 SHA256 a83ddaaeaf98231d9f224190dcb8810ebdabd3edb5c8cebe2fb083d25edb7436
 DIST libquicktime-1.2.3.tar.gz 1022465 RMD160 e5f8d7b7fbd99b432bcbc9588df6187909ce2145 SHA1 bda69adad0dfedee41462bd0dd1840e22872c5d6 SHA256 c55760fb4523e45fc2b2e22489c37f08d1b040ce59d3b4f5626c6b2b137c7646
 DIST libquicktime-1.2.4.tar.gz 1028626 RMD160 4daed02aa99903218af6844e879334cd1ae9e018 SHA1 7008b2dc27b9b40965bd2df42d39ff4cb8b6305e SHA256 1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368
-EBUILD libquicktime-1.2.2.ebuild 2867 RMD160 0dd6e44e5945983ecfe260c7660a247ff1636879 SHA1 bfc47be503458c2289bc6c2e1db6e83eeb346aed SHA256 4ed2b9fa25bf4f72a0be3da3326a79dcb06cd90f4b249b542862b16e182bdd8b
 EBUILD libquicktime-1.2.3-r1.ebuild 2707 RMD160 d91a37063737c9a189b742180883590776531b20 SHA1 45ed5c97144a054fa81e22a814b07b1c0a0c7ca9 SHA256 01930d81f228cee1a604d02dfc3fd4c994134b2be3f1c4e93b4077347115ce92
-EBUILD libquicktime-1.2.3.ebuild 2823 RMD160 791080d3e5310ac19eef561ea44c8c32911b1941 SHA1 3cdb0a89695f1698cf06e177387ae5280aeab88d SHA256 62ac0859e56e338fe153ea254ba1399f21b579195c4f03402f6c1d3f6f828d6d
 EBUILD libquicktime-1.2.4.ebuild 2701 RMD160 b9ba98091621715af1c3acd5d1b40b979e61afca SHA1 7baf385fa095839fba5f5bb47cf38a878fbc4f2e SHA256 4f0bb93c1abc3deeebca209cfb19182a43281272915ff6237e32b2091719358f
-MISC ChangeLog 26775 RMD160 7caa4289b25baca19aae1595ca0ce2b550c1942b SHA1 59bde235c1be70a630b8810594ee69e5cbcf6103 SHA256 2e0b036afbddbddd2fdc7fd3fea92c960b755ae46332cdefbab52c00f77efe81
-MISC metadata.xml 365 RMD160 3b9ef1a47d2f85224d5cdb61594ea7a99523df8b SHA1 89432e8cbc4ea43cfef9faa722fdd54ba2d4e10f SHA256 2963a8d151be35ab849e2265204e548a11e9176dd3275158905784702910906f
+MISC ChangeLog 26938 RMD160 917fb20c35e48e61b78d58e60ab7350bd216c942 SHA1 773579a175949e33d4a05b54e19f12efbe5ad01c SHA256 24bfb84f4bd4e66b8dc1bd40029eeefe03ae4bdc2318061cd863c9fc9fe59458
+MISC metadata.xml 429 RMD160 1a87783e1c5b9e4d33fd34c6db76ba256c26956d SHA1 cfcf1bf967a39d091592be079a3bcf9122a80462 SHA256 0f34b97b72c8fd6ac971342f174aee213910769a0a45060b188da3e9b98bbfb0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPda/CAAoJEEdUh39IaPFNxNMH/1zQLk3KbH18p+rU9l2wX7Kh
-Isau804j+06EeCVV1wkyBZ4UNQs2Lw9G9iniTxPjRLYv8VlQ50mrPaz+cf5331K1
-EqKTnWrOY5YXwvebNtDtn3A96IW+26LSPCM0qvZ/h1pNk95S525JRXkzqqxrD3NS
-qYu0977axrj5cqLfyORON3OPD+HupYG6mTfAAO40z5RlOjmDGq6EXqp3CRbAQQYn
-1TjzvZSDDaigS5chLXc+VI24eziiyiktaUnJO3JGBDUpuwdfNeu29+A2Qpwieu2R
-tOfN784UAFfT+N6krvc7DZoxTzJX9xXJsBkfKNe1AJIjxEv4Dzh/7YPIoyTHz5w=
-=5AdR
+iQEcBAEBAgAGBQJPdbBgAAoJEEdUh39IaPFNfRAIAIm1delMtdw65A31gsMLljfr
+21d0PoyGibbpPa8PQoy3QzEv9mUvTCkaQVPRL0m3n8Zq+5KLQvm8MmeImfSOUGxd
+ivX2jXIy05JRuOWLcx3uC/xBjKQybJELxjsgY1qIt9p0qYg5NBLZsXQ3dG0aFKQO
+rjncPCHpHAn9+0ggYk39zptLlleAOlaUBCwYZwxsIqxl5pBnUyDKRx5uosJIW50J
+ts4338qSwv13h4RWzOYm8gxYKVhoSTKTl/q5p5p1j1uIp9D3ponMdtH0GU69aUgw
+qCVn7ka1R/TrcYC08dYzZWzugOtoa+XhGk7tsDU2jwapjTDSGFEwvtKXEN4qb2w=
+=ABQo
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libquicktime/files/libquicktime-1.2.2-ffmpeg07.patch b/media-libs/libquicktime/files/libquicktime-1.2.2-ffmpeg07.patch
deleted file mode 100644
index 1d8b0df2c2a1..000000000000
--- a/media-libs/libquicktime/files/libquicktime-1.2.2-ffmpeg07.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: libquicktime-1.2.2/plugins/ffmpeg/lqt_ffmpeg.c
-===================================================================
---- libquicktime-1.2.2.orig/plugins/ffmpeg/lqt_ffmpeg.c
-+++ libquicktime-1.2.2/plugins/ffmpeg/lqt_ffmpeg.c
-@@ -1031,8 +1031,8 @@ static void set_codec_info(struct CODECI
-   snprintf(ffmpeg_long_name, 256, "%s", map->name);
-   snprintf(ffmpeg_description, 256, "%s", map->name);
-   
--  if((map->encoder && (map->encoder->type == CODEC_TYPE_VIDEO)) ||
--     (map->decoder && (map->decoder->type == CODEC_TYPE_VIDEO))){
-+  if((map->encoder && (map->encoder->type == AVMEDIA_TYPE_VIDEO)) ||
-+     (map->decoder && (map->decoder->type == AVMEDIA_TYPE_VIDEO))){
-        codec_info_ffmpeg.type = LQT_CODEC_VIDEO;
-   } else {
-        codec_info_ffmpeg.type = LQT_CODEC_AUDIO;
-Index: libquicktime-1.2.2/plugins/ffmpeg/params.c
-===================================================================
---- libquicktime-1.2.2.orig/plugins/ffmpeg/params.c
-+++ libquicktime-1.2.2/plugins/ffmpeg/params.c
-@@ -205,8 +205,10 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
-   PARAM_FLOAT("ff_p_masking",p_masking);
-   PARAM_FLOAT("ff_dark_masking",dark_masking);
-   PARAM_ENUM("ff_prediction_method",prediction_method,prediction_method);
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-   PARAM_INT("ff_mb_qmin",mb_qmin);
-   PARAM_INT("ff_mb_qmax",mb_qmax);
-+#endif
-   PARAM_ENUM("ff_me_cmp",me_cmp,compare_func);
-   PARAM_CMP_CHROMA("ff_me_cmp_chroma",me_cmp);
-   PARAM_ENUM("ff_me_sub_cmp",me_sub_cmp,compare_func);
diff --git a/media-libs/libquicktime/libquicktime-1.2.2.ebuild b/media-libs/libquicktime/libquicktime-1.2.2.ebuild
deleted file mode 100644
index 5e8b6c074ba1..000000000000
--- a/media-libs/libquicktime/libquicktime-1.2.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.2.2.ebuild,v 1.10 2011/04/25 20:55:53 aballier Exp $
-
-EAPI=1
-
-inherit libtool eutils
-
-MY_P=${P/_pre/pre}
-
-DESCRIPTION="A library based on quicktime4linux with extensions"
-HOMEPAGE="http://libquicktime.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="mmx X opengl dv gtk alsa aac encode png jpeg vorbis lame x264 ffmpeg doc schroedinger"
-
-RDEPEND="dv? ( media-libs/libdv )
-	gtk? ( >=x11-libs/gtk+-2.4.0:2 )
-	aac? (
-		media-libs/faad2
-		encode? ( media-libs/faac )
-	)
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	png? ( media-libs/libpng )
-	jpeg? ( virtual/jpeg )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	lame? ( media-sound/lame )
-	ffmpeg? ( virtual/ffmpeg )
-	x264? ( media-libs/x264 )
-	schroedinger? ( >=media-libs/schroedinger-1.0.5 )
-	X? ( x11-libs/libXaw
-		x11-libs/libXv
-		x11-libs/libXext
-		x11-libs/libX11
-		opengl? ( media-libs/mesa )
-	)
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	X? (
-		x11-proto/videoproto
-		x11-proto/xextproto
-	)
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-ffmpeg07.patch"
-	# Needed for sane .so versionning on g/fbsd
-	elibtoolize
-}
-
-src_compile() {
-	local MY_OPTS=""
-	if use !encode || use !aac; then
-		MY_OPTS="--without-faac"
-	fi
-
-	econf --enable-shared \
-		--enable-static \
-		--enable-gpl \
-		$(use_with doc doxygen) \
-		$(use_enable mmx asm) \
-		$(use_with X x) \
-		$(use_with gtk) \
-		$(use_with dv libdv) \
-		$(use_with alsa) \
-		$(use_with aac faad2) \
-		$(use_with png libpng) \
-		$(use_with jpeg libjpeg) \
-		$(use vorbis || echo "--without-vorbis") \
-		$(use_with lame) \
-		$(use_with x264) \
-		$(use_with ffmpeg) \
-		$(use_with opengl) \
-		$(use_with schroedinger) \
-		${MY_OPTS} \
-		--without-cpuflags || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc README TODO ChangeLog
-	# Compatibility with software that uses quicktime prefix, but
-	# don't do that when building for Darwin/MacOS
-	[[ ${CHOST} != *-darwin* ]] && \
-	dosym /usr/include/lqt /usr/include/quicktime
-}
-
-pkg_preinst() {
-	if [[ -d /usr/include/quicktime && ! -L /usr/include/quicktime ]]; then
-		elog "For compatibility with other quicktime libraries, ${PN} was"
-		elog "going to create a /usr/include/quicktime symlink, but for some"
-		elog "reason that is a directory on your system."
-
-		elog "Please check that is empty, and remove it, or submit a bug"
-		elog "telling us which package owns the directory."
-		die "/usr/include/quicktime is a directory."
-	fi
-}
diff --git a/media-libs/libquicktime/libquicktime-1.2.3.ebuild b/media-libs/libquicktime/libquicktime-1.2.3.ebuild
deleted file mode 100644
index 5622ac29602f..000000000000
--- a/media-libs/libquicktime/libquicktime-1.2.3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libquicktime/libquicktime-1.2.3.ebuild,v 1.5 2011/12/29 21:49:28 halcy0n Exp $
-
-EAPI=1
-
-inherit libtool eutils
-
-MY_P=${P/_pre/pre}
-
-DESCRIPTION="A library based on quicktime4linux with extensions"
-HOMEPAGE="http://libquicktime.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="mmx X opengl dv gtk alsa aac encode png jpeg vorbis lame x264 ffmpeg doc schroedinger"
-
-RDEPEND="dv? ( media-libs/libdv )
-	gtk? ( >=x11-libs/gtk+-2.4.0:2 )
-	aac? (
-		media-libs/faad2
-		encode? ( media-libs/faac )
-	)
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	png? ( media-libs/libpng )
-	jpeg? ( virtual/jpeg )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	lame? ( media-sound/lame )
-	ffmpeg? ( virtual/ffmpeg )
-	x264? ( media-libs/x264 )
-	schroedinger? ( >=media-libs/schroedinger-1.0.5 )
-	X? ( x11-libs/libXaw
-		x11-libs/libXv
-		x11-libs/libXext
-		x11-libs/libX11
-		opengl? ( media-libs/mesa )
-	)
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	X? (
-		x11-proto/videoproto
-		x11-proto/xextproto
-	)
-	doc? ( app-doc/doxygen )
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Needed for sane .so versionning on g/fbsd
-	elibtoolize
-}
-
-src_compile() {
-	local MY_OPTS=""
-	if use !encode || use !aac; then
-		MY_OPTS="--without-faac"
-	fi
-
-	econf --enable-shared \
-		--enable-static \
-		--enable-gpl \
-		$(use_with doc doxygen) \
-		$(use_enable mmx asm) \
-		$(use_with X x) \
-		$(use_with gtk) \
-		$(use_with dv libdv) \
-		$(use_with alsa) \
-		$(use_with aac faad2) \
-		$(use_with png libpng) \
-		$(use_with jpeg libjpeg) \
-		$(use vorbis || echo "--without-vorbis") \
-		$(use_with lame) \
-		$(use_with x264) \
-		$(use_with ffmpeg) \
-		$(use_with opengl) \
-		$(use_with schroedinger) \
-		${MY_OPTS} \
-		--without-cpuflags || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc README TODO ChangeLog
-	# Compatibility with software that uses quicktime prefix, but
-	# don't do that when building for Darwin/MacOS
-	[[ ${CHOST} != *-darwin* ]] && \
-	dosym /usr/include/lqt /usr/include/quicktime
-}
-
-pkg_preinst() {
-	if [[ -d /usr/include/quicktime && ! -L /usr/include/quicktime ]]; then
-		elog "For compatibility with other quicktime libraries, ${PN} was"
-		elog "going to create a /usr/include/quicktime symlink, but for some"
-		elog "reason that is a directory on your system."
-
-		elog "Please check that is empty, and remove it, or submit a bug"
-		elog "telling us which package owns the directory."
-		die "/usr/include/quicktime is a directory."
-	fi
-}
diff --git a/media-libs/libquicktime/metadata.xml b/media-libs/libquicktime/metadata.xml
index 8c262fcd5e27..9bbbc2a585e0 100644
--- a/media-libs/libquicktime/metadata.xml
+++ b/media-libs/libquicktime/metadata.xml
@@ -2,7 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>video</herd>
-  <use>
-    <flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
-  </use>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name='schroedinger'>Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec)</flag>
+	</use>
 </pkgmetadata>