contrib: Build for davinci

extras/contrib/src/Distributions/davinci.mak

 # Contrib configuration for TI Davinci based SoC
+#
+FFMPEGCONF += --arch=armv5te
+
+FFMPEGCONF += --disable-protocols
+
+FFMPEGCONF += --disable-filters --enable-filter=scale --enable-filter=crop --enable-filter=format
+
+FFMPEGCONF += --disable-muxers
+
+FFMPEGCONF += --disable-demuxers --enable-demuxer=gif --enable-demuxer=mjpg \
+		--enable-demuxer=aac --enable-demuxer=ac3 --enable-demuxer=amr --enable-demuxer=daud --enable-demuxer=dts --enable-demuxer=ogg \
+		--enable-demuxer=pcm_alaw  --enable-demuxer=pcm_mulaw \
+		--enable-demuxer=pcm_s16le --enable-demuxer=pcm_s16be --enable-demuxer=pcm_s24be  \
+		--enable-demuxer=pcm_s24le --enable-demuxer=pcm_s32be --enable-demuxer=pcm_s32le --enable-demuxer=pcm_s8 \
+		--enable-demuxer=pcm_u16be --enable-demuxer=pcm_u16le --enable-demuxer=pcm_u24be --enable-demuxer=pcm_u24le \
+		--enable-demuxer=pcm_u32be --enable-demuxer=pcm-u32le --enable-demuxer=pcm_u8    --enable-demuxer=pcm_zork
+
+FFMPEGCONF += --disable-parsers \
+		 --enable-parser=pnm --enable-parser=aac --enable-parser=ac3
+
+FFMPEGCONF += --disable-decoders \
+		--enable-decoder=gif --enable-decoder=targa --enable-decoder=tiff --enable-decoder=png --enable-decoder=bmp --enable-decoder=zlib \
+		--enable-decoder=aac --enable-decoder=ac3 --enable-decoder=aasc --enable-decoder=libgsm --enable-decoder=libgsm_ms \
+		--enable-decoder=pcm_alaw --enable-decoder=pcm_bluray --enable-decoder=pcm_dvd --enable-decoder=pcm_mulaw \
+		--enable-decoder=pcm_s16be --enable-decoder=pcm_s16le --enable-decoder=pcm_s16le_planar --enable-decoder=pcm_s24be \
+		--enable-decoder=pcm_s24daud --enable-decoder=pcm_s24le --enable-decoder=pcm_s32be --enable-decoder=pcm_s32le \
+		--enable-decoder=pcm_s8 --enable-decoder=pcm_u16be --enable-decoder=pcm_u16le --enable-decoder=pcm_u24be --enable-decoder=pcm_u24le \
+		--enable-decoder=pcm_u32be --enable-decoder=pcm_u32le --enable-decoder=pcm_u8 --enable-decoder=pcm_zork \
+		--enable-decoder=wmapro --enable-decoder=wmav1 --enable-decoder=wmav2
+
+FFMPEGCONF += --disable-encoders \
+		--enable-encoder=aac --enable-encoder=ac3 --enable-encoder=pcm_alaw --enable-encoder=pcm_mulaw \
+		--enable-encoder=pcm_s16le --enable-encoder=pcm_s16be --enable-encoder=pcm_s24be --enable-encoder=pcm_s24daud \
+		--enable-encoder=pcm_s24le --enable-encoder=pcm_s32be --enable-encoder=pcm_s32le --enable-encoder=pcm_s8 \
+		--enable-encoder=pcm_u16be --enable-encoder=pcm_u16le --enable-encoder=pcm_u24be --enable-encoder=pcm_u24le \
+		--enable-encoder=pcm_u32be --enable-encoder=pcm-u32le --enable-encoder=pcm_u8    --enable-encoder=pcm_zork \
+		--enable-encoder=bmp --enable-encoder=gif --enable-encoder=png --enable-encoder=targa --enable-encoder=tiff \
+		--enable-encoder=zlib
+
+#
 all: \
-	.a52 .id3tag .mad .ogg .theora \
+	.a52 .id3tag .mad .ogg \
+	.theora .tremor \
 	.flac .faad .faac .ffmpeg \
-	.live .tremor \
+	.live \
 	.dvbpsi
 

extras/contrib/src/Makefile

@@ -139,7 +139,7 @@ endif # not HAVE UCLIBC
 
 ifdef HAVE_ARM_LINUX
 #HOSTCONF+=
-FFMPEGCONF+= --arch=armv4l
+#FFMPEGCONF+= --arch=armv4l
 endif
 
 ifdef HAVE_BEOS
@@ -772,7 +772,7 @@ ifdef SVN
 tremor:
 	$(SVN) co http://svn.xiph.org/trunk/Tremor tremor
 	(cd $@ && patch -p0 < ../Patches/tremor.patch)
-	(cd $@; rm -f ogg.h && echo "#include <ogg/ogg.h>" > ogg.h && rm -f os_types.h && echo "#include <ogg/os_types.h>" > os_types.h && ./autogen.sh)
+	(cd $@; rm -f ogg.h && echo "#include <ogg/ogg.h>" > ogg.h && rm -f os_types.h && echo "#include <ogg/os_types.h>" > os_types.h && ./autogen.sh $(HOSTCONF) --prefix=$(PREFIX) --disable-shared)
 else
 tremor-$(TREMOR_VERSION).tar.bz2:
 	echo "tremor snapshot does not exist, you MUST use subversion !"
@@ -935,10 +935,11 @@ faad2-$(FAAD2_VERSION).tar.gz:
 
 faad2: faad2-$(FAAD2_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	(cd $@; sh ./bootstrap)
 ifdef HAVE_ARM_LINUX
 	(cd $@; sed -e 's/\/\/#define FIXED_POINT/#define FIXED_POINT/' -iorig libfaad/common.h)
+	(cd $@; sed -e 's/-iquote /-I/' -iorig libfaad/Makefile.am)
 endif
+	(cd $@; sh ./bootstrap)
 
 .faad: faad2
 	(cd $< && $(HOSTCC) ./configure $(HOSTCONF) --disable-shared --prefix=$(PREFIX) CFLAGS="-O3" && sed -i.orig "s/shrext_cmds/shrext/g" libtool && make -C libfaad && make -C libfaad install)
@@ -1117,11 +1118,13 @@ endif
 ifdef HAVE_BEOS
 	(cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch)
 endif
+ifdef HAVE_DARWIN_OS
 ifdef HAVE_DARWIN_OS_ON_INTEL
 	(cd $@; patch -p0 < ../Patches/ffmpeg-macosx-intel-mmx.patch)
 else
 	(cd $@; patch -p0 < ../Patches/ffmpeg-darwin-ppc-mdynamic.patch) 
 endif
+endif
 ifdef HAVE_UCLIBC
 	patch -p0 < Patches/ffmpeg-svn-uclibc.patch
 	patch -p0 < Patches/ffmpeg-svn-internal-define.patch
@@ -1315,10 +1318,13 @@ ifdef HAVE_BIGENDIAN
 	(cd $<; ./genMakefiles armeb-uclibc && make $(HOSTCC))
 endif
 else
-	(cd $<; sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux)
 ifdef HAVE_ARM_LINUX
+	(cd $<; sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' \
+	            -e 's/arm-elf-/arm-linux-/' -e 's/ar cr/ar -cr /' \
+	            -e 's/-L.//' -i.orig config.armlinux)
 	(cd $<; ./genMakefiles armlinux && make $(HOSTCC))
 else
+	(cd $<; sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux)
 	(cd $<; ./genMakefiles linux && make $(HOSTCC))
 endif
 endif

extras/contrib/src/Patches/live-noapps.patch

---- live/Makefile.tail.orig	2007-05-14 17:15:25.000000000 +0200
-+++ live/Makefile.tail	2007-05-14 17:16:17.000000000 +0200
-@@ -18,9 +18,7 @@
- ALL =	$(LIVEMEDIA_LIB) \
- 	$(GROUPSOCK_LIB) \
- 	$(USAGE_ENVIRONMENT_LIB) \
--	$(BASIC_USAGE_ENVIRONMENT_LIB) \
--	$(TESTPROGS_APP) \
--	$(MEDIA_SERVER_APP)
-+	$(BASIC_USAGE_ENVIRONMENT_LIB)
- all:	$(ALL)
- 
+--- live/Makefile.tail.orig	2009-09-28 17:16:16.000000000 +0200
++++ live/Makefile.tail	2009-11-12 14:20:01.000000000 +0100
+@@ -14,13 +14,9 @@
+ 	cd $(GROUPSOCK_DIR) ; $(MAKE)
+ 	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE)
+ 	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE)
+-	cd $(TESTPROGS_DIR) ; $(MAKE)
+-	cd $(MEDIA_SERVER_DIR) ; $(MAKE)
  
+ clean:
+ 	cd $(LIVEMEDIA_DIR) ; $(MAKE) clean
+ 	cd $(GROUPSOCK_DIR) ; $(MAKE) clean
+ 	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) clean
+ 	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE) clean
+-	cd $(TESTPROGS_DIR) ; $(MAKE) clean
+-	cd $(MEDIA_SERVER_DIR) ; $(MAKE) clean

extras/contrib/src/Patches/tremor.patch

@@ -44,6 +44,15 @@ Index: info.c
 --- info.c	(révision 12136)
 +++ info.c	(copie de travail)
 @@ -299,7 +299,7 @@
+   char buffer[6];
+ 
+   if(op){
+-    oggpack_readinit(&opb,op->packet);
++    oggpack_readinit(&opb,op->packet,op->bytes);
+ 
+     if(!op->b_o_s)
+       return(0); /* Not the initial packet */
+@@ -327,7 +327,7 @@
    oggpack_buffer opb;
    
    if(op){