diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2008-12-09 15:17:51 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2008-12-09 15:17:51 +0000 |
commit | 02b931c86d62578a507006b66d727ef418929425 (patch) | |
tree | a36ec389151562501459aef1670582ced43fe4ac /media-libs/libtheora/files | |
parent | Sparc stable, Bug #215149. (diff) | |
download | gentoo-2-02b931c86d62578a507006b66d727ef418929425.tar.gz gentoo-2-02b931c86d62578a507006b66d727ef418929425.tar.bz2 gentoo-2-02b931c86d62578a507006b66d727ef418929425.zip |
old
(Portage version: 2.1.6/cvs/Linux 2.6.27.7 i686)
Diffstat (limited to 'media-libs/libtheora/files')
3 files changed, 0 insertions, 351 deletions
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) |