<div dir="ltr">Ping!<div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Jul 25, 2014 at 8:20 PM, Sean McGovern <span dir="ltr"><<a href="mailto:gseanmcg@gmail.com" target="_blank">gseanmcg@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">---<br>
 contrib/src/upnp/add-includes-for-solaris.patch    |   25 +++++++++++++++++<br>
 contrib/src/upnp/rules.mak                         |   10 +++++++<br>
 .../use-inttypes-if-stdint-is-not-available.patch  |   28 ++++++++++++++++++++<br>
 3 files changed, 63 insertions(+)<br>
 create mode 100644 contrib/src/upnp/add-includes-for-solaris.patch<br>
 create mode 100644 contrib/src/upnp/use-inttypes-if-stdint-is-not-available.patch<br>
<br>
diff --git a/contrib/src/upnp/add-includes-for-solaris.patch b/contrib/src/upnp/add-includes-for-solaris.patch<br>
new file mode 100644<br>
index 0000000..02446d7<br>
--- /dev/null<br>
+++ b/contrib/src/upnp/add-includes-for-solaris.patch<br>
@@ -0,0 +1,25 @@<br>
+From b2d7dc97a2498339e01cc2799e6e27640f83cca2 Mon Sep 17 00:00:00 2001<br>
+From: Dagobert Michelsen <<a href="mailto:dam@opencsw.org">dam@opencsw.org</a>><br>
+Date: Thu, 1 Mar 2012 13:43:07 +0100<br>
+Subject: [PATCH] Add includes for Solaris<br>
+<br>
+---<br>
+ upnp/inc/UpnpInet.h |    2 ++<br>
+ 1 files changed, 2 insertions(+), 0 deletions(-)<br>
+<br>
+diff --git a/upnp/inc/UpnpInet.h b/upnp/inc/UpnpInet.h<br>
+index 6269c4a..a51cdc5 100644<br>
+--- a/upnp/inc/UpnpInet.h<br>
++++ b/upnp/inc/UpnpInet.h<br>
+@@ -30,6 +30,8 @@<br>
+       #if defined(__sun)<br>
+               #include <fcntl.h><br>
+               #include <sys/sockio.h><br>
++              #include <sys/types.h><br>
++              #include <sys/socket.h><br>
+       #elif (defined(BSD) && BSD >= 199306) || defined (__FreeBSD_kernel__)<br>
+               #include <ifaddrs.h><br>
+               /* Do not move or remove the include below for "sys/socket"!<br>
+--<br>
+1.7.9<br>
+<br>
diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak<br>
index f6706b1..17d9253 100644<br>
--- a/contrib/src/upnp/rules.mak<br>
+++ b/contrib/src/upnp/rules.mak<br>
@@ -15,6 +15,9 @@ ifdef HAVE_WIN32<br>
 DEPS_upnp += pthreads $(DEPS_pthreads)<br>
 LIBUPNP_ECFLAGS = -DPTW32_STATIC_LIB<br>
 endif<br>
+ifdef HAVE_SOLARIS<br>
+LIBUPNP_ECFLAGS = -D_POSIX_PTHREAD_SEMANTICS<br>
+endif<br>
<br>
 upnp: libupnp-$(UPNP_VERSION).tar.bz2 .sum-upnp<br>
        $(UNPACK)<br>
@@ -25,6 +28,10 @@ ifdef HAVE_WIN32<br>
 endif<br>
        $(APPLY) $(SRC)/upnp/libupnp-ipv6.patch<br>
        $(APPLY) $(SRC)/upnp/miniserver.patch<br>
+ifdef HAVE_SOLARIS<br>
+       $(APPLY) $(SRC)/upnp/add-includes-for-solaris.patch<br>
+       $(APPLY) $(SRC)/upnp/use-inttypes-if-stdint-is-not-available.patch<br>
+endif<br>
        $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build-aux/<br>
        $(MOVE)<br>
<br>
@@ -32,6 +39,9 @@ endif<br>
 ifdef HAVE_WIN32<br>
        $(RECONF)<br>
 endif<br>
+ifdef HAVE_SOLARIS<br>
+       $(RECONF)<br>
+endif<br>
        cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -DUPNP_STATIC_LIB $(LIBUPNP_ECFLAGS)" ./configure --disable-samples --without-documentation --enable-ipv6 $(HOSTCONF)<br>
        cd $< && $(MAKE) install<br>
        touch $@<br>
diff --git a/contrib/src/upnp/use-inttypes-if-stdint-is-not-available.patch b/contrib/src/upnp/use-inttypes-if-stdint-is-not-available.patch<br>
new file mode 100644<br>
index 0000000..73d85ee<br>
--- /dev/null<br>
+++ b/contrib/src/upnp/use-inttypes-if-stdint-is-not-available.patch<br>
@@ -0,0 +1,28 @@<br>
+From b32cacc18632995c2ac265eb323b30e2c2ee1b56 Mon Sep 17 00:00:00 2001<br>
+From: Dagobert Michelsen <<a href="mailto:dam@opencsw.org">dam@opencsw.org</a>><br>
+Date: Thu, 1 Mar 2012 14:09:24 +0100<br>
+Subject: [PATCH] Use inttypes.h if stdint.h is not available<br>
+<br>
+---<br>
+ upnp/inc/UpnpStdInt.h |    4 ++++<br>
+ 1 files changed, 4 insertions(+), 0 deletions(-)<br>
+<br>
+diff --git a/upnp/inc/UpnpStdInt.h b/upnp/inc/UpnpStdInt.h<br>
+index 9256f57..f87c095 100644<br>
+--- a/upnp/inc/UpnpStdInt.h<br>
++++ b/upnp/inc/UpnpStdInt.h<br>
+@@ -4,7 +4,11 @@<br>
+ #if !defined(UPNP_USE_BCBPP)<br>
+<br>
+ /* Sized integer types. */<br>
++#if defined( HAVE_STDINT_H )<br>
+ #include <stdint.h><br>
++#elif defined( HAVE_INTTYPES_H )<br>
++#include <inttypes.h><br>
++#endif<br>
+<br>
+ #ifdef UPNP_USE_MSVCPP<br>
+       /* no ssize_t defined for VC */<br>
+--<br>
+1.7.9<br>
+<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.7.9.2<br>
<br>
_______________________________________________<br>
vlc-devel mailing list<br>
To unsubscribe or modify your subscription options:<br>
<a href="https://mailman.videolan.org/listinfo/vlc-devel" target="_blank">https://mailman.videolan.org/listinfo/vlc-devel</a><br>
</font></span></blockquote></div><br></div></div>