X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=multimedia%2Fmjpg-streamer%2FMakefile;h=957813880a67e64678ae529d83252db5c2d6e7e4;hb=af0a5cde2b0dea4d277ec5a60c31570e7521a45c;hp=f43b1b5a31e82d902303496f3c01a846089fb0fc;hpb=0b3aa86231888cbc342b43625ac3db8c6cf60b68;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile
index f43b1b5a31..957813880a 100644
--- a/multimedia/mjpg-streamer/Makefile
+++ b/multimedia/mjpg-streamer/Makefile
@@ -1,15 +1,14 @@
 #
-# Copyright (C) 2007-2008 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mjpg-streamer
-PKG_REV:=74
+PKG_REV:=136
 PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
 
@@ -25,24 +24,28 @@ define Package/mjpg-streamer
   SECTION:=multimedia
   CATEGORY:=Multimedia
   TITLE:=MJPG-streamer
-  DEPENDS:=@LINUX_2_6 +libpthread +libjpeg
-  URL:=http://www.naaa.de/uvc_streamer.htm
+  DEPENDS:=@!LINUX_2_4 +libpthread +libjpeg
+  URL:=http://mjpg-streamer.wiki.sourceforge.net/
 endef
 
 define Package/mjpg-streamer/description
 	Streaming application for Linux-UVC compatible webcams
 endef
 
-EXTRA_CFLAGS += -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
+EXTRA_CFLAGS += $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)
 
 define Package/mjpg-streamer/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mjpg_streamer $(1)/sbin
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mjpg_streamer $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/etc/config
+	$(CP) ./files/mjpg-streamer.config $(1)/etc/config/mjpg-streamer
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/mjpg-streamer.init $(1)/etc/init.d/mjpg-streamer
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(foreach input_plugin,file uvc gspcav1,$(PKG_BUILD_DIR)/input_$(input_plugin).so) $(1)/usr/lib
 	$(CP) $(foreach output_plugin,http file autofocus,$(PKG_BUILD_DIR)/output_$(output_plugin).so) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/webcam_www
-	$(CP) $(PKG_BUILD_DIR)/www/* $(1)/webcam_www
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/usb
+	$(INSTALL_DATA) ./files/mjpg-streamer.hotplug $(1)/etc/hotplug.d/usb/20-mjpg-streamer
 endef
 
 $(eval $(call BuildPackage,mjpg-streamer))