Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 14

deadbeef.changes Changed

@@ -1,4 +1,748 @@
 -------------------------------------------------------------------
+Mon Nov 11 11:11:11 UTC 2024 - olaf@aepfle.de
+
+- Convert BuildRequires from libfaad-devel to pkgconfig(faad2)
+- Support ffmpeg 7.1 with 70ae99463889e191c3d5d0af6ba28e893d73a63f.patch
+
+-------------------------------------------------------------------
+Tue Mar 19 07:54:26 UTC 2024 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Drop hardcoded '-msse3' in ddb_dsp_libretro (fix non-x86 builds)
+
+-------------------------------------------------------------------
+Fri Mar  1 15:19:18 UTC 2024 - Michael Pujos <pujos.michael@gmail.com>
+
+- removed deadbeef-fix-includes.patch. Modify CFLAGS instead
+- removed upstream patches:
+  * deadbeef-fix-register-cxx17.patch 
+  * deadbeef-adplug-use-cxx11.patch
+  * deadbeef-fix-libretro-compilation.patch
+- Update to 1.9.6: 
+  * Fixed: Drawing spectrum analyzer in discrete frequencies mode
+  * Fixed: Handling the option to enter archives when scanning folders (fudanchii)
+  * Fixed: Playback performance issue when searching in large playlist
+  * Fixed: Possible crash when starting playback with ALSA plugin
+  * Fixed: Shuffle albums was not using Album Artist
+  * Fixed: Title formatting failure with large calculated values
+  * Fixed: Loading of small album art image files
+  * Fixed: MP4 parser failing to read/write certain tags correctly
+  * Fixed: Handling of title-formatted paths
+  * Fixed: A bug when editing metadata in multiple selected tracks
+  * Fixed: OSD notification reuse by default, with an option to disable
+  * Added: Bit depth override option (HiFiPhile)
+  * Added: DSD DoP support for ALSA/FFMPEG plugins (HiFiPhile)
+  * Added: $put, $puts, $get title formatting functions (Robin Ekman)
+
+-------------------------------------------------------------------
+Mon May  8 19:25:05 UTC 2023 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net>
+
+- Add deadbeef-fix-register-cxx17.patch
+- Add deadbeef-adplug-use-cxx11.patch
+
+-------------------------------------------------------------------
+Fri Feb 24 13:50:58 UTC 2023 - Michael Pujos <pujos.michael@gmail.com>
+
+- removed fix-warning.patch, not needed anymore
+- added pipewire build dependency
+- added deadbeef-fix-desktop-file.patch to fix bogus "Play Pause" action
+- added upstream deadbeef-fix-libretro-compilation.patch to fix compilation on ARM
+- Update to 1.9.5:
+
+  * Fixed: GME chiptune voice muting was affecting converter / replaygain scanner
+  * Fixed: SID chiptune voice muting was affecting converter / replaygain scanner
+  * Fixed: SID stereo was not working the way it was intended
+  * Fixed: Wave format conversion regressions, which could lead to wrong channels mapping
+  * Fixed: Converter race condition bug when checking whether a directory exists (dakeryas)
+  * Fixed: Album art fetching for tracks with multiple artists
+  * Fixed: GTK warning when opening track properties
+  * Fixed: Prompting before deleting playlist via middle mouse button
+  * Fixed: Album art left/right/center alignment in GTKUI
+  * Fixed: Removed embedded album art size limit for ID3v2 tags
+  * Fixed: Deadlock when trying to delete files from disk
+  * Fixed: Mute functionality for output plugins with their own volume control
+  * Fixed: Switching to previous/next track after the current track is removed
+  * Fixed: Incorrect playlist affected by hotkeys
+  * Fixed: Unsynchronized ID3v2 tag loading (credit: Robin Seth Ekman)
+  * Fixed: Spectrum analyzer buffer overflow
+  * Fixed: Deadlock when removing multiple selected tracks while one of them is playing
+  * Added: Pipewire output plugin (saivert)
+  * Added: LibRetro resampling plugin (toadking)
+  * Added: Chiptune voice muting in DUMB plugin
+  * Added: Improved drawing of spectrum analyzer
+  * Added: $itematindex(index,value) function to title formatting, get value by index from multivalue fields
+
+-------------------------------------------------------------------
+Sun Jan  1 17:43:46 UTC 2023 - Michael Pujos <pujos.michael@gmail.com>
+
+- Update to 1.9.4:
+  * Fixed: Deadlock when playing network streams
+  * Fixed: Handling multi-value genre in ID3v2
+  * Fixed: Will fully reinitialize ALSA device when changing output format,
+    to be compatible with more DACs
+  * Fixed: Duplicate playlist menu item was not showing
+  * Fixed: A random crash in visualization code
+  * Added: Customizable visualization background color for GTKUI
+  * Added: 64-bit seeking support in AAC, ALAC, Sndfile, Musepack, MP3, WMA, Vorbis
+  * Added: Embedded album art from OGG files
+  * Added: When double clicking a playlist in Playlist browser,
+    will play the first track in the shuffle queue,
+    according to current settings (pappnu)
+
+  * version 1.9.3
+  * Fixed: OpenBSD compatibility / warnings (Brad Smith)
+  * Fixed: Crash when loading certain malformed cuesheets
+  * Fixed: API behavior change regression causing certain plugins to malfunction
+  * Added: Support for building with FFMPEG 5.0 (xuzhen)
+
+- Removed fix-ffmpeg-5-support.patch: not needed anymore
+- Fixed deadbeef Help menu entries resulting in file not found errors
+
+-------------------------------------------------------------------
+Sun Nov  6 10:56:06 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add fix-ffmpeg-5-support.patch: Fix build against ffmpeg 5.0x
+
+-------------------------------------------------------------------
+Thu Nov  3 14:58:35 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>
+
+- Update to 1.9.2:
+  * Fixed: Many race conditions, deadlocks and crashes
+  * Fixed: Crash when reading metadata of some .SPU files
+  * Fixed: Config file content was repeated twice
+  * Fixed: Default album art max file size increased to 40MB (Dakeryas)
+  * Fixed: Reading some DTS files which require a larger buffer when probing
+  * Fixed: Noise was played in the beginning of DTS files
+  * Fixed: Default cddb server changed to gnudb.gnudb.org:8880
+  * Fixed: Crash when playing certain .AY files
+  * Fixed: Playlist corruption when sorting by random
+  * Fixed: Crash in the sndfile plugin
+  * Fixed: Spectrum analyzer samplerate bug
+  * Fixed: Visualization buffer out-of-bounds access
+  * Fixed: Multichannel down-mixing bug
+  * Added: Notification displaying compatibility with KDE 5.23.5
+  * Added: GTKUI oscilloscope rendering with anti-aliasing
+  * Added: Selection Properties widget configurable to display metadata, properties, or both
+  * Added: Toggle Pause action in the Deadbeef.desktop file
+  * Added: Confirmation dialog when removing a playlist using hotkey
+  * Added: Improved Sort By -> Custom dialog
+- Add fix-warning.patch
+
+-------------------------------------------------------------------
+Mon Jul  4 12:03:46 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Sync ExcludeArch %ix86 with libdispatch: libdispatch is not being
+  buily and as such we don't have the needed dep available.
+
+-------------------------------------------------------------------
+Sat Jul 02 13:08:43 UTC 2022 - predivan@mts.rs
+
+- Update to version 1.9.1:
+  * Remove the hearts from default titlebar - mainly because large percentage of systems can't display emoji in the title bar.
+  * fix LINGUAS and translators.txt to include 'be'
+  * translation: restore Belarussian language translation
+  * gtkui: exclude medialib files, to avoid broken tarball
+
+  Changes in 1.9.0
+  * Fixed: WMA regression which caused corrupt playback
+  * Fixed: Deadlock in ALSA plugin
+  * Fixed: Mis-detection of raw AAC files as MP4 files
+  * Fixed: Handling empty title formatting scripts
+  * Fixed: Memory error when dragging playlist via Playlist Browser
+  * Fixed: Keyboard nagivation issues across playlist tabs (Saivert)
+  * Fixed: Playlist tabs and playlist customized colors bugs (Saivert)
+  * Fixed: Paused state was not persisted correctly after force-quitting
+  * Fixed: Regression which broke musepack seeking
+  * Fixed: Crash when notification artwork could not be found
+  * Fixed: Poor performance when saving playlist and configuration files
+  * Fixed: sndfile not opening files because of uninitialized memory access bug
+  * Fixed: Crash when removing tracks from playlist while they're playing
+  * Fixed: Rendering group titles with blank text
+  * Fixed: Delay activation of a playlist tab during drag-drop over the tab bar
+  * Fixed: ᵣussian and ᵦelarussian languages are no longer supported
+  * Added: Long file seeking support for Opus and FFMPEG
+  * Added: HTTPS support for vfs_curl in portable builds, via libmbedtls
+  * Added: New Scope and Spectrum Analyzer visualizations
+  * Added: Visualization appearance preferences pane
+  * Added: New album art loader
+  * Added: Configurable volume bar scale (dB, linear, cubic) via context menu (Saivert)
+  * Added: Title formatting $year(time) function
+  * Added: GTK UI for editing a chosen field of multiple selected tracks, in a table interface
+  * Added: Creating new playlist via clicking the "+" button in the playlist tab strip (Saivert)
+  * Added: Improved DSP preferences GTK UI (Saivert)
+  * Added: Improved handling of invalid MP3 files
+  * Added: Last.fm scrobbler will use HTTPS by default
+
+- Refresh deadbeef-drop-documents-installation.patch
+- Add deadbeef-fix-includes.patch
+
+-------------------------------------------------------------------
+Thu Sep  9 18:58:52 UTC 2021 - Carsten Ziepke <kieltux@gmail.com>
+
+- Update version to 1.8.8
+  - Fixed: A crash and file path issues in PSF plugin
+  - Fixed: A crash when reading certain AAC files
+  - Fixed: Reading and writing metadata in certain MP4 files, which
+    didn't work before
+  - Fixed: Finding a cuesheet when the path contains symlink
+  - Fixed: %isplaying% and %ispaused% title formatting behavior
+  - Fixed: Playback of raw AAC files with ID3v2 tags
+  - Fixed: Infinite loop when trying to $replace an empty string
+    using title formatting
+  - Added: Handling of Disc subtitle frames in ID3v2 and APE tags
+  - Added: New improved plugin preferences UI
+  - Added: Non-modal preferences window
+  - Added: `$rgb()` title formatting function
+  - Added: Group title colorization support via title formatting
+  - Added: Plugin report and filtering in Plugin list
+  - Added: Focusable playlist tabs with keyboard navigation support
+  - Added: Sorting plugin list alphabetically
+  - Added: Reading of WAV RIFF tags

deadbeef.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package deadbeef
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,79 +12,98 @@
 # 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/
 #
 
 
+# LTO breaks compiler test at configure stage,
+# which is bad since Clang is the only suported compiler now.
+%define _lto_cflags %{nil}
 %bcond_with restricted
 Name:           deadbeef
-Version:        0.6.2
+Version:        1.9.6
 Release:        0
 Summary:        GTK+ audio player
-License:        Zlib
+License:        BSD-3-Clause AND GPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later
 Group:          Productivity/Multimedia/Sound/Players
-Url:            http://deadbeef.sourceforge.net/
-Source:         http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2
-# PATCH-FIX-OPENSUSE deadbeef-fix_ubuntu_unity_desktop.patch i@marguerite.su -- Fix Unity-oriented desktop-file warnings.
-Patch0:         deadbeef-fix_ubuntu_unity_desktop.patch
-Patch1:         deadbeef-compiler-warnings.patch
-BuildRequires:  alsa-devel
-BuildRequires:  dbus-1-devel
-BuildRequires:  flac-devel
-BuildRequires:  gcc-c++
+URL:            https://deadbeef.sourceforge.io/
+Source:         %{name}-%{version}.tar.bz2
+Source1:        %{name}.appdata.xml
+# PATCH-FIX-OPENSUSE 0003-Fix-operator-precedence-and-uninitialized-value-warn.patch
+Patch0:         0003-Fix-operator-precedence-and-uninitialized-value-warn.patch
+# PATCH-FIX-OPENSUSE deadbeef-drop-documents-installation.patch hillwood@opensuse.org -- Install documents by rpmbuild.
+Patch1:         %{name}-drop-documents-installation.patch
+# PATCH-FIX-OPENSUSE deadbeef-fix-desktop-file.patch -- fix bogus "Play Pause" action
+Patch2:         %{name}-fix-desktop-file.patch
+# PATCH-FIX-OPENSUSE 70ae99463889e191c3d5d0af6ba28e893d73a63f.patch -- see patch
+Patch3:         70ae99463889e191c3d5d0af6ba28e893d73a63f.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  clang
+BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  imlib2-devel
 BuildRequires:  intltool
-BuildRequires:  libcddb-devel
-BuildRequires:  libcdio-devel
-BuildRequires:  libcurl-devel
+BuildRequires:  libdispatch-devel
 BuildRequires:  libjpeg-devel
-BuildRequires:  libnotify-devel
-BuildRequires:  libpulse-devel
-BuildRequires:  libsamplerate-devel
-BuildRequires:  libsndfile-devel
-BuildRequires:  libvorbis-devel
-BuildRequires:  libzip-devel
+BuildRequires:  libtool
+BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
-BuildRequires:  wavpack-devel
-BuildRequires:  xorg-x11-libs
 BuildRequires:  yasm
-Recommends:     %{name}-lang = %{version}
-Recommends:     %{name}-plugins-extra = %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} >= 1210
-BuildRequires:  gtk3-devel
-%else
-BuildRequires:  gtk2-devel
-%endif
-%if 0%{?suse_version} <= 1140
-BuildRequires:  xorg-x11-libxcb-devel
-%endif
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(atk)
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(flac)
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(imlib2)
+BuildRequires:  pkgconfig(jansson)
+BuildRequires:  pkgconfig(libavcodec)
+BuildRequires:  pkgconfig(libavformat)
+BuildRequires:  pkgconfig(libavutil)
+BuildRequires:  pkgconfig(libcddb)
+BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(libmpg123)
+BuildRequires:  pkgconfig(libnotify)
+BuildRequires:  pkgconfig(libpipewire-0.3)
+BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(libzip)
+BuildRequires:  pkgconfig(mad)
+BuildRequires:  pkgconfig(opusfile)
+BuildRequires:  pkgconfig(pango)
+BuildRequires:  pkgconfig(samplerate)
+BuildRequires:  pkgconfig(sndfile)
+BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  pkgconfig(wavpack)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(zlib)
+ExcludeArch:    %{ix86}
 %if %{with restricted}
-BuildRequires:  libfaad-devel
-BuildRequires:  libffmpeg-devel
-BuildRequires:  libmad-devel
+BuildRequires:  pkgconfig(faad2)
+Requires:       %{name}-plugins-extra = %{version}-%{release}
+%else
+Recommends:     %{name}-plugins-extra = %{version}
 %endif
 
 %description
-DeaDBeeF is an audio player for GNU/Linux and other UNIX-like
-systems. It is written in C with some plugins in C++. DeaDBeeF has
-minimal dependencies for a native GTK+ GUI, cuesheet support,
-support for MP3, Ogg, FLAC, and APE, chiptune formats with subtunes,
-song-length databases, and more.
-It is very fast, lightweight, and extensible using plugins (DSP,
-GUI, output, input, etc.). The GUI looks similar to Foobar2000.
+DeaDBeeF is an audio player using GTK+. Through use of the ffmpeg
+libraries, it supports many formats. It also supports cuesheets,
+chiptune formats with subtunes, song-length databases. It can be
+extended using plugins (DSP, GUI, output, input, etc.). The GUI looks
+similar to Foobar2000.
 
 %lang_package
 
 %if %{with restricted}
-%package 	plugins-extra
+%package plugins-extra
 Summary:        Extra plugins for DeaDBeeF
-License:        Zlib and GPL-2.0+ and LGPL-2.1+ and BSD-3-Clause and Unicode
+License:        BSD-3-Clause AND GPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND Unicode AND NonFree
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
+Recommends:     faac
 Obsoletes:      %{name}-restricted-plugins < %{version}
-Provides:       %{name}-restricted-plugins = %{version}
+Provides:       %{name}-restricted-plugins = %{version}-%{version}
 
 %description plugins-extra
 Extra plugins for DeaDBeeF audio player.
@@ -95,50 +114,61 @@
 License:        Zlib
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
-Requires:       pkg-config
 
 %description devel
 This package provides headers for DeaDBeeF plugins development.
 
 %prep
-%setup -q
-%patch0
-%patch1 -p1
-sed -i 's/zip_file_t/db_zip_file_t/g' plugins/vfs_zip/vfs_zip.c
+%autosetup -n %{name}-%{version} -p1
+
+cp %{SOURCE1} %{name}.appdata.xml
+
+# Drop hardcoded -msse3
+sed -i "s/-msse3//" ./external/ddb_dsp_libretro/Makefile.*
 
 %build
-export CFLAGS="%{optflags} -fno-strict-aliasing"
-export CXXFLAGS="%{optflags} -fno-strict-aliasing"
-%configure \
-  --disable-static             \
-%if 0%{?suse_version} >= 1210
-  --enable-gtk3 --disable-gtk2 \
+export CC=clang
+export CXX=clang++
+# clang on 15.3 doesn't know about '-Wno-unused-but-set-variable'
+%if 0%{?sle_version} == 150300
+export CFLAGS="%{optflags} -fno-strict-aliasing -Wno-unused-command-line-argument -fpie -fPIC"
+export CXXFLAGS="$CFLAGS"
+%else
+export CFLAGS="%{optflags} -fno-strict-aliasing -Wno-unused-command-line-argument -Wno-unused-but-set-variable -fpie -fPIC"
+export CXXFLAGS="$CFLAGS"
 %endif
-%if %{with restricted}
-  --enable-ffmpeg              \
+%ifnarch x86_64
+export CFLAGS=$(echo "$CFLAGS -Wno-error=unused-variable")
+export CXXFLAGS="$CFLAGS"
+%endif

0003-Fix-operator-precedence-and-uninitialized-value-warn.patch Added

@@ -0,0 +1,45 @@
+From 30080bc60897545bb39805eeaebe6588a760d126 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Thu, 2 Nov 2017 20:10:18 +0100
+Subject: PATCH 3/3 Fix operator precedence and uninitialized value warnings
+
+---
+ plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h | 4 ++--
+ plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h             | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+Index: deadbeef-1.9.2/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h
+===================================================================
+--- deadbeef-1.9.2.orig/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h
++++ deadbeef-1.9.2/plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h
+@@ -115,7 +115,7 @@ inline void endian_16hi8 (uint_least16_t
+ #endif
+ }
+ 
+-// Set the hi byte (8 bit) in a word (16 bit)
++// Get the hi byte (8 bit) of a word (16 bit)
+ inline uint8_t endian_16hi8 (uint_least16_t word)
+ {
+ #if defined(SID_OPTIMISE_MEMORY_ACCESS)
+@@ -141,7 +141,7 @@ inline void endian_16swap8 (uint_least16
+ // Convert high-byte and low-byte to 16-bit word.
+ inline uint_least16_t endian_16 (uint8_t hi, uint8_t lo)
+ {
+-    uint_least16_t word;
++    uint_least16_t word = 0;
+     endian_16lo8 (word, lo);
+     endian_16hi8 (word, hi);
+     return word;
+Index: deadbeef-1.9.2/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h
+===================================================================
+--- deadbeef-1.9.2.orig/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h
++++ deadbeef-1.9.2/plugins/sid/sidplay-libs/libsidplay/src/xsid/xsid.h
+@@ -197,7 +197,7 @@ private:
+ 
+     // Compress address to not leave so many spaces
+     uint_least8_t convertAddr(uint_least8_t addr)
+-    { return (((addr) & 0x3) | ((addr) >> 3) & 0x0c); }
++    { return ((addr) & 0x3) | (((addr) >> 3) & 0x0c); }
+ 
+     void    reset    (void);
+     uint8_t read     (uint_least8_t  addr)

70ae99463889e191c3d5d0af6ba28e893d73a63f.patch Added

@@ -0,0 +1,176 @@
+From 70ae99463889e191c3d5d0af6ba28e893d73a63f Mon Sep 17 00:00:00 2001
+From: Christopher Snowhill <kode54@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->streamsstream_index->codecpar->codec_type != AVMEDIA_TYPE_AUDIO) {
+         return 0;
+     }
+-    AVCodec *codec = avcodec_find_decoder(format_context->streamsstream_index->codecpar->codec_id);
++    const AVCodec *codec = avcodec_find_decoder(format_context->streamsstream_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->bufferi*info->codec_context->channels+c = ((int8_t *)info->frame->extended_datac)i;
++                                    info->bufferi*chCnt+c = ((int8_t *)info->frame->extended_datac)i;
+                                     out_size++;
+                                 }
+                                 else if (_info->fmt.bps == 16) {
+                                     int16_t outsample = ((int16_t *)info->frame->extended_datac)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_datac)i*3, 3);
++                                    memcpy (&info->buffer(i*chCnt+c)*3, &((int8_t*)info->frame->extended_datac)i*3, 3);
+                                     out_size += 3;
+                                 }
+                                 else if (_info->fmt.bps == 32) {
+                                     int32_t sample = ((int32_t *)info->frame->extended_datac)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

deadbeef-0.6.2-fix_ubuntu_unity_desktop.patch Deleted

@@ -1,53 +0,0 @@
---- deadbeef.desktop.in.orig	2014-11-08 08:54:43.708910182 +0100
-+++ deadbeef.desktop.in	2014-11-08 10:51:33.530003678 +0100
-@@ -13,50 +13,3 @@
- Type=Application
- Icon=deadbeef
- X-PulseAudio-Properties=media.role=music
--
--X-Ayatana-Desktop-Shortcuts=Play;Pause;Stop;Next;Prev
--
--Play Shortcut Group
--Name=Play
--Exec=deadbeef --play
--TargetEnvironment=Unity
--
--Pause Shortcut Group
--Name=Pause
--Exec=deadbeef --pause
--TargetEnvironment=Unity
--
--Stop Shortcut Group
--Name=Stop
--Exec=deadbeef --stop
--TargetEnvironment=Unity
--
--Next Shortcut Group
--Name=Next
--Exec=deadbeef --next
--TargetEnvironment=Unity
--
--Prev Shortcut Group
--Name=Prev
--Exec=deadbeef --prev
--TargetEnvironment=Unity
--
--Desktop Action Play
--Name=Play
--Exec=deadbeef --play
--
--Desktop Action Pause
--Name=Pause
--Exec=deadbeef --pause
--
--Desktop Action Stop
--Name=Stop
--Exec=deadbeef --stop
--
--Desktop Action Next
--Name=Next
--Exec=deadbeef --next
--
--Desktop Action Previous
--Name=Prev
--Exec=deadbeef --prev

deadbeef-compiler-warnings.patch Deleted

@@ -1,216 +0,0 @@
-  168s I: A function overflows or underflows an array access. This could be a real error,
-  168s    but occasionaly this condition is also misdetected due to loop unrolling or strange pointer
-  168s    handling. So this is warning only, please review.
-  168s W: deadbeef arraysubscript dumb-kode54/src/it/readdsmf.c:32
-  168s W: deadbeef arraysubscript game-music-emu-0.6pre/gme/Spc_Cpu.cpp:403, 404
-  168s 
-  168s I: Program causes undefined operation
-  168s    (likely same variable used twiceand post/pre incremented in the same expression).
-  168s    e.g. x = x++; Split it in two operations.
-  168s W: deadbeef sequence-point adplug/cff.cpp:381
-  168s W: deadbeef sequence-point adplug/dmo.cpp:323, 343, 367
-  168s W: deadbeef sequence-point lh5dec.c:95
-  168s W: deadbeef sequence-point ttadec.c:515
-  168s 
-  168s I: Program is using uninitialized variables.
-  168s    Note the difference between "is used" and "may be used"
-  168s W: deadbeef uninitialized-variable ../../plugins/sid/sidplay-libs/libsidplay/include/sidplay/sidendian.h:91
-  168s 
-  168s I: Program returns random data in a function
-  168s E: deadbeef no-return-in-nonvoid-function artwork.c:229
-  168s E: deadbeef no-return-in-nonvoid-function streamer.c:810, 818, 826
-  168s E: deadbeef no-return-in-nonvoid-function vorbis.c:134
-  168s 
-  168s I: Program returns random data in a function
-  168s E: deadbeef no-return-in-nonvoid-function artwork.c:229
-  168s E: deadbeef no-return-in-nonvoid-function streamer.c:810, 818, 826
-  168s E: deadbeef no-return-in-nonvoid-function vorbis.c:134
-  168s 
-  168s I: Expression compares a char* pointer with a string literal.
-  168s    Usually a strcmp() was intended by the programmer
-  168s E: deadbeef stringcompare widgets.c:1179, 1212
----
- plugins/adplug/adplug/cff.cpp |    5 ++++-
- plugins/adplug/adplug/dmo.cpp |   15 ++++++++++++---
- plugins/artwork/artwork.c     |    1 +
- plugins/gtkui/widgets.c       |    4 ++--
- plugins/tta/ttadec.h          |    2 +-
- plugins/vorbis/vorbis.c       |    7 ++-----
- plugins/vtx/lh5dec.c          |    2 +-
- streamer.c                    |    6 +++---
- 8 files changed, 26 insertions(+), 16 deletions(-)
-
-Index: deadbeef-0.6.2/plugins/adplug/adplug/cff.cpp
-===================================================================
---- deadbeef-0.6.2.orig/plugins/adplug/adplug/cff.cpp
-+++ deadbeef-0.6.2/plugins/adplug/adplug/cff.cpp
-@@ -378,7 +378,10 @@ long CcffLoader::cff_unpacker::unpack(un
- 	  }
- 
- 	  for (unsigned int i=0;i<repeat_counter*repeat_length;i++)
--	    outputoutput_length++ = outputoutput_length - repeat_length;
-+	    {
-+	      outputoutput_length = outputoutput_length - repeat_length;
-+	      output_length++;
-+	    }
- 
- 	  code_length = old_code_length;
- 
-Index: deadbeef-0.6.2/plugins/adplug/adplug/dmo.cpp
-===================================================================
---- deadbeef-0.6.2.orig/plugins/adplug/adplug/dmo.cpp
-+++ deadbeef-0.6.2/plugins/adplug/adplug/dmo.cpp
-@@ -320,7 +320,10 @@ short CdmoLoader::dmo_unpacker::unpack_b
- 	    return -1;
- 
- 	  for(int i=0;i<cx;i++)
--	    *opos++ = *(opos - ax);
-+	    {
-+	      *opos = *(opos - ax);
-+	      *opos++;
-+	    }
- 
- 	  continue;
- 	}
-@@ -340,7 +343,10 @@ short CdmoLoader::dmo_unpacker::unpack_b
- 	    return -1;
- 
- 	  for(i=0;i<cx;i++)
--	    *opos++ = *(opos - ax);
-+	    {
-+	      *opos = *(opos - ax);
-+	      *opos++;
-+	    }
- 
- 	  for (i=0;i<bx;i++)
- 	    *opos++ = *ipos++;
-@@ -364,7 +370,10 @@ short CdmoLoader::dmo_unpacker::unpack_b
- 	    return -1;
- 
- 	  for(i=0;i<cx;i++)
--	    *opos++ = *(opos - bx);
-+	    {
-+	      *opos = *(opos - bx);
-+	      *opos++;
-+	    }
- 
- 	  for (i=0;i<ax;i++)
- 	    *opos++ = *ipos++;
-Index: deadbeef-0.6.2/plugins/artwork/artwork.c
-===================================================================
---- deadbeef-0.6.2.orig/plugins/artwork/artwork.c
-+++ deadbeef-0.6.2/plugins/artwork/artwork.c
-@@ -226,6 +226,7 @@ make_cache_path2 (char *path, int size,
-             *p = '_';
-         }
-     }
-+    return 0;
- }
- 
- static void
-Index: deadbeef-0.6.2/plugins/gtkui/widgets.c
-===================================================================
---- deadbeef-0.6.2.orig/plugins/gtkui/widgets.c
-+++ deadbeef-0.6.2/plugins/gtkui/widgets.c
-@@ -1176,7 +1176,7 @@ w_splitter_lock (w_splitter_t *w) {
-     }
-     w->locked = 1;
- 
--    int vert = w->base.type == "vsplitter";
-+    int vert = strcmp(w->base.type, "vsplitter");
- 
-     GtkAllocation a;
-     gtk_widget_get_allocation (w->base.widget, &a);
-@@ -1209,7 +1209,7 @@ w_splitter_unlock (w_splitter_t *w) {
-     }
-     w->locked = 0;
- 
--    int vert = w->base.type == "vsplitter";
-+    int vert = strcmp(w->base.type, "vsplitter");
-     // convert back to vpaned
-     GtkWidget *paned = vert ? gtk_vpaned_new () : gtk_hpaned_new ();
-     gtk_widget_set_can_focus (paned, FALSE);
-Index: deadbeef-0.6.2/plugins/tta/ttadec.h
-===================================================================
---- deadbeef-0.6.2.orig/plugins/tta/ttadec.h
-+++ deadbeef-0.6.2/plugins/tta/ttadec.h
-@@ -81,7 +81,7 @@ typedef unsigned char byte;
- #endif
- 
- #define PREDICTOR1(x, k)	((int)((((uint64)x << k) - x) >> k))
--#define DEC(x)			(((x)&1)?(++(x)>>1):(-(x)>>1))
-+#define DEC(x)			(((x)&1)?((++(x))>>1):((-(x))>>1))
- 
- typedef struct {
- 	unsigned int TTAid;
-Index: deadbeef-0.6.2/plugins/vorbis/vorbis.c
-===================================================================
---- deadbeef-0.6.2.orig/plugins/vorbis/vorbis.c
-+++ deadbeef-0.6.2/plugins/vorbis/vorbis.c
-@@ -114,7 +114,7 @@ is_special_tag(const char *tag) {
-            !strcasecmp(tag, gain_tag_name(RG_REFERENCE_LOUDNESS));
- }
- 
--static bool
-+static void
- add_meta(DB_playItem_t *it, const char *key, const char *value)
- {
-     const char *old_value = deadbeef->pl_find_meta(it, key);
-@@ -124,12 +124,9 @@ add_meta(DB_playItem_t *it, const char *
-             sprintf(new_value, "%s"DELIMITER"%s", old_value, value);
-             deadbeef->pl_replace_meta(it, key, new_value);
-             free(new_value);
--            return true;
-         }
--    }
--    else {
-+    } else {
-         deadbeef->pl_add_meta(it, key, value);
--        return true;
-     }
- }
- 
-Index: deadbeef-0.6.2/plugins/vtx/lh5dec.c
-===================================================================
---- deadbeef-0.6.2.orig/plugins/vtx/lh5dec.c
-+++ deadbeef-0.6.2/plugins/vtx/lh5dec.c
-@@ -92,7 +92,7 @@ static void make_table(int nchar, unsign
-     starti >>= jutbits;
-     weighti = 1U << (tablebits - i);
-   }
--  while (i <= 16) weighti++ = 1U << (16 - i);
-+  while (i <= 16) { weighti = 1U << (16 - i); i++; }
- 
-   i = starttablebits + 1 >> jutbits;
-   if (i != (unsigned short)(1U << 16)) {
-Index: deadbeef-0.6.2/streamer.c
-===================================================================
---- deadbeef-0.6.2.orig/streamer.c
-+++ deadbeef-0.6.2/streamer.c
-@@ -806,7 +806,7 @@ streamer_move_to_nextsong (int r) {
-     if (r) {
-         streamer_abort_files ();
-     }
--    handler_push (handler, STR_EV_NEXT, 0, r, 0);
-+    return handler_push (handler, STR_EV_NEXT, 0, r, 0);
- }
- 
- int
-@@ -814,7 +814,7 @@ streamer_move_to_prevsong (int r) {

deadbeef-drop-documents-installation.patch Added

deadbeef-fix-desktop-file.patch Added

deadbeef-fix_ubuntu_unity_desktop.patch Deleted

_service Added

_servicedata Added

deadbeef-0.6.2.tar.bz2 -> deadbeef-1.9.6.tar.bz2 Changed

deadbeef.appdata.xml Added

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id type="desktop">deadbeef.desktop</id>
+  <project_license>Zlib and GPL-2.0+ and LGPL-2.1+ and BSD-3-Clause</project_license>
+  <metadata_license>CC0-1.0</metadata_license>
+  <name>DeaDBeeF Player</name>
+  <summary>The Ultimate Music Player</summary>
+  <description>
+    <p>
+      DeaDBeeF (as in 0xDEADBEEF) is an audio player with the following main
+      features.
+    </p>
+    <ul>
+        <li>mp3, ogg vorbis, flac, ape, wv/iso.wv, wav, m4a/mp3 (aac and alac),
+            mpc, tta, cd audio, and many more</li>
+        <li>nsf, ay, vtx, vgm/vgz, spc and many other popular chiptune formats</li>
+        <li>SID with HVSC song length database support for sid</li>
+        <li>tracker modules - mod, s3m, it, xm, etc</li>
+        <li>ID3v1, ID3v2.2, ID3v2.3, ID3v2.4, APEv2, Xing/Info, VorbisComments
+            tag reading and writing, as well as reading many other tag/metadata
+            formats in most supported formats</li>
+        <li>automatic character set detection for non-unicode id3 tags -
+            supports cp1251, iso8859-1, and now chinese cp936 (optional), as
+            well as SHIFT-JIS and MS-DOS CP866 for selected formats</li>
+        <li>unicode tags are fully supported as well (both utf8 and ucs2)</li>
+        <li>cuesheet (.cue files) support, including charset
+            detection/conversion</li>
+        <li>minimisation to system tray, with scrollwheel volume control,
+            etc</li>
+        <li>drag and drop, both in playlist, and from other applications</li>
+        <li>control playback from command line</li>
+        <li>global hotkeys</li>
+        <li>multiple playlists using tabbed interface</li>
+        <li>album cover display</li>
+        <li>OSD notifications about current playing songs</li>
+        <li>18-band graphical equaliser and other DSP plugins</li>
+        <li>built-in high quality tag editor, with custom fields support</li>
+        <li>customizable groups in playlists</li>
+        <li>customizable columns with flexible title formatting</li>
+        <li>streaming radio support for ogg vorbis, mp3 and aac streams</li>
+        <li>gapless playback for correctly encoded files</li>
+        <li>lots of plugin, such as global hotkeys, last.fm scrobbler,
+            converter, and many more, sdk is included</li>
+        <li>comes with advanced Converter plugin, which allows to transcode
+            files to other formats</li>
+    </ul>
+  </description>
+  <releases>
+    <release version="1.8.4" date="2020-06-28">
+      <description>
+        <p>
+       <li>Soundtouch plugin has been updated, and is now included in the releases</li>
+       <li>Added %last_modified% title formatting keyword (Cristian Ciocaltea)</li>
+       <li>Fixed stack overflow bug in converter</li>
+       <li>Fixed buffer overflow bug in mp3 parser</li>
+       <li>Fixed handling of leading forward shash character in zipper file names</li>
+       <li>Fixed handling user-specified file mask in artwork plugin</li>
+       <li>Fixed CBR MP3 scanning performance</li>
+       <li>Fixed stack overflow in title formatting tint range calculation</li>
+       <li>Fixed pulseaudio plugin configuration backwards compatibility issue</li>
+       <li>Fixed last.fm scrobbling of streaming shoutcast tracks</li>
+       <li>Fixed deadlock when loading cuesheets which recursively reference themselves</li>
+       <li>Fixed a false-positive when detecting free format MP3 files</li>
+       <li>Fixed skipping unsupported fields in cuesheets</li>
+       <li>Fixed a regression which caused MP3 tag editing to crash when text can't be represented as CP1252</li>
+       <li>Fixed playback of certain network streams</li>
+       <li>Fixed handling of ID3v2 COMM frame content description data</li>
+        </p>
+      </description>
+    </release>
+  </releases>
+  <developer_name>
+    <li>Alexey Yakovenko <waker@users.sourceforge.net></li>
+    <li>Viktor Semykin <thesame.ml@gmail.com></li>
+    <li>and many others, please see about.txt</li>
+  </developer_name>
+  <screenshots>
+      <screenshot type="default">
+        <image>http://deadbeef.sf.net/screenshots/0.6/01.png</image>
+      </screenshot>
+  </screenshots>
+  <url type="homepage">http://deadbeef.sf.net/</url>
+</component>