From owner-freebsd-bugs@FreeBSD.ORG Sat Dec 21 09:10:00 2013 Return-Path: Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CC39EDCC for ; Sat, 21 Dec 2013 09:10:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A66051587 for ; Sat, 21 Dec 2013 09:10:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rBL9A0XM036754 for ; Sat, 21 Dec 2013 09:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rBL9A056036753; Sat, 21 Dec 2013 09:10:00 GMT (envelope-from gnats) Resent-Date: Sat, 21 Dec 2013 09:10:00 GMT Resent-Message-Id: <201312210910.rBL9A056036753@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Matthieu Volat Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8312ED87 for ; Sat, 21 Dec 2013 09:02:10 +0000 (UTC) Received: from oldred.freebsd.org (oldred.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 54A271553 for ; Sat, 21 Dec 2013 09:02:10 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rBL92A1m077832 for ; Sat, 21 Dec 2013 09:02:10 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rBL92AWb077815; Sat, 21 Dec 2013 09:02:10 GMT (envelope-from nobody) Message-Id: <201312210902.rBL92AWb077815@oldred.freebsd.org> Date: Sat, 21 Dec 2013 09:02:10 GMT From: Matthieu Volat To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: misc/185060: [patch] audio/sonata patch to work with mpd 0.18+ X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 09:10:00 -0000 >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: