Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/mjpg-streamer: bump version
@ 2019-06-22 18:28 Bernd Kuhls
  2019-06-23 14:06 ` Thomas Petazzoni
  0 siblings, 1 reply; 5+ messages in thread
From: Bernd Kuhls @ 2019-06-22 18:28 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/mjpg-streamer/mjpg-streamer.hash | 2 +-
 package/mjpg-streamer/mjpg-streamer.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/mjpg-streamer/mjpg-streamer.hash b/package/mjpg-streamer/mjpg-streamer.hash
index 76716266b9..0a08151a4b 100644
--- a/package/mjpg-streamer/mjpg-streamer.hash
+++ b/package/mjpg-streamer/mjpg-streamer.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 d2c2c9dbc95332245f34247f4a0791d741d1ae875084f9886442f48a01b01d81  mjpg-streamer-ddb69b7b4f114f3c2ca01adf55712792ca8aed43.tar.gz
+sha256 bd934363b5cb6ef3665aa2dfa15d08b72bbfe84ca60f7c342fe8ae1f94e19201  mjpg-streamer-501f6362c5afddcfb41055f97ae484252c85c912.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 4077a3dcbc..d5980dbf15 100644
--- a/package/mjpg-streamer/mjpg-streamer.mk
+++ b/package/mjpg-streamer/mjpg-streamer.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MJPG_STREAMER_VERSION = ddb69b7b4f114f3c2ca01adf55712792ca8aed43
+MJPG_STREAMER_VERSION = 501f6362c5afddcfb41055f97ae484252c85c912
 MJPG_STREAMER_SITE = $(call github,jacksonliam,mjpg-streamer,$(MJPG_STREAMER_VERSION))
 MJPG_STREAMER_SUBDIR = mjpg-streamer-experimental
 MJPG_STREAMER_LICENSE = GPL-2.0+
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/mjpg-streamer: bump version
@ 2025-06-17 21:02 Bernd Kuhls
  2025-06-18 20:14 ` Julien Olivain
  2025-06-26 19:54 ` Thomas Perale via buildroot
  0 siblings, 2 replies; 5+ messages in thread
From: Bernd Kuhls @ 2025-06-17 21:02 UTC (permalink / raw)
  To: buildroot

Add fix to build with cmake 4.x.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/mjpg-streamer/0002-cmake4.patch  | 34 ++++++++++++++++++++++++
 package/mjpg-streamer/mjpg-streamer.hash |  2 +-
 package/mjpg-streamer/mjpg-streamer.mk   |  2 +-
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 package/mjpg-streamer/0002-cmake4.patch

diff --git a/package/mjpg-streamer/0002-cmake4.patch b/package/mjpg-streamer/0002-cmake4.patch
new file mode 100644
index 0000000000..ed7211ab81
--- /dev/null
+++ b/package/mjpg-streamer/0002-cmake4.patch
@@ -0,0 +1,34 @@
+From 0dd9cf8b23fa183a403794e15617237662104d1d Mon Sep 17 00:00:00 2001
+From: Stephen L Arnold <nerdboy@gentoo.org>
+Date: Mon, 29 Nov 2021 18:13:34 -0800
+Subject: [PATCH] fix: update cmake build, fix install, add simple test and
+ versioning
+
+Signed-off-by: Stephen L Arnold <nerdboy@gentoo.org>
+
+Upstream: https://github.com/jacksonliam/mjpg-streamer/pull/333
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+[Bernd:
+ ported cmake version bump from upstream PR to fix build with cmake 4.x]
+---
+ mjpg-streamer-experimental/CMakeLists.txt     | 102 +++++++++++++-----
+ mjpg-streamer-experimental/Makefile           |  15 +--
+ .../cmake/FindGphoto2.cmake                   |  20 ++--
+ .../cmake/mjpg_streamer_utils.cmake           |  22 ++--
+ mjpg-streamer-experimental/mjpg_streamer.c    |   4 -
+ mjpg-streamer-experimental/mjpg_streamer.h    |   9 +-
+ .../plugins/input_ptp2/CMakeLists.txt         |   6 +-
+ .../plugins/output_http/CMakeLists.txt        |   2 +-
+ 8 files changed, 117 insertions(+), 63 deletions(-)
+
+diff --git a/mjpg-streamer-experimental/CMakeLists.txt b/mjpg-streamer-experimental/CMakeLists.txt
+index cf26620e..e6e67bc7 100644
+--- a/mjpg-streamer-experimental/CMakeLists.txt
++++ b/mjpg-streamer-experimental/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.3)
++cmake_minimum_required(VERSION 3.10.0)
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+ 
+ project("mjpg-streamer" C)
diff --git a/package/mjpg-streamer/mjpg-streamer.hash b/package/mjpg-streamer/mjpg-streamer.hash
index 164c9b2181..9b06bfebc2 100644
--- a/package/mjpg-streamer/mjpg-streamer.hash
+++ b/package/mjpg-streamer/mjpg-streamer.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  5b427b07c03c2c0468cc782daf1510d315141170246828fcbb7c07f927879973  mjpg-streamer-5a6e0a2db163e6ae9461552b59079870d0959340.tar.gz
+sha256  eb4de7fed9f8b15ee6d8ca2b0417aff2854cd018582b7090e28eb0aaa19bc808  mjpg-streamer-310b29f4a94c46652b20c4b7b6e5cf24e532af39.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 46f3f50104..364dfac27d 100644
--- a/package/mjpg-streamer/mjpg-streamer.mk
+++ b/package/mjpg-streamer/mjpg-streamer.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MJPG_STREAMER_VERSION = 5a6e0a2db163e6ae9461552b59079870d0959340
+MJPG_STREAMER_VERSION = 310b29f4a94c46652b20c4b7b6e5cf24e532af39
 MJPG_STREAMER_SITE = $(call github,jacksonliam,mjpg-streamer,$(MJPG_STREAMER_VERSION))
 MJPG_STREAMER_SUBDIR = mjpg-streamer-experimental
 MJPG_STREAMER_LICENSE = GPL-2.0+
-- 
2.39.5

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-06-26 19:54 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-22 18:28 [Buildroot] [PATCH 1/1] package/mjpg-streamer: bump version Bernd Kuhls
2019-06-23 14:06 ` Thomas Petazzoni
  -- strict thread matches above, loose matches on Subject: below --
2025-06-17 21:02 Bernd Kuhls
2025-06-18 20:14 ` Julien Olivain
2025-06-26 19:54 ` Thomas Perale via buildroot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox