public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-video/motion/, media-video/motion/files/
@ 2017-01-16 11:49 Wolfram Schlich
  0 siblings, 0 replies; 5+ messages in thread
From: Wolfram Schlich @ 2017-01-16 11:49 UTC (permalink / raw
  To: gentoo-commits

commit:     296feb41fc063071d4df2dee73fb6e9831d71ee9
Author:     Wolfram Schlich <wschlich <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 16 11:47:55 2017 +0000
Commit:     Wolfram Schlich <wschlich <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 11:49:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=296feb41

media-video/motion: add new ebuild for version 4, mostly based upon the ebuild from William Breathitt Gray <vilhelm.gray <AT> gmail.com> (bug #475120)

Package-Manager: portage-2.3.0

 media-video/motion/Manifest                |  1 +
 media-video/motion/files/motion.conf       |  1 +
 media-video/motion/files/motion.confd-r1   |  9 ++++
 media-video/motion/files/motion.initd-r3   | 43 ++++++++++++++++
 media-video/motion/files/motion.service    | 20 ++++++++
 media-video/motion/files/motion_at.service | 20 ++++++++
 media-video/motion/metadata.xml            |  3 ++
 media-video/motion/motion-4.0.1.ebuild     | 81 ++++++++++++++++++++++++++++++
 8 files changed, 178 insertions(+)

diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index a8e665f..3334e86 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1 +1,2 @@
 DIST motion-3.2.12.tar.gz 425729 SHA256 a597f8d7ec0bf3c5fb62722c4eead59717fe01c2ae0d256c642027cea74b2f0a SHA512 d44620f8865420da71ff1dc1e1d8ba8e5465b395f2cf3b2cc9a91d3d415694b26376a9f8e3a1b78ffd0efde22d9e0338daa77237aed38c060dc3577af4c0864c WHIRLPOOL 0b7618d48161e8ffefacc5331d1078004d87839b532100c37bfaf06e99772921228feea6eea063301dfdc9e5f5a1dc07fd0847858440c6f876c1e03deaa078c8
+DIST release-4.0.1.tar.gz 444779 SHA256 2f67669a09ce0481ecd987028dae1c5cb135dfdc3c254c06ab7c9ca0c6c183f0 SHA512 6ccde3890e6af56f28208321987dd1b9d62a55bbe7cbc3ab5600263602e6e8f47589392c2f3a3a6cb54f927ee76aea94d0e83f26ce8e4047890c891b6c2f8976 WHIRLPOOL 425587a1ff52edadddbdc7fd65cdb015324b99514128d3810a6d1bb6d2cd2f1c5daea03c1db0c4a89679358793f9201156dd821ce795d704ede12bdb151fafdd

diff --git a/media-video/motion/files/motion.conf b/media-video/motion/files/motion.conf
new file mode 100644
index 00000000..f032d87
--- /dev/null
+++ b/media-video/motion/files/motion.conf
@@ -0,0 +1 @@
+d /var/lib/motion/ 0750 motion video

diff --git a/media-video/motion/files/motion.confd-r1 b/media-video/motion/files/motion.confd-r1
new file mode 100644
index 00000000..dfff31b
--- /dev/null
+++ b/media-video/motion/files/motion.confd-r1
@@ -0,0 +1,9 @@
+# Set the user and group under which motion will be run
+MOTION_USER="motion"
+MOTION_GROUP="video"
+
+# Set the the directory for storing the pidfile
+MOTION_RUN_DIR="/var/run/motion"
+
+# Set the the working directory for storing images/videos
+MOTION_LIB_DIR="/var/lib/motion"

diff --git a/media-video/motion/files/motion.initd-r3 b/media-video/motion/files/motion.initd-r3
new file mode 100644
index 00000000..d893a82
--- /dev/null
+++ b/media-video/motion/files/motion.initd-r3
@@ -0,0 +1,43 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+extra_started_commands="reload"
+
+depend() {
+	need modules
+	after mysql
+}
+
+checkconfig() {
+	export MOTION_RUN_DIR="${MOTION_RUN_DIR:-/var/run/motion}"
+	checkpath -d -m 750 -o "${MOTION_USER:-motion}:${MOTION_GROUP:-video}" "${MOTION_RUN_DIR}"
+	export MOTION_LIB_DIR="${MOTION_LIB_DIR:-/var/lib/motion}"
+	checkpath -d -m 750 -o "${MOTION_USER:-motion}:${MOTION_GROUP:-video}" "${MOTION_LIB_DIR}"
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting motion detection"
+	start-stop-daemon --start -u "${MOTION_USER}" -g "${MOTION_GROUP}" -d "${MOTION_LIB_DIR}" --quiet --exec /usr/bin/motion -- -b -p "${MOTION_RUN_DIR}/motion.pid"
+	eend $?
+}
+
+stop() {
+	checkconfig || return 1
+
+	ebegin "Stopping motion detection"
+	start-stop-daemon --stop --quiet --exec /usr/bin/motion --pidfile "${MOTION_RUN_DIR}/motion.pid"
+	eend $?
+}
+
+reload() {
+	checkconfig || return 1
+
+	ebegin "Reloading motion detection configuration"
+	start-stop-daemon --stop --signal HUP --exec /usr/bin/motion --pidfile "${MOTION_RUN_DIR}/motion.pid"
+	eend $?
+}

diff --git a/media-video/motion/files/motion.service b/media-video/motion/files/motion.service
new file mode 100644
index 00000000..559b94b
--- /dev/null
+++ b/media-video/motion/files/motion.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=Motion detection daemon
+After=local-fs.target network.target
+Documentation=man:motion(1)
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/motion -n -c /etc/motion/motion.conf
+StandardError=null
+
+User=motion
+Group=video
+
+#RuntimeDirectory=motion
+#RuntimeDirectoryMode=0750
+
+WorkingDirectory=/var/lib/motion
+
+[Install]
+WantedBy=multi-user.target

diff --git a/media-video/motion/files/motion_at.service b/media-video/motion/files/motion_at.service
new file mode 100644
index 00000000..87df911
--- /dev/null
+++ b/media-video/motion/files/motion_at.service
@@ -0,0 +1,20 @@
+[Unit]
+Description=Motion detection daemon for %I
+After=local-fs.target network.target
+Documentation=man:motion(1)
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/motion -n -c /etc/motion/motion-%i.conf
+StandardError=null
+
+User=motion
+Group=video
+
+#RuntimeDirectory=motion
+#RuntimeDirectoryMode=0750
+
+WorkingDirectory=/var/lib/motion
+
+[Install]
+WantedBy=multi-user.target

diff --git a/media-video/motion/metadata.xml b/media-video/motion/metadata.xml
index bd52de8..cf2e1ad 100644
--- a/media-video/motion/metadata.xml
+++ b/media-video/motion/metadata.xml
@@ -4,6 +4,9 @@
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
 	</maintainer>
+	<use>
+		<flag name="mmal">Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">motion</remote-id>
 	</upstream>

diff --git a/media-video/motion/motion-4.0.1.ebuild b/media-video/motion/motion-4.0.1.ebuild
new file mode 100644
index 00000000..e820993
--- /dev/null
+++ b/media-video/motion/motion-4.0.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools readme.gentoo-r1 user systemd
+
+DESCRIPTION="A software motion detector"
+HOMEPAGE="https://motion-project.github.io"
+SRC_URI="https://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ffmpeg libav mmal mysql postgres v4l"
+
+RDEPEND="
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	virtual/jpeg:=
+	mmal? ( media-libs/raspberrypi-userland )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql:= )
+"
+DEPEND="${RDEPEND}
+	v4l? ( virtual/os-headers media-libs/libv4l )
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You need to setup /etc/${PN}/${PN}.conf before running
+${PN} for the first time.
+To install ${PN} as a service, use:
+rc-update add ${PN} default # with OpenRC
+systemctl enable ${PN}.service # with systemd
+"
+
+pkg_setup() {
+	enewuser ${PN} -1 -1 -1 video
+}
+
+S="${WORKDIR}"/${PN}-release-${PV}
+
+src_prepare() {
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ffmpeg) \
+		$(use_with mmal) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with v4l) \
+		--without-optimizecpu
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		examplesdir=/usr/share/doc/${PF}/examples \
+		install
+
+	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dounit "${FILESDIR}"/${PN}_at.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}.conf
+
+	keepdir /var/lib/motion
+	fowners motion:video /var/lib/motion
+	fperms 0750 /var/lib/motion
+
+	mv -vf "${D}"/etc/${PN}/${PN}{-dist,}.conf || die
+
+	readme.gentoo_create_doc
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/motion/, media-video/motion/files/
@ 2017-02-10 13:44 Wolfram Schlich
  0 siblings, 0 replies; 5+ messages in thread
From: Wolfram Schlich @ 2017-02-10 13:44 UTC (permalink / raw
  To: gentoo-commits

commit:     2b8b8b465357ce49caa20126a303e5d7a1eb367e
Author:     Wolfram Schlich <wschlich <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 10 13:44:32 2017 +0000
Commit:     Wolfram Schlich <wschlich <AT> gentoo <DOT> org>
CommitDate: Fri Feb 10 13:44:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b8b8b46

media-video/motion: security cleanup wrt bug #475120

Package-Manager: portage-2.3.3

 media-video/motion/Manifest                        |   1 -
 media-video/motion/files/ffmpeg-1.patch            |  95 --------------
 media-video/motion/files/ffmpeg-2.patch            | 141 ---------------------
 media-video/motion/files/ffmpeg-3.patch            |  35 -----
 media-video/motion/files/ffmpeg-4.patch            |  68 ----------
 media-video/motion/files/ffmpeg-5.patch            | 122 ------------------
 media-video/motion/files/libav-9.patch             |  21 ---
 ...motion-3.2.12-workaround-v4l1_deprecation.patch |  35 -----
 media-video/motion/files/motion.initd-r2           |  39 ------
 media-video/motion/motion-3.2.12-r2.ebuild         |  73 -----------
 media-video/motion/motion-3.2.12-r3.ebuild         |  82 ------------
 11 files changed, 712 deletions(-)

diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index 3334e86bd8..8048180803 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1,2 +1 @@
-DIST motion-3.2.12.tar.gz 425729 SHA256 a597f8d7ec0bf3c5fb62722c4eead59717fe01c2ae0d256c642027cea74b2f0a SHA512 d44620f8865420da71ff1dc1e1d8ba8e5465b395f2cf3b2cc9a91d3d415694b26376a9f8e3a1b78ffd0efde22d9e0338daa77237aed38c060dc3577af4c0864c WHIRLPOOL 0b7618d48161e8ffefacc5331d1078004d87839b532100c37bfaf06e99772921228feea6eea063301dfdc9e5f5a1dc07fd0847858440c6f876c1e03deaa078c8
 DIST release-4.0.1.tar.gz 444779 SHA256 2f67669a09ce0481ecd987028dae1c5cb135dfdc3c254c06ab7c9ca0c6c183f0 SHA512 6ccde3890e6af56f28208321987dd1b9d62a55bbe7cbc3ab5600263602e6e8f47589392c2f3a3a6cb54f927ee76aea94d0e83f26ce8e4047890c891b6c2f8976 WHIRLPOOL 425587a1ff52edadddbdc7fd65cdb015324b99514128d3810a6d1bb6d2cd2f1c5daea03c1db0c4a89679358793f9201156dd821ce795d704ede12bdb151fafdd

diff --git a/media-video/motion/files/ffmpeg-1.patch b/media-video/motion/files/ffmpeg-1.patch
deleted file mode 100644
index 56c83c474f..0000000000
--- a/media-video/motion/files/ffmpeg-1.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Description: Fix FFmpeg guess_format() deprecation warning
-Author: Angel Carpintero <motiondevelop@gmail.com>
-Origin: Upstream, https://github.com/sackmotion/motion/commit/527377#svn517
-Last-Update: 2012-02-12
-
---- a/ffmpeg.c
-+++ b/ffmpeg.c
-@@ -36,6 +36,11 @@
- #    endif /* __GNUC__ */
- #endif /* LIBAVCODEC_BUILD > 4680 */
- 
-+#if defined LIBAVFORMAT_VERSION_MAJOR && defined LIBAVFORMAT_VERSION_MINOR 
-+#if LIBAVFORMAT_VERSION_MAJOR < 53 && LIBAVFORMAT_VERSION_MINOR < 45
-+    #define GUESS_NO_DEPRECATED 
-+#endif
-+#endif
- 
- #if LIBAVFORMAT_BUILD >= 4616
- /* The API for av_write_frame changed with FFmpeg version 0.4.9pre1.
-@@ -258,7 +263,11 @@
-         /* We use "mpeg1video" for raw mpeg1 format. Using "mpeg" would
-          * result in a muxed output file, which isn't appropriate here.
-          */
--        of = guess_format("mpeg1video", NULL, NULL);
-+#ifdef GUESS_NO_DEPRECATED
-+        of = guess_format("mpeg1video", NULL, NULL);        
-+#else
-+        of = av_guess_format("mpeg1video", NULL, NULL);
-+#endif 
-         if (of) {
-             /* But we want the trailer to be correctly written. */
-             of->write_trailer = mpeg1_write_trailer;
-@@ -270,24 +279,44 @@
- #endif
-     } else if (strcmp(codec, "mpeg4") == 0) {
-         ext = ".avi";
--        of = guess_format("avi", NULL, NULL);
-+#ifdef GUESS_NO_DEPRECATED
-+        of = guess_format("mpeg1video", NULL, NULL);
-+#else        
-+        of = av_guess_format("avi", NULL, NULL);
-+#endif        
-     } else if (strcmp(codec, "msmpeg4") == 0) {
-         ext = ".avi";
--        of = guess_format("avi", NULL, NULL);
-+#ifdef GUESS_NO_DEPRECATED
-+        of = guess_format("mpeg1video", NULL, NULL);
-+#else        
-+        of = av_guess_format("avi", NULL, NULL);
-+#endif
-         if (of) {
-             /* Manually override the codec id. */
-             of->video_codec = CODEC_ID_MSMPEG4V2;
-         }
-     } else if (strcmp(codec, "swf") == 0) {
-         ext = ".swf";
--        of = guess_format("swf", NULL, NULL);
-+#ifdef GUESS_NO_DEPRECATED
-+        of = guess_format("mpeg1video", NULL, NULL);
-+#else        
-+        of = av_guess_format("swf", NULL, NULL);
-+#endif        
-     } else if (strcmp(codec, "flv") == 0) {
-         ext = ".flv";
--        of = guess_format("flv", NULL, NULL);
-+#ifdef GUESS_NO_DEPRECATED
-+        of = guess_format("mpeg1video", NULL, NULL);
-+#else        
-+        of = av_guess_format("flv", NULL, NULL);
-+#endif        
-         of->video_codec = CODEC_ID_FLV1;
-     } else if (strcmp(codec, "ffv1") == 0) {
-         ext = ".avi";
--        of = guess_format("avi", NULL, NULL);
-+#ifdef GUESS_NO_DEPRECATED
-+        of = guess_format("mpeg1video", NULL, NULL);
-+#else
-+        of = av_guess_format("avi", NULL, NULL);
-+#endif
-         if (of) {
-             /* Use the FFMPEG Lossless Video codec (experimental!).
-                Requires strict_std_compliance to be <= -2 */
-@@ -295,7 +324,11 @@
-         }
-     } else if (strcmp(codec, "mov") == 0) {
-         ext = ".mov";
--        of = guess_format("mov", NULL, NULL);        
-+#ifdef GUESS_NO_DEPRECATED
-+        of = guess_format("mpeg1video", NULL, NULL);
-+#else        
-+        of = av_guess_format("mov", NULL, NULL);
-+#endif
-     } else {
-         motion_log(LOG_ERR, 0, "ffmpeg_video_codec option value %s is not supported", codec);
-         return NULL;

diff --git a/media-video/motion/files/ffmpeg-2.patch b/media-video/motion/files/ffmpeg-2.patch
deleted file mode 100644
index 480819d998..0000000000
--- a/media-video/motion/files/ffmpeg-2.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-Description: Improve detection of av_register_protocol() for ffmpeg.
-Author: Angel Carpintero <motiondevelop@gmail.com>
-Origin: Upstream, https://github.com/sackmotion/motion/commit/7aec4b#svn538
-Last-Update: 2012-02-12
-
---- a/configure.in
-+++ b/configure.in
-@@ -316,7 +316,7 @@
- #
- else if test "${FFMPEG_DIR}" = "yes"; then
- 	# AUTODETECT STATIC/SHARED LIB 
--	AC_MSG_CHECKING(for ffmpeg autodetecting)
-+	AC_MSG_CHECKING(for ffmpeg autodetecting libraries)
- 
- 	if test -f /usr/lib64/libavcodec.a -o -f /usr/lib64/libavcodec.so && test -f /usr/lib64/libavformat.a -o -f /usr/lib64/libavformat.so ; then
- 		AC_MSG_RESULT(found in /usr/lib64)
-@@ -347,7 +347,7 @@
- 		echo ""		
- 	fi 
- else
--	AC_MSG_CHECKING(for ffmpeg in -> [${FFMPEG_DIR}] <-)
-+	AC_MSG_CHECKING(for ffmpeg libraries in -> [${FFMPEG_DIR}] <-)
- 	if test -f ${FFMPEG_DIR}/lib/libavcodec.a -o -f ${FFMPEG_DIR}/lib/libavcodec.so && test -f ${FFMPEG_DIR}/lib/libavformat.a -o -f ${FFMPEG_DIR}/lib/libavformat.so ; then
- 		AC_MSG_RESULT(found)
- 		FFMPEG_OK="found"
-@@ -392,9 +392,11 @@
- 	elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then
- 		AC_MSG_RESULT(found ${FFMPEG_DIR}/include/libavformat/avformat.h)
- 		FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES"
-+		AVFORMAT="-I${FFMPEG_DIR}/include/libavformat"
-     elif test -f ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h; then
-         AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h)
-         FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg -DFFMPEG_NEW_INCLUDES" 
-+	AVFORMAT="-I${FFMPEG_DIR}/include/ffmpeg/libavformat"
- 	else
- 		AC_MSG_RESULT(not found)
- 		FFMPEG_OK="no_found"
-@@ -423,9 +425,11 @@
- 		AC_MSG_CHECKING([file_protocol is defined in ffmpeg ?])
- 		saved_CFLAGS=$CFLAGS
- 		saved_LIBS=$LIBS
--		CFLAGS="${FFMPEG_CFLAGS}"
-+
-+
-+		CFLAGS="${FFMPEG_CFLAGS} ${AVFORMAT}"
- 		LIBS="$TEMP_LIBS"
--		
-+    	
- 		AC_COMPILE_IFELSE(
- 			[
- 			#include <avformat.h>
-@@ -442,7 +446,35 @@
- 			]
- 		)
- 		CFLAGS=$saved_CFLAGS
--		LIBS=$saved_LIBS	
-+		LIBS=$saved_LIBS
-+       
-+        AC_MSG_CHECKING([av_register_protocol is defined in ffmpeg ?]) 
-+        saved_CFLAGS=$CFLAGS
-+        saved_LIBS=$LIBS
-+        CFLAGS="${FFMPEG_CFLAGS} ${AVFORMAT}"
-+        LIBS="$TEMP_LIBS"
-+       
-+        AC_COMPILE_IFELSE(
-+            [
-+            #include <avformat.h>
-+            URLProtocol test_file_protocol;
-+            int main(void){
-+                av_register_protocol(&test_file_protocol);
-+        	    return 0;
-+            }
-+            ],
-+            [
-+                AC_MSG_RESULT(yes)
-+                TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG_AV_REGISTER_PROTOCOL"
-+            ],
-+            [
-+                AC_MSG_RESULT(no)
-+            ]
-+        )
-+
-+        CFLAGS=$saved_CFLAGS
-+        LIBS=$saved_LIBS
-+                                        
- 	fi
- fi	
- fi
---- a/ffmpeg.c
-+++ b/ffmpeg.c
-@@ -232,11 +232,11 @@
-     mpeg1_file_protocol.url_seek  = file_protocol.url_seek;
-     mpeg1_file_protocol.url_close = file_protocol.url_close;
- 
--    /* Register the append file protocol. */
--#if LIBAVFORMAT_BUILD >= (52<<16 | 31<<8)
-+/* Register the append file protocol. */
-+#ifdef HAVE_FFMPEG_AV_REGISTER_PROTOCOL
-     av_register_protocol(&mpeg1_file_protocol);
- #else
--    register_protocol(&mpeg1_file_protocol);
-+    av_register_protocol2(&mpeg1_file_protocol, sizeof(mpeg1_file_protocol));
- #endif
- }
- 
-@@ -410,7 +410,11 @@
- 
-     ffmpeg->c     = c = AVSTREAM_CODEC_PTR(ffmpeg->video_st);
-     c->codec_id   = ffmpeg->oc->oformat->video_codec;
-+#if LIBAVCODEC_VERSION_MAJOR < 53    
-     c->codec_type = CODEC_TYPE_VIDEO;
-+#else
-+    c->codec_type = AVMEDIA_TYPE_VIDEO;
-+#endif    
-     is_mpeg1      = c->codec_id == CODEC_ID_MPEG1VIDEO;
- 
-     if (strcmp(ffmpeg_video_codec, "ffv1") == 0)
-@@ -679,7 +683,11 @@
-     if (ffmpeg->oc->oformat->flags & AVFMT_RAWPICTURE) {
-         /* raw video case. The API will change slightly in the near future for that */
- #ifdef FFMPEG_AVWRITEFRAME_NEWAPI
-+#if LIBAVCODEC_VERSION_MAJOR < 53        
-         pkt.flags |= PKT_FLAG_KEY;
-+#else
-+        pkt.flags |= AV_PKT_FLAG_KEY;  
-+#endif        
-         pkt.data = (uint8_t *)pic;
-         pkt.size = sizeof(AVPicture);
-         ret = av_write_frame(ffmpeg->oc, &pkt);
-@@ -700,7 +708,11 @@
- #ifdef FFMPEG_AVWRITEFRAME_NEWAPI
-             pkt.pts = AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->pts;
-             if (AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->key_frame) {
-+#if LIBAVCODEC_VERSION_MAJOR < 53                
-                 pkt.flags |= PKT_FLAG_KEY;
-+#else
-+                pkt.flags |= AV_PKT_FLAG_KEY;
-+#endif                
-             }
-             pkt.data = ffmpeg->video_outbuf;
-             pkt.size = out_size;

diff --git a/media-video/motion/files/ffmpeg-3.patch b/media-video/motion/files/ffmpeg-3.patch
deleted file mode 100644
index 1d6be19592..0000000000
--- a/media-video/motion/files/ffmpeg-3.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Fix avoid crash producing MPEG4 with newer FFmpeg.
-Author: Angel Carpintero <motiondevelop@gmail.com>
-Origin: Upstream, https://github.com/sackmotion/motion/commit/734155#svn539
-Bug: http://www.lavrsen.dk/foswiki/bin/view/Motion/BugReport2011x10x05x071936
-Last-Update: 2012-02-12
-
---- a/configure.in
-+++ b/configure.in
-@@ -1099,6 +1099,10 @@
- LIBS="${TEMP_LIBS}"
- LDFLAGS="${TEMP_LDFLAGS}"
- 
-+
-+AC_CHECK_FUNC(avformat_alloc_context, AC_DEFINE([have_avformat_alloc_context],1,[Define to 1 if you have avformat_alloc_context support]))
-+AC_CHECK_FUNC(av_avformat_alloc_context, AC_DEFINE([have_av_avformat_alloc_context],1,[Define to 1 if you have av_avformat_alloc_context support]))
-+
- #
- # Add the right exec path for rc scripts
- #
---- a/ffmpeg.c
-+++ b/ffmpeg.c
-@@ -373,7 +373,13 @@
-     snprintf(ffmpeg->codec, sizeof(ffmpeg->codec), "%s", ffmpeg_video_codec);
- 
-     /* allocation the output media context */
-+#ifdef have_avformat_alloc_context
-+    ffmpeg->oc = avformat_alloc_context();
-+#elif defined have_av_avformat_alloc_context
-+    ffmpeg->oc = av_alloc_format_context();
-+#else
-     ffmpeg->oc = av_mallocz(sizeof(AVFormatContext));
-+#endif
- 
-     if (!ffmpeg->oc) {
-         motion_log(LOG_ERR, 1, "Memory error while allocating output media context");

diff --git a/media-video/motion/files/ffmpeg-4.patch b/media-video/motion/files/ffmpeg-4.patch
deleted file mode 100644
index 05abd9e284..0000000000
--- a/media-video/motion/files/ffmpeg-4.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Description: Improve av_register_protocol2()/av_register_protocol() detection
-Author: Angel Carpintero <motiondevelop@gmail.com>
-Origin: Upstream, https://github.com/sackmotion/motion/commit/5dd9ed#svn540#svn540
-Last-Update: 2012-02-12
-
---- a/configure.in
-+++ b/configure.in
-@@ -448,33 +448,6 @@
- 		CFLAGS=$saved_CFLAGS
- 		LIBS=$saved_LIBS
-        
--        AC_MSG_CHECKING([av_register_protocol is defined in ffmpeg ?]) 
--        saved_CFLAGS=$CFLAGS
--        saved_LIBS=$LIBS
--        CFLAGS="${FFMPEG_CFLAGS} ${AVFORMAT}"
--        LIBS="$TEMP_LIBS"
--       
--        AC_COMPILE_IFELSE(
--            [
--            #include <avformat.h>
--            URLProtocol test_file_protocol;
--            int main(void){
--                av_register_protocol(&test_file_protocol);
--        	    return 0;
--            }
--            ],
--            [
--                AC_MSG_RESULT(yes)
--                TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG_AV_REGISTER_PROTOCOL"
--            ],
--            [
--                AC_MSG_RESULT(no)
--            ]
--        )
--
--        CFLAGS=$saved_CFLAGS
--        LIBS=$saved_LIBS
--                                        
- 	fi
- fi	
- fi
-@@ -1102,6 +1075,9 @@
- 
- AC_CHECK_FUNC(avformat_alloc_context, AC_DEFINE([have_avformat_alloc_context],1,[Define to 1 if you have avformat_alloc_context support]))
- AC_CHECK_FUNC(av_avformat_alloc_context, AC_DEFINE([have_av_avformat_alloc_context],1,[Define to 1 if you have av_avformat_alloc_context support]))
-+AC_CHECK_FUNC(av_register_protocol2, AC_DEFINE([have_av_register_protocol2],1,[Define to 1 if you have av_register_protocol2 support]))
-+AC_CHECK_FUNC(av_register_protocol, AC_DEFINE([have_av_register_protocol],1,[Define to 1 if you have av_register_protocol support]))
-+
- 
- #
- # Add the right exec path for rc scripts
---- a/ffmpeg.c
-+++ b/ffmpeg.c
-@@ -233,10 +233,12 @@
-     mpeg1_file_protocol.url_close = file_protocol.url_close;
- 
- /* Register the append file protocol. */
--#ifdef HAVE_FFMPEG_AV_REGISTER_PROTOCOL
-+#ifdef have_av_register_protocol2
-+    av_register_protocol2(&mpeg1_file_protocol, sizeof(mpeg1_file_protocol));
-+#elif defined have_av_register_protocol        
-     av_register_protocol(&mpeg1_file_protocol);
- #else
--    av_register_protocol2(&mpeg1_file_protocol, sizeof(mpeg1_file_protocol));
-+#   warning av_register_protocolXXX missing
- #endif
- }
- 

diff --git a/media-video/motion/files/ffmpeg-5.patch b/media-video/motion/files/ffmpeg-5.patch
deleted file mode 100644
index c7d114b147..0000000000
--- a/media-video/motion/files/ffmpeg-5.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-Convert to avio API.
-Disable mpeg1 append code based or the ffurl API as mpeg1 is blacklisted with
-new ffmpeg versions in this code anyway.
-Fix build with ffmpeg-1
-
-Index: motion-3.2.12/ffmpeg.c
-===================================================================
---- motion-3.2.12.orig/ffmpeg.c
-+++ motion-3.2.12/ffmpeg.c
-@@ -73,6 +73,7 @@ AVFrame *ffmpeg_prepare_frame(struct ffm
- /* This is the trailer used to end mpeg1 videos. */
- static unsigned char mpeg1_trailer[] = {0x00, 0x00, 0x01, 0xb7};
- 
-+#ifndef FFMPEG_NO_NONSTD_MPEG1
- /* Append version of the file open function used in libavformat when opening
-  * an ordinary file. The original file open function truncates an existing
-  * file, but this version appends to it instead.
-@@ -118,6 +119,7 @@ URLProtocol mpeg1_file_protocol = {
-     .url_open = file_open_append
- };
- 
-+#endif
- 
- #ifdef HAVE_FFMPEG_NEW
- 
-@@ -132,6 +134,7 @@ URLProtocol mpeg1_file_protocol = {
- #include "avstring.h"
- #endif
- 
-+#ifndef FFMPEG_NO_NONSTD_MPEG1
- static int file_open(URLContext *h, const char *filename, int flags)
- {
-     int access_flags, fd;
-@@ -195,6 +198,7 @@ URLProtocol file_protocol = {
- };
- 
- #endif
-+#endif
- 
- 
- /* We set AVOutputFormat->write_trailer to this function for mpeg1. That way,
-@@ -203,8 +207,8 @@ URLProtocol file_protocol = {
- static int mpeg1_write_trailer(AVFormatContext *s)
- {
- #if LIBAVFORMAT_BUILD >= (52<<16) 
--    put_buffer(s->pb, mpeg1_trailer, 4);
--    put_flush_packet(s->pb);    
-+    avio_write(s->pb, mpeg1_trailer, 4);
-+    avio_flush(s->pb);    
- #else
-     put_buffer(&s->pb, mpeg1_trailer, 4);
-     put_flush_packet(&s->pb);
-@@ -226,6 +230,7 @@ void ffmpeg_init()
-     /* Copy the functions to use for the append file protocol from the standard
-      * file protocol.
-      */
-+#ifndef FFMPEG_NO_NONSTD_MPEG1
-     mpeg1_file_protocol.url_read  = file_protocol.url_read;
-     mpeg1_file_protocol.url_write = file_protocol.url_write;
-     mpeg1_file_protocol.url_seek  = file_protocol.url_seek;
-@@ -239,6 +244,7 @@ void ffmpeg_init()
- #else
-     register_protocol(&mpeg1_file_protocol);
- #endif
-+#endif
- }
- 
- /* Obtains the output format used for the specified codec. For mpeg4 codecs,
-@@ -422,13 +428,6 @@ struct ffmpeg *ffmpeg_open(char *ffmpeg_
-         c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-     }
- 
--    /* set the output parameters (must be done even if no parameters). */
--    if (av_set_parameters(ffmpeg->oc, NULL) < 0) {
--        motion_log(LOG_ERR, 0, "ffmpeg av_set_parameters error: Invalid output format parameters");
--        ffmpeg_cleanups(ffmpeg);
--        return NULL;
--    }
--
-     /* Dump the format settings.  This shows how the various streams relate to each other */
-     //dump_format(ffmpeg->oc, 0, filename, 1);
- 
-@@ -504,7 +503,7 @@ struct ffmpeg *ffmpeg_open(char *ffmpeg_
-             snprintf(file_proto, sizeof(file_proto), "%s", filename);
-         
- 
--        if (url_fopen(&ffmpeg->oc->pb, file_proto, URL_WRONLY) < 0) {
-+        if (avio_open(&ffmpeg->oc->pb, file_proto, AVIO_FLAG_WRITE) < 0) {
-             /* path did not exist? */
-             if (errno == ENOENT) {
-                 /* create path for file (don't use file_proto)... */
-@@ -514,7 +513,7 @@ struct ffmpeg *ffmpeg_open(char *ffmpeg_
-                 }
- 
-                 /* and retry opening the file (use file_proto) */
--                if (url_fopen(&ffmpeg->oc->pb, file_proto, URL_WRONLY) < 0) {
-+                if (avio_open(&ffmpeg->oc->pb, file_proto, AVIO_FLAG_WRITE) < 0) {
-                     motion_log(LOG_ERR, 1, "url_fopen - error opening file %s",filename);
-                     ffmpeg_cleanups(ffmpeg);
-                     return NULL;
-@@ -535,7 +534,11 @@ struct ffmpeg *ffmpeg_open(char *ffmpeg_
-     }
- 
-     /* write the stream header, if any */
--    av_write_header(ffmpeg->oc);
-+    if(avformat_write_header(ffmpeg->oc, NULL) < 0) {
-+      motion_log(LOG_ERR, 1, "Error while writing header for %s", filename);
-+      ffmpeg_cleanups(ffmpeg);
-+      return NULL;
-+    }
-     
-     return ffmpeg;
- }
-@@ -602,7 +605,7 @@ void ffmpeg_close(struct ffmpeg *ffmpeg)
-     if (!(ffmpeg->oc->oformat->flags & AVFMT_NOFILE)) {
-         /* close the output file */
- #if LIBAVFORMAT_BUILD >= (52<<16) 
--        url_fclose(ffmpeg->oc->pb);
-+        avio_close(ffmpeg->oc->pb);
- #else
-         url_fclose(&ffmpeg->oc->pb);
- #endif /* LIBAVFORMAT_BUILD >= (52<<16) */

diff --git a/media-video/motion/files/libav-9.patch b/media-video/motion/files/libav-9.patch
deleted file mode 100644
index 39b4059df0..0000000000
--- a/media-video/motion/files/libav-9.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN motion-3.2.12.old/ffmpeg.c motion-3.2.12/ffmpeg.c
---- motion-3.2.12.old/ffmpeg.c	2013-06-17 20:36:45.355529743 +0200
-+++ motion-3.2.12/ffmpeg.c	2013-06-17 20:35:41.868532001 +0200
-@@ -409,7 +409,7 @@
-     ffmpeg->video_st = NULL;
- 
-     if (ffmpeg->oc->oformat->video_codec != CODEC_ID_NONE) {
--        ffmpeg->video_st = av_new_stream(ffmpeg->oc, 0);
-+        ffmpeg->video_st = avformat_new_stream(ffmpeg->oc, 0);
-         if (!ffmpeg->video_st) {
-             motion_log(LOG_ERR, 1, "av_new_stream - could not alloc stream");
-             ffmpeg_cleanups(ffmpeg);
-@@ -487,7 +487,7 @@
-     pthread_mutex_lock(&global_lock);
- 
-     /* open the codec */
--    if (avcodec_open(c, codec) < 0) {
-+    if (avcodec_open2(c, codec, NULL) < 0) {
-         /* Release the lock. */
-         pthread_mutex_unlock(&global_lock);
-         motion_log(LOG_ERR, 1, "avcodec_open - could not open codec");

diff --git a/media-video/motion/files/motion-3.2.12-workaround-v4l1_deprecation.patch b/media-video/motion/files/motion-3.2.12-workaround-v4l1_deprecation.patch
deleted file mode 100644
index 04a18dc62c..0000000000
--- a/media-video/motion/files/motion-3.2.12-workaround-v4l1_deprecation.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-motion has both v4l1 and v4l2 support but they are not separate except in upstream version control.
-so, temporarily use the libv4l1-videodev.h from libv4l to allow succesful build of the v4l2 (pay attention here!) backend.
-
---- motion.h
-+++ motion.h
-@@ -40,7 +40,7 @@
- 
- #define _LINUX_TIME_H 1
- #if !defined(WITHOUT_V4L) && !defined(BSD)
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- #endif
- 
- #include <pthread.h>
---- track.c
-+++ track.c
-@@ -11,6 +11,7 @@
- #include "motion.h"
- 
- #ifndef WITHOUT_V4L
-+#include <linux/videodev2.h>
- #include "pwc-ioctl.h"
- #endif
- 
---- video.h
-+++ video.h
-@@ -12,7 +12,7 @@
- 
- #define _LINUX_TIME_H 1
- #ifndef WITHOUT_V4L
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- #include <sys/mman.h>
- #include "pwc-ioctl.h"
- #endif

diff --git a/media-video/motion/files/motion.initd-r2 b/media-video/motion/files/motion.initd-r2
deleted file mode 100644
index 18b2e5bb0b..0000000000
--- a/media-video/motion/files/motion.initd-r2
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-extra_started_commands="reload"
-
-_create_motion_run_dir() {
-	local dir="/var/run/motion"
-	if ! [ -d "$dir" ]; then
-		mkdir -p -m750 "$dir"
-		chown ${MOTION_USER}:${MOTION_GROUP} "$dir"
-	fi
-}
-
-depend() {
-	need modules
-	after mysql
-}
-
-start() {
-	_create_motion_run_dir
-
-	ebegin "Starting motion detection"
-	start-stop-daemon --start -u ${MOTION_USER} -g ${MOTION_GROUP} --quiet --exec /usr/bin/motion
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping motion detection"
-	start-stop-daemon --stop --quiet --exec /usr/bin/motion
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading motion detection configuration"
-	start-stop-daemon --stop --signal HUP --exec /usr/bin/motion
-	eend $?
-}

diff --git a/media-video/motion/motion-3.2.12-r2.ebuild b/media-video/motion/motion-3.2.12-r2.ebuild
deleted file mode 100644
index ebee6c437d..0000000000
--- a/media-video/motion/motion-3.2.12-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils user
-
-DESCRIPTION="A software motion detector"
-HOMEPAGE="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc x86"
-IUSE="ffmpeg mysql postgres +v4l"
-
-RDEPEND="sys-libs/zlib
-	virtual/jpeg
-	ffmpeg? ( virtual/ffmpeg )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )"
-# note: libv4l is only in dependencies for the libv4l1-videodev.h header file
-# used by the -workaround-v4l1_deprecation.patch.
-DEPEND="${RDEPEND}
-	v4l? ( virtual/os-headers media-libs/libv4l )"
-
-pkg_setup() {
-	enewuser motion -1 -1 -1 video
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/ffmpeg-1.patch \
-		"${FILESDIR}"/ffmpeg-2.patch \
-		"${FILESDIR}"/ffmpeg-3.patch \
-		"${FILESDIR}"/ffmpeg-4.patch \
-		"${FILESDIR}"/ffmpeg-5.patch \
-		"${FILESDIR}"/libav-9.patch \
-		"${FILESDIR}"/${P}-workaround-v4l1_deprecation.patch
-}
-
-src_configure() {
-	econf \
-		$(use_with v4l) \
-		$(use_with ffmpeg) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		--without-optimizecpu
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		DOC='CHANGELOG CODE_STANDARD CREDITS FAQ README' \
-		docdir=/usr/share/doc/${PF} \
-		EXAMPLES='thread*.conf' \
-		examplesdir=/usr/share/doc/${PF}/examples \
-		install
-
-	dohtml *.html
-
-	newinitd "${FILESDIR}"/motion.initd-r2 motion
-	newconfd "${FILESDIR}"/motion.confd motion
-
-	mv -vf "${D}"/etc/motion{-dist,}.conf || die
-}
-
-pkg_postinst() {
-	elog "You need to setup /etc/motion.conf before running"
-	elog "motion for the first time."
-	elog "You can install motion detection as a service, use:"
-	elog "rc-update add motion default"
-}

diff --git a/media-video/motion/motion-3.2.12-r3.ebuild b/media-video/motion/motion-3.2.12-r3.ebuild
deleted file mode 100644
index a09010371c..0000000000
--- a/media-video/motion/motion-3.2.12-r3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils readme.gentoo user
-
-DESCRIPTION="A software motion detector"
-HOMEPAGE="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc x86"
-IUSE="ffmpeg libav mysql postgres +v4l"
-
-RDEPEND="
-	sys-libs/zlib
-	virtual/jpeg
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )
-"
-# note: libv4l is only in dependencies for the libv4l1-videodev.h header file
-# used by the -workaround-v4l1_deprecation.patch.
-DEPEND="${RDEPEND}
-	v4l? ( virtual/os-headers media-libs/libv4l )
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You need to setup /etc/motion.conf before running
-motion for the first time.
-You can install motion detection as a service, use:
-rc-update add motion default
-"
-
-pkg_setup() {
-	enewuser motion -1 -1 -1 video
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/ffmpeg-1.patch \
-		"${FILESDIR}"/ffmpeg-2.patch \
-		"${FILESDIR}"/ffmpeg-3.patch \
-		"${FILESDIR}"/ffmpeg-4.patch \
-		"${FILESDIR}"/ffmpeg-5.patch \
-		"${FILESDIR}"/libav-9.patch \
-		"${FILESDIR}"/${P}-workaround-v4l1_deprecation.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with v4l) \
-		$(use_with ffmpeg) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		--without-optimizecpu
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		DOC='CHANGELOG CODE_STANDARD CREDITS FAQ README' \
-		docdir=/usr/share/doc/${PF} \
-		EXAMPLES='thread*.conf' \
-		examplesdir=/usr/share/doc/${PF}/examples \
-		install
-
-	dohtml *.html
-
-	newinitd "${FILESDIR}"/motion.initd-r2 motion
-	newconfd "${FILESDIR}"/motion.confd motion
-
-	mv -vf "${D}"/etc/motion{-dist,}.conf || die
-
-	readme.gentoo_create_doc
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/motion/, media-video/motion/files/
@ 2020-06-04  7:14 Joonas Niilola
  0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2020-06-04  7:14 UTC (permalink / raw
  To: gentoo-commits

commit:     58c1002e91e59ca9edba1a4781f3024b0dbdf99e
Author:     Hans Fernhout <hfern <AT> fernhout <DOT> info>
AuthorDate: Thu Jun  4 07:09:24 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jun  4 07:14:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58c1002e

media-video/motion: version bump to 4.3.1

Summary of changes:
- support new version 4.3.1
- EAPI6 to EAPI7
- GLEP81 support: user and group management via dedicated packages
- untangled support for mariadb and mysql
- remove libav
- confd support for commandline options, umask and work dir
- initd checkpre function to check existence of work dir and log dir
- support for OpenRC's supervise-daemon via a local use flag
- added myself as proxy-maintainer

Closes: https://bugs.gentoo.org/665930
Closes: https://bugs.gentoo.org/673410
Closes: https://bugs.gentoo.org/717312
Signed-off-by: Johannes Willem Fernhout <hfern <AT> fernhout.info>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-video/motion/Manifest                        |   1 +
 media-video/motion/files/motion.confd-r4           |  28 ++++++
 media-video/motion/files/motion.initd-r4           |  30 ++++++
 media-video/motion/files/motion.service            |   4 +-
 .../files/{motion.service => motion.service-r4}    |  14 ++-
 media-video/motion/metadata.xml                    |  10 ++
 media-video/motion/motion-4.3.1.ebuild             | 104 +++++++++++++++++++++
 7 files changed, 185 insertions(+), 6 deletions(-)

diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index 00403820c80..2ea48fa4c59 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1 +1,2 @@
 DIST motion-release-4.1.1.tar.gz 447795 BLAKE2B 8c7dfdad89f49ba8ec39689d268b4bc95c6a8bd85d4bd333f66638b2e815b3c59b2e42dd93811601b2ee7870100a0a21eaa789633056f74a5cc9f39f4f92229f SHA512 3b08d464f9243ccfc4b53b16cfc2001d1e0d206bf0295d55d8914914bc14ad0248ce5ac622cb7eb89ed32e1913a9a10add1b56497c4094ba876f7f85d6ad4143
+DIST motion-release-4.3.1.tar.gz 849633 BLAKE2B 33039d9b8b6db0698767892997be958d84a881cc56e8cdc31d8c27242c972e629d328197c92f91c1b71a957d85807877dc602f474d430384b1e27c9213ddc697 SHA512 17033dab055c4f1d9e2912a27d0a5b419d325b0781def98428a6117e38c62201b87199210071ba93d6c4dae514733b749e39cbc1befe6242f157d4583e07dcc6

diff --git a/media-video/motion/files/motion.confd-r4 b/media-video/motion/files/motion.confd-r4
new file mode 100644
index 00000000000..8a200d14928
--- /dev/null
+++ b/media-video/motion/files/motion.confd-r4
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# Motion OpenRC conf.d file
+# All settings are optional
+
+# Set the user and group under which motion will be run
+#MOTION_USER="motion"
+#MOTION_GROUP="motion"
+
+#Set motion's config file:
+#MOTION_CONFIGFILE="/etc/motion/motion.conf"
+
+#Set motion's log file. Leave unset for syslog:
+#MOTION_LOGFILE="/var/log/motion/motion.log"
+
+#Set log type:  1-9 for COR, STR, ENC, NET, DBL, EVT, TRK, VID, ALL
+#MOTION_LOGTYPE="9"
+
+#Set log level: 1-9 for EMG, ALR, CRT, ERR, WRN, NTC, INF, DBG, ALL
+#MOTION_LOGLEVEL="6"
+
+#Set a default dir where motion places its output
+#MOTION_DIR="/var/lib/motion"
+
+#Set the umask for the output files, for additonal security
+#MOTION_UMASK="007"
+

diff --git a/media-video/motion/files/motion.initd-r4 b/media-video/motion/files/motion.initd-r4
new file mode 100644
index 00000000000..30d5e25cb08
--- /dev/null
+++ b/media-video/motion/files/motion.initd-r4
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${MOTION_USER:="motion"}
+: ${MOTION_GROUP:="motion"}
+
+[ "${MOTION_UMASK}" ] && umask="${MOTION_UMASK}"
+[ "${MOTION_CONFIGFILE}" ] && command_args="-c ${MOTION_CONFIGFILE}"
+[ "${MOTION_LOGFILE}" ] && command_args="${command_args} -l ${MOTION_LOGFILE}"
+[ "${MOTION_LOGTYPE}" ] && command_args="${command_args} -k ${MOTION_LOGTYPE}"
+[ "${MOTION_LOGLEVEL}" ] && command_args="${command_args} -d ${MOTION_LOGLEVEL}"
+
+command=/usr/bin/motion
+command_user="${MOTION_USER}:${MOTION_GROUP}"
+
+start_pre() {
+  if [ "${MOTION_DIR}" ] ; then
+    mkdir -p "${MOTION_DIR}"
+    checkpath -d -o "${MOTION_USER}" "${MOTION_DIR}"
+    directory="${MOTION_DIR}"
+  fi
+  if [ "${MOTION_LOGFILE}" ] ; then
+    local LOGFILE=${MOTION_LOGFILE##*/}
+    local LOGDIR=${MOTION_LOGFILE%$LOGFILE} 
+    mkdir -p "${LOGDIR}"
+    checkpath -d -o "${MOTION_USER}" "${LOGDIR}"
+  fi
+}
+

diff --git a/media-video/motion/files/motion.service b/media-video/motion/files/motion.service
index 559b94b6b29..d4755bdb48e 100644
--- a/media-video/motion/files/motion.service
+++ b/media-video/motion/files/motion.service
@@ -8,13 +8,13 @@ Type=simple
 ExecStart=/usr/bin/motion -n -c /etc/motion/motion.conf
 StandardError=null
 
-User=motion
+#User=motion
 Group=video
 
 #RuntimeDirectory=motion
 #RuntimeDirectoryMode=0750
 
-WorkingDirectory=/var/lib/motion
+#WorkingDirectory=/var/lib/motion
 
 [Install]
 WantedBy=multi-user.target

diff --git a/media-video/motion/files/motion.service b/media-video/motion/files/motion.service-r4
similarity index 56%
copy from media-video/motion/files/motion.service
copy to media-video/motion/files/motion.service-r4
index 559b94b6b29..1564fb2699c 100644
--- a/media-video/motion/files/motion.service
+++ b/media-video/motion/files/motion.service-r4
@@ -1,3 +1,9 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# Motion OpenRC systemd service file
+
+
 [Unit]
 Description=Motion detection daemon
 After=local-fs.target network.target
@@ -9,12 +15,12 @@ ExecStart=/usr/bin/motion -n -c /etc/motion/motion.conf
 StandardError=null
 
 User=motion
-Group=video
+Group=motion
 
-#RuntimeDirectory=motion
-#RuntimeDirectoryMode=0750
+UMask=007
+WorkingDirectory=-/var/lib/motion
 
-WorkingDirectory=/var/lib/motion
 
 [Install]
 WantedBy=multi-user.target
+

diff --git a/media-video/motion/metadata.xml b/media-video/motion/metadata.xml
index b1389a2954b..301a7616abb 100644
--- a/media-video/motion/metadata.xml
+++ b/media-video/motion/metadata.xml
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>hfern@fernhout.info</email>
+		<name>Hans Fernhout</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
 	</maintainer>
 	<use>
+		<flag name="mariadb">Add mariadb database support</flag>
 		<flag name="mmal">Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi.</flag>
+		<flag name="supervise-daemon">Add experimental suppport for OpenRC's supervise-daemon process supervision</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">Motion-Project/motion</remote-id>

diff --git a/media-video/motion/motion-4.3.1.ebuild b/media-video/motion/motion-4.3.1.ebuild
new file mode 100644
index 00000000000..41e650e61fd
--- /dev/null
+++ b/media-video/motion/motion-4.3.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools readme.gentoo-r1 systemd
+
+DESCRIPTION="A software motion detector"
+HOMEPAGE="https://motion-project.github.io"
+SRC_URI="https://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz -> ${PN}-release-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ffmpeg mariadb mmal mysql postgres sqlite supervise-daemon v4l webp"
+
+RDEPEND="
+	acct-group/motion
+	acct-user/motion
+	virtual/jpeg:=
+	ffmpeg? ( media-video/ffmpeg:0= )
+	mariadb? ( dev-db/mariadb-connector-c )
+	mmal? ( media-libs/raspberrypi-userland )
+	mysql? ( dev-db/mysql-connector-c )
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )
+	webp? ( media-libs/libwebp:= )
+"
+DEPEND="${RDEPEND}
+	net-libs/libmicrohttpd
+	v4l? (
+		media-libs/libv4l
+		virtual/os-headers
+	)
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+You need to setup a configuraton file (/etc/motion/motion.conf) before
+running motion for the first time.
+
+If motion is built with the mysql or mariadb use flags then please make
+sure to configure a matching database_type in the config file.
+
+Motion runs by default under user motion and group motion:
+- change this if needed in /etc/conf.d/motion
+- or add users who need access to the output files to the motion group
+
+To install motion as a service, use:
+- rc-update add motion default # with OpenRC
+- systemctl enable motion.service # with systemd
+"
+
+S="${WORKDIR}"/${PN}-release-${PV}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ffmpeg) \
+		$(use_with mariadb) \
+		$(use_with mmal) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with sqlite sqlite3) \
+		$(use_with v4l v4l2) \
+		$(use_with webp) \
+		--without-optimizecpu
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF} \
+		examplesdir=/usr/share/doc/${PF}/examples \
+		install
+
+	# build INITDAD string cwto be added to initd based on use flags, eg
+	# "depend() {
+	#   use mysql
+	# }
+	#
+	# supervisor=supervise-daemon"
+	local INITDADJ=""
+	( use mysql || use mariadb ) && INITDADJ=" use mysql\n"
+	use postgres && INITDADJ="${INITDADJ}  use postgresql\n"
+	[ "${#INITDADJ}" -gt 0 ] && INITDADJ="depend() {\n${INITDADJ}}\n"
+	if use supervise-daemon ; then
+		INITDADJ="${INITDADJ}\nsupervisor=supervise-daemon\n"
+	else
+		INITDADJ="${INITDADJ}\npidfile=/run/\${RC_SVCNAME}.pid\ncommand_background=true\n"
+	fi
+	cp "${FILESDIR}/${PN}.initd-r4" "${T}/initd" || die
+	echo -e ${INITDADJ} >> "${T}/initd" || die
+
+	newinitd "${T}/initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r4" ${PN}
+	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
+	readme.gentoo_create_doc
+	readme.gentoo_print_elog
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/motion/, media-video/motion/files/
@ 2021-04-14 14:44 John Helmert III
  0 siblings, 0 replies; 5+ messages in thread
From: John Helmert III @ 2021-04-14 14:44 UTC (permalink / raw
  To: gentoo-commits

commit:     6c500354ad3a2355db99d0cef849f0b7ba9b79dc
Author:     John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 14 14:36:32 2021 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Wed Apr 14 14:43:43 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c500354

media-video/motion: security cleanup (drop <4.3.1)

Bug: https://bugs.gentoo.org/760714
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>

 media-video/motion/Manifest              |   1 -
 media-video/motion/files/motion.confd-r4 |  28 --------
 media-video/motion/files/motion.initd-r4 |  30 ---------
 media-video/motion/motion-4.3.1.ebuild   | 107 -------------------------------
 4 files changed, 166 deletions(-)

diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index 9f0cd88446b..6e4c76eea57 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1,2 +1 @@
-DIST motion-release-4.3.1.tar.gz 849633 BLAKE2B 33039d9b8b6db0698767892997be958d84a881cc56e8cdc31d8c27242c972e629d328197c92f91c1b71a957d85807877dc602f474d430384b1e27c9213ddc697 SHA512 17033dab055c4f1d9e2912a27d0a5b419d325b0781def98428a6117e38c62201b87199210071ba93d6c4dae514733b749e39cbc1befe6242f157d4583e07dcc6
 DIST motion-release-4.3.2.tar.gz 849378 BLAKE2B 2ff49f44bb1d57123760860ae17cc241ecabf3d045ac0c45e1ca08ce3ac8be2fec308492472c37c0d869bc21a7c04658c923c763f9b8f6b547403fc094b03196 SHA512 df54297eebc44b3bc50fd40890c69a9cbbfc5936224bf7027065364e794d7201ceadd99ac99bf43113ec3368f2b5ca435d2956258b9c774e03a6750b41346a7c

diff --git a/media-video/motion/files/motion.confd-r4 b/media-video/motion/files/motion.confd-r4
deleted file mode 100644
index 8a200d14928..00000000000
--- a/media-video/motion/files/motion.confd-r4
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# Motion OpenRC conf.d file
-# All settings are optional
-
-# Set the user and group under which motion will be run
-#MOTION_USER="motion"
-#MOTION_GROUP="motion"
-
-#Set motion's config file:
-#MOTION_CONFIGFILE="/etc/motion/motion.conf"
-
-#Set motion's log file. Leave unset for syslog:
-#MOTION_LOGFILE="/var/log/motion/motion.log"
-
-#Set log type:  1-9 for COR, STR, ENC, NET, DBL, EVT, TRK, VID, ALL
-#MOTION_LOGTYPE="9"
-
-#Set log level: 1-9 for EMG, ALR, CRT, ERR, WRN, NTC, INF, DBG, ALL
-#MOTION_LOGLEVEL="6"
-
-#Set a default dir where motion places its output
-#MOTION_DIR="/var/lib/motion"
-
-#Set the umask for the output files, for additonal security
-#MOTION_UMASK="007"
-

diff --git a/media-video/motion/files/motion.initd-r4 b/media-video/motion/files/motion.initd-r4
deleted file mode 100644
index 30d5e25cb08..00000000000
--- a/media-video/motion/files/motion.initd-r4
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-: ${MOTION_USER:="motion"}
-: ${MOTION_GROUP:="motion"}
-
-[ "${MOTION_UMASK}" ] && umask="${MOTION_UMASK}"
-[ "${MOTION_CONFIGFILE}" ] && command_args="-c ${MOTION_CONFIGFILE}"
-[ "${MOTION_LOGFILE}" ] && command_args="${command_args} -l ${MOTION_LOGFILE}"
-[ "${MOTION_LOGTYPE}" ] && command_args="${command_args} -k ${MOTION_LOGTYPE}"
-[ "${MOTION_LOGLEVEL}" ] && command_args="${command_args} -d ${MOTION_LOGLEVEL}"
-
-command=/usr/bin/motion
-command_user="${MOTION_USER}:${MOTION_GROUP}"
-
-start_pre() {
-  if [ "${MOTION_DIR}" ] ; then
-    mkdir -p "${MOTION_DIR}"
-    checkpath -d -o "${MOTION_USER}" "${MOTION_DIR}"
-    directory="${MOTION_DIR}"
-  fi
-  if [ "${MOTION_LOGFILE}" ] ; then
-    local LOGFILE=${MOTION_LOGFILE##*/}
-    local LOGDIR=${MOTION_LOGFILE%$LOGFILE} 
-    mkdir -p "${LOGDIR}"
-    checkpath -d -o "${MOTION_USER}" "${LOGDIR}"
-  fi
-}
-

diff --git a/media-video/motion/motion-4.3.1.ebuild b/media-video/motion/motion-4.3.1.ebuild
deleted file mode 100644
index fcb7435c91e..00000000000
--- a/media-video/motion/motion-4.3.1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools readme.gentoo-r1 systemd
-
-DESCRIPTION="A software motion detector"
-HOMEPAGE="https://motion-project.github.io"
-SRC_URI="https://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz -> ${PN}-release-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="ffmpeg mariadb mmal mysql postgres sqlite supervise-daemon v4l webp"
-
-RDEPEND="
-	acct-group/motion
-	acct-user/motion
-	virtual/jpeg:=
-	ffmpeg? ( media-video/ffmpeg:0= )
-	mariadb? ( dev-db/mariadb-connector-c )
-	mmal? ( media-libs/raspberrypi-userland )
-	mysql? ( dev-db/mysql-connector-c )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( dev-db/sqlite:3 )
-	webp? ( media-libs/libwebp:= )
-"
-DEPEND="${RDEPEND}
-	net-libs/libmicrohttpd
-	v4l? (
-		media-libs/libv4l
-		virtual/os-headers
-	)
-"
-
-# Breaks src_install(), #727056
-RESTRICT="test"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-You need to setup a configuraton file (/etc/motion/motion.conf) before
-running motion for the first time.
-
-If motion is built with the mysql or mariadb use flags then please make
-sure to configure a matching database_type in the config file.
-
-Motion runs by default under user motion and group motion:
-- change this if needed in /etc/conf.d/motion
-- or add users who need access to the output files to the motion group
-
-To install motion as a service, use:
-- rc-update add motion default # with OpenRC
-- systemctl enable motion.service # with systemd
-"
-
-S="${WORKDIR}"/${PN}-release-${PV}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ffmpeg) \
-		$(use_with mariadb) \
-		$(use_with mmal) \
-		$(use_with mysql) \
-		$(use_with postgres pgsql) \
-		$(use_with sqlite sqlite3) \
-		$(use_with v4l v4l2) \
-		$(use_with webp) \
-		--without-optimizecpu
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF} \
-		examplesdir=/usr/share/doc/${PF}/examples \
-		install
-
-	# build INITDAD string cwto be added to initd based on use flags, eg
-	# "depend() {
-	#   use mysql
-	# }
-	#
-	# supervisor=supervise-daemon"
-	local INITDADJ=""
-	( use mysql || use mariadb ) && INITDADJ=" use mysql\n"
-	use postgres && INITDADJ="${INITDADJ}  use postgresql\n"
-	[ "${#INITDADJ}" -gt 0 ] && INITDADJ="depend() {\n${INITDADJ}}\n"
-	if use supervise-daemon ; then
-		INITDADJ="${INITDADJ}\nsupervisor=supervise-daemon\n"
-	else
-		INITDADJ="${INITDADJ}\npidfile=/run/\${RC_SVCNAME}.pid\ncommand_background=true\n"
-	fi
-	cp "${FILESDIR}/${PN}.initd-r4" "${T}/initd" || die
-	echo -e ${INITDADJ} >> "${T}/initd" || die
-
-	newinitd "${T}/initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r4" ${PN}
-	systemd_newunit "${FILESDIR}/${PN}.service-r4" "${PN}.service"
-	readme.gentoo_create_doc
-	readme.gentoo_print_elog
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-video/motion/, media-video/motion/files/
@ 2023-06-26 18:05 David Seifert
  0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2023-06-26 18:05 UTC (permalink / raw
  To: gentoo-commits

commit:     ac9b51c7ab3f10e6bf1f77f9fb709e7b10364c93
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 26 18:05:37 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Jun 26 18:05:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac9b51c7

media-video/motion: fix gettext 0.22 breakage

Closes: https://bugs.gentoo.org/908965
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 ...n-4.5.1-fix-gettext-0.22-format-specifier.patch | 34 ++++++++++++++++++++++
 media-video/motion/motion-4.5.1-r2.ebuild          |  6 ++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/media-video/motion/files/motion-4.5.1-fix-gettext-0.22-format-specifier.patch b/media-video/motion/files/motion-4.5.1-fix-gettext-0.22-format-specifier.patch
new file mode 100644
index 000000000000..531fd3cf235a
--- /dev/null
+++ b/media-video/motion/files/motion-4.5.1-fix-gettext-0.22-format-specifier.patch
@@ -0,0 +1,34 @@
+https://github.com/Motion-Project/motion/pull/1681
+
+From 6c00ca93d87229ee28b052af4a4b4aefad14499b Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Mon, 26 Jun 2023 19:56:18 +0200
+Subject: [PATCH 1/2] po: fix gettext 0.22 format specifier
+
+Bug: https://bugs.gentoo.org/908965
+Bug: https://savannah.gnu.org/bugs/index.php?64334#comment1
+--- a/po/de.po
++++ b/po/de.po
+@@ -3458,7 +3458,7 @@ msgstr "Sprache: Deutsch"
+ #: src/util.c
+ #, c-format
+ msgid "Could not allocate %llu bytes of memory!"
+-msgstr "%Llu Bytes Speicher konnten nicht zugeordnet werden!"
++msgstr "%llu Bytes Speicher konnten nicht zugeordnet werden!"
+ 
+ #: src/util.c
+ #, c-format
+--- a/po/fi.po
++++ b/po/fi.po
+@@ -3432,7 +3432,7 @@ msgstr "Kieli: englanti"
+ #: src/util.c
+ #, c-format
+ msgid "Could not allocate %llu bytes of memory!"
+-msgstr "%Llu-tavua muistia ei voitu varata!"
++msgstr "%llu-tavua muistia ei voitu varata!"
+ 
+ #: src/util.c
+ #, c-format
+-- 
+2.41.0
+

diff --git a/media-video/motion/motion-4.5.1-r2.ebuild b/media-video/motion/motion-4.5.1-r2.ebuild
index 55cb4df6acd2..8e786bb8fe9e 100644
--- a/media-video/motion/motion-4.5.1-r2.ebuild
+++ b/media-video/motion/motion-4.5.1-r2.ebuild
@@ -8,6 +8,7 @@ inherit autotools readme.gentoo-r1 systemd
 DESCRIPTION="A software motion detector"
 HOMEPAGE="https://motion-project.github.io"
 SRC_URI="https://github.com/Motion-Project/${PN}/archive/release-${PV}.tar.gz -> ${PN}-release-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-release-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -34,6 +35,9 @@ DEPEND="${RDEPEND}
 		virtual/os-headers
 	)
 "
+
+PATCHES=( "${FILESDIR}"/${P}-fix-gettext-0.22-format-specifier.patch )
+
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="
 You need to setup a configuraton file (/etc/motion/motion.conf) before
@@ -51,8 +55,6 @@ To install motion as a service, use:
 - systemctl enable motion.service # with systemd
 "
 
-S="${WORKDIR}"/${PN}-release-${PV}
-
 src_prepare() {
 	default
 	eautoreconf


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-06-26 18:05 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-14 14:44 [gentoo-commits] repo/gentoo:master commit in: media-video/motion/, media-video/motion/files/ John Helmert III
  -- strict thread matches above, loose matches on Subject: below --
2023-06-26 18:05 David Seifert
2020-06-04  7:14 Joonas Niilola
2017-02-10 13:44 Wolfram Schlich
2017-01-16 11:49 Wolfram Schlich

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