From owner-dev-commits-ports-main@freebsd.org Sat Aug 28 00:39:59 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 08ABA66AC38; Sat, 28 Aug 2021 00:39:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GxHmG6nQqz3M96; Sat, 28 Aug 2021 00:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D171654C1; Sat, 28 Aug 2021 00:39:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17S0dwOc009184; Sat, 28 Aug 2021 00:39:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17S0dwkl009183; Sat, 28 Aug 2021 00:39:58 GMT (envelope-from git) Date: Sat, 28 Aug 2021 00:39:58 GMT Message-Id: <202108280039.17S0dwkl009183@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Steve Wills Subject: git: 09a2cb4e55ea - main - multimedia/mjpg-streamer: resurrect and update to new upstream MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: swills X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09a2cb4e55ea11a8a05cda65a5bc4223d565fe44 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Aug 2021 00:39:59 -0000 The branch main has been updated by swills: URL: https://cgit.FreeBSD.org/ports/commit/?id=09a2cb4e55ea11a8a05cda65a5bc4223d565fe44 commit 09a2cb4e55ea11a8a05cda65a5bc4223d565fe44 Author: Steve Wills AuthorDate: 2021-08-28 00:37:35 +0000 Commit: Steve Wills CommitDate: 2021-08-28 00:38:45 +0000 multimedia/mjpg-streamer: resurrect and update to new upstream --- MOVED | 1 - multimedia/mjpg-streamer/Makefile | 34 ++++++++++++++++++ multimedia/mjpg-streamer/distinfo | 3 ++ multimedia/mjpg-streamer/files/mjpg_streamer.in | 28 +++++++++++++++ .../mjpg-streamer/files/patch-mjpg__streamer.h | 10 ++++++ .../patch-plugins_input__testpicture_Makefile | 15 ++++++++ ...plugins_input__testpicture_input__testpicture.c | 11 ++++++ .../files/patch-plugins_output__http_httpd.c | 23 ++++++++++++ .../patch-plugins_output__rtsp_output__rtsp.c | 10 ++++++ .../files/patch-plugins_output__udp_output__udp.c | 10 ++++++ multimedia/mjpg-streamer/files/patch-utils.c | 18 ++++++++++ multimedia/mjpg-streamer/files/pkg-message.in | 14 ++++++++ multimedia/mjpg-streamer/pkg-descr | 6 ++++ multimedia/mjpg-streamer/pkg-plist | 41 ++++++++++++++++++++++ 14 files changed, 223 insertions(+), 1 deletion(-) diff --git a/MOVED b/MOVED index b01a1530acff..ab16c2179557 100644 --- a/MOVED +++ b/MOVED @@ -14678,7 +14678,6 @@ misc/yaunc||2020-05-05|Has expired: Broken for more than 6 months multimedia/clipgrab||2020-05-05|Has expired: Broken for more than 6 months multimedia/libsmacker||2020-05-05|Has expired: Broken for more than 6 months multimedia/lxdvdrip||2020-05-05|Has expired: Broken for more than 6 months -multimedia/mjpg-streamer||2020-05-05|Has expired: Broken for more than 6 months multimedia/vcdpad||2020-05-05|Has expired: Broken for more than 6 months net/erlang-xmlrpc||2020-05-05|Has expired: Broken for more than 6 months net/etrace||2020-05-05|Has expired: Broken for more than 6 months diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile new file mode 100644 index 000000000000..b4a977d3d8aa --- /dev/null +++ b/multimedia/mjpg-streamer/Makefile @@ -0,0 +1,34 @@ +# Created by: Kozlov Sergey + +PORTNAME= mjpg-streamer +PORTVERSION= g2021081601 +PORTEPOCH= 1 +CATEGORIES= multimedia net + +MAINTAINER= swills@FreeBSD.org +COMMENT= HTTP video streaming daemon + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev.h:multimedia/v4l_compat + +USES= cmake localbase jpeg + +USE_GITHUB= yes +GH_ACCOUNT= jacksonliam +GH_TAGNAME= 310b29f4a94c46652b20c4b7b6e5cf24e532af39 + +WRKSRC_SUBDIR= mjpg-streamer-experimental + +USE_RC_SUBR= mjpg_streamer +SUB_FILES+= pkg-message + +post-build: + cd ${WRKSRC}/plugins/input_testpicture && \ + ${SETENV} ${MAKE_ENV} make + +post-install: + ${INSTALL_LIB} ${WRKSRC}/plugins/input_testpicture/input_testpicture.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME} + +.include diff --git a/multimedia/mjpg-streamer/distinfo b/multimedia/mjpg-streamer/distinfo new file mode 100644 index 000000000000..32e82f8c64cd --- /dev/null +++ b/multimedia/mjpg-streamer/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1629161369 +SHA256 (jacksonliam-mjpg-streamer-g2021081601-310b29f4a94c46652b20c4b7b6e5cf24e532af39_GH0.tar.gz) = eb4de7fed9f8b15ee6d8ca2b0417aff2854cd018582b7090e28eb0aaa19bc808 +SIZE (jacksonliam-mjpg-streamer-g2021081601-310b29f4a94c46652b20c4b7b6e5cf24e532af39_GH0.tar.gz) = 711738 diff --git a/multimedia/mjpg-streamer/files/mjpg_streamer.in b/multimedia/mjpg-streamer/files/mjpg_streamer.in new file mode 100644 index 000000000000..41e94fa8608e --- /dev/null +++ b/multimedia/mjpg-streamer/files/mjpg_streamer.in @@ -0,0 +1,28 @@ +#!/bin/sh + +# $FreeBSD$ +# +# PROVIDE: mjpg_streamer +# REQUIRE: LOGIN +# KEYWORD: shutdown +# +# Add the following lines to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +# mjpg_streamer_enable="YES" +# #optional +# mjpg_streamer_flags="" + +. /etc/rc.subr + +name=mjpg_streamer +rcvar=mjpg_streamer_enable + +command=%%PREFIX%%/bin/${name} +command_args="-b" + +mjpg_streamer_enable="NO" +mjpg_streamer_flags="-o 'output_http.so -w %%WWWDIR%%'" + +load_rc_config $name +run_rc_command "$1" diff --git a/multimedia/mjpg-streamer/files/patch-mjpg__streamer.h b/multimedia/mjpg-streamer/files/patch-mjpg__streamer.h new file mode 100644 index 000000000000..d6f19fc42e30 --- /dev/null +++ b/multimedia/mjpg-streamer/files/patch-mjpg__streamer.h @@ -0,0 +1,10 @@ +--- mjpg_streamer.h.orig 2021-08-17 00:59:00 UTC ++++ mjpg_streamer.h +@@ -29,6 +29,7 @@ + #define MAX_OUTPUT_PLUGINS 10 + #define MAX_PLUGIN_ARGUMENTS 32 + ++#include + #include /* for videodev2.h */ + #include + #include diff --git a/multimedia/mjpg-streamer/files/patch-plugins_input__testpicture_Makefile b/multimedia/mjpg-streamer/files/patch-plugins_input__testpicture_Makefile new file mode 100644 index 000000000000..bd97e8fccd4c --- /dev/null +++ b/multimedia/mjpg-streamer/files/patch-plugins_input__testpicture_Makefile @@ -0,0 +1,15 @@ +--- plugins/input_testpicture/Makefile.orig 2021-02-20 17:47:40 UTC ++++ plugins/input_testpicture/Makefile +@@ -7,11 +7,10 @@ + # + ############################################################### + +-CC = gcc + + OTHER_HEADERS = ../../mjpg_streamer.h ../../utils.h ../output.h ../input.h + +-CFLAGS += -O2 -DLINUX -D_GNU_SOURCE -Wall -shared -fPIC ++CFLAGS += -shared -fPIC + #CFLAGS += -DDEBUG + LFLAGS += -lpthread -ldl + diff --git a/multimedia/mjpg-streamer/files/patch-plugins_input__testpicture_input__testpicture.c b/multimedia/mjpg-streamer/files/patch-plugins_input__testpicture_input__testpicture.c new file mode 100644 index 000000000000..8b004f725944 --- /dev/null +++ b/multimedia/mjpg-streamer/files/patch-plugins_input__testpicture_input__testpicture.c @@ -0,0 +1,11 @@ +--- plugins/input_testpicture/input_testpicture.c.orig 2021-08-17 01:24:22 UTC ++++ plugins/input_testpicture/input_testpicture.c +@@ -34,7 +34,7 @@ + #include + #include + +-#include /* for videodev2.h */ ++#include /* for videodev2.h */ + #include + + #include "../../mjpg_streamer.h" diff --git a/multimedia/mjpg-streamer/files/patch-plugins_output__http_httpd.c b/multimedia/mjpg-streamer/files/patch-plugins_output__http_httpd.c new file mode 100644 index 000000000000..cb8442b2dfa5 --- /dev/null +++ b/multimedia/mjpg-streamer/files/patch-plugins_output__http_httpd.c @@ -0,0 +1,23 @@ +--- plugins/output_http/httpd.c.orig 2021-02-20 17:47:40 UTC ++++ plugins/output_http/httpd.c +@@ -37,18 +37,17 @@ + #include + #include + +-#include + #include /* for videodev2.h */ + #include + ++#include ++ + #include "../../mjpg_streamer.h" + #include "../../utils.h" + + #include "httpd.h" + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) + #define V4L2_CTRL_TYPE_STRING_SUPPORTED +-#endif + + #include "../output_file/output_file.h" + diff --git a/multimedia/mjpg-streamer/files/patch-plugins_output__rtsp_output__rtsp.c b/multimedia/mjpg-streamer/files/patch-plugins_output__rtsp_output__rtsp.c new file mode 100644 index 000000000000..d460c7c415c3 --- /dev/null +++ b/multimedia/mjpg-streamer/files/patch-plugins_output__rtsp_output__rtsp.c @@ -0,0 +1,10 @@ +--- plugins/output_rtsp/output_rtsp.c.orig 2021-08-17 00:57:41 UTC ++++ plugins/output_rtsp/output_rtsp.c +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/multimedia/mjpg-streamer/files/patch-plugins_output__udp_output__udp.c b/multimedia/mjpg-streamer/files/patch-plugins_output__udp_output__udp.c new file mode 100644 index 000000000000..1809803d61c5 --- /dev/null +++ b/multimedia/mjpg-streamer/files/patch-plugins_output__udp_output__udp.c @@ -0,0 +1,10 @@ +--- plugins/output_udp/output_udp.c.orig 2021-08-17 01:14:40 UTC ++++ plugins/output_udp/output_udp.c +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/multimedia/mjpg-streamer/files/patch-utils.c b/multimedia/mjpg-streamer/files/patch-utils.c new file mode 100644 index 000000000000..fdc9e4faa571 --- /dev/null +++ b/multimedia/mjpg-streamer/files/patch-utils.c @@ -0,0 +1,18 @@ +--- utils.c.orig 2021-02-20 17:47:40 UTC ++++ utils.c +@@ -23,13 +23,12 @@ + #include + #include + #include +-#include ++#include + #include + #include +-#include ++#include + #include + #include +-#include + #include + + #include "utils.h" diff --git a/multimedia/mjpg-streamer/files/pkg-message.in b/multimedia/mjpg-streamer/files/pkg-message.in new file mode 100644 index 000000000000..9f7496eda41a --- /dev/null +++ b/multimedia/mjpg-streamer/files/pkg-message.in @@ -0,0 +1,14 @@ +[ +{ type: install + message: <