diff --git a/srcpkgs/motion/patches/Fix-detection-of-sqlite3-when-cross-compiling.patch b/srcpkgs/motion/patches/Fix-detection-of-sqlite3-when-cross-compiling.patch new file mode 100644 index 00000000000..62b7a6f9895 --- /dev/null +++ b/srcpkgs/motion/patches/Fix-detection-of-sqlite3-when-cross-compiling.patch @@ -0,0 +1,46 @@ +From d1a2397daa805b0acc965acf85dfdb7297ba6069 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 16 Sep 2016 20:25:51 +0200 +Subject: [PATCH] Fix detection of sqlite3 when cross-compiling + +Replace usage of AC_CHECK_FILE by test -f to check the existence of +sqlite3.c as AC_CHECK_FILE does not work when cross-compiling + +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git configure.ac configure.ac +index f069ccc..0f18f08 100644 +--- configure.ac ++++ configure.ac +@@ -460,16 +460,13 @@ else + + # first we check to see if the sqlite3 amalgamation (sqlite3.c), is in with our source + # this is the prefered way to use sqlite +- AC_CHECK_FILE([sqlite3.c], +- [ ++ if test -f sqlite3.c; then + SQLITE3_SUPPORT="yes" + VIDEO="$VIDEO sqlite3.o" + TEMP_LIBS="$TEMP_LIBS -ldl" + AC_DEFINE([HAVE_SQLITE3],1,[Define to 1 if you have SQLITE3]) + AC_DEFINE([HAVE_SQLITE3_EMBEDDED],1,[Define to 1 if you have SQLITE3 embedded support]) +- ] +- , +- [ ++ else + # if sqlite3.c is not found then we look for the shared library + AC_CHECK_LIB(sqlite3, sqlite3_open, + [ +@@ -478,8 +475,7 @@ else + AC_DEFINE([HAVE_SQLITE3],1,[Define to 1 if you have SQLITE3 shared library support]) + ] + ) +- ] +- ) ++ fi + + CFLAGS=$saved_CFLAGS + LIBS=$saved_LIBS diff --git a/srcpkgs/motion/template b/srcpkgs/motion/template index dfa0e0f2dab..173ab1aac9c 100644 --- a/srcpkgs/motion/template +++ b/srcpkgs/motion/template @@ -1,32 +1,18 @@ -broken="ffmpeg 3.0" - # Template file for 'motion' pkgname=motion -version=3.2.12+20140318 -revision=3 +version=3.4.1 +revision=1 +wrksrc="motion-release-${version}" build_style=gnu-configure -hostmakedepends="automake" -makedepends="v4l-utils-devel zlib-devel" +hostmakedepends="automake pkg-config" +makedepends="v4l-utils-devel zlib-devel ffmpeg-devel" short_desc="A motion detector software" maintainer="Andrea Brancaleoni " license="GPL-2" -homepage="http://www.lavrsen.dk/foswiki/bin/view/Motion/WebHome" -_commit=ad7e243fcaee500f67297305d9235556fb4270b9 -wrksrc="$pkgname-$_commit" -distfiles="https://github.com/sackmotion/motion/archive/${_commit}.tar.gz" -checksum=67e99398f0941012ee909a98673b9473b69780bf3b8a971594fcfa255ed4efeb - -if [ -z "$CROSS_BUILD" ]; then - configure_args="--enable-ffmpeg" - hostmakedepends+=" ffmpeg-devel" - makedepends+=" ffmpeg-devel" -fi +homepage="https://motion-project.github.io/" +distfiles="https://github.com/Motion-Project/motion/archive/release-${version}.tar.gz" +checksum=0d1702c7958fd03b99bf4fdcb45d8e604864e5867034f825f2fc543e8be64549 pre_configure() { autoreconf -fi } - -post_install() { - mv $DESTDIR/usr/share/motion* $DESTDIR/usr/share/motion - mv $DESTDIR/usr/share/doc/motion* $DESTDIR/usr/share/doc/motion -}