Skip to contentSkip to conversation

package/mjpg-streamer: bump version

PATCH Superseded Bernd Kuhls 2 participants 3 messages Jan 23, 2016 – Jan 24, 2016

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

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

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mjpg-streamer/mjpg-streamer.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/mjpg-streamer/mjpg-streamer.mk +1 -1
index e10e9a8..e54c600 100644
@@ -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
Signature · 1 line
2.7.0.rc3
author
#1 lore raw

PATCH 2/2 package/mjpg-streamer: Fix musl build

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

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mjpg-streamer/0001-musl_compatibility.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 package/mjpg-streamer/0001-musl_compatibility.patch
package/mjpg-streamer/0001-musl_compatibility.patch new file +20 -0
new file mode 100644
index 0000000..faebd58
@@ -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 <[email protected]>
+
+--- 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>
+
Signature · 1 line
2.7.0.rc3
#2 lore raw

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

In reply to Bernd Kuhls
Quoted 11 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>
---
 package/mjpg-streamer/mjpg-streamer.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/mjpg-streamer/mjpg-streamer.mk +0 -0
index e10e9a8..e54c600 100644

package/mjpg-streamer/mjpg-streamer.mk line 14

Quoted 8 lines
package/mjpg-streamer/mjpg-streamer.mk +1 -1
@@ -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

Can you also add a hash file?

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF