[gentoo-commits] repo/gentoo:master commit in: media-video/motion/files/, media-video/motion/
commit: 9a3e762a530087daea0bc72e44402b75a143094f
Author: Sam James gentoo org>
AuthorDate: Sat Oct 7 23:24:28 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 7 23:25:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a3e762a
media-video/motion: fix build w/ newer libwebp
The patch isn't perfect as upstream (even before this) called `pkgconf` directly
and this one doesn't update CFLAGS but as a driveby this is good enough.
Closes: https://bugs.gentoo.org/910601
Signed-off-by: Sam James gentoo.org>
.../files/motion-4.5.1-webp-underlinking.patch | 24 ++
...tion-4.5.1-r2.ebuild => motion-4.5.1-r3.ebuild} | 5 -
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/media-video/motion/files/motion-4.5.1-webp-underlinking.patch
b/media-video/motion/files/motion-4.5.1-webp-underlinking.patch
new file mode 100644
index ..19d111fd3039
--- /dev/null
+++ b/media-video/motion/files/motion-4.5.1-webp-underlinking.patch
@@ -0,0 +1,24 @@
+https://github.com/Motion-Project/motionplus/issues/74
+https://github.com/Motion-Project/motionplus/commit/af632f831127499ee541d9c719a930321718f294
+https://bugs.gentoo.org/910601
+
+From af632f831127499ee541d9c719a930321718f294 Mon Sep 17 00:00:00 2001
+From: Mr-Dave
+Date: Sat, 8 Jul 2023 21:36:06 -0600
+Subject: [PATCH] Fix webp libs. Closes #74
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/configure.ac 2022-12-17 17:36:49.0 -0700
b/configure.ac 2023-09-25 06:39:39.399220672 -0600
+@@ -192,7 +192,7 @@
+ AC_MSG_RESULT(yes)
+ AC_DEFINE([HAVE_WEBP], [1], [Define to 1 if WEBP is around])
+ TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags libwebpmux`
+-TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs libwebpmux`
++TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs libwebpmux libwebp`
+ ],[
+ AC_MSG_RESULT(no)
+ ]
diff --git a/media-video/motion/motion-4.5.1-r2.ebuild
b/media-video/motion/motion-4.5.1-r3.ebuild
similarity index 95%
rename from media-video/motion/motion-4.5.1-r2.ebuild
rename to media-video/motion/motion-4.5.1-r3.ebuild
index 8e786bb8fe9e..b145c2763090 100644
--- a/media-video/motion/motion-4.5.1-r2.ebuild
+++ b/media-video/motion/motion-4.5.1-r3.ebuild
@@ -36,7 +36,10 @@ DEPEND="${RDEPEND}
)
"
-PATCHES=( "${FILESDIR}"/${P}-fix-gettext-0.22-format-specifier.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-gettext-0.22-format-specifier.patch
+ "${FILESDIR}"/${P}-webp-underlinking.patch
+)
DISABLE_AUTOFORMATTING="yes"
DOC_CONTENTS="
[gentoo-commits] repo/gentoo:master commit in: media-video/motion/files/, media-video/motion/
commit: c2b5ff207b1160749bc7287f8372dcfe783d8079
Author: Johannes Willem Fernhout fernhout info>
AuthorDate: Tue Dec 8 18:23:18 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Dec 15 07:18:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2b5ff20
media-video/motion: version bump to 4.3.2
Changes are:
- version 4.3.2 has some bug fixes
- init file updated with need localmount and after bootmisc
- simplification of ebuild
- supervise-deamon USE flag no longer used
Closes: https://bugs.gentoo.org/752135
Closes: https://bugs.gentoo.org/739872
Signed-off-by: Johannes Willem Fernhout fernhout.info>
Closes: https://github.com/gentoo/gentoo/pull/18569
Signed-off-by: Joonas Niilola gentoo.org>
media-video/motion/Manifest | 1 +
media-video/motion/files/motion.confd-r5 | 31 +++
media-video/motion/files/motion.initd-r5 | 37 +
media-video/motion/motion-4.3.2.ebuild | 89
4 files changed, 158 insertions(+)
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index a8f8e25f509..9f0cd88446b 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1 +1,2 @@
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-r5
b/media-video/motion/files/motion.confd-r5
new file mode 100644
index 000..6ea8774cc4f
--- /dev/null
+++ b/media-video/motion/files/motion.confd-r5
@@ -0,0 +1,31 @@
+# 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"
+
+#Uncomment to under under start-stop-daemon instead of supervise_daemon
+#MOTION_PIDFILE="/var/run/motion.pid"
+
diff --git a/media-video/motion/files/motion.initd-r5
b/media-video/motion/files/motion.initd-r5
new file mode 100644
index 000..b13ac5d0b5b
--- /dev/null
+++ b/media-video/motion/files/motion.initd-r5
@@ -0,0 +1,37 @@
+#!/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
+checkpath -d -o "${MOTION_USER}":"${MOTION_GROUP}" "${MOTION_DIR}"
+directory="${MOTION_DIR}"
+ fi
+ if [ "${MOTION_LOGFILE}" ] ; then
+checkpath -f -o "${MOTION_USER}":"${MOTION_GROUP}" "${LOGFILE}"
+ fi
+ if [ "${MOTION_PIDFILE}" ] ; then
+pidfile="${MOTION_PIDFILE}"
+command_background=true
+ else
+supervisor=supervise-daemon
+ fi
+}
+
+depend() {
+ need localmount
+ after bootmisc
+ use mysql postgresq
+}
diff --git a/media-video/motion/motion-4.3.2.ebuild
b/media-video/motion/motion-4.3.2.ebuild
new file mode 100644
index 000..19e930a8ae0
--- /dev/null
+++ b/media-video/motion/motion-4.3.2.ebuild
@@ -0,0 +1,89 @@
+# 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
[gentoo-commits] repo/gentoo:master commit in: media-video/motion/files/, media-video/motion/files/4.1.1/
commit: dcd620ab992c94a48d252eca9f849246d0b43646
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sat Dec 12 12:23:48 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Dec 12 12:23:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd620ab
media-video/motion: remove unused patches
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger gmail.com>
Signed-off-by: David Seifert gentoo.org>
.../4.1.1/Fix-build-errors-with-FFmpeg-4.0.patch | 54 --
media-video/motion/files/motion.conf | 1 -
media-video/motion/files/motion.confd-r1 | 9
media-video/motion/files/motion.initd-r3 | 42 -
media-video/motion/files/motion.service| 20
5 files changed, 126 deletions(-)
diff --git
a/media-video/motion/files/4.1.1/Fix-build-errors-with-FFmpeg-4.0.patch
b/media-video/motion/files/4.1.1/Fix-build-errors-with-FFmpeg-4.0.patch
deleted file mode 100644
index 641d68a8d0c..000
--- a/media-video/motion/files/4.1.1/Fix-build-errors-with-FFmpeg-4.0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 9a9e918ec819277c6c5c2f21b52dd63570e426a7 Mon Sep 17 00:00:00 2001
-From: James Cowgill
-Date: Sun, 25 Feb 2018 20:13:57 +
-Subject: [PATCH] Fix build errors with FFmpeg 4.0
-
- ffmpeg.c | 17 +++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/ffmpeg.c b/ffmpeg.c
-index b2780bb..23644db 100644
a/ffmpeg.c
-+++ b/ffmpeg.c
-@@ -67,6 +67,19 @@
-
- #endif
-
-+/*/
-+#if (LIBAVCODEC_VERSION_MAJOR >= 57)
-+
-+#define MY_CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
-+#define MY_CODEC_FLAG_QSCALEAV_CODEC_FLAG_QSCALE
-+
-+#else
-+
-+#define MY_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
-+#define MY_CODEC_FLAG_QSCALECODEC_FLAG_QSCALE
-+
-+#endif
-+
- /*/
- AVFrame *my_frame_alloc(void){
- AVFrame *pic;
-@@ -538,7 +551,7 @@ static int ffmpeg_set_quality(struct ffmpeg *ffmpeg){
- /* The selection of 8000 in the else is a subjective number based
upon viewing output files */
- if (ffmpeg->vbr > 0){
- ffmpeg->vbr
=(int)(((100-ffmpeg->vbr)*(100-ffmpeg->vbr)*(100-ffmpeg->vbr) * 8000) /
100) + 1;
--ffmpeg->ctx_codec->flags |= CODEC_FLAG_QSCALE;
-+ffmpeg->ctx_codec->flags |= MY_CODEC_FLAG_QSCALE;
- ffmpeg->ctx_codec->global_quality=ffmpeg->vbr;
- }
- }
-@@ -663,7 +676,7 @@ static int ffmpeg_set_codec(struct ffmpeg *ffmpeg){
- ffmpeg->ctx_codec->strict_std_compliance = -2;
- ffmpeg->ctx_codec->level = 3;
- }
--ffmpeg->ctx_codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+ffmpeg->ctx_codec->flags |= MY_CODEC_FLAG_GLOBAL_HEADER;
-
- retcd = ffmpeg_set_quality(ffmpeg);
- if (retcd < 0){
---
-2.16.2
-
diff --git a/media-video/motion/files/motion.conf
b/media-video/motion/files/motion.conf
deleted file mode 100644
index f032d874f0c..000
--- a/media-video/motion/files/motion.conf
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index dfff31beb45..000
--- a/media-video/motion/files/motion.confd-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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
deleted file mode 100644
index 2b474fc56f9..000
--- a/media-video/motion/files/motion.initd-r3
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
