From e39f0668ced510d9e5c6de1d6c1c5af07098fbd9 Mon Sep 17 00:00:00 2001 From: Pawel Pekala Date: Tue, 4 Sep 2012 19:03:45 +0000 Subject: [PATCH] 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 --- devel/upnp/Makefile | 1 + devel/upnp/files/patch-upnp-src-inc-uuid.h | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 devel/upnp/files/patch-upnp-src-inc-uuid.h diff --git a/devel/upnp/Makefile b/devel/upnp/Makefile index 24ffa14bfde7..5906b783b4a9 100644 --- a/devel/upnp/Makefile +++ b/devel/upnp/Makefile @@ -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} diff --git a/devel/upnp/files/patch-upnp-src-inc-uuid.h b/devel/upnp/files/patch-upnp-src-inc-uuid.h new file mode 100644 index 000000000000..4a01583e7b94 --- /dev/null +++ b/devel/upnp/files/patch-upnp-src-inc-uuid.h @@ -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 { + /*! . */