commit libgroove for openSUSE:Factory

Hello community, here is the log from the commit of package libgroove for openSUSE:Factory checked in at 2019-02-14 14:36:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgroove (Old) and /work/SRC/openSUSE:Factory/.libgroove.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgroove" Thu Feb 14 14:36:22 2019 rev:3 rq:674745 version:4.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libgroove/libgroove.changes 2018-05-01 23:22:28.679032817 +0200 +++ /work/SRC/openSUSE:Factory/.libgroove.new.28833/libgroove.changes 2019-02-14 14:36:26.515568817 +0100 @@ -1,0 +2,6 @@ +Wed Feb 13 21:03:14 UTC 2019 - bjorn.lie@gmail.com + +- Add libgroove-4.3.0_ffmpeg-4.0.patch: Fix build with ffmpeg v4. +- Following the above patch, drop ffmpeg3-devel BuildRequires. + +------------------------------------------------------------------- New: ---- libgroove-4.3.0_ffmpeg-4.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgroove.spec ++++++ --- /var/tmp/diff_new_pack.FBk3Ir/_old 2019-02-14 14:36:27.015568592 +0100 +++ /var/tmp/diff_new_pack.FBk3Ir/_new 2019-02-14 14:36:27.015568592 +0100 @@ -1,7 +1,7 @@ # # spec file for package libgroove # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -37,8 +37,9 @@ Patch2: libgroove-4.3.0-no_overflow.patch # PATCH-FIX-UPSTREAM libgroove-4.3.0-no_Werror0.patch -- borrowed from debian, fixes Factory build Patch3: libgroove-4.3.0-no_Werror.patch +# PATCH-FIX-UPSTREAM libgroove-4.3.0_ffmpeg-4.0.patch -- Fix build with ffmpeg v4, borrowed from debian +Patch4: libgroove-4.3.0_ffmpeg-4.0.patch BuildRequires: cmake -BuildRequires: ffmpeg3-devel BuildRequires: libebur128-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(libavcodec) @@ -151,6 +152,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build export CFLAGS="%{optflags} -Wno-deprecated-declarations" @@ -179,19 +181,23 @@ %postun -n lib%{sofingerprinter}%{sover} -p /sbin/ldconfig %files -n lib%{sobase}%{sover} -%doc CHANGELOG* LICENSE +%license LICENSE +%doc CHANGELOG* %{_libdir}/lib%{sobase}.so.* %files -n lib%{soplayer}%{sover} -%doc CHANGELOG* LICENSE +%license LICENSE +%doc CHANGELOG* %{_libdir}/lib%{soplayer}.so.* %files -n lib%{soloudness}%{sover} -%doc CHANGELOG* LICENSE +%license LICENSE +%doc CHANGELOG* %{_libdir}/lib%{soloudness}.so.* %files -n lib%{sofingerprinter}%{sover} -%doc CHANGELOG* LICENSE +%license LICENSE +%doc CHANGELOG* %{_libdir}/lib%{sofingerprinter}.so.* %files -n lib%{sobase}-devel ++++++ libgroove-4.3.0_ffmpeg-4.0.patch ++++++ Description: Fix FTBFS with FFmpeg 4.0 Author: James Cowgill Bug-Debian: https://bugs.debian.org/888376 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/groove/encoder.c +++ b/groove/encoder.c @@ -616,7 +616,7 @@ int groove_encoder_attach(struct GrooveE e->sink->audio_format = encoder->actual_audio_format; e->sink->buffer_size = encoder->sink_buffer_size; - e->sink->buffer_sample_count = (codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) ? + e->sink->buffer_sample_count = (codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) ? 0 : e->stream->codec->frame_size; e->sink->gain = encoder->gain; --- a/groove/playlist.c +++ b/groove/playlist.c @@ -186,7 +186,7 @@ static int audio_decode_frame(struct Gro if (!got_frame) { // stop sending empty packets if the decoder is finished - if (!pkt_temp->data && dec->codec->capabilities & CODEC_CAP_DELAY) + if (!pkt_temp->data && dec->codec->capabilities & AV_CODEC_CAP_DELAY) return 0; continue; } @@ -571,7 +571,7 @@ static int decode_one_frame(struct Groov pthread_mutex_unlock(&f->seek_mutex); if (f->eof) { - if (f->audio_st->codec->codec->capabilities & CODEC_CAP_DELAY) { + if (f->audio_st->codec->codec->capabilities & AV_CODEC_CAP_DELAY) { av_init_packet(pkt); pkt->data = NULL; pkt->size = 0; --- a/groove/file.c +++ b/groove/file.c @@ -281,7 +281,7 @@ int groove_file_save(struct GrooveFile * ocodec->rc_buffer_size = icodec->rc_buffer_size; ocodec->field_order = icodec->field_order; - uint64_t extra_size = (uint64_t)icodec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE; + uint64_t extra_size = (uint64_t)icodec->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE; if (extra_size > INT_MAX) { cleanup_save(file); av_log(NULL, AV_LOG_ERROR, "codec extra size too big\n");