Changeset View
Changeset View
Standalone View
Standalone View
multimedia/x264/files/patch-configure
| --- configure.orig 2015-06-29 20:45:09 UTC | --- configure.orig 2015-06-29 20:45:09 UTC | ||||
| +++ configure | +++ configure | ||||
| @@ -639,7 +639,7 @@ case $host_cpu in | @@ -677,12 +677,6 @@ case $host_cpu in | ||||
| ASFLAGS="$ASFLAGS -f elf" | AS_EXT=".asm" | ||||
| ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/" | |||||
| if [ $compiler = GNU ]; then | |||||
| - if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then | |||||
| - CFLAGS="$CFLAGS -march=i686" | |||||
| - fi | |||||
| - if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then | |||||
| - CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2" | |||||
| - fi | |||||
| CFLAGS="-m32 $CFLAGS" | |||||
| LDFLAGS="-m32 $LDFLAGS" | |||||
| fi | fi | ||||
| @@ -697,7 +691,7 @@ case $host_cpu in | |||||
| ASFLAGS="$ASFLAGS -f elf32" | |||||
| fi | |||||
| ;; | ;; | ||||
| - x86_64) | - x86_64) | ||||
| + x86_64|amd64) | + x86_64|amd64) | ||||
| ARCH="X86_64" | ARCH="X86_64" | ||||
| AS="yasm" | AS="${AS-yasm}" | ||||
| AS_EXT=".asm" | AS_EXT=".asm" | ||||
| @@ -678,7 +678,7 @@ case $host_cpu in | @@ -761,7 +755,7 @@ case $host_cpu in | ||||
| sparc) | |||||
| ARCH="SPARC" | |||||
| ;; | |||||
| - mips|mipsel|mips64|mips64el) | |||||
| + mips|mipsel|mips64|mips64el|mipsn32) | |||||
| ARCH="MIPS" | |||||
| ;; | |||||
| arm*) | |||||
| @@ -695,7 +695,7 @@ case $host_cpu in | |||||
koobs: Was this upstreamed? | |||||
jbeichAuthorUnsubmitted Not Done Inline ActionsYes, superseded by ce0757d9d277. jbeich: Yes, superseded by [ce0757d9d277](https://git.videolan.org/?p=x264.git;a=commitdiff… | |||||
| AS="${AS-${CC}}" | AS="${AS-${CC}}" | ||||
| fi | fi | ||||
| ;; | ;; | ||||
| - aarch64) | - aarch64) | ||||
| + aarch64|arm64) | + aarch64|arm64) | ||||
| ARCH="AARCH64" | ARCH="AARCH64" | ||||
| stack_alignment=16 | |||||
| if [ "$SYS" = MACOSX ] ; then | if [ "$SYS" = MACOSX ] ; then | ||||
| AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -- ${CC}}" | @@ -1225,10 +1219,6 @@ if cc_check '' -Wshadow ; then | ||||
| @@ -1089,10 +1089,6 @@ if cc_check '' -Wshadow ; then | |||||
| CFLAGS="-Wshadow $CFLAGS" | CFLAGS="-Wshadow $CFLAGS" | ||||
| fi | fi | ||||
| -if cc_check '' -Wmaybe-uninitialized ; then | -if cc_check '' -Wmaybe-uninitialized ; then | ||||
| - CFLAGS="-Wno-maybe-uninitialized $CFLAGS" | - CFLAGS="-Wno-maybe-uninitialized $CFLAGS" | ||||
| -fi | -fi | ||||
| - | - | ||||
| if [ $compiler = ICC -o $compiler = ICL ] ; then | if [ $compiler = ICC -o $compiler = ICL ] ; then | ||||
| if cc_check 'extras/intel_dispatcher.h' '' 'x264_intel_dispatcher_override();' ; then | if cc_check 'extras/intel_dispatcher.h' '' 'x264_intel_dispatcher_override();' ; then | ||||
| define HAVE_INTEL_DISPATCHER | define HAVE_INTEL_DISPATCHER | ||||
| @@ -1128,6 +1118,9 @@ if [ "$opencl" = "yes" ]; then | |||||
| opencl="yes" | |||||
| define HAVE_OPENCL | |||||
| libdl="-ldl" | |||||
| + else | |||||
jbeichAuthorUnsubmitted Not Done Inline ActionsNote, this may need upstreaming. I miss the point why they need to limit OpenCL availability per platform or why LoadLibraryW() cannot fail gracefully like dlopen(). jbeich: Note, this may need upstreaming. I miss the point why they need to limit OpenCL availability… | |||||
| + opencl="yes" | |||||
| + define HAVE_OPENCL | |||||
| fi | |||||
| LDFLAGS="$LDFLAGS $libdl" | |||||
| fi | |||||
Was this upstreamed?