From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 8 Feb 2009 13:48:04 +0000 (+0000)
Subject: [package] update mjpg-streamer to revision 74 (#4347)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=0b3aa86231888cbc342b43625ac3db8c6cf60b68;ds=sidebyside

[package] update mjpg-streamer to revision 74 (#4347)

SVN-Revision: 14443
---

diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile
index 53b9702669..f43b1b5a31 100644
--- a/multimedia/mjpg-streamer/Makefile
+++ b/multimedia/mjpg-streamer/Makefile
@@ -9,9 +9,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mjpg-streamer
-PKG_REV:=68
+PKG_REV:=74
 PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://mjpg-streamer.svn.sourceforge.net/svnroot/mjpg-streamer/mjpg-streamer/
@@ -39,7 +39,7 @@ define Package/mjpg-streamer/install
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mjpg_streamer $(1)/sbin
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(foreach input_plugin,uvc gspcav1,$(PKG_BUILD_DIR)/input_$(input_plugin).so) $(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
diff --git a/multimedia/mjpg-streamer/patches/001-no_input_testpictures.patch b/multimedia/mjpg-streamer/patches/001-no_input_testpictures.patch
index 9390cf4c87..8ae90be3d8 100644
--- a/multimedia/mjpg-streamer/patches/001-no_input_testpictures.patch
+++ b/multimedia/mjpg-streamer/patches/001-no_input_testpictures.patch
@@ -1,12 +1,11 @@
-diff -urN mjpg-streamer-r68/Makefile mjpg-streamer-r68.new/Makefile
---- mjpg-streamer-r68/Makefile	2008-09-27 16:26:56.000000000 +0200
-+++ mjpg-streamer-r68.new/Makefile	2009-01-18 16:11:32.000000000 +0100
-@@ -28,7 +28,7 @@
- APP_BINARY = mjpg_streamer
- 
- # define the names and targets of the plugins
--PLUGINS = input_uvc.so output_file.so output_http.so input_testpicture.so output_autofocus.so input_gspcav1.so
-+PLUGINS = input_uvc.so output_file.so output_http.so output_autofocus.so input_gspcav1.so
- 
- # define the names of object files
- OBJECTS=mjpg_streamer.o utils.o
+diff -urN mjpg-streamer-r74/Makefile mjpg-streamer-r74.new/Makefile
+--- mjpg-streamer-r74/Makefile	2009-02-08 14:51:37.000000000 +0100
++++ mjpg-streamer-r74.new/Makefile	2009-02-08 14:52:48.000000000 +0100
+@@ -31,7 +31,6 @@
+ PLUGINS = input_uvc.so
+ PLUGINS += output_file.so
+ PLUGINS += output_http.so
+-PLUGINS += input_testpicture.so
+ PLUGINS += output_autofocus.so
+ PLUGINS += input_gspcav1.so
+ PLUGINS += input_file.so