Commit 27b73d75 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Fix bug 0002911: ffmpeg is compiled without a single optimization (x86_64, debian).

parent c753ca76
...@@ -47,7 +47,6 @@ else() ...@@ -47,7 +47,6 @@ else()
set(EP_ffmpeg_CONFIGURE_OPTIONS set(EP_ffmpeg_CONFIGURE_OPTIONS
"--disable-zlib" "--disable-zlib"
"--disable-bzlib" "--disable-bzlib"
"--disable-mmx"
"--disable-ffplay" "--disable-ffplay"
"--disable-ffprobe" "--disable-ffprobe"
"--disable-ffserver" "--disable-ffserver"
...@@ -93,6 +92,7 @@ else() ...@@ -93,6 +92,7 @@ else()
set(EP_ffmpeg_EXTRA_CFLAGS "-include windows.h") set(EP_ffmpeg_EXTRA_CFLAGS "-include windows.h")
set(EP_ffmpeg_EXTRA_LDFLAGS "-static-libgcc") set(EP_ffmpeg_EXTRA_LDFLAGS "-static-libgcc")
set(EP_ffmpeg_PATCH_COMMAND ${EP_ffmpeg_PATCH_COMMAND} "COMMAND" "${PATCH_PROGRAM}" "-p1" "-i" "${CMAKE_CURRENT_SOURCE_DIR}/builders/ffmpeg/mingw-no-lib.patch" ${EP_ffmpeg_PATCH_OPTIONS}) set(EP_ffmpeg_PATCH_COMMAND ${EP_ffmpeg_PATCH_COMMAND} "COMMAND" "${PATCH_PROGRAM}" "-p1" "-i" "${CMAKE_CURRENT_SOURCE_DIR}/builders/ffmpeg/mingw-no-lib.patch" ${EP_ffmpeg_PATCH_OPTIONS})
list(APPEND EP_ffmpeg_CONFIGURE_OPTIONS "--enable-runtime-cpudetect")
else() else()
if(APPLE) if(APPLE)
set(EP_ffmpeg_TARGET_OS "darwin") set(EP_ffmpeg_TARGET_OS "darwin")
...@@ -100,6 +100,7 @@ else() ...@@ -100,6 +100,7 @@ else()
list(APPEND EP_ffmpeg_CONFIGURE_OPTIONS list(APPEND EP_ffmpeg_CONFIGURE_OPTIONS
"--enable-decoder=h264" "--enable-decoder=h264"
"--disable-iconv" "--disable-iconv"
"--disable-mmx"
"--enable-cross-compile" "--enable-cross-compile"
"--cross-prefix=${SDK_BIN_PATH}/" "--cross-prefix=${SDK_BIN_PATH}/"
"--sysroot=${CMAKE_OSX_SYSROOT}" "--sysroot=${CMAKE_OSX_SYSROOT}"
...@@ -115,14 +116,16 @@ else() ...@@ -115,14 +116,16 @@ else()
endif() endif()
else() else()
list(APPEND EP_ffmpeg_CONFIGURE_OPTIONS list(APPEND EP_ffmpeg_CONFIGURE_OPTIONS
"--sysroot=${CMAKE_OSX_SYSROOT}" "--enable-runtime-cpudetect"
) "--sysroot=${CMAKE_OSX_SYSROOT}"
)
set(EP_ffmpeg_PATCH_COMMAND ${EP_ffmpeg_PATCH_COMMAND} "COMMAND" "${PATCH_PROGRAM}" "-p1" "-i" "${CMAKE_CURRENT_SOURCE_DIR}/builders/ffmpeg/configure-osx.patch" ${EP_ffmpeg_PATCH_OPTIONS}) set(EP_ffmpeg_PATCH_COMMAND ${EP_ffmpeg_PATCH_COMMAND} "COMMAND" "${PATCH_PROGRAM}" "-p1" "-i" "${CMAKE_CURRENT_SOURCE_DIR}/builders/ffmpeg/configure-osx.patch" ${EP_ffmpeg_PATCH_OPTIONS})
endif() endif()
elseif(ANDROID) elseif(ANDROID)
list(APPEND EP_ffmpeg_CONFIGURE_OPTIONS list(APPEND EP_ffmpeg_CONFIGURE_OPTIONS
"--enable-decoder=h264" "--enable-decoder=h264"
"--disable-iconv" "--disable-iconv"
"--disable-mmx"
"--enable-cross-compile" "--enable-cross-compile"
"--cross-prefix=${ANDROID_TOOLCHAIN_PATH}/" "--cross-prefix=${ANDROID_TOOLCHAIN_PATH}/"
"--sysroot=${CMAKE_SYSROOT}" "--sysroot=${CMAKE_SYSROOT}"
...@@ -138,6 +141,7 @@ else() ...@@ -138,6 +141,7 @@ else()
else() else()
set(EP_ffmpeg_TARGET_OS "linux") set(EP_ffmpeg_TARGET_OS "linux")
set(EP_ffmpeg_PATCH_COMMAND "${PATCH_PROGRAM}" "-p1" "-i" "${CMAKE_CURRENT_SOURCE_DIR}/builders/ffmpeg/no-sdl.patch" ${EP_ffmpeg_PATCH_OPTIONS}) set(EP_ffmpeg_PATCH_COMMAND "${PATCH_PROGRAM}" "-p1" "-i" "${CMAKE_CURRENT_SOURCE_DIR}/builders/ffmpeg/no-sdl.patch" ${EP_ffmpeg_PATCH_OPTIONS})
list(APPEND EP_ffmpeg_CONFIGURE_OPTIONS "--enable-runtime-cpudetect")
endif() endif()
list(APPEND EP_ffmpeg_CONFIGURE_OPTIONS "--cc=$CC") list(APPEND EP_ffmpeg_CONFIGURE_OPTIONS "--cc=$CC")
endif() endif()
......
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