port pic fix to this release too, bug #218267

Package-Manager: portage-2.1.5_rc10

4 files changed, 83 insertions, 10 deletions

diff --git a/media-libs/libtheora/ChangeLog b/media-libs/libtheora/ChangeLog
index 2e2b60941969..fb72002a2edd 100644
--- a/media-libs/libtheora/ChangeLog
+++ b/media-libs/libtheora/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libtheora
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.74 2008/04/18 23:26:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.75 2008/05/11 21:13:33 aballier Exp $
+
+*libtheora-1.0_beta3-r1 (11 May 2008)
+
+  11 May 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/libtheora-1.0_beta3-pic-fix.patch, -libtheora-1.0_beta3.ebuild,
+  +libtheora-1.0_beta3-r1.ebuild:
+  port pic fix to this release too, bug #218267
 
   18 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
   libtheora-1.0_beta3.ebuild:
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index 58fecf7f0eba..16189edc03cc 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -4,19 +4,20 @@ Hash: SHA1
 AUX libtheora-1.0_alpha6-pic-fix.patch 10712 RMD160 bb24bd1268ea4bbce8bdfc4ae21c7d5a463067ff SHA1 8654476589b44ecf0eea17204189c7b76c7c812b SHA256 1c5e77d55fe186f61cdde878d4f06333a7c4382ddea14a02b82c7e2395b1c4cd
 AUX libtheora-1.0_beta2-flags.patch 763 RMD160 eb1d55ab98e5eae570845baf17eb93301271596c SHA1 b79a4338454e832d2b46df55bae1de967919eb24 SHA256 7efb7aec3e472914ffc0facbdc9769e088e5d69e285254d19f353555ca90c7d6
 AUX libtheora-1.0_beta2-pic-fix.patch 4578 RMD160 0d44682d6c7897ade44d67996b5e1a95c2aba17c SHA1 b235d4f11d81bac49a89819643d5d3a4b29ceccf SHA256 c613bece1d08b51e95031b0de4a8a0d1e3271382480bbe7e77b6bc973f2f6c4c
+AUX libtheora-1.0_beta3-pic-fix.patch 3410 RMD160 01de450df2b8094d565c743efaf8fc95dd83f068 SHA1 55a3f8c007dcd6a23cd24e0d36c4e22329812cb5 SHA256 2d791cabf4c5a130fed38261d52ef626a212e002cb40c52a38c1e353f5f462bd
 AUX libtheora-1.0alpha6-buildfixes.patch 3977 RMD160 58061a155a4fbdb35ec87288d332001906ba457e SHA1 972fd0c16c2ac9fa15996cd54ad2b34034ee27ed SHA256 d2770fadcef32f8c4ea585865974ad82b8e55b4c6b874168d258b5c65e5d2701
 DIST libtheora-1.0alpha6.tar.bz2 1559318 RMD160 b0d81dab81ec96d51e2d6a4c047beff807de6077 SHA1 0fa7314a432e60c6178a7d98b6408c7a950155ed SHA256 4e6044cb24d2cdb42e5d9402c709644886e8761f7b166781469ffda44240da92
 DIST libtheora-1.0beta2.tar.bz2 1774632 RMD160 544bdb94e09fdfcfb76b603dd32c40ed5d6103a2 SHA1 d58490cc507e1840fbdb432a1dd12433644cc04b SHA256 8bd514ddf5836d82a97f9ff2a4b606c9ccf6ed749055a9fb79f7a335c0ef4b20
 DIST libtheora-1.0beta3.tar.bz2 1531449 RMD160 5308039be56064c7a54d464b0dc32f31542a34d8 SHA1 01f0a5adcdde5bdc5b7e700b5975067af60b456c SHA256 9d69299b06c1ec840b36bdf3951d86dc40d23c50f1d898ea633afa594ec43da7
 EBUILD libtheora-1.0_alpha6-r1.ebuild 1656 RMD160 8b65cb3a7b0de1681d690b50505e5f3cc150dbcd SHA1 14236c5ee2980da1d3007dd9634a6c1ef7ea71bd SHA256 bc83edd34bb1892403fafa39f60f5855c4e82ad9d91effdb7351cb9208f94d97
 EBUILD libtheora-1.0_beta2-r1.ebuild 1412 RMD160 2e3b2d5359a8008ad1e0c260d26a24f8e1478555 SHA1 ea21c17e27ebc73fff68f62b83307494bc23766b SHA256 4e4dfd7ef8a186ddd0551953c990e5738f095474cc2cf42644caa6c6fc8a7980
-EBUILD libtheora-1.0_beta3.ebuild 1541 RMD160 b0e662e7c6513145b1f1d46127a101389cd7581f SHA1 f3e7e77375dfb2c1c72ddecf2b894079012cdccf SHA256 bb7684a35b75d2fd5752c90feef509fb970955e36921e779d7ae2be9ca0f3100
-MISC ChangeLog 10755 RMD160 9c1b78b74067d6fe842e16119b095ecc477ecd9a SHA1 60142486bf46f5ea5f4f40dcb7168a37f5f30c54 SHA256 c109a029a3b10048343117cb27c853be529e6fbeed911531df785be003609c53
+EBUILD libtheora-1.0_beta3-r1.ebuild 1573 RMD160 e7a523cddc3bb2b968d15a1c8e24ac982b504609 SHA1 8c1bbf8e1eb7f8418c08e4c6689bfd4ae6ba3f9b SHA256 2f0407c0b43af11b32ec038c8059779d2ff0cb95b6129ff4d6e922acc794b64e
+MISC ChangeLog 11001 RMD160 5cc2183d7a0f39080fb467aedbe7b2ce4c2c532e SHA1 b18b8ac6ab10a8a9363968505aaafb58dd52cb59 SHA256 eb6804df5ae35e3ccfe817efe52033d9443f31ec87ee37216951b12033ced83b
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgJLkcACgkQAiZjviIA2XirQACgmYO+9JvCaVLj0awRu50Snna3
-qLIAn1scvM9Pjpu4h0YSLcQqXkMH/6iP
-=lX/x
+iEYEARECAAYFAkgnYYUACgkQvFcC4BYPU0rMwQCeMNpfVyGtnnQaUPXgJ7szPBBJ
+LtYAnAtXjXZvi3QoCQW5QvJcoIglAnJR
+=sTyA
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libtheora/files/libtheora-1.0_beta3-pic-fix.patch b/media-libs/libtheora/files/libtheora-1.0_beta3-pic-fix.patch
new file mode 100644
index 000000000000..fc4568e327dd
--- /dev/null
+++ b/media-libs/libtheora/files/libtheora-1.0_beta3-pic-fix.patch
@@ -0,0 +1,64 @@
+Index: libtheora-1.0beta3/lib/enc/x86_32/dct_decode_mmx.c
+===================================================================
+--- libtheora-1.0beta3.orig/lib/enc/x86_32/dct_decode_mmx.c
++++ libtheora-1.0beta3/lib/enc/x86_32/dct_decode_mmx.c
+@@ -24,12 +24,6 @@
+ static const __attribute__((aligned(8),used)) ogg_int64_t V3= 0x0003000300030003LL;
+ static const __attribute__((aligned(8),used)) ogg_int64_t V804= 0x0804080408040804LL;
+ 
+-#if defined(__APPLE__) || defined(__CYGWIN__) || defined (__WIN32__)
+-#define MANGLE(x) "_"#x
+-#else
+-#define MANGLE(x) #x
+-#endif
+-
+ static void FilterHoriz__mmx(unsigned char * PixelPtr,
+                         ogg_int32_t LineLength,
+                         ogg_int16_t *BoundingValuePtr){
+@@ -57,9 +51,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) */       \
+@@ -86,7 +80,7 @@ static void FilterHoriz__mmx(unsigned ch
+     " shrl $16,%%edi\n"                                                 \
+     " movw %%di,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"                                           \
+     );
+ 
+@@ -125,12 +119,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 */
+ 
+@@ -167,7 +161,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_beta3.ebuild b/media-libs/libtheora/libtheora-1.0_beta3-r1.ebuild
index c90e23dda27f..7516f4a0e1af 100644
--- a/media-libs/libtheora/libtheora-1.0_beta3.ebuild
+++ b/media-libs/libtheora/libtheora-1.0_beta3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_beta3.ebuild,v 1.3 2008/04/18 23:26:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.0_beta3-r1.ebuild,v 1.1 2008/05/11 21:13:33 aballier Exp $
 
 inherit autotools eutils toolchain-funcs flag-o-matic
 
@@ -11,7 +11,7 @@ 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 pic"
+IUSE="doc encode examples"
 
 RDEPEND="media-libs/libogg
 	encode? ( media-libs/libvorbis )"
@@ -25,11 +25,12 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-1.0_beta2-flags.patch
+	epatch "${FILESDIR}"/${P}-pic-fix.patch
 	AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {
-	use pic && local myconf="--disable-asm" #200549, comment #28
+	use x86 && filter-flags -fforce-addr -frename-registers #200549
 	use doc || export ac_cv_prog_HAVE_DOXYGEN="false"
 
 	# Don't build specs even with doc enabled, just a few people would need
@@ -37,7 +38,7 @@ src_compile() {
 	export ac_cv_prog_HAVE_PDFLATEX="false"
 
 	econf --disable-dependency-tracking --disable-examples \
-		--disable-sdltest $(use_enable encode) ${myconf}
+		--disable-sdltest $(use_enable encode)
 
 	emake || die "emake failed."
 }