From owner-freebsd-multimedia@FreeBSD.ORG Mon Sep 3 19:47:23 2012 Return-Path: Delivered-To: multimedia@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A27FA106566B; Mon, 3 Sep 2012 19:47:23 +0000 (UTC) (envelope-from nox@jelal.kn-bremen.de) Received: from smtp.kn-bremen.de (gelbbaer.kn-bremen.de [78.46.108.116]) by mx1.freebsd.org (Postfix) with ESMTP id 54C828FC1A; Mon, 3 Sep 2012 19:47:23 +0000 (UTC) Received: by smtp.kn-bremen.de (Postfix, from userid 10) id 6CC311E00715; Mon, 3 Sep 2012 21:47:16 +0200 (CEST) Received: from triton8.kn-bremen.de (noident@localhost [127.0.0.1]) by triton8.kn-bremen.de (8.14.4/8.14.4) with ESMTP id q83JjhpP038775; Mon, 3 Sep 2012 21:45:43 +0200 (CEST) (envelope-from nox@triton8.kn-bremen.de) Received: (from nox@localhost) by triton8.kn-bremen.de (8.14.4/8.14.3/Submit) id q83JjhuE038774; Mon, 3 Sep 2012 21:45:43 +0200 (CEST) (envelope-from nox) From: Juergen Lock Date: Mon, 3 Sep 2012 21:45:43 +0200 To: Andriy Gapon Message-ID: <20120903194543.GA38349@triton8.kn-bremen.de> References: <504468AB.8050003@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <504468AB.8050003@FreeBSD.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: multimedia@FreeBSD.org, pawel@FreeBSD.org Subject: Re: vlc-2.0.3_1,3 patch phase fails; devel/upnp bug X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Sep 2012 19:47:23 -0000 On Mon, Sep 03, 2012 at 11:22:03AM +0300, Andriy Gapon wrote: > ===> Patching for vlc-2.0.3_1,3 > ===> vlc-2.0.3_1,3 depends on file: /usr/local/bin/perl5.12.4 - found > ===> Applying extra patch > /usr/ports/multimedia/vlc/files/extra-patch-modules__services_discovery__upnp_intel.cpp > cannot open > /usr/ports/multimedia/vlc/files/extra-patch-modules__services_discovery__upnp_intel.cpp: > No such file or directory > > I do have > UPNP=on: UPnP network device control > in my showconfig output. > > The file files/extra-patch-modules__services_discovery__upnp_intel.cpp doesn't > exist indeed. Yeah it's no longer needed, I'll remove the bogus reference to it. But turns out there is another problem, at least clicking on upnp in the playlist view crashes in uuid_create() in libc, looking in the devel/upnp source reveals it has a different (internal) version of uuid_create() that has different args and was meant to be called but the one from libc got picked instead up and crashed due to the different args. The following hack in /usr/ports/devel/upnp/files/patch-upnp-src-inc-uuid.h fixes it, I've Cc'd the devel/upnp maintainer, maybe he wants to commit something like it? --- upnp/src/inc/uuid.h.orig +++ upnp/src/inc/uuid.h @@ -22,6 +22,14 @@ #include "sysdep.h" +#ifdef __FreeBSD__ +/* Workaround to avoid picking up different uuid_* fns from FreeBSD's libc */ +#define uuid_create libupnp_uuid_create +#define uuid_unpack libupnp_uuid_unpack +#define uuid_create_from_name libupnp_uuid_create_from_name +#define uuid_compare libupnp_uuid_compare +#endif + /*! . */ typedef struct _uuid_upnp { /*! . */