summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/Manifest.gzbin38159 -> 38162 bytes
-rw-r--r--media-gfx/blender/Manifest3
-rw-r--r--media-gfx/blender/blender-4.3.2-r1.ebuild1
-rw-r--r--media-gfx/blender/files/blender-4.3.2-ffmpeg7.patch151
-rw-r--r--media-gfx/libimagequant/Manifest2
-rw-r--r--media-gfx/libimagequant/libimagequant-4.3.4.ebuild2
6 files changed, 156 insertions, 3 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 848dc37c7738..f69fc365d9d0 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 56182978a228..bf92e362645e 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -2,6 +2,7 @@ AUX blender-4.0.2-CUDA_NVCC_FLAGS.patch 627 BLAKE2B 45c9f327ee6d2fbd45446ba0787f
AUX blender-4.0.2-FindClang.patch 451 BLAKE2B 4b57395d440b590f9b2e097b74fbcf46dbe12fd13536cb335b914246995ede928f1208872c5044e1d0ecb1a702d0c46b656eb4b3abc3b0ed149abaf0d74bd433 SHA512 21aa3e158585184dfc1ccd931b53142cf436507a9126f4cee465214e7183553d02451babc5a636d3eb4ae0fd3ed0f0effb7b8962889f6dbec3e9476a61d0bbb2
AUX blender-4.1.1-FindLLVM.patch 1388 BLAKE2B 721ba19ba6bdfde1672889d530bbd252665c12568363920561b7cfb7491e98a130cf0accc197f46a760c1bc57357183ce89903f2555125097d23361f1fe39ea7 SHA512 b13e8efaaf711bfba2a015b65153988c7ca9042e58785a483987634110c2bbdaec311744c633b7402dfaaca321984a5dc3fc549689c21fe0bfd6c27d890289da
AUX blender-4.1.1-numpy.patch 1060 BLAKE2B 76b4c83e852f25be042c2a8267ad2b55fcbf8c3d4c3c2d1e8640e349174029de13a791d53e66215126dc76cdefca40b1e9f253e317f02f6d40a04652e9519bd5 SHA512 d3047c0eba1ce6d4cb68df65bd1563b7eb7c14253ff82edfcdae0a19d8270027a45273442258e0afef19bf1e805b99b91ae76a95fb4a0ada0454ee75f36c43b1
+AUX blender-4.3.2-ffmpeg7.patch 5743 BLAKE2B b301fade57f45d427fb35cbeabd8233823199b4240f613be764c0b7715e0909b3718f42d4fd3062995d70baaefbda3706f06d369f404bde68fa63750a74a33c8 SHA512 33a80074020bd53056d00347fc142304e012704929f6859f7362cfaae46ab5d61a13a22e51b418c91ff42c5204de5eaf95165aebc000280ef67a72071b3db542
DIST blender-3.6.15.tar.xz 67906200 BLAKE2B 8709b20347e78f3f71d22fee9799b1c0e20a39521b35cff83d6cd3462d4b172e31c1656812d7ce51eef25341a0cff2e9efdcdab0bc9a361ec843a666fc8c3185 SHA512 dfd1d80850fe6ab0616fd99ab039345da621418890b1a006e5320a4b739d1cf6f4ca313e8f8aed6e27c976400c75e8d6085847623d933de71932aefe82f3fd32
DIST blender-3.6.18.tar.xz 67900952 BLAKE2B d4a619197abc3e4969846913f3c88cd64fd679bbefe007354af6ba2e83d47a8fcd27b3bcbaf6d850d28960eedeb3c50ff9336d0e61fd488d4916b6628bfd67dd SHA512 48a8b3e8b2fe75305061d7cb9b7b8491cef4f23fbd809d1fc34663a4f97f487d6e7e6e92848110fe6aa5a2fed18a2c1a2a0c1c928aa813e2456f7786681eae60
DIST blender-3.6.8.tar.xz 70453744 BLAKE2B 5361977951fa1720899fad26092b967cc78b7ba82c8823f92fe1e6a14419edae1f3914f639e88dd8b5fb3ec7c124783e1ece56199a80b9b51a0f320764e1eba7 SHA512 a5e15dc9de7024cebb955fc531ae592a4c58336196a07fd63ed5bb4eb14d66751a3697ea8b120283ca5078c92d8c87966e882862011ebb4368f132e2de004a45
@@ -16,6 +17,6 @@ EBUILD blender-4.1.1-r3.ebuild 17235 BLAKE2B 4d1407dc17edb954fa541ee02a77e2014de
EBUILD blender-4.1.1-r4.ebuild 17573 BLAKE2B f1cd3d3759b1d9a71cdf867774362eabd9d5ae9cbd6f0ce4a3f4c70128e60e57fbebb1925ba246ddfa51a38fa92d3e2d63c852495ad1e41729ec5de00149bf62 SHA512 022341394de302bd1e720b17512f8affb17666eeeff7a84dffedbaccc5ee0798b36f32c1d524f4df121413800de5351d4fc6fb93c873413d431f8b34ac91ba05
EBUILD blender-4.2.1-r1.ebuild 17428 BLAKE2B 55763969360cbad48fc6e81ce32464e15208f6dc1fc9b50b89c0ba94f797a61d8c61596a9d22dfe714e2e055aef273b50621f7579bb917746aeaf4d35bb17433 SHA512 315b44eb42a29e94b5d3df899eeaf10797e86934b47c33d17cb6fdb5d33cd8d903bc6a455eeb58a32e7188ff9f9933a7361e0611bc3f9638b3ce23b3604780cc
EBUILD blender-4.2.4-r1.ebuild 17395 BLAKE2B a3ac1b5cd7c56cab4c11390fbaef6ae6f20e2d31642b939f6b357593617ef5582f31a47d6b52d8df79db4f7d14eb5cae7fac54fd3b83dcdde8851bf7cd62479a SHA512 20f6714ea1e5f180b9232a2b7c3d32ee24e884b46b9bdf56462fb8e23781e40549af07595347a3833bf0a8f102100275d6d7a89abe2cb687f5c568439a15849b
-EBUILD blender-4.3.2-r1.ebuild 17396 BLAKE2B de587ba8d0b4089eb3fa29b46be2b1d40fd26623a5aa8d073302c85f00ccc3f95eabfd54c36ed32a5b1b597da98a1eaf534a3c785476c3e4921aa7c30c2bf595 SHA512 63bcbb77a1f871004efc36124259d5fd508ca104e3dea0a6015fccc78239924275c21ea3af7686979b0d3e494021fe0826ea8a6fb5c79306ef39a25ac6e21116
+EBUILD blender-4.3.2-r1.ebuild 17437 BLAKE2B e862b2601d51923ab96cbea8416a0e25b4aad6137b15fed75b0ac16deab28b1bd521b5fd05a1c136223ae14f7e47566c8cd6087486e893af24501cbeb87bb7b8 SHA512 c29fd7f6e777f9abbfce9101098e3fe5beb5b872e93f56b338f71e51ad5dbdb5b0b265985da4a8d0c655b19d41a45185150e7310bbaa9cc742149ad45ae90d40
EBUILD blender-9999.ebuild 17397 BLAKE2B a5120c3cd94f1e9989c640124bf12929fa1029c5a1129798183583a58302a8ab94c63df4a459b3436895988af31569fe7bf72b0d3cc4a9e62c69b755a5868a8a SHA512 61e10abcf36278f107c96da3fdee1a92633e5892374677a9c6855d894af5f29007eac526963fccd5ce7706dcb83a0b347c27f114db27211dbeaab31af672bf0b
MISC metadata.xml 3459 BLAKE2B 6fb5c60150a6ff87ef3011bd439886dbba0d41137cd7eb36afe5ce13daf4038178880f19a3afda52decc576132d6b44b17d99bafb611207b8417790706b299f9 SHA512 8057e29057a0a2d3851c44c95116b5ac8c04fbbf3efd1540df63ffe7837201007a99883fca9c6e31f89fb20a099959a81f97d88b14f99cf4910ae9e771b5fdbc
diff --git a/media-gfx/blender/blender-4.3.2-r1.ebuild b/media-gfx/blender/blender-4.3.2-r1.ebuild
index 8e849ba27514..71102af8a31b 100644
--- a/media-gfx/blender/blender-4.3.2-r1.ebuild
+++ b/media-gfx/blender/blender-4.3.2-r1.ebuild
@@ -184,6 +184,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.0.2-CUDA_NVCC_FLAGS.patch"
"${FILESDIR}/${PN}-4.1.1-FindLLVM.patch"
"${FILESDIR}/${PN}-4.1.1-numpy.patch"
+ "${FILESDIR}/${PN}-4.3.2-ffmpeg7.patch"
)
blender_check_requirements() {
diff --git a/media-gfx/blender/files/blender-4.3.2-ffmpeg7.patch b/media-gfx/blender/files/blender-4.3.2-ffmpeg7.patch
new file mode 100644
index 000000000000..c16c18124dd0
--- /dev/null
+++ b/media-gfx/blender/files/blender-4.3.2-ffmpeg7.patch
@@ -0,0 +1,151 @@
+https://bugs.gentoo.org/951199
+
+Backport of [1] plus a chunk from [2] for another anim_movie.cc issue.
+
+[1] https://projects.blender.org/blender/blender/commit/b1ca2f09dba5c4a6d21806ab913a2374bf7b3b8f
+[2] https://projects.blender.org/blender/blender/pulls/121947
+--- a/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
++++ b/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
+@@ -28,7 +28,12 @@
+ AUD_NAMESPACE_BEGIN
+
++/* FFmpeg < 4.0 */
+ #if LIBAVCODEC_VERSION_MAJOR < 58
+ #define FFMPEG_OLD_CODE
+ #endif
++/* FFmpeg < 5.0 */
++#if LIBAVCODEC_VERSION_MAJOR < 59
++#define FFMPEG_OLD_CH_LAYOUT
++#endif
+
+ SampleFormat FFMPEGReader::convertSampleFormat(AVSampleFormat format)
+@@ -113,5 +118,11 @@
+ break;
+
+- int data_size = av_samples_get_buffer_size(nullptr, m_codecCtx->channels, m_frame->nb_samples, m_codecCtx->sample_fmt, 1);
++ #ifdef FFMPEG_OLD_CH_LAYOUT
++ int channels = m_codecCtx->channels;
++ #else
++ int channels = m_codecCtx->ch_layout.nb_channels;
++ #endif
++
++ int data_size = av_samples_get_buffer_size(nullptr, channels, m_frame->nb_samples, m_codecCtx->sample_fmt, 1);
+
+ if(buf_size - buf_pos < data_size)
+@@ -123,10 +134,10 @@
+ if(m_tointerleave)
+ {
+- int single_size = data_size / m_codecCtx->channels / m_frame->nb_samples;
+- for(int channel = 0; channel < m_codecCtx->channels; channel++)
++ int single_size = data_size / channels / m_frame->nb_samples;
++ for(int channel = 0; channel < channels; channel++)
+ {
+ for(int i = 0; i < m_frame->nb_samples; i++)
+ {
+- std::memcpy(((data_t*)buffer.getBuffer()) + buf_pos + ((m_codecCtx->channels * i) + channel) * single_size,
++ std::memcpy(((data_t*)buffer.getBuffer()) + buf_pos + ((channels * i) + channel) * single_size,
+ m_frame->data[channel] + i * single_size, single_size);
+ }
+@@ -208,5 +219,10 @@
+ AUD_THROW(FileException, "File couldn't be read, ffmpeg codec couldn't be opened.");
+
+- m_specs.channels = (Channels) m_codecCtx->channels;
++ #ifdef FFMPEG_OLD_CH_LAYOUT
++ int channels = m_codecCtx->channels;
++ #else
++ int channels = m_codecCtx->ch_layout.nb_channels;
++ #endif
++ m_specs.channels = (Channels) channels;
+ m_tointerleave = av_sample_fmt_is_planar(m_codecCtx->sample_fmt);
+
+@@ -346,5 +362,10 @@
+ info.specs.format = convertSampleFormat(m_formatCtx->streams[i]->codec->sample_fmt);
+ #else
+- info.specs.channels = Channels(m_formatCtx->streams[i]->codecpar->channels);
++ #ifdef FFMPEG_OLD_CH_LAYOUT
++ int channels = m_formatCtx->streams[i]->codecpar->channels;
++ #else
++ int channels = m_formatCtx->streams[i]->codecpar->ch_layout.nb_channels;
++ #endif
++ info.specs.channels = Channels(channels);
+ info.specs.rate = m_formatCtx->streams[i]->codecpar->sample_rate;
+ info.specs.format = convertSampleFormat(AVSampleFormat(m_formatCtx->streams[i]->codecpar->format));
+--- a/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp
++++ b/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp
+@@ -31,7 +31,12 @@
+ AUD_NAMESPACE_BEGIN
+
++/* FFmpeg < 4.0 */
+ #if LIBAVCODEC_VERSION_MAJOR < 58
+ #define FFMPEG_OLD_CODE
+ #endif
++/* FFmpeg < 5.0 */
++#if LIBAVCODEC_VERSION_MAJOR < 59
++#define FFMPEG_OLD_CH_LAYOUT
++#endif
+
+ void FFMPEGWriter::encode()
+@@ -78,6 +83,11 @@
+ m_frame->nb_samples = m_input_samples;
+ m_frame->format = m_codecCtx->sample_fmt;
++#ifdef FFMPEG_OLD_CH_LAYOUT
+ m_frame->channel_layout = m_codecCtx->channel_layout;
+ m_frame->channels = m_specs.channels;
++#else
++ if(av_channel_layout_copy(&m_frame->ch_layout, &m_codecCtx->ch_layout) < 0)
++ AUD_THROW(FileException, "File couldn't be written, couldn't copy audio channel layout.");
++#endif
+
+ if(avcodec_fill_audio_frame(m_frame, m_specs.channels, m_codecCtx->sample_fmt, reinterpret_cast<data_t*>(data), m_input_buffer.getSize(), 0) < 0)
+@@ -406,6 +416,11 @@
+ m_codecCtx->codec_type = AVMEDIA_TYPE_AUDIO;
+ m_codecCtx->bit_rate = bitrate;
++#ifdef FFMPEG_OLD_CH_LAYOUT
+ m_codecCtx->channel_layout = channel_layout;
+ m_codecCtx->channels = m_specs.channels;
++#else
++ av_channel_layout_uninit(&m_codecCtx->ch_layout);
++ av_channel_layout_from_mask(&m_codecCtx->ch_layout, channel_layout);
++#endif
+ m_stream->time_base.num = m_codecCtx->time_base.num = 1;
+ m_stream->time_base.den = m_codecCtx->time_base.den = m_codecCtx->sample_rate;
+--- a/intern/ffmpeg/ffmpeg_compat.h
++++ b/intern/ffmpeg/ffmpeg_compat.h
+@@ -41,4 +41,11 @@
+ #endif
+
++#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(58, 29, 100)
++/* In ffmpeg 6.1 usage of the "key_frame" variable from "AVFrame" has been deprecated.
++ * used the new method to query for the "AV_FRAME_FLAG_KEY" flag instead.
++ */
++# define FFMPEG_OLD_KEY_FRAME_QUERY_METHOD
++#endif
++
+ #if (LIBAVFORMAT_VERSION_MAJOR < 59)
+ /* For versions older than ffmpeg 5.0, use the old channel layout variables.
+--- a/source/blender/imbuf/intern/anim_movie.cc
++++ b/source/blender/imbuf/intern/anim_movie.cc
+@@ -657,5 +657,9 @@
+ anim->cur_pts = av_get_pts_from_frame(anim->pFrame);
+
++# ifdef FFMPEG_OLD_KEY_FRAME_QUERY_METHOD
+ if (anim->pFrame->key_frame) {
++# else
++ if (anim->pFrame->flags & AV_FRAME_FLAG_KEY) {
++# endif
+ anim->cur_key_frame_pts = anim->cur_pts;
+ }
+@@ -1036,9 +1040,8 @@
+ AVFormatContext *format_ctx = anim->pFormatCtx;
+
+- if (format_ctx->iformat->read_seek2 || format_ctx->iformat->read_seek) {
+- ret = av_seek_frame(anim->pFormatCtx, anim->videoStream, seek_pos, AVSEEK_FLAG_BACKWARD);
+- }
+- else {
+- ret = ffmpeg_generic_seek_workaround(anim, &seek_pos, pts_to_search);
++ int ret = av_seek_frame(anim->pFormatCtx, anim->videoStream, seek_pos, AVSEEK_FLAG_BACKWARD);
++
++ if (ret < 0) {
++ ret = ffmpeg_generic_seek_workaround(anim, &seek_pos, pts_to_search);\
+ av_log(anim->pFormatCtx,
+ AV_LOG_DEBUG,
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 2ee5b8d71bd2..3311ece4a3b9 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -61,5 +61,5 @@ DIST zerocopy-derive-0.7.20.crate 528379 BLAKE2B 247ab986cb720903df383429a6785c7
EBUILD libimagequant-2.18.0.ebuild 1379 BLAKE2B 3e3d07bb4e879ee47f7aa92aab771200779a67b9f49bac88004f50038517418d832a4bf5ed7fbc1147207d74a5bdfaa6da0dd04aa84b46abf9118ee72b106d81 SHA512 24ca1bf46a5168a7a2bc45c4cc37fd3580576211e366c6bab3be6eb885e31d3c524dac4f10ac54d099505b8065de8088e3b49cf23227856470616d5437df111d
EBUILD libimagequant-4.2.2-r1.ebuild 1707 BLAKE2B fc08697734a2d80e531043ad16db163a6e96448bb3e1ae48d9ce3dcceac8b496978e5bcfa25262e33a5fc51c92b01a4dd6aeb26f8454298e58b93d8e3f6de011 SHA512 87483cd7763d48c0082d841562d118a0b285bb627e2f9b64c13061030da3f5c4c69003fdcb7fbd0a0c243d548c2e41ebc2dc333af15e5a0711bdc8b72eb05d32
EBUILD libimagequant-4.3.0-r1.ebuild 1178 BLAKE2B cd13826cb4b107e4242027a760a6721526a1828ab6e796d8cdabf14bc38ccfd8cfe687e50201e85709875a72057351a42a4bd355fd4b482f20cce1359344a133 SHA512 f2a15ac82a7845db560bff9bab3d73911837f5d189acc7c0a0c516adddd5aeb9d5539b7a471a51b29b0dcd4d76c7a2e88e8576da84d610a29bb693ecd10d798b
-EBUILD libimagequant-4.3.4.ebuild 1424 BLAKE2B 79faaca420d1f8f51e483a95bfd9e1db58ccbd850cc4b9e8daa42af7e8779996cf99e3d47dd0166443b0014dbc5a50b0d46e49c83652cbe4765d173f5d75a7b7 SHA512 ec03acda6be8e6b24181aa2d867cbe597aa4f5b1aba552c1b8af017e9d1e4a7a2b19a01d2e0f25558f72b3d7e2312658de6b4d4c661f8896641a1cbe8fe1b9ba
+EBUILD libimagequant-4.3.4.ebuild 1418 BLAKE2B ba8b89f39e36a59dad505583a374b8aa4daf478daee60bdea127b2743a708468056e915c194797016e3ef39fca4124fe30eab5dd2bc31157f3d304ca045369dc SHA512 676477cd71bdc4f80e96da444a00a5bdc7d9e7231da5aaac5c2c6b30d010de952bbd9a29bf76f6deaaa21aafe7101d413f69b78c3e94643ffbda6e5f6dd722d1
MISC metadata.xml 431 BLAKE2B 19ce5c802fc25f17f74073dba0473b11ea6a5820ec0726d405701c1e6b8f0a64d7019f4fe56ff0e6e43aba6cb52c34a5ac821d4bfcb8d9d6a10d0945bafc8a90 SHA512 4e22cda189c98a07cab44be95311def7b6955025d320869b55006e0e09f98c7370de40f552b556c466013b0c68b04013f36559f4970ebfd79655faf446c1e166
diff --git a/media-gfx/libimagequant/libimagequant-4.3.4.ebuild b/media-gfx/libimagequant/libimagequant-4.3.4.ebuild
index 60bcb0817fff..601c24795b4f 100644
--- a/media-gfx/libimagequant/libimagequant-4.3.4.ebuild
+++ b/media-gfx/libimagequant/libimagequant-4.3.4.ebuild
@@ -39,7 +39,7 @@ LICENSE="GPL-3+"
# Dependent crate licenses
LICENSE+=" MIT ZLIB"
SLOT="0/0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~s390 ~sparc"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~s390 sparc"
BDEPEND="
>=dev-util/cargo-c-0.9.14
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-14 05:35:14 +0000