Date: Thu, 27 Apr 2023 12:04:27 GMT From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a9e519613f78 - main - multimedia/obs-studio: Adjust patches and fix build with FFmpeg 6 Message-ID: <202304271204.33RC4R9d046677@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a9e519613f787c1e90ca5141901cc772ffc461d2 commit a9e519613f787c1e90ca5141901cc772ffc461d2 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2023-04-27 11:11:09 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304271204.33RC4R9d046677>