git: 4c1779fcd46f - main - multimedia/msopenh264: Update 1.2.1 -> 1.2.1.20220531
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 14 Jul 2022 07:45:24 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4c1779fcd46f94f40b062f9842cf688f835c2f05
commit 4c1779fcd46f94f40b062f9842cf688f835c2f05
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-07-14 07:43:34 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-07-14 07:45:22 +0000
multimedia/msopenh264: Update 1.2.1 -> 1.2.1.20220531
This fixed build broken by the recent update of net/mediastreamer
---
multimedia/msopenh264/Makefile | 14 ++++++++---
multimedia/msopenh264/distinfo | 6 ++---
multimedia/msopenh264/files/patch-openh264-2.0 | 35 --------------------------
3 files changed, 13 insertions(+), 42 deletions(-)
diff --git a/multimedia/msopenh264/Makefile b/multimedia/msopenh264/Makefile
index cec03f33fefb..780f8099b158 100644
--- a/multimedia/msopenh264/Makefile
+++ b/multimedia/msopenh264/Makefile
@@ -1,8 +1,7 @@
PORTNAME= msopenh264
-PORTVERSION= 1.2.1
-PORTREVISION= 2
+PORTVERSION= 1.2.1.20220531
CATEGORIES= multimedia net
-MASTER_SITES= https://www.linphone.org/releases/sources/plugins/msopenh264/
+#MASTER_SITES= https://www.linphone.org/releases/sources/plugins/msopenh264/
MAINTAINER= ports@FreeBSD.org
COMMENT= Mediastreamer plugin with H.264 codec
@@ -10,12 +9,19 @@ COMMENT= Mediastreamer plugin with H.264 codec
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libmediastreamer_base.so:net/mediastreamer \
+LIB_DEPENDS= libbctoolbox.so:net/bctoolbox \
+ libmediastreamer.so:net/mediastreamer \
libopenh264.so:multimedia/openh264 \
libortp.so:net/ortp
USES= cmake
+USE_GITLAB= yes
+GL_SITE= https://gitlab.linphone.org/BC
+GL_ACCOUNT= public
+GL_COMMIT= c09d2652245f0d660f427c1cf5ae97709b504803
+
+
CMAKE_ARGS= -DENABLE_STATIC=NO
PLIST_FILES= lib/mediastreamer/plugins/libmsopenh264.so
diff --git a/multimedia/msopenh264/distinfo b/multimedia/msopenh264/distinfo
index 293e468388c3..dca57ae4aa1c 100644
--- a/multimedia/msopenh264/distinfo
+++ b/multimedia/msopenh264/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1539620002
-SHA256 (msopenh264-1.2.1.tar.gz) = a8622752fcc8a3cbbcfb3ffa2fe0f8419aceebb8d5dc2bca03a68852bf7abd65
-SIZE (msopenh264-1.2.1.tar.gz) = 29665
+TIMESTAMP = 1657783494
+SHA256 (public-msopenh264-c09d2652245f0d660f427c1cf5ae97709b504803_GL0.tar.gz) = a4ef25d71b28b0e1b53d88d507ce01738fd875f5aef335f4412b9fba0b56bcec
+SIZE (public-msopenh264-c09d2652245f0d660f427c1cf5ae97709b504803_GL0.tar.gz) = 29893
diff --git a/multimedia/msopenh264/files/patch-openh264-2.0 b/multimedia/msopenh264/files/patch-openh264-2.0
deleted file mode 100644
index bcbe40c7c9c1..000000000000
--- a/multimedia/msopenh264/files/patch-openh264-2.0
+++ /dev/null
@@ -1,35 +0,0 @@
-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