x264-devel: updated to 20180224

20180224:
Remove ARRAY_SIZE macro which is identical to ARRAY_ELEMS
x86inc: Correctly set mmreg variables
.gitignore: Ignore TAGS file
Minor configure improvements
Bump dates to 2018
Merge zero buffers
rdo: Use ALIGNED_ARRAY for stack arrays
Correctly align buffers for AVX and AVX-512
Cosmetics
ppc: Add load_deinterleave_chroma_fenc_altivec
Update to the latest upstream version of gas-preprocessor
input: Add a workaround for swscale overread bugs
filters/resize: Upgrade to a newer libavutil API
aarch64: Use ldurb/sturb for loads/stores with negative offsets
configure: Add support for building with MSVC/armasm for ARM64
arm: Check for __ELF__ instead of !__APPLE__, for using .arch/.fpu

8 files changed, 87 insertions, 233 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 37bbd942e4c..c32eb8b8e9b 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.64 2017/09/13 09:04:05 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2018/02/25 21:57:43 adam Exp $
 
-DISTNAME=	x264-snapshot-20170912-2245
+DISTNAME=	x264-snapshot-20180224-2245
 PKGNAME=	${DISTNAME:S/-snapshot-/-devel-/:S/-2245$//}
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
@@ -13,41 +13,17 @@ LICENSE=	gnu-gpl-v2
 
 .include "../../mk/bsd.prefs.mk"
 
-.if exists(/usr/include/stdlib.h) && ${OPSYS} != "Linux" # XXX should be fine
-CFLAGS+=	-DHAVE_STDLIB_H
-.endif
-
-# The assembler implementations don't use position independent code
-# and therefore break the builds on a lot of platforms because we use
-# "libtool" to create shared libraries. We therefore need to switch
-# them off even if the C versions are slower.
-.if ${MACHINE_ARCH} == "i386"
-.  if ${OPSYS} == "SunOS" || (${OPSYS} == "NetBSD" && \
-	(!empty(OS_VERSION:M[1-5].*) && empty(OS_VERSION:M5.99.*))) || \
-      ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--disable-asm
-# depends on builtin functions enabled with i486 and later with GCC.
-.    if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mi386)
-GNU_ARCH.i386=		i486
-CFLAGS+=		-march=i486
-.    endif
-.  else
-BUILD_DEPENDS+=		nasm>=2.13.0:../../devel/nasm
-.  endif
-.elif ${MACHINE_ARCH} == "x86_64"
-.  if ${OPSYS} == "SunOS" || (${OPSYS} == "NetBSD" && \
-	(!empty(OS_VERSION:M[1-5].*) && empty(OS_VERSION:M5.99.*)))
-CONFIGURE_ARGS+=	--disable-asm
-.  else
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 BUILD_DEPENDS+=		nasm>=2.13.0:../../devel/nasm
-.  endif
 .endif
 
 USE_TOOLS+=		bash gmake
 USE_LIBTOOL=		yes
 HAS_CONFIGURE=		yes
 CONFIG_SHELL=		${BASH}
-CONFIGURE_ARGS+=	--enable-pic	# uses libtool's -prefer-pic
+CONFIGURE_ARGS+=	--enable-shared
+CONFIGURE_ARGS+=	--enable-static
+CONFIGURE_ARGS+=	--enable-pic
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 .if ${OPSYS} == "Darwin"
 USE_TOOLS+=		perl
@@ -62,9 +38,9 @@ CONFIGURE_ARGS+=	--host=${MACHINE_GNU_PLATFORM}
 .endif
 
 BUILD_TARGET=		default
-INSTALL_TARGET=		install-lib-static install-cli
+INSTALL_TARGET=		install-lib-shared install-lib-static install-cli
 INSTALLATION_DIRS=	bin
-REPLACE_SH=		strip_fopt.sh version.sh
+REPLACE_SH=		version.sh
 
 .include "../../mk/dlopen.buildlink3.mk"
 
@@ -78,16 +54,6 @@ X264_BUILD_THREADS_SUPPORT=	yes
 X264_BUILD_THREADS_SUPPORT=	${DLOPEN_REQUIRE_PTHREADS}
 .endif
 
-SUBST_CLASSES+=		netbsd
-SUBST_STAGE.netbsd=	pre-configure
-SUBST_MESSAGE.netbsd=	Adding support for NetBSD.
-SUBST_FILES.netbsd=	common/cpu.c
-SUBST_SED.netbsd=	-e 's,SYS_OPENBSD,SYS_OPENBSD || SYS_NETBSD,'
-
 .include "options.mk"
 
-post-extract:
-	${CP} ${FILESDIR}/strip_fopt.sh ${WRKSRC}/ && \
-	${CHMOD} +x ${WRKSRC}/strip_fopt.sh
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/x264-devel/PLIST b/multimedia/x264-devel/PLIST
index 40f90090379..c31981dff48 100644
--- a/multimedia/x264-devel/PLIST
+++ b/multimedia/x264-devel/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2012/11/08 20:28:08 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2018/02/25 21:57:43 adam Exp $
 bin/x264
 include/x264.h
 include/x264_config.h
-lib/libx264.la
+lib/libx264.a
+lib/libx264.so
+lib/libx264.so.155
 lib/pkgconfig/x264.pc
diff --git a/multimedia/x264-devel/buildlink3.mk b/multimedia/x264-devel/buildlink3.mk
index c604538d82f..288a86e42c5 100644
--- a/multimedia/x264-devel/buildlink3.mk
+++ b/multimedia/x264-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2017/07/14 08:12:33 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2018/02/25 21:57:43 adam Exp $
 
 BUILDLINK_TREE+=	x264-devel
 
@@ -18,8 +18,9 @@ X264_DEVEL_BUILDLINK3_MK:=
 ###	  Prior specification: x264-devel>=20130115 # X264_BUILD 129
 ###	  Prior specification: x264-devel>=20130703 # X264_BUILD 133
 ###	  Prior specification: x264-devel>=20131015 # X264_BUILD 138
+###	  Prior specification: x264-devel>=20140303 # X264_BUILD 142
 ###
-BUILDLINK_API_DEPENDS.x264-devel+=	x264-devel>=20140303 # X264 BUILD 142
+BUILDLINK_API_DEPENDS.x264-devel+=	x264-devel>=20180224 # X264_BUILD 152
 BUILDLINK_PKGSRCDIR.x264-devel?=	../../multimedia/x264-devel
 pkgbase:= x264-devel
 .include "../../mk/pkg-build-options.mk"
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 29eb6dd6e68..0e90e82cd91 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.48 2017/09/13 09:04:05 wiz Exp $
+$NetBSD: distinfo,v 1.49 2018/02/25 21:57:43 adam Exp $
 
-SHA1 (x264-snapshot-20170912-2245.tar.bz2) = 6574ef4e4635e7d1effc660b7338427244320eba
-RMD160 (x264-snapshot-20170912-2245.tar.bz2) = a2837483982de07a99ac79b8b044b81161503363
-SHA512 (x264-snapshot-20170912-2245.tar.bz2) = 027d573d2dd3c0b13d67cb0ead23b40d2749663037a6d5f804e2a582d2e2866b37494c9b76c95a4440a3a5a5640a597a2fd3123b63cfcec95b7fde9a443ef9cf
-Size (x264-snapshot-20170912-2245.tar.bz2) = 750535 bytes
-SHA1 (patch-Makefile) = 8637cc22e142081ad309b462fb30c654d3688cce
-SHA1 (patch-configure) = 0a69da50452159e0b12fb7ac294d1f15cd42bdca
+SHA1 (x264-snapshot-20180224-2245.tar.bz2) = 37b21c882cce3f8049d3a3f74cfe5f18130a8283
+RMD160 (x264-snapshot-20180224-2245.tar.bz2) = 2c1175e2b89ccac6cb52e86ebf93177c02ec54cf
+SHA512 (x264-snapshot-20180224-2245.tar.bz2) = d4aec5aa6913d7c3b5ec2cc017986d533b3ce934d63bb3334d39403df9883a17b46e67f15f51b827333fe9bdf234197bc8cb952c16e3a9e0f645469520036968
+Size (x264-snapshot-20180224-2245.tar.bz2) = 766228 bytes
+SHA1 (patch-common_cpu.c) = ef15bae000163e9c10d2e414e841486dd2920b80
+SHA1 (patch-configure) = 6c8cee809ec7306f039372d4bcca18b704cd0c22
 SHA1 (patch-encoder_analyse.c) = 2057583899e029a4c2173c511293e6a35cf80f78
diff --git a/multimedia/x264-devel/files/strip_fopt.sh b/multimedia/x264-devel/files/strip_fopt.sh
deleted file mode 100755
index bb188072c00..00000000000
--- a/multimedia/x264-devel/files/strip_fopt.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: strip_fopt.sh,v 1.4 2017/08/30 19:47:08 wiz Exp $
-#
-# libtool assumes that the compiler can handle the -fPIC flag and the
-# -fno-common. This isn't always true, for example yasm can't handle it.
-command="$1"
-shift
-while [ $# -gt 0 ]; do
-	case "$1" in
-	-fPIC|-fno-common|-pie)
-		;;
-	*)
-		command="$command $1"
-		;;
-	esac
-	shift
-done
-echo $command
-exec $command
diff --git a/multimedia/x264-devel/patches/patch-Makefile b/multimedia/x264-devel/patches/patch-Makefile
deleted file mode 100644
index 48255cceb94..00000000000
--- a/multimedia/x264-devel/patches/patch-Makefile
+++ /dev/null
@@ -1,134 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2017/06/16 05:39:23 adam Exp $
-
-Add rule for .lo:.S needed by aarch64
-
---- Makefile.orig	2017-06-15 20:45:03.000000000 +0000
-+++ Makefile
-@@ -34,7 +34,7 @@ OBJS =
- OBJSO =
- OBJCLI =
- 
--OBJCHK = tools/checkasm.o
-+OBJCHK = tools/checkasm.lo
- 
- OBJEXAMPLE = example.o
- 
-@@ -99,9 +99,9 @@ endif
- 
- ifdef ARCH_X86
- SRCS   += common/x86/mc-c.c common/x86/predict-c.c
--OBJASM  = $(ASMSRC:%.asm=%.o)
-+OBJASM  = $(ASMSRC:%.asm=%.lo)
- $(OBJASM): common/x86/x86inc.asm common/x86/x86util.asm
--OBJCHK += tools/checkasm-a.o
-+OBJCHK += tools/checkasm-a.lo
- endif
- endif
- 
-@@ -121,8 +121,8 @@ ASMSRC += common/arm/cpu-a.S common/arm/
-           common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \
-           common/arm/predict-a.S common/arm/bitstream-a.S
- SRCS   += common/arm/mc-c.c common/arm/predict-c.c
--OBJASM  = $(ASMSRC:%.S=%.o)
--OBJCHK += tools/checkasm-arm.o
-+OBJASM  = $(ASMSRC:%.S=%.lo)
-+OBJCHK += tools/checkasm-arm.lo
- endif
- endif
- 
-@@ -140,8 +140,8 @@ ASMSRC += common/aarch64/bitstream-a.S \
- SRCS   += common/aarch64/asm-offsets.c \
-           common/aarch64/mc-c.c        \
-           common/aarch64/predict-c.c
--OBJASM  = $(ASMSRC:%.S=%.o)
--OBJCHK += tools/checkasm-aarch64.o
-+OBJASM  = $(ASMSRC:%.S=%.lo)
-+OBJCHK += tools/checkasm-aarch64.lo
- endif
- endif
- 
-@@ -173,20 +173,23 @@ GENERATED += common/oclobj.h
- SRCS += common/opencl.c encoder/slicetype-cl.c
- endif
- 
--OBJS   += $(SRCS:%.c=%.o)
--OBJCLI += $(SRCCLI:%.c=%.o)
-+OBJS   += $(SRCS:%.c=%.lo)
-+OBJCLI += $(SRCCLI:%.c=%.lo)
- OBJSO  += $(SRCSO:%.c=%.o)
- 
- .PHONY: all default fprofiled clean distclean install install-* uninstall cli lib-* etags
- 
-+%.lo: %.c
-+	${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${PICFLAG} -o $@ $<
-+
- cli: x264$(EXE)
--lib-static: $(LIBX264)
-+lib-static: libx264.la
- lib-shared: $(SONAME)
- 
--$(LIBX264): $(GENERATED) .depend $(OBJS) $(OBJASM)
--	rm -f $(LIBX264)
--	$(AR)$@ $(OBJS) $(OBJASM)
--	$(if $(RANLIB), $(RANLIB) $@)
-+libx264.la: $(GENERATED) .depend $(OBJS) $(OBJASM)
-+	${LIBTOOL} --mode=link \
-+	${CC} -o libx264.la -rpath ${PREFIX}/lib -version-info 0 \
-+	$(OBJS) $(OBJASM) ${LDFLAGS}
- 
- $(SONAME): $(GENERATED) .depend $(OBJS) $(OBJASM) $(OBJSO)
- 	$(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
-@@ -198,24 +201,22 @@ checkasm: checkasm$(EXE)
- example: example$(EXE)
- endif
- 
--x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(CLI_LIBX264)
--	$(LD)$@ $(OBJCLI) $(CLI_LIBX264) $(LDFLAGSCLI) $(LDFLAGS)
-+x264$(EXE): $(GENERATED) .depend $(OBJCLI) libx264.la
-+	${LIBTOOL} --mode=link $(LD)$@ $(OBJCLI) libx264.la $(LDFLAGSCLI) $(LDFLAGS)
- 
--checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) $(LIBX264)
--	$(LD)$@ $(OBJCHK) $(LIBX264) $(LDFLAGS)
-+checkasm$(EXE): $(GENERATED) .depend $(OBJCHK) libx264.la
-+	${LIBTOOL} --mode=link $(LD)$@ $+ $(LDFLAGS)
- 
- example$(EXE): $(GENERATED) .depend $(OBJEXAMPLE) $(LIBX264)
- 	$(LD)$@ $(OBJEXAMPLE) $(LIBX264) $(LDFLAGS)
- 
- $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(OBJCHK) $(OBJEXAMPLE): .depend
- 
--%.o: %.asm common/x86/x86inc.asm common/x86/x86util.asm
--	$(AS) $(ASFLAGS) -o $@ $<
--	-@ $(if $(STRIP), $(STRIP) -x $@) # delete local/anonymous symbols, so they don't show up in oprofile
--
--%.o: %.S
--	$(AS) $(ASFLAGS) -o $@ $<
--	-@ $(if $(STRIP), $(STRIP) -x $@) # delete local/anonymous symbols, so they don't show up in oprofile
-+%.lo: %.asm common/x86/x86inc.asm common/x86/x86util.asm
-+	${LIBTOOL} --mode=compile --tag=CC ./strip_fopt.sh $(AS) $(ASFLAGS) -o $@ $<
-+
-+%.lo: %.S
-+	${LIBTOOL} --mode=compile --tag=CC $(AS) $(ASFLAGS) -o $@ $<
- 
- %.dll.o: %.rc x264.h
- 	$(RC) $(RCFLAGS)$@ -DDLL $<
-@@ -282,8 +283,7 @@ distclean: clean
- 	rm -rf conftest*
- 
- install-cli: cli
--	$(INSTALL) -d $(DESTDIR)$(bindir)
--	$(INSTALL) x264$(EXE) $(DESTDIR)$(bindir)
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} x264 $(DESTDIR)$(bindir)/x264
- 
- install-lib-dev:
- 	$(INSTALL) -d $(DESTDIR)$(includedir)
-@@ -294,8 +294,7 @@ install-lib-dev:
- 	$(INSTALL) -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
- 
- install-lib-static: lib-static install-lib-dev
--	$(INSTALL) -m 644 $(LIBX264) $(DESTDIR)$(libdir)
--	$(if $(RANLIB), $(RANLIB) $(DESTDIR)$(libdir)/$(LIBX264))
-+	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libx264.la $(DESTDIR)$(libdir)
- 
- install-lib-shared: lib-shared install-lib-dev
- ifneq ($(IMPLIBNAME),)
diff --git a/multimedia/x264-devel/patches/patch-common_cpu.c b/multimedia/x264-devel/patches/patch-common_cpu.c
new file mode 100644
index 00000000000..3324d6ccf50
--- /dev/null
+++ b/multimedia/x264-devel/patches/patch-common_cpu.c
@@ -0,0 +1,52 @@
+$NetBSD: patch-common_cpu.c,v 1.1 2018/02/25 21:57:43 adam Exp $
+
+Add support for NetBSD.
+
+--- common/cpu.c.orig	2018-02-07 08:18:42.000000000 +0000
++++ common/cpu.c
+@@ -37,7 +37,7 @@
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ #endif
+-#if SYS_OPENBSD
++#if SYS_OPENBSD || SYS_NETBSD
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+ #include <machine/cpu.h>
+@@ -300,20 +300,20 @@ uint32_t x264_cpu_detect( void )
+ 
+ #elif ARCH_PPC && HAVE_ALTIVEC
+ 
+-#if SYS_MACOSX || SYS_OPENBSD || SYS_FREEBSD
++#if SYS_MACOSX || SYS_OPENBSD || SYS_NETBSD || SYS_FREEBSD
+ #include <sys/sysctl.h>
+ uint32_t x264_cpu_detect( void )
+ {
+     /* Thank you VLC */
+     uint32_t cpu = 0;
+-#if SYS_OPENBSD
++#if SYS_OPENBSD || SYS_NETBSD
+     int      selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
+ #elif SYS_MACOSX
+     int      selectors[2] = { CTL_HW, HW_VECTORUNIT };
+ #endif
+     int      has_altivec = 0;
+     size_t   length = sizeof( has_altivec );
+-#if SYS_MACOSX || SYS_OPENBSD
++#if SYS_MACOSX || SYS_OPENBSD || SYS_NETBSD
+     int      error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 );
+ #else
+     int      error = sysctlbyname( "hw.altivec", &has_altivec, &length, NULL, 0 );
+@@ -462,10 +462,10 @@ int x264_cpu_num_processors( void )
+     get_system_info( &info );
+     return info.cpu_count;
+ 
+-#elif SYS_MACOSX || SYS_FREEBSD || SYS_OPENBSD
++#elif SYS_MACOSX || SYS_FREEBSD || SYS_OPENBSD || SYS_NETBSD
+     int ncpu;
+     size_t length = sizeof( ncpu );
+-#if SYS_OPENBSD
++#if SYS_OPENBSD || SYS_NETBSD
+     int mib[2] = { CTL_HW, HW_NCPU };
+     if( sysctl(mib, 2, &ncpu, &length, NULL, 0) )
+ #else
diff --git a/multimedia/x264-devel/patches/patch-configure b/multimedia/x264-devel/patches/patch-configure
index f98c88b104e..b15ef1c8573 100644
--- a/multimedia/x264-devel/patches/patch-configure
+++ b/multimedia/x264-devel/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.2 2017/06/16 05:39:23 adam Exp $
+$NetBSD: patch-configure,v 1.3 2018/02/25 21:57:43 adam Exp $
 
 Add support for DragonFly.
 Use 'amd64' as a synonym for 'x86_64'.
@@ -7,9 +7,9 @@ Do not force compiler optimisations.
 If we fail an assembly test, continue as if --disable-asm
 was passed.
 
---- configure.orig	2017-06-15 20:45:03.000000000 +0000
+--- configure.orig	2018-02-24 21:45:03.000000000 +0000
 +++ configure
-@@ -612,6 +612,10 @@ case $host_os in
+@@ -630,6 +630,10 @@ case $host_os in
          SYS="FREEBSD"
          libm="-lm"
          ;;
@@ -20,7 +20,7 @@ was passed.
      kfreebsd*-gnu)
          SYS="FREEBSD"
          define HAVE_MALLOC_H
-@@ -712,7 +716,7 @@ case $host_cpu in
+@@ -730,7 +734,7 @@ case $host_cpu in
              ASFLAGS="$ASFLAGS -f elf32"
          fi
          ;;
@@ -29,7 +29,7 @@ was passed.
          ARCH="X86_64"
          AS="${AS-nasm}"
          AS_EXT=".asm"
-@@ -741,14 +745,15 @@ case $host_cpu in
+@@ -759,14 +763,15 @@ case $host_cpu in
          fi
          ;;
      powerpc*)
@@ -46,7 +46,7 @@ was passed.
                  CFLAGS="$CFLAGS -maltivec -mabi=altivec"
                  define HAVE_ALTIVEC_H
              fi
-@@ -915,8 +920,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
+@@ -942,8 +947,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
          ASFLAGS="$ASFLAGS -c"
      else
          echo "You specified a pre-ARMv6 or Thumb-1 CPU in your CFLAGS."
@@ -57,7 +57,7 @@ was passed.
      fi
  fi
  
-@@ -925,8 +930,8 @@ if [ $asm = auto -a $ARCH = AARCH64 ] ; 
+@@ -955,8 +960,8 @@ if [ $asm = auto -a $ARCH = AARCH64 ] ; 
          ASFLAGS="$ASFLAGS -c"
      else
          echo "no NEON support, try adding -mfpu=neon to CFLAGS"
@@ -68,7 +68,7 @@ was passed.
      fi
  fi
  
-@@ -944,8 +949,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; the
+@@ -974,8 +979,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; the
          define HAVE_MSA
      else
          echo "You specified a pre-MSA CPU in your CFLAGS."
@@ -79,7 +79,7 @@ was passed.
      fi
  fi
  
-@@ -962,7 +967,7 @@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$sta
+@@ -992,7 +997,7 @@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$sta
  CPU_ENDIAN="little-endian"
  if [ $compiler = GNU ]; then
      echo "int i[2] = {0x42494745,0}; double f[2] = {0x1.0656e6469616ep+102,0};" > conftest.c
@@ -88,7 +88,7 @@ was passed.
      if (${cross_prefix}strings -a conftest.o | grep -q BIGE) && (${cross_prefix}strings -a conftest.o | grep -q FPendian) ; then
          define WORDS_BIGENDIAN
          CPU_ENDIAN="big-endian"
-@@ -984,7 +989,7 @@ fi
+@@ -1014,7 +1019,7 @@ fi
  
  # autodetect options that weren't forced nor disabled
  
@@ -97,12 +97,8 @@ was passed.
  if [ "$SYS" = "WINDOWS" -a "$thread" = "posix" ] ; then
      if [ "$gpl" = "no" ] ; then
          echo "Warning: pthread-win32 is LGPL and is therefore not supported with --disable-gpl"
-@@ -1205,10 +1210,10 @@ fi
- cc_check "stdint.h" "" "uint32_t test_vec __attribute__ ((vector_size (16))) = {0,1,2,3};" && define HAVE_VECTOREXT
- 
- if [ "$pic" = "yes" ] ; then
--    [ "$SYS" != WINDOWS -a "$SYS" != CYGWIN ] && CFLAGS="$CFLAGS -fPIC"
-+    PICFLAG="-prefer-pic"
+@@ -1242,7 +1247,7 @@ if [ "$pic" = "yes" ] ; then
+     [ "$SYS" != WINDOWS -a "$SYS" != CYGWIN ] && CFLAGS="$CFLAGS -fPIC"
      ASFLAGS="$ASFLAGS -DPIC"
      # resolve textrels in the x86 asm
 -    cc_check stdio.h "-shared -Wl,-Bsymbolic" && SOFLAGS="$SOFLAGS -Wl,-Bsymbolic"
@@ -110,7 +106,7 @@ was passed.
      [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
  fi
  
-@@ -1224,7 +1229,6 @@ if [ "$debug" = "yes" ]; then
+@@ -1258,7 +1263,6 @@ if [ "$debug" = "yes" ]; then
      CFLAGS="-O1 -g $CFLAGS"
      RCFLAGS="$RCFLAGS -DDEBUG"
  else
@@ -118,12 +114,3 @@ was passed.
      if [ "$lto" = "auto" ] && [ $compiler = GNU ] && cc_check "" "-flto" ; then
          lto="yes"
          CFLAGS="$CFLAGS -flto"
-@@ -1359,7 +1363,7 @@ else # gcc/icc
-     DEPMM="$DEPMM -g0"
-     AR="$AR rc "
-     LD="$CC -o "
--    LIBX264=libx264.a
-+    LIBX264=libx264.la
-     [ -n "$RC" ] && RCFLAGS="$RCFLAGS -I. -o "
- fi
- [ $compiler != GNU ] && CFLAGS="$(cc_cflags $CFLAGS)"