[SCM] guitarix/master: Drop upstreamed patches
viccuad-guest at users.alioth.debian.org
viccuad-guest at users.alioth.debian.org
Fri May 6 15:26:28 UTC 2016
The following commit has been merged in the master branch:
commit bbecfb6df40a1afac6601ef584591d178062c0db
Author: Víctor Cuadrado Juan <me at viccuad.me>
Date: Mon Apr 25 15:12:50 2016 +0200
Drop upstreamed patches
06-log-stdout.patch
05-fix-spelling.patch
04-fix-desktop.patch
03-update-changelog.patch
01-fix-linux-only.patch
diff --git a/debian/patches/01-fix-linux-only.patch b/debian/patches/01-fix-linux-only.patch
deleted file mode 100644
index 70d34e3..0000000
--- a/debian/patches/01-fix-linux-only.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fix build on Non-Linux archs
- This patch fixes the build on Non-Linux architectures for Debian since we have
- the respective referenced header files available anyway
-Author: Roland Stigge <stigge at antcom.de>
-Bug-Debian: http://bugs.debian.org/649634
-
-Index: guitarix-0.22.4/src/zita-convolver/zita-convolver.h
-===================================================================
---- guitarix-0.22.4.orig/src/zita-convolver/zita-convolver.h 2012-06-12 00:26:58.000000000 +0200
-+++ guitarix-0.22.4/src/zita-convolver/zita-convolver.h 2012-06-12 21:17:34.000000000 +0200
-@@ -39,7 +39,6 @@
- #undef ZCSEMA_IS_IMPLEMENTED
- #endif
-
--#if defined __linux__ || defined __FreeBSD__
- #include <semaphore.h>
-
- class ZCsema
-@@ -63,7 +62,6 @@
- };
-
- #define ZCSEMA_IS_IMPLEMENTED
--#endif
-
-
- #ifdef __APPLE__
diff --git a/debian/patches/02-libdl.patch b/debian/patches/02-libdl.patch
index a0fe5aa..2c7a790 100644
--- a/debian/patches/02-libdl.patch
+++ b/debian/patches/02-libdl.patch
@@ -1,15 +1,15 @@
Description: Use libdl in all platforms, not only in Linux (eg: for kFreeBSD)
Author: Roland Stigge <Stigge at antcom.de>
-Last-Update: 2015-12-19
+Last-Update: 2016-04-25
---
--- a/src/gx_head/wscript
+++ b/src/gx_head/wscript
-@@ -136,9 +136,7 @@ def build(bld):
+@@ -153,9 +153,7 @@ def build(bld):
sources = sources_engine + sources_gui
incl = ['.','./engine','../..','..','../headers','../../libgxwmm','../../libgxw'] # need ".." for config.h
libpath = []
- lib = []
-- if sys.platform.startswith("linux"):
+- if not sys.platform.startswith("darwin"):
- lib.append('dl')
+ lib = ['dl']
uselib = ['JACK', 'SNDFILE', 'GTHREAD', 'GMODULE_EXPORT', 'WEBKIT',
diff --git a/debian/patches/03-update-changelog.patch b/debian/patches/03-update-changelog.patch
deleted file mode 100644
index b5a8afc..0000000
--- a/debian/patches/03-update-changelog.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Description: Add 0.33 and 0.34 to changelog
-Author: Víctor Cuadrado Juan <me at viccuad.me>
-Origin: Guitarix team,
- http://article.gmane.org/gmane.linux.debian.devel.mentors/73670
-Forwarded: no
----
---- a/changelog
-+++ b/changelog
-@@ -1,3 +1,75 @@
-+guitarix2 (0.34.0) unstable; urgency=low
-+
-+ * Add BOSS OC-2 partial emulation LV2 plugin (by drgreenthumb)
-+ * Add gx_hogsfoot.lv2 gx_mole.lv2 and gx_rangem.lv2
-+ * Add gx_plugins AxeFace, BassFuzz, Buzz and the Mole
-+ * Add Gx_Wah.lv2 plugin
-+ * Add colorsound bass wah plugin emulation
-+ * Add Roland Wah add Jen Bass Wah emulation
-+ * Add bitdowner distortion plugin (by Viacheslav Lotsmanov)
-+
-+ * Add volume control to gcb95 plug
-+ * Add file browser and file load support to dubber (livelooper) plugin
-+ * Add play all button to the dubber (livelooper) plugin
-+ * Add support to import LV2 plugin presets into guitarix
-+ * Add 24-edo tuner option
-+ * Add 53-edo tuner option
-+
-+ * Disable LILV_OPTION_DYN_MANIFEST to avoid crashes from
-+ naspro-bridges (dssi).
-+
-+ * Add online preset download widget (requires libwebkit-1.0)
-+ thanks to lfz for creating https://musical-artifacts.com/
-+
-+ * Fix GxAmplifier-x GxAmplifierStereo-X and GxCabinet for the new
-+ ardour buffersize behave.
-+
-+ * Implement double click on plugin handle remove plugin from rack
-+
-+ * Fix guitarix build for the new libsigc++ library and the new GCC5
-+ compiler. Guitarix use now the default build flag -std=c++11
-+ (you can disable it, see ./waf --help for more optional flags)
-+
-+ -- 08.11.2015
-+
-+guitarix2 (0.33.0) unstable; urgency=low
-+
-+ * New Plugins in guitarix
-+ - A new Wah plugin with manual/auto/alien mode and the following
-+ emulated wah wah's to select from:
-+ * Colorsond Wah
-+ * DallasArbiter Wah
-+ * Foxx Wah
-+ * JEN Wah
-+ * Maestro Boomer Wah
-+ * Selmer Wah
-+ * Vox Wah
-+ - A new Fuzz section with emulations of the:
-+ * Astrotone Fuzz
-+ * Dunlop Fuzzface
-+ * Fuzzface Roger Mayer Mods
-+ * Fuzzface Fuller Mods
-+ * Foxeylady
-+ * Hornet
-+ * Sustainer
-+ * Muff
-+ * Screaming Bird
-+ * Colorsound Tonebender
-+ * Vintage Fuzzmaster
-+ * Ruiner
-+ * Fat Furry Freak
-+ * Fuzz Drive
-+ - And emulations of:
-+ * LPB-1 Linear power Booster
-+ * High Frequency Brightener
-+ * Hogs Foot
-+ * Dallas Rangemaster
-+ * Buffer Booster
-+ * Transistor Buffer
-+ * Colorsound Overdrive
-+
-+ -- 01.08.2015
-+
- guitarix2 (0.32.3) unstable; urgency=low
- * fix some rcstyle bugs for KDE Qtcurve engine
- * add 2 new rc-styles (flat and green
diff --git a/debian/patches/04-fix-desktop.patch b/debian/patches/04-fix-desktop.patch
deleted file mode 100644
index f406347..0000000
--- a/debian/patches/04-fix-desktop.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix errors in .desktop and add keywords
- Running `deskop-file-validate` highlighted errors with key groups
- containing more than A-Za-z0-9- characters.
-Author: Víctor Cuadrado Juan <me at viccuad.me>
-Origin: Debian
-Last-Update: 2015-02-06
----
---- a/guitarix.desktop.in
-+++ b/guitarix.desktop.in
-@@ -1,10 +1,11 @@
-
- [Desktop Entry]
--_Name=guitarix
--_GenericName=Mono Amplifier
--_Comment=Simple mono amplifier simulation
-+Name=guitarix
-+GenericName=Mono Amplifier
-+Comment=Simple mono amplifier simulation
- Exec=guitarix
- Icon=gx_head
- Categories=AudioVideo;Audio;X-Jack;Midi;X-MIDI;
- Terminal=false
- Type=Application
-+Keywords=Audio;Sound;Guitar;Amplifier;Record;Midi;Jack;
-\ No newline at end of file
diff --git a/debian/patches/05-fix-spelling.patch b/debian/patches/05-fix-spelling.patch
deleted file mode 100644
index f577bf0..0000000
--- a/debian/patches/05-fix-spelling.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix spelling errors
-Author: Víctor Cuadrado Juan <me at viccuad.me>
-Origin: Debian
-Last-Update: 2016-03-12
----
---- a/src/gx_head/gui/gx_main_window.cpp
-+++ b/src/gx_head/gui/gx_main_window.cpp
-@@ -1237,7 +1237,7 @@ void gx_show_about() {
- about +=_("\n Guitarix:gx_head ");
- about += GX_VERSION;
- about +=
-- _("\n\n This Aplication is to a large extent provided"
-+ _("\n\n This Application is to a large extent provided"
- "\n with the marvelous faust compiler.Yann Orlary"
- "\n http://faust.grame.fr/"
- "\n A large part is based on the work of Julius Orion Smith"
---- a/src/gx_head/engine/gx_preset.cpp
-+++ b/src/gx_head/engine/gx_preset.cpp
-@@ -372,7 +372,7 @@ void PresetIO::read_parameters(gx_system
- } else if (!p->isSavable()) {
- gx_print_warning(
- _("recall settings"),
-- _("non savable parameter ")+p->id()+_(" in settings"));
-+ _("non saveable parameter ")+p->id()+_(" in settings"));
- jp.skip_object();
- continue;
- }
diff --git a/debian/patches/06-log-stdout.patch b/debian/patches/06-log-stdout.patch
deleted file mode 100644
index 08c16bf..0000000
--- a/debian/patches/06-log-stdout.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-Description: Patch waf to log to stdout instead of stderr
-Author: Hermann Meyer <brummer- at web.de>
-Origin: upstream
-Applied-Upstream: yes
----
---- a/wafadmin/Logs.py
-+++ b/wafadmin/Logs.py
-@@ -2,7 +2,7 @@
- # encoding: utf-8
-
- import ansiterm
--import os,re,logging,traceback,sys
-+import os,re,logging,traceback,types,sys
- from Constants import*
- zones=''
- verbose=0
-@@ -11,7 +11,7 @@ got_tty=False
- term=os.environ.get('TERM','dumb')
- if not term in['dumb','emacs']:
- try:
-- got_tty=sys.stderr.isatty()or(sys.platform=='win32'and term in['xterm','msys'])
-+ got_tty=sys.stderr.isatty() or sys.stdout.isatty()
- except AttributeError:
- pass
- import Utils
-@@ -25,6 +25,38 @@ class foo(object):
- return get_color(a)
- def __call__(self,a):
- return get_color(a)
-+class WafStdStream(logging.Handler):
-+ def __init__(self):
-+ logging.Handler.__init__(self)
-+ self.strm_out = sys.stdout
-+ self.strm_err = sys.stderr
-+ def flush(self):
-+ if self.strm_out and hasattr(self.strm_out, "flush"):
-+ self.strm_out.flush()
-+ if self.strm_err and hasattr(self.strm_err, "flush"):
-+ self.strm_err.flush()
-+ def emit(self, record):
-+ try:
-+ msg = self.format(record)
-+ # anything with level WARNING or above goes to stderr, otherwise to stdout
-+ stream = self.strm_err if record.levelno >= logging.WARNING else self.strm_out
-+ fs = "%s\n"
-+ if not hasattr(types, "UnicodeType"): #if no unicode support...
-+ stream.write(fs % msg)
-+ else:
-+ try:
-+ if (isinstance(msg, unicode) or
-+ getattr(stream, 'encoding', None) is None):
-+ stream.write(fs % msg)
-+ else:
-+ stream.write(fs % msg.encode(stream.encoding))
-+ except UnicodeError:
-+ stream.write(fs % msg.encode("UTF-8"))
-+ stream.flush()
-+ except (KeyboardInterrupt, SystemExit):
-+ raise
-+ except:
-+ self.handleError(record)
- colors=foo()
- re_log=re.compile(r'(\w+): (.*)',re.M)
- class log_filter(logging.Filter):
-@@ -88,7 +120,7 @@ def init_log():
- log=logging.getLogger()
- log.handlers=[]
- log.filters=[]
-- hdlr=logging.StreamHandler()
-+ hdlr=WafStdStream()
- hdlr.setFormatter(formatter())
- log.addHandler(hdlr)
- log.addFilter(log_filter())
---- a/wafadmin/Build.py
-+++ b/wafadmin/Build.py
-@@ -639,7 +639,7 @@ class BuildContext(Utils.Context):
- self.cwd=kw['cwd']=self.bldnode.abspath()
- return Utils.exec_command(cmd,**kw)
- def printout(self,s):
-- f=self.log or sys.stderr
-+ f=self.log or sys.stdout
- f.write(s)
- f.flush()
- def add_subdirs(self,dirs):
---- a/wafadmin/Scripting.py
-+++ b/wafadmin/Scripting.py
-@@ -107,7 +107,7 @@ def prepare(t,cwd,ver,wafdir):
- error(str(e))
- sys.exit(1)
- except KeyboardInterrupt:
-- Utils.pprint('RED','Interrupted')
-+ Utils.eprint('RED','Interrupted')
- sys.exit(68)
- def main():
- global commands
---- a/wafadmin/Tools/intltool.py
-+++ b/wafadmin/Tools/intltool.py
-@@ -56,7 +56,7 @@ def apply_intltool_po(self):
- task.set_outputs(node.change_ext('.mo'))
- if self.bld.is_install:task.install=install_translation
- else:
-- Utils.pprint('RED',"Error no LINGUAS file found in po directory")
-+ Utils.eprint('RED',"Error no LINGUAS file found in po directory")
- Task.simple_task_type('po','${POCOM} -o ${TGT} ${SRC}',color='BLUE',shell=False)
- Task.simple_task_type('intltool','${INTLTOOL} ${INTLFLAGS} ${INTLCACHE} ${INTLPODIR} ${SRC} ${TGT}',color='BLUE',after="cc_link cxx_link",shell=False)
- def detect(conf):
---- a/wafadmin/Tools/unittestw.py
-+++ b/wafadmin/Tools/unittestw.py
-@@ -101,7 +101,7 @@ class unit_test(object):
- if Options.options.progress_bar:sys.stdout.write(Logs.colors.cursor_on)
- def print_results(self):
- if not Options.commands[self.run_if_waf_does]:return
-- p=Utils.pprint
-+ e=Utils.pprint
- if self.total_num_tests==0:
- p('YELLOW','No unit tests present')
- return
-@@ -118,9 +118,9 @@ class unit_test(object):
- elif result:n+=7
- else:n+=3
- line='%s %s'%(label,'.'*n)
-- if err:p('RED','%sERROR'%line)
-+ if err:e('RED','%sERROR'%line)
- elif result:p('GREEN','%sOK'%line)
-- else:p('YELLOW','%sFAILED'%line)
-+ else:e('YELLOW','%sFAILED'%line)
- percentage_ok=float(self.num_tests_ok)/float(self.total_num_tests)*100.0
- percentage_failed=float(self.num_tests_failed)/float(self.total_num_tests)*100.0
- percentage_erroneous=float(self.num_tests_err)/float(self.total_num_tests)*100.0
---- a/wafadmin/Utils.py
-+++ b/wafadmin/Utils.py
-@@ -306,6 +306,10 @@ def h_fun(fun):
- pass
- return h
- def pprint(col,str,label='',sep='\n'):
-+ "print messages in color on stdout"
-+ sys.stdout.write("%s%s%s %s%s"%(Logs.colors(col),str,Logs.colors.NORMAL,label,sep))
-+def eprint(col,str,label='',sep='\n'):
-+ "print messages in color on stderr"
- sys.stderr.write("%s%s%s %s%s"%(Logs.colors(col),str,Logs.colors.NORMAL,label,sep))
- def check_dir(dir):
- try:
---- a/wscript
-+++ b/wscript
-@@ -248,10 +248,7 @@ def set_options(opt):
- #
-
- def print_msg(msg, nl=True):
-- if HEXVERSION > 0x10500:
-- s = sys.stderr
-- else:
-- s = sys.stdout
-+ s = sys.stdout
- if nl:
- t = "\n"
- else:
-@@ -270,7 +267,7 @@ def display_msg(msg, status = None, colo
- print_msg("%s" % msg.ljust(g_maxlen))
-
- def error_msg(msg):
-- Utils.pprint('RED', msg)
-+ Utils.eprint('RED', msg)
-
- def display_feature(msg, build):
- if build:
diff --git a/debian/patches/series b/debian/patches/series
index 3337d7d..0cd0935 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1 @@
-06-log-stdout.patch
-05-fix-spelling.patch
-04-fix-desktop.patch
-03-update-changelog.patch
02-libdl.patch
-01-fix-linux-only.patch
--
guitarix packaging
More information about the pkg-multimedia-commits
mailing list