svn commit: r303668 - in head/devel/upnp: . files

[Pawel Pekala]

Author: pawel
Date: Tue Sep  4 19:03:45 2012
New Revision: 303668
URL: http://svn.freebsd.org/changeset/ports/303668

Log:
  Add patch to fix uuid_create() namespace clash with libc, this affects
  at least multimedia/vlc port (crash while checking upnp devices)
  
  Submitted by:   nox

Added:
  head/devel/upnp/files/patch-upnp-src-inc-uuid.h   (contents, props changed)
Modified:
  head/devel/upnp/Makefile

Modified: head/devel/upnp/Makefile
==============================================================================
--- head/devel/upnp/Makefile	Tue Sep  4 18:30:48 2012	(r303667)
+++ head/devel/upnp/Makefile	Tue Sep  4 19:03:45 2012	(r303668)
@@ -7,6 +7,7 @@
 
 PORTNAME=	upnp
 PORTVERSION=	1.6.17
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/p${PORTNAME}/p${PORTNAME}/libUPnP%20${PORTVERSION}

Added: head/devel/upnp/files/patch-upnp-src-inc-uuid.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/upnp/files/patch-upnp-src-inc-uuid.h	Tue Sep  4 19:03:45 2012	(r303668)
@@ -0,0 +1,17 @@
+--- upnp/src/inc/uuid.h.orig	2012-02-23 18:48:42.000000000 +0100
++++ upnp/src/inc/uuid.h	2012-09-04 20:09:52.000000000 +0200
+@@ -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 {
+ 	/*! . */