Page MenuHomeFreeBSD
Files F151721004

D13132.diff
No OneTemporary
Actions

D13132.diff
View Options

Index: head/editors/calligra/Makefile
===================================================================
--- head/editors/calligra/Makefile
+++ head/editors/calligra/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= calligra
PORTVERSION= 3.0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= editors kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}
DIST_SUBDIR= KDE/${PORTNAME}
@@ -14,8 +14,7 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE office suite
-LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \
- libImath-2_2.so:graphics/ilmbase \
+LIB_DEPENDS= libImath-2_2.so:graphics/ilmbase \
libKPropertyCore3.so:x11-toolkits/kproperty \
libKReport3.so:textproc/kreport \
libboost_thread.so:devel/boost-libs \
@@ -57,6 +56,11 @@
quick script sql svg testlib webkit widgets x11extras xml
USE_XORG= ice sm x11 xext
USE_LDCONFIG= yes
+
+OPTIONS_DEFINE= OPENEXR
+OPTIONS_DEFAULT= OPENEXR
+
+OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
CMAKE_ARGS= -DCMAKE_INCLUDE_PATH:STRING="${QT_INCDIR} ${LOCALBASE}/include" \
-DPRODUCTSET:STRING="DESKTOP"
Index: head/graphics/kf5-kimageformats/Makefile
===================================================================
--- head/graphics/kf5-kimageformats/Makefile
+++ head/graphics/kf5-kimageformats/Makefile
@@ -2,16 +2,23 @@
PORTNAME= kimageformats
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= graphics kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
COMMENT= KF5 library providing support for additional image formats
-LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \
- libHalf.so:graphics/ilmbase
+LIB_DEPENDS= libHalf.so:graphics/ilmbase
USES= cmake:outsource compiler:c++11-lib kde:5 pkgconfig tar:xz
USE_KDE= archive ecm
USE_QT5= buildtools_build core gui printsupport qmake_build widgets
+
+OPTIONS_DEFINE= OPENEXR
+OPTIONS_DEFAULT= OPENEXR
+OPTIONS_SUB= yes
+
+OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
+OPENEXR_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
.include <bsd.port.mk>
Index: head/graphics/kf5-kimageformats/pkg-plist
===================================================================
--- head/graphics/kf5-kimageformats/pkg-plist
+++ head/graphics/kf5-kimageformats/pkg-plist
@@ -1,5 +1,5 @@
%%QT_PLUGINDIR%%/imageformats/kimg_eps.so
-%%QT_PLUGINDIR%%/imageformats/kimg_exr.so
+%%OPENEXR%%%%QT_PLUGINDIR%%/imageformats/kimg_exr.so
%%QT_PLUGINDIR%%/imageformats/kimg_kra.so
%%QT_PLUGINDIR%%/imageformats/kimg_ora.so
%%QT_PLUGINDIR%%/imageformats/kimg_pcx.so
@@ -11,7 +11,7 @@
%%QT_PLUGINDIR%%/imageformats/kimg_xcf.so
share/kservices5/qimageioplugins/dds.desktop
share/kservices5/qimageioplugins/eps.desktop
-share/kservices5/qimageioplugins/exr.desktop
+%%OPENEXR%%share/kservices5/qimageioplugins/exr.desktop
share/kservices5/qimageioplugins/jp2.desktop
share/kservices5/qimageioplugins/kra.desktop
share/kservices5/qimageioplugins/ora.desktop
Index: head/graphics/krita/Makefile
===================================================================
--- head/graphics/krita/Makefile
+++ head/graphics/krita/Makefile
@@ -2,7 +2,7 @@
PORTNAME= krita
PORTVERSION= 3.1.2.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics kde
MASTER_SITES= KDE/stable/${PORTNAME}/3.1.2
DIST_SUBDIR= KDE/${PORTNAME}
@@ -14,8 +14,7 @@
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3
-LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \
- libImath.so:graphics/ilmbase \
+LIB_DEPENDS= libImath.so:graphics/ilmbase \
libOpenColorIO.so:graphics/opencolorio \
libX11.so:x11/libX11 \
libboost_system.so:devel/boost-libs \
@@ -39,11 +38,15 @@
qmake_build quick svg testlib widgets x11extras xml
USE_XORG= ice sm xcb xext xi
-OPTIONS_DEFINE= GMIC
+OPTIONS_DEFINE= GMIC OPENEXR
+OPTIONS_DEFAULT= OPENEXR
OPTIONS_SUB= yes
GMIC_DESC= Build the G'Mic plugin
GMIC_CMAKE_BOOL= WITH_GMIC
+
+OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
+OPENEXR_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
CONFLICTS_INSTALL= calligra-2*
Index: head/graphics/krita/pkg-plist
===================================================================
--- head/graphics/krita/pkg-plist
+++ head/graphics/krita/pkg-plist
@@ -45,8 +45,8 @@
lib/kritaplugins/kritaembossfilter.so
lib/kritaplugins/kritaexample.so
lib/kritaplugins/kritaexperimentpaintop.so
-lib/kritaplugins/kritaexrexport.so
-lib/kritaplugins/kritaexrimport.so
+%%OPENEXR%%lib/kritaplugins/kritaexrexport.so
+%%OPENEXR%%lib/kritaplugins/kritaexrimport.so
lib/kritaplugins/kritaextensioncolorsfilters.so
lib/kritaplugins/kritafastcolortransferfilter.so
lib/kritaplugins/kritafilterop.so
@@ -203,7 +203,7 @@
share/applications/krita_bmp.desktop
share/applications/krita_brush.desktop
share/applications/krita_csv.desktop
-share/applications/krita_exr.desktop
+%%OPENEXR%%share/applications/krita_exr.desktop
share/applications/krita_heightmap.desktop
share/applications/krita_jpeg.desktop
share/applications/krita_odg.desktop
@@ -516,7 +516,7 @@
%%DATADIR%%/input/tabletpro.profile
%%DATADIR%%/metadata/schemas/dc.schema
%%DATADIR%%/metadata/schemas/exif.schema
-%%DATADIR%%/metadata/schemas/exrchannels.schema
+%%OPENEXR%%%%DATADIR%%/metadata/schemas/exrchannels.schema
%%DATADIR%%/metadata/schemas/mkn.schema
%%DATADIR%%/metadata/schemas/tiff.schema
%%DATADIR%%/metadata/schemas/xmp.schema
Index: head/x11/kde4-runtime/Makefile
===================================================================
--- head/x11/kde4-runtime/Makefile
+++ head/x11/kde4-runtime/Makefile
@@ -2,14 +2,13 @@
PORTNAME= kde-runtime
PORTVERSION= ${KDE_APPLICATIONS_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11 kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= Runtime components for KDE Plasma Desktop
-LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \
- libexiv2.so:graphics/exiv2 \
+LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
libwebp.so:graphics/webp \
libslp.so:net/openslp \
libssh.so:security/libssh \
@@ -38,7 +37,12 @@
khelpcenter/searchhandlers/*.pl.cmake \
kioslave/info/kde-info2html
-OPTIONS_DEFINE= PULSEAUDIO ZEITGEIST
+OPTIONS_DEFINE= OPENEXR PULSEAUDIO ZEITGEIST
+OPTIONS_DEFAULT= OPENEXR
+OPTIONS_SUB= yes
+
+OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
+OPENEXR_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
PULSEAUDIO_DESC=Audio configuration via PulseAudio
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio \
Index: head/x11/kde4-runtime/pkg-plist
===================================================================
--- head/x11/kde4-runtime/pkg-plist
+++ head/x11/kde4-runtime/pkg-plist
@@ -38,7 +38,7 @@
lib/kde4/comicbookthumbnail.so
lib/kde4/cursorthumbnail.so
lib/kde4/djvuthumbnail.so
-lib/kde4/exrthumbnail.so
+%%OPENEXR%%lib/kde4/exrthumbnail.so
lib/kde4/fixhosturifilter.so
lib/kde4/htmlthumbnail.so
lib/kde4/imagethumbnail.so
@@ -855,7 +855,7 @@
share/kde4/services/directorythumbnail.desktop
share/kde4/services/djvuthumbnail.desktop
share/kde4/services/emoticons.desktop
-share/kde4/services/exrthumbnail.desktop
+%%OPENEXR%%share/kde4/services/exrthumbnail.desktop
share/kde4/services/filetypes.desktop
share/kde4/services/finger.protocol
share/kde4/services/fish.protocol
Index: head/x11/kdelibs4/Makefile
===================================================================
--- head/x11/kdelibs4/Makefile
+++ head/x11/kdelibs4/Makefile
@@ -3,14 +3,13 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE4_KDELIBS_VERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11 kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= Base set of libraries needed by KDE programs
-LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR \
- libImath-2_2.so.12:graphics/ilmbase \
+LIB_DEPENDS= libImath-2_2.so.12:graphics/ilmbase \
libjasper.so:graphics/jasper \
libpcre.so:devel/pcre \
libenchant.so:textproc/enchant \
@@ -72,14 +71,18 @@
kio/proxytype.pl \
kioslave/http/kcookiejar/kcookiescfg.pl
-OPTIONS_DEFINE= AVAHI UPNP
-OPTIONS_DEFAULT=AVAHI
+OPTIONS_DEFINE= AVAHI OPENEXR UPNP
+OPTIONS_DEFAULT= AVAHI OPENEXR
+OPTIONS_SUB= yes
AVAHI_LIB_DEPENDS= libavahi-core.so:net/avahi-app
UPNP_DESC= UPnP backend for Solid (WARNING: Unstable)
UPNP_LIB_DEPENDS= libHUpnp.so:net/hupnp
UPNP_CMAKE_ON= -DHUPNP_ENABLED:BOOL=On
+
+OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR
+OPENEXR_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenEXR
post-patch:
${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
Index: head/x11/kdelibs4/pkg-plist
===================================================================
--- head/x11/kdelibs4/pkg-plist
+++ head/x11/kdelibs4/pkg-plist
@@ -1988,7 +1988,7 @@
lib/kde4/plugins/designer/kdewidgets.so
lib/kde4/plugins/imageformats/kimg_dds.so
lib/kde4/plugins/imageformats/kimg_eps.so
-lib/kde4/plugins/imageformats/kimg_exr.so
+%%OPENEXR%%lib/kde4/plugins/imageformats/kimg_exr.so
lib/kde4/plugins/imageformats/kimg_jp2.so
lib/kde4/plugins/imageformats/kimg_pcx.so
lib/kde4/plugins/imageformats/kimg_pic.so
@@ -3426,7 +3426,7 @@
share/kde4/services/qimageioplugins/bmp.desktop
share/kde4/services/qimageioplugins/dds.desktop
share/kde4/services/qimageioplugins/eps.desktop
-share/kde4/services/qimageioplugins/exr.desktop
+%%OPENEXR%%share/kde4/services/qimageioplugins/exr.desktop
share/kde4/services/qimageioplugins/gif.desktop
share/kde4/services/qimageioplugins/hdr.desktop
share/kde4/services/qimageioplugins/ico.desktop

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 11, 6:32 AM (8 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31273699
Default Alt Text
D13132.diff (9 KB)

Event Timeline