Hello community, here is the log from the commit of package deadbeef for openSUSE:Factory checked in at 2020-02-18 13:29:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deadbeef (Old) and /work/SRC/openSUSE:Factory/.deadbeef.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deadbeef" Tue Feb 18 13:29:21 2020 rev:10 rq:775066 version:1.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/deadbeef/deadbeef.changes 2020-01-20 22:55:54.987354403 +0100 +++ /work/SRC/openSUSE:Factory/.deadbeef.new.26092/deadbeef.changes 2020-02-18 13:29:22.680699319 +0100 @@ -1,0 +2,11 @@ +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 + +------------------------------------------------------------------- New: ---- deadbeef-better-ogg-and-aac-converter-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deadbeef.spec ++++++ --- /var/tmp/diff_new_pack.DyYglm/_old 2020-02-18 13:29:23.564701038 +0100 +++ /var/tmp/diff_new_pack.DyYglm/_new 2020-02-18 13:29:23.568701045 +0100 @@ -1,7 +1,7 @@ # # spec file for package deadbeef # -# Copyright (c) 2020 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 @@ -39,6 +39,10 @@ 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 @@ -103,6 +107,7 @@ Requires: %{name} = %{version} Obsoletes: %{name}-restricted-plugins < %{version} Provides: %{name}-restricted-plugins = %{version}-%{version} +Recommends: faac %description plugins-extra Extra plugins for DeaDBeeF audio player. @@ -125,6 +130,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 cp %{SOURCE1} %{name}.appdata.xml ++++++ 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.DyYglm/_old 2020-02-18 13:29:23.620701146 +0100 +++ /var/tmp/diff_new_pack.DyYglm/_new 2020-02-18 13:29:23.620701146 +0100 @@ -79,6 +79,40 @@ for (i=0;i<ax;i++) *opos++ = *ipos++; +--- 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; + } ++ *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) {
