fixes bug 200039. thanks to David Leverton

Package-Manager: portage-2.1.5_rc3

3 files changed, 123 insertions, 2 deletions

diff --git a/media-libs/capseo/ChangeLog b/media-libs/capseo/ChangeLog
index cd803e0d6721..9883862848de 100644
--- a/media-libs/capseo/ChangeLog
+++ b/media-libs/capseo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/capseo
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/capseo/ChangeLog,v 1.6 2008/05/02 14:01:05 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/capseo/ChangeLog,v 1.7 2008/05/05 09:38:58 trapni Exp $
+
+*capseo-0.3.0_pre200712251-r2 (05 May 2008)
+
+  05 May 2008; Christian Parpart <trapni@gentoo.org>
+  +capseo-0.3.0_pre200712251-r2.ebuild:
+  fixes bug 200039. thanks to David Leverton
 
   02 May 2008; Christian Parpart <trapni@gentoo.org>
   capseo-0.3.0_pre200712251-r1.ebuild:
diff --git a/media-libs/capseo/Manifest b/media-libs/capseo/Manifest
index abe4a75db5a8..bd830d820d06 100644
--- a/media-libs/capseo/Manifest
+++ b/media-libs/capseo/Manifest
@@ -3,6 +3,7 @@ DIST captury-0.3.0_pre200706031.tar.bz2 1215736 RMD160 fedb5db4b560a3fcb225a204f
 DIST captury-0.3.0_pre200712251.tar.bz2 1256351 RMD160 0527f5f18e84ada5b37941f7f55355c20ef0fc0e SHA1 19227bbd1f4e609f274311be835a4b09ce91a67e SHA256 119499991c8bf68632485adce7bc13ce9b754d8b406862351abe8d92e3eb5fc3
 EBUILD capseo-0.3.0_pre200706031.ebuild 2335 RMD160 7d8fe4e2125102acacd909965b548be3ac807939 SHA1 53248f2221cccebc854a621b4fa2c16f8e33f3d7 SHA256 5d1720cbf406373b4d58c36cba4baad8a614c68b32407af4448d05a42470e46d
 EBUILD capseo-0.3.0_pre200712251-r1.ebuild 2498 RMD160 edfb8ae8f1f272f1cb9b6177a4c6ae858046f7ef SHA1 7b719f45a0e3ff53530b5550943fee1925e1b68b SHA256 0fa8f2c01bac125405f895f81dfac855217f181ae51e2a318c144c34026a179f
+EBUILD capseo-0.3.0_pre200712251-r2.ebuild 2830 RMD160 024d72a3ff5fef5b6d6df9f78efd919a669ddfd5 SHA1 893e40afb6ff3887a9220e29c17423bd16881b63 SHA256 f34e48832e39d50108a37efb7c9c1db45a9d3e9fc9a6fbea315f723cbc138152
 EBUILD capseo-0.3.0_pre200712251.ebuild 2335 RMD160 1bd2c1b439bfc120591c35bb5b228402f9709f0b SHA1 d0ecd3ee62634835cc5edf9f1a2a2cfbcb4d9ae8 SHA256 db1b8be1e72a61d91ec9695a57bf7e3b1ac9388c2c49a82f69474ce873226de7
-MISC ChangeLog 1122 RMD160 7b90576d4d3f8798cbfd91a5038a873674487a9e SHA1 f402a0ed37cb4a8442725d771e3a306208a8df5e SHA256 faee1024a53ce765fed2c266df4414ba52c0f3c282b327625d6d408dab98ccbf
+MISC ChangeLog 1306 RMD160 be3925d04b0f88d0f53c37e0a9c7f63fca786436 SHA1 4d83c912e83ce248921e255aab177fd2e9a7af3c SHA256 e12a7cb0abcff3f4d65902e7c070e798f33c30e4e053eafe9464f8afb2bf623e
 MISC metadata.xml 220 RMD160 ba793b36fde5acec86d8150ceddf4f3cfb5c2ae9 SHA1 6eb5af4c500c3736062744a87af40484a47e6951 SHA256 9375701257b18e240ba4baf120f7ee473798d867728c9c3fdc50b3b305df7ded
diff --git a/media-libs/capseo/capseo-0.3.0_pre200712251-r2.ebuild b/media-libs/capseo/capseo-0.3.0_pre200712251-r2.ebuild
new file mode 100644
index 000000000000..56a5a844726b
--- /dev/null
+++ b/media-libs/capseo/capseo-0.3.0_pre200712251-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/capseo/capseo-0.3.0_pre200712251-r2.ebuild,v 1.1 2008/05/05 09:38:58 trapni Exp $
+
+inherit flag-o-matic multilib
+
+DESCRIPTION="Capseo Video Codec Library"
+HOMEPAGE="http://rm-rf.in/captury/wiki/CapseoCodec"
+SRC_URI="http://upstream.rm-rf.in/captury/captury-${PV}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug theora"
+
+RDEPEND=">=media-libs/libtheora-1.0_alpha6-r1"
+
+DEPEND="${RDEPEND}
+		x86? ( >=dev-lang/yasm-0.4.0 )
+		amd64? ( >=dev-lang/yasm-0.4.0 )
+		dev-util/pkgconfig"
+
+EMULTILIB_PKG="true"
+
+S="${WORKDIR}/captury-${PV}/${PN}"
+
+src_unpack() {
+	unpack ${A} || die
+
+	cd "${S}"
+	einfo "pwd: $(pwd)"
+	epatch "${FILESDIR}/no-cpsplay.diff" || die
+}
+
+src_compile() {
+	if [[ -z ${OABI} ]] && has_multilib_profile; then
+		use debug && append-flags -O0 -g3
+		use debug || append-flags -DNDEBUG=1
+
+		einfo "Building multilib ${PN} for ABIs: $(get_install_abis)"
+		OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			export ABI=${ABI}
+			src_compile
+		done
+		ABI=${OABI}
+		return
+	fi
+
+	cd "${S}" || die
+
+	if [[ ! -f configure ]]; then
+		./autogen.sh || die "autogen.sh failed"
+	fi
+
+	# obviousely in src_install() it is set to "default" on non-multilib hosts,
+	# but isn't in src_compile()
+	ABI=${ABI:-default}
+
+	mkdir abi-${ABI}
+	cd abi-${ABI}
+
+	local myconf=
+	case ${ABI} in
+		amd64|x86)
+			myconf="${myconf} --with-accel=${ABI}"
+			;;
+	esac
+
+	if is_final_abi; then
+		myconf="${myconf} $(use_enable theora)"
+	else
+		# drop unnecessary theora dependency for secondary ABIs (as theora is
+		# only used for the cpsrecode tool anyway).
+		# see bug 200093.
+		myconf="${myconf} --disable-theora"
+	fi
+
+	../configure ${myconf} \
+		--prefix="/usr" \
+		--host="$(get_abi_CHOST ${ABI})" \
+		--libdir="/usr/$(get_libdir)" \
+		|| die "./configure for ABI ${ABI} failed"
+
+	emake || die "make for ABI ${ABI} failed"
+}
+
+src_install() {
+	for ABI in $(get_install_abis); do
+		make -C abi-${ABI} install DESTDIR="${D}" || die "make install for ABI ${ABI} failed."
+	done
+
+	rm "${D}/usr/bin/cpsplay" # currently unsupported
+
+	dodoc AUTHORS ChangeLog* NEWS README* TODO
+}
+
+pkg_postinst() {
+	einfo "Use the following command to re-encode your screen captures to a"
+	einfo "file format current media players do understand:"
+	einfo
+	einfo "    cpsrecode -i capture.cps -o - | mencoder - -o capture.avi \\"
+	einfo "              -ovc lavc -lavcopts vcodec=xvid:autoaspect=1"
+	einfo
+	einfo "or play in-place via mplayer:"
+	einfo
+	einfo "    cpsrecode -i capture.cps -o - | mplayer -demuxer y4m -"
+	einfo
+	einfo "or if use-flag theora enabled, create your ogg/theora file inplace:"
+	einfo
+	einfo "    cpsrecode -i capture.cps -o capture.ogg -c theora"
+	echo
+}
+
+# vim:ai:noet:ts=4:nowrap