Date: Sun, 31 Jan 2021 16:32:30 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563495 - in head: Mk graphics/gstreamer-plugins-opencv multimedia/gstreamer-plugins multimedia/gstreamer1-plugins Message-ID: <202101311632.10VGWUPu032742@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sun Jan 31 16:32:30 2021 New Revision: 563495 URL: https://svnweb.freebsd.org/changeset/ports/563495 Log: graphics/gstreamer*-plugins-opencv: fix fallout form OpenCV-4.5.1 upgrade * graphics/gstreamer-plugins-opencv: disabled, as it uses the no longer shipped OpenCV-1.0 API * graphics/gstreamer1-plugins-opencv: fix the configure script to not only look for OpenCV4 <= 4.2.0 => this will be properly fixed with the next upgrade of gstreamer when switching to the meson build system. PR: 253118 Submitted by: VVD <vvd@unislabs.com> Reported by: rhurlin, fluffy, VVD <vvd@unislabs.com> Modified: head/Mk/bsd.gstreamer.mk head/graphics/gstreamer-plugins-opencv/Makefile head/multimedia/gstreamer-plugins/Makefile.common head/multimedia/gstreamer1-plugins/Makefile Modified: head/Mk/bsd.gstreamer.mk ============================================================================== --- head/Mk/bsd.gstreamer.mk Sun Jan 31 16:31:50 2021 (r563494) +++ head/Mk/bsd.gstreamer.mk Sun Jan 31 16:32:30 2021 (r563495) @@ -93,7 +93,6 @@ _GSTREAMER_PLUGINS= \ musepack \ neon \ ogg \ - opencv \ opus \ pango \ pulse \ @@ -162,6 +161,7 @@ _GSTREAMER_PLUGINS+= \ modplug \ mpg123 \ mplex \ + opencv \ openexr \ openh264 \ openjpeg \ Modified: head/graphics/gstreamer-plugins-opencv/Makefile ============================================================================== --- head/graphics/gstreamer-plugins-opencv/Makefile Sun Jan 31 16:31:50 2021 (r563494) +++ head/graphics/gstreamer-plugins-opencv/Makefile Sun Jan 31 16:32:30 2021 (r563495) @@ -6,6 +6,8 @@ CATEGORIES= graphics COMMENT= Gstreamer opencv real time computer vision plugin +BROKEN= OpenCV4 no longer ships OpenCV-1.0 headers + GST_PLUGIN= opencv MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins Modified: head/multimedia/gstreamer-plugins/Makefile.common ============================================================================== --- head/multimedia/gstreamer-plugins/Makefile.common Sun Jan 31 16:31:50 2021 (r563494) +++ head/multimedia/gstreamer-plugins/Makefile.common Sun Jan 31 16:32:30 2021 (r563495) @@ -49,7 +49,6 @@ BAD_GST_ALL_PLUGINS+= \ nas \ neon \ ofa \ - opencv \ opus \ resindvd \ rsvg \ @@ -414,13 +413,6 @@ gst_ogg_EXTRA_LIBS+= -lgstriff-${VERSION} gst_ogg_PLIST_FILES= ${GST_LIB_DIR}/libgstogg.la \ ${GST_LIB_DIR}/libgstogg.so gst_ogg_DIST= base - -# opencv -gst_opencv_LIB_DEPENDS+=libopencv_highgui.so:graphics/opencv -gst_opencv_CONFIGURE_ENV+= OPENCV_CFLAGS="-I${LOCALBASE}/include/opencv" -gst_opencv_PLIST_FILES= ${GST_LIB_DIR}/libgstopencv.la \ - ${GST_LIB_DIR}/libgstopencv.so -gst_opencv_DIST= bad # opus gst_opus_LIB_DEPENDS+= libopus.so:audio/opus Modified: head/multimedia/gstreamer1-plugins/Makefile ============================================================================== --- head/multimedia/gstreamer1-plugins/Makefile Sun Jan 31 16:31:50 2021 (r563494) +++ head/multimedia/gstreamer1-plugins/Makefile Sun Jan 31 16:32:30 2021 (r563495) @@ -142,6 +142,9 @@ post-patch: # Fix dependency on neon-0.31 ${REINPLACE_CMD} -e '/neon/s|0.30.99|0.31.99|g' \ ${WRKSRC}/configure +# Fix build against OpenCV 4.5.1 + ${REINPLACE_CMD} '/opencv/s|4\.2\.0|4.6.0|g' \ + ${WRKSRC}/configure .endif .if ${DIST} != ugly
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101311632.10VGWUPu032742>