From nobody Thu Apr 27 12:04:27 2023 X-Original-To: dev-commits-ports-all@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 4Q6ZCv5ZnDz474k8; Thu, 27 Apr 2023 12:04:27 +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 4Q6ZCv2gHCz3md3; Thu, 27 Apr 2023 12:04:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597067; 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=vbImsDhryv+/QXX45J+FvR6mC5Vwhm96t8m2YUJDtmo=; b=upKI7o8xTMndjCVbpw0EToV2GZt/QrTpFgHU//SlLZX4ZWDHNAuGUKS9xOwYH+vSc9x25Y xqWas99S1n0+hGaFht8ph8FpKUVHR37b6yBP936XHptfJvodomOSroIrh8zRPcQ4dWnr9J Srd5Sx0oqQBUHdSgylCcHu62da7Fo0NuAtz0UHnC3fJ5MrUu7z3X8598oiHINr98VjuJI9 iYnIQqTRM71un6K7aC/iMr+f4+vyzXNc2rNBKTpky5XAVKnXrPvxkOlXliFOFNNHva9nl+ S/hcoV2uLzHw0PsExb1v3sPR1pXGlAFIghj5N/ln4i17KiLK/kA3fb9Qren+Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597067; 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=vbImsDhryv+/QXX45J+FvR6mC5Vwhm96t8m2YUJDtmo=; b=RiKKa0r0ZndBCqgHjKWKeUdiPQQxrhSSS6WbU5O2kUXhs+NJCszL3vHcqqUVX2WlofGSrL 0SONzl/msMwm9QoEgn2BOCygPQgdXTrIbIUC8guz8/Cu2/xcvoyJie00GWh+OMV2rQAsxt 7fmQMg7UovUBBXv9dtMXEQe0CkdqoinyOwGg9C3Dio221zmfrtAKzInAyAWZUBf+euaegM YeiLsx5sLkKP7OUu3iXGbzdLRke+wy7fVTdJvkc4Zd2Qic6g0UKJB+RHPPm0apZDDu91i9 RtTZctEcmn0do1fzU7ELQtd+IKeh40EsAgumYH12uk32xwMKkH3yCs9z+kQOgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597067; a=rsa-sha256; cv=none; b=cX/CmU9Ww8MGzYSRxfSYGVvXSCvJKPyh4KDafXWeRsz9Z7P5DrDx147WhYoeNac/h+Z836 ECJdPDfn5l2UfE1iMD3nSvtm4qRNEVIwaRVNHpekFW1wDA9vzTQIpoUDbde0fzDzvKSK/l ZoFk02vqqQa7kejvhSzME71w1enIWm9J7i4somIDeUx6pYekEQqhp9+Y3ol5UwX7Rzb2ZI RjHIzCp96K5JZ0+f9+FcgrWgm9NRPuF2Kj2B+jxy6NI80N3LxuQqHBe1pTJw3TWjfLcbrS A17uE5vXSlbd9K9jua0gpfI+2KdVuoq9JgyOYNVL4IkDPAvLuvDkNkXlQR+/hQ== 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 4Q6ZCv1mfczG68; Thu, 27 Apr 2023 12:04:27 +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 33RC4RHl046678; Thu, 27 Apr 2023 12:04:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC4R9d046677; Thu, 27 Apr 2023 12:04:27 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:04:27 GMT Message-Id: <202304271204.33RC4R9d046677@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: a9e519613f78 - main - multimedia/obs-studio: Adjust patches and fix build with FFmpeg 6 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9e519613f787c1e90ca5141901cc772ffc461d2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a9e519613f787c1e90ca5141901cc772ffc461d2 commit a9e519613f787c1e90ca5141901cc772ffc461d2 Author: Daniel Engberg AuthorDate: 2023-04-27 11:11:09 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:45 +0000 multimedia/obs-studio: Adjust patches and fix build with FFmpeg 6 Adjust patches to use merged commits with upstream and 2e79d4c902abf3e6bb4ad1b5bf779c0cc22a6fd0 to fix build with FFmpeg 6 References: https://github.com/obsproject/obs-studio/commit/2e79d4c902abf3e6bb4ad1b5bf779c0cc22a6fd0 PR: 270968 Reviewed by: yuri (maintainer) --- multimedia/obs-studio/Makefile | 5 +++-- multimedia/obs-studio/distinfo | 12 +++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile index 1047d81b2dc3..23efdae16a24 100644 --- a/multimedia/obs-studio/Makefile +++ b/multimedia/obs-studio/Makefile @@ -4,8 +4,9 @@ PORTREVISION= 1 CATEGORIES= multimedia PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 2cebc65ad7f8.patch:-p1 # https://github.com/obsproject/obs-studio/pull/7992 -PATCHFILES+= 90c476983ce9.patch:-p1 # https://github.com/obsproject/obs-studio/pull/7992 +PATCHFILES= e98c9fbd65aa4e3d91da081b6020962c7b3e68ee.patch:-p1 \ + 0a257a71e83225d1e6b503a5cc2dc0eea99c1e13.patch:-p1 \ + 2e79d4c902abf3e6bb4ad1b5bf779c0cc22a6fd0.patch:-p1 MAINTAINER= yuri@FreeBSD.org COMMENT= Open source streaming/recording software diff --git a/multimedia/obs-studio/distinfo b/multimedia/obs-studio/distinfo index 921130a1b331..e9937c9bcc33 100644 --- a/multimedia/obs-studio/distinfo +++ b/multimedia/obs-studio/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1675623671 +TIMESTAMP = 1682027140 SHA256 (obsproject-obs-studio-29.0.2_GH0.tar.gz) = 0e6260800b80c3fc9f67c4c3fb12ffae740ab1dd188e526a55e0fc8949168db2 SIZE (obsproject-obs-studio-29.0.2_GH0.tar.gz) = 18939072 SHA256 (obsproject-obs-amd-encoder-d5a136c6834c39293ad749cf8f07bdaa772fe44b_GH0.tar.gz) = 6cfae1f4d378124d9621bde29d9ff5d49134dabcd1f17aad048f77e103ddee14 @@ -27,7 +27,9 @@ SHA256 (curl-curl-44b9b4d4f56d6f6de92c89636994c03984e9cd01_GH0.tar.gz) = e3b9aa0 SIZE (curl-curl-44b9b4d4f56d6f6de92c89636994c03984e9cd01_GH0.tar.gz) = 2705576 SHA256 (akheron-jansson-bc5741fb1ac730ead24e9bd08977fc6c248e04b0_GH0.tar.gz) = a285ed51c597b23d1f25de3bc5c9c128d55c6aa17af68e0680efa028f8b0437c SIZE (akheron-jansson-bc5741fb1ac730ead24e9bd08977fc6c248e04b0_GH0.tar.gz) = 127897 -SHA256 (2cebc65ad7f8.patch) = bdad9893f25e9503514e1c4eea5f82024d9f85ce3b9594f8e6d202934205ccb0 -SIZE (2cebc65ad7f8.patch) = 765 -SHA256 (90c476983ce9.patch) = 7d3efcc7d9f7014c4e04ce3d2635e7ab2fce565f3bf3557846f7a5ca34e7bbcd -SIZE (90c476983ce9.patch) = 684 +SHA256 (e98c9fbd65aa4e3d91da081b6020962c7b3e68ee.patch) = b38290f7d9e4dfeab810fd4b2f06dad052bbba8d06cb8fd19c1e136d197fad97 +SIZE (e98c9fbd65aa4e3d91da081b6020962c7b3e68ee.patch) = 757 +SHA256 (0a257a71e83225d1e6b503a5cc2dc0eea99c1e13.patch) = 7866207ee48dd12af6e27d61a165c990d79b79e176c9c7514df48a1485c432e9 +SIZE (0a257a71e83225d1e6b503a5cc2dc0eea99c1e13.patch) = 684 +SHA256 (2e79d4c902abf3e6bb4ad1b5bf779c0cc22a6fd0.patch) = 96ea913149377b324d132aa56964a72e5263e06a8b8d2103c1708b04752f3b9d +SIZE (2e79d4c902abf3e6bb4ad1b5bf779c0cc22a6fd0.patch) = 3475