From f5e725820c8ff11c3c6d0700cded67947e5559b3 Mon Sep 17 00:00:00 2001 From: Fusl Date: Wed, 10 Jan 2018 05:49:49 +0000 Subject: testing/motion: upgrade to 4.1.1 to solve a randomly happening SIGSEGV issue --- testing/motion/APKBUILD | 11 ++++------ testing/motion/motion-dist.conf.in.patch | 35 ++++++++------------------------ testing/motion/pthread.patch | 23 --------------------- testing/motion/strerror_r.patch | 11 ---------- 4 files changed, 13 insertions(+), 67 deletions(-) delete mode 100644 testing/motion/pthread.patch delete mode 100644 testing/motion/strerror_r.patch (limited to 'testing/motion') diff --git a/testing/motion/APKBUILD b/testing/motion/APKBUILD index 3f54b0cd1e..ec74858b84 100644 --- a/testing/motion/APKBUILD +++ b/testing/motion/APKBUILD @@ -1,8 +1,9 @@ +# Contributor: Katie Holly # Contributor: Łukasz Jendrysik # Contributor: Mika Havela # Maintainer: Mika Havela pkgname=motion -pkgver=4.0.1 +pkgver=4.1.1 pkgrel=0 pkgdesc="Detect if a significant part of the picture has changed (e.g. from a webcam)." url="https://motion-project.github.io" @@ -20,8 +21,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/Motion-Project/$pkgname/arch motion.confd motion.initd motion-dist.conf.in.patch - pthread.patch - strerror_r.patch " builddir="$srcdir"/$pkgname-release-$pkgver @@ -53,9 +52,7 @@ package() { install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -sha512sums="6ccde3890e6af56f28208321987dd1b9d62a55bbe7cbc3ab5600263602e6e8f47589392c2f3a3a6cb54f927ee76aea94d0e83f26ce8e4047890c891b6c2f8976 motion-4.0.1.tar.gz +sha512sums="3b08d464f9243ccfc4b53b16cfc2001d1e0d206bf0295d55d8914914bc14ad0248ce5ac622cb7eb89ed32e1913a9a10add1b56497c4094ba876f7f85d6ad4143 motion-4.1.1.tar.gz 8a67b5b0360924e58ba3136a737ce73bb43201a49b2b6e2c632426561b830f6ab55cbbeaa89be7f1683aa8fd322b4f31b9f560e67a93eaceb964c9f56ceef363 motion.confd be30f19595dba27f2d0ca8133c93e134161781935a152bd1701e581410039e37742acd11987c38e6e64f495b1fd2b0a74a8c61ae0e6e211a475fca7994172501 motion.initd -2ac312c7bdd6a487b875a0b39c69a9e61a8d0767f6834be3598242d2f607e823920ad379c5bf10afe2d90de25a1ab03b6d745f18ba952181dad5a154b761388f motion-dist.conf.in.patch -aab20c38dc57f5ad5f4a4a96220a69589208138401b42c181ab0cb8aa8238d5441b50af40c7bc481729cc74247aa3d2923633b06957817bbaa9282c9d6a24b8d pthread.patch -a94ea4512c1b53fce38791a7773d01021092009afdac68552aad72749f7b9a18804a78adcf00f2810753f37b40617c5f4111711338369b28d2ddd63b268a0782 strerror_r.patch" +c27d7ded3ed7a56101791bca86eb083450f5b8a1f431b3f7ee8538f682ac5f5d4b50104d9d61f40be964f1f1975a114313ba3d30d7357035dc25ebe925db6a89 motion-dist.conf.in.patch" diff --git a/testing/motion/motion-dist.conf.in.patch b/testing/motion/motion-dist.conf.in.patch index 0fddba9b8b..a707436e68 100644 --- a/testing/motion/motion-dist.conf.in.patch +++ b/testing/motion/motion-dist.conf.in.patch @@ -1,27 +1,9 @@ ---- motion-4.0.1/motion-dist.conf.in -+++ ./motion-dist.conf.in -@@ -1,6 +1,6 @@ - # Rename this distribution example file to motion.conf - # --# This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@ -+# This config file was generated by motion 4.0.1 - - - ############################################################ -@@ -447,7 +447,7 @@ - - # Target base directory for pictures and films - # Recommended to use absolute path. (Default: current working directory) --#target_dir /tmp/motion -+target_dir /var/lib/motion - - # File path for snapshots (jpeg or ppm) relative to target_dir - # Default: %v-%Y%m%d%H%M%S-snapshot -@@ -666,70 +666,6 @@ - # It depends on the driver, some drivers dosn't detect a lost camera at all - # Some hangs the motion thread. Some even hangs the PC! (default: none) - ; on_camera_lost value -- +--- a/motion-dist.conf.in ++++ b/motion-dist.conf.in +@@ -633,70 +633,6 @@ + # NOTE: If motion doesn't properly detect a lost camera, it also won't know it found one. + ; on_camera_found value + -##################################################################### -# Common Options for database features. -# Options require database options to be active also. @@ -85,6 +67,7 @@ -# be unlocked before returning database locked error (default 0) -; database_busy_timeout 0 - - - +- + ############################################################ + # Video Loopback Device (vloopback project) diff --git a/testing/motion/pthread.patch b/testing/motion/pthread.patch deleted file mode 100644 index 570849729b..0000000000 --- a/testing/motion/pthread.patch +++ /dev/null @@ -1,23 +0,0 @@ -configure doesn't generate proper pthread support - ---- motion-4.0.1/configure.ac -+++ ./configure.ac -@@ -188,7 +188,8 @@ - pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], - [PTHREAD_LIB=yes]) - --if test x$PTHREAD_LIB != xyes; then -+# this test should fail but it doesn't on alpine -+if test x$PTHREAD_LIB = xyes; then - - if test "${FreeBSD}" != ""; then - TEMP_LIBS="$TEMP_LIBS -pthread" -@@ -213,7 +214,7 @@ - CFLAGS="$TEMP_CFLAGS" - LIBS="$TEMP_LIBS" - AC_LINK_IFELSE( -- [AC_LANG_PROGRAM([[#include ]], [[ pthread_setname_np(pthread_self(), "name")]])], -+ [AC_LANG_PROGRAM([[#include ]], [[ pthread_getname_np(pthread_self(), "name", 0)]])], - [AC_DEFINE([[HAVE_PTHREAD_SETNAME_NP]], [[1]], [Define if you have pthread_setname_np function.]) - AC_MSG_RESULT([[yes]])], - [AC_MSG_RESULT([[no]])] ) diff --git a/testing/motion/strerror_r.patch b/testing/motion/strerror_r.patch deleted file mode 100644 index bbe625ecb7..0000000000 --- a/testing/motion/strerror_r.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- motion-4.0.1/motion.h -+++ ./motion.h -@@ -88,7 +88,7 @@ - #endif - - /* strerror_r() XSI vs GNU */ --#if (defined(BSD)) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE) -+#if !defined(__GLIBC__) || (defined(BSD)) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE) - #define XSI_STRERROR_R - #endif - -- cgit v1.2.3