[Buildroot] [PATCH v2 1/2] package/mjpg-streamer: bump version, add hash

[Buildroot] [PATCH v2 1/2] package/mjpg-streamer: bump version, add hash

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: added hash (Arnout)

 package/mjpg-streamer/mjpg-streamer.hash | 2 ++
 package/mjpg-streamer/mjpg-streamer.mk   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 package/mjpg-streamer/mjpg-streamer.hash

diff --git a/package/mjpg-streamer/mjpg-streamer.hash b/package/mjpg-streamer/mjpg-streamer.hash
new file mode 100644
index 0000000..8bbac29
--- /dev/null
+++ b/package/mjpg-streamer/mjpg-streamer.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256	756a60cbc3404ac21109bb66091774ac8e1d64ebf60e2bf2c0d08a06d1abb9be	mjpg-streamer-bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b.tar.gz
diff --git a/package/mjpg-streamer/mjpg-streamer.mk b/package/mjpg-streamer/mjpg-streamer.mk
index e10e9a8..e54c600 100644
--- a/package/mjpg-streamer/mjpg-streamer.mk
+++ b/package/mjpg-streamer/mjpg-streamer.mk
@@ -8,7 +8,7 @@
 # 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 = 730b5bcdc378b6a201131c6c2620eedbe0f6eb30
+MJPG_STREAMER_VERSION = bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b
 MJPG_STREAMER_SITE = $(call github,oliv3r,mjpg-streamer,$(MJPG_STREAMER_VERSION))
 MJPG_STREAMER_LICENSE = GPLv2+
 MJPG_STREAMER_LICENSE_FILES = LICENSE
-- 
2.7.0.rc3

[Buildroot] [PATCH v2 2/2] package/mjpg-streamer: Fix musl build

[Bernd Kuhls]

Fixes
http://autobuild.buildroot.net/results/74c/74c6006c4d7a97fa69c6feee204631861daffea9/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: no changes

 package/mjpg-streamer/0001-musl_compatibility.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 package/mjpg-streamer/0001-musl_compatibility.patch

diff --git a/package/mjpg-streamer/0001-musl_compatibility.patch b/package/mjpg-streamer/0001-musl_compatibility.patch
new file mode 100644
index 0000000..faebd58
--- /dev/null
+++ b/package/mjpg-streamer/0001-musl_compatibility.patch
@@ -0,0 +1,20 @@
+Fix musl build
+
+Patch downloaded from
+https://github.com/openwrt/packages/blob/master/multimedia/mjpg-streamer/patches/005-musl_compatibility.patch
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+--- a/mjpg_streamer.h
++++ b/mjpg_streamer.h
+@@ -29,6 +29,10 @@
+ #define MAX_OUTPUT_PLUGINS 10
+ #define MAX_PLUGIN_ARGUMENTS 32
+ 
++#define __NEED_pthread_t
++#define __NEED_pthread_mutex_t
++#define __NEED_pthread_cond_t
++
+ #include <linux/types.h>          /* for videodev2.h */
+ #include <linux/videodev2.h>
+ 
-- 
2.7.0.rc3

[Buildroot] [PATCH v2 2/2] package/mjpg-streamer: Fix musl build

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sun, 24 Jan 2016 15:12:59 +0100, Bernd Kuhls wrote:

> diff --git a/package/mjpg-streamer/0001-musl_compatibility.patch b/package/mjpg-streamer/0001-musl_compatibility.patch
> new file mode 100644
> index 0000000..faebd58
> --- /dev/null
> +++ b/package/mjpg-streamer/0001-musl_compatibility.patch
> @@ -0,0 +1,20 @@
> +Fix musl build
> +
> +Patch downloaded from
> +https://github.com/openwrt/packages/blob/master/multimedia/mjpg-streamer/patches/005-musl_compatibility.patch
> +
> +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> +
> +--- a/mjpg_streamer.h
> ++++ b/mjpg_streamer.h
> +@@ -29,6 +29,10 @@
> + #define MAX_OUTPUT_PLUGINS 10
> + #define MAX_PLUGIN_ARGUMENTS 32
> + 
> ++#define __NEED_pthread_t
> ++#define __NEED_pthread_mutex_t
> ++#define __NEED_pthread_cond_t

This is not the proper fix. This is an ugly hack. Instead, just add:

#include <pthread.h> in plugins/input.h

and things will magically build fine.

One suggestion: do *not* take the patches found in OpenWRT for granted.
No offense for the OpenWRT developers, but I have already found
numerous horrible hacks in OpenWRT patches, and dubious solutions to
build issues.

So whenever you take a patch from OpenWRT, take a step back, and always
check if it's the right solution, and whether the solution is
upstreamable.

What prompted me to check more precisely here is that the OpenWRT
solution is clearly not upstreamable, while including <pthread.h> when
the file uses pthread_* types definitely is.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH v2 1/2] package/mjpg-streamer: bump version, add hash

[Thomas Petazzoni]

Dear Bernd Kuhls,

On Sun, 24 Jan 2016 15:12:58 +0100, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> v2: added hash (Arnout)

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com