[xcpc] Updated to new upstream release
by Andrea Musuruane
commit f371ee3a3ee3336919b23cc6da4ca2d235f3a939
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Oct 12 15:19:27 2024 +0200
Updated to new upstream release
.gitignore | 1 +
sources | 2 +-
xcpc.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 482d1a2..d7870c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ xcpc-20070122.tar.gz
/xcpc-0.38.1.tar.gz
/xcpc-0.51.0.tar.gz
/xcpc-0.52.0.tar.gz
+/xcpc-0.52.1.tar.gz
diff --git a/sources b/sources
index 358645e..b67783c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xcpc-0.52.0.tar.gz) = df95e779c82a6d39ebe22422269894982c3c9ed38045de2f0c85920869199c749433f8869bd3dff5b90d80acc5e066ca127558c10cefa4964210804998edb645
+SHA512 (xcpc-0.52.1.tar.gz) = c7cdcd010f2a0fec4f54c0c31df3415d758a3352161206e241e98fc5958ffed647f9b4a504a885deabcbb866520b574762e807610ebc9d0b8b70b7548c0e9586
diff --git a/xcpc.spec b/xcpc.spec
index e728ab4..9c0fcb2 100644
--- a/xcpc.spec
+++ b/xcpc.spec
@@ -1,5 +1,5 @@
Name: xcpc
-Version: 0.52.0
+Version: 0.52.1
Release: 1%{?dist}
Summary: A portable Amstrad CPC 464/664/6128 emulator written in C
@@ -72,6 +72,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%changelog
+* Tue Sep 24 2024 Andrea Musuruane <musuruan(a)gmail.com> - 0.52.1-1
+- Updated to new upstream release
+
* Mon Aug 12 2024 Andrea Musuruane <musuruan(a)gmail.com> - 0.52.0-1
- Updated to new upstream release
1 month, 1 week
[deadbeef] fix compile flag issue
by Leigh Scott
commit 2d22c71bfc59c36032d8ccd8d4b2751104c3e4bb
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Oct 12 13:33:02 2024 +0100
fix compile flag issue
deadbeef.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/deadbeef.spec b/deadbeef.spec
index beb6996..96de116 100644
--- a/deadbeef.spec
+++ b/deadbeef.spec
@@ -99,6 +99,9 @@ mv ddb_dsp_libretro-%{ddb_dsp_libretro_commit}/* external/ddb_dsp_libretro
sed -i 's|#include <stdint.h>||' external/ddb_dsp_libretro/sinc_resampler.h
sed -i "s|#pragma once|#pragma once\n#include <cstdint>|" external/ddb_dsp_libretro/sinc_resampler.h
sed -i "s|size_t|std::size_t|" external/ddb_dsp_libretro/sinc_resampler.h
+%ifnarch x86_64
+sed -i -re 's/^(.*)\s+([-]msse3)\s+(.*)$/\1 \3/g' external/ddb_dsp_libretro/Makefile.am
+%endif
tar -xvf %{SOURCE3}
mv ddb_output_pw-%{ddb_output_pw_commit}/* external/ddb_output_pw
@@ -113,9 +116,6 @@ do
done
%build
-%if 0%{?fedora} && 0%{?fedora} > 35
-export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig"
-%endif
./autogen.sh
%configure \
--enable-ffmpeg --docdir=%{_defaultdocdir}/%{name}-%{version} \
1 month, 1 week
[libde265/f41] rebuild for ffmpeg
by Leigh Scott
Summary of changes:
827e10c... rebuild for ffmpeg (*)
(*) This commit already existed in another branch; no separate mail sent
1 month, 1 week
[libde265] rebuild for ffmpeg
by Leigh Scott
commit 827e10cb0f002a4b26c0907863fa4ceba860307b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Oct 12 13:15:58 2024 +0100
rebuild for ffmpeg
libde265.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/libde265.spec b/libde265.spec
index 21f27fe..22e2094 100644
--- a/libde265.spec
+++ b/libde265.spec
@@ -1,7 +1,7 @@
Name: libde265
Summary: Open H.265 video codec implementation
Version: 1.0.15
-Release: 3%{?dist}
+Release: 4%{?dist}
License: LGPLv3+
Source: https://github.com/strukturag/libde265/releases/download/v%{version}/%{na...
URL: https://www.libde265.org/
@@ -105,6 +105,9 @@ rm -f %{buildroot}%{_bindir}/yuv-distortion
%{_bindir}/acceleration_speed
%changelog
+* Sat Oct 12 2024 Leigh Scott <leigh123linux(a)gmail.com> - 1.0.15-4
+- rebuild for ffmpeg
+
* Fri Aug 02 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.0.15-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
1 month, 1 week
[deadbeef/f41] rebuild for ffmpeg
by Leigh Scott
Summary of changes:
d6047b6... rebuild for ffmpeg (*)
(*) This commit already existed in another branch; no separate mail sent
1 month, 1 week
[deadbeef] rebuild for ffmpeg
by Leigh Scott
commit d6047b6275d2ad90c40dce67b14f32ee5ef45949
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Oct 12 13:00:49 2024 +0100
rebuild for ffmpeg
deadbeef-ffmpeg-7.patch | 176 ++++++++++++++++++++++++++++++++++++++++++++++++
deadbeef.spec | 6 +-
2 files changed, 181 insertions(+), 1 deletion(-)
---
diff --git a/deadbeef-ffmpeg-7.patch b/deadbeef-ffmpeg-7.patch
new file mode 100644
index 0000000..4cc4c96
--- /dev/null
+++ b/deadbeef-ffmpeg-7.patch
@@ -0,0 +1,176 @@
+From d4cca5605447122cd080691f43e46047a6039359 Mon Sep 17 00:00:00 2001
+From: Christopher Snowhill <kode54(a)gmail.com>
+Date: Fri, 21 Jun 2024 21:35:53 -0700
+Subject: [PATCH] ffmpeg: update API to support FFMPEG 7
+
+---
+ plugins/ffmpeg/ffmpeg.c | 53 ++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 44 insertions(+), 9 deletions(-)
+
+diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
+index 97545e987d..69c4e83df8 100644
+--- a/plugins/ffmpeg/ffmpeg.c
++++ b/plugins/ffmpeg/ffmpeg.c
+@@ -62,7 +62,7 @@ static int enable_dop = 0;
+
+ typedef struct {
+ DB_fileinfo_t info;
+- AVCodec *codec;
++ const AVCodec *codec;
+ AVCodecContext *codec_context;
+ int need_to_free_codec_context;
+ AVFormatContext *format_context;
+@@ -115,12 +115,20 @@ int is_codec_dsd(enum AVCodecID codec_id) {
+ // ensure that the buffer can contain entire frame of frame_size bytes per channel
+ static int
+ ensure_buffer (ffmpeg_info_t *info, size_t frame_size) {
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0)
++ if (!info->buffer || info->buffer_size < frame_size * info->codec_context->ch_layout.nb_channels) {
++#else
+ if (!info->buffer || info->buffer_size < frame_size * info->codec_context->channels) {
++#endif
+ if (info->buffer) {
+ free (info->buffer);
+ info->buffer = NULL;
+ }
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0)
++ info->buffer_size = frame_size*info->codec_context->ch_layout.nb_channels;
++#else
+ info->buffer_size = frame_size*info->codec_context->channels;
++#endif
+ info->left_in_buffer = 0;
+ int err = posix_memalign ((void **)&info->buffer, 16, info->buffer_size);
+ if (err) {
+@@ -137,7 +145,7 @@ _get_audio_codec_from_stream(AVFormatContext *format_context, int stream_index,
+ if (format_context->streams[stream_index]->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) {
+ return 0;
+ }
+- AVCodec *codec = avcodec_find_decoder(format_context->streams[stream_index]->codecpar->codec_id);
++ const AVCodec *codec = avcodec_find_decoder(format_context->streams[stream_index]->codecpar->codec_id);
+ if (codec == NULL) {
+ return 0;
+ }
+@@ -154,7 +162,7 @@ _get_audio_codec_from_stream(AVFormatContext *format_context, int stream_index,
+ if (ctx == NULL) {
+ return 0;
+ }
+- AVCodec *codec = avcodec_find_decoder (ctx->codec_id);
++ const AVCodec *codec = avcodec_find_decoder (ctx->codec_id);
+ if (codec == NULL) {
+ return 0;
+ }
+@@ -231,7 +239,11 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
+ int bps = av_get_bytes_per_sample (info->codec_context->sample_fmt)*8;
+ int samplerate = info->codec_context->sample_rate;
+
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0)
++ if (bps <= 0 || info->codec_context->ch_layout.nb_channels <= 0 || samplerate <= 0) {
++#else
+ if (bps <= 0 || info->codec_context->channels <= 0 || samplerate <= 0) {
++#endif
+ return -1;
+ }
+
+@@ -248,7 +260,11 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
+ _info->plugin = &plugin.decoder;
+ _info->readpos = 0;
+ _info->fmt.bps = bps;
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0)
++ _info->fmt.channels = info->codec_context->ch_layout.nb_channels;
++#else
+ _info->fmt.channels = info->codec_context->channels;
++#endif
+ _info->fmt.samplerate = samplerate;
+ if (info->codec_context->sample_fmt == AV_SAMPLE_FMT_FLT || info->codec_context->sample_fmt == AV_SAMPLE_FMT_FLTP) {
+ _info->fmt.is_float = 1;
+@@ -296,7 +312,9 @@ _free_info_data(ffmpeg_info_t *info) {
+ av_packet_unref (&info->pkt);
+ }
+ if (info->codec_context) {
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(61, 0, 0)
+ avcodec_close (info->codec_context);
++#endif
+
+ // The ctx is owned by AVFormatContext in legacy mode
+ if (info->need_to_free_codec_context) {
+@@ -396,7 +414,11 @@ ffmpeg_read (DB_fileinfo_t *_info, char *bytes, int size) {
+ return -1;
+ }
+
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0)
++ int chCnt = info->codec_context->ch_layout.nb_channels;
++#else
+ int chCnt = info->codec_context->channels;
++#endif
+ int chSize = info->pkt.size / chCnt;
+ uint32_t *pOut = (uint32_t *)info->buffer;
+ uint8_t marker = 0x05;
+@@ -462,25 +484,30 @@ ffmpeg_read (DB_fileinfo_t *_info, char *bytes, int size) {
+ return -1;
+ }
+ if (av_sample_fmt_is_planar(info->codec_context->sample_fmt)) {
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0)
++ int chCnt = info->codec_context->ch_layout.nb_channels;
++#else
++ int chCnt = info->codec_context->channels;
++#endif
+ out_size = 0;
+- for (int c = 0; c < info->codec_context->channels; c++) {
++ for (int c = 0; c < chCnt; c++) {
+ for (int i = 0; i < info->frame->nb_samples; i++) {
+ if (_info->fmt.bps == 8) {
+- info->buffer[i*info->codec_context->channels+c] = ((int8_t *)info->frame->extended_data[c])[i];
++ info->buffer[i*chCnt+c] = ((int8_t *)info->frame->extended_data[c])[i];
+ out_size++;
+ }
+ else if (_info->fmt.bps == 16) {
+ int16_t outsample = ((int16_t *)info->frame->extended_data[c])[i];
+- ((int16_t*)info->buffer)[i*info->codec_context->channels+c] = outsample;
++ ((int16_t*)info->buffer)[i*chCnt+c] = outsample;
+ out_size += 2;
+ }
+ else if (_info->fmt.bps == 24) {
+- memcpy (&info->buffer[(i*info->codec_context->channels+c)*3], &((int8_t*)info->frame->extended_data[c])[i*3], 3);
++ memcpy (&info->buffer[(i*chCnt+c)*3], &((int8_t*)info->frame->extended_data[c])[i*3], 3);
+ out_size += 3;
+ }
+ else if (_info->fmt.bps == 32) {
+ int32_t sample = ((int32_t *)info->frame->extended_data[c])[i];
+- ((int32_t*)info->buffer)[i*info->codec_context->channels+c] = sample;
++ ((int32_t*)info->buffer)[i*chCnt+c] = sample;
+ out_size += 4;
+ }
+ }
+@@ -784,7 +811,11 @@ ffmpeg_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
+ trace ("ffmpeg: samplerate is %d\n", samplerate);
+ trace ("ffmpeg: duration is %f\n", duration);
+
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0)
++ if (bps <= 0 || info.codec_context->ch_layout.nb_channels <= 0 || samplerate <= 0) {
++#else
+ if (bps <= 0 || info.codec_context->channels <= 0 || samplerate <= 0) {
++#endif
+ goto error;
+ }
+
+@@ -819,7 +850,11 @@ ffmpeg_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
+ deadbeef->pl_add_meta (it, ":FILE_SIZE", s);
+ snprintf (s, sizeof (s), "%d", bps);
+ deadbeef->pl_add_meta (it, ":BPS", s);
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 0, 0)
++ snprintf (s, sizeof (s), "%d", info.codec_context->ch_layout.nb_channels);
++#else
+ snprintf (s, sizeof (s), "%d", info.codec_context->channels);
++#endif
+ deadbeef->pl_add_meta (it, ":CHANNELS", s);
+ if (is_codec_dsd(info.codec_context->codec_id)) {
+ snprintf (s, sizeof (s), "%d", samplerate * 8);
+@@ -904,7 +939,7 @@ ffmpeg_init_exts (void) {
+ n = add_new_exts (n, new_exts, ';');
+ }
+ else {
+- AVInputFormat *ifmt = NULL;
++ const AVInputFormat *ifmt = NULL;
+ /*
+ * It's quite complicated to enumerate all supported extensions in
+ * ffmpeg. If a decoder defines extensions in ffmpeg, the probing
diff --git a/deadbeef.spec b/deadbeef.spec
index d28b09d..beb6996 100644
--- a/deadbeef.spec
+++ b/deadbeef.spec
@@ -14,7 +14,7 @@
Name: deadbeef
Version: 1.9.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: An audio player for GNU/Linux
License: GPL-2.0-or later AND LGPL-2.0-or-later and BSD and MIT AND Zlib
@@ -23,6 +23,7 @@ Source0: https://github.com/DeaDBeeF-Player/%{name}/archive/%{version}.ta
Source1: https://github.com/DeaDBeeF-Player/mp4p/archive/%{mp4p_commit}/mp4p-%{mp4...
Source2: https://github.com/DeaDBeeF-Player/ddb_dsp_libretro/archive/%{ddb_dsp_lib...
Source3: https://github.com/DeaDBeeF-Player/ddb_output_pw/archive/%{ddb_output_pw_...
+Patch0: https://github.com/DeaDBeeF-Player/deadbeef/commit/d4cca5605447122cd08069...
# Build for armv7hl failed
# https://github.com/DeaDBeeF-Player/deadbeef/issues/2538
@@ -170,6 +171,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%changelog
+* Sat Oct 12 2024 Leigh Scott <leigh123linux(a)gmail.com> - 1.9.6-4
+- rebuild for ffmpeg
+
* Thu Aug 01 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.9.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
1 month, 1 week
[cmus/f41] rebuild for ffmpeg
by Leigh Scott
Summary of changes:
a257d7f... rebuild for ffmpeg (*)
(*) This commit already existed in another branch; no separate mail sent
1 month, 1 week
[cmus] rebuild for ffmpeg
by Leigh Scott
commit a257d7fec2be4b665625bcf6d739e301ffbf192a
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Oct 12 12:45:37 2024 +0100
rebuild for ffmpeg
cmus.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/cmus.spec b/cmus.spec
index d6c74a2..439f275 100644
--- a/cmus.spec
+++ b/cmus.spec
@@ -7,7 +7,7 @@
Name: cmus
Version: 2.11.0
-Release: 2%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
+Release: 3%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
Summary: Ncurses-Based Music Player
License: GPLv2+
URL: https://cmus.github.io/
@@ -102,6 +102,9 @@ chmod -x examples/*
%changelog
+* Sat Oct 12 2024 Leigh Scott <leigh123linux(a)gmail.com> - 2.11.0-3
+- rebuild for ffmpeg
+
* Thu Aug 01 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.11.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
1 month, 1 week
