diff --git a/0002-fix-channels-build-error.patch b/0002-fix-channels-build-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..7c1acceab1033bad80e595378939e06adc62c94e --- /dev/null +++ b/0002-fix-channels-build-error.patch @@ -0,0 +1,77 @@ +From 0a6a3ce990a6eb61a1acac31260acc69c145f0bb Mon Sep 17 00:00:00 2001 +From: Super User +Date: Fri, 21 Feb 2025 17:03:41 +0800 +Subject: [PATCH] fix channels build error + +--- + 3rdparty/libcam/libcam_encoder/encoder.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/3rdparty/libcam/libcam_encoder/encoder.c b/3rdparty/libcam/libcam_encoder/encoder.c +index 7f4f3b4..9d076f4 100644 +--- a/3rdparty/libcam/libcam_encoder/encoder.c ++++ b/3rdparty/libcam/libcam_encoder/encoder.c +@@ -735,12 +735,12 @@ static encoder_audio_context_t *encoder_audio_init(encoder_context_t *encoder_ct + audio_codec_data->codec_context->flags |= audio_defaults->flags; + + audio_codec_data->codec_context->sample_rate = encoder_ctx->audio_samprate; +- audio_codec_data->codec_context->channels = encoder_ctx->audio_channels; ++ audio_codec_data->codec_context = encoder_ctx->audio_channels; + + if(encoder_ctx->audio_channels < 2) +- audio_codec_data->codec_context->channel_layout = AV_CH_LAYOUT_MONO; ++ audio_codec_data->codec_context = AV_CH_LAYOUT_MONO; + else +- audio_codec_data->codec_context->channel_layout = AV_CH_LAYOUT_STEREO; ++ audio_codec_data->codec_context = AV_CH_LAYOUT_STEREO; + + audio_codec_data->codec_context->cutoff = 0; /*automatic*/ + +@@ -895,7 +895,7 @@ static encoder_audio_context_t *encoder_audio_init(encoder_context_t *encoder_ct + audio_codec_data->frame->nb_samples = frame_size; + audio_codec_data->frame->format = audio_defaults->sample_format; + +- audio_codec_data->frame->channel_layout = audio_codec_data->codec_context->channel_layout; ++ audio_codec_data->frame = audio_codec_data->codec_context; + + /*set codec data in encoder context*/ + enc_audio_ctx->codec_data = (void *) audio_codec_data; +@@ -1753,7 +1753,7 @@ int encoder_encode_audio(encoder_context_t *encoder_ctx, void *audio_data) + + int buffer_size = getAvutil()->m_av_samples_get_buffer_size( + NULL, +- audio_codec_data->codec_context->channels, ++ audio_codec_data->codec_context, + audio_codec_data->frame->nb_samples, + audio_codec_data->codec_context->sample_fmt, + align); +@@ -1762,7 +1762,7 @@ int encoder_encode_audio(encoder_context_t *encoder_ctx, void *audio_data) + { + fprintf(stderr, "ENCODER: (encoder_encode_audio) av_samples_get_buffer_size error (%d): chan(%d) nb_samp(%d) samp_fmt(%d)\n", + buffer_size, +- audio_codec_data->codec_context->channels, ++ audio_codec_data->codec_context, + audio_codec_data->frame->nb_samples, + audio_codec_data->codec_context->sample_fmt); + +@@ -1773,7 +1773,7 @@ int encoder_encode_audio(encoder_context_t *encoder_ctx, void *audio_data) + /*set the data pointers in frame*/ + ret = getLoadLibsInstance()->m_avcodec_fill_audio_frame( + audio_codec_data->frame, +- audio_codec_data->codec_context->channels, ++ audio_codec_data->codec_context, + audio_codec_data->codec_context->sample_fmt, + (const uint8_t *) audio_data, + buffer_size, +@@ -1783,7 +1783,7 @@ int encoder_encode_audio(encoder_context_t *encoder_ctx, void *audio_data) + { + fprintf(stderr, "ENCODER: (encoder_encode_audio) avcodec_fill_audio_frame error (%d): chan(%d) nb_samp(%d) samp_fmt(%d) buff(%d bytes)\n", + ret, +- audio_codec_data->codec_context->channels, ++ audio_codec_data->codec_context, + audio_codec_data->frame->nb_samples, + audio_codec_data->codec_context->sample_fmt, + buffer_size); +-- +2.48.1 + diff --git a/deepin-screen-recorder.spec b/deepin-screen-recorder.spec index e35c4025d9b76d88bb78f5a539a35579f994401c..cffd291bcb1c5f923017517f6cb48b3065fb9e3e 100644 --- a/deepin-screen-recorder.spec +++ b/deepin-screen-recorder.spec @@ -1,11 +1,12 @@ Name: deepin-screen-recorder Version: 5.11.15 -Release: 1 +Release: 2 Summary: Deepin Screen Recorder License: GPLv3+ URL: https://github.com/linuxdeepin/deepin-screen-recorder Source0: https://github.com/linuxdeepin/%{name}/archive/%{version}/%{name}-%{version}.tar.gz Patch0: 0001-delete-proc-readproc.h.patch +Patch1: 0002-fix-channels-build-error.patch BuildRequires: qt5-devel BuildRequires: dtkcore-devel @@ -88,6 +89,9 @@ CXXFLAGS="${CXXFLAGS:-%optflags} -I/usr/include/ffmpeg" %{_datadir}/glib-2.0/schemas/com.deepin.dde.dock.module.shot-start-plugin.gschema.xml %changelog +* Fri Feb 21 2025 pangqing - 5.11.15-2 +- fix build error + * Tue Jul 25 2023 leeffo - 5.11.15-1 - upgrade to version 5.11.15