mirror of
git://slackware.nl/current.git
synced 2024-12-26 09:58:59 +01:00
3e4363cb32
ap/moc-2.6_alpha3-x86_64-4.txz: Rebuilt. The ffmpeg7 patch isn't 100% there, so rebuild without the ffmpeg plugin. ap/sqlite-3.46.1-x86_64-1.txz: Upgraded. kde/digikam-8.4.0-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. kde/ffmpegthumbs-23.08.5-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. kde/k3b-23.08.5-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. kde/kfilemetadata-5.116.0-x86_64-6.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. kde/kpipewire-5.27.11-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/alsa-plugins-1.2.12-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/ffmpeg-7.0.2-x86_64-1.txz: Upgraded. Shared library .so-version bump. Compiled against vulkan-sdk-1.3.290.0. l/freetype-2.13.3-x86_64-1.txz: Upgraded. l/gegl-0.4.48-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/gst-plugins-bad-free-1.24.6-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. l/gst-plugins-libav-1.24.6-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/gtk4-4.14.4-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. l/libplacebo-7.349.0-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. l/mlt-7.24.0-x86_64-3.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/opencv-4.10.0-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/pipewire-1.2.2-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. Recompiled against vulkan-sdk-1.3.290.0. l/qt5-5.15.14_20240716_ae0c8451-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/qt6-6.7.2_20240610_3f005f1e-x86_64-5.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. l/spirv-llvm-translator-18.1.3-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. x/fcitx5-gtk-5.1.3-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. x/ibus-1.5.30-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. x/mesa-24.1.5-x86_64-2.txz: Rebuilt. Recompiled against vulkan-sdk-1.3.290.0. x/vulkan-sdk-1.3.290.0-x86_64-1.txz: Upgraded. xap/MPlayer-20240812-x86_64-1.txz: Upgraded. Recompiled against ffmpeg-7.0.2. xap/audacious-plugins-4.4-x86_64-3.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. xap/ffmpegthumbnailer-2.2.2-x86_64-6.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. xap/freerdp-2.11.7-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. xap/mpv-0.38.0-x86_64-5.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. Recompiled against vulkan-sdk-1.3.290.0. xap/ssr-0.4.4-x86_64-3.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. xap/xine-lib-1.2.13-x86_64-8.txz: Rebuilt. Recompiled against ffmpeg-7.0.2. xap/xscreensaver-6.09-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-7.0.2.
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
--- ./decoder_plugins/ffmpeg/ffmpeg.m4.orig 2022-10-09 12:44:06.000000000 -0500
|
|
+++ ./decoder_plugins/ffmpeg/ffmpeg.m4 2024-08-07 21:13:42.693200094 -0500
|
|
@@ -44,7 +44,7 @@
|
|
LIBS="$LIBS $ffmpeg_LIBS"
|
|
AC_CHECK_MEMBERS([struct AVProbeData.mime_type], [], [],
|
|
[#include <libavformat/avformat.h>])
|
|
- AC_CHECK_HEADERS([libavutil/channel_layout.h])
|
|
+ AC_CHECK_HEADERS([libavutil/ch_layout.h])
|
|
AC_SEARCH_LIBS(av_packet_alloc, avcodec,
|
|
[AC_DEFINE([HAVE_AV_PACKET_FNS], 1,
|
|
[Define to 1 if you have the `av_packet_*' functions.])])
|
|
--- ./decoder_plugins/ffmpeg/ffmpeg.c.orig 2022-10-09 12:44:06.000000000 -0500
|
|
+++ ./decoder_plugins/ffmpeg/ffmpeg.c 2024-08-07 21:14:12.958229068 -0500
|
|
@@ -35,9 +35,7 @@
|
|
#include <libavformat/avformat.h>
|
|
#include <libavutil/mathematics.h>
|
|
#if HAVE_LIBAVUTIL_CHANNEL_LAYOUT_H
|
|
-# include <libavutil/channel_layout.h>
|
|
-#else
|
|
-# include <libavutil/audioconvert.h>
|
|
+# include <libavutil/ch_layout.h>
|
|
#endif
|
|
|
|
/* FFmpeg also likes common names, without that, our common.h and log.h
|
|
@@ -561,10 +559,10 @@
|
|
/* Downmix multi-channel audios to stereo. */
|
|
static void set_downmixing (struct ffmpeg_data *data)
|
|
{
|
|
- if (av_get_channel_layout_nb_channels (data->enc->channel_layout) <= 2)
|
|
+ if (av_get_ch_layout_nb_channels (data->enc->ch_layout) <= 2)
|
|
return;
|
|
|
|
- data->enc->request_channel_layout = AV_CH_LAYOUT_STEREO;
|
|
+ data->enc->request_ch_layout = AV_CH_LAYOUT_STEREO;
|
|
}
|
|
|
|
static int ffmpeg_io_read_cb (void *s, uint8_t *buf, int count)
|