summaryrefslogtreecommitdiff
path: root/media-video
diff options
context:
space:
mode:
Diffstat (limited to 'media-video')
-rw-r--r--media-video/Manifest.gzbin24703 -> 24710 bytes
-rw-r--r--media-video/ffmpeg/Manifest2
-rw-r--r--media-video/ffmpeg/files/ffmpeg-5.1.3-fix-build-svt-av1-1.5.0.patch81
-rw-r--r--media-video/ffmpeg/files/ffmpeg-5.1.3-svt-av1.patch67
-rw-r--r--media-video/pipewire/Manifest1
-rw-r--r--media-video/pipewire/files/gentoo-pipewire-launcher.in-r277
6 files changed, 0 insertions, 228 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 05cc3eb45e22..d6b1e6c4511b 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
Binary files differ
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index f9f6d03ef69b..6b600c7f5027 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -9,8 +9,6 @@ AUX ffmpeg-4.4.4-wint-conversion-vulkan.patch 1066 BLAKE2B 1409c97a31ae59500df94
AUX ffmpeg-5.0-backport-ranlib-build-fix.patch 2224 BLAKE2B 1af6c5eee3f2c69c0630a73ec3885b9302cb045a03623ff138939348d6ba7e7deef1bb07c33c5bef5834040c4f6abcd7d22af8b0b849b28efde3d5753b776108 SHA512 e82cd400488ba86e5d039f088e3798b5a66245a8753d275d608284081f4b260fb7a4d8d1310f43acdf81258cc507943c8f07e431c497411744a62ba98c88c5bb
AUX ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch 999 BLAKE2B 736a85e60d3ee9b48346e1d7795bd8e075e8bcc2556695ec9db0a48a8d7356d20795ed31e1d6dcda7615e5ad3ff9faf7edf7563ba6e1f822a99d3cd442bd8a72 SHA512 f16c7185a3265710b6638e35322895590b58dffaffcb8fb436b08f945e19c44a1b66a17902b73e89fd53cf5e4cd9e7f2256bef4df4c82be16a807eb6bf663f5a
AUX ffmpeg-5.1.3-binutils-2.41.patch 2217 BLAKE2B f013c5df1cc3495830d101e551e42dfd07b016913c7cfed82920e85e69d857fb8081e19503d7f0306ca2e0313683d00e3b20293fc8ddab491eb10ffdd3a92b1a SHA512 2db666d4e5f3e9e4f32b6a34e537b5af2229c744eebdbc6680e883b88e5d937ab59f8a0fd7da812a28d9d0a3955853cb594ac5352d31a9655da95b735bbc46c0
-AUX ffmpeg-5.1.3-fix-build-svt-av1-1.5.0.patch 3500 BLAKE2B 1098c0ebc5d4db6198edf1928f6821a7e4c891145905fee16c945eba80a6c3647c9ad9402790465c3487d9926e394c592e1e7b87d06b7f6e558579d93a1ff92e SHA512 b4dfde5a84f96de80988f4fce25d947865568f6a2dd0b14219c38b9239aaa14636839a218e46e6d38ea33bf0f1bfb91d603f8317eb2fa71833ebe5852f557e77
-AUX ffmpeg-5.1.3-svt-av1.patch 3092 BLAKE2B 3c41b361fd19f87fa252e7385e917fdbc5821bd365851544a190aa711db96b89cee58b21de00354a69f12a40815cb7811e7558548c841ec183ed5695ee3aa86b SHA512 18889a141d8cba1781447ccc965d408706698af2b4b6c0f91cac70bfd0c27be346461e6545043988825a3b5ec9c196af3b4b408ce575f37135d2cc19ab95163c
AUX ffmpeg-6.0-DECLARE_ALIGNED.patch 1006 BLAKE2B 10bf1b3f618e0fad2dfb33b42fcec611329181d5481f79c42cbfda7054e2ce5f53e5b2ce439965a1beadc346492ac06c6a91a56d979a73bd72ce8952a15b2dd8 SHA512 e2d3e915a6d9ebae11e000b908bd5346de0d7731407dc783088a6d10a8e36de045a90225d16a01366ed1ad3af16fdb3b87803c03833883e7f31b93e7cdea44f7
AUX ffmpeg-6.0-binutils-2.41.patch 2217 BLAKE2B 2c8e96610fe1d198613405941b8f6ce36c1e8a543769a0dcfa5498dc0b4638e2e936dde8ad6c81a24b31dfc674ab7a2484e1a692f1ea911a1141276c05a5b13e SHA512 ec082acaaeb42061e2c6054f26fb6483170684f148200219ec8bc1fc04cf56a0d9bb31becd367c2cfdde3a9bc6bcf4d9fcdb646a57df3cda6935951e18759f6e
AUX ffmpeg-6.0-libplacebo-remove-deprecated-field.patch 4733 BLAKE2B eba46b33bdbb387b90f89491aa638cb941e7fb72d522945394e540fdfadaf83efc6837a13eefedc285b6bce3ef4443ef32f2c04754209c4a47c4d2216574d597 SHA512 0673dab6043466eecf79048f1da8879d89a014b207910bfd6ec6ebf151fe77edf35460035583f803133969d90ab202ce31aaddf322501ac4e34e1270a66f09fe
diff --git a/media-video/ffmpeg/files/ffmpeg-5.1.3-fix-build-svt-av1-1.5.0.patch b/media-video/ffmpeg/files/ffmpeg-5.1.3-fix-build-svt-av1-1.5.0.patch
deleted file mode 100644
index 51a8cb02d7b5..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-5.1.3-fix-build-svt-av1-1.5.0.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-https://bugs.gentoo.org/907478
-https://bugs.gentoo.org/907493
-https://git.videolan.org/?p=ffmpeg.git;a=commit;h=bea695d54372b66a6b9b136982fc92adb63e4745
-https://git.videolan.org/?p=ffmpeg.git;a=commit;h=3344d47a88506aba060b5fd2a214cf7785b11483
-
-From bea695d54372b66a6b9b136982fc92adb63e4745 Mon Sep 17 00:00:00 2001
-From: Christopher Degawa <christopher.degawa@intel.com>
-Date: Thu, 20 Oct 2022 22:55:28 -0500
-Subject: [PATCH] avcodec/libsvtav1: replace vbv_bufsize with
- maximum_buffer_size_ms
-
-svt-av1 v1.2.0 has deprecated vbv_bufsize in favor of using
-- maximum_buffer_size_ms (--buf-sz)
-- starting_buffer_level_ms (--buf-initial-sz)
-- optimal_buffer_level_ms (--buf-optimal-sz)
-
-and vbv_bufsize has not been in use since svt-av1 v0.8.6
-
-Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -183,7 +183,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
- param->min_qp_allowed = avctx->qmin;
- }
- param->max_bit_rate = avctx->rc_max_rate;
-- param->vbv_bufsize = avctx->rc_buffer_size;
-+ param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate;
-
- if (svt_enc->crf > 0) {
- param->qp = svt_enc->crf;
-@@ -300,7 +300,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
- avctx->bit_rate = param->rate_control_mode > 0 ?
- param->target_bit_rate : 0;
- avctx->rc_max_rate = param->max_bit_rate;
-- avctx->rc_buffer_size = param->vbv_bufsize;
-+ avctx->rc_buffer_size = param->maximum_buffer_size_ms * avctx->bit_rate / 1000LL;
-
- if (avctx->bit_rate || avctx->rc_max_rate || avctx->rc_buffer_size) {
- AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx);
---
-2.30.2
-
-From 3344d47a88506aba060b5fd2a214cf7785b11483 Mon Sep 17 00:00:00 2001
-From: Christopher Degawa <christopher.degawa@intel.com>
-Date: Thu, 20 Oct 2022 22:55:27 -0500
-Subject: [PATCH] avcodec/libsvtav1: remove compressed_ten_bit_format and
- simplify alloc_buffer
-
-compressed_ten_bit_format has been deprecated upstream and has no effect
-and can be removed. Plus, technically it was never used in the first place
-since it would require the app (ffmpeg) to set it and do additional
-processing of the input frames.
-
-Also simplify alloc_buffer by removing calculations relating to the
-non-existant processing.
-
-Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -124,16 +124,12 @@ static int svt_print_error(void *log_ctx, EbErrorType err,
-
- static int alloc_buffer(EbSvtAv1EncConfiguration *config, SvtContext *svt_enc)
- {
-- const int pack_mode_10bit =
-- (config->encoder_bit_depth > 8) && (config->compressed_ten_bit_format == 0) ? 1 : 0;
-- const size_t luma_size_8bit =
-- config->source_width * config->source_height * (1 << pack_mode_10bit);
-- const size_t luma_size_10bit =
-- (config->encoder_bit_depth > 8 && pack_mode_10bit == 0) ? luma_size_8bit : 0;
-+ const size_t luma_size = config->source_width * config->source_height *
-+ (config->encoder_bit_depth > 8 ? 2 : 1);
-
- EbSvtIOFormat *in_data;
-
-- svt_enc->raw_size = (luma_size_8bit + luma_size_10bit) * 3 / 2;
-+ svt_enc->raw_size = luma_size * 3 / 2;
-
- // allocate buffer for in and out
- svt_enc->in_buf = av_mallocz(sizeof(*svt_enc->in_buf));
---
-2.30.2
diff --git a/media-video/ffmpeg/files/ffmpeg-5.1.3-svt-av1.patch b/media-video/ffmpeg/files/ffmpeg-5.1.3-svt-av1.patch
deleted file mode 100644
index fb905f714fa3..000000000000
--- a/media-video/ffmpeg/files/ffmpeg-5.1.3-svt-av1.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-https://git.videolan.org/?p=ffmpeg.git;a=commit;h=8fe2fec45321d1b82f98f9725ad9118cefcfa58d
-https://git.videolan.org/?p=ffmpeg.git;a=commit;h=e5b5dd66535f444451e0fee59247b224d866f334
-
-From 8fe2fec45321d1b82f98f9725ad9118cefcfa58d Mon Sep 17 00:00:00 2001
-From: Christopher Degawa <ccom@randomderp.com>
-Date: Sun, 20 Nov 2022 13:07:36 -0600
-Subject: [PATCH] avcodec/libsvtav1: only set max_buf_sz if both bitrate and
- rc_buf_sz is set
-
-maximum_buffer_size_ms should only be set if both are specified or if
-the user sets it through -svtav1-params buf-sz=val
-
-Signed-off-by: Christopher Degawa <ccom@randomderp.com>
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -179,7 +179,8 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
- param->min_qp_allowed = avctx->qmin;
- }
- param->max_bit_rate = avctx->rc_max_rate;
-- param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate;
-+ if (avctx->bit_rate && avctx->rc_buffer_size)
-+ param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate;
-
- if (svt_enc->crf > 0) {
- param->qp = svt_enc->crf;
---
-2.30.2
-
-From e5b5dd66535f444451e0fee59247b224d866f334 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Jan=20Ekstr=C3=B6m?= <jeebjp@gmail.com>
-Date: Thu, 9 Mar 2023 20:27:06 +0200
-Subject: [PATCH] avcodec/libsvtav1: use larger of bit rate and max rate for
- buffer size
-
-Generally if maxrate is set, the calculation should be maxrate over
-bufsize. This additionally enables CRF + maxrate & bufsize usage.
-
-In order to keep negative values from enabling zero to be treated
-as larger and causing a division by zero, check that one of the
-variables is larger than zero.
---- a/libavcodec/libsvtav1.c
-+++ b/libavcodec/libsvtav1.c
-@@ -179,8 +179,10 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
- param->min_qp_allowed = avctx->qmin;
- }
- param->max_bit_rate = avctx->rc_max_rate;
-- if (avctx->bit_rate && avctx->rc_buffer_size)
-- param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate;
-+ if ((avctx->bit_rate > 0 || avctx->rc_max_rate > 0) && avctx->rc_buffer_size)
-+ param->maximum_buffer_size_ms =
-+ avctx->rc_buffer_size * 1000LL /
-+ FFMAX(avctx->bit_rate, avctx->rc_max_rate);
-
- if (svt_enc->crf > 0) {
- param->qp = svt_enc->crf;
-@@ -297,7 +299,8 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
- avctx->bit_rate = param->rate_control_mode > 0 ?
- param->target_bit_rate : 0;
- avctx->rc_max_rate = param->max_bit_rate;
-- avctx->rc_buffer_size = param->maximum_buffer_size_ms * avctx->bit_rate / 1000LL;
-+ avctx->rc_buffer_size = param->maximum_buffer_size_ms *
-+ FFMAX(avctx->bit_rate, avctx->rc_max_rate) / 1000LL;
-
- if (avctx->bit_rate || avctx->rc_max_rate || avctx->rc_buffer_size) {
- AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx);
---
-2.30.2
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index ae220c065e43..7bafeed72ee5 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -3,7 +3,6 @@ AUX 1.0.0/0001-fix-compile-with-no-examples.patch 1388 BLAKE2B 9cf02967d8723f41c
AUX 1.0.0/0002-fix-x11-bell-segfault.patch 988 BLAKE2B 2281275262157fa2545820e155d1182873b05738b6314c6b9d73c89f928cddf34a135ca02a552c6d124402439636a986f8aaab899ee8e872bdd6582ce60327b2 SHA512 24732d8c8c9d0ac951a9d7d30da68488da1b8da3b94652492706dd02859f7beeb8499a08a130b10332f50f81854825c80cffc5dca951d93e2eeab43a0bc786fe
AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a7a1374c453802eb1bdc19db9289856ec7b8643acbab916a39ca859d543deca111e3b0f110d1904343221c1573ffc17 SHA512 ef891e38c6f40fce2904e240307147a58c48d780e8470dac8e28044cfb86ddeb163885a2362687791779379ad814f58ad5649b75ac4e82931c5bdd3f37a6ed01
AUX gentoo-pipewire-launcher.1 1633 BLAKE2B 36c8888693bd0389dc9b1e49d0501d2679956d88f6b7ac42f0347c3fe2259775dd7082cb0bbdeb54a232fcc8902faa8086203e0fe2437c0eea5f1927ba2d0de4 SHA512 8085c9a989f21ee7f2528d56d5b104c0d14024df06f5cb6cd2aa8168b58469c71b91c788706b11021d9dbddb647a2203175603f4f8aa7b33a63a7b7cf8b59d1f
-AUX gentoo-pipewire-launcher.in-r2 2630 BLAKE2B e1a176c2b8558c56e250970cf99b78425384cafbc7086856ad389af47041d9b5203f201ebe53510e2e0d663b95447d482d219b0c3476eba7caf26c270b334ae7 SHA512 f5200fc99071aa8b7f4dde4cb9518909db3a79ebeb98d6c25bb216bf794028c4cb9573761a1a8ea6441d3a9478ab8cca7c31239f1f497cb2e9e8231f069d00bc
AUX gentoo-pipewire-launcher.in-r3 2848 BLAKE2B 5e6b8ca2df88cef240ca1ff4de28cc8ed3590fabd29b903b37880baf9cf52c35ca01be25b031898d4ee06f4600a5f0c61025a244778577a562f4a4bfa14e2aca SHA512 43cf3e07058e86bf6651106f7f192022c05c5640ba8e101b88e98a83efcc5614f9474107b6d0daf3d5234a51ebcc0a3a7ae5b359d9ba36b648c125813f4e1334
AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
AUX pipewire.desktop-r2 333 BLAKE2B 6a8805bb4ea3f23af535867c0551b8f742543de1fa8d99d2b451575066c3394b01977587078356dab65a640899bf336252b7f81b83072c676110fce9b0732eff SHA512 292fbc7283b30454025be50c657803dcb0592c9a6f0757eebe4de5a98166c3bcfeb5563da3d72489762073fe782b5e1f913c01184fbd2e926d872fc7ade73eb7
diff --git a/media-video/pipewire/files/gentoo-pipewire-launcher.in-r2 b/media-video/pipewire/files/gentoo-pipewire-launcher.in-r2
deleted file mode 100644
index a149b0d326c3..000000000000
--- a/media-video/pipewire/files/gentoo-pipewire-launcher.in-r2
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-# PipeWire launcher script for XDG compliant desktops on OpenRC.
-#
-# systemd users are very _STRONGLY_ advised to use the much
-# more reliable and predictable user units instead.
-
-# WARNING: This script assumes being run inside XDG compliant session,
-# which means D-Bus session instance is expected to be correctly set up
-# prior to this script starting. If that is not true, things may break!
-
-DATE_FORMAT='+%Y-%m-%dT%H:%M:%S%Z'
-
-CONF="${XDG_CONFIG_HOME:-${HOME}/.config}/gentoo-pipewire-launcher.conf"
-if [ -f "${CONF}" ]
-then
- . "${CONF}"
-else
- GENTOO_PIPEWIRE_LOG='/dev/null'
- GENTOO_PIPEWIRE_PULSE_LOG='/dev/null'
- GENTOO_WIREPLUMBER_LOG='/dev/null'
-fi
-for L in \
- "${GENTOO_PIPEWIRE_LOG}" \
- "${GENTOO_PIPEWIRE_PULSE_LOG}" \
- "${GENTOO_WIREPLUMBER_LOG}"
-do
- if [ ! -e "${L}" ]
- then
- touch "${L}"
- fi
-done
-
-restart () {
- echo "Terminating PipeWire processes ..."
- pkill -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
- pwait -u "${USER}" -x pipewire\|wireplumber
- echo "PipeWire terminated."
-}
-
-if [ "${#}" -gt 0 ]
-then
- if [ "${1}" = 'restart' ]
- then
- restart
- else
- echo "Unrecognised argument." >&2
- echo "Usage: gentoo-pipewire-launcher [restart]" >&2
- exit 1
- fi
-fi
-
-if pgrep -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1
-then
- echo "PipeWire already running, exiting." >&2
- echo "(Use 'gentoo-pipewire-launcher restart' to restart PipeWire and WirePlumber.)" >&2
- exit 1
-fi
-
-# The core daemon which by itself does probably nothing.
-echo "[$(@GENTOO_PORTAGE_EPREFIX@/bin/date ${DATE_FORMAT})] Starting PipeWire." 1>>"${GENTOO_PIPEWIRE_LOG}"
-@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire 1>>"${GENTOO_PIPEWIRE_LOG}" 2>&1 &
-
-# The so called pipewire-pulse daemon used for PulseAudio compatibility.
-# Commenting this out will stop the PA proxying daemon from starting,
-# however ALSA (with pipewire-alsa), JACK (with jack-sdk) and PW API using
-# clients will still have access to audio and may end up clashing with
-# non-PW apps over HW control (most notably, /usr/bin/pulseaudio daemon).
-echo "[$(@GENTOO_PORTAGE_EPREFIX@/bin/date ${DATE_FORMAT})] Starting PipeWire-Pulse." 1>>"${GENTOO_PIPEWIRE_PULSE_LOG}"
-@GENTOO_PORTAGE_EPREFIX@/usr/bin/pipewire -c pipewire-pulse.conf 1>>"${GENTOO_PIPEWIRE_PULSE_LOG}" 2>&1 &
-
-# Hack for bug #822498
-sleep 1
-
-# Finally a session manager is required for PipeWire to do anything.
-echo "[$(@GENTOO_PORTAGE_EPREFIX@/bin/date ${DATE_FORMAT})] Starting WirePlumber." 1>>"${GENTOO_WIREPLUMBER_LOG}"
-exec @GENTOO_PORTAGE_EPREFIX@/usr/bin/wireplumber 1>>"${GENTOO_WIREPLUMBER_LOG}" 2>&1
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 16:20:49 +0000