* [Buildroot] [PATCH 1/4] package/mjpg-streamer: bump version
@ 2018-09-30 19:03 Bernd Kuhls
2018-09-30 19:03 ` [Buildroot] [PATCH 2/4] package/mjpg-streamer: add optional dependency to opencv3 Bernd Kuhls
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Bernd Kuhls @ 2018-09-30 19:03 UTC (permalink / raw)
To: buildroot
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 <bernd.kuhls@t-online.de>
---
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
diff --git a/package/mjpg-streamer/0001-musl-pthread.patch b/package/mjpg-streamer/0001-musl-pthread.patch
deleted file mode 100644
index 9e76e760d8..0000000000
--- a/package/mjpg-streamer/0001-musl-pthread.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix musl build
-
-Patch written by Thomas Petazzoni:
-http://patchwork.ozlabs.org/patch/572309/
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-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: "
diff --git a/package/mjpg-streamer/Config.in b/package/mjpg-streamer/Config.in
index f42c2a50db..3587af0288 100644
--- a/package/mjpg-streamer/Config.in
+++ b/package/mjpg-streamer/Config.in
@@ -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
diff --git a/package/mjpg-streamer/mjpg-streamer.hash b/package/mjpg-streamer/mjpg-streamer.hash
index 8bbac29e33..f544550c53 100644
--- a/package/mjpg-streamer/mjpg-streamer.hash
+++ b/package/mjpg-streamer/mjpg-streamer.hash
@@ -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
diff --git a/package/mjpg-streamer/mjpg-streamer.mk b/package/mjpg-streamer/mjpg-streamer.mk
index 4fecf69ec9..2941e314b3 100644
--- a/package/mjpg-streamer/mjpg-streamer.mk
+++ b/package/mjpg-streamer/mjpg-streamer.mk
@@ -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))
--
2.19.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/4] package/mjpg-streamer: add optional dependency to opencv3
2018-09-30 19:03 [Buildroot] [PATCH 1/4] package/mjpg-streamer: bump version Bernd Kuhls
@ 2018-09-30 19:03 ` Bernd Kuhls
2018-09-30 19:03 ` [Buildroot] [PATCH 3/4] package/mjpg-streamer: add optional dependency to sdl Bernd Kuhls
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Bernd Kuhls @ 2018-09-30 19:03 UTC (permalink / raw)
To: buildroot
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 <bernd.kuhls@t-online.de>
---
package/mjpg-streamer/mjpg-streamer.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/mjpg-streamer/mjpg-streamer.mk b/package/mjpg-streamer/mjpg-streamer.mk
index 2941e314b3..50ed980b7a 100644
--- a/package/mjpg-streamer/mjpg-streamer.mk
+++ b/package/mjpg-streamer/mjpg-streamer.mk
@@ -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))
--
2.19.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 3/4] package/mjpg-streamer: add optional dependency to sdl
2018-09-30 19:03 [Buildroot] [PATCH 1/4] package/mjpg-streamer: bump version Bernd Kuhls
2018-09-30 19:03 ` [Buildroot] [PATCH 2/4] package/mjpg-streamer: add optional dependency to opencv3 Bernd Kuhls
@ 2018-09-30 19:03 ` Bernd Kuhls
2018-09-30 19:03 ` [Buildroot] [PATCH 4/4] package/mjpg-streamer: add optional dependency to libgphoto2 Bernd Kuhls
2018-10-08 19:29 ` [Buildroot] [PATCH 1/4] package/mjpg-streamer: bump version Thomas Petazzoni
3 siblings, 0 replies; 5+ messages in thread
From: Bernd Kuhls @ 2018-09-30 19:03 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/mjpg-streamer/mjpg-streamer.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/mjpg-streamer/mjpg-streamer.mk b/package/mjpg-streamer/mjpg-streamer.mk
index 50ed980b7a..a4f96e1c56 100644
--- a/package/mjpg-streamer/mjpg-streamer.mk
+++ b/package/mjpg-streamer/mjpg-streamer.mk
@@ -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))
--
2.19.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 4/4] package/mjpg-streamer: add optional dependency to libgphoto2
2018-09-30 19:03 [Buildroot] [PATCH 1/4] package/mjpg-streamer: bump version Bernd Kuhls
2018-09-30 19:03 ` [Buildroot] [PATCH 2/4] package/mjpg-streamer: add optional dependency to opencv3 Bernd Kuhls
2018-09-30 19:03 ` [Buildroot] [PATCH 3/4] package/mjpg-streamer: add optional dependency to sdl Bernd Kuhls
@ 2018-09-30 19:03 ` Bernd Kuhls
2018-10-08 19:29 ` [Buildroot] [PATCH 1/4] package/mjpg-streamer: bump version Thomas Petazzoni
3 siblings, 0 replies; 5+ messages in thread
From: Bernd Kuhls @ 2018-09-30 19:03 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/mjpg-streamer/mjpg-streamer.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/mjpg-streamer/mjpg-streamer.mk b/package/mjpg-streamer/mjpg-streamer.mk
index a4f96e1c56..111a66ef7e 100644
--- a/package/mjpg-streamer/mjpg-streamer.mk
+++ b/package/mjpg-streamer/mjpg-streamer.mk
@@ -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
--
2.19.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/4] package/mjpg-streamer: bump version
2018-09-30 19:03 [Buildroot] [PATCH 1/4] package/mjpg-streamer: bump version Bernd Kuhls
` (2 preceding siblings ...)
2018-09-30 19:03 ` [Buildroot] [PATCH 4/4] package/mjpg-streamer: add optional dependency to libgphoto2 Bernd Kuhls
@ 2018-10-08 19:29 ` Thomas Petazzoni
3 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2018-10-08 19:29 UTC (permalink / raw)
To: buildroot
Hello,
On Sun, 30 Sep 2018 21:03:20 +0200, Bernd Kuhls wrote:
> 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 <bernd.kuhls@t-online.de>
> ---
> 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
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-10-08 19:29 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-30 19:03 [Buildroot] [PATCH 1/4] package/mjpg-streamer: bump version Bernd Kuhls
2018-09-30 19:03 ` [Buildroot] [PATCH 2/4] package/mjpg-streamer: add optional dependency to opencv3 Bernd Kuhls
2018-09-30 19:03 ` [Buildroot] [PATCH 3/4] package/mjpg-streamer: add optional dependency to sdl Bernd Kuhls
2018-09-30 19:03 ` [Buildroot] [PATCH 4/4] package/mjpg-streamer: add optional dependency to libgphoto2 Bernd Kuhls
2018-10-08 19:29 ` [Buildroot] [PATCH 1/4] package/mjpg-streamer: bump version Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox