diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2018-07-17 17:29:00 +0000 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2018-07-17 17:29:00 +0000 |
| commit | f52aa6f55dfdb17585fe9bfda00bd0810d1044e3 (patch) | |
| tree | 4e2c0e4cafe43bdb089af42630fbf94df980d4e0 /multimedia | |
| parent | cf320394fcd0730991e74883bb201e0b0f76180f (diff) | |
| download | ports-f52aa6f55dfdb17585fe9bfda00bd0810d1044e3.tar.gz ports-f52aa6f55dfdb17585fe9bfda00bd0810d1044e3.zip | |
Upgrade x265 from 2.6 to 2.8 and:
. Explicitly disable use of AVX with clang (see patch for links)
. Put non-SSL sources back on the list of MASTER_SITES
Bump PORTREVISION in the depending ports as appropriate.
Notes
Notes:
svn path=/head/; revision=474814
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ccextractor/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/x265/Makefile | 17 | ||||
| -rw-r--r-- | multimedia/x265/distinfo | 6 | ||||
| -rw-r--r-- | multimedia/x265/files/patch-disable-avx-for-clang | 13 | ||||
| -rw-r--r-- | multimedia/x265/files/patch-rdtsc | 9 | ||||
| -rw-r--r-- | multimedia/x265/pkg-plist | 2 |
7 files changed, 28 insertions, 22 deletions
diff --git a/multimedia/ccextractor/Makefile b/multimedia/ccextractor/Makefile index 29ec7c1d2a3d..ce8bd8723df3 100644 --- a/multimedia/ccextractor/Makefile +++ b/multimedia/ccextractor/Makefile @@ -3,7 +3,7 @@ PORTNAME= ccextractor DISTVERSIONPREFIX= v DISTVERSION= 0.85 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia MAINTAINER= oz@nixil.net diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 717b4dd4dae1..e89cf0db8cbc 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -3,6 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 4.0.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= https://ffmpeg.org/releases/ diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile index bbdfbdde4b3e..8338e2d16909 100644 --- a/multimedia/x265/Makefile +++ b/multimedia/x265/Makefile @@ -2,18 +2,19 @@ # $FreeBSD$ PORTNAME= x265 -PORTVERSION= 2.6 -PORTREVISION= 1 +PORTVERSION= 2.8 CATEGORIES= multimedia -MASTER_SITES= https://downloads.videolan.org/pub/videolan/${PORTNAME}/ \ - https://mirror.leaseweb.com/videolan/x265/ +MASTER_SITES= https://downloads.videolan.org/pub/videolan/x265/ \ + https://mirror.leaseweb.com/videolan/x265/ \ + http://downloads.videolan.org/pub/videolan/x265/ \ + http://mirror.leaseweb.com/videolan/x265/ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= mi@aldan.algebra.com COMMENT= H.265/High Efficiency Video Coding (HEVC) format LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/../COPYING +LICENSE_FILE= ${WRKSRC:H}/COPYING BUILD_DEPENDS= yasm:devel/yasm @@ -28,7 +29,7 @@ DEBUG_VARS_OFF= CFLAGS+=-DNDEBUG CPPFLAGS+=-DNDEBUG HI10P_CMAKE_BOOL= HIGH_BIT_DEPTH HI12P_CMAKE_BOOL= MAIN12 HI12P_IMPLIES= HI10P -OPTIMIZED_FLAGS_VARS= CFLAGS+=-O3 CPPFLAGS+=-O3 +OPTIMIZED_FLAGS_VARS= CFLAGS+=-O3 CXXFLAGS+=-O3 DEBUG_DESC= Enable debugging HI10P_DESC= Enable HI10P Support (64-bit only) @@ -39,8 +40,8 @@ USE_LDCONFIG= yes CMAKE_ARGS= -DENABLE_PIC=on -DPLATFORM_LIBS=md -DENABLE_TESTS=on CFLAGS_mips= -DNO_ATOMICS # cannot use lang/gcc CFLAGS_mips64= -DNO_ATOMICS # cannot use lang/gcc -EXTRACT_AFTER_ARGS+= --exclude "md5*" -WRKSRC= ${WRKDIR}/${PORTNAME}_v${PORTVERSION}/source +EXTRACT_AFTER_ARGS+= --exclude "md5*" --exclude compat +WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}/source do-test: ${WRKSRC}/test/TestBench diff --git a/multimedia/x265/distinfo b/multimedia/x265/distinfo index e0359860f7e0..33d68a3a2e1a 100644 --- a/multimedia/x265/distinfo +++ b/multimedia/x265/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516798519 -SHA256 (x265_2.6.tar.gz) = 1bf0036415996af841884802161065b9e6be74f5f6808ac04831363e2549cdbf -SIZE (x265_2.6.tar.gz) = 1271976 +TIMESTAMP = 1531665864 +SHA256 (x265_2.8.tar.gz) = 6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863 +SIZE (x265_2.8.tar.gz) = 1379551 diff --git a/multimedia/x265/files/patch-disable-avx-for-clang b/multimedia/x265/files/patch-disable-avx-for-clang new file mode 100644 index 000000000000..e09495d6a5ea --- /dev/null +++ b/multimedia/x265/files/patch-disable-avx-for-clang @@ -0,0 +1,13 @@ +See: + + https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=229788 + https://bitbucket.org/multicoreware/x265/issues/422/when-using-clang-with-avx-enabled + +--- CMakeLists.txt 2018-05-21 04:33:10.000000000 -0400 ++++ CMakeLists.txt 2018-07-17 12:51:05.820330000 -0400 +@@ -133,4 +133,5 @@ + if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") + set(CLANG 1) ++ add_definitions("-mno-avx") + endif() + if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel") diff --git a/multimedia/x265/files/patch-rdtsc b/multimedia/x265/files/patch-rdtsc deleted file mode 100644 index ea8653b0ccd4..000000000000 --- a/multimedia/x265/files/patch-rdtsc +++ /dev/null @@ -1,9 +0,0 @@ ---- test/testharness.h 2016-12-23 00:57:39.000000000 -0500 -+++ test/testharness.h 2017-01-17 15:46:38.623298000 -0500 -@@ -69,5 +69,5 @@ - #elif HAVE_RDTSC - #include <intrin.h> --#elif defined(__GNUC__) -+#elif defined(__GNUC__) && (!defined(__clang__) || __clang_major__ < 4) - /* fallback for older GCC/MinGW */ - static inline uint32_t __rdtsc(void) diff --git a/multimedia/x265/pkg-plist b/multimedia/x265/pkg-plist index 5b371e8aabd7..08f6668f2240 100644 --- a/multimedia/x265/pkg-plist +++ b/multimedia/x265/pkg-plist @@ -3,5 +3,5 @@ include/x265.h include/x265_config.h lib/libx265.a lib/libx265.so -lib/libx265.so.146 +lib/libx265.so.160 libdata/pkgconfig/x265.pc |