diff options
| -rw-r--r-- | patches/ffmpeg-4.1_pre.local.patch | 13 | ||||
| -rw-r--r-- | vars/build.vars | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/patches/ffmpeg-4.1_pre.local.patch b/patches/ffmpeg-4.1_pre.local.patch index 4c8dbc8a..d8e39cba 100644 --- a/patches/ffmpeg-4.1_pre.local.patch +++ b/patches/ffmpeg-4.1_pre.local.patch @@ -1,6 +1,5 @@ -diff -ru ffmpeg-4.1.orig/configure ffmpeg-4.1/configure ---- ffmpeg-4.1.orig/configure 2018-11-06 00:22:33.000000000 +0100 -+++ ffmpeg-4.1/configure 2019-01-13 20:49:35.764790185 +0100 +--- ffmpeg-4.1/configure.orig 2018-11-05 23:22:33.000000000 +0000 ++++ ffmpeg-4.1/configure 2019-01-17 19:13:20.212000000 +0000 @@ -5268,6 +5268,12 @@ ranlib=: enable dos_paths @@ -14,3 +13,11 @@ diff -ru ffmpeg-4.1.orig/configure ffmpeg-4.1/configure cygwin*) target_os=cygwin shlibdir_default="$bindir_default" +@@ -5764,7 +5770,6 @@ + disabled x86asm && die "nasm/yasm not found or too old. Use --disable-x86asm for a crippled build." + X86ASMFLAGS="-f $objformat" + enabled pic && append X86ASMFLAGS "-DPIC" +- test -n "$extern_prefix" && append X86ASMFLAGS "-DPREFIX" + case "$objformat" in + elf*) enabled debug && append X86ASMFLAGS $x86asm_debug ;; + esac diff --git a/vars/build.vars b/vars/build.vars index 3a6814a2..be673ece 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -1248,7 +1248,7 @@ tmux tzdb vim xcowsay xeyes xorriso xterm xwd"; : ${PKG_FFMPEG_SHA256SUM:=b684fb43244a5c4caae652af9022ed5d85ce15210835bce054a33fb26033a1a5}; : ${PKG_FFMPEG_VERSION:=4.1}; : ${PKG_FFMPEG_URL:=https://ffmpeg.org/releases/ffmpeg-${PKG_FFMPEG_VERSION}.tar.bz2}; -: ${PKG_FFMPEG_CONFIGURE_ARGS:="--cc=${DEFAULT_TARGET}-gcc --cxx=${DEFAULT_TARGET}-g++ --disable-stripping --disable-x86asm --enable-cross-compile --enable-libtheora --enable-libvorbis --enable-libxml2 --enable-openssl --pkg-config=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config --prefix=/ --target-os=midipix"}; +: ${PKG_FFMPEG_CONFIGURE_ARGS:="--cc=${DEFAULT_TARGET}-gcc --cxx=${DEFAULT_TARGET}-g++ --disable-stripping --enable-cross-compile --enable-libtheora --enable-libvorbis --enable-libxml2 --enable-openssl --pkg-config=${PREFIX}/bin/${DEFAULT_TARGET}-pkg-config --prefix=/ --target-os=midipix --x86asmexe=${DEFAULT_TARGET}-nasm"}; : ${PKG_FFMPEG_CFLAGS_BUILD_EXTRA:="-I${PREFIX_NATIVE}/include/SDL2 -I${PREFIX_NATIVE}/include/libxml2 -std=gnu99"}; : ${PKG_GNUCHESS_SHA256SUM:=9a99e963355706cab32099d140b698eda9de164ebce40a5420b1b9772dd04802}; : ${PKG_GNUCHESS_VERSION:=6.2.5}; |