Add define HAVE_BIGENDIAN to bootstrap and config.mak when compiler is armeb-linux...

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index a72ce0d37cd56ece0576843439ee0fb0609c87d3..3a2a2cdbf9bd3eb9ce1715207caedb6bc5107def 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -180,6 +180,7 @@ case $HOST in
         ;;
     armeb-linux-uclibc)
             echo "HAVE_UCLIBC = 1" >> config.mak
+            echo "HAVE_BIGENDIAN = 1" >> config.mak
             if test ! -z "${DISTRO}";  then
                 cat src/Distributions/${DISTRO}.mak >> distro.mak
             else

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 02196188d574c80d8842f9d411277c77c83275ee..c76a3f8e78dbd74f0ffe951f13423d5e5dfc8ff6 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -124,7 +124,12 @@ FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --disable-encoders --
 endif
 
 ifdef HAVE_UCLIBC
-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
+ifdef HAVE_BIGENDIAN
+FFMPEGCONF+= --arch=armeb
+else
+FFMPEGCONF+= --arch=armv4l
+endif
+FFMPEGCONF+= --enable-small --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 += -DHAVE_LRINTF --std=c99
 else
 FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-liba52
@@ -1098,6 +1103,9 @@ ifdef HAVE_DARWIN_OS
 endif
        patch -p0 < Patches/live-starttime.patch
        patch -p0 < Patches/live-config.patch
+ifdef HAVE_UCLIBC
+       patch -p0 < Patches/live-noapps.patch
+endif
 
 .live: live
 ifdef HAVE_WIN32 
@@ -1111,9 +1119,15 @@ ifdef HAVE_DARWIN_OS
        (cd $<; ./genMakefiles macosx && make)
 else
        (cd $<; sed -e 's/=/= EXTRA_CPPFLAGS/' -e 's%EXTRA_CPPFLAGS%-I/include%' -i.orig groupsock/Makefile.head)
+ifdef HAVE_UCLIBC
+ifdef HAVE_BIGENDIAN
+       (cd $<; ./genMakefiles armeb-uclibc && make $(HOSTCC))
+endif
+else
        (cd $<; ./genMakefiles linux && make $(HOSTCC))
 endif
 endif
+endif
 endif
        touch $@
 

diff --git a/extras/contrib/src/Patches/live-config.patch b/extras/contrib/src/Patches/live-config.patch
index f1461ead109eb5020a549ce295b151046d1528bb..77708080fa3625a5ede6ceca6453f3d7a459b031 100644 (file)
--- a/extras/contrib/src/Patches/live-config.patch
+++ b/extras/contrib/src/Patches/live-config.patch
@@ -89,3 +89,24 @@ diff -x Makefile -uN live/config.uClinux live.new/config.uClinux
  C =                   c\r
  C_COMPILER =          $(CROSS_COMPILE)gcc\r
  C_FLAGS =             $(COMPILE_OPTS)\r
+--- /dev/null  2007-05-14 09:00:32.045340388 +0200
++++ live/config.armeb-uclibc   2007-05-14 16:55:22.000000000 +0200
+@@ -0,0 +1,18 @@
++CROSS_COMPILE=                armeb-linux-uclibc-\r
++COMPILE_OPTS =          $(INCLUDES) -I. -Os -DSOCKLEN_T=socklen_t -DNO_STRSTREAM=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DUSE_SYSTEM_RANDOM=1\r
++C =                   c\r
++C_COMPILER =          $(CROSS_COMPILE)gcc\r
++C_FLAGS =             $(COMPILE_OPTS)\r
++CPP =                 cpp\r
++CPLUSPLUS_COMPILER =  $(CROSS_COMPILE)g++\r
++CPLUSPLUS_FLAGS =     $(COMPILE_OPTS) -Wall -DBSD=1\r
++OBJ =                 o\r
++LINK =                        $(CROSS_COMPILE)gcc -o\r
++LINK_OPTS =           -L.\r
++CONSOLE_LINK_OPTS =   $(LINK_OPTS)\r
++LIBRARY_LINK =                $(CROSS_COMPILE)ld -o\r
++LIBRARY_LINK_OPTS =   $(LINK_OPTS) -r -Bstatic\r
++LIB_SUFFIX =                  a\r
++LIBS_FOR_CONSOLE_APPLICATION =\r
++LIBS_FOR_GUI_APPLICATION =\r
++EXE =\r

diff --git a/extras/contrib/src/Patches/live-noapps.patch b/extras/contrib/src/Patches/live-noapps.patch
new file mode 100644 (file)
index 0000000..6109ed4
--- /dev/null
+++ b/extras/contrib/src/Patches/live-noapps.patch
@@ -0,0 +1,13 @@
+--- 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)
+ 
+