aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2019-09-26 00:30:36 +0000
committerJan Beich <jbeich@FreeBSD.org>2019-09-26 00:30:36 +0000
commit8b9dfe2d716417b685cfdc2ae73608f137eed89d (patch)
tree609a19102e73d2b956460443b4dce5f7e6efd5fc
parent2bfa6419e0c5c63d9433cfb0e901a46ad7b1ac49 (diff)
downloadports-8b9dfe2d716417b685cfdc2ae73608f137eed89d.tar.gz
ports-8b9dfe2d716417b685cfdc2ae73608f137eed89d.zip
multimedia/svt-av1: update to 0.6.0.417
Notes
Notes: svn path=/head/; revision=512868
-rw-r--r--multimedia/ffmpeg/Makefile2
-rw-r--r--multimedia/svt-av1/Makefile16
-rw-r--r--multimedia/svt-av1/distinfo6
-rw-r--r--multimedia/svt-av1/files/patch-Source_Lib_Codec_EbThreads.h25
4 files changed, 7 insertions, 42 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index e817377d4f55..9d388d56d1e8 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ffmpeg
PORTVERSION= 4.2.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= https://ffmpeg.org/releases/
diff --git a/multimedia/svt-av1/Makefile b/multimedia/svt-av1/Makefile
index d62fa1ca41ec..f79864fb6888 100644
--- a/multimedia/svt-av1/Makefile
+++ b/multimedia/svt-av1/Makefile
@@ -2,8 +2,8 @@
PORTNAME= svt-av1
DISTVERSIONPREFIX= v
-DISTVERSION= 0.6.0-384
-DISTVERSIONSUFFIX= -gef00d203
+DISTVERSION= 0.6.0-417
+DISTVERSIONSUFFIX= -g1150460c
CATEGORIES= multimedia
MAINTAINER= jbeich@FreeBSD.org
@@ -26,16 +26,6 @@ USE_LDCONFIG= yes
GH_ACCOUNT= OpenVisualCloud
GH_PROJECT= SVT-AV1
CMAKE_ON= BUILD_SHARED_LIBS
-CMAKE_OFF= NATIVE
-
-post-patch:
-# Keep using nasm and drop vendor -O/-g
- @${REINPLACE_CMD} -e '/find_program.*yasm/d' \
- -Ee '/set.*(release|debug)_flags_to_test/,/\)/d' \
- ${WRKSRC}/CMakeLists.txt
-# Avoid platform whitelists for generic non-Windows code
-# https://github.com/OpenVisualCloud/SVT-AV1/pull/162
- @${GREP} --exclude='*/third_party/*' -Flr '__linux' ${WRKSRC} | ${XARGS} \
- ${REINPLACE_CMD} -i .opsys -E 's/__linux(__)?/__unix__/'
+CMAKE_OFF= NATIVE YASM
.include <bsd.port.mk>
diff --git a/multimedia/svt-av1/distinfo b/multimedia/svt-av1/distinfo
index abc35f9944da..b1419ec22848 100644
--- a/multimedia/svt-av1/distinfo
+++ b/multimedia/svt-av1/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569285177
-SHA256 (OpenVisualCloud-SVT-AV1-v0.6.0-384-gef00d203_GH0.tar.gz) = dca34721cabdb4fd96786f81a047fa1973c7d9bf97687a755f67a31ed3eb41e2
-SIZE (OpenVisualCloud-SVT-AV1-v0.6.0-384-gef00d203_GH0.tar.gz) = 2859928
+TIMESTAMP = 1569427971
+SHA256 (OpenVisualCloud-SVT-AV1-v0.6.0-417-g1150460c_GH0.tar.gz) = 66b45b95d7aae7bc0bc4023e8d9b695fcf7db37806ff06bf0a979fda0e54ae3f
+SIZE (OpenVisualCloud-SVT-AV1-v0.6.0-417-g1150460c_GH0.tar.gz) = 2885740
diff --git a/multimedia/svt-av1/files/patch-Source_Lib_Codec_EbThreads.h b/multimedia/svt-av1/files/patch-Source_Lib_Codec_EbThreads.h
deleted file mode 100644
index 1d83a24bee49..000000000000
--- a/multimedia/svt-av1/files/patch-Source_Lib_Codec_EbThreads.h
+++ /dev/null
@@ -1,25 +0,0 @@
-In file included from Source/Lib/Codec/EbEncDecProcess.c:9:
-In file included from Source/Lib/Codec/EbTransforms.h:14:
-In file included from Source/Lib/Codec/EbSequenceControlSet.h:10:
-Source/Lib/Codec/EbThreads.h:100:11: error: unknown type name 'cpu_set_t'
-extern cpu_set_t groupAffinity;
- ^
-
---- Source/Lib/Common/Codec/EbThreads.h.orig 2019-09-18 21:33:26 UTC
-+++ Source/Lib/Common/Codec/EbThreads.h
-@@ -99,8 +99,15 @@ extern "C" {
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE
- #endif
-+#ifdef __FreeBSD__
-+#define cpu_set_t cpuset_t
-+#else
- #include <sched.h>
-+#endif
- #include <pthread.h>
-+#if defined(__DragonFly__) || defined(__FreeBSD__)
-+#include <pthread_np.h>
-+#endif
- extern cpu_set_t group_affinity;
- #define EB_CREATE_THREAD(pointer, thread_function, thread_context) \
- do { \