X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libs%2Flibupnp%2FMakefile;h=9ebef1596f4f79de3a613314322a407466aa7839;hb=c75bc7b0bfbc1f485b74ccaa0ebe720d78cb4798;hp=ddebeff89e8181513a9889e6bfe0d39ebdd5c450;hpb=d85961b5ffc35f9b5e8caa42da83613da118fec5;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/libs/libupnp/Makefile b/libs/libupnp/Makefile
index ddebeff89e..9ebef1596f 100644
--- a/libs/libupnp/Makefile
+++ b/libs/libupnp/Makefile
@@ -9,31 +9,45 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libupnp
-PKG_VERSION:=1.3.1
+PKG_VERSION:=1.6.6
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/upnp
-PKG_MD5SUM:=6646be5e31e58188e8f47c6ce64faa4c
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@SF/pupnp
+PKG_MD5SUM:=8918dcf7428cd119d0c8275765ff2833
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/libupnp
+define Package/libupnp/Default
   SECTION:=libs
   CATEGORY:=Libraries
+  URL:=http://upnp.sourceforge.net/
+endef
+
+define Package/libupnp
+  $(call Package/libupnp/Default)
   DEPENDS:=+libpthread
   TITLE:=UPnP SDK library
-  URL:=http://upnp.sourceforge.net/
+  MENU:=1
 endef
 
 define Package/libupnp/description
-	The Universal Plug and Play (UPnP) SDK for Linux provides support 
-	for building UPnP-compliant control points, devices, and bridges 
-	on Linux.
+        The portable SDK for UPnP Devices (libupnp) provides developers with an
+	API and open source code for building control points, devices, and
+	bridges that are compliant with Version 1.0 of the  Universal Plug and
+	Play Device Architecture Specification and support several operating
+	systems like Linux, *BSD, Solaris and others.
+endef
+
+define Package/libupnp-sample
+  $(call Package/libupnp/Default)
+  DEPENDS:=libupnp
+  TITLE:=UPnP sample applications
+endef
+
+define Package/libupnp-sample/description
+	TVcontrolpoint & tvdevice sample applications
+	run inside /etc/upnp-tvdevice/
 endef
 
 define Build/Configure
@@ -48,6 +62,14 @@ define Build/Compile
 		CCOPT="$(TARGET_CFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
+	$(MAKE) -C $(PKG_BUILD_DIR)/upnp/sample/ upnp_tv_device upnp_tv_ctrlpt
+endef
+
+define Build/Compile/libupnp-sample
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CCOPT="$(TARGET_CFLAGS)" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		check
 endef
 
 define Build/InstallDev
@@ -59,16 +81,18 @@ define Build/InstallDev
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libupnp.pc $(1)/usr/lib/pkgconfig/
 endef
 
-define Build/UninstallDev
-	rm -rf \
-		$(STAGING_DIR)/usr/include/upnp \
-		$(STAGING_DIR)/usr/lib/lib{ixml,threadutil,upnp}.{a,so*} \
-		$(STAGING_DIR)/usr/lib/pkgconfig/libupnp.pc
-endef
-
 define Package/libupnp/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ixml,threadutil,upnp}.so.* $(1)/usr/lib/
 endef
 
+define Package/libupnp-sample/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/upnp_tv_device $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/upnp_tv_ctrlpt $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/etc/upnp-tvdevice/web
+	$(CP) $(PKG_BUILD_DIR)/upnp/sample/web/* $(1)/etc/upnp-tvdevice
+endef
+
 $(eval $(call BuildPackage,libupnp))
+$(eval $(call BuildPackage,libupnp-sample))