From 802eb1361871969c3e071706a635c116b2789d75 Mon Sep 17 00:00:00 2001 From: Max Brazhnikov Date: Wed, 2 Oct 2019 08:19:18 +0000 Subject: [PATCH] graphics/openimageio: - Depend on x11-fonts/droid-fonts-ttf instead of installing own copies: Droid fonts shipped with openimageio don't have Cyrillic symbols. For some reason LibreOffice picks up Droid fonts from openimageio and this breaks LibreOffice UI for non-Latin locales. PR: 240963 Approved by: maintainer --- graphics/openimageio/Makefile | 6 +++--- graphics/openimageio/pkg-plist | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index f887e572aef0..67c2e04014c6 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -4,7 +4,7 @@ PORTNAME= openimageio DISTVERSIONPREFIX= Release- DISTVERSION= 2.0.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES?= graphics multimedia MAINTAINER?= FreeBSD@Shaneware.biz @@ -30,7 +30,7 @@ GH_PROJECT= oiio CONFLICTS= fbm-[0-9]* CMAKE_ARGS= USE_CPP:STRING=11 -CMAKE_OFF= BUILDSTATIC LINKSTATIC NOTHREADS STOP_ON_WARNING USE_OPENSSL +CMAKE_OFF= BUILDSTATIC INSTALL_FONTS LINKSTATIC NOTHREADS STOP_ON_WARNING USE_OPENSSL OPTIONS_DEFINE= DICOM DOCS FFMPEG FREETYPE GIF IMAGEVIEWER OCIO \ OPENCV OPENJPEG RAW TBB TEST TOOLS VDB @@ -49,8 +49,8 @@ FFMPEG_CMAKE_BOOL= USE_FFMPEG FFMPEG_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg FREETYPE_CMAKE_BOOL= USE_FREETYPE -FREETYPE_CMAKE_ON= -DFONTS_INSTALL_DIR:STRING=share/fonts/oiio_dev FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 +FREETYPE_RUN_DEPENDS= ${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:x11-fonts/droid-fonts-ttf GIF_CMAKE_BOOL= USE_GIF GIF_LIB_DEPENDS= libgif.so:graphics/giflib diff --git a/graphics/openimageio/pkg-plist b/graphics/openimageio/pkg-plist index 0744ad6ec66c..d864ce8225f1 100644 --- a/graphics/openimageio/pkg-plist +++ b/graphics/openimageio/pkg-plist @@ -71,13 +71,6 @@ lib/libOpenImageIO_Util.so.2.0 lib/libOpenImageIO_Util.so.%%LIBVERS%% libdata/pkgconfig/OpenImageIO.pc share/cmake/Modules/FindOpenImageIO.cmake -%%FREETYPE%%share/fonts/OpenImageIO/DroidSans-Bold.ttf -%%FREETYPE%%share/fonts/OpenImageIO/DroidSans.ttf -%%FREETYPE%%share/fonts/OpenImageIO/DroidSansMono.ttf -%%FREETYPE%%share/fonts/OpenImageIO/DroidSerif-Bold.ttf -%%FREETYPE%%share/fonts/OpenImageIO/DroidSerif-BoldItalic.ttf -%%FREETYPE%%share/fonts/OpenImageIO/DroidSerif-Italic.ttf -%%FREETYPE%%share/fonts/OpenImageIO/DroidSerif.ttf %%PORTDOCS%%%%DOCSDIR%%/CHANGES.md %%PORTDOCS%%%%DOCSDIR%%/CHANGES-0.x.md %%PORTDOCS%%%%DOCSDIR%%/CHANGES-1.x.md