git: daa0efdbe36a - 2023Q1 - multimedia/ffmpeg: drop TENSORFLOW workaround after 56dc0e449f2a

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Sun, 15 Jan 2023 12:28:22 UTC

The branch 2023Q1 has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=daa0efdbe36a7847aa8a231d719dfe50305b55b0

commit daa0efdbe36a7847aa8a231d719dfe50305b55b0
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-01-14 15:27:35 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-01-15 12:28:02 +0000

    multimedia/ffmpeg: drop TENSORFLOW workaround after 56dc0e449f2a
    
    (cherry picked from commit b5cd792b477f5a513548d273b3d31ba5c0e64901)
---
 multimedia/ffmpeg/Makefile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 22e18bacaa20..a85afab9e514 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -80,11 +80,6 @@ OPTIONS_EXCLUDE+=	KLVANC
 OPTIONS_EXCLUDE+=	OPENVINO
 .endif
 
-.if !exists(${.CURDIR:H:H}/science/tensorflow)
-# https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/d8c0bbb0aa4
-OPTIONS_EXCLUDE+=	TENSORFLOW
-.endif
-
 OPTIONS_RADIO=	RTMP SSL
 OPTIONS_RADIO_RTMP=	GCRYPT GMP LIBRTMP
 OPTIONS_RADIO_SSL=	GNUTLS MBEDTLS OPENSSL
@@ -490,7 +485,7 @@ SVTVP9_PATCHFILES=	master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:s
 .endif
 
 # tensorflow
-TENSORFLOW_LIB_DEPENDS=	libtensorflow.so:science/tensorflow
+TENSORFLOW_LIB_DEPENDS=	libtensorflow.so:science/py-tensorflow
 TENSORFLOW_CONFIGURE_ENABLE=	libtensorflow
 
 # tesseract