diff options
Diffstat (limited to 'media-video/obs-studio')
| -rw-r--r-- | media-video/obs-studio/Manifest | 3 | ||||
| -rw-r--r-- | media-video/obs-studio/files/obs-studio-31.0.0-libx11-link.patch | 28 | ||||
| -rw-r--r-- | media-video/obs-studio/obs-studio-31.0.0-r2.ebuild (renamed from media-video/obs-studio/obs-studio-31.0.0-r1.ebuild) | 4 |
3 files changed, 32 insertions, 3 deletions
diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest index 4e8726cf7f63..a446c691beb3 100644 --- a/media-video/obs-studio/Manifest +++ b/media-video/obs-studio/Manifest @@ -1,4 +1,5 @@ AUX json11-1.0.0-include-cstdint.patch 258 BLAKE2B 2b7cb5abcbaaaf7c44f1b483716cd68e7a68a5d92f0107847aeb514b93c2b34da1311bd9465ba2077ef568cb7d1a7c150fc89e9adb981a9b59fd7821cefb159d SHA512 c7df20caa578d12a707b74fde88f856dbbf5e75176d7b9aca13f7fe9b501f4ca844fee5a4f2250b3c9de4afd1cd9ed1c26717a06ea4b1d239415cc154152305f +AUX obs-studio-31.0.0-libx11-link.patch 827 BLAKE2B b0572ea25d4d54bf6ed0fe6bafb1fc80611e8868439829c044bc7bcf08c6d292035c2e2b89ab467687275ce5cf82c4787a55da47110458af0b6637bf1c7cc4f7 SHA512 ade4e7927066635c32813c6a5e24808ccfea0494490b7df009a14caa0e9f212de67ff9330d3191838540488725999b087b7299b6ddd17e64afc31c09cd65f2b3 DIST cef_binary_5060_linux_x86_64_v3.tar.xz 91352460 BLAKE2B 443f4b1bc638d3fe462fd8b8dd167e96f65aebb2b8de3616beac298449e2786c746f9a1fa4a0dbe2e3ef2d593139938e97538890d3ca3b74018b3afb9c7fc661 SHA512 1fbdf1d4ed117f3b8af20476c57502145d652b451ba8e0a544081403d292cc7a78642e9071b8f0283a19ef7ad507ef6e0d9df32b00afc51605ab74f650a7d755 DIST cef_binary_6533_linux_x86_64.tar.xz 325687240 BLAKE2B 5d34cac26cd35ebb1ce5c4f978cbc16766ad51696c800c1d2c999d50e9340420c580094e57dc9d06f0aa063708c0aef45cee2cdcaad5ba999c7b5c722423de90 SHA512 2539e3cd59b70511f438921348472298ad6cd55c20516b19fc6f200c44ab157b067ef557e2e8ba790635b7351ea553fed044abf979fc6bdf0220b210d95b883b DIST obs-browser-a76b4d8810a0a33e91ac5b76a0b1af2f22bf8efd.tar.gz 113664 BLAKE2B 1079a11ac5865aee18c1e1768df31db56306ecbce9aa03b1869bbfc37934c13b24f9555e574fcb31f4f0c7d7a9841ea2dacf7b8ac614294c834ebce2026eb305 SHA512 70b428b5ab7e7d9e8c1402656530dbea590d122e098e4e1b3ca293061b3b5ee1f91d969f2c0bfc3efa581d539670e94a68c2ac80afce02b5ea0581fedc0fd243 @@ -8,6 +9,6 @@ DIST obs-studio-31.0.0.tar.gz 16012774 BLAKE2B 1cc70a755845700c7a59d096ff3ee5e5a DIST obs-websocket-0548c7798a323fe5296c150e13b898a5ee62fc1e.tar.gz 250611 BLAKE2B fefeab4a637528138152d6e1bd374d6e3f08e4a4e20698665adf4dd925e7831df5bdb1068e402def71b6e12e239db823dac2944e6549c00e914abca175d16fc0 SHA512 f24f520c4a08ad2b80d97c5dfba14421fcd48661d3b0fb694af5d11e063c711e7bf49a4baa95d9de8aff07b6fbbd4b4681ce10a4074506d98cf25c793cc2844d DIST obs-websocket-eed8a49933786383d11f4868a4e5604a9ee303c6.tar.gz 250566 BLAKE2B 138041a2bdd5d7eb6b5c2636c17fe6ae8a30986ec55548556ce4a1762b2bcc3fee6e039840220d9d60d3314527647334bf7a408dc63e0ab3f0cc45f0e0e65a47 SHA512 21ff4a58465bcb8917f2e213b430dbcbfd56a1647e80c351f18479d7dd3ff2b4c64292132ca26b40054f2b994db9dd8d0a2cb97f32498cb5d59f2812272a6ec5 EBUILD obs-studio-30.2.3.ebuild 6866 BLAKE2B 837ac56245cfc7a1f627a930b1bbbf4278357600b1ddd7f810948f4110fd45c060f173cafd156d022b5a9a2990a7660074a14118f3dce052fec6fee5802b7801 SHA512 dd621ec4cf061d89f47a78e911d6bdc6527b6f932cda248f4a36239eb2297314eeb2c63e00856a602508fd61ffe7fb1b552b8a3bc98e45e583b5aaa6baa1a5d8 -EBUILD obs-studio-31.0.0-r1.ebuild 6801 BLAKE2B 15454727e99c21540103764bbb2581a196dad617915b19ec08cb1c4b86fa92b70d4d540c4d50ee8bea93ba01df54e99d9160e00452b8d7c5dce6952702cc9b1d SHA512 6526ffb83d6ec9ceaf4bc8f4c56cb660be64da09d0c85d329ff5e37adce4449cbdb940d6cd932c74def661fbd7486eed5f6ba51113bd4fa911b4f9ba79f160fe +EBUILD obs-studio-31.0.0-r2.ebuild 6849 BLAKE2B 8fb76d14fe40b6ed60c67a9c155935a55eb5ff8f2e838ff2b4931fb5b1e9af1e9114bd608ff71fe2f9ffac5d15d778e916e3e7dd6bd5ef3b38d3eb92cfa64762 SHA512 61f7aa5a132bbd7864aa514692a25192d7d2fcce6edfc6424e429784f4bec1ee3a351ffb7ffee2fd3fbb4ed390b16fd697e732216cb323e62a07ec7ecaabfb9f EBUILD obs-studio-9999.ebuild 6801 BLAKE2B 15454727e99c21540103764bbb2581a196dad617915b19ec08cb1c4b86fa92b70d4d540c4d50ee8bea93ba01df54e99d9160e00452b8d7c5dce6952702cc9b1d SHA512 6526ffb83d6ec9ceaf4bc8f4c56cb660be64da09d0c85d329ff5e37adce4449cbdb940d6cd932c74def661fbd7486eed5f6ba51113bd4fa911b4f9ba79f160fe MISC metadata.xml 1533 BLAKE2B 7bc778d152d6854330f821d0712da81b54397a35118baf4ba61b3ce4eb7aff5a292d4e4c74c01992761c3cae15b367dcf85450080e920d35ffeb2ee06c74483b SHA512 3dbc5096e3203ec8350e75db78519a061270d52d441e159ab297147a729bda21016a26e15b5c0447dc4a835da59ee822da99265e4f8c3bea3a1e173b134c739c diff --git a/media-video/obs-studio/files/obs-studio-31.0.0-libx11-link.patch b/media-video/obs-studio/files/obs-studio-31.0.0-libx11-link.patch new file mode 100644 index 000000000000..40aa5c2130d3 --- /dev/null +++ b/media-video/obs-studio/files/obs-studio-31.0.0-libx11-link.patch @@ -0,0 +1,28 @@ +- https://bugs.gentoo.org/946057 +- https://github.com/obsproject/obs-studio/issues/11667 + +From 428142d7022989af61a684a680e2d6ecc5b7ca8a Mon Sep 17 00:00:00 2001 +From: Kurt Kartaltepe <kkartaltepe@gmail.com> +Date: Tue, 24 Dec 2024 10:22:40 -0800 +Subject: [PATCH] libobs: Fix underlinking by adding libx11 + +We directly depend on libx11 for various operations in obs-nix-x11.c, +not just xcb. So be sure to link it in too. + +fixes #11667 +--- + libobs/cmake/os-linux.cmake | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libobs/cmake/os-linux.cmake b/libobs/cmake/os-linux.cmake +index 317e75cab0c1dd..1af874f4f1fefe 100644 +--- a/libobs/cmake/os-linux.cmake ++++ b/libobs/cmake/os-linux.cmake +@@ -47,6 +47,7 @@ endif() + target_link_libraries( + libobs + PRIVATE ++ X11::X11 + X11::x11-xcb + xcb::xcb + LibUUID::LibUUID diff --git a/media-video/obs-studio/obs-studio-31.0.0-r1.ebuild b/media-video/obs-studio/obs-studio-31.0.0-r2.ebuild index a7536b82f747..79bc62763bf4 100644 --- a/media-video/obs-studio/obs-studio-31.0.0-r1.ebuild +++ b/media-video/obs-studio/obs-studio-31.0.0-r2.ebuild @@ -145,6 +145,8 @@ RDEPEND="${DEPEND} qsv? ( media-libs/intel-mediasdk ) " +PATCHES=( "${FILESDIR}"/${PN}-31.0.0-libx11-link.patch ) + QA_PREBUILT=" usr/lib*/obs-plugins/chrome-sandbox usr/lib*/obs-plugins/libcef.so @@ -176,8 +178,6 @@ src_unpack() { } src_prepare() { - default - # -Werror=lto-type-mismatch # https://bugs.gentoo.org/867250 # https://github.com/obsproject/obs-studio/issues/8988 |