diff options
author | Robert Schuster <thebohemian@gmx.net> | 2008-08-27 15:37:19 +0000 |
---|---|---|
committer | Robert Schuster <thebohemian@gmx.net> | 2008-08-27 15:37:19 +0000 |
commit | a11270972338aa07727da3a8624adf0ec4289816 (patch) | |
tree | 3a2aa4cc3f5b3f8efb969fe3111ebda5919cc266 /packages/ffmpeg/ffmpeg_0.4.9-pre1.bb | |
parent | 7a527a494ce316a373361024b9e86a779e4a49e8 (diff) | |
parent | f05854e89327463f009e47cad7ed61bd228fb7e9 (diff) |
merge of '4dc83fb2fe7f6a2d1912363f0f5d575ef277a6b7'
and '6db51d8148c7ab6620fa15c71ccbfc4ec1db4fc0'
Diffstat (limited to 'packages/ffmpeg/ffmpeg_0.4.9-pre1.bb')
-rw-r--r-- | packages/ffmpeg/ffmpeg_0.4.9-pre1.bb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb index 6df6d89ca0..f2d5a928aa 100644 --- a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb +++ b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb @@ -1,11 +1,13 @@ require ffmpeg.inc -PR = "r3" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \ file://configure.patch;patch=0 \ file://gcc4.patch;patch=1 \ file://soname.patch;patch=1 \ + file://libavformat-makefile.patch;patch=1 \ + file://Makefile-lame.patch;patch=1 \ " EXTRA_OECONF += " \ @@ -27,13 +29,18 @@ EXTRA_OECONF += " \ \ --cpu=${TARGET_ARCH} \ --tune=${PACKAGE_ARCH} \ - --extra-ldflags="-la52" \ + --extra-libs="-la52" \ + --extra-ldflags="-L${STAGING_LIBDIR}" \ \ --disable-audio-beos \ --disable-v4l \ --disable-dv1394 \ " +EXTRA_OECONF_append_x86 += " \ + --disable-mmx \ +" + do_stage() { oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR} oe_libinstall -a -so -C libavformat libavformat ${STAGING_LIBDIR} |