pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

zoneminder: Switch to ffmpeg6



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sun Jan 14 17:08:14 2024 -0500
Changeset:	aa10390ff2563acb7418c6f62687a6976466b82c

Modified Files:
	zoneminder/Makefile

Log Message:
zoneminder: Switch to ffmpeg6

 - add libswresample args
 - stop substituting perl paths because upstream does it right now

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=aa10390ff2563acb7418c6f62687a6976466b82c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zoneminder/Makefile | 30 ++++--------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diffs:
diff --git a/zoneminder/Makefile b/zoneminder/Makefile
index 6dd1f6ed78..06361e5fb7 100644
--- a/zoneminder/Makefile
+++ b/zoneminder/Makefile
@@ -117,17 +117,15 @@ OWN_DIRS_PERMS+=	${ZM_CONTENT}/images ${APACHE_USER} ${APACHE_GROUP} 775
 PTHREAD_AUTO_VARS=	yes
 .include "../../mk/pthread.buildlink3.mk"
 
-# This should probably be ffmpeg4 at least.
-# \todo Try higher versions with 1.32.
-.include "../../multimedia/ffmpeg2/buildlink3.mk"
+.include "../../multimedia/ffmpeg6/buildlink3.mk"
 .if ${OPSYS} == "Darwin"
 SOEXT=	dylib
 .else
 SOEXT=	so
 .endif
-.for lib in AVFORMAT AVCODEC AVDEVICE AVUTIL SWSCALE
-CMAKE_ARGS+=	-D${lib}_INCLUDE_DIR=${BUILDLINK_PREFIX.ffmpeg2}/include/ffmpeg2
-CMAKE_ARGS+=	-D${lib}_LIBRARIES=${BUILDLINK_PREFIX.ffmpeg2}/lib/ffmpeg2/lib${lib:tl}.${SOEXT}
+.for lib in AVFORMAT AVCODEC AVDEVICE AVUTIL SWSCALE SWRESAMPLE
+CMAKE_ARGS+=	-D${lib}_INCLUDE_DIR=${BUILDLINK_PREFIX.ffmpeg6}/include/ffmpeg6
+CMAKE_ARGS+=	-D${lib}_LIBRARIES=${BUILDLINK_PREFIX.ffmpeg6}/lib/ffmpeg6/lib${lib:tl}.${SOEXT}
 .endfor
 # This is somewhat awkward.  ffmpeg's libavformat/avformat.h requires
 # constant macros from stdint.h, but these are only defined under C++ if
@@ -199,26 +197,6 @@ DEPENDS+=	p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
 DEPENDS+=	p5-Number-Bytes-Human-[0-9]*:../../textproc/p5-Number-Bytes-Human
 DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
 
-# All perl scripts need interpreter patching (REPLACE_PERL), while a large
-# subset also need an include PATH line modified (ZM_REPLACE_PERL).
-ZM_REPLACE_PERL+=	scripts/zmaudit.pl.in
-ZM_REPLACE_PERL+=	scripts/zmcamtool.pl.in
-ZM_REPLACE_PERL+=	scripts/zmcontrol.pl.in
-ZM_REPLACE_PERL+=	scripts/zmdc.pl.in
-ZM_REPLACE_PERL+=	scripts/zmfilter.pl.in
-REPLACE_PERL+=		scripts/zmonvif-probe.pl.in
-ZM_REPLACE_PERL+=	scripts/zmpkg.pl.in
-ZM_REPLACE_PERL+=	scripts/zmstats.pl.in
-REPLACE_PERL+=		scripts/zmsystemctl.pl.in
-ZM_REPLACE_PERL+=	scripts/zmtelemetry.pl.in
-ZM_REPLACE_PERL+=	scripts/zmtrack.pl.in
-ZM_REPLACE_PERL+=	scripts/zmtrigger.pl.in
-ZM_REPLACE_PERL+=	scripts/zmupdate.pl.in
-ZM_REPLACE_PERL+=	scripts/zmvideo.pl.in
-ZM_REPLACE_PERL+=	scripts/zmwatch.pl.in
-ZM_REPLACE_PERL+=	scripts/zmx10.pl.in
-REPLACE_PERL+=		${ZM_REPLACE_PERL}
-
 # \todo Still necessary?
 # SUBST_CLASSES+=			systemd-perl
 # SUBST_MESSAGE.systemd-perl=	Adjusting systemd pkexec perl.


Home | Main Index | Thread Index | Old Index