From owner-svn-ports-all@freebsd.org Fri Nov 9 21:37:26 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 87D281108E11; Fri, 9 Nov 2018 21:37:26 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 131D38F139; Fri, 9 Nov 2018 21:37:26 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E9BA519845; Fri, 9 Nov 2018 21:37:25 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA9LbPAs030070; Fri, 9 Nov 2018 21:37:25 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA9LbP4i030066; Fri, 9 Nov 2018 21:37:25 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201811092137.wA9LbP4i030066@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Fri, 9 Nov 2018 21:37:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r484548 - in branches/2018Q4/sysutils/xfburn: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in branches/2018Q4/sysutils/xfburn: . files X-SVN-Commit-Revision: 484548 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 131D38F139 X-Spamd-Result: default: False [-106.87 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.76)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.87), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Nov 2018 21:37:26 -0000 Author: madpilot Date: Fri Nov 9 21:37:25 2018 New Revision: 484548 URL: https://svnweb.freebsd.org/changeset/ports/484548 Log: MFH: r484458 Add patch to stop xfburn crashing when trying to burn an audio CD. Reported and tested by: Holger Wagemann Approved by: ports-secteam (miwi) Added: branches/2018Q4/sysutils/xfburn/files/patch-xfburn_xfburn-transcoder-gst.c - copied unchanged from r484458, head/sysutils/xfburn/files/patch-xfburn_xfburn-transcoder-gst.c Modified: branches/2018Q4/sysutils/xfburn/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/sysutils/xfburn/Makefile ============================================================================== --- branches/2018Q4/sysutils/xfburn/Makefile Fri Nov 9 21:37:01 2018 (r484547) +++ branches/2018Q4/sysutils/xfburn/Makefile Fri Nov 9 21:37:25 2018 (r484548) @@ -3,6 +3,7 @@ PORTNAME= xfburn PORTVERSION= 0.5.5 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 Copied: branches/2018Q4/sysutils/xfburn/files/patch-xfburn_xfburn-transcoder-gst.c (from r484458, head/sysutils/xfburn/files/patch-xfburn_xfburn-transcoder-gst.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/sysutils/xfburn/files/patch-xfburn_xfburn-transcoder-gst.c Fri Nov 9 21:37:25 2018 (r484548, copy of r484458, head/sysutils/xfburn/files/patch-xfburn_xfburn-transcoder-gst.c) @@ -0,0 +1,50 @@ +--- xfburn/xfburn-transcoder-gst.c.orig 2017-12-14 12:34:57 UTC ++++ xfburn/xfburn-transcoder-gst.c +@@ -221,8 +221,8 @@ xfburn_transcoder_gst_init (XfburnTranscoderGst * obj) + + /* if the mutex is locked, then we're not currently seeking + * information from gst */ ++ /* Actual locking in prepare and finish */ + g_mutex_init (&priv->gst_mutex); +- g_mutex_lock (&priv->gst_mutex); + + priv->discoverer = gst_discoverer_new(GST_SECOND, NULL); + } +@@ -492,19 +492,9 @@ bus_call (GstBus *bus, GstMessage *msg, gpointer data) + + if (strcmp (GST_OBJECT_NAME (GST_MESSAGE_SRC (msg)), "decoder") != 0) + break; +- +- if (!g_mutex_trylock (&priv->gst_mutex)) { +- g_critical ("Lock held by another thread, can't signal transcoding start!"); +- break; +- } else { +-#if DEBUG_GST > 0 +- DBG ("Locked mutex to signal transcoding start"); +-#endif +- } + + priv->gst_done = TRUE; + g_cond_signal (&priv->gst_cond); +- g_mutex_unlock (&priv->gst_mutex); + break; + } /* switch of priv->state */ + +@@ -835,6 +825,8 @@ prepare (XfburnTranscoder *trans, GError **error) + gboolean ret; + gint64 end_time; + ++ g_mutex_lock(&priv->gst_mutex); ++ + priv->tracks = g_slist_reverse (priv->tracks); + + priv->state = XFBURN_TRANSCODER_GST_STATE_TRANSCODE_START; +@@ -933,6 +925,8 @@ finish (XfburnTranscoder *trans) + } + */ + recreate_pipeline (gst); ++ ++ g_mutex_unlock (&priv->gst_mutex); + } + +