From dcd620ab992c94a48d252eca9f849246d0b43646 Mon Sep 17 00:00:00 2001 From: Michael Mair-Keimberger Date: Sat, 12 Dec 2020 13:23:48 +0100 Subject: media-video/motion: remove unused patches Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger Signed-off-by: David Seifert --- .../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(-) delete mode 100644 media-video/motion/files/4.1.1/Fix-build-errors-with-FFmpeg-4.0.patch delete mode 100644 media-video/motion/files/motion.conf delete mode 100644 media-video/motion/files/motion.confd-r1 delete mode 100644 media-video/motion/files/motion.initd-r3 delete mode 100644 media-video/motion/files/motion.service (limited to 'media-video') 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 641d68a8d0c5..000000000000 --- 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 +0000 -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_QSCALE AV_CODEC_FLAG_QSCALE -+ -+#else -+ -+#define MY_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER -+#define MY_CODEC_FLAG_QSCALE CODEC_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) / 1000000) + 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 f032d874f0ca..000000000000 --- 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 dfff31beb45d..000000000000 --- 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 2b474fc56f9a..000000000000 --- 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 /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 deleted file mode 100644 index d4755bdb48ea..000000000000 --- a/media-video/motion/files/motion.service +++ /dev/null @@ -1,20 +0,0 @@ -[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 -- cgit v1.2.3-65-gdbad