[vlc-commits] contrib: upnp: fix build

[Rafaël Carré]

vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Mon Apr  8 00:29:01 2013 +0200| [a38fc7e1f282665d72856d93070708979501d95c] | committer: Rafaël Carré

contrib: upnp: fix build
(cherry picked from commit 3b1ecaf7ae893a53b1d8e4928824e10ca20ac2e9)

Signed-off-by: Rafaël Carré <funman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=a38fc7e1f282665d72856d93070708979501d95c
---

 contrib/src/upnp/miniserver.patch |   17 +++++++++++++++++
 contrib/src/upnp/rules.mak        |    1 +
 2 files changed, 18 insertions(+)

diff --git a/contrib/src/upnp/miniserver.patch b/contrib/src/upnp/miniserver.patch
new file mode 100644
index 0000000..45ff90c
--- /dev/null
+++ b/contrib/src/upnp/miniserver.patch
@@ -0,0 +1,17 @@
+--- upnp/upnp/src/api/upnpapi.c.orig	2013-04-08 00:23:46.000000000 +0200
++++ upnp/upnp/src/api/upnpapi.c	2013-04-08 00:25:49.000000000 +0200
+@@ -358,13 +358,13 @@
+ 		return retVal;
+ 	}
+ 
++#ifdef INTERNAL_WEB_SERVER
+ #ifdef INCLUDE_DEVICE_APIS
+ #if EXCLUDE_SOAP == 0
+ 	SetSoapCallback(soap_device_callback);
+ #endif
+ #endif /* INCLUDE_DEVICE_APIS */
+ 
+-#ifdef INTERNAL_WEB_SERVER
+ #if EXCLUDE_GENA == 0
+ 	SetGenaCallback(genaCallback);
+ #endif
diff --git a/contrib/src/upnp/rules.mak b/contrib/src/upnp/rules.mak
index a5d919f..bba4a65 100644
--- a/contrib/src/upnp/rules.mak
+++ b/contrib/src/upnp/rules.mak
@@ -22,6 +22,7 @@ ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/upnp/libupnp-win64.patch
 endif
 	$(APPLY) $(SRC)/upnp/libupnp-ipv6.patch
+	$(APPLY) $(SRC)/upnp/miniserver.patch
 	$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build-aux/
 	$(MOVE)