Commit b112b600 authored by Jean-Paul Saman's avatar Jean-Paul Saman

Force ffmpeg to build for cross-compile and bigendian when system is uclibc.

parent 1f1fe98f
...@@ -124,8 +124,8 @@ FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --disable-encoders -- ...@@ -124,8 +124,8 @@ FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --disable-encoders --
endif endif
ifdef HAVE_UCLIBC ifdef HAVE_UCLIBC
FFMPEGCONF+= --enable-small --arch=armeb --disable-debug --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols FFMPEGCONF+= --enable-small --arch=armeb --disable-debug --disable-encoders --disable-muxers --disable-demuxer=mpegts --disable-v4l --disable-v4l2 --disable-bktr --disable-dv1394 --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols --disable-encoders
FFMPEG_CFLAGS += --std=c99 FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99
else else
FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-liba52 FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-liba52
endif endif
...@@ -925,7 +925,9 @@ ifdef HAVE_BEOS ...@@ -925,7 +925,9 @@ ifdef HAVE_BEOS
(cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch) (cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch)
endif endif
ifdef HAVE_UCLIBC ifdef HAVE_UCLIBC
(cd $@; patch -p1 < ../Patches/ffmpeg-svn-uclibc.patch) patch -p0 < Patches/ffmpeg-svn-uclibc.patch
patch -p0 < Patches/ffmpeg-svn-internal-define.patch
patch -p0 < Patches/ffmpeg-svn-grab.patch
endif endif
ffmpeg-$(FFMPEG_VERSION).tar.gz: ffmpeg-$(FFMPEG_VERSION).tar.gz:
...@@ -944,7 +946,7 @@ else ...@@ -944,7 +946,7 @@ else
.ffmpeg: ffmpeg .faac .lame .ffmpeg: ffmpeg .faac .lame
endif endif
endif endif
(cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-network --disable-ffplay && make && make install-libs install-headers) (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-ffmpeg --disable-network --disable-ffplay && make && make install-libs install-headers)
touch $@ touch $@
ifdef SVN ifdef SVN
......
--- ffmpeg/libavformat/grab.c.orig 2007-05-14 16:36:34.000000000 +0200
+++ ffmpeg/libavformat/grab.c 2007-05-14 16:36:50.000000000 +0200
@@ -27,6 +27,7 @@
#define _LINUX_TIME_H 1
#include <linux/videodev.h>
#include <time.h>
+#include <strings.h>
typedef struct {
int fd;
--- ffmpeg/libavutil/internal.h.orig 2007-05-14 16:24:22.000000000 +0200
+++ ffmpeg/libavutil/internal.h 2007-05-14 16:24:35.000000000 +0200
@@ -46,6 +46,10 @@
#define M_PI 3.14159265358979323846
#endif
+#ifndef M_E
+#define M_E 2.718281828
+#endif
+
#ifndef INT16_MIN
#define INT16_MIN (-0x7fff-1)
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment