Hello community,
here is the log from the commit of package jack for openSUSE:Factory checked in
at 2019-04-17 11:22:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jack (Old)
and /work/SRC/openSUSE:Factory/.jack.new.17052 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jack"
Wed Apr 17 11:22:57 2019 rev:63 rq:694428 version:1.9.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/jack/jack.changes 2018-09-26
16:02:19.660399563 +0200
+++ /work/SRC/openSUSE:Factory/.jack.new.17052/jack.changes 2019-04-17
11:23:17.650414554 +0200
@@ -1,0 +2,6 @@
+Mon Apr 15 12:56:04 UTC 2019 - plater <davejpla...@gmail.com>
+
+- Added 0001-Make-jack_control-python2-3-compatible.patch from git
+ to fix boo#1132458.
+
+-------------------------------------------------------------------
New:
----
0001-Make-jack_control-python2-3-compatible.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jack.spec ++++++
--- /var/tmp/diff_new_pack.SEkmk7/_old 2019-04-17 11:23:18.918416046 +0200
+++ /var/tmp/diff_new_pack.SEkmk7/_new 2019-04-17 11:23:18.922416051 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jack
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -34,6 +34,7 @@
Source1: baselibs.conf
Patch0: jack-waf2.patch
Patch1: fix-mmap-return-value-check.patch
+Patch2: 0001-Make-jack_control-python2-3-compatible.patch
BuildRequires: dos2unix
BuildRequires: doxygen
BuildRequires: fdupes
@@ -125,8 +126,8 @@
%prep
%setup -q -n %{name}2-%{version}
-%patch0 -p1
-%patch1 -p1
+%autopatch -p1
+
#Change python script headers to python3
for i in `grep -rl "/usr/bin/env python"`;do sed -i
'1s/^#!.*/#!\/usr\/bin\/python3/' ${i} ;done
++++++ 0001-Make-jack_control-python2-3-compatible.patch ++++++
>From 950d36d7287f59803168354144726fc040ee98d4 Mon Sep 17 00:00:00 2001
From: Charalampos Stratakis <cstra...@redhat.com>
Date: Tue, 26 Jun 2018 20:28:57 +0200
Subject: [PATCH] Make jack_control python2/3 compatible.
---
example-clients/jack_control | 183 ++++++++++++++++++++++---------------------
1 file changed, 92 insertions(+), 91 deletions(-)
diff --git a/example-clients/jack_control b/example-clients/jack_control
index bafb9407..61ac40c1 100755
--- a/example-clients/jack_control
+++ b/example-clients/jack_control
@@ -1,5 +1,6 @@
#!/usr/bin/env python
+from __future__ import print_function
name_base = 'org.jackaudio'
control_interface_name = name_base + '.JackControl'
configure_interface_name = name_base + '.Configure'
@@ -77,12 +78,12 @@ def dbus_typesig_to_type_string(type_char):
if type_char == 'b':
return "bool"
- print 'shit'
+ print('shit')
return None # throw exception here?
def get_parameters(iface, path):
params = iface.GetParametersInfo(path)
-
+
#print params
for param in params:
typestr = dbus_typesig_to_type_string(param[0])
@@ -99,45 +100,45 @@ def get_parameters(iface, path):
value = dbus_type_to_python_type(value)
default = dbus_type_to_python_type(default)
- print "%20s: %s (%s:%s:%s:%s)" %(name, descr, typestr, isset, default,
value)
+ print("%20s: %s (%s:%s:%s:%s)" %(name, descr, typestr, isset, default,
value))
def print_help():
- print "Usage: %s [command] [command] ..." % os.path.basename(sys.argv[0])
- print "Commands:"
- print " exit - exit jack dbus service (stops jack
server if currently running)"
- print " help - print this help text"
- print " status - check whether jack server is
started, return value is 0 if running and 1 otherwise"
- print " start - start jack server if not currently
started"
- print " stop - stop jack server if currently
started"
- print " sm - switch master to currently
selected driver"
- print " dl - get list of available drivers"
- print " dg - get currently selected driver"
- print " ds <driver> - select driver"
- print " dp - get parameters of currently
selected driver"
- print " dpd <param> - get long description for driver
parameter"
- print " dps <param> <value> - set driver parameter"
- print " dpr <param> - reset driver parameter to its
default value"
- print " asd <driver> - add slave driver"
- print " rsd <driver> - remove slave driver"
- print " il - get list of available internals"
- print " ip <name> - get parameters of given internal"
- print " ipd <name> <param> - get long description for internal
parameter"
- print " ips <name> <param> <value> - set internal parameter"
- print " ipr <name> <param> - reset internal parameter to its
default value"
- print " iload <name> - load internal"
- print " iunload <name> - unload internal"
- print " ep - get engine parameters"
- print " epd <param> - get long description for engine
parameter"
- print " eps <param> <value> - set engine parameter"
- print " epr <param> - reset engine parameter to its
default value"
+ print("Usage: %s [command] [command] ..." % os.path.basename(sys.argv[0]))
+ print("Commands:")
+ print(" exit - exit jack dbus service (stops jack
server if currently running)")
+ print(" help - print this help text")
+ print(" status - check whether jack server is
started, return value is 0 if running and 1 otherwise")
+ print(" start - start jack server if not currently
started")
+ print(" stop - stop jack server if currently
started")
+ print(" sm - switch master to currently
selected driver")
+ print(" dl - get list of available drivers")
+ print(" dg - get currently selected driver")
+ print(" ds <driver> - select driver")
+ print(" dp - get parameters of currently
selected driver")
+ print(" dpd <param> - get long description for driver
parameter")
+ print(" dps <param> <value> - set driver parameter")
+ print(" dpr <param> - reset driver parameter to its
default value")
+ print(" asd <driver> - add slave driver")
+ print(" rsd <driver> - remove slave driver")
+ print(" il - get list of available internals")
+ print(" ip <name> - get parameters of given internal")
+ print(" ipd <name> <param> - get long description for internal
parameter")
+ print(" ips <name> <param> <value> - set internal parameter")
+ print(" ipr <name> <param> - reset internal parameter to its
default value")
+ print(" iload <name> - load internal")
+ print(" iunload <name> - unload internal")
+ print(" ep - get engine parameters")
+ print(" epd <param> - get long description for engine
parameter")
+ print(" eps <param> <value> - set engine parameter")
+ print(" epr <param> - reset engine parameter to its
default value")
def maybe_print_param_constraint(iface, param):
is_range, is_strict, is_fake, values = iface.GetParameterConstraint(param)
if is_range:
- print
- print("allowed range: %s to %s (inclusive)" % (values[0][0],
values[1][0]))
+ print()
+ print(("allowed range: %s to %s (inclusive)" % (values[0][0],
values[1][0])))
elif len(values):
- print
+ print()
if is_strict:
print("allowed values:")
else:
@@ -148,13 +149,13 @@ def maybe_print_param_constraint(iface, param):
if len(str(value[0])) > max_len:
max_len = len(str(value[0]))
for value in values:
- print("%*s'%s' - %s" % (1 + max_len - len(str(value[0])), "",
str(value[0]), str(value[1])))
+ print(("%*s'%s' - %s" % (1 + max_len - len(str(value[0])), "",
str(value[0]), str(value[1]))))
def main():
if len(sys.argv) == 1 or sys.argv[1] in ["-h", "--help", "help"]:
print_help()
sys.exit(0)
-
+
bus = dbus.SessionBus()
controller = bus.get_object(service_name, "/org/jackaudio/Controller")
@@ -168,67 +169,67 @@ def main():
index += 1
try:
if arg == "exit":
- print "--- exit"
+ print("--- exit")
control_iface.Exit()
elif arg == "status":
- print "--- status"
+ print("--- status")
if control_iface.IsStarted():
- print "started"
+ print("started")
sys.exit(0)
else:
- print "stopped"
+ print("stopped")
sys.exit(1)
elif arg == 'start':
- print "--- start"
+ print("--- start")
control_iface.StartServer()
elif arg == 'stop':
- print "--- stop"
+ print("--- stop")
control_iface.StopServer()
- elif arg == 'sm':
- print "--- switch master driver"
+ elif arg == 'sm':
+ print("--- switch master driver")
control_iface.SwitchMaster()
elif arg == 'ism':
if control_iface.IsManuallyActivated():
- print "Manually activated"
+ print("Manually activated")
else:
- print "Automatically activated"
+ print("Automatically activated")
elif arg == 'dl':
- print "--- drivers list"
+ print("--- drivers list")
is_range, is_strict, is_fake_values, values =
configure_iface.GetParameterConstraint(['engine', 'driver'])
for value in values:
- print value[1]
+ print(value[1])
elif arg == 'dg':
- print "--- get selected driver"
+ print("--- get selected driver")
isset, default, value =
configure_iface.GetParameterValue(['engine', 'driver'])
- print value
+ print(value)
elif arg == 'ds':
if index >= len(sys.argv):
- print "driver select command requires driver name argument"
+ print("driver select command requires driver name
argument")
sys.exit()
arg = sys.argv[index]
index += 1
- print "--- driver select \"%s\"" % arg
+ print("--- driver select \"%s\"" % arg)
configure_iface.SetParameterValue(['engine', 'driver'],
dbus.String(arg))
elif arg == 'dp':
- print "--- get driver parameters (type:isset:default:value)"
+ print("--- get driver parameters (type:isset:default:value)")
get_parameters(configure_iface, ['driver'])
elif arg == 'dpd':
if index >= len(sys.argv):
- print "get driver parameter long description command
requires parameter name argument"
+ print("get driver parameter long description command
requires parameter name argument")
sys.exit()
param = sys.argv[index]
index += 1
- print "--- get driver parameter description (%s)" % param
+ print("--- get driver parameter description (%s)" % param)
type_char, name, short_descr, long_descr =
configure_iface.GetParameterInfo(['driver', param])
- print long_descr
+ print(long_descr)
maybe_print_param_constraint(configure_iface, ['driver',
param])
elif arg == 'dps':
if index + 1 >= len(sys.argv):
- print "driver parameter set command requires parameter
name and value arguments"
+ print("driver parameter set command requires parameter
name and value arguments")
sys.exit()
param = sys.argv[index]
@@ -236,39 +237,39 @@ def main():
value = sys.argv[index]
index += 1
- print "--- driver param set \"%s\" -> \"%s\"" % (param, value)
+ print("--- driver param set \"%s\" -> \"%s\"" % (param, value))
type_char, name, short_descr, long_descr =
configure_iface.GetParameterInfo(['driver', param])
configure_iface.SetParameterValue(['driver', param],
python_type_to_jackdbus_type(value, type_char))
elif arg == 'dpr':
if index >= len(sys.argv):
- print "driver parameter reset command requires parameter
name argument"
+ print("driver parameter reset command requires parameter
name argument")
sys.exit()
param = sys.argv[index]
index += 1
- print "--- driver param reset \"%s\"" % param
+ print("--- driver param reset \"%s\"" % param)
configure_iface.ResetParameterValue(['driver', param])
elif arg == 'ep':
- print "--- get engine parameters (type:isset:default:value)"
+ print("--- get engine parameters (type:isset:default:value)")
get_parameters(configure_iface, ['engine'])
elif arg == 'epd':
if index >= len(sys.argv):
- print "get engine parameter long description command
requires parameter name argument"
+ print("get engine parameter long description command
requires parameter name argument")
sys.exit()
param_name = sys.argv[index]
index += 1
- print "--- get engine parameter description (%s)" % param_name
+ print("--- get engine parameter description (%s)" % param_name)
type_char, name, short_descr, long_descr =
configure_iface.GetParameterInfo(['engine', param_name])
- print long_descr
+ print(long_descr)
maybe_print_param_constraint(configure_iface, ['engine',
param_name])
elif arg == 'eps':
if index + 1 >= len(sys.argv):
- print "engine parameter set command requires parameter
name and value arguments"
+ print("engine parameter set command requires parameter
name and value arguments")
sys.exit()
param = sys.argv[index]
@@ -276,32 +277,32 @@ def main():
value = sys.argv[index]
index += 1
- print "--- engine param set \"%s\" -> \"%s\"" % (param, value)
+ print("--- engine param set \"%s\" -> \"%s\"" % (param, value))
type_char, name, short_descr, long_descr =
configure_iface.GetParameterInfo(['engine', param])
configure_iface.SetParameterValue(['engine', param],
python_type_to_jackdbus_type(value, type_char))
elif arg == 'epr':
if index >= len(sys.argv):
- print "engine parameter reset command requires parameter
name"
+ print("engine parameter reset command requires parameter
name")
sys.exit()
param = sys.argv[index]
index += 1
- print "--- engine param reset \"%s\"" % param
+ print("--- engine param reset \"%s\"" % param)
type_char, name, short_descr, long_descr =
configure_iface.GetParameterInfo(['engine', param])
configure_iface.ResetParameterValue(['engine', param])
elif arg == 'il':
- print "--- internals list"
+ print("--- internals list")
is_leaf, internals =
configure_iface.ReadContainer(['internals'])
for internal in internals:
- print internal
+ print(internal)
elif arg == 'ip':
- print "--- get internal parameters (type:isset:default:value)"
+ print("--- get internal parameters (type:isset:default:value)")
if index >= len(sys.argv):
- print "internal parameters command requires internal name
argument"
+ print("internal parameters command requires internal name
argument")
sys.exit()
internal_name = sys.argv[index]
@@ -310,7 +311,7 @@ def main():
get_parameters(configure_iface, ['internals', internal_name])
elif arg == 'ipd':
if index + 1 >= len(sys.argv):
- print "get internal parameter long description command
requires internal and parameter name arguments"
+ print("get internal parameter long description command
requires internal and parameter name arguments")
sys.exit()
name = sys.argv[index]
@@ -318,12 +319,12 @@ def main():
param = sys.argv[index]
index += 1
- print "--- get internal parameter description (%s)" % param
+ print("--- get internal parameter description (%s)" % param)
type_char, name, short_descr, long_descr =
configure_iface.GetParameterInfo(['internals', name, param])
- print long_descr
+ print(long_descr)
elif arg == 'ips':
if index + 2 >= len(sys.argv):
- print "internal parameter set command requires internal,
parameter name and value arguments"
+ print("internal parameter set command requires internal,
parameter name and value arguments")
sys.exit()
internal_name = sys.argv[index]
@@ -332,14 +333,14 @@ def main():
index += 1
value = sys.argv[index]
index += 1
-
- print "--- internal param set \"%s\" -> \"%s\"" % (param,
value)
+
+ print("--- internal param set \"%s\" -> \"%s\"" % (param,
value))
type_char, name, short_descr, long_descr =
configure_iface.GetParameterInfo(['internals', internal_name, param])
configure_iface.SetParameterValue(['internals', internal_name,
param], python_type_to_jackdbus_type(value, type_char))
elif arg == 'ipr':
if index + 1 >= len(sys.argv):
- print "reset internal parameter command requires internal
and parameter name arguments"
+ print("reset internal parameter command requires internal
and parameter name arguments")
sys.exit()
internal_name = sys.argv[index]
@@ -347,53 +348,53 @@ def main():
param = sys.argv[index]
index += 1
- print "--- internal param reset \"%s\"" % param
+ print("--- internal param reset \"%s\"" % param)
configure_iface.ResetParameterValue(['internals',
internal_name, param])
elif arg == 'iload':
- print "--- load internal"
+ print("--- load internal")
if index >= len(sys.argv):
- print "load internal command requires internal name
argument"
+ print("load internal command requires internal name
argument")
sys.exit()
name = sys.argv[index]
index += 1
result = control_iface.LoadInternal(name)
elif arg == 'iunload':
- print "--- unload internal"
+ print("--- unload internal")
if index >= len(sys.argv):
- print "unload internal command requires internal name
argument"
+ print("unload internal command requires internal name
argument")
sys.exit()
name = sys.argv[index]
index += 1
result = control_iface.UnloadInternal(name)
elif arg == 'asd':
- print "--- add slave driver"
+ print("--- add slave driver")
if index >= len(sys.argv):
- print "add slave driver command requires driver name
argument"
+ print("add slave driver command requires driver name
argument")
sys.exit()
name = sys.argv[index]
index += 1
result = control_iface.AddSlaveDriver(name)
elif arg == 'rsd':
- print "--- remove slave driver"
+ print("--- remove slave driver")
if index >= len(sys.argv):
- print "remove slave driver command requires driver name
argument"
+ print("remove slave driver command requires driver name
argument")
sys.exit()
name = sys.argv[index]
index += 1
result = control_iface.RemoveSlaveDriver(name)
else:
- print "Unknown command '%s'" % arg
- except dbus.DBusException, e:
- print "DBus exception: %s" % str(e)
+ print("Unknown command '%s'" % arg)
+ except dbus.DBusException as e:
+ print("DBus exception: %s" % str(e))
if __name__ == '__main__':
main()
--
2.16.4
