old

(Portage version: 2.1.6/cvs/Linux 2.6.27.7 i686)

6 files changed, 0 insertions, 487 deletions

diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index 25bd699127a1..e080d436376a 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -1,16 +1,9 @@
-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.0_beta3-tests.patch 812 RMD160 08c4e8ba16743c0f83e49a1930b319365de74bf9 SHA1 2cc262d6e05b1153dcc2cfc16b8e10b4768809b8 SHA256 364fbc5cb84e85c4644d542da412b4c7d362069782d6da9a9ba7876f1da9a1d1
-AUX libtheora-1.0alpha6-buildfixes.patch 3977 RMD160 58061a155a4fbdb35ec87288d332001906ba457e SHA1 972fd0c16c2ac9fa15996cd54ad2b34034ee27ed SHA256 d2770fadcef32f8c4ea585865974ad82b8e55b4c6b874168d258b5c65e5d2701
 DIST libtheora-1.0.tar.bz2 1652987 RMD160 f72d0a2ce8475a888ab67fd77b7126d66d537c9b SHA1 02717773001b44f95bc6c23111a89493a4a93f87 SHA256 3ae9df56e8fc75ffe26e63a13cae2ce79d079416175fb0baffe0e2de8dc91a6d
-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.ebuild 1524 RMD160 1811c16a12ec8a7a27d181756706d0ec9b478481 SHA1 7ad041ac57aa0eec1ac8849946a48cee3e64856f SHA256 359a9fcea640a7041f9c71a96ec587c6d3bd6393e75b1695decc3dd1ac8c35e3
-EBUILD libtheora-1.0_alpha6-r1.ebuild 1656 RMD160 8b65cb3a7b0de1681d690b50505e5f3cc150dbcd SHA1 14236c5ee2980da1d3007dd9634a6c1ef7ea71bd SHA256 bc83edd34bb1892403fafa39f60f5855c4e82ad9d91effdb7351cb9208f94d97
-EBUILD libtheora-1.0_beta2-r1.ebuild 1414 RMD160 b1c986795e9feba756d3cef83555f8824c175e26 SHA1 43f04b8e2f97d3c493e1d8f14ca715c99101d669 SHA256 11ac59fbb4fb578b6e282254ebdff9917f5f1cb0f5a10fabd973fc3cfaeab2d0
 EBUILD libtheora-1.0_beta3-r1.ebuild 1601 RMD160 8ba94dbb2e682762d22bb298984ca62f008dfbaf SHA1 26981a43edd987450e919106fcd5f173cde9ac62 SHA256 b2e2ba6805221580c6759406d93d6629249211e9b8216330dce0bb36c8b124a3
 MISC ChangeLog 12052 RMD160 779766e16ead8a58f3bd49896e42dbe648eb95b7 SHA1 f6ab381ddc94735ba07fd363e737bec9148594df SHA256 28386b5d1aab40e6acb99fcbc79bd42bbd04d98a6b32c560a3ce9786825d3ed1
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
diff --git a/media-libs/libtheora/files/libtheora-1.0_alpha6-pic-fix.patch b/media-libs/libtheora/files/libtheora-1.0_alpha6-pic-fix.patch
deleted file mode 100644
index d79d67afe38d..000000000000
--- a/media-libs/libtheora/files/libtheora-1.0_alpha6-pic-fix.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-diff -urp libtheora-1.0alpha6-old/lib/x86_32/dsp_mmx.c libtheora-1.0alpha6/lib/x86_32/dsp_mmx.c
---- libtheora-1.0alpha6-old/lib/x86_32/dsp_mmx.c	2006-05-27 19:09:12.000000000 +0200
-+++ libtheora-1.0alpha6/lib/x86_32/dsp_mmx.c	2006-07-29 17:37:35.000000000 +0200
-@@ -79,7 +79,7 @@ static void sub8x8_128__mmx (unsigned ch
-     "  .balign 16                   \n\t"
- 
-     "  pxor        %%mm7, %%mm7     \n\t" 
--    "  movq      "M(V128)", %%mm1   \n\t"
-+    "  movq        %3, %%mm1        \n\t"
- 
-     ".rept 8                        \n\t"
-     "  movq        (%0), %%mm0      \n\t" /* mm0 = FiltPtr */
-@@ -99,7 +99,8 @@ static void sub8x8_128__mmx (unsigned ch
- 
-      : "+r" (FiltPtr),
-        "+r" (DctInputPtr)
--     : "m" (PixelsPerLine)
-+     : "m" (PixelsPerLine),
-+       "m" (V128)
-      : "memory"
-   );
- }
-diff -urp libtheora-1.0alpha6-old/lib/x86_32/fdct_mmx.c libtheora-1.0alpha6/lib/x86_32/fdct_mmx.c
---- libtheora-1.0alpha6-old/lib/x86_32/fdct_mmx.c	2006-05-27 19:09:12.000000000 +0200
-+++ libtheora-1.0alpha6/lib/x86_32/fdct_mmx.c	2006-07-29 17:52:20.000000000 +0200
-@@ -74,7 +74,7 @@ static const __attribute__ ((aligned(8),
-   "  movq        %%mm2, %%mm0       \n\t" /* make a copy */                   \
-   "  paddsw      %%mm2, %%mm3       \n\t" /* mm3 = is0734 + is1256 */         \
-                                                                               \
--  "  pmulhw   "M(xC4S4)", %%mm0     \n\t" /* mm0 = xC4S4 * ( is0734 - is1256 ) - ( is0734 - is1256 ) */ \
-+  "  pmulhw      %6, %%mm0          \n\t" /* mm0 = xC4S4 * ( is0734 - is1256 ) - ( is0734 - is1256 ) */ \
-   "  paddw       %%mm2, %%mm0       \n\t" /* mm0 = xC4S4 * ( is0734 - is1256 ) */ \
-   "  psrlw       $15, %%mm2         \n\t"                                     \
-   "  paddw       %%mm2, %%mm0       \n\t" /* Truncate mm0, now it is op[4] */ \
-@@ -83,7 +83,7 @@ static const __attribute__ ((aligned(8),
-   "  movq        %%mm0," #ip4 "     \n\t" /* save ip4, now mm0,mm2 are free */ \
-                                                                               \
-   "  movq        %%mm3, %%mm0       \n\t"                                     \
--  "  pmulhw   "M(xC4S4)", %%mm3     \n\t" /* mm3 = xC4S4 * ( is0734 +is1256 ) - ( is0734 +is1256 ) */ \
-+  "  pmulhw      %6, %%mm3          \n\t" /* mm3 = xC4S4 * ( is0734 +is1256 ) - ( is0734 +is1256 ) */ \
-                                                                               \
-   "  psrlw       $15, %%mm2         \n\t"                                     \
-   "  paddw       %%mm0, %%mm3       \n\t" /* mm3 = xC4S4 * ( is0734 +is1256 )	 */ \
-@@ -92,7 +92,7 @@ static const __attribute__ ((aligned(8),
-   "  movq        %%mm3," #ip0 "     \n\t"                                     \
-   /* ------------------------------------------------------------------- */   \
-   "  movq      " #temp ", %%mm3     \n\t" /* mm3 = irot_input_y */            \
--  "  pmulhw   "M(xC2S6)", %%mm3     \n\t" /* mm3 = xC2S6 * irot_input_y - irot_input_y */ \
-+  "  pmulhw      %4, %%mm3          \n\t" /* mm3 = xC2S6 * irot_input_y - irot_input_y */ \
-                                                                               \
-   "  movq      " #temp ", %%mm2     \n\t"                                     \
-   "  movq        %%mm2, %%mm0       \n\t"                                     \
-@@ -104,7 +104,7 @@ static const __attribute__ ((aligned(8),
-   "  movq        %%mm5, %%mm0       \n\t"                                     \
-                                                                               \
-   "  movq        %%mm5, %%mm2       \n\t"                                     \
--  "  pmulhw   "M(xC6S2)", %%mm0     \n\t" /* mm0 = xC6S2 * irot_input_x */    \
-+  "  pmulhw      %8, %%mm0          \n\t" /* mm0 = xC6S2 * irot_input_x */    \
-                                                                               \
-   "  psrlw       $15, %%mm2         \n\t"                                     \
-   "  paddw       %%mm2, %%mm0       \n\t" /* Truncated */                     \
-@@ -115,7 +115,7 @@ static const __attribute__ ((aligned(8),
-   "  movq        %%mm5, %%mm0       \n\t"                                     \
-   "  movq        %%mm5, %%mm2       \n\t"                                     \
-                                                                               \
--  "  pmulhw   "M(xC2S6)", %%mm5     \n\t" /* mm5 = xC2S6 * irot_input_x - irot_input_x */ \
-+  "  pmulhw      %4, %%mm5          \n\t" /* mm5 = xC2S6 * irot_input_x - irot_input_x */ \
-   "  psrlw       $15, %%mm2         \n\t"                                     \
-                                                                               \
-   "  movq      " #temp ", %%mm3     \n\t"                                     \
-@@ -124,7 +124,7 @@ static const __attribute__ ((aligned(8),
-   "  paddw       %%mm2, %%mm5       \n\t" /* Truncated */                     \
-   "  movq        %%mm3, %%mm2       \n\t"                                     \
-                                                                               \
--  "  pmulhw   "M(xC6S2)", %%mm3     \n\t" /* mm3 = xC6S2 * irot_input_y */    \
-+  "  pmulhw      %8, %%mm3          \n\t" /* mm3 = xC6S2 * irot_input_y */    \
-   "  psrlw       $15, %%mm2         \n\t"                                     \
-                                                                               \
-   "  paddw       %%mm2, %%mm3       \n\t" /* Truncated */                     \
-@@ -132,7 +132,7 @@ static const __attribute__ ((aligned(8),
-                                                                               \
-   "  movq        %%mm3," #ip6 "     \n\t"                                     \
-   /* ------------------------------------------------------------------- */   \
--  "  movq     "M(xC4S4)", %%mm0     \n\t"                                     \
-+  "  movq        %6, %%mm0          \n\t"                                     \
-   "  movq        %%mm1, %%mm2       \n\t"                                     \
-   "  movq        %%mm1, %%mm3       \n\t"                                     \
-                                                                               \
-@@ -162,13 +162,13 @@ static const __attribute__ ((aligned(8),
-   "  paddsw      %%mm1, %%mm1       \n\t"                                     \
-   "  paddsw      %%mm4, %%mm1       \n\t" /* mm1 = id07 + icommon_product1 */ \
-   /* ------------------------------------------------------------------- */   \
--  "  movq     "M(xC1S7)", %%mm7     \n\t"                                     \
-+  "  movq        %3, %%mm7          \n\t"                                     \
-   "  movq        %%mm1, %%mm2       \n\t"                                     \
-                                                                               \
-   "  movq        %%mm1, %%mm3       \n\t"                                     \
-   "  pmulhw      %%mm7, %%mm1       \n\t" /* mm1 = xC1S7 * irot_input_x - irot_input_x */ \
-                                                                               \
--  "  movq     "M(xC7S1)", %%mm7     \n\t"                                     \
-+  "  movq        %9, %%mm7          \n\t"                                     \
-   "  psrlw       $15, %%mm2         \n\t"                                     \
-                                                                               \
-   "  paddw       %%mm3, %%mm1       \n\t" /* mm1 = xC1S7 * irot_input_x */    \
-@@ -180,10 +180,10 @@ static const __attribute__ ((aligned(8),
-   "  movq        %%mm0, %%mm5       \n\t"                                     \
-   "  movq        %%mm0, %%mm2       \n\t"                                     \
-                                                                               \
--  "  movq     "M(xC1S7)", %%mm7     \n\t"                                     \
-+  "  movq        %3, %%mm7          \n\t"                                     \
-   "  pmulhw      %%mm7, %%mm0       \n\t" /* mm0 = xC1S7 * irot_input_y - irot_input_y */ \
-                                                                               \
--  "  movq     "M(xC7S1)", %%mm7     \n\t"                                     \
-+  "  movq        %9, %%mm7          \n\t"                                     \
-   "  psrlw       $15, %%mm2         \n\t"                                     \
-                                                                               \
-   "  paddw       %%mm5, %%mm0       \n\t" /* mm0 = xC1S7 * irot_input_y */    \
-@@ -198,8 +198,8 @@ static const __attribute__ ((aligned(8),
-   "  movq        %%mm1," #ip1 "     \n\t"                                     \
-   "  movq        %%mm3," #ip7 "     \n\t"                                     \
-   /* ------------------------------------------------------------------- */   \
--  "  movq     "M(xC3S5)", %%mm0     \n\t"                                     \
--  "  movq     "M(xC5S3)", %%mm1     \n\t"                                     \
-+  "  movq        %5, %%mm0          \n\t"                                     \
-+  "  movq        %7, %%mm1          \n\t"                                     \
-                                                                               \
-   "  movq        %%mm6, %%mm5       \n\t"                                     \
-   "  movq        %%mm6, %%mm7       \n\t"                                     \
-@@ -320,7 +320,14 @@ static void fdct_short__mmx ( ogg_int16_
-     
-     : "+r" (InputData),
-       "+r" (OutputData)
--    : "r" (temp)
-+    : "r" (temp),
-+      "m" (xC1S7),
-+      "m" (xC2S6),
-+      "m" (xC3S5),
-+      "m" (xC4S4),
-+      "m" (xC5S3),
-+      "m" (xC6S2),
-+      "m" (xC7S1)
-     : "memory"
-   );
- }
-diff -urp libtheora-1.0alpha6-old/lib/x86_32/recon_mmx.c libtheora-1.0alpha6/lib/x86_32/recon_mmx.c
---- libtheora-1.0alpha6-old/lib/x86_32/recon_mmx.c	2006-05-27 19:09:12.000000000 +0200
-+++ libtheora-1.0alpha6/lib/x86_32/recon_mmx.c	2006-07-29 17:39:05.000000000 +0200
-@@ -71,7 +71,7 @@ static void recon_intra8x8__mmx (unsigne
-   __asm__ __volatile__ (
-     "  .balign 16                      \n\t"
- 
--    "  movq     "M(V128)", %%mm0       \n\t" /* Set mm0 to 0x8080808080808080 */
-+    "  movq        %3, %%mm0           \n\t" /* Set mm0 to 0x8080808080808080 */
- 
-     "  lea         128(%1), %%edi      \n\t" /* Endpoint in input buffer */
-     "1:                                \n\t" 
-@@ -89,7 +89,8 @@ static void recon_intra8x8__mmx (unsigne
-     "  jc          1b                  \n\t" /* Loop back if we are not done */
-       : "+r" (ReconPtr)
-       : "r" (ChangePtr),
--        "r" (LineStep)
-+        "r" (LineStep),
-+        "m" (V128)
-       : "memory", "edi"
-   );
- }
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
deleted file mode 100644
index 0ca893736d19..000000000000
--- a/media-libs/libtheora/files/libtheora-1.0_beta2-pic-fix.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -urp libtheora-1.0beta2-orig/lib/enc/x86_32/dct_decode_mmx.c libtheora-1.0beta2/lib/enc/x86_32/dct_decode_mmx.c
---- libtheora-1.0beta2-orig/lib/enc/x86_32/dct_decode_mmx.c	2007-10-04 20:37:01.000000000 +0200
-+++ libtheora-1.0beta2/lib/enc/x86_32/dct_decode_mmx.c	2007-12-17 10:32:44.000000000 +0100
-@@ -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) */       \
-@@ -75,20 +75,19 @@ static void FilterHoriz__mmx(unsigned ch
-     " packuswb %%mm0,%%mm5\n"   /* mm5 = x x x x newpix1 */             \
-     " packuswb %%mm0,%%mm7\n"   /* mm7 = x x x x newpix2 */             \
-     " punpcklbw %%mm7,%%mm5\n"  /* 2 1 2 1 2 1 2 1 */                   \
--    " movd %%mm5,%%eax\n"       /* eax = newpix21 */                    \
--    " movw %%ax,1(%0)\n"                                                \
-+    " movd %%mm5,%%edi\n"       /* eax = newpix21 */                    \
-+    " movw %%di,1(%0)\n"                                                \
-     " psrlq $32,%%mm5\n"        /* why is so big stall here ? */        \
--    " shrl $16,%%eax\n"                                                 \
--    " lea 1(%0,%1,2),%%edi\n"                                           \
--    " movw %%ax,1(%0,%1,1)\n"                                           \
--    " movd %%mm5,%%eax\n"       /* eax = newpix21 high part */          \
-+    " shrl $16,%%edi\n"                                                 \
-+    " movw %%di,1(%0,%1,1)\n"                                           \
-+    " movd %%mm5,%%edi\n"       /* eax = newpix21 high part */          \
-     " lea (%1,%1,2),%%esi\n"                                            \
--    " movw %%ax,(%%edi)\n"                                              \
--    " shrl $16,%%eax\n"                                                 \
--    " movw %%ax,1(%0,%%esi)\n"                                          \
-+    " movw %%di,1(%0,%1,2)\n"                                              \
-+    " shrl $16,%%edi\n"                                                 \
-+    " movw %%di,1(%0,%%esi)\n"                                          \
-     :                                                                   \
--    : "r" (PixelPtr), "r" (LineLength), "r" (BoundingValuePtr-256)      \
--    : "esi", "edi" , "memory", "eax"                                    \
-+    : "r" (PixelPtr), "r" (LineLength), "r" (BoundingValuePtr-256), "m" (V3), "m" (V804) \
-+    : "esi", "edi" , "memory"                                           \
-     );
- 
-     OC_LOOP_H_4x4
-@@ -126,12 +125,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 +167,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/files/libtheora-1.0alpha6-buildfixes.patch b/media-libs/libtheora/files/libtheora-1.0alpha6-buildfixes.patch
deleted file mode 100644
index 15e90a92f698..000000000000
--- a/media-libs/libtheora/files/libtheora-1.0alpha6-buildfixes.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Complete build fixes so that 1.0_alpha6 of libtheora actually _builds_.
-
-Thanks to Ian Leonard for some of the patches here merged.
-Index: libtheora-1.0alpha6/configure.ac
-===================================================================
---- libtheora-1.0alpha6.orig/configure.ac
-+++ libtheora-1.0alpha6/configure.ac
-@@ -115,12 +115,14 @@ if test "x${ac_enable_asm}" = xyes; then
- 		if test ! "x$target_vendor" = "xapple"; then
- 		  cpu_x86_32=yes 
- 		  cpu_optimization="32 bit x86"
-+  		AC_DEFINE([USE_ASM], [],  [make use of asm optimization])
- 		fi
-     	;;
- 	x86_64)
- 		cpu_x86_64=yes
- 		cpu_optimization="64 bit x86"
--	;;
-+  	AC_DEFINE([USE_ASM], [],  [make use of asm optimization])	
-+    ;;
-   esac
- else
-   cpu_optimization="disabled"
-Index: libtheora-1.0alpha6/lib/encoder_disabled.c
-===================================================================
---- /dev/null
-+++ libtheora-1.0alpha6/lib/encoder_disabled.c
-@@ -0,0 +1,51 @@
-+/********************************************************************
-+ *                                                                  *
-+ * THIS FILE IS PART OF THE OggTheora SOFTWARE CODEC SOURCE CODE.   *
-+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
-+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
-+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
-+ *                                                                  *
-+ * THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2003                *
-+ * by the Xiph.Org Foundation http://www.xiph.org/                  *
-+ *                                                                  *
-+ ********************************************************************
-+
-+  function:
-+  last mod: $Id: libtheora-1.0alpha6-buildfixes.patch,v 1.1 2006/06/07 12:01:51 flameeyes Exp $
-+
-+ ********************************************************************/
-+
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
-+#include "toplevel_lookup.h"
-+#include "toplevel.h"
-+
-+int theora_encode_init(theora_state *th, theora_info *c){
-+  return OC_DISABLED;
-+}
-+
-+int theora_encode_YUVin(theora_state *t, yuv_buffer *yuv){
-+  return OC_DISABLED;
-+}
-+
-+int theora_encode_packetout( theora_state *t, int last_p, ogg_packet *op){
-+  return OC_DISABLED;
-+}
-+
-+int theora_encode_header(theora_state *t, ogg_packet *op){
-+  return OC_DISABLED;
-+}
-+
-+int theora_encode_comment(theora_comment *tc, ogg_packet *op){
-+  return OC_DISABLED;
-+}
-+
-+int theora_encode_tables(theora_state *t, ogg_packet *op){
-+  return OC_DISABLED;
-+}
-+
-+void theora_encoder_clear (CP_INSTANCE * cpi)
-+{
-+}
-Index: libtheora-1.0alpha6/lib/cpu.c
-===================================================================
---- libtheora-1.0alpha6.orig/lib/cpu.c
-+++ libtheora-1.0alpha6/lib/cpu.c
-@@ -26,10 +26,10 @@ cpuid(ogg_int32_t op, ogg_uint32_t *out_
-                 "cpuid         \n\t"
-                 "movl %%ebx,%1 \n\t"
-                 "popq %%rbx"        
--              : "=a" (*eax),         
--                "=r" (*ebx),         
--                "=c" (*ecx),         
--                "=d" (*edx)          
-+              : "=a" (*out_eax),         
-+                "=r" (*out_ebx),         
-+                "=c" (*out_ecx),         
-+                "=d" (*out_edx)          
-               : "a" (op)            
-               : "cc");
- # elif defined(__i386__)
-@@ -37,10 +37,10 @@ cpuid(ogg_int32_t op, ogg_uint32_t *out_
-                 "cpuid         \n\t"
-                 "movl %%ebx,%1 \n\t"
-                 "popl %%ebx"        
--              : "=a" (*eax),         
--                "=r" (*ebx),         
--                "=c" (*ecx),         
--                "=d" (*edx)          
-+              : "=a" (*out_eax),         
-+                "=r" (*out_ebx),         
-+                "=c" (*out_ecx),         
-+                "=d" (*out_edx)          
-               : "a" (op)            
-               : "cc");
- # elif defined(WIN32)
diff --git a/media-libs/libtheora/libtheora-1.0_alpha6-r1.ebuild b/media-libs/libtheora/libtheora-1.0_alpha6-r1.ebuild
deleted file mode 100644
index dd9d510cf21e..000000000000
--- a/media-libs/libtheora/libtheora-1.0_alpha6-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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_alpha6-r1.ebuild,v 1.15 2008/04/17 11:27:38 drac Exp $
-
-WANT_AUTOMAKE=1.9
-WANT_AUTOCONF=2.5
-
-inherit flag-o-matic libtool autotools
-
-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="arm sh"
-IUSE="encode doc examples"
-
-RDEPEND=">=media-libs/libogg-1.1.0
-	encode? ( >=media-libs/libvorbis-1.0.1 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${P/_}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e 's:SUBDIRS = .*:SUBDIRS = lib include doc:' Makefile.am
-
-	epatch "${FILESDIR}/${P/_/}-buildfixes.patch"
-	epatch "${FILESDIR}/${P}-pic-fix.patch"
-
-	# Force automake 1.9 for newer autoconf
-	WANT_AUTOMAKE="1.9" \
-	AT_M4DIR="m4" eautoreconf
-
-	elibtoolize
-
-	if use examples; then
-		# This creates a clean copy of examples sources
-		cp -R "${S}/examples" "${WORKDIR}"
-		rm -f "${WORKDIR}/examples/Makefile"*
-	fi
-}
-
-src_compile() {
-	# bug #75403, -O3 needs to be filtered to -O2
-	replace-flags -O3 -O2
-
-	use doc || export ac_cv_prog_HAVE_DOXYGEN="false"
-
-	econf \
-		$(use_enable encode) \
-		--enable-shared \
-		--disable-dependency-tracking \
-		|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="usr/share/doc/${PF}" \
-		install || die "make install failed"
-
-	if use examples; then
-		insinto "/usr/share/doc/${PF}/examples"
-		doins "${WORKDIR}/examples/"*
-	fi
-
-	dodoc README
-}
diff --git a/media-libs/libtheora/libtheora-1.0_beta2-r1.ebuild b/media-libs/libtheora/libtheora-1.0_beta2-r1.ebuild
deleted file mode 100644
index 8b6817ed1fd9..000000000000
--- a/media-libs/libtheora/libtheora-1.0_beta2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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_beta2-r1.ebuild,v 1.10 2008/12/07 11:53:05 vapier Exp $
-
-inherit autotools eutils toolchain-funcs flag-o-matic
-
-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() {
-	use x86 && filter-flags -fforce-addr -frename-registers #200549
-
-	use doc || export ac_cv_prog_HAVE_DOXYGEN="false"
-
-	econf --disable-dependency-tracking --disable-examples \
-		--disable-sdltest $(use_enable encode)
-
-	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
-}