diff --git a/.gitignore b/.gitignore index 534682b..b635cf9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /xmp-plugin-audacious-4.0.0-e0213c0.tar.gz /xmp-plugin-audacious-4.0.0-fae5d38.tar.gz /xmp-plugin-audacious-4.0.0-ff91487.tar.gz +/xmp-plugin-audacious-4.0.0-7a354bb.tar.gz diff --git a/sources b/sources index d6ac8df..3d6ec46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -934832356d7afbf6f93772fe55520ffe xmp-plugin-audacious-4.0.0-ff91487.tar.gz +51ef451b617e992bcda8ea6939c54ad2 xmp-plugin-audacious-4.0.0-7a354bb.tar.gz diff --git a/xmp-plugin-audacious-api45.patch b/xmp-plugin-audacious-api45.patch deleted file mode 100644 index 22f823d..0000000 --- a/xmp-plugin-audacious-api45.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Nurb --strip-trailing-cr xmp-plugin-audacious-ff914873bbf8bcdd552c78accfdb456c1cd76d5c-orig/audacious3.c xmp-plugin-audacious-ff914873bbf8bcdd552c78accfdb456c1cd76d5c-aud45/audacious3.c ---- xmp-plugin-audacious-ff914873bbf8bcdd552c78accfdb456c1cd76d5c-orig/audacious3.c 2013-11-27 16:47:03.000000000 +0100 -+++ xmp-plugin-audacious-ff914873bbf8bcdd552c78accfdb456c1cd76d5c-aud45/audacious3.c 2014-03-01 00:14:44.758087493 +0100 -@@ -251,9 +251,15 @@ - - tuple = tuple_new_from_filename(filename); - g_free(filename); -+#if _AUD_PLUGIN_VERSION >= 45 -+ tuple_set_str(tuple, FIELD_TITLE, mi.mod->name); -+ tuple_set_str(tuple, FIELD_CODEC, mi.mod->type); -+ tuple_set_int(tuple, FIELD_LENGTH, fi.total_time); -+#else - tuple_set_str(tuple, FIELD_TITLE, NULL, mi.mod->name); - tuple_set_str(tuple, FIELD_CODEC, NULL, mi.mod->type); - tuple_set_int(tuple, FIELD_LENGTH, NULL, fi.total_time); -+#endif - - xmp_release_module(ctx); - xmp_free_context(ctx); -@@ -364,9 +370,15 @@ - - tuple = tuple_new_from_filename(filename); - g_free(filename); -+#if _AUD_PLUGIN_VERSION >= 45 -+ tuple_set_str(tuple, FIELD_TITLE, plugin_cfg.mod_info.mod->name); -+ tuple_set_str(tuple, FIELD_CODEC, plugin_cfg.mod_info.mod->type); -+ tuple_set_int(tuple, FIELD_LENGTH, fi.total_time); -+#else - tuple_set_str(tuple, FIELD_TITLE, NULL, plugin_cfg.mod_info.mod->name); - tuple_set_str(tuple, FIELD_CODEC, NULL, plugin_cfg.mod_info.mod->type); - tuple_set_int(tuple, FIELD_LENGTH, NULL, fi.total_time); -+#endif - #if _AUD_PLUGIN_VERSION < 45 - ipb->set_tuple(ipb, tuple); - diff --git a/xmp-plugin-audacious-rpm.patch b/xmp-plugin-audacious-rpm.patch deleted file mode 100644 index 3fcc055..0000000 --- a/xmp-plugin-audacious-rpm.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -up xmp-plugin-audacious-8c492d73aceacd2c98d42cd8936ea73d74a8c033/Makefile.r xmp-plugin-audacious-8c492d73aceacd2c98d42cd8936ea73d74a8c033/Makefile ---- xmp-plugin-audacious-8c492d73aceacd2c98d42cd8936ea73d74a8c033/Makefile.r 2013-06-26 23:56:27.000000000 +0200 -+++ xmp-plugin-audacious-8c492d73aceacd2c98d42cd8936ea73d74a8c033/Makefile 2013-07-12 01:37:24.366961927 +0200 -@@ -1,7 +1,8 @@ - VERSION = 4.0.0 - - CC = gcc --CFLAGS = -c -Wall -g -O2 -fPIC -D_REENTRANT \ -+OPTFLAGS = -g -O2 -+CFLAGS = -c -Wall $(OPTFLAGS) -fPIC -D_REENTRANT \ - `pkg-config --cflags libxmp audacious glib-2.0` - LD = gcc - LDFLAGS = -@@ -16,6 +17,7 @@ DIST = audacious-plugin-xmp-$(VERSION) - DFILES = README INSTALL COPYING CREDITS Changelog configure \ - install-sh configure.ac Makefile.in - DDIRS = -+OBJS = audacious3.lo - - all: binaries - -@@ -41,11 +43,11 @@ clean: - install: install-plugin - - install-plugin: -- $(INSTALL) -+ $(INSTALL) -D xmp-audacious3.so $(DESTDIR)$(PLUGIN_DIR)/xmp-audacious3.so - - depend: - @echo Building dependencies... -- @$(CC) $(CFLAGS) -MM $(OBJS:.o=.c) > $@ -+ @$(CC) $(CFLAGS) -MM $(OBJS:.lo=.c) > $@ - - dist: dist-prepare dist-subdirs - diff --git a/xmp-plugin-audacious.spec b/xmp-plugin-audacious.spec index 35e9602..9bc71d9 100644 --- a/xmp-plugin-audacious.spec +++ b/xmp-plugin-audacious.spec @@ -1,23 +1,27 @@ -%global commit ff914873bbf8bcdd552c78accfdb456c1cd76d5c +%global commit 7a354bb5133be738499ab5a10abe2a2e60fefa65 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global plugin_dir %(pkg-config --variable=plugin_dir audacious) -%global aud_plugin_api %(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION[ ]\\+' %{_includedir}/audacious/api.h 2>/dev/null | sed 's!.*_AUD_PLUGIN_VERSION[ ]*\\([0-9]\\+\\).*!\\1!') +%global aud_plugin_api %(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION[ ]\\+' %{_includedir}/libaudcore/plugin.h 2>/dev/null | sed 's!.*_AUD_PLUGIN_VERSION[ ]*\\([0-9]\\+\\).*!\\1!') %if 0%{aud_plugin_api} > 0 %global aud_plugin_dep Requires: audacious(plugin-api)%{?_isa} = %{aud_plugin_api} %endif Name: xmp-plugin-audacious Version: 4.0.0 -Release: 0.9.20131127git%{shortcommit}%{?dist} +Release: 0.10.20141214git%{shortcommit}%{?dist} Summary: Multi-format module playback plugin for Audacious using libxmp Group: Applications/Multimedia -Source0: https://github.com/cmatsuoka/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz -Patch0: %{name}-rpm.patch -Patch1: xmp-plugin-audacious-api45.patch +#Source0: https://github.com/cmatsuoka/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz +# C++ usage in Audacious 3.6 required a larger rewrite: +# https://github.com/mschwendt/xmp-plugin-audacious +# git clone https://github.com/mschwendt/xmp-plugin-audacious.git xmp-plugin-audacious-4.0.0 ; cd xmp-plugin-audacious-4.0.0 +# git checkout -b 7a354bb5133be738499ab5a10abe2a2e60fefa65 ; rm -rf .git* +Source0: %{name}-%{version}-%{shortcommit}.tar.gz License: GPLv2+ URL: http://xmp.sourceforge.net/ +BuildRequires: libtool automake autoconf BuildRequires: audacious-devel BuildRequires: libxmp-devel %if 0%{?fedora} @@ -47,11 +51,12 @@ This package contains the xmp plugin for the Audacious media player. # just a guard pkg-config --print-variables audacious | grep ^plugin_dir -%setup -qn %{name}-%{commit} -%patch0 -p1 -b .r -%patch1 -p1 -b .old-api +#setup -qn %{name}-%{commit} +%setup -qn %{name}-%{version} +autoreconf -i %build +%configure make OPTFLAGS="%{optflags}" V=1 %{?_smp_mflags} %install @@ -60,8 +65,20 @@ make install DESTDIR=%{buildroot} %files %doc COPYING %{plugin_dir}/Input/*.so +%exclude %{plugin_dir}/Input/*.la %changelog +* Tue Mar 3 2015 Michael Schwendt - 4.0.0-0.10.20141214git7a354bb +- Copy from Fedora Copr builds but keep old package versioning scheme + for now. + +* Sun Dec 14 2014 Michael Schwendt +- Fix 8-bit sample precision. + +* Sun Dec 14 2014 Michael Schwendt +- Upgrade to preliminary fork for Audacious 3.6-alpha1. +- Plugin API version definition has moved to libaudcore header directory. + * Mon Aug 18 2014 Fedora Release Engineering - 4.0.0-0.9.20131127gitff91487 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild