Upgrade mjpg-streamer to revision 35

git-svn-id: svn://svn.openwrt.org/openwrt/packages@10043 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile
index 6cde444..fb38e97 100644 (file)
--- a/multimedia/mjpg-streamer/Makefile
+++ b/multimedia/mjpg-streamer/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mjpg-streamer
-PKG_VERSION:=2
+PKG_VERSION:=rev35
 PKG_RELEASE:=1
 
-PKG_SOURCE:=mjpg_streamer_2007_10_12.tgz
-PKG_SOURCE_URL:=http://naaa.de/programme/mjpg-streamer/
-PKG_MD5SUM:=fd1159498a8648d30dfead3e6569ab54
+PKG_SOURCE:=mjpg_streamer_$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=@SF/$(PKG_NAME)
+PKG_MD5SUM:=2a41d65eff5977e0d7823d2d12f385c9
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
@@ -24,7 +24,7 @@ define Package/mjpg-streamer
   SECTION:=multimedia
   CATEGORY:=Multimedia
   TITLE:=MJPG-streamer
-  DEPENDS:=@LINUX_2_6 +libpthread
+  DEPENDS:=@LINUX_2_6 +libpthread +libjpeg
   URL:=http://www.naaa.de/uvc_streamer.htm
 endef
 
@@ -32,11 +32,10 @@ define Package/mjpg-streamer/description
        streaming application for Linux-UVC compatible webcams
 endef
 
-MAKE_FLAGS += \
-       -C $(PKG_BUILD_DIR) \
-       CFLAGS="$(TARGET_CFLAGS)" \
-       CC="$(TARGET_CC)" \
-       all
+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
@@ -46,14 +45,25 @@ define Package/mjpg-streamer/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/output_http.so $(1)/usr/lib
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/output_file.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
 endef
 
 $(eval $(call BuildPackage,mjpg-streamer))