From: Oliver Ertl <oliver@ertl-net.net>
Date: Wed, 23 Jan 2008 10:09:46 +0000 (+0000)
Subject: [Packages] multimedia/mjpg-streamer:
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=5523ed0b07cb10e6c4efcf552bc3cb5c5195bb2f

[Packages] multimedia/mjpg-streamer:
 * Update r31 to r51
 * Cleanup Makefile

SVN-Revision: 10233
---

diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile
index fb38e97b48..987fce6c23 100644
--- a/multimedia/mjpg-streamer/Makefile
+++ b/multimedia/mjpg-streamer/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007,2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mjpg-streamer
-PKG_VERSION:=rev35
+PKG_VERSION:=rev51
 PKG_RELEASE:=1
 
 PKG_SOURCE:=mjpg_streamer_$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=2a41d65eff5977e0d7823d2d12f385c9
+PKG_MD5SUM:=a9f26a96fdebdf3046ce920d2bcfb4ef
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
@@ -33,37 +33,15 @@ define Package/mjpg-streamer/description
 endef
 
 EXTRA_CFLAGS += -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
-define Build/Compile
-	$(call Build/Compile/Default)
-endef
 
 define Package/mjpg-streamer/install
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mjpg_streamer $(1)/sbin
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/input_uvc.so $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/output_http.so $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/output_file.so $(1)/usr/lib
+	$(CP) $(foreach plugin,http file autofocus,$(PKG_BUILD_DIR)/output_$(plugin).so) $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/webcam_www
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/bodybg.gif $(1)/webcam_www
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/cambozola.jar $(1)/webcam_www
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/control.htm $(1)/webcam_www
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/example.jpg $(1)/webcam_www
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/favicon.ico $(1)/webcam_www
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/fix.css $(1)/webcam_www
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/functions.js $(1)/webcam_www
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/index.html $(1)/webcam_www
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/java.html $(1)/webcam_www
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/javascript.html $(1)/webcam_www
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/javascript_simple.html $(1)/webcam_www
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/java_simple.html $(1)/webcam_www
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/LICENSE.txt $(1)/webcam_www
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/sidebarbg.gif $(1)/webcam_www
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/static.html $(1)/webcam_www
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/static_simple.html $(1)/webcam_www
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/stream.html $(1)/webcam_www
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/stream_simple.html $(1)/webcam_www
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/style.css $(1)/webcam_www
+	$(CP) $(PKG_BUILD_DIR)/www/* $(1)/webcam_www
 endef
 
 $(eval $(call BuildPackage,mjpg-streamer))