svn commit: r342178 - in branches/2014Q1/multimedia/motion: . files
Thomas Zander
riggs at FreeBSD.org
Sat Feb 1 16:01:15 UTC 2014
Author: riggs
Date: Sat Feb 1 16:01:14 2014
New Revision: 342178
URL: http://svnweb.freebsd.org/changeset/ports/342178
QAT: https://qat.redports.org/buildarchive/r342178/
Log:
MFH: r342064
- Un-break port
- Stage support
- Replace USE_GMAKE by USES
- New format for LIB_DEPENDS
- Use /boot/modules via KMODDIR as in other ports
PR: ports/184406
Submitted by: Ildar Hizbulin <hizel at vyborg.ru>
Approved by: portmgr (implicit), co-mentor (jadawin)
Deleted:
branches/2014Q1/multimedia/motion/files/patch-ffmpeg.c
Modified:
branches/2014Q1/multimedia/motion/Makefile
branches/2014Q1/multimedia/motion/files/patch-configure.in
branches/2014Q1/multimedia/motion/pkg-plist
Directory Properties:
branches/2014Q1/ (props changed)
Modified: branches/2014Q1/multimedia/motion/Makefile
==============================================================================
--- branches/2014Q1/multimedia/motion/Makefile Sat Feb 1 15:54:44 2014 (r342177)
+++ branches/2014Q1/multimedia/motion/Makefile Sat Feb 1 16:01:14 2014 (r342178)
@@ -3,18 +3,16 @@
PORTNAME= motion
PORTVERSION= 3.2.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20-%20${PORTVERSION:R}/${PORTVERSION}
MAINTAINER= ports at FreeBSD.org
COMMENT= Motion detection application
-BROKEN= Fails to build
-
LICENSE= GPLv2
-LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg
OPTIONS_DEFINE= FFMPEG MYSQL PGSQL DOCS EXAMPLES
OPTIONS_SINGLE= VIDEO
@@ -24,31 +22,30 @@ VIDEO_DESC= Video capture driver. Choose
BKTR_DESC= BKTR based TV capture cards
PWCBSD_DESC= PWCBSD based Webcams
-USE_GMAKE= yes
+USES= gmake
USE_AUTOTOOLS= autoconf
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-MAN1= motion.1
PORTDOCS= CHANGELOG CREDITS README README.FreeBSD \
motion_guide.html
PORTEXAMPLES= motion-dist.conf thread1.conf thread2.conf \
thread3.conf thread4.conf
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MBKTR}
CONFIGURE_ARGS+=--with-bktr
-CFLAGS+= -DWITHOUT_V4L
.else
CONFIGURE_ARGS+=--without-bktr
.endif
.if ${PORT_OPTIONS:MPWCBSD}
+# Location /boot/modules is hard coded in the pwc port, so use it here too
+KMODDIR= /boot/modules
BUILD_DEPENDS+= v4l_compat>=1.0.20060801:${PORTSDIR}/multimedia/v4l_compat
-RUN_DEPENDS+= /boot/modules/pwc.ko:${PORTSDIR}/multimedia/pwcbsd
+RUN_DEPENDS+= ${KMODDIR}/pwc.ko:${PORTSDIR}/multimedia/pwcbsd
CONFIGURE_ARGS+=--with-pwcbsd
CFLAGS+= -DWITHOUT_V4L
.else
@@ -58,7 +55,7 @@ CONFIGURE_ARGS+=--without-pwcbsd
CONFIGURE_ARGS+=--without-linuxthreads
.if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+= avformat:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+= libavformat0.so:${PORTSDIR}/multimedia/ffmpeg0
CONFIGURE_ARGS+=--with-ffmpeg=${LOCALBASE}
.else
CONFIGURE_ARGS+=--without-ffmpeg
@@ -94,26 +91,26 @@ post-patch:
's|jpeg_mem_dest|local_jpeg_mem_dest|' ${WRKSRC}/picture.c
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/motion ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/motion.1 ${MANPREFIX}/man/man1
+ ${INSTALL_PROGRAM} ${WRKSRC}/motion ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/motion.1 ${STAGEDIR}${MANPREFIX}/man/man1
${INSTALL_SCRIPT} ${WRKSRC}/motion.init-FreeBSD.sh \
- ${PREFIX}/etc/rc.d/motion
+ ${STAGEDIR}${PREFIX}/etc/rc.d/motion
${INSTALL_DATA} ${WRKSRC}/motion-dist.conf \
- ${PREFIX}/etc/motion.conf.sample
-.if !exists(${PREFIX}/etc/motion.conf)
- ${INSTALL_DATA} ${PREFIX}/etc/motion.conf.sample \
- ${PREFIX}/etc/motion.conf
+ ${STAGEDIR}${PREFIX}/etc/motion.conf.sample
+.if !exists(${STAGEDIR}${PREFIX}/etc/motion.conf)
+ ${INSTALL_DATA} ${STAGEDIR}${PREFIX}/etc/motion.conf.sample \
+ ${STAGEDIR}${PREFIX}/etc/motion.conf
.endif
.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
.for f in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
.endfor
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
- @${MKDIR} ${EXAMPLESDIR}
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
.for f in ${PORTEXAMPLES}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${EXAMPLESDIR}
.endfor
.endif
Modified: branches/2014Q1/multimedia/motion/files/patch-configure.in
==============================================================================
--- branches/2014Q1/multimedia/motion/files/patch-configure.in Sat Feb 1 15:54:44 2014 (r342177)
+++ branches/2014Q1/multimedia/motion/files/patch-configure.in Sat Feb 1 16:01:14 2014 (r342178)
@@ -1,5 +1,5 @@
---- configure.in.orig 2010-06-01 15:48:23.000000000 +0900
-+++ configure.in 2012-06-08 23:21:55.000000000 +0900
+--- configure.in.orig 2010-06-01 10:48:23.000000000 +0400
++++ configure.in 2013-12-01 13:32:23.000000000 +0400
@@ -316,7 +316,7 @@
#
else if test "${FFMPEG_DIR}" = "yes"; then
@@ -9,62 +9,70 @@
if test -f /usr/lib64/libavcodec.a -o -f /usr/lib64/libavcodec.so && test -f /usr/lib64/libavformat.a -o -f /usr/lib64/libavformat.so ; then
AC_MSG_RESULT(found in /usr/lib64)
-@@ -347,7 +347,7 @@
+@@ -347,11 +347,11 @@
echo ""
fi
else
- AC_MSG_CHECKING(for ffmpeg in -> [${FFMPEG_DIR}] <-)
+- if test -f ${FFMPEG_DIR}/lib/libavcodec.a -o -f ${FFMPEG_DIR}/lib/libavcodec.so && test -f ${FFMPEG_DIR}/lib/libavformat.a -o -f ${FFMPEG_DIR}/lib/libavformat.so ; then
+ AC_MSG_CHECKING(for ffmpeg libraries in -> [${FFMPEG_DIR}] <-)
- if test -f ${FFMPEG_DIR}/lib/libavcodec.a -o -f ${FFMPEG_DIR}/lib/libavcodec.so && test -f ${FFMPEG_DIR}/lib/libavformat.a -o -f ${FFMPEG_DIR}/lib/libavformat.so ; then
++ if test -f ${FFMPEG_DIR}/lib/ffmpeg0/libavcodec0.a -o -f ${FFMPEG_DIR}/lib/ffmpeg0/libavcodec0.so && test -f ${FFMPEG_DIR}/lib/ffmpeg0/libavformat0.a -o -f ${FFMPEG_DIR}/lib/ffmpeg0/libavformat0.so ; then
AC_MSG_RESULT(found)
FFMPEG_OK="found"
-@@ -392,9 +392,11 @@
- elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then
- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/libavformat/avformat.h)
- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES"
-+ AVFORMAT="-I${FFMPEG_DIR}/include/libavformat"
- elif test -f ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h; then
- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h)
- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg -DFFMPEG_NEW_INCLUDES"
-+ AVFORMAT="-I${FFMPEG_DIR}/include/ffmpeg/libavformat"
+- FFMPEG_LIB="${FFMPEG_DIR}/lib"
++ FFMPEG_LIB="${FFMPEG_DIR}/lib/ffmpeg0"
+ elif test -f ${FFMPEG_DIR}/libavcodec.a -o -f ${FFMPEG_DIR}/libavcodec.so && test -f ${FFMPEG_DIR}/libavformat.a -o -f ${FFMPEG_DIR}/libavformat.so ; then
+ AC_MSG_RESULT(found)
+ FFMPEG_LIB="${FFMPEG_DIR}"
+@@ -389,12 +389,12 @@
+ elif test -f ${FFMPEG_DIR}/include/ffmpeg/avformat.h; then
+ AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/avformat.h)
+ FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg"
+- elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then
+- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/libavformat/avformat.h)
+- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES"
+- elif test -f ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h; then
+- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h)
+- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg -DFFMPEG_NEW_INCLUDES"
++# elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then
++# AC_MSG_RESULT(found ${FFMPEG_DIR}/include/libavformat/avformat.h)
++# FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES"
++ elif test -f ${FFMPEG_DIR}/include/ffmpeg0/libavformat/avformat.h; then
++ AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg0/libavformat/avformat.h)
++ FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg0 -DFFMPEG_NEW_INCLUDES"
else
AC_MSG_RESULT(not found)
FFMPEG_OK="no_found"
-@@ -423,9 +425,11 @@
- AC_MSG_CHECKING([file_protocol is defined in ffmpeg ?])
- saved_CFLAGS=$CFLAGS
- saved_LIBS=$LIBS
-- CFLAGS="${FFMPEG_CFLAGS}"
-+
-+
-+ CFLAGS="${FFMPEG_CFLAGS} ${AVFORMAT}"
- LIBS="$TEMP_LIBS"
--
-+
- AC_COMPILE_IFELSE(
- [
- #include <avformat.h>
-@@ -442,7 +446,8 @@
- ]
- )
- CFLAGS=$saved_CFLAGS
-- LIBS=$saved_LIBS
-+ LIBS=$saved_LIBS
-+
- fi
- fi
- fi
-@@ -1067,6 +1072,13 @@
+@@ -413,9 +413,9 @@
+ #
+
+ if test "${FFMPEG_OK}" = "found"; then
+- TEMP_LIBS="$TEMP_LIBS -L${FFMPEG_LIB} -lavformat -lavcodec -lavutil -lm -lz"
++ TEMP_LIBS="$TEMP_LIBS -L${FFMPEG_LIB} -lavformat0 -lavcodec0 -lavutil0 -lm -lz"
+ TEMP_LDFLAGS="${TEMP_LDFLAGS} -L${FFMPEG_LIB}"
+- TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG ${FFMPEG_CFLAGS}"
++ TEMP_CFLAGS="-DHAVE_FFMPEG ${FFMPEG_CFLAGS} ${TEMP_CFLAGS}"
+
+ FFMPEG_OBJ="ffmpeg.o"
+ AC_SUBST(FFMPEG_OBJ)
+@@ -751,7 +751,7 @@
+ if test "${V4L}" = "no"; then
+ AC_MSG_CHECKING(for V42L support)
+ AC_MSG_RESULT(skipping)
+-else
++elif test "${BKTR}" = "no"; then
+ AC_CHECK_TYPE([struct v4l2_buffer],
+ [SUPPORTED_V4L2=true],
+ [SUPPORTED_V4L2=false],
+@@ -1067,6 +1067,11 @@
LIBS="${TEMP_LIBS}"
LDFLAGS="${TEMP_LDFLAGS}"
-+
+AC_CHECK_FUNC(avformat_alloc_context, AC_DEFINE([have_avformat_alloc_context],1,[Define to 1 if you have avformat_alloc_context support]))
+AC_CHECK_FUNC(av_avformat_alloc_context, AC_DEFINE([have_av_avformat_alloc_context],1,[Define to 1 if you have av_avformat_alloc_context support]))
+AC_CHECK_FUNC(av_register_protocol2, AC_DEFINE([have_av_register_protocol2],1,[Define to 1 if you have av_register_protocol2 support]))
+AC_CHECK_FUNC(av_register_protocol, AC_DEFINE([have_av_register_protocol],1,[Define to 1 if you have av_register_protocol support]))
+
-+
#
# Add the right exec path for rc scripts
#
Modified: branches/2014Q1/multimedia/motion/pkg-plist
==============================================================================
--- branches/2014Q1/multimedia/motion/pkg-plist Sat Feb 1 15:54:44 2014 (r342177)
+++ branches/2014Q1/multimedia/motion/pkg-plist Sat Feb 1 16:01:14 2014 (r342178)
@@ -1,4 +1,5 @@
bin/motion
+man/man1/motion.1.gz
@unexec if cmp -s %D/etc/motion.conf %D/etc/motion.conf.sample; then rm -f %D/etc/motion.conf; fi
etc/motion.conf.sample
@exec [ -f %B/motion.conf ] || cp %B/%f %B/motion.conf
More information about the svn-ports-all
mailing list