timg: Cleanup package options (add ffmpeg, rename turbojpeg)

[Michael-John Turner <mj%mjturner.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael-John Turner <mj%mjturner.net@localhost>
Pushed By:	mj
Date:		Sun Aug 8 13:03:55 2021 +0100
Changeset:	6ce6f5482aeadeaf05de089fc685c49f54fbfde2

Modified Files:
	timg/Makefile
	timg/options.mk

Log Message:
timg: Cleanup package options (add ffmpeg, rename turbojpeg)

o Add ffmpeg option
o Rename turbojpeg to jpegturbo

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

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

diffstat:
 timg/Makefile   |  2 --
 timg/options.mk | 21 +++++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diffs:
diff --git a/timg/Makefile b/timg/Makefile
index 7f25af8d06..95bec89f0e 100644
--- a/timg/Makefile
+++ b/timg/Makefile
@@ -17,7 +17,6 @@ WRKSRC=		${WRKDIR}/timg-1.4.2
 USE_TOOLS=	cmake pkg-config
 USE_CMAKE=	yes
 USE_LANGUAGES=	c++
-CMAKE_ARGS+=	-DWITH_TURBOJPEG=OFF
 CMAKE_ARGS+=	-DTIMG_VERSION_FROM_GIT=OFF
 CMAKE_ARGS+=	-DWITH_OPENSLIDE_SUPPORT=OFF
 
@@ -28,5 +27,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/timg.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/timg/options.mk b/timg/options.mk
index 1b0dffc980..839d6f57ce 100644
--- a/timg/options.mk
+++ b/timg/options.mk
@@ -1,17 +1,30 @@
 # $NetBSD$
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.timg
-PKG_SUPPORTED_OPTIONS+=	graphicsmagick turbojpeg
+PKG_SUPPORTED_OPTIONS+=	ffmpeg graphicsmagick jpegturbo
 
-PKG_SUGGESTED_OPTIONS=	graphicsmagick
+PKG_SUGGESTED_OPTIONS=	ffmpeg graphicsmagick
 
 .include "../../mk/bsd.options.mk"
 
+###
+### Use ffmpeg
+###
+.if !empty(PKG_OPTIONS:Mffmpeg)
+CMAKE_ARGS+= 	-DWITH_VIDEO_DECODING=ON
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
+.else
+CMAKE_ARGS+= 	-DWITH_VIDEO_DECODING=OFF
+.endif
+
 ###
 ### Use GraphicsMagick
 ###
 .if !empty(PKG_OPTIONS:Mgraphicsmagick)
+CMAKE_ARGS+= 	-DWITH_GRAPHICSMAGICK=ON
 .include "../../graphics/GraphicsMagick/buildlink3.mk"
+.else
+CMAKE_ARGS+= 	-DWITH_GRAPHICSMAGICK=OFF
 .endif
 
 ###
@@ -24,10 +37,10 @@ PKG_SUGGESTED_OPTIONS=	graphicsmagick
 #.endif
 
 ###
-### Use turbojpeg
+### Use libjpeg-turbo
 ### Not enabled by default as it conflicts with graphics/jpeg
 ###
-.if !empty(PKG_OPTIONS:Mturbojpeg)
+.if !empty(PKG_OPTIONS:Mjpegturbo)
 CMAKE_ARGS+= 	-DWITH_TURBOJPEG=ON
 .include "../../graphics/libjpeg-turbo/buildlink3.mk"
 .else