diff options
Diffstat (limited to 'audio/jalv/remove_experimental_uis.diff')
| -rw-r--r-- | audio/jalv/remove_experimental_uis.diff | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/audio/jalv/remove_experimental_uis.diff b/audio/jalv/remove_experimental_uis.diff index 9b6ef597a8..78fb2f6693 100644 --- a/audio/jalv/remove_experimental_uis.diff +++ b/audio/jalv/remove_experimental_uis.diff @@ -1,6 +1,6 @@ -diff -Naur jalv-1.4.4/doc/jalv.gtkmm.1 jalv-1.4.4.patched/doc/jalv.gtkmm.1 ---- jalv-1.4.4/doc/jalv.gtkmm.1 2012-04-19 18:12:54.000000000 -0400 -+++ jalv-1.4.4.patched/doc/jalv.gtkmm.1 1969-12-31 19:00:00.000000000 -0500 +diff -Naur jalv-1.4.6/doc/jalv.gtkmm.1 jalv-1.4.6.patched/doc/jalv.gtkmm.1 +--- jalv-1.4.6/doc/jalv.gtkmm.1 2012-04-19 18:12:54.000000000 -0400 ++++ jalv-1.4.6.patched/doc/jalv.gtkmm.1 1969-12-31 19:00:00.000000000 -0500 @@ -1,25 +0,0 @@ -.TH JALV.GTKMM 1 "19 Apr 2012" - @@ -27,9 +27,9 @@ diff -Naur jalv-1.4.4/doc/jalv.gtkmm.1 jalv-1.4.4.patched/doc/jalv.gtkmm.1 -.PP -This manual page was written by Jaromír Mikes <mira.mikes@seznam.cz> -and David Robillard <d@drobilla.net> -diff -Naur jalv-1.4.4/doc/jalv.qt.1 jalv-1.4.4.patched/doc/jalv.qt.1 ---- jalv-1.4.4/doc/jalv.qt.1 2012-04-19 18:12:43.000000000 -0400 -+++ jalv-1.4.4.patched/doc/jalv.qt.1 1969-12-31 19:00:00.000000000 -0500 +diff -Naur jalv-1.4.6/doc/jalv.qt.1 jalv-1.4.6.patched/doc/jalv.qt.1 +--- jalv-1.4.6/doc/jalv.qt.1 2012-04-19 18:12:43.000000000 -0400 ++++ jalv-1.4.6.patched/doc/jalv.qt.1 1969-12-31 19:00:00.000000000 -0500 @@ -1,25 +0,0 @@ -.TH JALV.QT 1 "19 Apr 2012" - @@ -56,10 +56,10 @@ diff -Naur jalv-1.4.4/doc/jalv.qt.1 jalv-1.4.4.patched/doc/jalv.qt.1 -.PP -This manual page was written by Jaromír Mikes <mira.mikes@seznam.cz> -and David Robillard <d@drobilla.net> -diff -Naur jalv-1.4.4/wscript jalv-1.4.4.patched/wscript ---- jalv-1.4.4/wscript 2014-01-04 16:18:19.000000000 -0500 -+++ jalv-1.4.4.patched/wscript 2014-02-08 01:08:11.000000000 -0500 -@@ -45,12 +45,6 @@ +diff -Naur jalv-1.4.6/wscript jalv-1.4.6.patched/wscript +--- jalv-1.4.6/wscript 2014-08-08 17:36:24.000000000 -0400 ++++ jalv-1.4.6.patched/wscript 2016-10-16 13:55:52.873636638 -0400 +@@ -48,15 +48,6 @@ atleast_version='0.120.0', mandatory=True) autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK2', atleast_version='2.18.0', mandatory=False) @@ -67,13 +67,16 @@ diff -Naur jalv-1.4.4/wscript jalv-1.4.4.patched/wscript - atleast_version='3.0.0', mandatory=False) - autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM2', - atleast_version='2.20.0', mandatory=False) -- autowaf.check_pkg(conf, 'QtGui', uselib_store='QT4', -- atleast_version='4.0.0', mandatory=False) +- if not Options.options.no_qt: +- autowaf.check_pkg(conf, 'QtGui', uselib_store='QT4', +- atleast_version='4.0.0', mandatory=False) +- if conf.is_defined('HAVE_QT4'): +- conf.find_program('moc') conf.check(function_name='jack_port_type_get_buffer_size', header_name='jack/jack.h', -@@ -66,12 +60,6 @@ - +@@ -81,12 +72,6 @@ + conf.is_defined('HAVE_JACK_METADATA')) autowaf.display_msg(conf, "Gtk 2.0 support", conf.is_defined('HAVE_GTK2')) - autowaf.display_msg(conf, "Gtk 3.0 support", @@ -85,7 +88,7 @@ diff -Naur jalv-1.4.4/wscript jalv-1.4.4.patched/wscript print('') def build(bld): -@@ -98,36 +86,6 @@ +@@ -113,39 +98,6 @@ install_path = '${BINDIR}') autowaf.use_lib(bld, obj, libs + ' GTK2') @@ -111,6 +114,9 @@ diff -Naur jalv-1.4.4/wscript jalv-1.4.4.patched/wscript - - # Qt version - if bld.is_defined('HAVE_QT4'): +- obj = bld(rule = '${MOC} ${SRC} > ${TGT}', +- source = 'src/jalv_qt4.cpp', +- target = 'jalv_qt4_meta.hpp') - obj = bld(features = 'c cxx cxxprogram', - source = source + ' src/jalv_qt4.cpp', - target = 'jalv.qt', |