diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
| commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
| tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/mplayer/files | |
| parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) | |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/mplayer/files')
38 files changed, 0 insertions, 16265 deletions
diff --git a/packages/mplayer/files/Makefile-codec-cfg.patch b/packages/mplayer/files/Makefile-codec-cfg.patch deleted file mode 100644 index 9ce22a8839..0000000000 --- a/packages/mplayer/files/Makefile-codec-cfg.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /tmp/Makefile 2008-09-24 19:24:26.000000000 +0200 -+++ trunk/Makefile 2008-09-24 19:25:01.683198000 +0200 -@@ -752,7 +752,7 @@ - $(CC) -o $@ $^ $(LDFLAGS_MPLAYER) - - codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h -- $(HOST_CC) -O -DCODECS2HTML $(EXTRA_INC) -o $@ $< -+ $(BUILD_CC) -O -DCODECS2HTML $(EXTRA_INC) -o $@ $< - - codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf - ./$^ > $@ diff --git a/packages/mplayer/files/Makefile.patch b/packages/mplayer/files/Makefile.patch deleted file mode 100644 index f0464b9176..0000000000 --- a/packages/mplayer/files/Makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: MPlayer-1.0rc1/Makefile -=================================================================== ---- MPlayer-1.0rc1.orig/Makefile -+++ MPlayer-1.0rc1/Makefile -@@ -399,7 +399,7 @@ osdep/mplayer-rc.o: osdep/mplayer.rc - windres -o $@ osdep/mplayer.rc - - codec-cfg: codec-cfg.c codec-cfg.h help_mp.h -- $(HOST_CC) -I. -DCODECS2HTML codec-cfg.c -o $@ -+ $(BUILD_CC) -I. -DCODECS2HTML codec-cfg.c -o $@ - - codecs.conf.h: codec-cfg etc/codecs.conf - ./codec-cfg ./etc/codecs.conf > $@ diff --git a/packages/mplayer/files/armv5te/configh b/packages/mplayer/files/armv5te/configh deleted file mode 100644 index 46c647e2d5..0000000000 --- a/packages/mplayer/files/armv5te/configh +++ /dev/null @@ -1,6 +0,0 @@ -#define HAVE_LLRINT 1 -#define HAVE_ROUNDF 1 -#define ARCH_ARMV4L 1 -#define ENABLE_ARMV4L 1 -#define HAVE_ARMV5TE 1 -#define ENABLE_ARMV5TE 1 diff --git a/packages/mplayer/files/armv5te/configmak b/packages/mplayer/files/armv5te/configmak deleted file mode 100644 index aa9978515d..0000000000 --- a/packages/mplayer/files/armv5te/configmak +++ /dev/null @@ -1,3 +0,0 @@ -ARCH_ARMV4L=yes -HAVE_ARMV5TE=yes - diff --git a/packages/mplayer/files/armv6/configh b/packages/mplayer/files/armv6/configh deleted file mode 100644 index 2301e723d6..0000000000 --- a/packages/mplayer/files/armv6/configh +++ /dev/null @@ -1,8 +0,0 @@ -#define HAVE_LLRINT 1 -#define HAVE_ROUNDF 1 -#define ARCH_ARMV4L 1 -#define ENABLE_ARMV4L 1 -#define HAVE_ARMV5TE 1 -#define ENABLE_ARMV5TE 1 -#define HAVE_ARMV6 1 -#define ENABLE_ARMV6 1 diff --git a/packages/mplayer/files/armv6/configmak b/packages/mplayer/files/armv6/configmak deleted file mode 100644 index 4db5dc0dfd..0000000000 --- a/packages/mplayer/files/armv6/configmak +++ /dev/null @@ -1,3 +0,0 @@ -ARCH_ARMV4L=yes -HAVE_ARMV5TE=yes -HAVE_ARMV6=yes diff --git a/packages/mplayer/files/armv7a/configh b/packages/mplayer/files/armv7a/configh deleted file mode 100644 index 245e40f56a..0000000000 --- a/packages/mplayer/files/armv7a/configh +++ /dev/null @@ -1,14 +0,0 @@ -#define HAVE_LLRINT 1 -#define HAVE_ROUNDF 1 -#define ARCH_ARMV4L 1 -#define ENABLE_ARMV4L 1 -#define HAVE_ARMV5TE 1 -#define ENABLE_ARMV5TE 1 -#define HAVE_ARMV6 1 -#define ENABLE_ARMV6 1 -#define HAVE_ARMV6T2 1 -#define ENABLE_ARMV6T2 1 -#define HAVE_ARMVFP 1 -#define ENABLE_ARMVFP 1 -#define HAVE_NEON 1 -#define ENABLE_NEON 1 diff --git a/packages/mplayer/files/armv7a/configmak b/packages/mplayer/files/armv7a/configmak deleted file mode 100644 index 50d549f794..0000000000 --- a/packages/mplayer/files/armv7a/configmak +++ /dev/null @@ -1,6 +0,0 @@ -ARCH_ARMV4L=yes -HAVE_ARMV5TE=yes -HAVE_ARMV6=yes -HAVE_ARMV6T2=yes -HAVE_ARMVFP=yes -HAVE_NEON=yes diff --git a/packages/mplayer/files/configh b/packages/mplayer/files/configh deleted file mode 100644 index 2fe7658383..0000000000 --- a/packages/mplayer/files/configh +++ /dev/null @@ -1,2 +0,0 @@ -#define HAVE_LLRINT 1 -#define HAVE_ROUNDF 1 diff --git a/packages/mplayer/files/configmak b/packages/mplayer/files/configmak deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/mplayer/files/configmak +++ /dev/null diff --git a/packages/mplayer/files/disable-executable-stack-test.patch b/packages/mplayer/files/disable-executable-stack-test.patch deleted file mode 100644 index dc8871b6ae..0000000000 --- a/packages/mplayer/files/disable-executable-stack-test.patch +++ /dev/null @@ -1,30 +0,0 @@ -Removes the "noexecstack" check from configure so we don't end up with: - - mplayer: error while loading shared libraries: libmad.so.0: cannot - enable executable stack as shared object requires: Error 14 - -at runtime. - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- MPlayer-1.0pre8/configure~disable-executable-stack-test -+++ MPlayer-1.0pre8/configure -@@ -7193,15 +7193,7 @@ - fi - - echocheck "compiler support for noexecstack" --cat > $TMPC <<EOF --int main(void) { return 0; } --EOF --if cc_check -Wl,-z,noexecstack ; then -- _ld_extra="-Wl,-z,noexecstack $_ld_extra" -- echores "yes" --else -- echores "no" --fi -+echores "no" - - echocheck "ftello()" - # if we don't have ftello use the osdep/ compatibility module diff --git a/packages/mplayer/files/imageon-video_out.patch b/packages/mplayer/files/imageon-video_out.patch deleted file mode 100644 index fcb7953c1b..0000000000 --- a/packages/mplayer/files/imageon-video_out.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- mplayer/libvo/video_out.c.orig 2006-11-27 12:49:51.000000000 -0800 -+++ mplayer/libvo/video_out.c 2006-11-27 12:41:59.000000000 -0800 -@@ -87,6 +87,7 @@ extern vo_functions_t video_out_syncfb; - extern vo_functions_t video_out_fbdev; - extern vo_functions_t video_out_fbdev2; - extern vo_functions_t video_out_w100; -+extern vo_functions_t video_out_imageon; - extern vo_functions_t video_out_svga; - extern vo_functions_t video_out_png; - extern vo_functions_t video_out_ggi; -@@ -200,6 +201,9 @@ vo_functions_t* video_out_drivers[] = - #ifdef HAVE_W100 - &video_out_w100, - #endif -+#ifdef HAVE_IMAGEON -+ &video_out_imageon, -+#endif - #ifdef HAVE_SVGALIB - &video_out_svga, - #endif diff --git a/packages/mplayer/files/libmpdemux-ogg-include-svn.patch b/packages/mplayer/files/libmpdemux-ogg-include-svn.patch deleted file mode 100644 index 52b7029bc5..0000000000 --- a/packages/mplayer/files/libmpdemux-ogg-include-svn.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trunk/libmpdemux/Makefile.orig 2006-07-24 10:11:06.000000000 +0100 -+++ trunk/libmpdemux/Makefile 2006-07-24 10:12:02.000000000 +0100 -@@ -208,7 +208,7 @@ - OBJS = $(SRCS:.c=.o) - OBJS += $(CPLUSPLUSSRCS:.cpp=.o) - INCLUDE = -I.. -I../loader $(LIBAV_INC) --CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC) -+CFLAGS = $(INCLUDE) $(OPTFLAGS) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC) - CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE) -D__STDC_LIMIT_MACROS - CPLUSPLUS = $(CC) - diff --git a/packages/mplayer/files/makefile-nostrip-rc2.patch b/packages/mplayer/files/makefile-nostrip-rc2.patch deleted file mode 100644 index d7c147565f..0000000000 --- a/packages/mplayer/files/makefile-nostrip-rc2.patch +++ /dev/null @@ -1,24 +0,0 @@ -upstream: not applicable, I think (unless somebody claims there is a more portable way to stripping) - -Index: MPlayer-1.0rc2/Makefile -=================================================================== ---- MPlayer-1.0rc2.orig/Makefile 2008-04-19 10:31:18.000000000 +0200 -+++ MPlayer-1.0rc2/Makefile 2008-04-19 10:31:55.000000000 +0200 -@@ -253,7 +253,7 @@ - if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi - - install-mplayer: mplayer$(EXESUF) -- $(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) $(BINDIR) -+ $(INSTALL) -m 755 mplayer$(EXESUF) $(BINDIR) - - install-mplayer-man: - for i in $(MAN_LANG); do \ -@@ -266,7 +266,7 @@ - done - - install-mencoder: mencoder$(EXESUF) -- $(INSTALL) -m 755 $(INSTALLSTRIP) mencoder$(EXESUF) $(BINDIR) -+ $(INSTALL) -m 755 mencoder$(EXESUF) $(BINDIR) - for i in $(MAN_LANG); do \ - if test "$$i" = en ; then \ - cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \ diff --git a/packages/mplayer/files/makefile-nostrip-svn.patch b/packages/mplayer/files/makefile-nostrip-svn.patch deleted file mode 100644 index c684001792..0000000000 --- a/packages/mplayer/files/makefile-nostrip-svn.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /tmp/Makefile 2008-06-10 21:05:55.613676241 +0200 -+++ trunk/Makefile 2008-06-10 21:06:30.701172833 +0200 -@@ -797,7 +797,7 @@ - $(INSTALL) -d $(BINDIR) $(CONFDIR) - - install-%: %$(EXESUF) install-dirs -- $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) -+ $(INSTALL) -m 755 $< $(BINDIR) - - install-mplayer-man: $(foreach lang,$(MAN_LANG_ALL),install-mplayer-man-$(lang)) - install-mencoder-man: $(foreach lang,$(MAN_LANG_ALL),install-mencoder-man-$(lang)) diff --git a/packages/mplayer/files/makefile-nostrip.patch b/packages/mplayer/files/makefile-nostrip.patch deleted file mode 100644 index 604433938b..0000000000 --- a/packages/mplayer/files/makefile-nostrip.patch +++ /dev/null @@ -1,24 +0,0 @@ -upstream: not applicable, I think (unless somebody claims there is a more portable way to stripping) - -Index: MPlayer-1.0rc1/Makefile -=================================================================== ---- MPlayer-1.0rc1.orig/Makefile -+++ MPlayer-1.0rc1/Makefile -@@ -416,7 +416,7 @@ ifeq ($(VIDIX),yes) - $(MAKE) -C vidix install - endif - $(INSTALL) -d $(BINDIR) -- $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG) -+ $(INSTALL) -m 755 $(PRG) $(BINDIR)/$(PRG) - ifeq ($(GUI),yes) - -ln -sf $(PRG) $(BINDIR)/gmplayer - endif -@@ -430,7 +430,7 @@ endif - fi ; \ - done - ifeq ($(MENCODER),yes) -- $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER) -+ $(INSTALL) -m 755 $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER) - for i in $(MAN_LANG); do \ - if test "$$i" = en ; then \ - cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \ diff --git a/packages/mplayer/files/motion-comp-pld.patch b/packages/mplayer/files/motion-comp-pld.patch deleted file mode 100644 index 6d4160c7bb..0000000000 --- a/packages/mplayer/files/motion-comp-pld.patch +++ /dev/null @@ -1,163 +0,0 @@ -Index: MPlayer-1.0rc2/libmpeg2/motion_comp_arm_s.S -=================================================================== ---- MPlayer-1.0rc2.orig/libmpeg2/motion_comp_arm_s.S 2007-11-02 14:16:50.000000000 +0000 -+++ MPlayer-1.0rc2/libmpeg2/motion_comp_arm_s.S 2007-11-02 14:23:53.000000000 +0000 -@@ -18,6 +18,14 @@ - @ along with this program; if not, write to the Free Software - @ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -+#if defined(__ARM_ARCH_5__) || \ -+ defined(__ARM_ARCH_5T__) || \ -+ defined(__ARM_ARCH_5TE__) -+#define PLD(code...) code -+#else -+#define PLD(code...) -+#endif -+ - .text - - @ ---------------------------------------------------------------- -@@ -25,7 +33,7 @@ - .global MC_put_o_16_arm - MC_put_o_16_arm: - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) -- pld [r1] -+ PLD ( pld [r1] ) - stmfd sp!, {r4-r11, lr} @ R14 is also called LR - and r4, r1, #3 - adr r5, MC_put_o_16_arm_align_jt -@@ -35,7 +43,7 @@ - MC_put_o_16_arm_align0: - ldmia r1, {r4-r7} - add r1, r1, r2 -- pld [r1] -+ PLD ( pld [r1] ) - stmia r0, {r4-r7} - subs r3, r3, #1 - add r0, r0, r2 -@@ -46,7 +54,7 @@ - ldmia r1, {r4-r8} - add r1, r1, r2 - mov r9, r4, lsr #(\shift) -- pld [r1] -+ PLD ( pld [r1] ) - mov r10, r5, lsr #(\shift) - orr r9, r9, r5, lsl #(32-\shift) - mov r11, r6, lsr #(\shift) -@@ -85,7 +93,7 @@ - .global MC_put_o_8_arm - MC_put_o_8_arm: - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) -- pld [r1] -+ PLD ( pld [r1] ) - stmfd sp!, {r4-r10, lr} @ R14 is also called LR - and r4, r1, #3 - adr r5, MC_put_o_8_arm_align_jt -@@ -94,7 +102,7 @@ - MC_put_o_8_arm_align0: - ldmia r1, {r4-r5} - add r1, r1, r2 -- pld [r1] -+ PLD ( pld [r1] ) - stmia r0, {r4-r5} - add r0, r0, r2 - subs r3, r3, #1 -@@ -105,7 +113,7 @@ - ldmia r1, {r4-r6} - add r1, r1, r2 - mov r9, r4, lsr #(\shift) -- pld [r1] -+ PLD ( pld [r1] ) - mov r10, r5, lsr #(\shift) - orr r9, r9, r5, lsl #(32-\shift) - orr r10, r10, r6, lsl #(32-\shift) -@@ -154,7 +162,7 @@ - .global MC_put_x_16_arm - MC_put_x_16_arm: - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) -- pld [r1] -+ PLD ( pld [r1] ) - stmfd sp!, {r4-r11,lr} @ R14 is also called LR - and r4, r1, #3 - adr r5, MC_put_x_16_arm_align_jt -@@ -179,7 +187,7 @@ - MC_put_x_16_arm_align0: - ldmia r1, {r4-r8} - add r1, r1, r2 -- pld [r1] -+ PLD ( pld [r1] ) - AVG_PW r7, r8 - AVG_PW r6, r7 - AVG_PW r5, r6 -@@ -193,7 +201,7 @@ - and r1, r1, #0xFFFFFFFC - 1: ldmia r1, {r4-r8} - add r1, r1, r2 -- pld [r1] -+ PLD ( pld [r1] ) - ADJ_ALIGN_QW 8, r4, r5, r6, r7, r8 - AVG_PW r7, r8 - AVG_PW r6, r7 -@@ -208,7 +216,7 @@ - and r1, r1, #0xFFFFFFFC - 1: ldmia r1, {r4-r8} - add r1, r1, r2 -- pld [r1] -+ PLD ( pld [r1] ) - ADJ_ALIGN_QW 16, r4, r5, r6, r7, r8 - AVG_PW r7, r8 - AVG_PW r6, r7 -@@ -223,7 +231,7 @@ - and r1, r1, #0xFFFFFFFC - 1: ldmia r1, {r4-r8} - add r1, r1, r2 -- pld [r1] -+ PLD ( pld [r1] ) - ADJ_ALIGN_QW 24, r4, r5, r6, r7, r8 - AVG_PW r7, r8 - AVG_PW r6, r7 -@@ -246,7 +254,7 @@ - .global MC_put_x_8_arm - MC_put_x_8_arm: - @@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height) -- pld [r1] -+ PLD ( pld [r1] ) - stmfd sp!, {r4-r11,lr} @ R14 is also called LR - and r4, r1, #3 - adr r5, MC_put_x_8_arm_align_jt -@@ -267,7 +275,7 @@ - MC_put_x_8_arm_align0: - ldmia r1, {r4-r6} - add r1, r1, r2 -- pld [r1] -+ PLD ( pld [r1] ) - AVG_PW r5, r6 - AVG_PW r4, r5 - stmia r0, {r5-r6} -@@ -279,7 +287,7 @@ - and r1, r1, #0xFFFFFFFC - 1: ldmia r1, {r4-r6} - add r1, r1, r2 -- pld [r1] -+ PLD ( pld [r1] ) - ADJ_ALIGN_DW 8, r4, r5, r6 - AVG_PW r5, r6 - AVG_PW r4, r5 -@@ -292,7 +300,7 @@ - and r1, r1, #0xFFFFFFFC - 1: ldmia r1, {r4-r6} - add r1, r1, r2 -- pld [r1] -+ PLD ( pld [r1] ) - ADJ_ALIGN_DW 16, r4, r5, r6 - AVG_PW r5, r6 - AVG_PW r4, r5 -@@ -305,7 +313,7 @@ - and r1, r1, #0xFFFFFFFC - 1: ldmia r1, {r4-r6} - add r1, r1, r2 -- pld [r1] -+ PLD ( pld [r1] ) - ADJ_ALIGN_DW 24, r4, r5, r6 - AVG_PW r5, r6 - AVG_PW r4, r5 diff --git a/packages/mplayer/files/mplayer-1.0rc1-atmel.2.patch b/packages/mplayer/files/mplayer-1.0rc1-atmel.2.patch deleted file mode 100644 index 800f43e8eb..0000000000 --- a/packages/mplayer/files/mplayer-1.0rc1-atmel.2.patch +++ /dev/null @@ -1,6444 +0,0 @@ - cfg-common.h | 4 + - cfg-mencoder.h | 4 + - cfg-mplayer.h | 4 + - configure | 13 +- - libaf/af_format.c | 7 + - libavcodec/Makefile | 7 + - libavcodec/avr32/dsputil_avr32.c | 2678 ++++++++++++++++++++++++++++++++++++++ - libavcodec/avr32/fdct.S | 541 ++++++++ - libavcodec/avr32/h264idct.S | 451 +++++++ - libavcodec/avr32/idct.S | 829 ++++++++++++ - libavcodec/avr32/mc.S | 434 ++++++ - libavcodec/avr32/pico.h | 260 ++++ - libavcodec/bitstream.h | 77 +- - libavcodec/dsputil.c | 3 + - libavcodec/h264.c | 15 + - libavutil/common.h | 16 + - libavutil/internal.h | 9 + - libfaad2/common.h | 2 +- - libmpcodecs/ad_libmad.c | 5 + - libswscale/pico-avr32.h | 137 ++ - libswscale/swscale_internal.h | 2 +- - libswscale/yuv2rgb.c | 14 + - libswscale/yuv2rgb_avr32.c | 416 ++++++ - libvo/vo_fbdev2.c | 101 ++- - version.sh | 2 +- - 25 files changed, 6011 insertions(+), 20 deletions(-) - create mode 100644 libavcodec/avr32/dsputil_avr32.c - create mode 100644 libavcodec/avr32/fdct.S - create mode 100644 libavcodec/avr32/h264idct.S - create mode 100644 libavcodec/avr32/idct.S - create mode 100644 libavcodec/avr32/mc.S - create mode 100644 libavcodec/avr32/pico.h - create mode 100644 libswscale/pico-avr32.h - create mode 100644 libswscale/yuv2rgb_avr32.c - -diff --git a/cfg-common.h b/cfg-common.h -index 780df38..7d878a8 100644 ---- a/cfg-common.h -+++ b/cfg-common.h -@@ -235,6 +235,10 @@ - {"tsprobe", &ts_probe, CONF_TYPE_POSITION, 0, 0, TS_MAX_PROBE_SIZE, NULL}, - {"tskeepbroken", &ts_keep_broken, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - -+#ifdef ARCH_AVR32 -+ {"use-pico", &avr32_use_pico, CONF_TYPE_FLAG, 0, 0, 1, NULL}, -+ {"nouse-pico", &avr32_use_pico, CONF_TYPE_FLAG, 0, 1, 0, NULL}, -+#endif - // draw by slices or whole frame (useful with libmpeg2/libavcodec) - {"slices", &vd_use_slices, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"noslices", &vd_use_slices, CONF_TYPE_FLAG, 0, 1, 0, NULL}, -diff --git a/cfg-mencoder.h b/cfg-mencoder.h -index 411b748..addf791 100644 ---- a/cfg-mencoder.h -+++ b/cfg-mencoder.h -@@ -5,6 +5,10 @@ - - #include "cfg-common.h" - -+#ifdef ARCH_AVR32 -+extern int avr32_use_pico; -+#endif -+ - #ifdef USE_FAKE_MONO - extern int fakemono; // defined in dec_audio.c - #endif -diff --git a/cfg-mplayer.h b/cfg-mplayer.h -index 62b6eac..31499c2 100644 ---- a/cfg-mplayer.h -+++ b/cfg-mplayer.h -@@ -4,6 +4,10 @@ - - #include "cfg-common.h" - -+#ifdef ARCH_AVR32 -+extern int avr32_use_pico; -+#endif -+ - extern int noconsolecontrols; - - #if defined(HAVE_FBDEV)||defined(HAVE_VESA) -diff --git a/configure b/configure -index 29002c8..56c6fe4 100755 ---- a/configure -+++ b/configure -@@ -1203,6 +1203,15 @@ EOF - _optimizing="$proc" - ;; - -+ avr32) -+ _def_arch='#define ARCH_AVR32' -+ _target_arch='TARGET_ARCH_AVR32 = yes' -+ iproc='avr32' -+ proc='' -+ _march='' -+ _mcpu='' -+ _optimizing='' -+ ;; - arm|armv4l|armv5tel) - _def_arch='#define ARCH_ARMV4L 1' - _target_arch='TARGET_ARCH_ARMV4L = yes' -@@ -1533,7 +1542,7 @@ echores $_named_asm_args - # Checking for CFLAGS - _stripbinaries=yes - if test "$_profile" != "" || test "$_debug" != "" ; then -- CFLAGS="-W -Wall -O2 $_march $_mcpu $_debug $_profile" -+ CFLAGS="-W -Wall -O4 $_march $_mcpu $_debug $_profile" - if test "$_cc_major" -ge "3" ; then - CFLAGS=`echo "$CFLAGS" | sed -e 's/\(-Wall\)/\1 -Wno-unused-parameter/'` - fi -@@ -3794,7 +3803,7 @@ fi - - - echocheck "X11 headers presence" -- for I in `echo $_inc_extra | sed s/-I//g` /usr/X11/include /usr/X11R6/include /usr/include/X11R6 /usr/include /usr/openwin/include ; do -+ for I in `echo $_inc_extra | sed s/-I//g`; do - if test -f "$I/X11/Xlib.h" ; then - _inc_x11="-I$I" - _x11_headers="yes" -diff --git a/libaf/af_format.c b/libaf/af_format.c -index e5b7cc9..5d7ea6d 100644 ---- a/libaf/af_format.c -+++ b/libaf/af_format.c -@@ -20,7 +20,14 @@ - // Integer to float conversion through lrintf() - #ifdef HAVE_LRINTF - #include <math.h> -+ -+#ifdef ARCH_AVR32 -+#define lrintf(x) rint(x) -+#define llrint(x) (long long)rint(x) -+#else - long int lrintf(float); -+#endif -+ - #else - #define lrintf(x) ((int)(x)) - #endif -diff --git a/libavcodec/Makefile b/libavcodec/Makefile -index 17b6c45..8e1dc96 100644 ---- a/libavcodec/Makefile -+++ b/libavcodec/Makefile -@@ -360,6 +360,12 @@ OBJS-$(TARGET_ARCH_SPARC) += sparc/dsputil_vis.o \ - - sparc/dsputil_vis.o: CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc - -+# avr32 specific stuff -+ifeq ($(TARGET_ARCH_AVR32),yes) -+ASM_OBJS += avr32/idct.o avr32/fdct.o avr32/mc.o avr32/h264idct.o -+OBJS += avr32/dsputil_avr32.o -+endif -+ - # sun mediaLib specific stuff - OBJS-$(HAVE_MLIB) += mlib/dsputil_mlib.o \ - -@@ -419,6 +425,7 @@ tests: apiexample $(TESTS) - clean:: - rm -f \ - i386/*.o i386/*~ \ -+ avr32/*.o avr32/*~ \ - armv4l/*.o armv4l/*~ \ - mlib/*.o mlib/*~ \ - alpha/*.o alpha/*~ \ -diff --git a/libavcodec/avr32/dsputil_avr32.c b/libavcodec/avr32/dsputil_avr32.c -new file mode 100644 -index 0000000..200284d ---- /dev/null -+++ b/libavcodec/avr32/dsputil_avr32.c -@@ -0,0 +1,2678 @@ -+/* -+ * Copyright (c) 2007 Atmel Corporation. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above -+ * copyright notice, this list of conditions and the following -+ * disclaimer in the documentation and/or other materials provided -+ * with the distribution. -+ * -+ * 3. The name of ATMEL may not be used to endorse or promote products -+ * derived from this software without specific prior written -+ * permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY ATMEL ``AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL -+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, -+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -+ * DAMAGE. -+ */ -+ -+#include "../dsputil.h" -+#include "pico.h" -+ -+int avr32_use_pico = 1; -+ -+//#define CHECK_DSP_FUNCS_AGAINST_C -+ -+#ifdef CHECK_DSP_FUNCS_AGAINST_C -+#define DSP_FUNC_NAME(name) test_ ## name -+#else -+#define DSP_FUNC_NAME(name) name -+#endif -+ -+union doubleword { -+ int64_t doubleword; -+ struct { -+ int32_t top; -+ int32_t bottom; -+ } words; -+}; -+ -+#undef LD16 -+#undef LD32 -+#undef LD64 -+ -+#define LD16(a) (*((uint16_t*)(a))) -+#define LD32(a) (*((uint32_t*)(a))) -+#define LD64(a) (*((uint64_t*)(a))) -+#define LD64_UNALIGNED(a) \ -+ ({ union doubleword __tmp__; \ -+ __tmp__.words.top = LD32(a); \ -+ __tmp__.words.bottom = LD32(a + 4); \ -+ __tmp__.doubleword; }) -+ -+#undef ST32 -+#undef ST16 -+ -+#define ST16(a, b) *((uint16_t*)(a)) = (b) -+#define ST32(a, b) *((uint32_t*)(a)) = (b) -+ -+#undef rnd_avg32 -+#define rnd_avg32(a, b) \ -+ ({ uint32_t __tmp__;\ -+ asm("pavg.ub\t%0, %1, %2" : "=r"(__tmp__) : "r"(a), "r"(b));\ -+ __tmp__;}) -+ -+void idct_avr32(DCTELEM *data); -+void fdct_avr32(DCTELEM *data); -+ -+void idct_put_avr32(uint8_t *dest, int line_size, DCTELEM *data); -+void idct_add_avr32(uint8_t *dest, int line_size, DCTELEM *data); -+ -+void h264_idct_add_avr32(uint8_t *dest, DCTELEM *data, int stride); -+void h264_idct8_add_avr32(uint8_t *dest, DCTELEM *data, int stride); -+ -+#define extern_dspfunc(PFX, NUM) \ -+ void PFX ## _pixels ## NUM ## _avr32(uint8_t *dst, const uint8_t *pixels, int line_size, int h ); \ -+ void PFX ## _pixels ## NUM ## _h_avr32(uint8_t *dst, const uint8_t *pixels, int line_size, int h ); \ -+ void PFX ## _pixels ## NUM ## _v_avr32(uint8_t *dst, const uint8_t *pixels, int line_size, int h ); \ -+ void PFX ## _pixels ## NUM ## _hv_avr32(uint8_t *dst, const uint8_t *pixels, int line_size, int h ) -+ -+extern_dspfunc(put, 8); -+extern_dspfunc(put_no_rnd, 8); -+extern_dspfunc(avg, 8); -+extern_dspfunc(avg_no_rnd, 8); -+#undef extern_dspfunc -+ -+#ifdef CHECK_DSP_FUNCS_AGAINST_C -+#define extern_dspfunc(PFX, NUM) \ -+ void PFX ## _pixels ## NUM ## _c(uint8_t *dst, const uint8_t *pixels, int line_size, int h ); \ -+ void PFX ## _pixels ## NUM ## _x2_c(uint8_t *dst, const uint8_t *pixels, int line_size, int h ); \ -+ void PFX ## _pixels ## NUM ## _y2_c(uint8_t *dst, const uint8_t *pixels, int line_size, int h ); \ -+ |