mschwendt pushed to audacious-plugins (f22). "Update to 3.6.1 (56k diff). (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 14 14:08:00 UTC 2015
>From fbbe7d32dfe62575a20f945aeb9647e7e1a199b6 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Tue, 14 Apr 2015 16:06:55 +0200
Subject: Update to 3.6.1 (56k diff).
- Don't mention the old and dropped GSF plugin in subpackage description
anymore.
diff --git a/.gitignore b/.gitignore
index eb595a4..5bcc2bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
/audacious-plugins-3.5.1.tar.bz2
/audacious-plugins-3.5.2.tar.bz2
/audacious-plugins-3.6.tar.bz2
+/audacious-plugins-3.6.1.tar.bz2
diff --git a/audacious-plugins-3.6-arm-no-narrowing.patch b/audacious-plugins-3.6-arm-no-narrowing.patch
deleted file mode 100644
index 6d2a58f..0000000
--- a/audacious-plugins-3.6-arm-no-narrowing.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nur audacious-plugins-3.6-orig/src/adplug/core/s3m.cc audacious-plugins-3.6/src/adplug/core/s3m.cc
---- audacious-plugins-3.6-orig/src/adplug/core/s3m.cc 2015-02-28 22:57:53.000000000 +0100
-+++ audacious-plugins-3.6/src/adplug/core/s3m.cc 2015-03-03 16:53:52.260021152 +0100
-@@ -26,7 +26,7 @@
-
- #include "s3m.h"
-
--const char
-+const signed char
- Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion
- { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3,
- 4, 5, 6, 7, 8, -1, -1, -1, -1, -1, -1, -1 };
-diff -Nur audacious-plugins-3.6-orig/src/adplug/core/s3m.h audacious-plugins-3.6/src/adplug/core/s3m.h
---- audacious-plugins-3.6-orig/src/adplug/core/s3m.h 2015-02-28 22:57:53.000000000 +0100
-+++ audacious-plugins-3.6/src/adplug/core/s3m.h 2015-03-03 17:06:48.714707068 +0100
-@@ -90,7 +90,7 @@
- unsigned char crow,ord,speed,tempo,del,songend,loopstart,loopcnt;
-
- private:
-- static const char chnresolv[];
-+ static const signed char chnresolv[];
- static const unsigned short notetable[12];
- static const unsigned char vibratotab[32];
-
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index ad9e015..8e2ac77 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -12,8 +12,8 @@
%{?aud_plugin_dep}
Name: audacious-plugins
-Version: 3.6
-Release: 3%{?dist}
+Version: 3.6.1
+Release: 1%{?dist}
%if %{with gtk2}
%global tar_ver %{version}
@@ -44,9 +44,6 @@ Patch0: audacious-plugins-3.6-alpha1-xmms-skindir.patch
Patch1: audacious-plugins-3.6-alpha1-enable-gnomeshortcuts.patch
# Fedora customization: add default system-wide module_path
Patch2: audacious-plugins-3.6-ladspa.patch
-# new GCC 5 narrowing conversion build failure / Arch: armv7hl
-# applied upstream
-Patch3: audacious-plugins-3.6-arm-no-narrowing.patch
BuildRequires: audacious-devel >= %{aud_ver}
BuildRequires: gettext-devel
@@ -122,8 +119,7 @@ at a wide demographic audience. Most users of Audacious do not need this.
For example, included are input plugins for exotic audio file formats,
SID music (from Commodore 64 and compatibles), AdLib/OPL2 emulation,
console game music, the Portable Sound Format PSF1/PSF2, Vortex AM/YM
-emulation, Game Boy Advance Sound Format GSF, Nintendo DS Sound Format
-2SF.
+emulation, Nintendo DS Sound Format 2SF.
%package amidi
@@ -144,7 +140,6 @@ input plugin for Audacious.
%patch0 -p1 -b .xmms-skindir
%patch1 -p1 -b .enable-gnomeshortcuts
%patch2 -p1 -b .ladspa
-%patch3 -p1 -b .no-narrowing
for i in src/ladspa/plugin.cc
do
@@ -300,6 +295,11 @@ install -p -m0644 %{SOURCE102} ${RPM_BUILD_ROOT}%{_datadir}/appdata
%changelog
+* Thu Apr 9 2015 Michael Schwendt <mschwendt at fedoraproject.org> - 3.6.1-1
+- Update to 3.6.1 (56k diff).
+- Don't mention the old and dropped GSF plugin in subpackage description
+ anymore.
+
* Tue Mar 3 2015 Michael Schwendt <mschwendt at fedoraproject.org> - 3.6-3
- armv7hl build fails with a narrowing conversion GCC error not found
in Copr (x86_64/i686 only) builds. Probably further patches necessary.
diff --git a/sources b/sources
index bf04c93..c01aefc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f3ea8edde73f1b07848f02d5bb957d72 audacious-plugins-3.6.tar.bz2
+f1a2ef5fac0afa08d7f54b12f6f64a4e audacious-plugins-3.6.1.tar.bz2
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/audacious-plugins.git/commit/?h=f22&id=fbbe7d32dfe62575a20f945aeb9647e7e1a199b6
More information about the scm-commits
mailing list