mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-08 08:30:47 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/mjpg-streamer: bump version to v1.0.0-1-g310b29f4

Browse Source 
Add fix to build with cmake 4.x.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
[Julien: use "git describe --tags --abbrev=40" format in _VERSION]
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Bernd Kuhls
2025-06-17 23:02:44 +02:00
committed by Julien Olivain
parent 4da169b03e
commit f1adb7952d
3 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
package/mjpg-streamer/0002-cmake4.patch Normal file
View File

@@ -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)

2
package/mjpg-streamer/mjpg-streamer.hash
View File

@@ -1,3 +1,3 @@
# Locally computed
sha256 5b427b07c03c2c0468cc782daf1510d315141170246828fcbb7c07f927879973 mjpg-streamer-5a6e0a2db163e6ae9461552b59079870d0959340.tar.gz
sha256 eb4de7fed9f8b15ee6d8ca2b0417aff2854cd018582b7090e28eb0aaa19bc808 mjpg-streamer-v1.0.0-1-g310b29f4a94c46652b20c4b7b6e5cf24e532af39.tar.gz
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 mjpg-streamer-experimental/LICENSE

2
package/mjpg-streamer/mjpg-streamer.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
MJPG_STREAMER_VERSION = 5a6e0a2db163e6ae9461552b59079870d0959340
MJPG_STREAMER_VERSION = v1.0.0-1-g310b29f4a94c46652b20c4b7b6e5cf24e532af39
MJPG_STREAMER_SITE = $(call github,jacksonliam,mjpg-streamer,$(MJPG_STREAMER_VERSION))
MJPG_STREAMER_SUBDIR = mjpg-streamer-experimental
MJPG_STREAMER_LICENSE = GPL-2.0+