Hello community, here is the log from the commit of package deadbeef for openSUSE:Leap:15.2 checked in at 2020-02-19 18:48:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/deadbeef (Old) and /work/SRC/openSUSE:Leap:15.2/.deadbeef.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deadbeef" Wed Feb 19 18:48:13 2020 rev:14 rq:776207 version:1.8.2 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/deadbeef/deadbeef.changes 2020-01-15 14:52:01.293473969 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.deadbeef.new.26092/deadbeef.changes 2020-02-19 18:48:14.399001094 +0100 @@ -1,0 +2,179 @@ +Sun Feb 16 09:02:21 UTC 2020 - Hillwood Yang <[email protected]> + +- More profiles for ogg and aac + add deadbeef-better-ogg-and-aac-converter-support.patch + +------------------------------------------------------------------- +Thu Jan 16 11:11:11 UTC 2020 - [email protected] + +- Fix potential buffer overflow in on_group_by_custom_activate + +------------------------------------------------------------------- +Mon Jan 6 13:26:05 UTC 2020 - Hillwood Yang <[email protected]> + +- Update version to 1.8.2 + * Volume control from command line supports increment syntax (by + eauno1re@github) + * Fixed writing multi-value fields into FLAC tags + * Map ALBUMARTIST field to ALBUM ARTIST field in FLAC + * Fixed sound output plugin selection bug in GTK UI + * Fixed crash when opening files of 0 size + * Fixed UI freeze when nullout plugin is selected + * Fixed a regression in restoring the last selected folder in GTK file chooser +- Fixed reture type, add deadbeef-fix-return-type.patch +- Install documents by rpmbuild, add deadbeef-drop-documents-installation.patch + +------------------------------------------------------------------- +Sat Jun 29 21:15:00 UTC 2019 - Alexei Sorokin <[email protected]> + +- Update to version 1.8.1: + * Fix audio freeze while sorting. + * Fix a crash when resuming playback of a file that has been + deleted. + * Fix error messages when loading PLS playlist with relative + paths. + * Fix adjusting shuffle queue after a user initiated track change. + * Write Album Artist field into OGG files as "ALBUMARTIST". + * Load external album covers before embedded. + * Remove the unmaintained sndio plugin. + * Fix localisation of status bar. + * Add experimental subgrouping support in playlist, via using a + "|||" separator for each subsequent nested group, when using + Group by -> Custom. + * Add new title formatting functions "$stripprefix" and + "$swapprefix". + * Change supereq DSP configuration to be more compact + horizontally and to have more slider precision. + * Update Repeat and Shuffle hotkey names to match the menus. + * Fix rounding bug of total playtime in statusbar. + * Fix design mode splitter handles dragging beyond the window edges. + * Fix setting album art size based on larger dimension (by ToadKing). + * Fix a regression causing custom layouts with splitters look + wrong. + * Add a FLAC plugin option to ignore corrupted stream errors. + * Fix a supereq reentrancy bug, potentially causing crash after + changing audio output configuration. + * Fix reloading replaygain info. + * Fix writing replaygain info to APEv2 tags. +- Rebase deadbeef-compiler-warnings.patch, + deadbeef_disable_psf.patch. + +------------------------------------------------------------------- +Fri May 24 08:21:09 UTC 2019 - Luigi Baldoni <[email protected]> + +- Added _service file to remove the non-distributable plugins/psf + and other undesired files +- Added deadbeef_disable_psf.patch + +------------------------------------------------------------------- +Mon Apr 8 06:01:14 UTC 2019 - [email protected] + +- Fix filelist for restricted build + +------------------------------------------------------------------- +Sun Apr 7 17:43:47 UTC 2019 - Luigi Baldoni <[email protected]> + +- Update to version 1.8.0 + * added Opus support + * added ReplayGain Scanner + * added proper tracks+cue support (in cooperation with wdlkmpx) + * added/improved MP4 tag reading and writing + * added loading embedded album art from MP4 files + * added File Copy and File Move converter presets + * added Log Window displaying error information from various + sources (in cooperation with Saivert) + * improved replaygain configuration and runtime behavior + * fixed replaygain support in Converter + * improved reading, storing and editing multi-value tag fields + * added GBS support to Game_Music_Emu (kode54) + * added SGC support to Game_Music_Emu + * fixed clipping prevention for mp3, replaygain is applied + before clipping + * fixed vfz_zip handling of colons in filenames + * fixed wma decoding precision error + * fixed issues with playing very short files + * fixed a number of known issues in the Converter + * UI splitter proportional resizing (cboxdoerfer) + * added to title formatting: $num, %_path_raw%, + %_playlist_name%, $replace, $upper, $lower, + %playback_bitrate%, $repeat, $insert, $len, <<<>>>, >>><<<, + $pad, $pad_right (saivert) + * added support for dim and bright text in playlist columns + (saivert) + * improved detecting GTK theme colors for custom widgets + * added new multiline tag editing dialog for individual values + * added Copy&Paste in playlist (cboxdoerfer) + * added localization support for plugin UI + * added Drag'n'drop support from deadbeef to other + applications (cboxdoerfer) + * fixed a number of ogg file tagging issues (kode54) + * fixed multiple crash bugs in AdPlug plugin + * added UMX module support, ported from foo_dumb + * updated Game_Music_Emu and VGMplay (kode54) + * added an option to Converter, to copy the files if the + format doesn't change + * added a configuration option `gtkui.start_hidden`, to start + the player with hidden main window (Radics Péter) + * added a converter option to retag the files after copying + * added a context menu action for duplicating playlists (Alex + Couture-Beil) + * fixed a number of fadeout issues in Game_Music_Emu + * fixed musepack seeking issue + * fixed loading album covers from ID3v2.2 + * fixed mp3 bitrate calculation bug for incomplete files with + LAME header + * improved large file support with many internal values + converted to use 64 bits for sample counts + * use title formatting for displaying status bar text + * added %seltime% title formatting value, for displaying + playback time of selected tracks (Thomas Ross) + * added reading SONGWRITER field from cue sheets (wdlkmpx) + * added playlist group spacing configuration (saivert) + * improved mp3 USLT lyrics support (in copperation with Ignat + Loskutov) + * improved playlist browser configurability (Jakub Wasylków) + * added hotkey action for opening track properties (Jakub + Wasylków) + * added hotkey actions for add/remove/toggle in playqueue + (Jakub Wasylków) + * added --volume command line option (Saivert) + * improved ISRC and subindex handling in CUE (wdlkmpx) + * added hotkey actions to move selected tracks up/down (Jakub + Wasylków) + * fixed memory access bugs in config handling and supereq + (github/tsowa) + * added charset detection based on the whole ID3v2 tag content + * added automatic charset detection for cdtext (Jakub Wasylków) + * added configuration for output samplerate setting + * removed fast scanning mp3 option, since it was too inaccurate + * improved detection of PSF files, to disambiguate them + against other files which use the same extension + * added Edit In Place and Crop options to the track properties + menu + * fixed WildMidi playback of some MID files playing more than + 1024 simultaneous notes + * fixed playing stereo APE files with single-channel silence + * added wavpack version 5 support with DSD + * fixed performance issue when reading AdPlug's HSC files + * fixed loading audio files from GVFS volumes + * fixed handling of cuesheets in zip files + * fixed writing tags into tiny ogg files + * fixed handling FLAC files with huge block sizes over 100KB + * replaced mp3 parsing code with the new library, which is + more reliable and tested, and can handle even more obscure + mp3 files + * renamed Looping and Order menus to Repeat and Shuffle, + respectively + * fixed loading larger Songlenths.txt in sid plugin, and added + support for Songlengths.md5 + +- Refreshed deadbeef-fix_ubuntu_unity_desktop.patch and + deadbeef-compiler-warnings.patch + +- Dropped 0001-Explicitly-specify-signedness-for-char.patch and + 0002-Use-signed-values-instead-of-potentially-unsigned-li.patch + (no longer necessary) + +- Enabled opus + +------------------------------------------------------------------- Old: ---- 0001-Explicitly-specify-signedness-for-char.patch 0002-Use-signed-values-instead-of-potentially-unsigned-li.patch deadbeef-0.7.2.tar.bz2 New: ---- _service deadbeef-1.8.2.tar.gz deadbeef-better-ogg-and-aac-converter-support.patch deadbeef-drop-documents-installation.patch deadbeef-fix-return-type.patch deadbeef_disable_psf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deadbeef.spec ++++++ --- /var/tmp/diff_new_pack.7vThvU/_old 2020-02-19 18:48:14.851001575 +0100 +++ /var/tmp/diff_new_pack.7vThvU/_new 2020-02-19 18:48:14.851001575 +0100 @@ -1,7 +1,7 @@ # # spec file for package deadbeef # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,32 +12,40 @@ # 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/ # %bcond_with restricted + Name: deadbeef -Version: 0.7.2 +Version: 1.8.2 Release: 0 Summary: GTK+ audio player -License: Zlib AND GPL-2.0+ AND LGPL-2.1+ AND BSD-3-Clause +License: Zlib AND GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause Group: Productivity/Multimedia/Sound/Players -Url: http://deadbeef.sourceforge.net/ -Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 +URL: https://deadbeef.sourceforge.io/ +Source: https://github.com/DeaDBeeF-Player/deadbeef/archive/%{version}/%{name}-%{version}.tar.gz Source1: %{name}.appdata.xml # PATCH-FIX-OPENSUSE deadbeef-fix_ubuntu_unity_desktop.patch [email protected] -- Fix Unity-oriented desktop-file warnings. Patch0: %{name}-fix_ubuntu_unity_desktop.patch # PATCH-FIX-OPENSUSE deadbeef-compiler-warnings.patch [email protected] -- Fix compiler warnings. Patch1: %{name}-compiler-warnings.patch -# PATCH-FIX-OPENSUSE 0001-Explicitly-specify-signedness-for-char.patch -- Explicitly specify signedness for char -Patch2: 0001-Explicitly-specify-signedness-for-char.patch -# PATCH-FIX-OPENSUSE 0002-Use-signed-values-instead-of-potentially-unsigned-li.patch -Patch3: 0002-Use-signed-values-instead-of-potentially-unsigned-li.patch # PATCH-FIX-OPENSUSE 0003-Fix-operator-precedence-and-uninitialized-value-warn.patch Patch4: 0003-Fix-operator-precedence-and-uninitialized-value-warn.patch +# PATCH-FEATURE-OPENSUSE deadbeef_disable_psf.patch [email protected] -- Do not look for plugins/psf. +Patch5: deadbeef_disable_psf.patch +# PATCH-FIX-UPSTREAM deadbeef-fix-return-type.patch [email protected] Fix return type +Patch6: deadbeef-fix-return-type.patch +# PATCH-FIX-OPENSUSE deadbeef-drop-documents-installation.patch [email protected] Install documents by rpmbuild +Patch7: deadbeef-drop-documents-installation.patch +# PATCH-FIX-UPSTREAM deadbeef-better-ogg-and-aac-converter-support.patch [email protected] More profiles for ogg and aac +# Bring the feature to openSUSE first. +# https://github.com/DeaDBeeF-Player/deadbeef/pull/2338 +Patch8: deadbeef-better-ogg-and-aac-converter-support.patch BuildRequires: autoconf BuildRequires: automake +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: intltool @@ -66,6 +74,7 @@ BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libzip) BuildRequires: pkgconfig(mad) +BuildRequires: pkgconfig(opusfile) BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(samplerate) BuildRequires: pkgconfig(sndfile) @@ -76,7 +85,7 @@ Recommends: %{name}-lang %if %{with restricted} BuildRequires: libfaad-devel -Requires: %{name}-plugins-extra = %{version} +Requires: %{name}-plugins-extra = %{version}-%{release} %else Recommends: %{name}-plugins-extra = %{version} %endif @@ -93,11 +102,12 @@ %if %{with restricted} %package plugins-extra Summary: Extra plugins for DeaDBeeF -License: Zlib AND GPL-2.0+ AND LGPL-2.1+ AND BSD-3-Clause AND Unicode AND SUSE-NonFree +License: Zlib AND GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause AND Unicode AND NonFree Group: Productivity/Multimedia/Sound/Players Requires: %{name} = %{version} Obsoletes: %{name}-restricted-plugins < %{version} -Provides: %{name}-restricted-plugins = %{version} +Provides: %{name}-restricted-plugins = %{version}-%{version} +Recommends: faac %description plugins-extra Extra plugins for DeaDBeeF audio player. @@ -113,50 +123,38 @@ This package provides headers for DeaDBeeF plugins development. %prep -%setup -q +%setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 cp %{SOURCE1} %{name}.appdata.xml %build -autoreconf -fi +NOCONFIGURE=1 ./autogen.sh export CFLAGS="%{optflags} -fno-strict-aliasing" export CXXFLAGS="$CFLAGS" -%configure \ - --disable-static \ -%if %{with restricted} - --enable-psf \ -%else - --disable-psf \ -%endif - --docdir=%{_docdir}/%{name}/ -make %{?_smp_mflags} V=1 +%configure --disable-static +%make_build %install %make_install install -Dpm 0644 %{name}.appdata.xml \ - %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml +%{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml %suse_update_desktop_file %{name} find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name} - -%if 0%{?suse_version} <= 1320 -%post -%desktop_database_post -%icon_theme_cache_post - -%postun -%desktop_database_postun -%icon_theme_cache_postun -%endif +%fdupes -s %{buildroot}%{_libdir}/%{name}/data68/Replay %files -%doc %{_docdir}/%{name}/ +%doc README README.md help.txt about.txt translators.txt CONTRIBUTING.md +%doc AUTHORS ChangeLog translation/help.ru.txt ABOUT-NLS +%license COPYING COPYING.GPLv2 COPYING.LGPLv2.1 %{_bindir}/%{name} %dir %{_libdir}/%{name}/ %{_libdir}/%{name}/adplug.so* @@ -173,6 +171,7 @@ %{_libdir}/%{name}/nullout.so* %{_libdir}/%{name}/oss.so* %{_libdir}/%{name}/pulse.so* +%{_libdir}/%{name}/rg_scanner.so* %{_libdir}/%{name}/sid.so* %{_libdir}/%{name}/sndfile.so* %{_libdir}/%{name}/supereq.so* @@ -184,6 +183,7 @@ %{_libdir}/%{name}/dca.so* %{_libdir}/%{name}/mms.so* %{_libdir}/%{name}/musepack.so* +%{_libdir}/%{name}/opus.so* %{_libdir}/%{name}/shellexec.so* %{_libdir}/%{name}/tta.so* %{_libdir}/%{name}/wildmidi.so* @@ -214,7 +214,6 @@ %if %{with restricted} %files plugins-extra %{_libdir}/%{name}/aac.so* -%{_libdir}/%{name}/ddb_ao.so* %endif %files devel ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="url">https://github.com/DeaDBeeF-Player/deadbeef.git</param> <param name="scm">git</param> <param name="exclude">osx</param> <param name="exclude">plugins/psf</param> <param name="exclude">tools</param> <param name="exclude">.git</param> <param name="revision">1.8.1</param> <param name="versionformat">@PARENT_TAG@</param> <param name="filename">deadbeef_nopsf</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="disabled" name="set_version" /> </services> ++++++ deadbeef-better-ogg-and-aac-converter-support.patch ++++++ diff -Nur deadbeef-1.8.2/plugins/converter/convpresets/AAC_(Nero_FAAC).txt deadbeef-1.8.2-new/plugins/converter/convpresets/AAC_(Nero_FAAC).txt --- deadbeef-1.8.2/plugins/converter/convpresets/AAC_(Nero_FAAC).txt 2019-08-02 02:36:50.000000000 +0800 +++ deadbeef-1.8.2-new/plugins/converter/convpresets/AAC_(Nero_FAAC).txt 1970-01-01 08:00:00.000000000 +0800 @@ -1,11 +0,0 @@ -title AAC (Nero FAAC) -ext mp4 -encoder faac -w -o %o - -method 0 -id3v2_version 0 -tag_id3v2 0 -tag_id3v1 0 -tag_apev2 0 -tag_flac 0 -tag_oggvorbis 0 -tag_mp4 1 diff -Nur deadbeef-1.8.2/plugins/converter/convpresets/AAC_VBR_192Kbps_(Nero_FAAC).txt deadbeef-1.8.2-new/plugins/converter/convpresets/AAC_VBR_192Kbps_(Nero_FAAC).txt --- deadbeef-1.8.2/plugins/converter/convpresets/AAC_VBR_192Kbps_(Nero_FAAC).txt 1970-01-01 08:00:00.000000000 +0800 +++ deadbeef-1.8.2-new/plugins/converter/convpresets/AAC_VBR_192Kbps_(Nero_FAAC).txt 2020-02-14 21:10:08.903061000 +0800 @@ -0,0 +1,11 @@ +title AAC VBR 192kbps (Nero FAAC) +ext m4a +encoder faac -q 200 -w -o %o - +method 0 +id3v2_version 0 +tag_id3v2 0 +tag_id3v1 0 +tag_apev2 0 +tag_flac 0 +tag_oggvorbis 0 +tag_mp4 1 diff -Nur deadbeef-1.8.2/plugins/converter/convpresets/AAC_VBR_256Kbps_(Nero_FAAC).txt deadbeef-1.8.2-new/plugins/converter/convpresets/AAC_VBR_256Kbps_(Nero_FAAC).txt --- deadbeef-1.8.2/plugins/converter/convpresets/AAC_VBR_256Kbps_(Nero_FAAC).txt 1970-01-01 08:00:00.000000000 +0800 +++ deadbeef-1.8.2-new/plugins/converter/convpresets/AAC_VBR_256Kbps_(Nero_FAAC).txt 2020-02-16 16:56:24.022674708 +0800 @@ -0,0 +1,11 @@ +title AAC VBR 256kbps (Nero FAAC) +ext m4a +encoder faac -q 300 -w -o %o - +method 0 +id3v2_version 0 +tag_id3v2 0 +tag_id3v1 0 +tag_apev2 0 +tag_flac 0 +tag_oggvorbis 0 +tag_mp4 1 diff -Nur deadbeef-1.8.2/plugins/converter/convpresets/AAC_VBR_320Kbps_(Nero_FAAC).txt deadbeef-1.8.2-new/plugins/converter/convpresets/AAC_VBR_320Kbps_(Nero_FAAC).txt --- deadbeef-1.8.2/plugins/converter/convpresets/AAC_VBR_320Kbps_(Nero_FAAC).txt 1970-01-01 08:00:00.000000000 +0800 +++ deadbeef-1.8.2-new/plugins/converter/convpresets/AAC_VBR_320Kbps_(Nero_FAAC).txt 2020-02-14 21:10:24.514992000 +0800 @@ -0,0 +1,11 @@ +title AAC VBR 320kbps (Nero FAAC) +ext m4a +encoder faac -q 500 -w -o %o - +method 0 +id3v2_version 0 +tag_id3v2 0 +tag_id3v1 0 +tag_apev2 0 +tag_flac 0 +tag_oggvorbis 0 +tag_mp4 1 diff -Nur deadbeef-1.8.2/plugins/converter/convpresets/Ogg_VBR_192Kbps.txt deadbeef-1.8.2-new/plugins/converter/convpresets/Ogg_VBR_192Kbps.txt --- deadbeef-1.8.2/plugins/converter/convpresets/Ogg_VBR_192Kbps.txt 1970-01-01 08:00:00.000000000 +0800 +++ deadbeef-1.8.2-new/plugins/converter/convpresets/Ogg_VBR_192Kbps.txt 2020-02-14 21:19:59.992432000 +0800 @@ -0,0 +1,10 @@ +title Ogg Vorbis VBR 192kbps +ext ogg +encoder oggenc -q 6 -o %o - +method 0 +id3v2_version 0 +tag_id3v2 0 +tag_id3v1 0 +tag_apev2 0 +tag_flac 0 +tag_oggvorbis 1 diff -Nur deadbeef-1.8.2/plugins/converter/convpresets/Ogg_VBR_256Kbps.txt deadbeef-1.8.2-new/plugins/converter/convpresets/Ogg_VBR_256Kbps.txt --- deadbeef-1.8.2/plugins/converter/convpresets/Ogg_VBR_256Kbps.txt 1970-01-01 08:00:00.000000000 +0800 +++ deadbeef-1.8.2-new/plugins/converter/convpresets/Ogg_VBR_256Kbps.txt 2020-02-14 21:16:34.625346000 +0800 @@ -0,0 +1,10 @@ +title Ogg Vorbis VBR 256kbps +ext ogg +encoder oggenc -q 8 -o %o - +method 0 +id3v2_version 0 +tag_id3v2 0 +tag_id3v1 0 +tag_apev2 0 +tag_flac 0 +tag_oggvorbis 1 diff -Nur deadbeef-1.8.2/plugins/converter/convpresets/Ogg_VBR_320Kbps.txt deadbeef-1.8.2-new/plugins/converter/convpresets/Ogg_VBR_320Kbps.txt --- deadbeef-1.8.2/plugins/converter/convpresets/Ogg_VBR_320Kbps.txt 1970-01-01 08:00:00.000000000 +0800 +++ deadbeef-1.8.2-new/plugins/converter/convpresets/Ogg_VBR_320Kbps.txt 2020-02-14 21:19:09.784656000 +0800 @@ -0,0 +1,10 @@ +title Ogg Vorbis VBR 320kbps +ext ogg +encoder oggenc -q 9 -o %o - +method 0 +id3v2_version 0 +tag_id3v2 0 +tag_id3v1 0 +tag_apev2 0 +tag_flac 0 +tag_oggvorbis 1 diff -Nur deadbeef-1.8.2/plugins/converter/convpresets/Ogg_Vorbis_(-q_5).txt deadbeef-1.8.2-new/plugins/converter/convpresets/Ogg_Vorbis_(-q_5).txt --- deadbeef-1.8.2/plugins/converter/convpresets/Ogg_Vorbis_(-q_5).txt 2019-08-02 02:36:50.000000000 +0800 +++ deadbeef-1.8.2-new/plugins/converter/convpresets/Ogg_Vorbis_(-q_5).txt 1970-01-01 08:00:00.000000000 +0800 @@ -1,10 +0,0 @@ -title Ogg Vorbis (-q 5) -ext ogg -encoder oggenc -q 5 -o %o - -method 0 -id3v2_version 0 -tag_id3v2 0 -tag_id3v1 0 -tag_apev2 0 -tag_flac 0 -tag_oggvorbis 1 diff -Nur deadbeef-1.8.2/plugins/converter/Makefile.am deadbeef-1.8.2-new/plugins/converter/Makefile.am --- deadbeef-1.8.2/plugins/converter/Makefile.am 2019-08-02 02:36:50.000000000 +0800 +++ deadbeef-1.8.2-new/plugins/converter/Makefile.am 2020-02-16 16:55:07.799115782 +0800 @@ -1,12 +1,16 @@ convdata = \ - convpresets/AAC_(Nero_FAAC).txt\ + convpresets/AAC_VBR_192Kbps_(Nero_FAAC).txt\ + convpresets/AAC_VBR_256Kbps_(Nero_FAAC).txt\ + convpresets/AAC_VBR_320Kbps_(Nero_FAAC).txt\ convpresets/FLAC_(compression_level_5).txt\ convpresets/MP3_CBR_320_Kbps_(Lame).txt\ convpresets/MP3_VBR_192Kbps_(Lame).txt\ convpresets/MS_RIFF_WAV.txt\ convpresets/MusePack.txt\ convpresets/Ogg_FLAC.txt\ - convpresets/Ogg_Vorbis_(-q_5).txt\ + convpresets/Ogg_VBR_192Kbps.txt\ + convpresets/Ogg_VBR_256Kbps.txt\ + convpresets/Ogg_VBR_320Kbps.txt\ convpresets/Opus.txt\ convpresets/TTA.txt\ convpresets/WavPack.txt\ ++++++ deadbeef-compiler-warnings.patch ++++++ --- /var/tmp/diff_new_pack.7vThvU/_old 2020-02-19 18:48:14.891001617 +0100 +++ /var/tmp/diff_new_pack.7vThvU/_new 2020-02-19 18:48:14.891001617 +0100 @@ -1,31 +1,30 @@ > I: Program causes undefined operation > (likely same variable used twiceand post/pre incremented in the same > expression). > e.g. x = x++; Split it in two operations. -> W: deadbeef sequence-point ./../plugins/adplug/adplug/cff.cpp:381 -> W: deadbeef sequence-point ./../plugins/adplug/adplug/dmo.cpp:323, 343, 367 -> W: deadbeef sequence-point ../../plugins/vtx/lh5dec.c:95 -> W: deadbeef sequence-point ../../plugins/tta/ttadec.c:515 +> W: deadbeef sequence-point adplug/cff.cpp:381 +> W: deadbeef sequence-point adplug/dmo.cpp:323, 343, 367 +> W: deadbeef sequence-point lh5dec.c:95 +> W: deadbeef sequence-point ttadec.c:515 > > I: Statement might be overflowing a buffer in strncat. Common mistake: > BAD: strncat(buffer,charptr,sizeof(buffer)) is wrong, it takes the left > over size as 3rd argument > GOOD: strncat(buffer,charptr,sizeof(buffer)-strlen(buffer)-1) -> E: deadbeef bufferoverflowstrncat ../../plugins/sc68/libsc68/conf68.c:198, 258 +> E: deadbeef bufferoverflowstrncat libsc68/conf68.c:198:12 +> E: deadbeef bufferoverflowstrncat libsc68/conf68.c:258:14 > > I: Program returns random data in a function -> E: deadbeef no-return-in-nonvoid-function ../../plugins/pltbrowser/pltbrowser.c:719, 730 +> E: deadbeef no-return-in-nonvoid-function pltbrowser.c:748, 759 +> E: deadbeef no-return-in-nonvoid-function search.c:308 +> E: deadbeef no-return-in-nonvoid-function widgets.c:3347 > > I: Program returns random data in a function -> E: deadbeef no-return-in-nonvoid-function ../../plugins/pltbrowser/pltbrowser.c:719, 730 -> -> I: Expression compares a char* pointer with a string literal. -> Usually a strcmp() was intended by the programmer -> E: deadbeef stringcompare ../../plugins/gtkui/widgets.c:1188, 1221 +> E: deadbeef no-return-in-nonvoid-function pltbrowser.c:748, 759 +> E: deadbeef no-return-in-nonvoid-function search.c:308 +> E: deadbeef no-return-in-nonvoid-function widgets.c:3347 --- -Index: deadbeef-0.7.0/plugins/adplug/adplug/cff.cpp -=================================================================== ---- deadbeef-0.7.0.orig/plugins/adplug/adplug/cff.cpp -+++ deadbeef-0.7.0/plugins/adplug/adplug/cff.cpp +--- a/plugins/adplug/adplug/cff.cpp ++++ b/plugins/adplug/adplug/cff.cpp @@ -377,8 +377,10 @@ long CcffLoader::cff_unpacker::unpack(un goto out; } @@ -39,10 +38,8 @@ code_length = old_code_length; -Index: deadbeef-0.7.0/plugins/adplug/adplug/dmo.cpp -=================================================================== ---- deadbeef-0.7.0.orig/plugins/adplug/adplug/dmo.cpp -+++ deadbeef-0.7.0/plugins/adplug/adplug/dmo.cpp +--- a/plugins/adplug/adplug/dmo.cpp ++++ b/plugins/adplug/adplug/dmo.cpp @@ -319,8 +319,10 @@ short CdmoLoader::dmo_unpacker::unpack_b if(opos + cx >= oend) return -1; @@ -82,33 +79,65 @@ for (i=0;i<ax;i++) *opos++ = *ipos++; -Index: deadbeef-0.7.0/plugins/gtkui/widgets.c -=================================================================== ---- deadbeef-0.7.0.orig/plugins/gtkui/widgets.c -+++ deadbeef-0.7.0/plugins/gtkui/widgets.c -@@ -1185,7 +1185,7 @@ w_splitter_lock (w_splitter_t *w) { +--- a/plugins/gtkui/plcommon.c ++++ b/plugins/gtkui/plcommon.c +@@ -1538,15 +1538,27 @@ on_group_by_custom_activate ( + gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (mainwin)); + GtkWidget *entry = lookup_widget (dlg, "format"); + char format[1024]; +- format[0] = 0; ++ char *p = format; ++ size_t remaining = sizeof(format) - 1; ++ size_t copy_len, sep_len = strlen(SUBGROUP_DELIMITER); + DdbListviewGroupFormat *fmt = listview->group_formats; + while (fmt) { +- if (format[0] != 0) { +- strncat(format, SUBGROUP_DELIMITER, sizeof(format)); ++ copy_len = strlen(fmt->format); ++ if (copy_len > remaining) ++ break; ++ if (p != format) { ++ if (copy_len + sep_len > remaining) ++ break; ++ memcpy(p, SUBGROUP_DELIMITER, sep_len); ++ remaining -= sep_len; ++ p += sep_len; + } +- strncat(format, fmt->format, sizeof(format)); ++ memcpy(p, fmt->format, copy_len); ++ remaining -= copy_len; ++ p += copy_len; + fmt = fmt->next; } - w->locked = 1; - -- int vert = w->base.type == "vsplitter"; -+ int vert = g_strcmp0(w->base.type, "vsplitter") == 0; - - GtkAllocation a; - gtk_widget_get_allocation (w->base.widget, &a); -@@ -1218,7 +1218,7 @@ w_splitter_unlock (w_splitter_t *w) { ++ *p = '\0'; + gtk_entry_set_text (GTK_ENTRY (entry), format); + // gtk_window_set_title (GTK_WINDOW (dlg), "Group by"); + gint response = gtk_dialog_run (GTK_DIALOG (dlg)); +--- a/plugins/gtkui/search.c ++++ b/plugins/gtkui/search.c +@@ -299,7 +299,7 @@ submit_refresh (void) { } - w->locked = 0; + } -- int vert = w->base.type == "vsplitter"; -+ int vert = g_strcmp0(w->base.type, "vsplitter") == 0; - // convert back to vpaned - GtkWidget *paned = vert ? gtk_vpaned_new () : gtk_hpaned_new (); - gtk_widget_set_can_focus (paned, FALSE); -Index: deadbeef-0.7.0/plugins/pltbrowser/pltbrowser.c -=================================================================== ---- deadbeef-0.7.0.orig/plugins/pltbrowser/pltbrowser.c -+++ deadbeef-0.7.0/plugins/pltbrowser/pltbrowser.c -@@ -707,7 +707,7 @@ add_treeview_column (w_pltbrowser_t *w, +-static gboolean ++static void + playlistswitch_cb (void) { + DdbListview *listview = playlist_visible(); + if (listview) { +--- a/plugins/gtkui/widgets.c ++++ b/plugins/gtkui/widgets.c +@@ -3338,7 +3338,7 @@ spectrum_realize (GtkWidget *widget, gpo + #endif + } + +-static int ++static void + w_spectrum_message (ddb_gtkui_widget_t *w, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) { + switch (id) { + case DB_EV_SONGCHANGED: { +--- a/plugins/pltbrowser/pltbrowser.c ++++ b/plugins/pltbrowser/pltbrowser.c +@@ -736,7 +736,7 @@ add_treeview_column (w_pltbrowser_t *w, static gboolean drag_row_active = FALSE; @@ -117,8 +146,8 @@ on_pltbrowser_drag_begin_event (GtkWidget *widget, GdkDragContext *drag_context, gint x, -@@ -718,7 +718,7 @@ on_pltbrowser_drag_begin_event - drag_row_active = TRUE; +@@ -748,7 +748,7 @@ on_pltbrowser_drag_begin_event + return FALSE; } -static gboolean @@ -126,10 +155,8 @@ on_pltbrowser_drag_end_event (GtkWidget *widget, GdkDragContext *drag_context, gint x, -Index: deadbeef-0.7.0/plugins/sc68/libsc68/conf68.c -=================================================================== ---- deadbeef-0.7.0.orig/plugins/sc68/libsc68/conf68.c -+++ deadbeef-0.7.0/plugins/sc68/libsc68/conf68.c +--- a/plugins/sc68/libsc68/conf68.c ++++ b/plugins/sc68/libsc68/conf68.c @@ -195,7 +195,7 @@ int config68_save(const char * confname) const int sizeof_config_hd = sizeof(config_header)-1; @@ -148,10 +175,8 @@ TRACE68(config68_cat, "conf68: trying -- '%s'\n", path); switch (opt->type) { -Index: deadbeef-0.7.0/plugins/tta/ttadec.c -=================================================================== ---- deadbeef-0.7.0.orig/plugins/tta/ttadec.c -+++ deadbeef-0.7.0/plugins/tta/ttadec.c +--- a/plugins/tta/ttadec.c ++++ b/plugins/tta/ttadec.c @@ -459,7 +459,7 @@ int get_samples (tta_info *info, byte *b byte *p = buffer; decoder *dec = info->tta; @@ -171,10 +196,8 @@ // decompress stage 1: adaptive hybrid filter hybrid_filter(fst, &value); -Index: deadbeef-0.7.0/plugins/vtx/lh5dec.c -=================================================================== ---- deadbeef-0.7.0.orig/plugins/vtx/lh5dec.c -+++ deadbeef-0.7.0/plugins/vtx/lh5dec.c +--- a/plugins/vtx/lh5dec.c ++++ b/plugins/vtx/lh5dec.c @@ -92,7 +92,7 @@ static void make_table(int nchar, unsign start[i] >>= jutbits; weight[i] = 1U << (tablebits - i); ++++++ deadbeef-drop-documents-installation.patch ++++++ diff -Nur deadbeef-1.8.2/Makefile.am deadbeef-1.8.2-new/Makefile.am --- deadbeef-1.8.2/Makefile.am 2019-08-02 02:36:50.000000000 +0800 +++ deadbeef-1.8.2-new/Makefile.am 2020-01-06 23:09:09.377726700 +0800 @@ -62,9 +62,9 @@ docsdir = $(docdir) -docs_DATA = README help.txt about.txt translators.txt ChangeLog\ - COPYING.GPLv2 COPYING.LGPLv2.1\ - translation/help.ru.txt +#docs_DATA = README help.txt about.txt translators.txt ChangeLog\ +# COPYING.GPLv2 COPYING.LGPLv2.1\ +# translation/help.ru.txt desktopdir = $(datadir)/applications desktop_DATA = deadbeef.desktop ++++++ deadbeef-fix-return-type.patch ++++++ diff -Nur deadbeef-1.8.2/plugins/gtkui/search.c deadbeef-1.8.2-new/plugins/gtkui/search.c --- deadbeef-1.8.2/plugins/gtkui/search.c 2020-01-07 16:17:52.110361067 +0800 +++ deadbeef-1.8.2-new/plugins/gtkui/search.c 2020-01-07 16:21:51.540578354 +0800 @@ -305,7 +305,6 @@ if (listview) { ddb_listview_list_setup(listview, 0); } - return FALSE; } int diff -Nur deadbeef-1.8.2/plugins/gtkui/widgets.c deadbeef-1.8.2-new/plugins/gtkui/widgets.c --- deadbeef-1.8.2/plugins/gtkui/widgets.c 2020-01-07 16:17:52.110361067 +0800 +++ deadbeef-1.8.2-new/plugins/gtkui/widgets.c 2020-01-07 16:20:13.650922265 +0800 @@ -3338,7 +3338,7 @@ #endif } -static void +static int w_spectrum_message (ddb_gtkui_widget_t *w, uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) { switch (id) { case DB_EV_SONGCHANGED: { diff -Nur deadbeef-1.8.2/plugins/pltbrowser/pltbrowser.c deadbeef-1.8.2-new/plugins/pltbrowser/pltbrowser.c --- deadbeef-1.8.2/plugins/pltbrowser/pltbrowser.c 2020-01-07 16:17:52.110361067 +0800 +++ deadbeef-1.8.2-new/plugins/pltbrowser/pltbrowser.c 2020-01-07 16:41:41.675064417 +0800 @@ -745,7 +745,6 @@ gpointer user_data) { drag_row_active = TRUE; - return FALSE; } static void @@ -757,7 +756,6 @@ gpointer user_data) { drag_row_active = FALSE; - return FALSE; } static gboolean ++++++ deadbeef-fix_ubuntu_unity_desktop.patch ++++++ --- /var/tmp/diff_new_pack.7vThvU/_old 2020-02-19 18:48:14.911001639 +0100 +++ /var/tmp/diff_new_pack.7vThvU/_new 2020-02-19 18:48:14.911001639 +0100 @@ -1,66 +1,49 @@ ---- a/deadbeef.desktop.in -+++ b/deadbeef.desktop.in -@@ -16,62 +16,4 @@ Type=Application - Icon=deadbeef - X-PulseAudio-Properties=media.role=music +Index: deadbeef-1.8.0/deadbeef.desktop.in +=================================================================== +--- deadbeef-1.8.0.orig/deadbeef.desktop.in ++++ deadbeef-1.8.0/deadbeef.desktop.in +@@ -20,44 +20,8 @@ Categories=Audio;AudioVideo;Player;GTK; + Keywords=Sound;Music;Audio;Player;Musicplayer;MP3 + Keywords[zh_TW]=Sound;Music;Audio;Player;Musicplayer;MP3;音樂;音樂播放器;播放器;音訊 -X-Ayatana-Desktop-Shortcuts=Play;Pause;Stop;Next;Prev -- --Keywords=Sound;Music;Audio;Player;Musicplayer;MP3 --Keywords[zh_TW]=Sound;Music;Audio;Player;Musicplayer;MP3;音樂;音樂播放器;播放器;音訊 -- + X-PulseAudio-Properties=media.role=music + -[Play Shortcut Group] -Name=Play +-Name[zh_CN]=播放 -Name[zh_TW]=播放 -Exec=deadbeef --play -TargetEnvironment=Unity - -[Pause Shortcut Group] -Name=Pause +-Name[zh_CN]=暂停 -Name[zh_TW]=暫停 -Exec=deadbeef --pause -TargetEnvironment=Unity - -[Stop Shortcut Group] -Name=Stop +-Name[zh_CN]=停止 -Name[zh_TW]=停止 -Exec=deadbeef --stop -TargetEnvironment=Unity - -[Next Shortcut Group] -Name=Next +-Name[zh_CN]=下一首 -Name[zh_TW]=下一首 -Exec=deadbeef --next -TargetEnvironment=Unity - -[Prev Shortcut Group] -Name=Prev +-Name[zh_CN]=上一首 -Name[zh_TW]=上一首 -Exec=deadbeef --prev -TargetEnvironment=Unity - --[Desktop Action Play] --Name=Play --Name[zh_TW]=播放 --Exec=deadbeef --play -- --[Desktop Action Pause] --Name=Pause --Name[zh_TW]=暫停 --Exec=deadbeef --pause -- --[Desktop Action Stop] --Name=Stop --Name[zh_TW]=停止 --Exec=deadbeef --stop -- --[Desktop Action Next] --Name=Next --Name[zh_TW]=下一首 --Exec=deadbeef --next -- --[Desktop Action Previous] --Name=Prev --Name[zh_TW]=上一首 --Exec=deadbeef --prev -+Keywords=Sound;Music;Audio;Player;Musicplayer;MP3; + [Desktop Action Play] + Name=Play + Name[zh_CN]=播放 ++++++ deadbeef_disable_psf.patch ++++++ --- a/configure.ac +++ b/configure.ac @@ -125,7 +125,6 @@ AC_ARG_ENABLE(artwork-imlib2, [AS_HELP_S dnl AC_ARG_ENABLE(medialib, [AS_HELP_STRING([--enable-medialib ], [build medialibrary plugin (default: auto)])], [enable_medialib=$enableval], [enable_medialib=no]) AC_ARG_ENABLE(dumb, [AS_HELP_STRING([--enable-dumb ], [build DUMB plugin (default: auto)])], [enable_dumb=$enableval], [enable_dumb=yes]) AC_ARG_ENABLE(shn, [AS_HELP_STRING([--enable-shn ], [build SHN plugin (default: auto)])], [enable_shn=$enableval], [enable_shn=yes]) -AC_ARG_ENABLE(psf, [AS_HELP_STRING([--enable-psf ], [build AOSDK-based PSF(,QSF,SSF,DSF) plugin (default: auto)])], [enable_psf=$enableval], [enable_psf=yes]) AC_ARG_ENABLE(mono2stereo, [AS_HELP_STRING([--enable-mono2stereo ], [build mono2stereo DSP plugin (default: auto)])], [enable_mono2stereo=$enableval], [enable_mono2stereo=yes]) AC_ARG_ENABLE(shellexecui, [AS_HELP_STRING([--enable-shellexecui ], [build shellexec GTK UI plugin (default: auto)])], [enable_shellexecui=$enableval], [enable_shellexecui=yes]) AC_ARG_ENABLE(alac, [AS_HELP_STRING([--enable-alac ], [build ALAC plugin (default: auto)])], [enable_alac=$enableval], [enable_alac=yes]) @@ -781,10 +780,6 @@ AS_IF([test "${enable_shn}" != "no"], [ HAVE_SHN=yes ]) -AS_IF([test "${enable_psf}" != "no" -a "${HAVE_ZLIB}" = "yes"], [ - HAVE_PSF=yes -]) - AS_IF([test "${enable_mono2stereo}" != "no"], [ HAVE_MONO2STEREO=yes ]) @@ -822,7 +817,7 @@ AS_IF([test "${enable_rgscanner}" != "no HAVE_RGSCANNER=yes ]) -PLUGINS_DIRS="plugins/liboggedit plugins/libmp4ff plugins/libparser plugins/lastfm plugins/mp3 plugins/vorbis plugins/opus plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork-legacy plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/psf plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio plugins/sc68 plugins/rg_scanner" +PLUGINS_DIRS="plugins/liboggedit plugins/libmp4ff plugins/libparser plugins/lastfm plugins/mp3 plugins/vorbis plugins/opus plugins/flac plugins/wavpack plugins/sndfile plugins/vfs_curl plugins/cdda plugins/gtkui plugins/alsa plugins/ffmpeg plugins/hotkeys plugins/oss plugins/artwork-legacy plugins/adplug plugins/ffap plugins/sid plugins/nullout plugins/supereq plugins/vtx plugins/gme plugins/pulse plugins/notify plugins/musepack plugins/wildmidi plugins/tta plugins/dca plugins/aac plugins/mms plugins/shellexec plugins/shellexecui plugins/dsp_libsrc plugins/m3u plugins/vfs_zip plugins/converter plugins/dumb plugins/shn plugins/mono2stereo plugins/alac plugins/wma plugins/pltbrowser plugins/coreaudio plugins/sc68 plugins/rg_scanner" AM_CONDITIONAL(APE_USE_YASM, test "x$APE_USE_YASM" = "xyes") AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBISPLUGIN" = "xyes") @@ -875,7 +870,6 @@ AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PN AM_CONDITIONAL(HAVE_YASM, test "x$HAVE_YASM" = "xyes") dnl AM_CONDITIONAL(HAVE_MEDIALIB, test "x$HAVE_MEDIALIB" = "xyes") AM_CONDITIONAL(HAVE_DUMB, test "x$HAVE_DUMB" = "xyes") -AM_CONDITIONAL(HAVE_PSF, test "x$HAVE_PSF" = "xyes") AM_CONDITIONAL(HAVE_SHN, test "x$HAVE_SHN" = "xyes") AM_CONDITIONAL(HAVE_MONO2STEREO, test "x$HAVE_MONO2STEREO" = "xyes") dnl AM_CONDITIONAL(HAVE_SM, test "x$HAVE_SM" = "xyes") @@ -938,7 +932,6 @@ plugins/m3u/Makefile plugins/vfs_zip/Makefile plugins/converter/Makefile plugins/dumb/Makefile -plugins/psf/Makefile plugins/shn/Makefile plugins/mono2stereo/Makefile plugins/shellexecui/Makefile @@ -1019,7 +1012,6 @@ PRINT_PLUGIN_INFO([m3u],[M3U and PLS pla PRINT_PLUGIN_INFO([vfs_zip],[zip archive support],[test "x$HAVE_VFS_ZIP" = "xyes"]) PRINT_PLUGIN_INFO([converter],[plugin for converting files to any formats],[test "x$HAVE_CONVERTER" = "xyes"]) dnl PRINT_PLUGIN_INFO([medialib],[media library support plugin],[test "x$HAVE_MEDIALIB" = "xyes"]) -PRINT_PLUGIN_INFO([psf],[PSF player, using Audio Overload SDK],[test "x$HAVE_PSF" = "xyes"]) PRINT_PLUGIN_INFO([dumb],[DUMB module plugin, for MOD, S3M, etc],[test "x$HAVE_DUMB" = "xyes"]) PRINT_PLUGIN_INFO([shn],[SHN plugin based on xmms-shn],[test "x$HAVE_SHN" = "xyes"]) PRINT_PLUGIN_INFO([mono2stereo],[mono2stereo DSP plugin],[test "x$HAVE_MONO2STEREO" = "xyes"])
