vlc-2.0.3_1,3 patch phase fails; devel/upnp bug

[Juergen Lock]

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 {
 	/*! . */