summaryrefslogtreecommitdiff
path: root/multimedia/x264/files/patch-configure
diff options
context:
space:
mode:
authorKubilay Kocak <koobs@FreeBSD.org>2015-07-03 07:02:44 +0000
committerKubilay Kocak <koobs@FreeBSD.org>2015-07-03 07:02:44 +0000
commit9b08af5e1a546b78fe93f99c39a534eeca7acf11 (patch)
treefb62b3412f4fbbccc19b38b48e8e04f5e9d1afda /multimedia/x264/files/patch-configure
parentReplace deprecated des_ with DES_ and fix LibreSSL build. (diff)
multimedia/{lib}x264: Update to 0.144.2533 and major refactor
- Update to 0.144.2533 (from upstream stable branch) [1] - Switch x264 and libx264 ports to master/slave ports respectively - Bump PORTREVISION for dependent ports as the shared library version has changed. multimedia/x264: - Clean up and update "updating instructions" in Makefile header - Tweak COMMENT - Only LIB_DEPENDS on libx264 and add PLIST_FILES if this isn't the libx264 port. - Allow COMMENT, USES, OPTIONS_*, CONFIGURE_ARGS to be overriden in libx264 port. - Place common configure arguments in a CONFIGURE_COMMON_ARGS variable to make overriding values without duplication easier. - Use --prefix configure argument over post-patch replacements - Enable stripping of binaries and libraries if DEBUG is off. Remove post-install target STRIP_CMD accordingly. - Delete patch-Makefile in favour of patching WRKSRC/configure to identify amd64, arm64 and mipsn32. powerpc and powerpc64 are now covered upstream without needing patches. - Patch out a bogus compiler argument check (cc_check) that results in -Wno-maybe-uninitialized being added to CFLAGS causing causes warnings when clang is cc. The cc_check function checks for basename $CC to identify compiler type (icl, clang, gcc, etc). multimedia/libx264: - Remove all Makefile entries that are duplicated or common and found in the master port (x264). - Set lib as the PKGNAMEPREFIX - Tweak COMMENT - Delete upstreamed ARM patches [1] - Delete all but one patch, as they duplicate those in x264. - Dont remove pkgconfig/libdata directory Changes: https://git.videolan.org/?p=x264.git;a=shortlog;h=refs/heads/stable Based on: PR: 201260 [1] Submitted by: Andrey Cherkashin <andoriyu gmail com> [1]
Notes
Notes: svn path=/head/; revision=391217
Diffstat (limited to 'multimedia/x264/files/patch-configure')
-rw-r--r--multimedia/x264/files/patch-configure59
1 files changed, 37 insertions, 22 deletions
diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure
index 3830d51c01f2..61414cdd63db 100644
--- a/multimedia/x264/files/patch-configure
+++ b/multimedia/x264/files/patch-configure
@@ -1,25 +1,40 @@
-From 9463ec0004f1bddc49c05ed8e38430a4ce1738fb Mon Sep 17 00:00:00 2001
-From: Janne Grunau <janne-x264@jannau.net>
-Date: Sun, 20 Jul 2014 13:40:28 +0200
-Subject: [PATCH] arm/ppc: use $CC as default assembler
-
---- configure.orig 2014-08-27 20:45:08 UTC
+--- configure.orig 2015-06-29 20:45:09 UTC
+++ configure
-@@ -648,7 +648,7 @@ case $host_cpu in
- ARCH="PPC"
- if [ $asm = auto ] ; then
- define HAVE_ALTIVEC
-- AS="${AS-${cross_prefix}gcc}"
-+ AS="${AS-${CC}}"
- if [ $SYS = MACOSX ] ; then
- CFLAGS="$CFLAGS -faltivec -fastf -mcpu=G4"
- else
-@@ -674,7 +674,7 @@ case $host_cpu in
- LDFLAGS="$LDFLAGS -arch armv7"
- fi
- else
-- AS="${AS-${cross_prefix}gcc}"
-+ AS="${AS-${CC}}"
+@@ -639,7 +639,7 @@ case $host_cpu in
+ ASFLAGS="$ASFLAGS -f elf"
fi
;;
- s390|s390x)
+- x86_64)
++ x86_64|amd64)
+ ARCH="X86_64"
+ AS="yasm"
+ AS_EXT=".asm"
+@@ -678,7 +678,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
+ AS="${AS-${CC}}"
+ fi
+ ;;
+- aarch64)
++ aarch64|arm64)
+ ARCH="AARCH64"
+ if [ "$SYS" = MACOSX ] ; then
+ AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -- ${CC}}"
+@@ -1089,10 +1089,6 @@ if cc_check '' -Wshadow ; then
+ CFLAGS="-Wshadow $CFLAGS"
+ fi
+
+-if cc_check '' -Wmaybe-uninitialized ; then
+- CFLAGS="-Wno-maybe-uninitialized $CFLAGS"
+-fi
+-
+ if [ $compiler = ICC -o $compiler = ICL ] ; then
+ if cc_check 'extras/intel_dispatcher.h' '' 'x264_intel_dispatcher_override();' ; then
+ define HAVE_INTEL_DISPATCHER