diff --git a/.gitignore b/.gitignore index 8ca456f..013c474 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /audacious-3.3.4.tar.bz2 /audacious-3.4-alpha1.tar.bz2 /audacious-3.4-beta1.tar.bz2 +/audacious-3.4-beta2.tar.bz2 diff --git a/audacious-3.4-beta1-id3-time-tag.patch b/audacious-3.4-beta1-id3-time-tag.patch deleted file mode 100644 index 13e8b3c..0000000 --- a/audacious-3.4-beta1-id3-time-tag.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Nurb --strip-trailing-cr /tmp/tmp.MA77uIJbNk/audacious-old/src/libaudtag/id3/id3v24.c audacious/src/libaudtag/id3/id3v24.c ---- /tmp/tmp.MA77uIJbNk/audacious-old/src/libaudtag/id3/id3v24.c 2012-06-29 11:00:05.000000000 +0200 -+++ audacious/src/libaudtag/id3/id3v24.c 2013-05-13 11:00:06.662680438 +0200 -@@ -36,7 +36,6 @@ - ID3_COMPOSER, - ID3_COPYRIGHT, - ID3_DATE, -- ID3_TIME, - ID3_LENGTH, - ID3_ARTIST, - ID3_TRACKNR, -@@ -51,9 +50,9 @@ - ID3_TAGS_NO - }; - --static const char * id3_frames[ID3_TAGS_NO] = {"TALB","TIT2","TCOM", "TCOP", -- "TDAT", "TIME", "TLEN", "TPE1", "TRCK", "TYER","TCON", "COMM", "PRIV", "TSSE", -- "TDRC", "TXXX", "RVA2"}; -+static const char * id3_frames[ID3_TAGS_NO] = {"TALB", "TIT2", "TCOM", "TCOP", -+ "TDAT", "TLEN", "TPE1", "TRCK", "TYER", "TCON", "COMM", "PRIV", "TSSE", "TDRC", -+ "TXXX", "RVA2"}; - - static const unsigned char PRIMARY_CLASS_MUSIC[16] = {0xBC, 0x7D, 0x60, 0xD1, 0x23, - 0xE3, 0xE2, 0x4B, 0x86, 0xA1, 0x48, 0xA4, 0x2A, 0x28, 0x44, 0x1E}; -@@ -859,9 +858,6 @@ - case ID3_DATE: - associate_string (tuple, FIELD_DATE, NULL, data, size); - break; -- case ID3_TIME: -- associate_int (tuple, FIELD_LENGTH, NULL, data, size); -- break; - case ID3_LENGTH: - associate_int (tuple, FIELD_LENGTH, NULL, data, size); - break; - diff --git a/audacious-3.4-beta1-resume-git89e1806.patch b/audacious-3.4-beta1-resume-git89e1806.patch deleted file mode 100644 index 26871d4..0000000 --- a/audacious-3.4-beta1-resume-git89e1806.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nur audacious-3.4-beta1-orig/src/audacious/drct.c audacious-3.4-beta1/src/audacious/drct.c ---- audacious-3.4-beta1-orig/src/audacious/drct.c 2013-04-22 00:07:56.000000000 +0200 -+++ audacious-3.4-beta1/src/audacious/drct.c 2013-04-25 20:37:29.140878903 +0200 -@@ -49,7 +49,11 @@ - } - } - else -- drct_play_playlist (playlist_get_active ()); -+ { -+ int playlist = playlist_get_active (); -+ playlist_set_position (playlist, playlist_get_position (playlist)); -+ drct_play_playlist (playlist); -+ } - } - - void drct_play_pause (void) diff --git a/audacious.spec b/audacious.spec index f349356..bbbad42 100644 --- a/audacious.spec +++ b/audacious.spec @@ -1,14 +1,14 @@ # Minimum audacious/audacious-plugins version in inter-package dependencies. %global aud_ver 3.4 -%global tar_ver 3.4-beta1 +%global tar_ver 3.4-beta2 # Audacious Generic Plugin API defined in audacious-libs subpackage. Name: audacious Version: 3.4 -Release: 0.3.beta1%{?dist} +Release: 0.4.beta2%{?dist} License: BSD Summary: Advanced audio player @@ -17,10 +17,6 @@ Group: Applications/Multimedia Source0: http://distfiles.audacious-media-player.org/audacious-%{tar_ver}.tar.bz2 -Patch0: audacious-3.4-beta1-resume-git89e1806.patch -# upstream fix for #290 -Patch1: audacious-3.4-beta1-id3-time-tag.patch - BuildRequires: gettext BuildRequires: gtk3-devel BuildRequires: libguess-devel @@ -29,11 +25,6 @@ BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils BuildRequires: doxygen -# temporarily for aarch64 config.* files autoreconf -BuildRequires: automake >= 1.13 -BuildRequires: autoconf >= 2.69 -BuildRequires: gettext-devel - # The automatic SONAME dependency is not enough # during version upgrades. Requires: audacious-libs%{?_isa} = %{version}-%{release} @@ -96,11 +87,6 @@ Files needed when building software for the Audacious audio player. %prep %setup -q -n %{name}-%{tar_ver} -%patch0 -p1 -b .resume -%patch1 -p1 -b .id3-time-tag -# https://bugzilla.redhat.com/925050 -# fixed upstream after 3.4-beta1 -autoreconf -f -I m4 # Verify the value of the audacious(plugin-api) Provides. api=$(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION[ ]\+' src/audacious/plugin.h | sed 's!.*_AUD_PLUGIN_VERSION[ ]*\([0-9]\+\).*!\1!') @@ -175,6 +161,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Wed Jun 12 2013 Michael Schwendt - 3.4-0.4.beta2 +- Update to 3.4-beta2 (which also includes newer Autotools files). + * Mon May 13 2013 Michael Schwendt - 3.4-0.3.beta1 - Merge upstream fix for incorrect parsing of ID3 "TIME" field. diff --git a/sources b/sources index 2eac069..f6628c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -256143f18ba969f6a58bebdf21c80287 audacious-3.4-beta1.tar.bz2 +90226520fbf96b0db19ad037cc279896 audacious-3.4-beta2.tar.bz2