From 890f8c0999554cdbf8cadca43ff1a8ea58869711 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Thu, 26 Oct 2017 11:56:17 +0300 Subject: [PATCH] delete unnecessary motion mmal patch --- .../motion/0002-mmal-configure-paths.patch | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 package/motion/0002-mmal-configure-paths.patch diff --git a/package/motion/0002-mmal-configure-paths.patch b/package/motion/0002-mmal-configure-paths.patch deleted file mode 100644 index c7ed50250a..0000000000 --- a/package/motion/0002-mmal-configure-paths.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index f14974d..368ab28 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -381,12 +381,32 @@ AS_HELP_STRING([--without-mmal], - WITHOUT_MMAL="yes", - WITHOUT_MMAL="no") - -+AC_ARG_WITH(mmal-lib, -+[ --with-mmal-lib[=DIR] Use this command to tell configure where mmal libs -+ installation root directory is. -+ ], -+MMAL_LIBS_DIR="$withval" -+# if not given argument, assume standard -+) -+ -+AC_ARG_WITH(mmal-include, -+[ --with-mmal-include[=DIR] Use this command to tell configure where mmal include -+ installation root directory is. -+ ], -+MMAL_HEADERS="$withval" -+# if not given argument, assume standard -+) -+ - if test "${WITHOUT_MMAL}" = "no"; then - HAVE_MMAL="" - LIBRASPBERRYPIDEVPATH="/opt/vc/include/interface/mmal" - - if test -d ${LIBRASPBERRYPIDEVPATH}; then - HAVE_MMAL="yes" -+ MMAL_HEADERS="/opt/vc/include" -+ MMAL_LIBS_DIR="/opt/vc/lib" -+ elif test -d ${MMAL_HEADERS}/interface/mmal; then -+ HAVE_MMAL="yes" - fi - - AS_IF([test "${HAVE_MMAL}" = "yes" ], [ -@@ -394,8 +414,8 @@ if test "${WITHOUT_MMAL}" = "no"; then - AC_SUBST(MMAL_OBJ) - AC_SUBST(MMAL_LIBS) - MMAL_OBJ="mmalcam.o raspicam/RaspiCamControl.o raspicam/RaspiCLI.o" -- MMAL_CFLAGS="-std=gnu99 -DHAVE_MMAL -Irasppicam -I/opt/vc/include" -- MMAL_LIBS="-L/opt/vc/lib -lmmal_core -lmmal_util -lmmal_vc_client -lvcos -lvchostif -lvchiq_arm" -+ MMAL_CFLAGS="-std=gnu99 -DHAVE_MMAL -Irasppicam -I${MMAL_HEADERS}" -+ MMAL_LIBS="-L${MMAL_LIBS_DIR} -lmmal_core -lmmal_util -lmmal_vc_client -lvcos -lvchostif -lvchiq_arm" - AC_DEFINE([HAVE_MMAL], 1, [Define to 1 if we want MMAL]) - ]) - fi