Commit 163bf2de authored by Gildas Bazin's avatar Gildas Bazin

* extras/contrib: wince ffmpeg fixes + faad support.

parent 405e0811
...@@ -116,6 +116,7 @@ case $HOST in ...@@ -116,6 +116,7 @@ case $HOST in
arm-wince-pe) arm-wince-pe)
echo "HAVE_WINCE = 1" >> config.mak echo "HAVE_WINCE = 1" >> config.mak
echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
EXTRA_CPPFLAGS=" -D_WIN32_WCE"
;; ;;
*) *)
;; ;;
......
...@@ -86,12 +86,12 @@ endif ...@@ -86,12 +86,12 @@ endif
# #
ifdef HAVE_WIN32 ifdef HAVE_WIN32
HOSTCONF+= --without-pic --disable-shared --enable-msw --with-included-opencdk --with-included-libtasn1 --disable-depedency-tracking HOSTCONF+= --without-pic --disable-shared --enable-msw --with-included-opencdk --with-included-libtasn1 --disable-depedency-tracking
FFMPEGCONF+= --enable-mingw32 --enable-memalign-hack --cpu=x86 FFMPEGCONF+= --enable-mingw32 --enable-memalign-hack --cpu=x86 --disable-debug
endif endif
ifdef HAVE_WINCE ifdef HAVE_WINCE
HOSTCONF+= --without-pic --disable-shared HOSTCONF+= --without-pic --disable-shared
FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-codec=snow --disable-protocols FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-codec=snow --disable-codec=vc9 --disable-codec=wmv3 --disable-codec=vorbis --disable-codec=vorbis --disable-codec=dvdsub --disable-codec=dvbsub --disable-protocols
else else
FFMPEGCONF+= --enable-mp3lame --enable-faac FFMPEGCONF+= --enable-mp3lame --enable-faac
endif endif
...@@ -145,7 +145,7 @@ else ...@@ -145,7 +145,7 @@ else
ifdef HAVE_WINCE ifdef HAVE_WINCE
all: .dvbpsi .zlib .ffmpeg .ogg .tremor all: .dvbpsi .zlib .ffmpeg .ogg .tremor .faad
else else
# Standard Linux or other UNIX-like systems # Standard Linux or other UNIX-like systems
...@@ -719,9 +719,8 @@ faad2-$(FAAD2_VERSION).tar.bz2: ...@@ -719,9 +719,8 @@ faad2-$(FAAD2_VERSION).tar.bz2:
faad2: faad2-$(FAAD2_VERSION).tar.bz2 faad2: faad2-$(FAAD2_VERSION).tar.bz2
$(EXTRACT_BZ2) $(EXTRACT_BZ2)
ifdef HAVE_WIN32 (cd faad2; patch -p 0 < ../Patches/faad2.patch && ./bootstrap)
(cd faad2;patch -p 0 < ../Patches/faad2-20050513-win32.patch && ./bootstrap)
endif
.faad: faad2 .faad: faad2
(cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && make -C libfaad && make -C libfaad install) (cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && make -C libfaad && make -C libfaad install)
ifndef HAVE_DARWIN ifndef HAVE_DARWIN
...@@ -846,6 +845,7 @@ ifeq ($(HOST),i586-pc-beos) ...@@ -846,6 +845,7 @@ ifeq ($(HOST),i586-pc-beos)
endif endif
ifdef HAVE_WIN32 ifdef HAVE_WIN32
patch -p 0 < Patches/ffmpeg-cvs-win32.patch patch -p 0 < Patches/ffmpeg-cvs-win32.patch
patch -p 1 < Patches/ffmpeg-cvs-wince.patch
endif endif
ifdef HAVE_WINCE ifdef HAVE_WINCE
patch -p 1 < Patches/ffmpeg-cvs-wince.patch patch -p 1 < Patches/ffmpeg-cvs-wince.patch
......
+codebook/hcb_9.h codebook/hcb_10.h codebook/hcb_11.h codebook/hcb_sf.h
Index: libfaad/common.h
===================================================================
RCS file: /cvsroot/faac/faad2/libfaad/common.h,v
retrieving revision 1.66
diff -u -r1.66 common.h
--- libfaad/common.h 1 Feb 2005 13:23:35 -0000 1.66
+++ libfaad/common.h 13 May 2005 09:07:19 -0000
@@ -309,8 +309,10 @@
}
- #if defined(_WIN32) && !defined(__MINGW32__)
+ #ifdef __MINGW32__
#define HAS_LRINTF
+ #elif defined(_WIN32)
+ #define HAS_LRINTF
static INLINE int lrintf(float f)
{
int i;
diff -ru faad2.old/common/mp4v2/mp4.h faad2/common/mp4v2/mp4.h --- libfaad/bits.h 2005-11-22 23:41:28.000000000 +0000
--- faad2.old/common/mp4v2/mp4.h Sun Feb 22 14:04:55 2004 +++ libfaad/bits.h 2005-11-22 23:40:15.000000000 +0000
+++ faad2/common/mp4v2/mp4.h Sun Feb 22 14:18:41 2004 @@ -58,7 +58,7 @@
@@ -27,6 +27,8 @@
#include <mpeg4ip.h> #if defined (_WIN32) && !defined(_WIN32_WCE) && !defined(__MINGW32__)
#define BSWAP(a) __asm mov eax,a __asm bswap eax __asm mov a, eax
#include <math.h> /* to define float HUGE_VAL and/or NAN */ -#elif defined(LINUX) || defined(DJGPP) || defined(__MINGW32__)
+/* Meuuh power */ +#elif defined(LINUX) || defined(DJGPP) || (defined(__MINGW32__) && !defined(__MINGWCE__))
+#undef NAN #define BSWAP(a) __asm__ ( "bswapl %0\n" : "=r" (a) : "0" (a) )
#ifndef NAN #else
#define NAN HUGE_VAL #define BSWAP(a) \
#endif Index: libfaad/common.h
===================================================================
RCS file: /cvsroot/faac/faad2/libfaad/common.h,v
retrieving revision 1.66
diff -u -r1.66 common.h
--- libfaad/common.h 1 Feb 2005 13:23:35 -0000 1.66
+++ libfaad/common.h 22 Nov 2005 22:46:50 -0000
@@ -162,7 +162,7 @@
/* END COMPILE TIME DEFINITIONS */
-#if defined(_WIN32) && !defined(__MINGW32__)
+#if defined(_WIN32) && !defined(__MINGW32__) && !defined(__MINGWCE__)
#include <stdlib.h>
@@ -309,8 +309,11 @@
}
- #if defined(_WIN32) && !defined(__MINGW32__)
+ #if defined(__MINGWCE__)
+ #elif defined(__MINGW32__)
#define HAS_LRINTF
+ #elif defined(_WIN32)
+ #define HAS_LRINTF
static INLINE int lrintf(float f)
{
int i;
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