From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6C29D139368 for ; Fri, 13 Aug 2021 23:29:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C1D3E099C; Fri, 13 Aug 2021 23:29:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EF3CCE099C for ; Fri, 13 Aug 2021 23:29:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F101C342B15 for ; Fri, 13 Aug 2021 23:29:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91AC98A8 for ; Fri, 13 Aug 2021 23:29:06 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1628897286.547d473472b58b22729234b9d213f2a2abdca3fd.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mjpg-streamer/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mjpg-streamer/Manifest media-video/mjpg-streamer/metadata.xml media-video/mjpg-streamer/mjpg-streamer-0_pre20200524-r1.ebuild X-VCS-Directories: media-video/mjpg-streamer/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 547d473472b58b22729234b9d213f2a2abdca3fd X-VCS-Branch: master Date: Fri, 13 Aug 2021 23:29:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 331db3a2-b388-4fa6-adea-9839285d9cc9 X-Archives-Hash: 8d0cc4b05d35e8b3b6ed60cb38e18711 commit: 547d473472b58b22729234b9d213f2a2abdca3fd Author: ChaosEngine gmail com> AuthorDate: Sat May 30 14:11:09 2020 +0000 Commit: Sam James gentoo org> CommitDate: Fri Aug 13 23:28:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=547d4734 media-video/mjpg-streamer: bump to 0_pre20200524-r1 Closes: https://bugs.gentoo.org/724802 Closes: https://bugs.gentoo.org/665122 Package-Manager: Portage-2.3.99, Repoman 2.3.22 Signed-off-by: Andrzej Pauli gmail.com> Signed-off-by: Sam James gentoo.org> media-video/mjpg-streamer/Manifest | 1 + media-video/mjpg-streamer/metadata.xml | 6 ++ .../mjpg-streamer-0_pre20200524-r1.ebuild | 91 ++++++++++++++++++++++ 3 files changed, 98 insertions(+) diff --git a/media-video/mjpg-streamer/Manifest b/media-video/mjpg-streamer/Manifest index d7dd0161571..0cc52fbbb0e 100644 --- a/media-video/mjpg-streamer/Manifest +++ b/media-video/mjpg-streamer/Manifest @@ -1 +1,2 @@ DIST mjpg-streamer-0_pre20120621.tar.bz2 471546 BLAKE2B 3ede2a60062bba7c91ddfa0d7151e32cd8dac11a083cc6a88dc350a523174685b2ff066fa99db13b82a6a4960d370b97b27aa3663ac323fa54908bb0108857d0 SHA512 dfc6077ec03fe4f239d8e25b65b7808bd489a954d8cf3aeed444e68fd9536720c2c888a5fa9f4b8d0152dab5ca0bd166a46f2cb22a357ba816eb5bc79ff11332 +DIST mjpg-streamer-0_pre20200524.tar.gz 711183 BLAKE2B 3a40f20f518a53c0c6046cf37728c46c2a843a1dd0ef0086c77940b5133f1337445b1edb2c21edc1bbacc588f7c7b45b1530871c944695c2ae02cf327fde6847 SHA512 d6e910f6693b27c16c33749458affcb4d9336bd15c642156c452fcbc4a8c2ba9f4a6102e6b94f698fc6fb48da9564a09cb0f804a5ac52201e566adf798a70ba2 diff --git a/media-video/mjpg-streamer/metadata.xml b/media-video/mjpg-streamer/metadata.xml index 2e4cb6515fd..3df394f71ec 100644 --- a/media-video/mjpg-streamer/metadata.xml +++ b/media-video/mjpg-streamer/metadata.xml @@ -24,6 +24,8 @@ it's content Plugin that sends video stream from UVC compatible camera + Plugin that takes http-input + Plugin that sends video stream from PTP2 compatible camera Plugin that saves received content under given location Plugin receiving content over UDP and storing to @@ -33,7 +35,11 @@ Auto focusing plugin Plugin which provides a mechanism to take snapshots with a trigger from a UDP packet + Plugin which allows to see output with viewer + Plugin which provides zmqserver processing Installs WWW content + Enable experimental HTTP management option + Enable camera WXP compatible format mjpg-streamer diff --git a/media-video/mjpg-streamer/mjpg-streamer-0_pre20200524-r1.ebuild b/media-video/mjpg-streamer/mjpg-streamer-0_pre20200524-r1.ebuild new file mode 100644 index 00000000000..e0d1f254f9e --- /dev/null +++ b/media-video/mjpg-streamer/mjpg-streamer-0_pre20200524-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd + +DESCRIPTION="MJPG-streamer takes JPGs from Linux-UVC compatible webcams" +HOMEPAGE="https://github.com/jacksonliam/mjpg-streamer" +EGIT_COMMIT="85f89a8c321e799fabb1693c5d133f3fb48ee748" +SRC_URI="https://github.com/jacksonliam/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +INPUT_PLUGINS="input-testpicture input-control input-file input-uvc input-http input-ptp2" +OUTPUT_PLUGINS="output-file output-udp output-http output-autofocus output-rtsp output-viewer output-zmqserver" +IUSE_PLUGINS="${INPUT_PLUGINS} ${OUTPUT_PLUGINS}" +IUSE="input-testpicture input-control +input-file input-uvc input-http input-ptp2 + output-file output-udp +output-http output-autofocus output-rtsp output-viewer output-zmqserver + www http-management wxp-compat" +REQUIRED_USE="|| ( ${INPUT_PLUGINS} ) + || ( ${OUTPUT_PLUGINS} )" + +RDEPEND="virtual/jpeg + input-uvc? ( media-libs/libv4l ) + input-ptp2? ( media-libs/libgphoto2 ) + output-zmqserver? ( + dev-libs/protobuf-c + net-libs/zeromq + )" +DEPEND="${RDEPEND} + input-testpicture? ( media-gfx/imagemagick )" + +S="${WORKDIR}/${PN}-${EGIT_COMMIT}/${PN}-experimental" + +src_prepare() { + sed -i -e "s|.*RPATH.*||g" CMakeLists.txt || die + if use wxp-compat; then + sed -i -e \ + 's|^add_feature_option(WXP_COMPAT "Enable compatibility with WebcamXP" OFF)|add_feature_option(WXP_COMPAT "Enable compatibility with WebcamXP" ON)|g' \ + CMakeLists.txt || die + fi + + local flag switch + for flag in ${IUSE_PLUGINS}; do + use ${flag} && switch='' || switch='#' + flag=${flag/input-/input_} + flag=${flag/output-/output_} + sed -i -e \ + "s|^add_subdirectory(plugins\/${flag})|${switch}add_subdirectory(plugins/${flag})|" \ + CMakeLists.txt || die + done + if use http-management; then + sed -i -e \ + 's|^add_feature_option(ENABLE_HTTP_MANAGEMENT "Enable experimental HTTP management option" OFF)|add_feature_option(ENABLE_HTTP_MANAGEMENT "Enable experimental HTTP management option" ON)|g' \ + plugins/output_http/CMakeLists.txt || die + fi + sed -e "s|@LIBDIR@|$(get_libdir)/${PN}/$(get_libdir)|g" "${FILESDIR}/${PN}.initd" > ${PN}.initd || die + + default +} + +src_install() { + into /usr + dobin ${PN//-/_} + into "/usr/$(get_libdir)/${PN}" + dolib.so *.so + + if use www ; then + insinto /usr/share/${PN} + doins -r www + fi + + dodoc README.md TODO + + newinitd ${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + systemd_dounit mjpg_streamer@.service +} + +pkg_postinst() { + elog "Remember to set an input and output plugin for mjpg-streamer." + + if use www ; then + echo + elog "An example webinterface has been installed into" + elog "/usr/share/mjpg-streamer/www for your usage." + fi +}