Page MenuHomeFreeBSD
Differential D11566 Diff 30687 multimedia/x264/files/patch-configure

Changeset View

Standalone View

View Options

multimedia/x264/files/patch-configure

--- configure.orig 2015-06-29 20:45:09 UTC --- configure.orig 2017-06-26 20:45:05 UTC
+++ configure +++ configure
@@ -677,12 +677,6 @@ case $host_cpu in @@ -682,12 +682,6 @@ case $host_cpu in
AS_EXT=".asm" AS_EXT=".asm"
ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/" ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/"
if [ $compiler = GNU ]; then if [ $compiler = GNU ]; then
- if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then - if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
- CFLAGS="$CFLAGS -march=i686" - CFLAGS="$CFLAGS -march=i686"
- fi - fi
- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then - if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
- CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2" - CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2"
- fi - fi
CFLAGS="-m32 $CFLAGS" CFLAGS="-m32 $CFLAGS"
LDFLAGS="-m32 $LDFLAGS" LDFLAGS="-m32 $LDFLAGS"
fi fi
@@ -697,7 +691,7 @@ case $host_cpu in @@ -702,7 +696,7 @@ case $host_cpu in
ASFLAGS="$ASFLAGS -f elf32" ASFLAGS="$ASFLAGS -f elf32"
fi fi
;; ;;
- x86_64) - x86_64)
+ x86_64|amd64) + amd64|x86_64)
jbeichAuthorUnsubmitted
Not Done
Inline Actions

Just sorting. Otherwise, see bug 208440 for the proper fix.

jbeich: Just sorting. Otherwise, see [bug 208440](https://bugs.freebsd.org/bugzilla/show_bug.cgi?
ARCH="X86_64" ARCH="X86_64"
AS="${AS-yasm}" AS="${AS-yasm}"
AS_EXT=".asm" AS_EXT=".asm"
@@ -761,7 +755,7 @@ case $host_cpu in @@ -776,7 +770,7 @@ case $host_cpu in
AS="${AS-${CC}}" AS="${AS-${CC}}"
fi fi
;; ;;
- aarch64) - aarch64)
+ aarch64|arm64) + aarch64|arm64)
jbeichAuthorUnsubmitted
Not Done
Inline Actions

Probably cruft from the times uname -p value wasn't stable. config.guess from both x264 distfile and /usr/ports/Templates/ shows aarch64.

jbeich: Probably cruft from the times `uname -p` value wasn't stable. config.guess from both x264…
ARCH="AARCH64" ARCH="AARCH64"
stack_alignment=16 stack_alignment=16
if [ "$SYS" = MACOSX ] ; then AS="${AS-${CC}}"
@@ -882,9 +876,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then @@ -875,7 +869,7 @@ elif [ $compiler = ICC -a $ARCH = X86 ]; then
fi
fi
-if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then
+if [ $cli_libx264 != system -a $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then
if ! as_check "vpmovzxwd ymm0, xmm0" ; then
VER=`($AS --version || echo no assembler) 2>/dev/null | head -n 1`
echo "Found $VER"
@@ -889,9 +883,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \
fi
if [ $asm = auto -a $ARCH = ARM ] ; then
- # set flags so neon is built by default
- [ $compiler == CL ] || echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon"
jbeichAuthorUnsubmitted
Not Done
Inline Actions

Stayed to support real armv6 like RPi (1st generation). Maybe @mikael.urankar_gmail.com can confirm if the hunk is still necassary. Otherwise, it's similar to -march=i686 removal above which is part of respecting CFLAGS.

jbeich: Stayed to support real armv6 like RPi (1st generation). Maybe @mikael.urankar_gmail.com can…
mikaelUnsubmitted
Not Done
Inline Actions

Yes we still have to support the rpi1, the hunk is needed.

mikael: Yes we still have to support the rpi1, the hunk is needed.
-
cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM
if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then
define HAVE_ARMV6
@@ -902,9 +893,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON
ASFLAGS="$ASFLAGS -c" ASFLAGS="$ASFLAGS -c"
else else
- echo "You specified a pre-ARMv6 or Thumb-1 CPU in your CFLAGS." - echo "You specified a pre-ARMv6 or Thumb-1 CPU in your CFLAGS."
- echo "If you really want to run on such a CPU, configure with --disable-asm." - echo "If you really want to run on such a CPU, configure with --disable-asm."
- exit 1 - exit 1
+ echo "No usable SIMD found, adding --disable-asm." + echo "No usable SIMD found, assuming --disable-asm."
+ asm="no" + asm="no"
fi fi
fi fi
@@ -911,9 +904,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; the @@ -931,9 +921,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then
if cc_check '' '' '__asm__("addvi.b $w0, $w1, 1");' ; then if cc_check '' '' '__asm__("addvi.b $w0, $w1, 1");' ; then
define HAVE_MSA define HAVE_MSA
else else
- echo "You specified a pre-MSA CPU in your CFLAGS." - echo "You specified a pre-MSA CPU in your CFLAGS."
- echo "If you really want to run on such a CPU, configure with --disable-asm." - echo "If you really want to run on such a CPU, configure with --disable-asm."
- exit 1 - exit 1
+ echo "No usable SIMD found, adding --disable-asm." + echo "No usable SIMD found, assuming --disable-asm."
+ asm="no" + asm="no"
fi fi
fi fi
@@ -1225,10 +1217,6 @@ if cc_check '' -Wshadow ; then @@ -1245,10 +1234,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"
jbeichAuthorUnsubmitted
Not Done
Inline Actions

Probably cruft from when -Wunknown-warning-option was fatal for a brief time (circa Clang 3.6). However, before removing one needs to check the ancient GCC in base.

jbeich: Probably cruft from when `-Wunknown-warning-option` was fatal for a brief time (circa Clang 3.
-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 @@ -1284,6 +1269,9 @@ if [ "$opencl" = "yes" ]; then
opencl="yes" opencl="yes"
define HAVE_OPENCL define HAVE_OPENCL
libdl="-ldl" libdl="-ldl"
+ else + else
+ opencl="yes" + opencl="yes"
+ define HAVE_OPENCL + define HAVE_OPENCL
fi fi
LDFLAGS="$LDFLAGS $libdl" LDFLAGS="$LDFLAGS $libdl"
fi fi