From nobody Thu Mar 27 09:18:07 2025 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 4ZNdNw5p71z5s3cL; Thu, 27 Mar 2025 09:18:08 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZNdNv70T9z450y; Thu, 27 Mar 2025 09:18:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743067088; 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=VxaSutpCBBl/RQPSj9ZVd0Pcga62G1idNxe1zQyitjA=; b=eW809VqQyn/mTcRHUfVRHyO16RRiaMKSRJRg98pDIN/bkcjgC9ENXnRjRiEIXrReleymI2 bvGHuqYOt7+mTMLNO8nAoB+WDVmWcXJT/bnkVSeindEjUhHCbd//FUA/fKgl1oTo2f1ZAF +pwNhPjwSmHRSAuPnkS/Omy0YbR85Nk1AyTf040/lIFa/YfQaF903cAbNAR9vUmYUFrd7B B0b7K/vbyHuWETD/HJckW+XRiiDnBO/nlvXAeDEIUJAmk5nH7F0VtwCXjfygPZAnzcbh5i XVcgmbqqar04Vz8K9M73rRmjRNOkkzolRqDj4FgbJAEzde302fz4+GZ3lvqOVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743067088; a=rsa-sha256; cv=none; b=oeuCrn3G98Gk+cHC9HgYvnxm5dxxyoFYrjrYJgmBGdYbdykx+S0QnA1siZcmo2J/p4/BMO iJbrQiPwL0/Lz7bC1GSV3HO4bZNJH0V6UFobmYNTclWY0qy/gCpq9eBOm1r0E3T8+CTKAZ bkvvpHgXFEkrF2Z5srfibQd5/wjtSXz4lAXp+KnG/WbhfLs2fakPyMMs29Dh3iZPyHwtCV aNQY8fY/GZpbCcSudDYi+DQqSjROt1FuqxzNassWLTjL1Ow/c23CD17dmtjC8dBrktAae3 KS3kNGrhkH6RPOZPmlPiXMK0qg6H1rPLn5UcOxQ/JoFdZxW2VHNX5dMEf2EMow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743067088; 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=VxaSutpCBBl/RQPSj9ZVd0Pcga62G1idNxe1zQyitjA=; b=Js4sV9pvK+1vlIaIrxV9EM5beCqu0DBiIw0H2JtNei/liwbj6VIy1Ev245FHHK4pRzSNuL I/KVo65U6/SBoqdr6Hn74txPjQDOWbPtnDxoHjcxO4eXWzoVI9tOchRAn7YwFuaXI2bZWd RMBkvV5dv38aHQPQdA4gmMijG4D9ulyyN6zDrygNbV2s8v0DSMn4fhM1OcnSxtbZgfyO6r RQPao/gbO1fORuIYSNVqrda4z2f1C2vjBhpNRn+wh0kSOpQElqdgPB5SQitbdXgBr5LyyO Npb6ZmuGj3psS6ZWBZPjcC8IfJinXWopaOg6NWm+wDS72mfLoztTPEvkfjf7Qw== 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 4ZNdNv6Sdqzr3N; Thu, 27 Mar 2025 09:18:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52R9I72g020933; Thu, 27 Mar 2025 09:18:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52R9I7CX020930; Thu, 27 Mar 2025 09:18:07 GMT (envelope-from git) Date: Thu, 27 Mar 2025 09:18:07 GMT Message-Id: <202503270918.52R9I7CX020930@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 29b780a2208e - main - multimedia/msopenh264: Fix build with new mediastreamer 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29b780a2208eda20d49bdcabed89f0c45f35e3c1 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=29b780a2208eda20d49bdcabed89f0c45f35e3c1 commit 29b780a2208eda20d49bdcabed89f0c45f35e3c1 Author: Muhammad Moinur Rahman AuthorDate: 2025-03-27 01:03:34 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2025-03-27 09:17:08 +0000 multimedia/msopenh264: Fix build with new mediastreamer Sponsored by: Cybermancer Infosec --- multimedia/msopenh264/Makefile | 26 ++++++++++++++++------ multimedia/msopenh264/distinfo | 4 +++- multimedia/msopenh264/files/patch-CMakeLists.txt | 15 +++++++++++++ .../msopenh264/files/patch-src_CMakeLists.txt | 13 +++++++++++ 4 files changed, 50 insertions(+), 8 deletions(-) diff --git a/multimedia/msopenh264/Makefile b/multimedia/msopenh264/Makefile index b34868916d38..cc36fee43a25 100644 --- a/multimedia/msopenh264/Makefile +++ b/multimedia/msopenh264/Makefile @@ -1,8 +1,11 @@ PORTNAME= msopenh264 DISTVERSION= 5.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia net +PATCH_SITES= https://gitlab.linphone.org/BC/public/msopenh264/-/commit/ +PATCHFILES= a7c4a130a1fd0a2d1f18df748d370430cfbe936a.diff:-p1 + MAINTAINER= bofh@FreeBSD.org COMMENT= Mediastreamer plugin with H.264 codec WWW= https://www.linphone.org/technical-corner/mediastreamer2.html @@ -10,17 +13,26 @@ WWW= https://www.linphone.org/technical-corner/mediastreamer2.html LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libbctoolbox.so:net/bctoolbox \ - libmediastreamer.so:net/mediastreamer \ - libopenh264.so:multimedia/openh264 \ - libortp.so:net/ortp +BUILD_DEPENDS= ${LOCALBASE}/lib/libbctoolbox.a:net/bctoolbox \ + ${LOCALBASE}/lib/libbcunit.a:devel/bcunit \ + ${LOCALBASE}/lib/libbcmatroska2.a:multimedia/bcmatroska2 \ + ${LOCALBASE}/lib/libbzrtp.a:security/bzrtp \ + ${LOCALBASE}/lib/libmediastreamer2.a:net/mediastreamer \ + ${LOCALBASE}/lib/libortp.a:net/ortp \ + v4l_compat>=1.0.20120501:multimedia/v4l_compat +LIB_DEPENDS= libopenh264.so:multimedia/openh264 -USES= cmake +USES= cmake gl USE_GITLAB= yes GL_SITE= https://gitlab.linphone.org/BC GL_ACCOUNT= public +USE_GL= opengl -CMAKE_ARGS= -DENABLE_STATIC=NO +CMAKE_ARGS= -DENABLE_STATIC=NO \ + -DMEDIASTREAMER2_PLUGINS_LOCATION=${CMAKE_INSTALL_PREFIX}/lib/mediastreamer/plugins PLIST_FILES= lib/mediastreamer/plugins/libmsopenh264.so +post-patch: + ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/CMakeLists.txt + .include diff --git a/multimedia/msopenh264/distinfo b/multimedia/msopenh264/distinfo index 23ac2c3c7b2e..57a5d36ee17f 100644 --- a/multimedia/msopenh264/distinfo +++ b/multimedia/msopenh264/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1690572921 +TIMESTAMP = 1743037209 SHA256 (msopenh264-5.2.0.tar.bz2) = 225057b1a935bd5f4c1a3f8b57981461c99969d73e70c5e91bc9dfac4c01a236 SIZE (msopenh264-5.2.0.tar.bz2) = 28215 +SHA256 (a7c4a130a1fd0a2d1f18df748d370430cfbe936a.diff) = 24a0511e55383ad308e4fd2a09475bf09ed152b9caca2b431683c567cc94a4a9 +SIZE (a7c4a130a1fd0a2d1f18df748d370430cfbe936a.diff) = 22703 diff --git a/multimedia/msopenh264/files/patch-CMakeLists.txt b/multimedia/msopenh264/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..7cc132fd343c --- /dev/null +++ b/multimedia/msopenh264/files/patch-CMakeLists.txt @@ -0,0 +1,15 @@ +--- CMakeLists.txt.orig 2022-10-13 08:55:06 UTC ++++ CMakeLists.txt +@@ -50,9 +50,10 @@ check_include_file_cxx("stdbool.h" HAVE_STDBOOL_H) + include(CheckIncludeFileCXX) + check_include_file_cxx("stdbool.h" HAVE_STDBOOL_H) + ++set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") + find_package(Mediastreamer2 CONFIG REQUIRED) +-find_package(ortp CONFIG REQUIRED) +-find_package(bctoolbox CONFIG REQUIRED) ++find_package(Ortp CONFIG REQUIRED) ++find_package(BCToolbox CONFIG REQUIRED) + + find_package(OpenH264 REQUIRED) + diff --git a/multimedia/msopenh264/files/patch-src_CMakeLists.txt b/multimedia/msopenh264/files/patch-src_CMakeLists.txt new file mode 100644 index 000000000000..48db54e4e9cb --- /dev/null +++ b/multimedia/msopenh264/files/patch-src_CMakeLists.txt @@ -0,0 +1,13 @@ +--- src/CMakeLists.txt.orig 2025-03-27 00:48:29 UTC ++++ src/CMakeLists.txt +@@ -83,10 +83,7 @@ if(ENABLE_SHARED) + + endif() + install(TARGETS msopenh264 +- RUNTIME DESTINATION "${MS2_PLUGINS_DIR}" + LIBRARY DESTINATION "${MS2_PLUGINS_DIR}" +- ARCHIVE DESTINATION "${MS2_PLUGINS_DIR}" +- FRAMEWORK DESTINATION Frameworks + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + ) + endif()