Skip to contentSkip to conversation

package/mjpg-streamer: bump version

PATCH New Bernd Kuhls 2 participants 5 messages Sep 30, 2018 – Oct 8, 2018

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/4 package/mjpg-streamer: bump version

The currently used github repo from oliv3r does not exist anymore.
https://sourceforge.net/projects/mjpg-streamer/ shows that the status of the original project site is "Inactive" and points to
https://github.com/jacksonliam/mjpg-streamer as the new site.

The new maintainer is active so we bump the package to HEAD of its master branch which fixes a glibc-related build error:
http://autobuild.buildroot.net/results/4c8/4c8aac898d4580ed0b8b52cef7779d0f6f6a631f/

Further changes due to this bump:
- removed patch 0001, fix was applied upstream:
https://github.com/jacksonliam/mjpg-streamer/commit/eb4dafd802b366d9b0310e91e7bb93a1082e7657#diff-511ff6908e8db4543e5a59d0ea4a2f1f
- switched to CMake

Added license hash.

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mjpg-streamer/0001-musl-pthread.patch | 18 ---------------
 package/mjpg-streamer/Config.in               |  2 +-
 package/mjpg-streamer/mjpg-streamer.hash      |  3 ++-
 package/mjpg-streamer/mjpg-streamer.mk        | 22 +++++--------------
 4 files changed, 8 insertions(+), 37 deletions(-)
 delete mode 100644 package/mjpg-streamer/0001-musl-pthread.patch
package/mjpg-streamer/0001-musl-pthread.patch deleted +0 -18
deleted file mode 100644
index 9e76e760d8..0000000000
@@ -1,18 +0,0 @@
-Fix musl build
-
-Patch written by Thomas Petazzoni:
-http://patchwork.ozlabs.org/patch/572309/
-
-Signed-off-by: Bernd Kuhls <[email protected]>
-
-diff -uNr mjpg-streamer-bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b.org/plugins/input.h mjpg-streamer-bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b/plugins/input.h
---- mjpg-streamer-bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b.org/plugins/input.h	2015-11-09 15:56:47.000000000 +0100
-+++ mjpg-streamer-bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b/plugins/input.h	2016-01-26 20:19:05.884349502 +0100
-@@ -20,6 +20,7 @@
- #                                                                              #
- *******************************************************************************/
- 
-+#include <pthread.h>
- #include <syslog.h>
- #include "../mjpg_streamer.h"
- #define INPUT_PLUGIN_PREFIX " i: "
package/mjpg-streamer/Config.in +1 -1
index f42c2a50db..3587af0288 100644
@@ -10,7 +10,7 @@ config BR2_PACKAGE_MJPG_STREAMER
 	  filesystem or other input plugins and streams them as
 	  M-JPEG via HTTP to webbrowsers, VLC and other software.
 
-	  http://mjpg-streamer.sourceforge.net
+	  https://github.com/jacksonliam/mjpg-streamer
 
 comment "mjpg-streamer needs a toolchain w/ threads, headers >= 3.0, dynamic library"
 	depends on BR2_USE_MMU
package/mjpg-streamer/mjpg-streamer.hash +2 -1
index 8bbac29e33..f544550c53 100644
@@ -1,2 +1,3 @@
 # Locally computed
-sha256	756a60cbc3404ac21109bb66091774ac8e1d64ebf60e2bf2c0d08a06d1abb9be	mjpg-streamer-bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b.tar.gz
+sha256 094fda686ef63e5167cbef81b5ac6aea74fa98ea2674fa4eba3bc6ba29cc5857  mjpg-streamer-f387bb44e6c087271b763b27da998bf2e06c4f5d.tar.gz
+sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  mjpg-streamer-experimental/LICENSE
package/mjpg-streamer/mjpg-streamer.mk +5 -17
index 4fecf69ec9..2941e314b3 100644
@@ -4,27 +4,15 @@
 #
 ################################################################################
 
-# Original source is located at
-# http://sourceforge.net/p/mjpg-streamer/code/commit_browser
-# oliv3r forked the repo to add support for 3.16 and 3.17 kernels:
-# http://sourceforge.net/p/mjpg-streamer/patches/14/
-MJPG_STREAMER_VERSION = bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b
-MJPG_STREAMER_SITE = $(call github,oliv3r,mjpg-streamer,$(MJPG_STREAMER_VERSION))
+MJPG_STREAMER_VERSION = f387bb44e6c087271b763b27da998bf2e06c4f5d
+MJPG_STREAMER_SITE = $(call github,jacksonliam,mjpg-streamer,$(MJPG_STREAMER_VERSION))
+MJPG_STREAMER_SUBDIR = mjpg-streamer-experimental
 MJPG_STREAMER_LICENSE = GPL-2.0+
-MJPG_STREAMER_LICENSE_FILES = LICENSE
+MJPG_STREAMER_LICENSE_FILES = $(MJPG_STREAMER_SUBDIR)/LICENSE
 MJPG_STREAMER_DEPENDENCIES = jpeg
 
 ifeq ($(BR2_PACKAGE_LIBV4L),y)
 MJPG_STREAMER_DEPENDENCIES += libv4l
-MJPG_STREAMER_USE_LIBV4L += USE_LIBV4L2=true
 endif
 
-define MJPG_STREAMER_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" -C $(@D) $(MJPG_STREAMER_USE_LIBV4L)
-endef
-
-define MJPG_STREAMER_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR)/usr install
-endef
-
-$(eval $(generic-package))
+$(eval $(cmake-package))
Signature · 1 line
2.19.0
author
#1 lore raw

PATCH 2/4 package/mjpg-streamer: add optional dependency to opencv3

According to
https://github.com/jacksonliam/mjpg-streamer/blob/master/mjpg-streamer-experimental/plugins/input_opencv/README.md
the plugin does not support OpenCV 2.x.

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mjpg-streamer/mjpg-streamer.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/mjpg-streamer/mjpg-streamer.mk +7 -0
index 2941e314b3..50ed980b7a 100644
@@ -15,4 +15,11 @@ ifeq ($(BR2_PACKAGE_LIBV4L),y)
 MJPG_STREAMER_DEPENDENCIES += libv4l
 endif
 
+ifeq ($(BR2_PACKAGE_OPENCV3_LIB_IMGPROC)$(BR2_PACKAGE_OPENCV3_LIB_IMGPROC)$(BR2_PACKAGE_OPENCV3_LIB_IMGPROC),yyy)
+MJPG_STREAMER_CONF_OPTS += -DPLUGIN_INPUT_OPENCV=ON
+MJPG_STREAMER_DEPENDENCIES += host-pkgconf opencv3
+else
+MJPG_STREAMER_CONF_OPTS += -DPLUGIN_INPUT_OPENCV=OFF
+endif
+
 $(eval $(cmake-package))
Signature · 1 line
2.19.0
author
#2 lore raw

PATCH 3/4 package/mjpg-streamer: add optional dependency to sdl

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mjpg-streamer/mjpg-streamer.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/mjpg-streamer/mjpg-streamer.mk +7 -0
index 50ed980b7a..a4f96e1c56 100644
@@ -22,4 +22,11 @@ else
 MJPG_STREAMER_CONF_OPTS += -DPLUGIN_INPUT_OPENCV=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_SDL),y)
+MJPG_STREAMER_CONF_OPTS += -DPLUGIN_OUTPUT_VIEWER=ON
+MJPG_STREAMER_DEPENDENCIES += host-pkgconf sdl
+else
+MJPG_STREAMER_CONF_OPTS += -DPLUGIN_OUTPUT_VIEWER=OFF
+endif
+
 $(eval $(cmake-package))
Signature · 1 line
2.19.0
author
#3 lore raw

PATCH 4/4 package/mjpg-streamer: add optional dependency to libgphoto2

In reply to Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mjpg-streamer/mjpg-streamer.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/mjpg-streamer/mjpg-streamer.mk +7 -0
index a4f96e1c56..111a66ef7e 100644
@@ -11,6 +11,13 @@ MJPG_STREAMER_LICENSE = GPL-2.0+
 MJPG_STREAMER_LICENSE_FILES = $(MJPG_STREAMER_SUBDIR)/LICENSE
 MJPG_STREAMER_DEPENDENCIES = jpeg
 
+ifeq ($(BR2_PACKAGE_LIBGPHOTO2),y)
+MJPG_STREAMER_CONF_OPTS += -DPLUGIN_INPUT_PTP2=ON
+MJPG_STREAMER_DEPENDENCIES += host-pkgconf libgphoto2
+else
+MJPG_STREAMER_CONF_OPTS += -DPLUGIN_INPUT_PTP2=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_LIBV4L),y)
 MJPG_STREAMER_DEPENDENCIES += libv4l
 endif
Signature · 1 line
2.19.0
#4 lore raw

PATCH 1/4 package/mjpg-streamer: bump version

In reply to Bernd Kuhls

Hello,

Quoted 16 lines · Bernd Kuhls

The currently used github repo from oliv3r does not exist anymore.
https://sourceforge.net/projects/mjpg-streamer/ shows that the status of the original project site is "Inactive" and points to
https://github.com/jacksonliam/mjpg-streamer as the new site.

The new maintainer is active so we bump the package to HEAD of its master branch which fixes a glibc-related build error:
http://autobuild.buildroot.net/results/4c8/4c8aac898d4580ed0b8b52cef7779d0f6f6a631f/

Further changes due to this bump:
- removed patch 0001, fix was applied upstream:
https://github.com/jacksonliam/mjpg-streamer/commit/eb4dafd802b366d9b0310e91e7bb93a1082e7657#diff-511ff6908e8db4543e5a59d0ea4a2f1f
- switched to CMake

Added license hash.

Quoted 8 lines
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mjpg-streamer/0001-musl-pthread.patch | 18 ---------------
 package/mjpg-streamer/Config.in               |  2 +-
 package/mjpg-streamer/mjpg-streamer.hash      |  3 ++-
 package/mjpg-streamer/mjpg-streamer.mk        | 22 +++++--------------
 4 files changed, 8 insertions(+), 37 deletions(-)
 delete mode 100644 package/mjpg-streamer/0001-musl-pthread.patch

All four patches applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com