summaryrefslogtreecommitdiff
path: root/media-video
diff options
context:
space:
mode:
Diffstat (limited to 'media-video')
-rw-r--r--media-video/Manifest.gzbin23195 -> 23216 bytes
-rw-r--r--media-video/obs-studio/Manifest3
-rw-r--r--media-video/obs-studio/files/obs-studio-31.0.0-libx11-link.patch28
-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
-rw-r--r--media-video/qmplay2/Manifest4
-rw-r--r--media-video/qmplay2/qmplay2-24.12.28.ebuild27
-rw-r--r--media-video/qmplay2/qmplay2-9999.ebuild29
7 files changed, 49 insertions, 46 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index fd7231f82d26..bebcae8c3dae 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
Binary files differ
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
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index 247d243bab69..58bd79126382 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -5,6 +5,6 @@ DIST QMPlay2-src-24.12.28.tar.xz 2070576 BLAKE2B ce7197617b61807f86707cf1ae91981
EBUILD qmplay2-24.06.16.ebuild 3377 BLAKE2B 0a1decfcdf7c00665f4886f5b027649d071341a373b186328b094eba94411a40cabb60ed6a7027636a619486305b1c74a53fcae426a4944a690bcf2a34cc47dd SHA512 cf9a7cc2bc5d1aa92e12d31954ffec60dd70d5c76eb0bfadc8edd83149f90b437f9f5f863b616608239e5302fdb7032bea50b4f4c6d05ccdec9fca2f0d534e29
EBUILD qmplay2-24.12.06.ebuild 3378 BLAKE2B 6cc5773edb049423e62502ea823991428a07d737d46a90f1a470ab3214cf7d82212f3706eef61a9981c0c8fa9405b7fcf95101f44cd4019d9c285da38da855f6 SHA512 c6d941954a4887457264c06fec0721b4ae152731bc344923fc77443b35bc38b71c8dc0e5852e7031ad5894359b880762abec56c5c1ebeea4e0bc683827c95c5a
EBUILD qmplay2-24.12.23-r1.ebuild 3380 BLAKE2B 9134114136cc761234c9c9cd23edca9ec9b5efaa73a3746113956b85288c5b692ba34786d01ec8562b9aeb33b8bacb87c337794a004d4a2395f17ec55bc4678b SHA512 f1d1fcfcec96d737fe5cda773b994252164d7d44508ed82b0cf2d4f6870874e830dc6cd664326b5653a7a9c43786c9fde05e35abd643d3590ad9c6c17fdaeb74
-EBUILD qmplay2-24.12.28.ebuild 3380 BLAKE2B 9134114136cc761234c9c9cd23edca9ec9b5efaa73a3746113956b85288c5b692ba34786d01ec8562b9aeb33b8bacb87c337794a004d4a2395f17ec55bc4678b SHA512 f1d1fcfcec96d737fe5cda773b994252164d7d44508ed82b0cf2d4f6870874e830dc6cd664326b5653a7a9c43786c9fde05e35abd643d3590ad9c6c17fdaeb74
-EBUILD qmplay2-9999.ebuild 3380 BLAKE2B becc2bd8deb3e9728a2c4a0acd9d16972d47276680708d857649685e3fdca7fccf943ba0234b7cd6e70b2ea1dc31d0039a3e578baa1751c743e2bb47eb85a232 SHA512 1acbc2b08fac39251fbf960507574d328aaad097559d76d51a60ff0e693a32e996ea18339811b3753fd1bd4811d365f5ae96c006e06c3c1efc6f1b446a35b4d6
+EBUILD qmplay2-24.12.28.ebuild 3085 BLAKE2B fdd456b35279670bf6dfdbdf634eeefc29be372d6c9c2d2953da2f1de137b8b2008604cae0c7a56794d15bb22cd9722ee67fa4cb1710888283d1a1f682a49d87 SHA512 65d1c0bc289414278d0294397e02200547874316b867430f1381345b3d1eb3a2eff96453281afe721d862e9a33a9b5e2076a591fd88bb665f52c3d3b46f39025
+EBUILD qmplay2-9999.ebuild 3085 BLAKE2B fdd456b35279670bf6dfdbdf634eeefc29be372d6c9c2d2953da2f1de137b8b2008604cae0c7a56794d15bb22cd9722ee67fa4cb1710888283d1a1f682a49d87 SHA512 65d1c0bc289414278d0294397e02200547874316b867430f1381345b3d1eb3a2eff96453281afe721d862e9a33a9b5e2076a591fd88bb665f52c3d3b46f39025
MISC metadata.xml 1225 BLAKE2B 9fc74ea3d0319bc8822e0ff56968efcbe4ab40b758bfeca900883ed4dbbe80608a6954ffe95a1f61d0dd988ae88afd29d2c4485f3d62b2b839b9fea289fe3b72 SHA512 94f8b05578de759be210af0eb26f15d48e15112b07e586b6336737bd9cb3dd768c7dbefc3b667753239c10bdb1fa6ebdd39d5abe234742ead51f189bf63f8173
diff --git a/media-video/qmplay2/qmplay2-24.12.28.ebuild b/media-video/qmplay2/qmplay2-24.12.28.ebuild
index 08b367fb933f..389e940a75d0 100644
--- a/media-video/qmplay2/qmplay2-24.12.28.ebuild
+++ b/media-video/qmplay2/qmplay2-24.12.28.ebuild
@@ -21,7 +21,7 @@ LICENSE="LGPL-3"
SLOT="0"
IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
- modplug notifications opengl pipewire portaudio pulseaudio qt6 sid
+ modplug notifications opengl pipewire portaudio pulseaudio sid
shaders +taglib vaapi videofilters visualizations vulkan xv"
REQUIRED_USE="
@@ -30,25 +30,13 @@ REQUIRED_USE="
"
RDEPEND="
+ dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl?,ssl,vulkan?,widgets]
+ dev-qt/qt5compat:6
+ dev-qt/qtsvg:6
media-video/ffmpeg:=[vaapi?]
- !qt6? (
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5[X(-),vulkan?]
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- extensions? ( dev-qt/qtdeclarative:5 )
- videofilters? ( dev-qt/qtconcurrent:5 )
- )
- qt6? (
- dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl?,ssl,vulkan?,widgets]
- dev-qt/qt5compat:6
- dev-qt/qtsvg:6
- extensions? ( dev-qt/qtdeclarative:6 )
- )
alsa? ( media-libs/alsa-lib )
cdio? ( dev-libs/libcdio[cddb] )
+ extensions? ( dev-qt/qtdeclarative:6 )
gme? ( media-libs/game-music-emu )
libass? ( media-libs/libass )
opengl? ( virtual/opengl )
@@ -64,8 +52,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="
- !qt6? ( dev-qt/linguist-tools:5 )
- qt6? ( dev-qt/qttools:6[linguist] )
+ dev-qt/qttools:6[linguist]
"
src_prepare() {
@@ -80,7 +67,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DBUILD_WITH_QT6=$(usex qt6)
+ -DBUILD_WITH_QT6=ON
# core
-DUSE_UPDATES=OFF
-DUSE_ALSA=$(usex alsa)
diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild
index 88438e2c0dd5..389e940a75d0 100644
--- a/media-video/qmplay2/qmplay2-9999.ebuild
+++ b/media-video/qmplay2/qmplay2-9999.ebuild
@@ -21,7 +21,7 @@ LICENSE="LGPL-3"
SLOT="0"
IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
- modplug notifications opengl pipewire portaudio pulseaudio qt6 sid
+ modplug notifications opengl pipewire portaudio pulseaudio sid
shaders +taglib vaapi videofilters visualizations vulkan xv"
REQUIRED_USE="
@@ -30,25 +30,13 @@ REQUIRED_USE="
"
RDEPEND="
+ dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl?,ssl,vulkan?,widgets]
+ dev-qt/qt5compat:6
+ dev-qt/qtsvg:6
media-video/ffmpeg:=[vaapi?]
- !qt6? (
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5[X(-),vulkan?]
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- extensions? ( dev-qt/qtdeclarative:5 )
- videofilters? ( dev-qt/qtconcurrent:5 )
- )
- qt6? (
- dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl?,ssl,vulkan?,widgets]
- dev-qt/qt5compat:6
- dev-qt/qtsvg:6
- extensions? ( dev-qt/qtdeclarative:6 )
- )
alsa? ( media-libs/alsa-lib )
cdio? ( dev-libs/libcdio[cddb] )
+ extensions? ( dev-qt/qtdeclarative:6 )
gme? ( media-libs/game-music-emu )
libass? ( media-libs/libass )
opengl? ( virtual/opengl )
@@ -57,15 +45,14 @@ RDEPEND="
pulseaudio? ( media-libs/libpulse )
sid? ( media-libs/libsidplayfp )
shaders? ( >=media-libs/shaderc-2020.1 )
- taglib? ( media-libs/taglib:= )
+ taglib? ( media-libs/taglib:= )
vaapi? ( media-libs/libva[X] )
vulkan? ( >=media-libs/vulkan-loader-1.2.133 )
xv? ( x11-libs/libXv )
"
DEPEND="${RDEPEND}"
BDEPEND="
- !qt6? ( dev-qt/linguist-tools:5 )
- qt6? ( dev-qt/qttools:6[linguist] )
+ dev-qt/qttools:6[linguist]
"
src_prepare() {
@@ -80,7 +67,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DBUILD_WITH_QT6=$(usex qt6)
+ -DBUILD_WITH_QT6=ON
# core
-DUSE_UPDATES=OFF
-DUSE_ALSA=$(usex alsa)
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-24 18:44:02 +0000