diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-02-28 01:09:34 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-02-28 01:09:34 +0000 |
| commit | b57ee8bb5e85a9680563d4e4551ab18559ec8cbe (patch) | |
| tree | e982c9fee6d068df8585030e5a134b94ac3b3992 /rules/ffmpeg.make | |
| parent | 821bb7ef7e7f41717950d8185147341f97405814 (diff) | |
| download | ptxdist-b57ee8bb5e85a9680563d4e4551ab18559ec8cbe.tar.gz ptxdist-b57ee8bb5e85a9680563d4e4551ab18559ec8cbe.tar.xz | |
* ffmpeg: cleanup arch things
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7793 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/ffmpeg.make')
| -rw-r--r-- | rules/ffmpeg.make | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/rules/ffmpeg.make b/rules/ffmpeg.make index df5c19654..e268b05ba 100644 --- a/rules/ffmpeg.make +++ b/rules/ffmpeg.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_FFMPEG) += ffmpeg # # Paths and names # -FFMPEG_VERSION := r6104 +FFMPEG_VERSION := r12134 FFMPEG := ffmpeg-$(FFMPEG_VERSION) FFMPEG_SUFFIX := tar.bz2 FFMPEG_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(FFMPEG).$(FFMPEG_SUFFIX) @@ -79,34 +79,34 @@ FFMPEG_AUTOCONF += --extra-libs="$(CROSS_LIBS) -lm" #FFMPEG_AUTOCONF += --enable-mingw32 #FFMPEG_AUTOCONF += --enable-mingwce #FFMPEG_AUTOCONF += --enable-sunmlib -FFMPEG_AUTOCONF += --disable-audio-beos +#FFMPEG_AUTOCONF += --disable-audio-beos ifdef PTXCONF_ARCH_X86 FFMPEG_AUTOCONF += --disable-altivec FFMPEG_AUTOCONF += --disable-iwmmxt - ifdef PTXCONF_OPT_I386 + ifdef PTXCONF_ARCH_X86_I386 FFMPEG_AUTOCONF += --cpu=i386 FFMPEG_AUTOCONF += --tune=i386 FFMPEG_AUTOCONF += --disable-mmx endif - ifdef PTXCONF_OPT_I486 + ifdef PTXCONF_ARCH_X86_I486 FFMPEG_AUTOCONF += --cpu=i486 FFMPEG_AUTOCONF += --tune=i486 FFMPEG_AUTOCONF += --disable-mmx endif - ifdef PTXCONF_OPT_I586 + ifdef PTXCONF_ARCH_X86_I586 FFMPEG_AUTOCONF += --cpu=i586 FFMPEG_AUTOCONF += --tune=i586 endif - ifdef PTXCONF_OPT_I686 + ifdef PTXCONF_ARCH_X86_I686 FFMPEG_AUTOCONF += --cpu=i686 FFMPEG_AUTOCONF += --tune=i686 endif - ifdef PTXCONF_OPT_PII + ifdef PTXCONF_ARCH_X86_P2 FFMPEG_AUTOCONF += --cpu=i686 FFMPEG_AUTOCONF += --tune=pentium2 endif - ifdef PTXCONF_OPT_P3M + ifdef PTXCONF_ARCH_X86_P3M FFMPEG_AUTOCONF += --cpu=i686 FFMPEG_AUTOCONF += --tune=pentium3 endif @@ -121,21 +121,19 @@ FFMPEG_AUTOCONF += \ endif ifdef PTXCONF_ARCH_ARM -FFMPEG_AUTOCONF += \ - --cpu=armv4l \ + ifdef PTXCONF_ARCH_ARM_NETX + FFMPEG_AUTOCONF += --cpu=arm926ej-s + endif + ifdef PTXCONF_ARCH_ARM_PXA + # FIXME not all xscales are iwmmxt + FFMPEG_AUTOCONF += --cpu=iwmmxt + endif + FFMPEG_AUTOCONF += \ --disable-altivec \ --disable-mmx \ --disable-iwmmxt endif -ifdef PTXCONF_ARCH_ARM_NOMMU -FFMPEG_AUTOCONF += \ - --cpu=armv4l \ - --disable-altivec \ - --disable-mmx \ - --disable-iwmmxt -endif - ifdef PTXCONF_ARCH_PPC FFMPEG_AUTOCONF += \ --cpu=powerpc \ @@ -163,7 +161,6 @@ endif ifdef PTXCONF_ARCH_MIPS FFMPEG_AUTOCONF += \ - --cpu=armv4l \ --disable-altivec \ --disable-mmx \ --disable-iwmmxt |