From nobody Thu Jul 14 07:45:24 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Lk63T11cJz4TLs7; Thu, 14 Jul 2022 07:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lk63T0J12z3SlB; Thu, 14 Jul 2022 07:45:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657784725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lUeVRsozRP/icvSBVrMEBdPka67JPSo7j+sWbgAsIR4=; b=tmju7qa1CSxMc+kRgw2epKgIDrME4lTGCjq9P6WnWHzOsEL3+wfp070YU3L9pxges3nPQ9 721XE0nucrL09AbihmdFjqmYbVk2R52RsMzIbqd1N9Iiq+SIbqPpohGkrfnWTQ2h4ypo7X 81COUAMYxfOCoGmILceVc1Cv0gFIMqEC2EtUZazmRLQLjG/xQqiMm41592W1SJn6PZqP98 Sp+cGaV5ukoNwaZEia4tpgAcW1s4d4gm+KCCdS2xumyjtqOlXla7dasP6xkvfvH+djCg+U n1GB+10Y+lAV+QFKjvg7Uk72kfXVLM6nuC6ap8gJeknVxMvFBzl5U2kaXmLEPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lk63S6TRTzvtX; Thu, 14 Jul 2022 07:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26E7jOlk069886; Thu, 14 Jul 2022 07:45:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26E7jOMU069885; Thu, 14 Jul 2022 07:45:24 GMT (envelope-from git) Date: Thu, 14 Jul 2022 07:45:24 GMT Message-Id: <202207140745.26E7jOMU069885@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 4c1779fcd46f - main - multimedia/msopenh264: Update 1.2.1 -> 1.2.1.20220531 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c1779fcd46f94f40b062f9842cf688f835c2f05 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657784725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lUeVRsozRP/icvSBVrMEBdPka67JPSo7j+sWbgAsIR4=; b=O6fHmbNAcL2LKcnVlwhZASPxN028S9kqAejvgPAdYtbBjyV/eo4GDIGj2ObiasvHb5mVtL Qqg/aLhBtP8YHMOTvny2+apU5P2R313nkz+UhGQRS/MTKofeXAQDa6OHskC0UrtGlhRe7v Vwfy7kE71bD7o3zQHzuVN2MCQpyDlwXyshegNoGFdk8Qn9I4AqmbkteHtlM+ANasw0lx23 ag9LIE993RCJlODpSV0dQAyMv9tQmJYS0BJX14j7yU1Nnny2r1mukW9+lTGj9YxIAq4PyC Zha1hje1Q7YPQcyUnX6csCSwRfXQ2lQEbmb+U5mwlRSW+wflIpKAvnjFVRRHBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657784725; a=rsa-sha256; cv=none; b=DMqF781g6aiHm6pegC1lyN0IwKtqru24pJMua35NrRol4dm2OmkAPyaD8Yr944PwdhC8BG odVRIf4flE8fsQf3EvbWi5P4TKzhFfy+0j4tMZPytYkvYQiqYU1EeJhtoRpu5HJyLMJX/j RIAzGM0PZqjzrTjRr3IwqLHotb3MOl81Fhh1EEw6PFh87S6MtZBYk2LBASp92SeBrG7j01 fBMvZfHSHXOnLxQ26z1NCWPKGTJ7mj0tN+I4aPWHboLvl/nR8kfghJ1AdCu8TzHW4X4QXQ mmtp1JSeOZ4+NdeKMyob4iBO8FBNifi1uYeoFdVXGfYQT0FAKPBYmABtSu4cmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c1779fcd46f94f40b062f9842cf688f835c2f05 commit 4c1779fcd46f94f40b062f9842cf688f835c2f05 Author: Yuri Victorovich AuthorDate: 2022-07-14 07:43:34 +0000 Commit: Yuri Victorovich 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