aboutsummaryrefslogtreecommitdiff
path: root/multimedia/openh264
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2018-06-27 14:46:54 +0000
committerJan Beich <jbeich@FreeBSD.org>2018-06-27 14:46:54 +0000
commit22436547544a2ec0f1f9fab69ad2ee8ce2165bf6 (patch)
tree9b836eb3c9fdd244835f6498d87fa0e7d83320b7 /multimedia/openh264
parent90737a48dd596cff4e92840c41fdf1b8aa560fb7 (diff)
downloadports-22436547544a2ec0f1f9fab69ad2ee8ce2165bf6.tar.gz
ports-22436547544a2ec0f1f9fab69ad2ee8ce2165bf6.zip
multimedia/openh264: update to 1.8.0
Notes
Notes: svn path=/head/; revision=473444
Diffstat (limited to 'multimedia/openh264')
-rw-r--r--multimedia/openh264/Makefile6
-rw-r--r--multimedia/openh264/distinfo6
-rw-r--r--multimedia/openh264/files/patch-clang22
3 files changed, 26 insertions, 8 deletions
diff --git a/multimedia/openh264/Makefile b/multimedia/openh264/Makefile
index 10b5db2ebfd7..10ba97937f49 100644
--- a/multimedia/openh264/Makefile
+++ b/multimedia/openh264/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= openh264
-PORTVERSION= 1.7.0
+PORTVERSION= 1.8.0
DISTVERSIONPREFIX=v
PORTEPOCH= 2
CATEGORIES= multimedia
@@ -18,9 +18,6 @@ GH_ACCOUNT= cisco
USES= compiler cpe gmake
CPE_VENDOR= cisco
USE_LDCONFIG= yes
-ASFLAGS+= ${ASFLAGS_${MACHINE}_${CHOSEN_COMPILER_TYPE}}
-ASFLAGS_arm_clang= -no-integrated-as
-ASFLAGS_arm64_clang= -no-integrated-as
MAKE_ARGS= PREFIX="${PREFIX}" \
OS=bsd ARCH="${ARCH:S/amd64/x86_64/}" \
CCASFLAGS='$$(CFLAGS) ${ASFLAGS}' \
@@ -33,7 +30,6 @@ OPTIONS_DEFAULT=PLUGINS
OPTIONS_SUB= yes
DEBUG_BUILD_DEPENDS_OFF= ${DEBUG_BUILD_DEPENDS_OFF_${ARCH}}
-DEBUG_BUILD_DEPENDS_OFF_aarch64=as:devel/binutils
DEBUG_BUILD_DEPENDS_OFF_amd64= nasm:devel/nasm
DEBUG_BUILD_DEPENDS_OFF_i386= nasm:devel/nasm
DEBUG_MAKE_ARGS=BUILDTYPE=Debug
diff --git a/multimedia/openh264/distinfo b/multimedia/openh264/distinfo
index 022b2c41c969..28581875bcf3 100644
--- a/multimedia/openh264/distinfo
+++ b/multimedia/openh264/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497586814
-SHA256 (cisco-openh264-v1.7.0_GH0.tar.gz) = 9c07c38d7de00046c9c52b12c76a2af7648b70d05bd5460c8b67f6895738653f
-SIZE (cisco-openh264-v1.7.0_GH0.tar.gz) = 38681895
+TIMESTAMP = 1530063403
+SHA256 (cisco-openh264-v1.8.0_GH0.tar.gz) = 08670017fd0bb36594f14197f60bebea27b895511251c7c64df6cd33fc667d34
+SIZE (cisco-openh264-v1.8.0_GH0.tar.gz) = 38695675
diff --git a/multimedia/openh264/files/patch-clang b/multimedia/openh264/files/patch-clang
new file mode 100644
index 000000000000..853016daff7a
--- /dev/null
+++ b/multimedia/openh264/files/patch-clang
@@ -0,0 +1,22 @@
+Based on https://github.com/cisco/openh264/pull/2877
+
+--- codec/common/arm64/arm_arch64_common_macro.S.orig 2018-06-27 01:36:43 UTC
++++ codec/common/arm64/arm_arch64_common_macro.S
+@@ -52,13 +52,17 @@ ret
+ .align 2
+ .global \funcName
+ .type \funcName, %function
++#ifndef __clang__
+ .func \funcName
++#endif
+ \funcName:
+ .endm
+
+ .macro WELS_ASM_AARCH64_FUNC_END
+ ret
++#ifndef __clang__
+ .endfunc
++#endif
+ .endm
+
+ #endif