import clean BK tree at cset 1.3670

4 files changed, 200 insertions, 0 deletions

diff --git a/packages/ffmpeg/ffmpeg-0.4.9-pre1/.mtn2git_empty b/packages/ffmpeg/ffmpeg-0.4.9-pre1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ffmpeg/ffmpeg-0.4.9-pre1/.mtn2git_empty
diff --git a/packages/ffmpeg/ffmpeg-0.4.9-pre1/common.patch b/packages/ffmpeg/ffmpeg-0.4.9-pre1/common.patch
index e69de29bb2..5a1ceaa10d 100644
--- a/packages/ffmpeg/ffmpeg-0.4.9-pre1/common.patch
+++ b/packages/ffmpeg/ffmpeg-0.4.9-pre1/common.patch
@@ -0,0 +1,13 @@
+--- ffmpeg-0.4.9-pre1/libavcodec/common.h.orig	2004-12-24 23:49:50.000000000 +0100
++++ ffmpeg-0.4.9-pre1/libavcodec/common.h	2004-12-24 23:51:37.000000000 +0100
+@@ -1292,10 +1292,6 @@
+ #define time time_is_forbidden_due_to_security_issues
+ #define rand rand_is_forbidden_due_to_state_trashing
+ #define srand srand_is_forbidden_due_to_state_trashing
+-#if !(defined(LIBAVFORMAT_BUILD) || defined(_FRAMEHOOK_H))
+-#define printf please_use_av_log
+-#define fprintf please_use_av_log
+-#endif
+ 
+ #define CHECKED_ALLOCZ(p, size)\
+ {\
diff --git a/packages/ffmpeg/ffmpeg-0.4.9-pre1/configure.patch b/packages/ffmpeg/ffmpeg-0.4.9-pre1/configure.patch
index e69de29bb2..10fa0ce6b2 100644
--- a/packages/ffmpeg/ffmpeg-0.4.9-pre1/configure.patch
+++ b/packages/ffmpeg/ffmpeg-0.4.9-pre1/configure.patch
@@ -0,0 +1,113 @@
+--- ./configure~configure.patch	2004-07-06 03:36:16.000000000 +0930
++++ ./configure	2004-09-27 00:07:23.000000000 +0930
+@@ -88,7 +88,7 @@
+ mandir=""
+ bindir=""
+ cross_prefix=""
+-cc="gcc"
++cc="$CC"
+ ar="ar"
+ ranlib="ranlib"
+ make="make"
+@@ -104,7 +104,7 @@
+     cpu="x86"
+   ;;
+   # armv4l is a subset of armv5tel
+-  armv4l|armv5tel)
++  armv4l|armv5tel|arm|xscale)
+     cpu="armv4l"
+   ;;
+   alpha)
+@@ -434,6 +434,37 @@
+   esac
+ done
+ 
++case "$cpu" in
++  i386|i486|i586|i686|i86pc|BePC)
++    cpu="x86"
++  ;;
++  # armv4l is a subset of armv5tel
++  armv4l|armv5tel|arm|xscale)
++    cpu="armv4l"
++  ;;
++  alpha)
++    cpu="alpha"
++  ;;
++  "Power Macintosh"|ppc)
++    cpu="powerpc"
++  ;;
++  mips)
++    cpu="mips"
++  ;;
++  sun4u|sparc64)
++    cpu="sparc64"
++  ;;
++  sparc)
++    cpu="sparc"
++  ;;
++  sh4)
++    cpu="sh4"
++  ;;
++  *)
++    cpu="unknown"
++  ;;
++esac
++
+ if test "$gpl" != "yes"; then
+     if test "$pp" != "no" -o "$shared_pp" != "no"; then
+         echo "The Postprocessing code is under GPL and --enable-gpl is not specified"
+@@ -662,7 +693,6 @@
+     bindir="$prefix"
+ fi
+ 
+-cc="${cross_prefix}${cc}"
+ ar="${cross_prefix}${ar}"
+ ranlib="${cross_prefix}${ranlib}"
+ strip="${cross_prefix}${strip}"
+@@ -753,21 +783,6 @@
+ fi
+ 
+ if test "$zlib" = "yes"; then
+-# check for zlib - mmu_man
+-cat > $TMPC << EOF
+-#include <zlib.h>
+-int main ( void ) {
+-if (zlibVersion() != ZLIB_VERSION)
+-   puts("zlib version differs !!!");
+-   return 1;
+-return 0;
+-}
+-EOF
+-$cc $CFLAGS -o $TMPE $TMPC -lz 2> /dev/null || zlib="no"
+-# $TMPE 2> /dev/null > /dev/null || zlib="no"
+-# XXX: more tests needed - runtime test
+-fi
+-if test "$zlib" = "yes"; then
+ extralibs="$extralibs -lz"
+ fi
+ 
+@@ -881,24 +896,8 @@
+ ##########################################
+ # SDL probe
+ 
+-cat > $TMPC << EOF
+-#include <SDL.h>
+-#undef main /* We don't want SDL to override our main() */
+-int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
+-EOF
+-
+ sdl_too_old=no
+-sdl=no
+-if sdl-config --version >/dev/null 2>&1 ; then
+-if $cc -o $TMPE `sdl-config --cflags` $TMPC `sdl-config --libs`  > /dev/null 2>&1  ; then
+-_sdlversion=`sdl-config --version | sed 's/[^0-9]//g'`
+-if test "$_sdlversion" -lt 121 ; then
+-sdl_too_old=yes
+-else
+ sdl=yes
+-fi
+-fi
+-fi
+ 
+ ##########################################
+ # texi2html probe
diff --git a/packages/ffmpeg/ffmpeg-0.4.9-pre1/soname.patch b/packages/ffmpeg/ffmpeg-0.4.9-pre1/soname.patch
index e69de29bb2..48de6f01bf 100644
--- a/packages/ffmpeg/ffmpeg-0.4.9-pre1/soname.patch
+++ b/packages/ffmpeg/ffmpeg-0.4.9-pre1/soname.patch
@@ -0,0 +1,74 @@
+--- ffmpeg-0.4.9-pre1/libavcodec/Makefile.orig	2004-08-25 22:36:39.000000000 +0200
++++ ffmpeg-0.4.9-pre1/libavcodec/Makefile	2004-08-25 22:37:22.000000000 +0200
+@@ -7,7 +7,7 @@
+ VPATH=$(SRC_PATH)/libavcodec
+ 
+ # NOTE: -I.. is needed to include config.h
+-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
++CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fPIC -DPIC
+ 
+ OBJS= common.o utils.o mem.o allcodecs.o \
+       mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
+@@ -197,7 +197,7 @@
+ 	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS)
+ 	-lib /machine:i386 /def:$(@:.dll=.def)
+ else
+-	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS)
++	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(EXTRALIBS) $(AMREXTRALIBS) $(LDFLAGS) -Wl,-soname -Wl,libavcodec.so.0
+ endif
+ 
+ dsputil.o: dsputil.c dsputil.h
+@@ -269,8 +269,9 @@
+ 	install -s -m 755 $(SLIB) "$(prefix)"
+ else
+ 	install -d $(prefix)/lib
+-	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
+-	ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
++	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec.so.0.4.9
++	ln -sf libavcodec.so.0.4.9 $(prefix)/lib/libavcodec.so.0
++	ln -sf libavcodec.so.0.4.9 $(prefix)/lib/libavcodec.so
+ 	ldconfig || true
+ endif
+ else
+
+--- ffmpeg-0.4.9-pre1/libavformat/Makefile.orig	2004-08-26 13:45:12.000000000 +0200
++++ ffmpeg-0.4.9-pre1/libavformat/Makefile	2004-08-26 13:46:00.000000000 +0200
+@@ -6,7 +6,7 @@
+ 
+ VPATH=$(SRC_PATH)/libavformat
+ 
+-CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
++CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -fPIC -DPIC
+ 
+ OBJS= utils.o cutils.o os_support.o allformats.o
+ PPOBJS=
+@@ -54,6 +54,7 @@
+ ifeq ($(CONFIG_AUDIO_BEOS),yes)
+ PPOBJS+= beosaudio.o
+ EXTRALIBS+=-lbe -lmedia
++else
+ # this should be the default !
+ EXTRALIBS+=-lavcodec -L../libavcodec
+ endif
+@@ -93,7 +94,7 @@
+ 	$(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll
+ 	-lib /machine:i386 /def:$(@:.dll=.def)
+ else
+-	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS)
++	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) -Wl,-soname -Wl,libavformat.so.0
+ endif
+ 
+ depend: $(SRCS)
+@@ -105,8 +106,9 @@
+ 	install -s -m 755 $(SLIB) "$(prefix)"
+ else
+ 	install -d $(prefix)/lib
+-	install -s -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so
+-	ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so
++	install -s -m 755 $(SLIB) $(prefix)/lib/libavformat.so.0.4.9
++	ln -sf libavformat.so.0.4.9 $(prefix)/lib/libavformat.so.0
++	ln -sf libavformat.so.0.4.9 $(prefix)/lib/libavformat.so
+ 	ldconfig || true
+ endif
+ else
+