fixed cpsplay build inclusion as stated in bug #205830

Package-Manager: portage-2.1.4

5 files changed, 148 insertions, 6 deletions

diff --git a/media-libs/capseo/ChangeLog b/media-libs/capseo/ChangeLog
index 1da6aba451a7..b8406741c924 100644
--- a/media-libs/capseo/ChangeLog
+++ b/media-libs/capseo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/capseo
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/capseo/ChangeLog,v 1.3 2007/12/25 17:59:52 trapni Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/capseo/ChangeLog,v 1.4 2008/01/16 07:38:53 trapni Exp $
+
+*capseo-0.3.0_pre200712251-r1 (16 Jan 2008)
+
+  16 Jan 2008; Christian Parpart <trapni@gentoo.org> +files/no-cpsplay.diff,
+  +capseo-0.3.0_pre200712251-r1.ebuild:
+  fixed cpsplay build inclusion as stated in bug #205830
 
 *capseo-0.3.0_pre200712251 (25 Dec 2007)
 
diff --git a/media-libs/capseo/Manifest b/media-libs/capseo/Manifest
index ff129f53c4ff..e097758bc00b 100644
--- a/media-libs/capseo/Manifest
+++ b/media-libs/capseo/Manifest
@@ -1,17 +1,25 @@
+AUX no-cpsplay.diff 832 RMD160 0c3549d50fbc143446dfc7bc5c76c807407caf6e SHA1 276974350bcd2f6f3c5246a6ea592c19caf32251 SHA256 a49337fafc11d606a68a92e005e734ba266a11ff696deda5fc8d96535f374e72
+MD5 1f574d161ccf91586241ba714cbb9d0f files/no-cpsplay.diff 832
+RMD160 0c3549d50fbc143446dfc7bc5c76c807407caf6e files/no-cpsplay.diff 832
+SHA256 a49337fafc11d606a68a92e005e734ba266a11ff696deda5fc8d96535f374e72 files/no-cpsplay.diff 832
 DIST captury-0.3.0_pre200706031.tar.bz2 1215736 RMD160 fedb5db4b560a3fcb225a204f2b58f95c61c393c SHA1 ccd84184b37fe4120c82034fbc3d1cff859d7cbf SHA256 51904c4b1183cf77809ff47bbe6b1cdcffabfdefc301ac838de89a0d4d799289
 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
 MD5 d46b855e50ffd146f419a4eeff191c93 capseo-0.3.0_pre200706031.ebuild 2335
 RMD160 7d8fe4e2125102acacd909965b548be3ac807939 capseo-0.3.0_pre200706031.ebuild 2335
 SHA256 5d1720cbf406373b4d58c36cba4baad8a614c68b32407af4448d05a42470e46d capseo-0.3.0_pre200706031.ebuild 2335
+EBUILD capseo-0.3.0_pre200712251-r1.ebuild 2456 RMD160 5ce1cf46d37c1505d6783e85de946908fb941519 SHA1 5b7c340cbdd94b8e3ff953ff6a662359e8a74d7f SHA256 844613dd97fe69722568a4a60dc1584e9aa4bdaabcdbd158d216d5c6d4d9abec
+MD5 ac0be8f614c72285064503b2671366da capseo-0.3.0_pre200712251-r1.ebuild 2456
+RMD160 5ce1cf46d37c1505d6783e85de946908fb941519 capseo-0.3.0_pre200712251-r1.ebuild 2456
+SHA256 844613dd97fe69722568a4a60dc1584e9aa4bdaabcdbd158d216d5c6d4d9abec capseo-0.3.0_pre200712251-r1.ebuild 2456
 EBUILD capseo-0.3.0_pre200712251.ebuild 2335 RMD160 1bd2c1b439bfc120591c35bb5b228402f9709f0b SHA1 d0ecd3ee62634835cc5edf9f1a2a2cfbcb4d9ae8 SHA256 db1b8be1e72a61d91ec9695a57bf7e3b1ac9388c2c49a82f69474ce873226de7
 MD5 444764cff18a78cca1b69a0cf9e0af26 capseo-0.3.0_pre200712251.ebuild 2335
 RMD160 1bd2c1b439bfc120591c35bb5b228402f9709f0b capseo-0.3.0_pre200712251.ebuild 2335
 SHA256 db1b8be1e72a61d91ec9695a57bf7e3b1ac9388c2c49a82f69474ce873226de7 capseo-0.3.0_pre200712251.ebuild 2335
-MISC ChangeLog 654 RMD160 b28eee5433197a15d778b3a9d27b824847bc0ba9 SHA1 42239978812757abb1eb33b8945a9e00bca79d4b SHA256 e43068c57a9344a06c02875e01585ee613f419e2f24fb86d1d53fbf174315dcf
-MD5 6c0c6f40d85e83a910d0e71a194c3558 ChangeLog 654
-RMD160 b28eee5433197a15d778b3a9d27b824847bc0ba9 ChangeLog 654
-SHA256 e43068c57a9344a06c02875e01585ee613f419e2f24fb86d1d53fbf174315dcf ChangeLog 654
+MISC ChangeLog 874 RMD160 b465b5b91064673a84f9ae6ee6e645e612148f2a SHA1 7fa35f7226d598f344634ff1cc9fe8a97ab02614 SHA256 1d8da70db5095cf374ef62c5df478a62bf16f2cbe679c443d6dd4cc88b4a215f
+MD5 d1d8e2dc1f473483a4ae99a2e390cb64 ChangeLog 874
+RMD160 b465b5b91064673a84f9ae6ee6e645e612148f2a ChangeLog 874
+SHA256 1d8da70db5095cf374ef62c5df478a62bf16f2cbe679c443d6dd4cc88b4a215f ChangeLog 874
 MISC metadata.xml 199 RMD160 852e94c35804ed3cf83a7149b577cd41a38e2ea1 SHA1 fda1928420c1ef71f25d78ac4a34e6236d9740fc SHA256 3137765885d09c96954a5018ae5627d0276f743c3d7a1f9cf7f1be517855ac5d
 MD5 bff27c36ac89297d86169d3fc2d2ad46 metadata.xml 199
 RMD160 852e94c35804ed3cf83a7149b577cd41a38e2ea1 metadata.xml 199
@@ -22,3 +30,6 @@ SHA256 98a25268eff43a13bed753f0aca90340c888b33b891b4311d0b7789e08d9c968 files/di
 MD5 c6eeca815123f79070cf97dbf04f3101 files/digest-capseo-0.3.0_pre200712251 286
 RMD160 8fddc6571c2a2960e058673a591bcbf66650b55d files/digest-capseo-0.3.0_pre200712251 286
 SHA256 e9af5c7836769ab17aa4cf4efc2fdf0035544a9ac3726070d992767e6803dab9 files/digest-capseo-0.3.0_pre200712251 286
+MD5 c6eeca815123f79070cf97dbf04f3101 files/digest-capseo-0.3.0_pre200712251-r1 286
+RMD160 8fddc6571c2a2960e058673a591bcbf66650b55d files/digest-capseo-0.3.0_pre200712251-r1 286
+SHA256 e9af5c7836769ab17aa4cf4efc2fdf0035544a9ac3726070d992767e6803dab9 files/digest-capseo-0.3.0_pre200712251-r1 286
diff --git a/media-libs/capseo/capseo-0.3.0_pre200712251-r1.ebuild b/media-libs/capseo/capseo-0.3.0_pre200712251-r1.ebuild
new file mode 100644
index 000000000000..214aaf404afc
--- /dev/null
+++ b/media-libs/capseo/capseo-0.3.0_pre200712251-r1.ebuild
@@ -0,0 +1,101 @@
+# 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-r1.ebuild,v 1.1 2008/01/16 07:38:53 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}
+		>=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
+	myconf="${myconf} $(use_enable theora)"
+
+	../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 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
diff --git a/media-libs/capseo/files/digest-capseo-0.3.0_pre200712251-r1 b/media-libs/capseo/files/digest-capseo-0.3.0_pre200712251-r1
new file mode 100644
index 000000000000..bce9f747eb7a
--- /dev/null
+++ b/media-libs/capseo/files/digest-capseo-0.3.0_pre200712251-r1
@@ -0,0 +1,3 @@
+MD5 dc68b7105778ff708cf17aadeceb4b7b captury-0.3.0_pre200712251.tar.bz2 1256351
+RMD160 0527f5f18e84ada5b37941f7f55355c20ef0fc0e captury-0.3.0_pre200712251.tar.bz2 1256351
+SHA256 119499991c8bf68632485adce7bc13ce9b754d8b406862351abe8d92e3eb5fc3 captury-0.3.0_pre200712251.tar.bz2 1256351
diff --git a/media-libs/capseo/files/no-cpsplay.diff b/media-libs/capseo/files/no-cpsplay.diff
new file mode 100644
index 000000000000..13788fd7062d
--- /dev/null
+++ b/media-libs/capseo/files/no-cpsplay.diff
@@ -0,0 +1,21 @@
+=== capseo/tools/Makefile.am
+==================================================================
+--- capseo/tools/Makefile.am	(revision 5574)
++++ capseo/tools/Makefile.am	(local)
+@@ -3,13 +3,13 @@
+ ANSI_CXXFLAGS = -ansi -pedantic -Wall -Wno-long-long -Wno-unknown-pragmas
+ AM_CXXFLAGS = $(ANSI_CXXFLAGS) $(CAPTURY_CFLAGS) -DVERSION="\"@CAPSEO_VERSION@\"" -DTHEORA=@THEORA@
+ 
+-bin_PROGRAMS = cpsinfo cpsplay cpsrecode
++bin_PROGRAMS = cpsinfo cpsrecode
+ 
+ cpsinfo_SOURCES = cpsinfo.cpp
+ cpsinfo_LDFLAGS = $(top_builddir)/src/libcapseo.la
+ 
+-cpsplay_SOURCES = cpsplay.cpp
+-cpsplay_LDFLAGS = $(top_builddir)/src/libcapseo.la $(X11_LIBS) -lGL
++# cpsplay_SOURCES = cpsplay.cpp
++# cpsplay_LDFLAGS = $(top_builddir)/src/libcapseo.la $(X11_LIBS) -lGL
+ 
+ cpsrecode_SOURCES = cpsrecode.cpp
+ cpsrecode_LDFLAGS = $(top_builddir)/src/libcapseo.la