Finally add (hopefully) working PIC-patches, Bug #121871.

Package-Manager: portage-2.1.2_rc2-r3

6 files changed, 143 insertions, 8 deletions

diff --git a/media-libs/libdv/ChangeLog b/media-libs/libdv/ChangeLog
index 0d62c22557a8..9ead833e51d1 100644
--- a/media-libs/libdv/ChangeLog
+++ b/media-libs/libdv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libdv
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.64 2006/10/21 08:14:33 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.65 2006/11/29 21:22:01 zzam Exp $
+
+*libdv-1.0.0-r1 (29 Nov 2006)
+*libdv-0.104-r3 (29 Nov 2006)
+
+  29 Nov 2006; Matthias Schwarzott <zzam@gentoo.org> +libdv-0.104-r3.ebuild,
+  +libdv-1.0.0-r1.ebuild:
+  Finally add (hopefully) working PIC-patches, Bug #121871.
 
   21 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   libdv-0.104-r2.ebuild:
diff --git a/media-libs/libdv/Manifest b/media-libs/libdv/Manifest
index 2a4e903874c0..02ebec221183 100644
--- a/media-libs/libdv/Manifest
+++ b/media-libs/libdv/Manifest
@@ -36,8 +36,10 @@ SHA256 57189f7e660507c50c80b16637f4b1cfdf345dd0d9718ed0c2c2c3db337cf166 files/li
 DIST libdv-0.101.tar.gz 476510 RMD160 9bb471f52cafcfd44afc46b51e0c501a251c20fb SHA256 706d1caf3b5e7af1e16d1ea91ddd9aad60a529a61ac08509e1aa99f61dca21d5
 DIST libdv-0.102.tar.gz 476931 RMD160 262ea1dc3e0746002ed90ba1b17e78caa511ca15 SHA1 66d2609bd639c8223f388dc1d1de653f9e61fd2d SHA256 bc6f98d46e82c10d51bfc46d68ec34e3ff7afef0610b96b2d317d9ec75c09271
 DIST libdv-0.104-pic-fix.patch.bz2 9343 RMD160 b72775a37841f2820f89bec029ec18e9c09453d9 SHA1 f0cd4245fe0977489cb4ceaef34e3d784266c470 SHA256 1142c69169d0915b36efe97173744cb751e9ef1d2df319f9cb7924c228c672dd
+DIST libdv-0.104-pic.patch.bz2 11018 RMD160 25b9fb554a88d2a76b94a32c41050c065202e040 SHA1 3ecd935b83dc78da608ca3167c1a49a4875f62cd SHA256 42130856fa711b703dd3404b62887fb7148eb59dd129879943c3b60ead90b55e
 DIST libdv-0.104.tar.gz 554691 RMD160 a91708ecb75533caf2b9038ca68064c7707dcfdf SHA1 521a079193f4ae8f9995091b0590c87fde130650 SHA256 8310e365e799dea9547fcaf84b21dae3bf8891a3befe7f0c6556025e6bc2c573
 DIST libdv-0.99.tar.gz 359334 RMD160 d123497afa505946fb8e484e2b32929fdaffad7d SHA256 e0027b77098d0165d37d85264e45b1c4273599bd7684ff1511a83fc6dc5fdea7
+DIST libdv-1.0.0-pic.patch.bz2 9771 RMD160 a0995597413609ac938f68086a6aac9ef6e2ab37 SHA1 074687289dd78adb60c2423e270125bd48479d1f SHA256 474a50d373e39dd8a0dac0b22f089e957d752145712f97f987ad18028f6d6a5e
 DIST libdv-1.0.0.tar.gz 574565 RMD160 a8d3ae083340cec411d5294db7197ea72c8b3c4f SHA1 2e5ba0e95f665d60e72cbebcf1c4989e0d6c92c8 SHA256 a305734033a9c25541a59e8dd1c254409953269ea7c710c39e540bd8853389ba
 EBUILD libdv-0.101.ebuild 1236 RMD160 2a5cacec8da1018143f3068c06ac0ea436f3eeb7 SHA1 11be054bb8e7cde8939c260239def2edd49807e9 SHA256 02e7d004fc639b4db55582b3a395db3ddbe694f2ad087529fd00284dbeace638
 MD5 16e25f8306f5392534c9e122a15a1c68 libdv-0.101.ebuild 1236
@@ -55,6 +57,10 @@ EBUILD libdv-0.104-r2.ebuild 1381 RMD160 d10051077da62ef3f08ea5737bb3ed7439e6a53
 MD5 51b8d098d8b1018b09676dcb5313c1bb libdv-0.104-r2.ebuild 1381
 RMD160 d10051077da62ef3f08ea5737bb3ed7439e6a532 libdv-0.104-r2.ebuild 1381
 SHA256 9f7fc7ee1d0c5478fc30b9a0dd6e563456006141748a0c356ae4416c68ecb581 libdv-0.104-r2.ebuild 1381
+EBUILD libdv-0.104-r3.ebuild 1473 RMD160 a319d10f26d83f463694517d2396a4219a590404 SHA1 c0f68709664d99b8999c75dd7150a0696e547c1f SHA256 5090030d1d3194309aa3b37507897798c5407e19cc13f58befcd8c0902f1a411
+MD5 4be55c7abb38e80b9c3a807fd9523c8f libdv-0.104-r3.ebuild 1473
+RMD160 a319d10f26d83f463694517d2396a4219a590404 libdv-0.104-r3.ebuild 1473
+SHA256 5090030d1d3194309aa3b37507897798c5407e19cc13f58befcd8c0902f1a411 libdv-0.104-r3.ebuild 1473
 EBUILD libdv-0.104.ebuild 1315 RMD160 2724f17fc8fb46ad9db1455e80f34e007aaca971 SHA1 59ba92e58fafa2c84fe583c6d824653822053a1c SHA256 4e9570cbef32f705b7d4f2ae222a55bae9d21870733fb37d6334d1f02b3eb801
 MD5 9af0184f9281e6dbf633dec4dd9173ec libdv-0.104.ebuild 1315
 RMD160 2724f17fc8fb46ad9db1455e80f34e007aaca971 libdv-0.104.ebuild 1315
@@ -63,14 +69,18 @@ EBUILD libdv-0.99-r1.ebuild 1261 RMD160 3e17c43f5d42e91ed461749582037f8215bdf043
 MD5 9bc1bd257f1c5ebac58211fcff44d975 libdv-0.99-r1.ebuild 1261
 RMD160 3e17c43f5d42e91ed461749582037f8215bdf043 libdv-0.99-r1.ebuild 1261
 SHA256 f84918b65f6e0dc4b6baf146cc46d3d33a271874a3876f947fd5079ffc758751 libdv-0.99-r1.ebuild 1261
+EBUILD libdv-1.0.0-r1.ebuild 1240 RMD160 543637d6ad09e62514fd2d146ed98c86d4e4ba77 SHA1 0ca0eefd23cbfdfc7ecc1044cf4952048db5241f SHA256 346c337d83e502b987d59c375f09196c01a9d8d8d92b7e60c89b820078f5e8b5
+MD5 b3de0ff75e892398d15a38d2b9efbc27 libdv-1.0.0-r1.ebuild 1240
+RMD160 543637d6ad09e62514fd2d146ed98c86d4e4ba77 libdv-1.0.0-r1.ebuild 1240
+SHA256 346c337d83e502b987d59c375f09196c01a9d8d8d92b7e60c89b820078f5e8b5 libdv-1.0.0-r1.ebuild 1240
 EBUILD libdv-1.0.0.ebuild 1153 RMD160 a31c22084e0974f321508d4eea93fe57799fc6ed SHA1 9d08fe9e4467433df6ab20f625b995c6a2525dbb SHA256 4f0605779b4030ba188e2bf17f8fd7ff081de3095eab801a55f7fb3cda9dd17a
 MD5 cbd638560985446828f81e4ecc4676de libdv-1.0.0.ebuild 1153
 RMD160 a31c22084e0974f321508d4eea93fe57799fc6ed libdv-1.0.0.ebuild 1153
 SHA256 4f0605779b4030ba188e2bf17f8fd7ff081de3095eab801a55f7fb3cda9dd17a libdv-1.0.0.ebuild 1153
-MISC ChangeLog 8821 RMD160 cf1bdac8d41b35b9a9441ef90936cf9c3d779f62 SHA1 6386e002dc3eecedf0c06075eff0d8fbc4b9478e SHA256 215e8963ae75467113100412823b7903108a2f67149f7ac5e1938ff822af46ca
-MD5 c0ed9c9028c397c50cb9f1a196f594f5 ChangeLog 8821
-RMD160 cf1bdac8d41b35b9a9441ef90936cf9c3d779f62 ChangeLog 8821
-SHA256 215e8963ae75467113100412823b7903108a2f67149f7ac5e1938ff822af46ca ChangeLog 8821
+MISC ChangeLog 9040 RMD160 5c961721e76d9325cc7559f4f9ac30d666455e44 SHA1 1f8b6491d95065b9d3ca371566699321b4bc0022 SHA256 b264d9df757b22b0949cd675b15edda043f7ddf6bf4c9f2e69c514a0c453f4cb
+MD5 84796f06613d33e66012107b67bf304e ChangeLog 9040
+RMD160 5c961721e76d9325cc7559f4f9ac30d666455e44 ChangeLog 9040
+SHA256 b264d9df757b22b0949cd675b15edda043f7ddf6bf4c9f2e69c514a0c453f4cb ChangeLog 9040
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -90,16 +100,22 @@ SHA256 8db2da8c4437b67b846dcd3a50862b32ac306065be7970e0c2a8404d78b9d51f files/di
 MD5 6a89342bced7af9dcf770a83197b3ddf files/digest-libdv-0.104-r2 235
 RMD160 dd19de4a5b42f7b7c456348973fcd02c9221467c files/digest-libdv-0.104-r2 235
 SHA256 e5c88a0dee5042623a3087bfd1b3cb4b165c5bedcc8ff3c0a6749146ae10df6e files/digest-libdv-0.104-r2 235
+MD5 1b1a27d5f61fbe74d92deed3aa330fce files/digest-libdv-0.104-r3 488
+RMD160 2921f5b6aa3df49e41072155cf3dd7f9ca57d3e7 files/digest-libdv-0.104-r3 488
+SHA256 fe14ea53dc0dbd2db83ef267a1e81f49c4da869cede32184729bbaa343ce2f94 files/digest-libdv-0.104-r3 488
 MD5 95959bab64c7566a231acc075cb12a09 files/digest-libdv-0.99-r1 232
 RMD160 7bc15baf00c3123ed2c6874b56934e30a12d7462 files/digest-libdv-0.99-r1 232
 SHA256 4210b3fafe1a7ea1aa422ef83b97a7efa10c3161cd88ceec630aa3fdb56c3b2c files/digest-libdv-0.99-r1 232
 MD5 daefa6990053d24fd9fd2f9650c2022c files/digest-libdv-1.0.0 235
 RMD160 78e5dbb46748d3d962fc24e5c2ed496969a185b0 files/digest-libdv-1.0.0 235
 SHA256 9b4e3139708a34c7f17a2b1bfbe076f99dd12cc90eede310d7aaa35cde105da1 files/digest-libdv-1.0.0 235
+MD5 4d17916cb384929117446b3096e3a7b7 files/digest-libdv-1.0.0-r1 485
+RMD160 914cccf38e12e710a8dbdb8bb5d03e6dbcae9c3f files/digest-libdv-1.0.0-r1 485
+SHA256 46febd90ec8b2cd956b86d9a68c4a20d8aba946a457e9eba16404bfebf594bc7 files/digest-libdv-1.0.0-r1 485
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFTHjmamhnQswr0vIRAtKqAJ9T/sqjeQ7IIejprjaDlL158ko0UwCfe24S
-QrxAUE5L5LD55pT5b6tlT+0=
-=VO7m
+iD8DBQFFbfoGt2vP6XvVdOcRAqLKAKDW3sG8vP5i3PVyCQAYyiD5chw4zgCgrK8l
+bA9We11HQjZ4dEg+N5v6KDo=
+=HHkw
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libdv/files/digest-libdv-0.104-r3 b/media-libs/libdv/files/digest-libdv-0.104-r3
new file mode 100644
index 000000000000..4dec9f7ddf51
--- /dev/null
+++ b/media-libs/libdv/files/digest-libdv-0.104-r3
@@ -0,0 +1,6 @@
+MD5 7c5f94b57dd3bc28f97ff37e344f53b3 libdv-0.104-pic.patch.bz2 11018
+RMD160 25b9fb554a88d2a76b94a32c41050c065202e040 libdv-0.104-pic.patch.bz2 11018
+SHA256 42130856fa711b703dd3404b62887fb7148eb59dd129879943c3b60ead90b55e libdv-0.104-pic.patch.bz2 11018
+MD5 f6b08efce7472daa20685e6e8431f542 libdv-0.104.tar.gz 554691
+RMD160 a91708ecb75533caf2b9038ca68064c7707dcfdf libdv-0.104.tar.gz 554691
+SHA256 8310e365e799dea9547fcaf84b21dae3bf8891a3befe7f0c6556025e6bc2c573 libdv-0.104.tar.gz 554691
diff --git a/media-libs/libdv/files/digest-libdv-1.0.0-r1 b/media-libs/libdv/files/digest-libdv-1.0.0-r1
new file mode 100644
index 000000000000..995389918671
--- /dev/null
+++ b/media-libs/libdv/files/digest-libdv-1.0.0-r1
@@ -0,0 +1,6 @@
+MD5 332c325bdd6224da9bd675d5d9a8ef7c libdv-1.0.0-pic.patch.bz2 9771
+RMD160 a0995597413609ac938f68086a6aac9ef6e2ab37 libdv-1.0.0-pic.patch.bz2 9771
+SHA256 474a50d373e39dd8a0dac0b22f089e957d752145712f97f987ad18028f6d6a5e libdv-1.0.0-pic.patch.bz2 9771
+MD5 f895162161cfa4bb4a94c070a7caa6c7 libdv-1.0.0.tar.gz 574565
+RMD160 a8d3ae083340cec411d5294db7197ea72c8b3c4f libdv-1.0.0.tar.gz 574565
+SHA256 a305734033a9c25541a59e8dd1c254409953269ea7c710c39e540bd8853389ba libdv-1.0.0.tar.gz 574565
diff --git a/media-libs/libdv/libdv-0.104-r3.ebuild b/media-libs/libdv/libdv-0.104-r3.ebuild
new file mode 100644
index 000000000000..e045e734e770
--- /dev/null
+++ b/media-libs/libdv/libdv-0.104-r3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104-r3.ebuild,v 1.1 2006/11/29 21:22:01 zzam Exp $
+
+inherit eutils flag-o-matic libtool
+
+DESCRIPTION="Software codec for dv-format video (camcorders etc)"
+HOMEPAGE="http://libdv.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/${PN}-0.104-pic.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug gtk sdl xv"
+
+RDEPEND="dev-libs/popt
+	gtk? ( =x11-libs/gtk+-1.2* )
+	sdl? ( >=media-libs/libsdl-1.2.5 )
+	xv? ( x11-libs/libXv )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	gtk? ( x11-proto/xextproto x11-libs/libXt )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.99-2.6.patch
+	epatch "${FILESDIR}"/${PN}-0.104-amd64reloc.patch
+	epatch "${FILESDIR}"/${PN}-0.104-no-exec-stack.patch
+	epatch "${FILESDIR}"/${P}-playdv-segv.patch
+	epatch "${FILESDIR}"/${PN}-0.103-mmx.patch
+	epatch "${FILESDIR}"/${P}-inline.patch
+	epatch "${WORKDIR}"/${PN}-0.104-pic.patch
+
+	elibtoolize
+	epunt_cxx #74497
+}
+
+src_compile() {
+	econf \
+		$(use_with debug) \
+		$(use_enable gtk) $(use_enable gtk gtktest) \
+		$(use_enable sdl) \
+		$(use_enable xv) \
+		|| die "econf failed"
+	make || die "compile problem"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog INSTALL NEWS README* TODO
+}
diff --git a/media-libs/libdv/libdv-1.0.0-r1.ebuild b/media-libs/libdv/libdv-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..7a1a04e1542f
--- /dev/null
+++ b/media-libs/libdv/libdv-1.0.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-1.0.0-r1.ebuild,v 1.1 2006/11/29 21:22:01 zzam Exp $
+
+inherit eutils flag-o-matic libtool
+
+DESCRIPTION="Software codec for dv-format video (camcorders etc)"
+HOMEPAGE="http://libdv.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/${PN}-1.0.0-pic.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug gtk sdl xv"
+
+RDEPEND="dev-libs/popt
+	gtk? ( =x11-libs/gtk+-1.2* )
+	sdl? ( >=media-libs/libsdl-1.2.5 )
+	xv? ( x11-libs/libXv )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	gtk? ( x11-proto/xextproto x11-libs/libXt )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.99-2.6.patch
+	epatch "${WORKDIR}"/${PN}-1.0.0-pic.patch
+	elibtoolize
+	epunt_cxx #74497
+}
+
+src_compile() {
+	econf \
+		$(use_with debug) \
+		$(use_enable gtk) $(use_enable gtk gtktest) \
+		$(use_enable sdl) \
+		$(use_enable xv) \
+		|| die "econf failed"
+	emake || die "compile problem"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog INSTALL NEWS README* TODO
+}