Fri Apr 10 02:53:20 2015 UTC ()
New ZoneMinder supports the newer ffmpeg APIs, so switch the ffmpeg
dependency from ffmpeg010 to ffmpeg2.


(dsainty)
diff -r1.15 -r1.16 pkgsrc/security/zoneminder/Makefile
cvs diff -r1.15 -r1.16 pkgsrc/security/zoneminder/Makefile (expand / switch to unified diff)

--- pkgsrc/security/zoneminder/Makefile 2015/04/07 12:32:59 1.15
+++ pkgsrc/security/zoneminder/Makefile 2015/04/10 02:53:20 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.15 2015/04/07 12:32:59 dsainty Exp $ 1# $NetBSD: Makefile,v 1.16 2015/04/10 02:53:20 dsainty Exp $
2 2
3PKGNAME= ${DISTNAME:S/ZoneMinder-/zoneminder-/} 3PKGNAME= ${DISTNAME:S/ZoneMinder-/zoneminder-/}
4DISTNAME= ZoneMinder-1.28.1 4DISTNAME= ZoneMinder-1.28.1
5CATEGORIES= security 5CATEGORIES= security
6MASTER_SITES= ${MASTER_SITE_GITHUB:=ZoneMinder/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=ZoneMinder/}
7GITHUB_PROJECT= ZoneMinder 7GITHUB_PROJECT= ZoneMinder
8GITHUB_TYPE= tag 8GITHUB_TYPE= tag
9GITHUB_TAG= v${PKGVERSION_NOREV} 9GITHUB_TAG= v${PKGVERSION_NOREV}
10 10
11MAINTAINER= dsainty@NetBSD.org 11MAINTAINER= dsainty@NetBSD.org
12HOMEPAGE= http://www.zoneminder.com/ 12HOMEPAGE= http://www.zoneminder.com/
13COMMENT= Video camera security and surveillance solution 13COMMENT= Video camera security and surveillance solution
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
@@ -60,29 +60,29 @@ CONFIGURE_ARGS+= --with-cgidir=${PREFIX} @@ -60,29 +60,29 @@ CONFIGURE_ARGS+= --with-cgidir=${PREFIX}
60CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client} 60CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client}
61CONFIGURE_ARGS+= --localstatedir=${VARBASE} 61CONFIGURE_ARGS+= --localstatedir=${VARBASE}
62 62
63# PolicyKit doesn't actually seem to be necessary. This hack disables 63# PolicyKit doesn't actually seem to be necessary. This hack disables
64# configure's hunt for PolicyKit, but has no other apparent ill effects. 64# configure's hunt for PolicyKit, but has no other apparent ill effects.
65CONFIGURE_ENV+= POLKIT_CFLAGS=" " POLKIT_LIBS=" " 65CONFIGURE_ENV+= POLKIT_CFLAGS=" " POLKIT_LIBS=" "
66 66
67PTHREAD_AUTO_VARS= yes 67PTHREAD_AUTO_VARS= yes
68.include "../../mk/pthread.buildlink3.mk" 68.include "../../mk/pthread.buildlink3.mk"
69 69
70CONFIGURE_ENV+= OPT_NETPBM=yes 70CONFIGURE_ENV+= OPT_NETPBM=yes
71CONFIGURE_ENV+= PATH_NETPBM=${PREFIX}/bin/pnmscale 71CONFIGURE_ENV+= PATH_NETPBM=${PREFIX}/bin/pnmscale
72 72
73.include "../../multimedia/ffmpeg010/buildlink3.mk" 73.include "../../multimedia/ffmpeg2/buildlink3.mk"
74CONFIGURE_ARGS+= --with-ffmpeg=${BUILDLINK_PREFIX.ffmpeg010} 74CONFIGURE_ARGS+= --with-ffmpeg=${BUILDLINK_PREFIX.ffmpeg2}
75CONFIGURE_ENV+= PATH_FFMPEG=${BUILDLINK_PREFIX.ffmpeg010}/bin/ffmpeg010 75CONFIGURE_ENV+= PATH_FFMPEG=${BUILDLINK_PREFIX.ffmpeg2}/bin/ffmpeg2
76CONFIGURE_ENV+= OPT_FFMPEG=yes 76CONFIGURE_ENV+= OPT_FFMPEG=yes
77 77
78# The backtrace requires Linux's unportable <execinfo.h> header. 78# The backtrace requires Linux's unportable <execinfo.h> header.
79CONFIGURE_ARGS+= --enable-crashtrace=no 79CONFIGURE_ARGS+= --enable-crashtrace=no
80 80
81# Need Perl Sys::Mmap module for (default) mmap support. 81# Need Perl Sys::Mmap module for (default) mmap support.
82CONFIGURE_ARGS+= --enable-mmap=no 82CONFIGURE_ARGS+= --enable-mmap=no
83 83
84# This is somewhat awkward. ffmpeg's libavformat/avformat.h requires 84# This is somewhat awkward. ffmpeg's libavformat/avformat.h requires
85# constant macros from stdint.h, but these are only defined under C++ if 85# constant macros from stdint.h, but these are only defined under C++ if
86# __STDC_CONSTANT_MACROS is requested, so we have to do that on behalf 86# __STDC_CONSTANT_MACROS is requested, so we have to do that on behalf
87# of ffmpeg. Failure to do so causes configure time failures, and 87# of ffmpeg. Failure to do so causes configure time failures, and
88# build failures complaining about UINT64_C not being defined. 88# build failures complaining about UINT64_C not being defined.