From 9be0710ebdf994af01c451b8198f5dc0c672830d Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Wed, 13 Dec 2017 14:05:00 -0500 Subject: [PATCH] mjpg-streamer: Remove build date-time from image Remove un-needed uvcvideo.h (use system include) Signed-off-by: Ted Hess --- multimedia/mjpg-streamer/Makefile | 6 +++- .../patches/035-remove_build_date-time.patch | 34 +++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 multimedia/mjpg-streamer/patches/035-remove_build_date-time.patch diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile index 1c18e5d923..bc8e44ce7f 100644 --- a/multimedia/mjpg-streamer/Makefile +++ b/multimedia/mjpg-streamer/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mjpg-streamer PKG_REV:=182 PKG_VERSION:=r$(PKG_REV) -PKG_RELEASE:=9 +PKG_RELEASE:=10 PKG_MAINTAINER:=Roger D , \ Ted Hess @@ -71,6 +71,10 @@ define Build/Prepare endif endef +define Build/Configure + $(RM) $(PKG_BUILD_DIR)/plugins/input_uvc/uvcvideo.h +endef + ifeq ($(CONFIG_MJPG_STREAMER_V4L2),y) TARGET_CFLAGS+= -DUSE_LIBV4L2 TARGET_LDFLAGS+= -lv4l2 diff --git a/multimedia/mjpg-streamer/patches/035-remove_build_date-time.patch b/multimedia/mjpg-streamer/patches/035-remove_build_date-time.patch new file mode 100644 index 0000000000..f2d051949a --- /dev/null +++ b/multimedia/mjpg-streamer/patches/035-remove_build_date-time.patch @@ -0,0 +1,34 @@ +--- a/Makefile ++++ b/Makefile +@@ -15,8 +15,8 @@ DESTDIR = /usr/local + # set the compiler to use + CC = gcc + +-SVNDEV := -D'SVN_REV="$(shell svnversion -c .)"' +-CFLAGS += $(SVNDEV) ++#SVNDEV := -D'SVN_REV="$(shell svnversion -c .)"' ++#CFLAGS += $(SVNDEV) + + # general compile flags, enable all warnings to make compile more verbose + CFLAGS += -DLINUX -D_GNU_SOURCE -Wall +--- a/mjpg_streamer.c ++++ b/mjpg_streamer.c +@@ -253,15 +253,12 @@ int main(int argc, char *argv[]) + /* v, version */ + case 6: + case 7: +- printf("MJPG Streamer Version: %s\n" \ +- "Compilation Date.....: %s\n" \ +- "Compilation Time.....: %s\n", ++ printf("MJPG Streamer Version: %s\n", + #ifdef SVN_REV +- SVN_REV, ++ SVN_REV); + #else +- SOURCE_VERSION, ++ SOURCE_VERSION); + #endif +- __DATE__, __TIME__); + return 0; + break; +