[vlc-devel] commit: [Contrib]: libupnp build rules. Enable upnp on darwin. ( Pavlov Konstantin )

[git version control]

vlc | branch: master | Pavlov Konstantin <thresh at videolan.org> | Fri Jan  9 18:18:36 2009 +0300| [2bd0c496c12d5c247e4f1e638a78bc57a0316175] | committer: Pavlov Konstantin 

[Contrib]: libupnp build rules. Enable upnp on darwin.

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

 extras/contrib/src/Distributions/darwin.mak |    2 +-
 extras/contrib/src/Makefile                 |   19 +++++++++++++++++++
 extras/contrib/src/packages.mak             |    4 ++--
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak
index 82d693a..09d280c 100644
--- a/extras/contrib/src/Distributions/darwin.mak
+++ b/extras/contrib/src/Distributions/darwin.mak
@@ -6,7 +6,7 @@ all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .freetype \
     .png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
     .SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \
     .dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .liboil \
-    .schroedinger .libass .aclocal
+    .schroedinger .libass .aclocal .libupnp
 # .expat .clinkcc don't work with SDK yet
 # .glib .IDL .gecko are required to build the mozilla plugin
 # .mozilla-macosx will build an entire mozilla. it can be used if we need to create a new .gecko package
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 86b25d7..eca15f8 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2520,6 +2520,25 @@ CLEAN_PKG += libass
 DISTCLEAN_PKG += libass-$(ASS_VERSION).tar.bz2
 
 # ***************************************************************************
+# UPNP library
+# ***************************************************************************
+
+libupnp-$(UPNP_VERSION).tar.bz2:
+	$(WGET) $(UPNP_URL)
+
+libupnp: libupnp-$(UPNP_VERSION).tar.bz2
+	$(EXTRACT_BZ2)
+
+.libupnp: libupnp
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-samples --without-documentation --disable-webserver CFLAGS="$(CFLAGS) -O3" && make && make install)
+	touch $@
+
+CLEAN_FILE += .libupnp
+CLEAN_PKG += libupnp
+DISTCLEAN_PKG += libupnp-$(UPNP_VERSION).tar.bz2
+
+
+# ***************************************************************************
 # Some cleaning
 # ***************************************************************************
 
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index bf0e518..a829f5c 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -200,8 +200,8 @@ PORTAUDIO_VERSION=19
 PORTAUDIO_URL=http://www.portaudio.com/archives/pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz
 CLINKCC_VERSION=171
 CLINKCC_URL=$(SF)/clinkcc/clinkcc$(CLINKCC_VERSION).tar.gz
-UPNP_VERSION=1.2.1
-UPNP_URL=$(SF)/upnp/libupnp-$(UPNP_VERSION).tar.gz
+UPNP_VERSION=1.6.6
+UPNP_URL=$(VIDEOLAN)/testing/contrib/libupnp-$(UPNP_VERSION).tar.bz2
 EXPAT_VERSION=2.0.0
 EXPAT_URL=$(SF)/expat/expat-$(EXPAT_VERSION).tar.gz
 PTHREADS_VERSION=2-8-0