View | Details | Raw Unified | Return to bug 235906
Collapse All | Expand All

(-)b/graphics/libbpg/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	libbpg
4
PORTNAME=	libbpg
5
PORTVERSION=	0.9.7
5
PORTVERSION=	0.9.7
6
PORTREVISION=	6
6
PORTREVISION=	7
7
CATEGORIES=	graphics
7
CATEGORIES=	graphics
8
MASTER_SITES=	http://bellard.org/bpg/
8
MASTER_SITES=	http://bellard.org/bpg/
9
9
(-)b/graphics/libheif/Makefile (+1 lines)
Lines 3-8 Link Here
3
PORTNAME=		libheif
3
PORTNAME=		libheif
4
DISTVERSIONPREFIX=	v
4
DISTVERSIONPREFIX=	v
5
DISTVERSION=		1.3.2
5
DISTVERSION=		1.3.2
6
PORTREVISION=		1
6
CATEGORIES=		graphics
7
CATEGORIES=		graphics
7
8
8
MAINTAINER=		me@sebastiansteinmetz.ch
9
MAINTAINER=		me@sebastiansteinmetz.ch
(-)b/multimedia/avidemux-plugins/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	avidemux
4
PORTNAME=	avidemux
5
PORTVERSION=	${AVIDEMUX_VERSION}
5
PORTVERSION=	${AVIDEMUX_VERSION}
6
PORTREVISION=	11
6
PORTREVISION=	12
7
CATEGORIES=	multimedia
7
CATEGORIES=	multimedia
8
PKGNAMESUFFIX=	-plugins
8
PKGNAMESUFFIX=	-plugins
9
9
(-)b/multimedia/ccextractor/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
PORTNAME=	ccextractor
3
PORTNAME=	ccextractor
4
DISTVERSIONPREFIX=	v
4
DISTVERSIONPREFIX=	v
5
DISTVERSION=	0.85
5
DISTVERSION=	0.85
6
PORTREVISION=	10
6
PORTREVISION=	11
7
CATEGORIES=	multimedia
7
CATEGORIES=	multimedia
8
8
9
MAINTAINER=	oz@nixil.net
9
MAINTAINER=	oz@nixil.net
(-)b/multimedia/cinelerra-gg/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
PORTNAME=	cinelerra-gg
3
PORTNAME=	cinelerra-gg
4
DISTVERSION=	5.1-20180714
4
DISTVERSION=	5.1-20180714
5
DISTVERSIONSUFFIX=	-${REV:C/(.......).*/\1/}
5
DISTVERSIONSUFFIX=	-${REV:C/(.......).*/\1/}
6
PORTREVISION=	6
6
PORTREVISION=	7
7
CATEGORIES=	multimedia
7
CATEGORIES=	multimedia
8
MASTER_SITES=	https://git.cinelerra-cv.org/gitweb?p=goodguy/cinelerra.git;a=snapshot;h=${REV};sf=tgz;dummy=/ # tarballs are @ https://cinelerra-cv.org/five/pkgs/src/
8
MASTER_SITES=	https://git.cinelerra-cv.org/gitweb?p=goodguy/cinelerra.git;a=snapshot;h=${REV};sf=tgz;dummy=/ # tarballs are @ https://cinelerra-cv.org/five/pkgs/src/
9
9
(-)b/multimedia/ffmpeg/Makefile (+1 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	ffmpeg
4
PORTNAME=	ffmpeg
5
PORTVERSION=	4.1.1
5
PORTVERSION=	4.1.1
6
PORTREVISION=	1
6
PORTEPOCH=	1
7
PORTEPOCH=	1
7
CATEGORIES=	multimedia audio ipv6 net
8
CATEGORIES=	multimedia audio ipv6 net
8
MASTER_SITES=	https://ffmpeg.org/releases/
9
MASTER_SITES=	https://ffmpeg.org/releases/
(-)b/multimedia/gstreamer1-plugins-x265/Makefile (-1 / +1 lines)
Lines 1-6 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTREVISION=	1
3
PORTREVISION=	2
4
CATEGORIES=	multimedia
4
CATEGORIES=	multimedia
5
5
6
COMMENT=	GStreamer libx265 based H265 plugin
6
COMMENT=	GStreamer libx265 based H265 plugin
(-)b/multimedia/vlc/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	vlc
4
PORTNAME=	vlc
5
DISTVERSION=	3.0.6
5
DISTVERSION=	3.0.6
6
PORTREVISION=	2
6
PORTREVISION=	3
7
PORTEPOCH=	4
7
PORTEPOCH=	4
8
CATEGORIES=	multimedia audio ipv6 net www
8
CATEGORIES=	multimedia audio ipv6 net www
9
MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
9
MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
(-)b/multimedia/x265/Makefile (-6 / +10 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	x265
4
PORTNAME=	x265
5
PORTVERSION=	2.8
5
PORTVERSION=	3.0
6
PORTREVISION=	2
7
CATEGORIES=	multimedia
6
CATEGORIES=	multimedia
8
MASTER_SITES=	https://downloads.videolan.org/pub/videolan/x265/ \
7
MASTER_SITES=	https://downloads.videolan.org/pub/videolan/x265/ \
9
		https://mirror.leaseweb.com/videolan/x265/ \
8
		https://mirror.leaseweb.com/videolan/x265/ \
Lines 12-18 MASTER_SITES= https://downloads.videolan.org/pub/videolan/x265/ \ Link Here
12
DISTNAME=	${PORTNAME}_${PORTVERSION}
11
DISTNAME=	${PORTNAME}_${PORTVERSION}
13
12
14
PATCH_SITES=	http://hg.videolan.org/${PORTNAME}/raw-rev/
13
PATCH_SITES=	http://hg.videolan.org/${PORTNAME}/raw-rev/
15
PATCHFILES=	450421921079:-p2
14
PATCHFILES+=	878541319ea1:-p1 a41325fc854f:-p1 # SVT-HEVC
16
15
17
MAINTAINER=	mi@aldan.algebra.com
16
MAINTAINER=	mi@aldan.algebra.com
18
COMMENT=	H.265/High Efficiency Video Coding (HEVC) format
17
COMMENT=	H.265/High Efficiency Video Coding (HEVC) format
Lines 25-31 BUILD_DEPENDS= nasm:devel/nasm Link Here
25
USES=		cmake compiler:c++14-lang pathfix
24
USES=		cmake compiler:c++14-lang pathfix
26
25
27
OPTIONS_DEFINE=		DEBUG OPTIMIZED_FLAGS
26
OPTIONS_DEFINE=		DEBUG OPTIMIZED_FLAGS
28
OPTIONS_DEFINE_amd64=	HI10P HI12P
27
OPTIONS_DEFINE_amd64=	HI10P HI12P SVTHEVC
29
28
30
DEBUG_PREVENTS=		OPTIMIZED_FLAGS
29
DEBUG_PREVENTS=		OPTIMIZED_FLAGS
31
DEBUG_PREVENTS_MSG=	Optimizations are incompatible with debugging code
30
DEBUG_PREVENTS_MSG=	Optimizations are incompatible with debugging code
Lines 34-51 HI10P_CMAKE_BOOL= HIGH_BIT_DEPTH Link Here
34
HI12P_CMAKE_BOOL=	MAIN12
33
HI12P_CMAKE_BOOL=	MAIN12
35
HI12P_IMPLIES=		HI10P
34
HI12P_IMPLIES=		HI10P
36
OPTIMIZED_FLAGS_VARS=	CFLAGS+=-O3 CXXFLAGS+=-O3
35
OPTIMIZED_FLAGS_VARS=	CFLAGS+=-O3 CXXFLAGS+=-O3
36
SVTHEVC_LIB_DEPENDS=	libSvtHevcEnc.so:multimedia/svt-hevc
37
SVTHEVC_CMAKE_BOOL=	ENABLE_SVT_HEVC
38
SVTHEVC_CMAKE_ON=	-DSVT_HEVC_INCLUDE_DIR:PATH="${LOCALBASE}/include/svt-hevc"
37
39
38
DEBUG_DESC=	Enable debugging
40
DEBUG_DESC=	Enable debugging
39
HI10P_DESC=	Enable HI10P Support (64-bit only)
41
HI10P_DESC=	Enable HI10P Support (64-bit only)
40
HI12P_DESC=	Enable HI12P Support (64-bit only)
42
HI12P_DESC=	Enable HI12P Support (64-bit only)
41
OPTIMIZED_FLAGS_DESC=	Enable O3 optimization
43
OPTIMIZED_FLAGS_DESC=	Enable O3 optimization
44
SVTHEVC_DESC=	HEVC encoding via SVT-HEVC
42
45
43
USE_LDCONFIG=	yes
46
USE_LDCONFIG=	yes
44
CMAKE_ARGS=	-DENABLE_PIC=on -DPLATFORM_LIBS=md -DENABLE_TESTS=on
47
CMAKE_ARGS=	-DENABLE_PIC=on -DENABLE_TESTS=on
45
CFLAGS_mips=	-DNO_ATOMICS # cannot use lang/gcc
48
CFLAGS_mips=	-DNO_ATOMICS # cannot use lang/gcc
46
CFLAGS_mips64=	-DNO_ATOMICS # cannot use lang/gcc
49
CFLAGS_mips64=	-DNO_ATOMICS # cannot use lang/gcc
47
LDFLAGS_i386=	-Wl,-znotext
50
LDFLAGS_i386=	-Wl,-znotext
48
EXTRACT_AFTER_ARGS+=	--exclude "md5*" --exclude compat
51
EXTRACT_AFTER_ARGS+=	--exclude compat
52
PATCH_WRKSRC=	${WRKSRC:H}
49
WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}/source
53
WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}/source
50
54
51
do-test:
55
do-test:
(-)b/multimedia/x265/distinfo (-5 / +7 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1531665864
1
TIMESTAMP = 1548236838
2
SHA256 (x265_2.8.tar.gz) = 6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863
2
SHA256 (x265_3.0.tar.gz) = c5b9fc260cabbc4a81561a448f4ce9cad7218272b4011feabc3a6b751b2f0662
3
SIZE (x265_2.8.tar.gz) = 1379551
3
SIZE (x265_3.0.tar.gz) = 1398519
4
SHA256 (450421921079) = 015d99bbcc60e184293cd86879f54d6f78559c9ff2cda32c5ad54e6113bc7fca
4
SHA256 (878541319ea1) = cb135430143d4d0df4e1d7e5b9d7994f0b6279796f44f7b8b6e5159c00c92768
5
SIZE (450421921079) = 703
5
SIZE (878541319ea1) = 86799
6
SHA256 (a41325fc854f) = 5fb5a2d97cecf9920f5800364534f56584dbf805f1e215de9dbdeca025eb3ec8
7
SIZE (a41325fc854f) = 912
(-)a/multimedia/x265/files/patch-bug-422 (-13 lines)
Removed Link Here
1
See:
2
3
	https://bitbucket.org/multicoreware/x265/issues/422
4
5
--- common/pixel.cpp	2018-05-21 08:33:10 UTC
6
+++ common/pixel.cpp	2018-08-05 21:57:26 UTC
7
@@ -923,5 +923,5 @@
8
 {
9
     for (int i = 0; i < count; i++)
10
-        dst[i] = (uint16_t)(src[i] * 256.0);
11
+        dst[i] = (int16_t)(src[i] * 256.0);
12
 }
13
 
(-)a/multimedia/x265/files/patch-md5 (-33 lines)
Removed Link Here
1
Use FreeBSD's MD5-implementation instead of yet another bundled one.
2
3
	-mi
4
5
--- common/CMakeLists.txt	2016-01-25 00:16:50.000000000 -0500
6
+++ common/CMakeLists.txt	2016-02-02 17:57:52.620700000 -0500
7
@@ -109,5 +109,4 @@
8
     threadpool.cpp threadpool.h
9
     wavefront.h wavefront.cpp
10
-    md5.cpp md5.h
11
     bitstream.h bitstream.cpp
12
     yuv.cpp yuv.h
13
--- common/picyuv.h	2016-01-25 00:16:50.000000000 -0500
14
+++ common/picyuv.h	2016-02-02 21:52:24.690114000 -0500
15
@@ -25,6 +25,8 @@
16
 #define X265_PICYUV_H
17
 
18
+#include <sys/types.h>
19
+#include <md5.h>
20
+
21
 #include "common.h"
22
-#include "md5.h"
23
 #include "x265.h"
24
 
25
--- encoder/frameencoder.cpp	2016-01-25 00:16:50.000000000 -0500
26
+++ encoder/frameencoder.cpp	2016-02-02 18:06:58.918647000 -0500
27
@@ -667,5 +667,5 @@
28
             m_seiReconPictureDigest.m_method = SEIDecodedPictureHash::MD5;
29
             for (int i = 0; i < planes; i++)
30
-                MD5Final(&m_state[i], m_seiReconPictureDigest.m_digest[i]);
31
+                MD5Final(m_seiReconPictureDigest.m_digest[i], &m_state[i]);
32
         }
33
         else if (m_param->decodedPictureHashSEI == 2)
(-)b/multimedia/x265/files/patch-source_CMakeLists.txt (+22 lines)
Added Link Here
1
===> Checking for items in STAGEDIR missing from pkg-plist
2
Error: Orphaned: bin/libSvtHevcEnc.so
3
Error: Orphaned: include/EbApi.h
4
Error: Orphaned: include/EbErrorCodes.h
5
Error: Orphaned: include/EbTime.h
6
7
--- source/CMakeLists.txt.orig	2019-01-23 09:47:18 UTC
8
+++ source/CMakeLists.txt
9
@@ -570,13 +570,6 @@ if(ENABLE_HDR10_PLUS)
10
         ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
11
 endif()
12
 
13
-if(SVTHEVC_FOUND)
14
-    install(FILES "${SVT_HEVC_INCLUDE_DIR}/EbApi.h" DESTINATION include)
15
-    install(FILES "${SVT_HEVC_INCLUDE_DIR}/EbErrorCodes.h" DESTINATION include)
16
-    install(FILES "${SVT_HEVC_INCLUDE_DIR}/EbTime.h" DESTINATION include)
17
-    install(FILES "${SVT_HEVC_LIBRARY}" DESTINATION ${BIN_INSTALL_DIR})
18
-endif()
19
-
20
 install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)
21
 if((WIN32 AND ENABLE_CLI) OR (WIN32 AND ENABLE_SHARED))
22
     if(MSVC_IDE)
(-)b/multimedia/x265/files/patch-source_encoder_api.cpp (+45 lines)
Added Link Here
1
source/encoder/api.cpp:432:17: error: cannot jump from this
2
      goto statement to its label
3
                goto fail;
4
                ^
5
source/encoder/api.cpp:436:36: note: jump bypasses variable
6
      initialization
7
        EB_H265_ENC_CONFIGURATION* svtParam = (EB_H265_ENC_CONFIGURATION*)encoder->m_svtAppData->svtHevcParams;
8
                                   ^
9
source/encoder/api.cpp:413:17: error: cannot jump from this
10
      goto statement to its label
11
                goto fail;
12
                ^
13
source/encoder/api.cpp:436:36: note: jump bypasses variable
14
      initialization
15
        EB_H265_ENC_CONFIGURATION* svtParam = (EB_H265_ENC_CONFIGURATION*)encoder->m_svtAppData->svtHevcParams;
16
                                   ^
17
source/encoder/api.cpp:406:21: error: cannot jump from this
18
      goto statement to its label
19
                    goto fail;
20
                    ^
21
source/encoder/api.cpp:436:36: note: jump bypasses variable
22
      initialization
23
        EB_H265_ENC_CONFIGURATION* svtParam = (EB_H265_ENC_CONFIGURATION*)encoder->m_svtAppData->svtHevcParams;
24
                                   ^
25
3 errors generated.
26
27
--- source/encoder/api.cpp.orig	2019-01-23 09:47:18 UTC
28
+++ source/encoder/api.cpp
29
@@ -355,6 +355,7 @@ int x265_encoder_encode(x265_encoder *enc, x265_nal **
30
     static unsigned char picSendDone = 0;
31
     numEncoded = 0;
32
     static int codedNal = 0, eofReached = 0;
33
+    EB_H265_ENC_CONFIGURATION* svtParam = NULL;
34
 
35
     if (encoder->m_param->bEnableSvtHevc)
36
     {
37
@@ -433,7 +434,7 @@ int x265_encoder_encode(x265_encoder *enc, x265_nal **
38
             }
39
         }
40
 
41
-        EB_H265_ENC_CONFIGURATION* svtParam = (EB_H265_ENC_CONFIGURATION*)encoder->m_svtAppData->svtHevcParams;
42
+        svtParam = (EB_H265_ENC_CONFIGURATION*)encoder->m_svtAppData->svtHevcParams;
43
         if (eofReached && svtParam->codeEosNal == 0 && !codedNal)
44
         {
45
             EB_BUFFERHEADERTYPE *outputStreamPtr = 0;
(-)b/multimedia/x265/pkg-plist (-1 / +1 lines)
Lines 3-7 include/x265.h Link Here
3
include/x265_config.h
3
include/x265_config.h
4
lib/libx265.a
4
lib/libx265.a
5
lib/libx265.so
5
lib/libx265.so
6
lib/libx265.so.160
6
lib/libx265.so.170
7
libdata/pkgconfig/x265.pc
7
libdata/pkgconfig/x265.pc
(-)b/x11/xpra/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	xpra
3
PORTNAME=	xpra
4
PORTVERSION=	2.4.3
4
PORTVERSION=	2.4.3
5
PORTREVISION=	1
5
PORTREVISION=	2
6
CATEGORIES=	x11
6
CATEGORIES=	x11
7
MASTER_SITES=	http://xpra.org/src/
7
MASTER_SITES=	http://xpra.org/src/
8
8

Return to bug 235906