fix textrels, bug #200670, getting rid of pic useflag, readding ~x86-fbsd keyword as its fine there

(Portage version: 2.1.4_rc8)

4 files changed, 118 insertions, 1 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/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
+}