mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
mjpg-streamer: Update to latest from github/jacksonliam repository. Add additional plugins for RTSP, UDP, etc.
Signed-off-by: Ted Hess <thess@kitschensync.net>
This commit is contained in:
@@ -6,23 +6,23 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=mjpg-streamer
|
||||
PKG_REV:=182
|
||||
PKG_VERSION:=r$(PKG_REV)
|
||||
PKG_RELEASE:=10
|
||||
PKG_VERSION:=2018-04-14
|
||||
PKG_RELEASE:=1
|
||||
PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>, \
|
||||
Ted Hess <thess@kitschensync.net>
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).1.tar.xz
|
||||
PKG_SOURCE_URL:=https://svn.code.sf.net/p/mjpg-streamer/code/mjpg-streamer-experimental
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/jacksonliam/mjpg-streamer.git
|
||||
PKG_SOURCE_VERSION:=821c330ea6bbb5fbed98d48e00aac156e923161b
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
||||
PKG_SOURCE_VERSION:=$(PKG_REV)
|
||||
PKG_SOURCE_PROTO:=svn
|
||||
PKG_MIRROR_HASH:=ccff417d0a34f7cee12c7984f77788267b1da0f2a7d849bc1b2e3614e670078b
|
||||
PKG_MIRROR_HASH:=f95e54bc95c808b9867bbca364e58b6c7e08cb26613205f8d87450ab9c899942
|
||||
|
||||
PKG_LICENSE:=GPL-2.0
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
include $(INCLUDE_DIR)/cmake.mk
|
||||
|
||||
PKG_BUILD_DEPENDS:=MJPG_STREAMER_V4L2:libv4l
|
||||
|
||||
@@ -31,7 +31,7 @@ define Package/mjpg-streamer
|
||||
CATEGORY:=Multimedia
|
||||
TITLE:=MJPG-streamer
|
||||
DEPENDS:=+libpthread +libjpeg +MJPG_STREAMER_V4L2:libv4l
|
||||
URL:=http://mjpg-streamer.wiki.sourceforge.net/
|
||||
URL:=https://github.com/jacksonliam/mjpg-streamer
|
||||
MENU:=1
|
||||
endef
|
||||
|
||||
@@ -43,8 +43,6 @@ define Package/mjpg-streamer/config
|
||||
source "$(SOURCE)/Config.in"
|
||||
endef
|
||||
|
||||
EXTRA_CFLAGS += $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)
|
||||
|
||||
define Package/mjpg-streamer/conffiles
|
||||
/etc/config/mjpg-streamer
|
||||
endef
|
||||
@@ -60,13 +58,18 @@ define Download/cambozola
|
||||
MD5SUM:=35c45188aa9635aef2b745c35c311396
|
||||
endef
|
||||
|
||||
# Fetch latest cambozola that works with latest Java(s)
|
||||
# Yes, I know this is ugly
|
||||
# redefine prepare to extract to our build dir
|
||||
# apply patches
|
||||
define Build/Prepare
|
||||
$(call Build/Prepare/Default)
|
||||
rm -rf $(PKG_BUILD_DIR)/
|
||||
mkdir -p $(PKG_BUILD_DIR)/
|
||||
$(TAR) -xJf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) --strip=2
|
||||
$(Build/Patch)
|
||||
# Fetch latest cambozola that works with latest Java(s)
|
||||
# Yes, I know this is ugly
|
||||
ifeq ($(CONFIG_MJPG_STREAMER_WWW),y)
|
||||
$(eval $(call Download,cambozola))
|
||||
$(TAR) -xvf $(DL_DIR)/$(CAMBOZOLA) --strip=2 --wildcards \
|
||||
$(TAR) -xf $(DL_DIR)/$(CAMBOZOLA) --strip=2 --wildcards \
|
||||
-C $(PKG_BUILD_DIR)/www */dist/cambozola.jar
|
||||
endif
|
||||
endef
|
||||
@@ -75,6 +78,8 @@ define Build/Configure
|
||||
$(RM) $(PKG_BUILD_DIR)/plugins/input_uvc/uvcvideo.h
|
||||
endef
|
||||
|
||||
TARGET_LDFLAGS+= -ljpeg
|
||||
|
||||
ifeq ($(CONFIG_MJPG_STREAMER_V4L2),y)
|
||||
TARGET_CFLAGS+= -DUSE_LIBV4L2
|
||||
TARGET_LDFLAGS+= -lv4l2
|
||||
@@ -96,8 +101,14 @@ endif
|
||||
ifeq ($(CONFIG_MJPG_STREAMER_INPUT_UVC),y)
|
||||
$(CP) $(PKG_BUILD_DIR)/input_uvc.so $(1)/usr/lib
|
||||
endif
|
||||
ifeq ($(CONFIG_MJPG_STREAMER_INPUT_TESTPICTURE),y)
|
||||
$(CP) $(PKG_BUILD_DIR)/input_testpicture.so $(1)/usr/lib
|
||||
ifeq ($(CONFIG_MJPG_STREAMER_INPUT_HTTP),y)
|
||||
$(CP) $(PKG_BUILD_DIR)/input_http.so $(1)/usr/lib
|
||||
endif
|
||||
ifeq ($(CONFIG_MJPG_STREAMER_OUTPUT_RTSP),y)
|
||||
$(CP) $(PKG_BUILD_DIR)/output_rtsp.so $(1)/usr/lib
|
||||
endif
|
||||
ifeq ($(CONFIG_MJPG_STREAMER_OUTPUT_UDP),y)
|
||||
$(CP) $(PKG_BUILD_DIR)/output_udp.so $(1)/usr/lib
|
||||
endif
|
||||
ifeq ($(CONFIG_MJPG_STREAMER_OUTPUT_FILE),y)
|
||||
$(CP) $(PKG_BUILD_DIR)/output_file.so $(1)/usr/lib
|
||||
|
||||
Reference in New Issue
Block a user