Date: Sat, 21 Dec 2013 09:02:10 GMT From: Matthieu Volat <mazhe@alkumuna.eu> To: freebsd-gnats-submit@FreeBSD.org Subject: misc/185060: [patch] audio/sonata patch to work with mpd 0.18+ Message-ID: <201312210902.rBL92AWb077815@oldred.freebsd.org> Resent-Message-ID: <201312210910.rBL9A056036753@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185060 >Category: misc >Synopsis: [patch] audio/sonata patch to work with mpd 0.18+ >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Dec 21 09:10:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Matthieu Volat >Release: 10.0-RC2 >Organization: >Environment: FreeBSD freedom.alkumuna.eu 10.0-RC2 FreeBSD 10.0-RC2 #0 r259404: Sun Dec 15 08:18:20 UTC 2013 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64 >Description: audio/sonata broke with last mpd update : it will never connect because it cannot find anymore the xfade functionality (that was removed). solution (see belows) is to slightly patch main.py file so that it will look over xfade support absence. >How-To-Repeat: upgrade to mpd 0.18+ >Fix: Applying this patch from upstream(?) fix the problem: https://github.com/multani/sonata/commit/6bea8bb I've attached a patch that applies it to the port directory directly. Patch attached with submission follows: diff -ru sonata.orig/Makefile sonata/Makefile --- sonata.orig/Makefile 2013-12-21 09:55:52.000000000 +0100 +++ sonata/Makefile 2013-12-21 09:56:27.000000000 +0100 @@ -3,7 +3,7 @@ PORTNAME= sonata PORTVERSION= 1.6.2.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= audio python MASTER_SITES= http://codingteam.net/project/sonata/upload/releases/ diff -ru sonata.orig/files/patch-sonata_main.py sonata/files/patch-sonata_main.py --- sonata.orig/files/patch-sonata_main.py 2013-12-21 09:55:52.000000000 +0100 +++ sonata/files/patch-sonata_main.py 2013-12-21 09:56:18.000000000 +0100 @@ -1,6 +1,28 @@ ---- sonata/main.py.orig 2013-08-03 13:13:21.000000000 +0200 -+++ sonata/main.py 2013-08-03 13:14:12.000000000 +0200 -@@ -3400,4 +3400,7 @@ class Base(object): +--- sonata/main.py.orig 2009-09-21 23:02:16.000000000 +0200 ++++ sonata/main.py 2013-12-21 09:55:28.000000000 +0100 +@@ -989,13 +989,14 @@ + self.repeatmenu.set_active(self.status['repeat'] == '1') + if not self.last_random or self.last_random != self.status['random']: + self.randommenu.set_active(self.status['random'] == '1') +- if self.status['xfade'] == '0': +- self.config.xfade_enabled = False +- else: +- self.config.xfade_enabled = True +- self.config.xfade = int(self.status['xfade']) +- if self.config.xfade > 30: +- self.config.xfade = 30 ++ self.config.xfade_enabled = False ++ if 'xfade' in self.status: ++ xfade = int(self.status['xfade']) ++ if xfade != 0: ++ self.config.xfade_enabled = True ++ self.config.xfade = xfade ++ if self.config.xfade > 30: ++ self.config.xfade = 30 + self.last_repeat = self.status['repeat'] + self.last_random = self.status['random'] + return +@@ -3400,4 +3401,7 @@ self.on_currsong_notify(force_popup=True) def main(self): >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312210902.rBL92AWb077815>