[oe-commits] org.oe.dev ffmpeg git: adjust staging

[koen commit]

ffmpeg git: adjust staging

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 778242e4ed0805499896d7ab0c4ac532741b4198
ViewMTN: http://monotone.openembedded.org/revision/info/778242e4ed0805499896d7ab0c4ac532741b4198
Files:
1
packages/ffmpeg/ffmpeg_git.bb
Diffs:

#
# mt diff -r7270ff86aff5c36c5c7de6dcc5e4084225a9f455 -r778242e4ed0805499896d7ab0c4ac532741b4198
#
#
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
#  from [c2514c0639ab183a0f26f7e2736f7f03709b4609]
#    to [dd0dfbb0e116e12cbef829defa334905ca9fa64c]
#
============================================================
--- packages/ffmpeg/ffmpeg_git.bb	c2514c0639ab183a0f26f7e2736f7f03709b4609
+++ packages/ffmpeg/ffmpeg_git.bb	dd0dfbb0e116e12cbef829defa334905ca9fa64c
@@ -42,7 +42,7 @@ EXTRA_OECONF = " \
         --enable-libfaadbin \
         --enable-libgsm \
         --enable-libmp3lame \
-        --enable-swscale \
+        --disable-swscale \
         --arch=${TARGET_ARCH} \
         --enable-cross-compile \
         --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \
@@ -63,7 +63,7 @@ do_stage() {
         for lib in libavcodec libavdevice libavformat \
                    libavutil libpostproc libswscale
         do
-            oe_libinstall -a -so -C $lib $lib ${STAGING_LIBDIR}
+            oe_libinstall -a -so -C $lib $lib ${STAGING_LIBDIR} || true
             install -d ${STAGING_INCDIR}/$lib 
         done