summaryrefslogtreecommitdiff
path: root/media-video
diff options
context:
space:
mode:
Diffstat (limited to 'media-video')
-rw-r--r--media-video/Manifest.gzbin23386 -> 23389 bytes
-rw-r--r--media-video/obs-studio/Manifest5
-rw-r--r--media-video/obs-studio/files/json11-1.0.0-include-cstdint.patch12
-rw-r--r--media-video/obs-studio/obs-studio-30.2.3.ebuild4
-rw-r--r--media-video/obs-studio/obs-studio-9999.ebuild4
-rw-r--r--media-video/x264-encoder/Manifest4
-rw-r--r--media-video/x264-encoder/x264-encoder-0.0.20240513.ebuild77
-rw-r--r--media-video/x264-encoder/x264-encoder-9999.ebuild4
8 files changed, 105 insertions, 5 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index e2a3063957a7..022fd64035ec 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 d510111b011a..1fcb432fa318 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,7 +1,8 @@
+AUX json11-1.0.0-include-cstdint.patch 258 BLAKE2B 2b7cb5abcbaaaf7c44f1b483716cd68e7a68a5d92f0107847aeb514b93c2b34da1311bd9465ba2077ef568cb7d1a7c150fc89e9adb981a9b59fd7821cefb159d SHA512 c7df20caa578d12a707b74fde88f856dbbf5e75176d7b9aca13f7fe9b501f4ca844fee5a4f2250b3c9de4afd1cd9ed1c26717a06ea4b1d239415cc154152305f
DIST cef_binary_5060_linux_x86_64_v3.tar.xz 91352460 BLAKE2B 443f4b1bc638d3fe462fd8b8dd167e96f65aebb2b8de3616beac298449e2786c746f9a1fa4a0dbe2e3ef2d593139938e97538890d3ca3b74018b3afb9c7fc661 SHA512 1fbdf1d4ed117f3b8af20476c57502145d652b451ba8e0a544081403d292cc7a78642e9071b8f0283a19ef7ad507ef6e0d9df32b00afc51605ab74f650a7d755
DIST obs-browser-c710222ec9d7ef9aa5d7099e9019d636e2c89f00.tar.gz 112527 BLAKE2B abfdd7cff3ec4479cc78d1f85a404ac48c2ebee1ba679a48e4e7abeb685ee08faa00059bda1cee2d5abf16b69ad0aa843898f612b3ee9d46f0950bd546aa6e44 SHA512 1ec2f48ce986c0d44cddf4332c8b58b8eb1fcb6a662504dd7ec580f9eb45b2a570542424d4c31ed6f96060746f21082661d43bf50b94469b4ef0c1f0b9190f7c
DIST obs-studio-30.2.3.tar.gz 16150339 BLAKE2B b3ed65060881a731bd2e48d8b490cde4a0cf2886bfbdfb2f09536b4aae15c8230c6f6fc20eed3943b88c194b46509dca702d7e955b5b148b5f3577db410f0889 SHA512 1fea762b8fb4d5401516d9e547fe20db389633fb1abbdb52e4b9559ab6aaf3b9f4c25e055896b4063c6a693bfeb78e6463486b4c66e3994a6d1ceb0b7f65865f
DIST obs-websocket-0548c7798a323fe5296c150e13b898a5ee62fc1e.tar.gz 250611 BLAKE2B fefeab4a637528138152d6e1bd374d6e3f08e4a4e20698665adf4dd925e7831df5bdb1068e402def71b6e12e239db823dac2944e6549c00e914abca175d16fc0 SHA512 f24f520c4a08ad2b80d97c5dfba14421fcd48661d3b0fb694af5d11e063c711e7bf49a4baa95d9de8aff07b6fbbd4b4681ce10a4074506d98cf25c793cc2844d
-EBUILD obs-studio-30.2.3.ebuild 6742 BLAKE2B cabb4f8986f10f14d64832a730a09feebf0c53853c6dd2f332c4c0483f2104fc944edd005062a461bc7910198cb5b979dd206b08804ecb53cf82fa4bb48b2d0c SHA512 d9ab3126077d62a4bb626f2544a7a00063ae794743efffacef0c48b1d726e9e58db84927054a4ca926093dc2c5f76dc2fabef51f9cfcafbd8f9b327ce94622f9
-EBUILD obs-studio-9999.ebuild 6672 BLAKE2B 32d6aebe654c705471756d8c344a933771f7fd4773be99bfe50150265f9180e66e4f92cd628008c6291a18524d0242f43f9a4f96989802162fe330d22693a8f5 SHA512 3b2ef56554be1adbf839f804a74b5509c1f64f95b7fb87d13e26f47ab237f41a8584b426a1be93310938c6ef7545485750c83427dcccbb2f56489c6d8a688be3
+EBUILD obs-studio-30.2.3.ebuild 6866 BLAKE2B 837ac56245cfc7a1f627a930b1bbbf4278357600b1ddd7f810948f4110fd45c060f173cafd156d022b5a9a2990a7660074a14118f3dce052fec6fee5802b7801 SHA512 dd621ec4cf061d89f47a78e911d6bdc6527b6f932cda248f4a36239eb2297314eeb2c63e00856a602508fd61ffe7fb1b552b8a3bc98e45e583b5aaa6baa1a5d8
+EBUILD obs-studio-9999.ebuild 6796 BLAKE2B 8d768b27f967727872288309e5613df29de7b681bf701681beeff251cf15aa3729c4a9d35ffaec239e41e3e73a6ea49abdab75703cb509702dfedfb7a627c346 SHA512 a2e8d58ae75e77c2cae66cbbcd4d06ce7de2d0b58f23a5c27e032e3572f3af54c70d2a3f9710389361b3c47df098d88c81a4b187122e61b40e945daf0c172b8a
MISC metadata.xml 1533 BLAKE2B 7bc778d152d6854330f821d0712da81b54397a35118baf4ba61b3ce4eb7aff5a292d4e4c74c01992761c3cae15b367dcf85450080e920d35ffeb2ee06c74483b SHA512 3dbc5096e3203ec8350e75db78519a061270d52d441e159ab297147a729bda21016a26e15b5c0447dc4a835da59ee822da99265e4f8c3bea3a1e173b134c739c
diff --git a/media-video/obs-studio/files/json11-1.0.0-include-cstdint.patch b/media-video/obs-studio/files/json11-1.0.0-include-cstdint.patch
new file mode 100644
index 000000000000..29648cf15825
--- /dev/null
+++ b/media-video/obs-studio/files/json11-1.0.0-include-cstdint.patch
@@ -0,0 +1,12 @@
+diff --git a/json11.cpp b/json11.cpp
+index 9647846..8266a14 100644
+--- a/json11.cpp
++++ b/json11.cpp
+@@ -22,6 +22,7 @@
+ #include "json11.hpp"
+ #include <cassert>
+ #include <cmath>
++#include <cstdint>
+ #include <cstdlib>
+ #include <cstdio>
+ #include <limits>
diff --git a/media-video/obs-studio/obs-studio-30.2.3.ebuild b/media-video/obs-studio/obs-studio-30.2.3.ebuild
index d0fc789c0edc..043f43465d42 100644
--- a/media-video/obs-studio/obs-studio-30.2.3.ebuild
+++ b/media-video/obs-studio/obs-studio-30.2.3.ebuild
@@ -183,6 +183,10 @@ src_prepare() {
use wayland && filter-lto
cmake_src_prepare
+
+ pushd deps/json11 &> /dev/null || die
+ eapply "${FILESDIR}/json11-1.0.0-include-cstdint.patch"
+ popd &> /dev/null || die
}
src_configure() {
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index efd7033f58ab..f2a746c3d815 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -185,6 +185,10 @@ src_prepare() {
use wayland && filter-lto
cmake_src_prepare
+
+ pushd deps/json11 &> /dev/null || die
+ eapply "${FILESDIR}/json11-1.0.0-include-cstdint.patch"
+ popd &> /dev/null || die
}
src_configure() {
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 44ff2075f03f..487720e021b4 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,6 +1,8 @@
DIST x264-0.0.20220222.tar.bz2 777236 BLAKE2B 45e57c48b4b889f5c7b4ce87d1442d26d907aac47fb7c586b34239317a8b74bb93eac3058eed766728fbca6370656d9a6f070e8992643984a89560e28edf206d SHA512 1cf864059f83731ac47008c1af1d9ac06d06283439cf883a020f8a76e0c7efc3b525791d11efe8784d0e39ded68dd03794f0502fa64cc07df2f2de064a55e1d9
DIST x264-0.0.20231114.tar.bz2 833229 BLAKE2B e8e60767d16ea11e55f9dd56f1c74535a06b07a498b91d4372872925915563b67fb917c5856e2e40e1f58acbab3142509d036cae8d56820bef0e16ee7bc35196 SHA512 7705c2827c6b280afc7403bce206f82ee94c1ba76c582d3e6ae017b9c4f08c4475ac70373f8a0bcda73046221456efc3f338c57aaf03c11f4d8e63f69bb94db5
+DIST x264-0.0.20240513.tar.bz2 841594 BLAKE2B fe88195c52d90e635a0aedef7d18886160147ba41cd1a692ae9a661b76608ac11e05aa5bc4628030f833d6a822cee187f3fbc4c015e094eb1b30c96783147124 SHA512 6d0d9e079d6c7650abb5c00ad60cf3cfe72a220b3ee7cd030d4daeefdd9feeb4d056cf2e01b2f8d2fb0a66ccc15cdde860237f8ac5eac42ede6e5444a81346f8
EBUILD x264-encoder-0.0.20220222.ebuild 2146 BLAKE2B 5aa96436f28c6943e59f2fb8d1b061bb66ebaac901268b73c3651259346d1f1aa429c2f4f4a29bc6b1de7accc093f0e80166a4a7f1d98f0b95cd8065fed94238 SHA512 3a1c20eb9f93ad24c48d7bc5dc7e01195adef29ae90bff6b648f0f8a919a76b2210ea33e4b626aaeefe002e18a7cda684719e2657e6a29014425315b7b649ef7
EBUILD x264-encoder-0.0.20231114.ebuild 2207 BLAKE2B d40d41cd4ea540b2bfe5224345488e0c02bd2fe17081f38b947185d9e06dabe1ffbd3606e3f4b95363f6846a1d2dbbcb0bea28ae7bd500d839e176163edddb8f SHA512 1576b40aa709c903f63f337214ad977fea2fae0d4f6b3890e04149ef73dee1bd0c0e5de6dfdc926ee3088219e8cfca67dd13ef446d37e8b90c624246bd147cd4
-EBUILD x264-encoder-9999.ebuild 2209 BLAKE2B 59667c3997a0e43ab3ff4453ba434a7a6cefd9587f4aabac28e08cb31828bb7038e5a65e2ecbb063f392d9c5ff4c6654c27a89a2f944a335daaf84adb0a7a251 SHA512 2eb37cb0932dc828c23c87b9e9dc14f0066a24fa14f6b239941b6a0a8bd47fe02cd373efa77e6d07006703d967470f3011f4fef683baa31f47c9df051354e041
+EBUILD x264-encoder-0.0.20240513.ebuild 2209 BLAKE2B 20b35fde815abff94a7d0a9d1bab9de138a9caecd2f70ad8303c21e979fd4ef5021688fe9f4a0bbba6b39946d0fc2346944d37c320435c7198fab7cb83291cbb SHA512 7fc1e1bf72e48a7b6a6c8a98f329f728605ae353d7f2fe9314be28331d179ec71b2350b833d7b56e4e9b8d5b2539f5b6118b3855012f13208fb855340c5a7a14
+EBUILD x264-encoder-9999.ebuild 2209 BLAKE2B 20b35fde815abff94a7d0a9d1bab9de138a9caecd2f70ad8303c21e979fd4ef5021688fe9f4a0bbba6b39946d0fc2346944d37c320435c7198fab7cb83291cbb SHA512 7fc1e1bf72e48a7b6a6c8a98f329f728605ae353d7f2fe9314be28331d179ec71b2350b833d7b56e4e9b8d5b2539f5b6118b3855012f13208fb855340c5a7a14
MISC metadata.xml 531 BLAKE2B fbf3d1b3460773bd6cb8deaa7df7d1da8bd9597d8c1c1da2ea19fc8ced206f3424b4f10af6d019941a2a1e2974c53f21db1dc47a2062c6dae401e514051c58a8 SHA512 1a36bbd77bb5e526a42fe35382fef906d741fd51b0569c2255191222c4cf006e12767228ae0fdda9bf32f72cdb24cc1f250b6bd7e57aadb50a3bc09624a2e0c0
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20240513.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20240513.ebuild
new file mode 100644
index 000000000000..488b1f76ddb7
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20240513.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bump with media-libs/x264
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A free commandline encoder for X264/AVC streams"
+HOMEPAGE="https://www.videolan.org/developers/x264.html"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
+else
+ X264_COMMIT="4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1"
+ SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P/-encoder}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+ S="${WORKDIR}/${PN/-encoder}-${X264_COMMIT}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
+
+RDEPEND="
+ ~media-libs/x264-${PV}[interlaced=,threads=]
+ ffmpeg? ( media-video/ffmpeg:= )
+ ffmpegsource? ( media-libs/ffmpegsource )
+ mp4? ( >=media-video/gpac-0.5.2:= )
+"
+ASM_DEP=">=dev-lang/nasm-2.13"
+DEPEND="
+ ${RDEPEND}
+ amd64? ( ${ASM_DEP} )
+ x86? ( ${ASM_DEP} )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+ tc-export CC
+
+ if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
+ export AS="nasm"
+ else
+ export AS="${CC}"
+ fi
+
+ # let upstream pick the optimization level by default
+ use custom-cflags || filter-flags -O?
+
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --system-libx264 \
+ --host="${CHOST}" \
+ --disable-lsmash \
+ $(usex avs "" "--disable-avs") \
+ $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
+ $(usex ffmpegsource "" "--disable-ffms") \
+ $(usex interlaced "" "--disable-interlaced") \
+ $(usex mp4 "" "--disable-gpac") \
+ $(usex threads "" "--disable-thread") || die
+
+ # this is a nasty workaround for bug #376925 for x264 that also applies
+ # here, needed because as upstream doesn't like us fiddling with their CFLAGS
+ if use custom-cflags; then
+ local cflags
+ cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
+ cflags="${cflags//$(get-flag O)/}"
+ cflags="${cflags//-O? /$(get-flag O) }"
+ cflags="${cflags//-g /}"
+ sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
+ fi
+}
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index f688e3cb2d4e..488b1f76ddb7 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
else
- X264_COMMIT="c196240409e4d7c01b47448d93b1f9683aaa7cf7"
+ X264_COMMIT="4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1"
SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P/-encoder}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
S="${WORKDIR}/${PN/-encoder}-${X264_COMMIT}"
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 23:16:15 +0000