diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2019-01-17 22:49:14 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2019-01-17 22:49:14 +0000 |
| commit | a1d76bcd73a73df2d8d2b2dff2aa1ce3dbd56885 (patch) | |
| tree | 09b4884c1156ec5139051ee2619417e8d70a486c /patches | |
| parent | 74192cd4466678b6c365489edd75acb53c22627c (diff) | |
| download | midipix_build-a1d76bcd73a73df2d8d2b2dff2aa1ce3dbd56885.tar.bz2 midipix_build-a1d76bcd73a73df2d8d2b2dff2aa1ce3dbd56885.tar.xz | |
vars/build.vars:ffmpeg:${PKG_CONFIGURE_ARGS}: build w/o --disable-x86asm and w/ --x86asmexe=${DEFAULT_TARGET}-nasm.
patches/ffmpeg-4.1_pre.local.patch: don't pass -DPREFIX to nasm.
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/ffmpeg-4.1_pre.local.patch | 13 |
1 files changed, 10 insertions, 3 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 |