[packages] mjpeg-streamer: Update to r63

[packages.git] / multimedia / mjpg-streamer / Makefile

diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile
index 6cde444..67c1356 100644 (file)
--- 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,14 +9,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mjpg-streamer
-PKG_VERSION:=2
+PKG_REV:=63
+PKG_VERSION:=r$(PKG_REV)
 PKG_RELEASE:=1
 
-PKG_SOURCE:=mjpg_streamer_2007_10_12.tgz
-PKG_SOURCE_URL:=http://naaa.de/programme/mjpg-streamer/
-PKG_MD5SUM:=fd1159498a8648d30dfead3e6569ab54
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=https://mjpg-streamer.svn.sourceforge.net/svnroot/mjpg-streamer/mjpg-streamer/
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_PROTO:=svn
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -24,36 +25,24 @@ 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
 
 define Package/mjpg-streamer/description
-       streaming application for Linux-UVC compatible webcams
+       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 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 input_plugin,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
-       $(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/favicon.ico $(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/LICENSE.txt $(1)/webcam_www
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/www/stream.html $(1)/webcam_www
+       $(CP) $(PKG_BUILD_DIR)/www/* $(1)/webcam_www
 endef
 
 $(eval $(call BuildPackage,mjpg-streamer))