Date: Wed, 11 Nov 2020 12:17:22 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554890 - head/graphics/oyranos Message-ID: <202011111217.0ABCHMnj092613@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Wed Nov 11 12:17:22 2020 New Revision: 554890 URL: https://svnweb.freebsd.org/changeset/ports/554890 Log: FLTK-based auxiliary programs fail to build after r552109 (Mesa update), so make them optional and disabled by default for the time being. This allows to unbreak the port and, subsequently, its consumers. Modified: head/graphics/oyranos/Makefile head/graphics/oyranos/pkg-plist Modified: head/graphics/oyranos/Makefile ============================================================================== --- head/graphics/oyranos/Makefile Wed Nov 11 12:14:54 2020 (r554889) +++ head/graphics/oyranos/Makefile Wed Nov 11 12:17:22 2020 (r554890) @@ -10,8 +10,6 @@ COMMENT= Colour Management System (CMS) LICENSE= BSD3CLAUSE -BROKEN= fails to build - RUN_DEPENDS= ${LOCALBASE}/share/color/icc/OpenICC/sRGB.icc:graphics/icc-profiles-openicc \ ${LOCALBASE}/share/color/icc/basICColor/ISOcoated_v2_300_bas.ICC:graphics/icc-profiles-basiccolor \ xcalib:x11/xcalib @@ -20,7 +18,6 @@ LIB_DEPENDS= libraw.so:graphics/libraw \ libpng.so:graphics/png \ libcairo.so:graphics/cairo \ libyajl.so:devel/yajl \ - libfltk.so:x11-toolkits/fltk \ libcups.so:print/cups \ libxdot.so:graphics/graphviz \ liblcms.so:graphics/lcms \ @@ -44,9 +41,15 @@ CMAKE_ARGS+= -DXDG_CONFIG_DIR=${PREFIX}/etc/xdg LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} MAKE_JOBS_UNSAFE=yes -OPTIONS_DEFINE= DOXYGEN DOCS +OPTIONS_DEFINE= DOCS DOXYGEN FLTK +OPTIONS_SUB= yes +FLTK_DESC= Build FLTK-based auxiliary programs +FLTK_BROKEN= fails to build, see https://github.com/oyranos-cms/oyranos/issues/62 + DOXYGEN_IMPLIES= DOCS DOXYGEN_BUILD_DEPENDS= ${LOCALBASE}/bin/doxygen:devel/doxygen + +FLTK_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk PORTDOCS= * DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} Modified: head/graphics/oyranos/pkg-plist ============================================================================== --- head/graphics/oyranos/pkg-plist Wed Nov 11 12:14:54 2020 (r554889) +++ head/graphics/oyranos/pkg-plist Wed Nov 11 12:17:22 2020 (r554890) @@ -1,7 +1,7 @@ bin/oyranos-config -bin/oyranos-config-fltk +%%FLTK%%bin/oyranos-config-fltk bin/oyranos-icc -bin/oyranos-image-display +%%FLTK%%bin/oyranos-image-display bin/oyranos-monitor bin/oyranos-monitor-daemon bin/oyranos-policy @@ -10,7 +10,7 @@ bin/oyranos-profile-graph bin/oyranos-profile-install bin/oyranos-profiles bin/oyranos-xforms -bin/oyranos-xforms-fltk +%%FLTK%%bin/oyranos-xforms-fltk bin/oyranos-xforms-modules bin/qcmsevents etc/xdg/autostart/oyranos-monitor-setup.desktop @@ -106,7 +106,7 @@ lib/liboyranos_modules-static.a lib/liboyranos_object-static.a lib/oyranos-meta/liboyranos_oyIM_cmm_module.so libdata/pkgconfig/oyranos.pc -man/man1/oyranos-config-fltk.1.gz +%%FLTK%%man/man1/oyranos-config-fltk.1.gz man/man1/oyranos-monitor-daemon.1.gz man/man1/oyranos-monitor.1.gz man/man1/oyranos-policy.1.gz @@ -119,7 +119,7 @@ man/man1/qcmsevents-qt4.1.gz man/man1/qcmsevents.1.gz man/man3/oyranos-config.3.gz man/man3/oyranos.3.gz -share/applications/oyranos-image-display.desktop +%%FLTK%%share/applications/oyranos-image-display.desktop share/applications/oyranos-profile-install.desktop share/applications/qcmsevents-applet.desktop share/color/rank-map/config.icc_profile.monitor.oyX1.qarz.json @@ -135,8 +135,8 @@ share/locale/eo/LC_MESSAGES/oyranos.mo share/locale/eu/LC_MESSAGES/oyranos.mo share/locale/fr/LC_MESSAGES/oyranos.mo share/locale/ru/LC_MESSAGES/oyranos.mo -share/man/man1/oyranos-image-display.1.gz -share/man/man1/oyranos-xforms-fltk.1.gz +%%FLTK%%share/man/man1/oyranos-image-display.1.gz +%%FLTK%%share/man/man1/oyranos-xforms-fltk.1.gz share/man/man1/oyranos-xforms-modules.1.gz share/pixmaps/lcms_logo2.png share/pixmaps/oyranos_logo.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011111217.0ABCHMnj092613>