aboutsummaryrefslogtreecommitdiff
path: root/multimedia/msopenh264
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2019-06-17 07:56:06 +0000
committerJan Beich <jbeich@FreeBSD.org>2019-06-17 07:56:06 +0000
commitedc42f3c38101cea58c0f69ccf772c5103697878 (patch)
treef9db005d417d9a1e01cff49987eb731bc4211fb6 /multimedia/msopenh264
parentacad0de691a68b4b56a61bb2809ccbaa1405a18a (diff)
downloadports-edc42f3c38101cea58c0f69ccf772c5103697878.tar.gz
ports-edc42f3c38101cea58c0f69ccf772c5103697878.zip
multimedia/openh264: update to 2.0.0
- Add symlinks for cliqz and thunderbird Changes: https://github.com/cisco/openh264/releases/tag/v2.0.0 ABI: https://abi-laboratory.pro/tracker/timeline/openh264/ Reported by: GitHub (watch releases)
Notes
Notes: svn path=/head/; revision=504400
Diffstat (limited to 'multimedia/msopenh264')
-rw-r--r--multimedia/msopenh264/Makefile1
-rw-r--r--multimedia/msopenh264/files/patch-openh264-2.035
2 files changed, 36 insertions, 0 deletions
diff --git a/multimedia/msopenh264/Makefile b/multimedia/msopenh264/Makefile
index d7b8d90aed93..9c16d2c53eb0 100644
--- a/multimedia/msopenh264/Makefile
+++ b/multimedia/msopenh264/Makefile
@@ -2,6 +2,7 @@
PORTNAME= msopenh264
PORTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= multimedia net
MASTER_SITES= https://www.linphone.org/releases/sources/plugins/msopenh264/
diff --git a/multimedia/msopenh264/files/patch-openh264-2.0 b/multimedia/msopenh264/files/patch-openh264-2.0
new file mode 100644
index 000000000000..bcbe40c7c9c1
--- /dev/null
+++ b/multimedia/msopenh264/files/patch-openh264-2.0
@@ -0,0 +1,35 @@
+src/msopenh264dec.cpp:67:11: error: no member named 'eOutputColorFormat' in 'TagSVCDecodingParam'
+ params.eOutputColorFormat = videoFormatI420;
+ ~~~~~~ ^
+src/msopenh264enc.cpp:134:29: error: no member named 'sSliceCfg' in 'SSpatialLayerConfig'
+ params.sSpatialLayers[0].sSliceCfg.uiSliceMode = SM_DYN_SLICE;
+ ~~~~~~~~~~~~~~~~~~~~~~~~ ^
+src/msopenh264enc.cpp:134:53: error: use of undeclared identifier 'SM_DYN_SLICE'
+ params.sSpatialLayers[0].sSliceCfg.uiSliceMode = SM_DYN_SLICE;
+ ^
+src/msopenh264enc.cpp:135:29: error: no member named 'sSliceCfg' in 'SSpatialLayerConfig'
+ params.sSpatialLayers[0].sSliceCfg.sSliceArgument.uiSliceSizeConstraint = ms_factory_get_payload_max_size(mFilter->factory);
+ ~~~~~~~~~~~~~~~~~~~~~~~~ ^
+
+--- src/msopenh264dec.cpp.orig 2016-10-19 15:32:52 UTC
++++ src/msopenh264dec.cpp
+@@ -62,7 +62,7 @@ void MSOpenH264Decoder::initialize()
+ mUnpacker=rfc3984_new();
+ if (mDecoder != 0) {
+ SDecodingParam params = { 0 };
+-#if (OPENH264_MAJOR == 1) && (OPENH264_MINOR >=6)
++#if (OPENH264_MAJOR > 1) || ((OPENH264_MAJOR == 1) && (OPENH264_MINOR >=6))
+ #else
+ params.eOutputColorFormat = videoFormatI420;
+ #endif
+--- src/msopenh264enc.cpp.orig 2017-07-20 13:56:32 UTC
++++ src/msopenh264enc.cpp
+@@ -127,7 +127,7 @@ void MSOpenH264Encoder::initialize()
+ params.sSpatialLayers[0].iSpatialBitrate = targetBitrate;
+ params.sSpatialLayers[0].iMaxSpatialBitrate = maxBitrate;
+
+-#if (OPENH264_MAJOR == 1) && (OPENH264_MINOR >=6)
++#if (OPENH264_MAJOR > 1) || ((OPENH264_MAJOR == 1) && (OPENH264_MINOR >=6))
+ params.sSpatialLayers[0].sSliceArgument.uiSliceMode = SM_SIZELIMITED_SLICE;
+ params.sSpatialLayers[0].sSliceArgument.uiSliceSizeConstraint = ms_factory_get_payload_max_size(mFilter->factory);
+ #else