diff -Nru fil-plugins-0.1.0/AUTHORS fil-plugins-0.3.0/AUTHORS --- fil-plugins-0.1.0/AUTHORS 2005-05-17 22:05:50.000000000 +0100 +++ fil-plugins-0.3.0/AUTHORS 2009-06-09 21:13:39.000000000 +0100 @@ -1 +1 @@ -Fons Adriaensen +Fons Adriaensen diff -Nru fil-plugins-0.1.0/debian/changelog fil-plugins-0.3.0/debian/changelog --- fil-plugins-0.1.0/debian/changelog 2010-01-22 11:48:11.000000000 +0000 +++ fil-plugins-0.3.0/debian/changelog 2010-01-22 11:48:11.000000000 +0000 @@ -1,3 +1,22 @@ +fil-plugins (0.3.0-1) unstable; urgency=low + + * New upstream release. + * Switch to debhelper 7. + * Switch to quilt patch system. + * Refresh and convert all patches to quilt format. + * debian/control: + - Bump Standards. + - Set Debian Multimedia Maintainers as Maintainer. + - Add myself as uploader. + - Allow uploads by DM. + - Add Vcs-* tags. + - Add Homepage field. + - Build-depend on ladspa-sdk. + * Bump debian/watch version to 3. + * Update debian/copyright. + + -- Alessio Treglia Sat, 09 Jan 2010 01:53:21 +0100 + fil-plugins (0.1.0-2) unstable; urgency=low * Fixed watch filed diff -Nru fil-plugins-0.1.0/debian/compat fil-plugins-0.3.0/debian/compat --- fil-plugins-0.1.0/debian/compat 2010-01-22 11:48:11.000000000 +0000 +++ fil-plugins-0.3.0/debian/compat 2010-01-22 11:48:11.000000000 +0000 @@ -1 +1 @@ -4 +7 diff -Nru fil-plugins-0.1.0/debian/control fil-plugins-0.3.0/debian/control --- fil-plugins-0.1.0/debian/control 2010-01-22 11:48:11.000000000 +0000 +++ fil-plugins-0.3.0/debian/control 2010-01-22 11:48:11.000000000 +0000 @@ -1,14 +1,22 @@ Source: fil-plugins Section: sound Priority: optional -Maintainer: Debian Multimedia Team -Uploaders: Free Ekanayaka -Build-Depends: debhelper (>= 4.0.0), dpatch -Standards-Version: 3.7.2 +Maintainer: Debian Multimedia Maintainers +Uploaders: Free Ekanayaka , + Alessio Treglia +Build-Depends: debhelper (>= 7.0.50~), + ladspa-sdk, + quilt (>= 0.46-7~) +DM-Upload-Allowed: yes +Homepage: http://www.kokkinizita.net/linuxaudio/index.html +Vcs-Git: git://git.debian.org/git/pkg-multimedia/fil-plugins.git +Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/fil-plugins.git;a=summary +Standards-Version: 3.8.3 Package: fil-plugins Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} Description: parametric equalizer LADSPA plugin Four-band parametric equaliser. Each section has an active/bypass switch, frequency, bandwidth and gain controls. There is also a global bypass diff -Nru fil-plugins-0.1.0/debian/copyright fil-plugins-0.3.0/debian/copyright --- fil-plugins-0.1.0/debian/copyright 2010-01-22 11:48:11.000000000 +0000 +++ fil-plugins-0.3.0/debian/copyright 2010-01-22 11:48:11.000000000 +0000 @@ -1,10 +1,12 @@ This package was debianized by Free Ekanayaka on Thu, 14 Oct 2004 16:00:59 +0200. -It was downloaded from http://users.skynet.be/solaris/linuxaudio/downloads/FIL-plugins-0.0.1.tar.bz2 +It was downloaded from http://www.kokkinizita.net/linuxaudio/downloads/index.html Upstream Author: Fons Adriaensen +Copyright: © 2004-2009 Fons Adriaensen + License: This package is free software; you can redistribute it and/or modify @@ -22,4 +24,4 @@ MA 02110-1301, USA. On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. +Public License can be found in `/usr/share/common-licenses/GPL-2'. diff -Nru fil-plugins-0.1.0/debian/docs fil-plugins-0.3.0/debian/docs --- fil-plugins-0.1.0/debian/docs 2010-01-22 11:48:11.000000000 +0000 +++ fil-plugins-0.3.0/debian/docs 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -README diff -Nru fil-plugins-0.1.0/debian/patches/00list fil-plugins-0.3.0/debian/patches/00list --- fil-plugins-0.1.0/debian/patches/00list 2010-01-22 11:48:11.000000000 +0000 +++ fil-plugins-0.3.0/debian/patches/00list 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -10_Makefile diff -Nru fil-plugins-0.1.0/debian/patches/01-destdir.patch fil-plugins-0.3.0/debian/patches/01-destdir.patch --- fil-plugins-0.1.0/debian/patches/01-destdir.patch 1970-01-01 01:00:00.000000000 +0100 +++ fil-plugins-0.3.0/debian/patches/01-destdir.patch 2010-01-22 11:48:11.000000000 +0000 @@ -0,0 +1,25 @@ +Origin: Debian +Description: Pass DESTDIR path to make install. +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- fil-plugins.orig/Makefile ++++ fil-plugins/Makefile +@@ -14,6 +14,7 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + ++DESTDIR = + + CPPFLAGS += -I. -fPIC -D_REENTRANT -Wall -O3 + +@@ -28,7 +29,7 @@ filters.o: ladspaplugin.h filters.h + filters_if.o: ladspaplugin.h filters.h + + install: all +- cp *.so /usr/lib/ladspa ++ cp *.so $(DESTDIR)/usr/lib/ladspa + + clean: + /bin/rm -f *~ *.o *.so diff -Nru fil-plugins-0.1.0/debian/patches/10_Makefile.dpatch fil-plugins-0.3.0/debian/patches/10_Makefile.dpatch --- fil-plugins-0.1.0/debian/patches/10_Makefile.dpatch 2010-01-22 11:48:11.000000000 +0000 +++ fil-plugins-0.3.0/debian/patches/10_Makefile.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_Makefile.dpatch by Free Ekanayaka -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad fil-plugins-0.0.1/Makefile /tmp/dpep.EBoAL9/fil-plugins-0.0.1/Makefile ---- fil-plugins-0.0.1/Makefile 2004-05-08 23:25:51.000000000 +0200 -+++ /tmp/dpep.EBoAL9/fil-plugins-0.0.1/Makefile 2005-01-26 10:24:11.000000000 +0100 -@@ -1,6 +1,7 @@ - - CPPFLAGS += -I. -fPIC -D_REENTRANT -Wall -O3 - -+DESTDIR= - - all: filters.so - -@@ -13,7 +14,7 @@ - - - install: -- cp *.so /usr/lib/ladspa -+ cp *.so $(DESTDIR)/usr/lib/ladspa - - - DIR := $(shell basename `pwd`) diff -Nru fil-plugins-0.1.0/debian/patches/series fil-plugins-0.3.0/debian/patches/series --- fil-plugins-0.1.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ fil-plugins-0.3.0/debian/patches/series 2010-01-22 11:48:11.000000000 +0000 @@ -0,0 +1 @@ +01-destdir.patch diff -Nru fil-plugins-0.1.0/debian/README.source fil-plugins-0.3.0/debian/README.source --- fil-plugins-0.1.0/debian/README.source 1970-01-01 01:00:00.000000000 +0100 +++ fil-plugins-0.3.0/debian/README.source 2010-01-22 11:48:11.000000000 +0000 @@ -0,0 +1,11 @@ +fil-plugins for Debian +=============== + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To learn how to use quilt, please refer to the official documentation, +usually available in /usr/share/doc/quilt/README.source. + + -- Alessio Treglia Sat, 09 Jan 2010 01:53:21 +0100 diff -Nru fil-plugins-0.1.0/debian/rules fil-plugins-0.3.0/debian/rules --- fil-plugins-0.1.0/debian/rules 2010-01-22 11:48:11.000000000 +0000 +++ fil-plugins-0.3.0/debian/rules 2010-01-22 11:48:11.000000000 +0000 @@ -1,100 +1,7 @@ #!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +%: + dh --with quilt $@ -include /usr/share/dpatch/dpatch.make - - - - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -configure: configure-stamp -configure-stamp: - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - - -build: build-stamp - -build-stamp: patch-stamp configure-stamp - dh_testdir - - # Add here commands to compile the package. - $(MAKE) - #docbook-to-man debian/fil-plugins.sgml > fil-plugins.1 - - touch build-stamp - -clean: unpatch - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Add here commands to clean up after the build process. - -$(MAKE) clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/fil-plugins. - $(MAKE) install DESTDIR=$(CURDIR)/debian/fil-plugins - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples -# dh_install -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms -# dh_perl -# dh_python -# dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +override_dh_installchangelogs: + dh_installchangelogs README diff -Nru fil-plugins-0.1.0/debian/watch fil-plugins-0.3.0/debian/watch --- fil-plugins-0.1.0/debian/watch 2010-01-22 11:48:11.000000000 +0000 +++ fil-plugins-0.3.0/debian/watch 2010-01-22 11:48:11.000000000 +0000 @@ -1,3 +1,2 @@ -# Site Directory Pattern Version Script -version=2 +version=3 http://www.kokkinizita.net/linuxaudio/downloads/index.html FIL-plugins-(.*)\.tar\.bz2 debian uupdate diff -Nru fil-plugins-0.1.0/exp2ap.cc fil-plugins-0.3.0/exp2ap.cc --- fil-plugins-0.1.0/exp2ap.cc 2005-05-17 22:05:50.000000000 +0100 +++ fil-plugins-0.3.0/exp2ap.cc 2009-06-09 21:12:14.000000000 +0100 @@ -1,3 +1,22 @@ +/* + Copyright (C) 2004-2009 Fons Adriaensen + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + + #include @@ -5,10 +24,9 @@ { int i; - i = (int)(floor (x)); + i = (int)(floorf (x)); x -= i; -// return ldexp (1 + x * (0.66 + 0.34 * x), i); - return ldexp (1 + x * (0.6930 + x * (0.2416 + x * (0.0517 + x * 0.0137))), i); + return ldexpf (1 + x * (0.6930f + x * (0.2416f + x * (0.0517f + x * 0.0137f))), i); } diff -Nru fil-plugins-0.1.0/filters.cc fil-plugins-0.3.0/filters.cc --- fil-plugins-0.1.0/filters.cc 2006-03-14 18:07:29.000000000 +0000 +++ fil-plugins-0.3.0/filters.cc 2009-06-09 21:10:59.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 Fons Adriaensen + Copyright (C) 2004-2009 Fons Adriaensen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -113,5 +113,3 @@ } } - - diff -Nru fil-plugins-0.1.0/filters.h fil-plugins-0.3.0/filters.h --- fil-plugins-0.1.0/filters.h 2006-02-10 22:11:16.000000000 +0000 +++ fil-plugins-0.3.0/filters.h 2009-06-09 21:10:49.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 Fons Adriaensen + Copyright (C) 2004-2009 Fons Adriaensen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,9 +32,9 @@ void init (void) { - _f = 0.25; - _b = _g = 1.0; - _a = _s1 = _s2 = _z1 = _z2 = 0.0; + _f = 0.25f; + _b = _g = 1.0f; + _a = _s1 = _s2 = _z1 = _z2 = 0.0f; } void proc (int k, float *sig, float f, float b, float g) @@ -51,36 +51,36 @@ if (f != _f) { - if (f < 0.5 * _f) f = 0.5 * _f; - else if (f > 2.0 * _f) f = 2.0 * _f; + if (f < 0.5f * _f) f = 0.5f * _f; + else if (f > 2.0f * _f) f = 2.0f * _f; _f = f; - _s1 = -cos (2 * M_PI * f); + _s1 = -cosf (6.283185f * f); d1 = (_s1 - s1) / k; u2 = true; } if (g != _g) { - if (g < 0.5 * _g) g = 0.5 * _g; - else if (g > 2.0 * _g) g = 2.0 * _g; + if (g < 0.5f * _g) g = 0.5f * _g; + else if (g > 2.0f * _g) g = 2.0f * _g; _g = g; - _a = 0.5 * (g - 1.0); + _a = 0.5f * (g - 1.0f); da = (_a - a) / k; u2 = true; } if (b != _b) { - if (b < 0.5 * _b) b = 0.5 * _b; - else if (b > 2.0 * _b) b = 2.0 * _b; + if (b < 0.5f * _b) b = 0.5f * _b; + else if (b > 2.0f * _b) b = 2.0f * _b; _b = b; u2 = true; } if (u2) { - b *= 4 * f; - _s2 = (1 + _a - b) / (1 + _a + b); + b *= 7 * f / sqrtf (g); + _s2 = (1 - b) / (1 + b); d2 = (_s2 - s2) / k; } @@ -94,7 +94,7 @@ *sig++ -= a * (_z2 + s2 * y - x); y -= s1 * _z1; _z2 = _z1 + s1 * y; - _z1 = y + 1e-10; + _z1 = y + 1e-10f; } } diff -Nru fil-plugins-0.1.0/filters_if.cc fil-plugins-0.3.0/filters_if.cc --- fil-plugins-0.1.0/filters_if.cc 2006-03-14 18:27:38.000000000 +0000 +++ fil-plugins-0.3.0/filters_if.cc 2009-06-09 21:11:09.000000000 +0100 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 Fons Adriaensen + Copyright (C) 2004-2009 Fons Adriaensen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,10 +23,10 @@ #include "filters.h" #define NMODS 1 -#define VERSION "0.1.0" +#define VERSION "0.3.0" -static const char* maker = "Fons Adriaensen "; +static const char* maker = "Fons Adriaensen "; static const char* copyr = "GPL"; @@ -179,6 +179,7 @@ } }; + extern "C" const LADSPA_Descriptor *ladspa_descriptor (unsigned long i) { if (i >= NMODS) return 0; diff -Nru fil-plugins-0.1.0/Makefile fil-plugins-0.3.0/Makefile --- fil-plugins-0.1.0/Makefile 2005-05-17 22:05:50.000000000 +0100 +++ fil-plugins-0.3.0/Makefile 2009-06-09 21:13:12.000000000 +0100 @@ -1,3 +1,19 @@ +# Copyright (C) 2004-2009 Fons Adriaensen +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + CPPFLAGS += -I. -fPIC -D_REENTRANT -Wall -O3 @@ -11,17 +27,9 @@ filters.o: ladspaplugin.h filters.h filters_if.o: ladspaplugin.h filters.h - -install: +install: all cp *.so /usr/lib/ladspa - -DIR := $(shell basename `pwd`) - -archive: clean - cd ..; /bin/rm -f $(DIR).tar.bz2; tar cvf $(DIR).tar $(DIR); bzip2 $(DIR).tar - - clean: /bin/rm -f *~ *.o *.so