summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2007-12-07 20:01:14 +0000
committerAlexis Ballier <aballier@gentoo.org>2007-12-07 20:01:14 +0000
commitd8ff8fecb3a06a85fdf2497ffbf2595ea6d2018c (patch)
treeb1ad0daade46f38c2454661572ff0e19041a561f
parentVersion bump to use new GNUstep eclasses (diff)
downloadhistorical-d8ff8fecb3a06a85fdf2497ffbf2595ea6d2018c.tar.gz
historical-d8ff8fecb3a06a85fdf2497ffbf2595ea6d2018c.tar.bz2
historical-d8ff8fecb3a06a85fdf2497ffbf2595ea6d2018c.zip
fix textrels, bug #200670, getting rid of pic useflag, readding ~x86-fbsd keyword as its fine there
Package-Manager: portage-2.1.4_rc8
-rw-r--r--media-libs/libtheora/ChangeLog9
-rw-r--r--media-libs/libtheora/Manifest29
-rw-r--r--media-libs/libtheora/files/digest-libtheora-1.0_beta2-r13
-rw-r--r--media-libs/libtheora/files/libtheora-1.0_beta2-pic-fix.patch51
-rw-r--r--media-libs/libtheora/libtheora-1.0_beta2-r1.ebuild56
5 files changed, 143 insertions, 5 deletions
diff --git a/media-libs/libtheora/ChangeLog b/media-libs/libtheora/ChangeLog
index ba75a0e59d60..a1a9f0ed9836 100644
--- a/media-libs/libtheora/ChangeLog
+++ b/media-libs/libtheora/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-libs/libtheora
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.61 2007/11/27 20:54:56 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.62 2007/12/07 20:01:14 aballier Exp $
+
+*libtheora-1.0_beta2-r1 (07 Dec 2007)
+
+ 07 Dec 2007; Alexis Ballier <aballier@gentoo.org>
+ +files/libtheora-1.0_beta2-pic-fix.patch, +libtheora-1.0_beta2-r1.ebuild:
+ fix textrels, bug #200670, getting rid of pic useflag, readding ~x86-fbsd
+ keyword as its fine there
27 Nov 2007; Samuli Suominen <drac@gentoo.org>
files/libtheora-1.0_beta2-flags.patch:
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index 24354232c81c..ce815c8311bd 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX libtheora-1.0_alpha6-pic-fix.patch 10712 RMD160 bb24bd1268ea4bbce8bdfc4ae21c7d5a463067ff SHA1 8654476589b44ecf0eea17204189c7b76c7c812b SHA256 1c5e77d55fe186f61cdde878d4f06333a7c4382ddea14a02b82c7e2395b1c4cd
MD5 5ee6df083131befd1d185acff813aa77 files/libtheora-1.0_alpha6-pic-fix.patch 10712
RMD160 bb24bd1268ea4bbce8bdfc4ae21c7d5a463067ff files/libtheora-1.0_alpha6-pic-fix.patch 10712
@@ -6,6 +9,10 @@ AUX libtheora-1.0_beta2-flags.patch 784 RMD160 fbc5d373cb9232c82b2e6806305dbea09
MD5 ebab8129fa395bb2ce04474295e39e7b files/libtheora-1.0_beta2-flags.patch 784
RMD160 fbc5d373cb9232c82b2e6806305dbea0932956b5 files/libtheora-1.0_beta2-flags.patch 784
SHA256 600475e29a3f8b1eddf77493f10e52e333f587dfcc2a8c5810fb87b7e6ba9d71 files/libtheora-1.0_beta2-flags.patch 784
+AUX libtheora-1.0_beta2-pic-fix.patch 2916 RMD160 098a6ea58834aba3ce8dc219c0bceb44ceeba3b6 SHA1 c3f5cc0c84e7a79847ceea7e45e8851cf9a23dd7 SHA256 c06b1f8b012b28430b8823ebf94986a39f087c926707ded83de8bab28659bbb8
+MD5 9c8fbaa4b71c2b700f8f46739f49a6d0 files/libtheora-1.0_beta2-pic-fix.patch 2916
+RMD160 098a6ea58834aba3ce8dc219c0bceb44ceeba3b6 files/libtheora-1.0_beta2-pic-fix.patch 2916
+SHA256 c06b1f8b012b28430b8823ebf94986a39f087c926707ded83de8bab28659bbb8 files/libtheora-1.0_beta2-pic-fix.patch 2916
AUX libtheora-1.0alpha6-buildfixes.patch 3977 RMD160 58061a155a4fbdb35ec87288d332001906ba457e SHA1 972fd0c16c2ac9fa15996cd54ad2b34034ee27ed SHA256 d2770fadcef32f8c4ea585865974ad82b8e55b4c6b874168d258b5c65e5d2701
MD5 1eb2cfa449ce65cb36b04b1d8c93933f files/libtheora-1.0alpha6-buildfixes.patch 3977
RMD160 58061a155a4fbdb35ec87288d332001906ba457e files/libtheora-1.0alpha6-buildfixes.patch 3977
@@ -29,14 +36,18 @@ EBUILD libtheora-1.0_alpha7.ebuild 1489 RMD160 6faf15754fbb4b701c240bc53dd31d7ba
MD5 56bf308c04fb69b9df5adc0d7840af2d libtheora-1.0_alpha7.ebuild 1489
RMD160 6faf15754fbb4b701c240bc53dd31d7ba53cd2f2 libtheora-1.0_alpha7.ebuild 1489
SHA256 c75e56af947d4bc9480f762be7d9ee83eb597ce59895807939a5d275b9a42b4b libtheora-1.0_alpha7.ebuild 1489
+EBUILD libtheora-1.0_beta2-r1.ebuild 1355 RMD160 6286ca1151f294977629a85cf9ea9c383e73c02e SHA1 961a150e83e6532be70c0ce01c8b97db5a0b0cfb SHA256 0e9eacd4b0fe08baf28f98362f8cba72060bc023c2c761dea758f380860e3fba
+MD5 0d926e83e216228f6cd411c343403d39 libtheora-1.0_beta2-r1.ebuild 1355
+RMD160 6286ca1151f294977629a85cf9ea9c383e73c02e libtheora-1.0_beta2-r1.ebuild 1355
+SHA256 0e9eacd4b0fe08baf28f98362f8cba72060bc023c2c761dea758f380860e3fba libtheora-1.0_beta2-r1.ebuild 1355
EBUILD libtheora-1.0_beta2.ebuild 1336 RMD160 88814205ed24298002e6e5c910d9b17880cc1f40 SHA1 49239ab8cba1e958ace1eceb17e7896ce0169852 SHA256 1c5f979fc62e24fdbda18a192a491204188b338255cccd1e821e8ceb2b88a3f5
MD5 1f9b2393acc96b4d8463a803c7266352 libtheora-1.0_beta2.ebuild 1336
RMD160 88814205ed24298002e6e5c910d9b17880cc1f40 libtheora-1.0_beta2.ebuild 1336
SHA256 1c5f979fc62e24fdbda18a192a491204188b338255cccd1e821e8ceb2b88a3f5 libtheora-1.0_beta2.ebuild 1336
-MISC ChangeLog 8465 RMD160 ebaef9f9bf0a13dce6559df6f72006019b71085c SHA1 814c52fa8924c8903a8b096c7976b6d6e918338b SHA256 a84cb99e4b668c58935c7f78a5f8b55fd66960b5bdc52dcdd35c2154637ff089
-MD5 4a6e698587d3ee71489b544382ac46d0 ChangeLog 8465
-RMD160 ebaef9f9bf0a13dce6559df6f72006019b71085c ChangeLog 8465
-SHA256 a84cb99e4b668c58935c7f78a5f8b55fd66960b5bdc52dcdd35c2154637ff089 ChangeLog 8465
+MISC ChangeLog 8741 RMD160 a6456f9afeb639d643184ac108b6bccf832c0f35 SHA1 6e3b0150ee5bd736284b6eca2b90eacb3ba94e0a SHA256 fae7eb5e0b2b96b72dc23a97c4ba1cd066351310f490a876be037a1c5b9d19a7
+MD5 4d427597b30abdec164d2fba8c087917 ChangeLog 8741
+RMD160 a6456f9afeb639d643184ac108b6bccf832c0f35 ChangeLog 8741
+SHA256 fae7eb5e0b2b96b72dc23a97c4ba1cd066351310f490a876be037a1c5b9d19a7 ChangeLog 8741
MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -53,3 +64,13 @@ SHA256 ed04c06d51479bd86dd0263900668d7908ef14d78987c7f75a57cfbd029abfab files/di
MD5 de771445a9a0bf6bc73425c7d5d01f0c files/digest-libtheora-1.0_beta2 262
RMD160 57f5680554b57b35962a2750d77edaa794818e00 files/digest-libtheora-1.0_beta2 262
SHA256 3fc902b5f685e058c2514ca5dae6118593c913c20ea131b78b60d4ee42f7fc32 files/digest-libtheora-1.0_beta2 262
+MD5 de771445a9a0bf6bc73425c7d5d01f0c files/digest-libtheora-1.0_beta2-r1 262
+RMD160 57f5680554b57b35962a2750d77edaa794818e00 files/digest-libtheora-1.0_beta2-r1 262
+SHA256 3fc902b5f685e058c2514ca5dae6118593c913c20ea131b78b60d4ee42f7fc32 files/digest-libtheora-1.0_beta2-r1 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHWaagvFcC4BYPU0oRAidxAKCvpBJ6H7IJ6UJ8gRseiopZxdlIEACgrc/s
+eDj3tvkmjUQS61I4k8Hn9WM=
+=qVRK
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libtheora/files/digest-libtheora-1.0_beta2-r1 b/media-libs/libtheora/files/digest-libtheora-1.0_beta2-r1
new file mode 100644
index 000000000000..b1a25e44c2fb
--- /dev/null
+++ b/media-libs/libtheora/files/digest-libtheora-1.0_beta2-r1
@@ -0,0 +1,3 @@
+MD5 6ed9f998a982e996ad53d3686d655cfe libtheora-1.0beta2.tar.bz2 1774632
+RMD160 544bdb94e09fdfcfb76b603dd32c40ed5d6103a2 libtheora-1.0beta2.tar.bz2 1774632
+SHA256 8bd514ddf5836d82a97f9ff2a4b606c9ccf6ed749055a9fb79f7a335c0ef4b20 libtheora-1.0beta2.tar.bz2 1774632
diff --git a/media-libs/libtheora/files/libtheora-1.0_beta2-pic-fix.patch b/media-libs/libtheora/files/libtheora-1.0_beta2-pic-fix.patch
new file mode 100644
index 000000000000..3664f44c0161
--- /dev/null
+++ b/media-libs/libtheora/files/libtheora-1.0_beta2-pic-fix.patch
@@ -0,0 +1,51 @@
+Index: libtheora-1.0beta2/lib/enc/x86_32/dct_decode_mmx.c
+===================================================================
+--- libtheora-1.0beta2.orig/lib/enc/x86_32/dct_decode_mmx.c
++++ libtheora-1.0beta2/lib/enc/x86_32/dct_decode_mmx.c
+@@ -57,9 +57,9 @@ static void FilterHoriz__mmx(unsigned ch
+ "psubw %%mm3,%%mm1\n" /* mm1 = pix[0]-pix[3] mm1 - mm3 */ \
+ "movq %%mm0,%%mm7\n" /* mm7 = pix[2]*/ \
+ "psubw %%mm5,%%mm0\n" /* mm0 = pix[2]-pix[1] mm0 - mm5*/ \
+- "PMULLW "MANGLE(V3)",%%mm0\n" /* *3 */ \
++ "PMULLW %3,%%mm0\n" /* *3 */ \
+ "paddw %%mm0,%%mm1\n" /* mm1 has f[0] ... f[4]*/ \
+- "paddw "MANGLE(V804)",%%mm1\n"/* add 4 */ /* add 256 after shift */ \
++ "paddw %4,%%mm1\n"/* add 4 */ /* add 256 after shift */ \
+ "psraw $3,%%mm1\n" /* >>3 */ \
+ " pextrw $0,%%mm1,%%esi\n" /* In MM1 we have 4 f coefs (16bits) */ \
+ " pextrw $1,%%mm1,%%edi\n" /* now perform MM4 = *(_bv+ f) */ \
+@@ -87,7 +87,7 @@ static void FilterHoriz__mmx(unsigned ch
+ " shrl $16,%%eax\n" \
+ " movw %%ax,1(%0,%%esi)\n" \
+ : \
+- : "r" (PixelPtr), "r" (LineLength), "r" (BoundingValuePtr-256) \
++ : "r" (PixelPtr), "r" (LineLength), "r" (BoundingValuePtr-256), "m" (V3), "m" (V804) \
+ : "esi", "edi" , "memory", "eax" \
+ );
+
+@@ -126,12 +126,12 @@ static void FilterVert__mmx(unsigned cha
+ "psubw %%mm5,%%mm3\n"
+ "psubw %%mm4,%%mm2\n"
+ /* mm3:mm2 = (pix[ystride*2]-pix[ystride]); */
+- "PMULLW "MANGLE(V3)",%%mm3\n" /* *3 */
+- "PMULLW "MANGLE(V3)",%%mm2\n" /* *3 */
++ "PMULLW %3,%%mm3\n" /* *3 */
++ "PMULLW %3,%%mm2\n" /* *3 */
+ "paddw %%mm7,%%mm3\n" /* highpart */
+ "paddw %%mm6,%%mm2\n" /* lowpart of pix[0]-pix[ystride*3]+3*(pix[ystride*2]-pix[ystride]); */
+- "paddw "MANGLE(V804)",%%mm3\n" /* add 4 */ /* add 256 after shift */
+- "paddw "MANGLE(V804)",%%mm2\n" /* add 4 */ /* add 256 after shift */
++ "paddw %4,%%mm3\n" /* add 4 */ /* add 256 after shift */
++ "paddw %4,%%mm2\n" /* add 4 */ /* add 256 after shift */
+ "psraw $3,%%mm3\n" /* >>3 f coefs high */
+ "psraw $3,%%mm2\n" /* >>3 f coefs low */
+
+@@ -168,7 +168,7 @@ static void FilterVert__mmx(unsigned cha
+ "movq %%mm4,(%0,%1)\n" /* pix[ystride]= */
+ "emms\n"
+ :
+- : "r" (PixelPtr-2*LineLength), "r" (LineLength), "r" (BoundingValuePtr-256)
++ : "r" (PixelPtr-2*LineLength), "r" (LineLength), "r" (BoundingValuePtr-256), "m" (V3), "m" (V804)
+ : "esi", "edi" , "memory"
+ );
+ }
diff --git a/media-libs/libtheora/libtheora-1.0_beta2-r1.ebuild b/media-libs/libtheora/libtheora-1.0_beta2-r1.ebuild
new file mode 100644
index 000000000000..98d35b3c7c06
--- /dev/null
+++ b/media-libs/libtheora/libtheora-1.0_beta2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_beta2-r1.ebuild,v 1.1 2007/12/07 20:01:14 aballier Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="The Theora Video Compression Codec"
+HOMEPAGE="http://www.theora.org"
+SRC_URI="http://downloads.xiph.org/releases/theora/${P/_}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc encode examples"
+
+RDEPEND=">=media-libs/libogg-1.1
+ encode? ( >=media-libs/libvorbis-1.0.1 )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ dev-util/pkgconfig"
+
+S=${WORKDIR}/${P/_}
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-flags.patch
+ epatch "${FILESDIR}"/${P}-pic-fix.patch
+ AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+ local myconf
+
+ use doc || export ac_cv_prog_HAVE_DOXYGEN="false"
+
+ econf --disable-dependency-tracking --disable-examples \
+ --disable-sdltest $(use_enable encode) ${myconf}
+
+ emake || die "emake failed."
+}
+
+src_install() {
+ emake DESTDIR="${D}" docdir="usr/share/doc/${PF}" \
+ install || die "emake install failed."
+
+ dodoc AUTHORS CHANGES README
+
+ prepalldocs
+
+ if use examples; then
+ rm examples/Makefile*
+ insinto /usr/share/doc/${PF}/examples
+ doins examples/*
+ fi
+}