From owner-svn-ports-all@freebsd.org Wed Nov 11 12:17:23 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 642292E8160; Wed, 11 Nov 2020 12:17:23 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CWNyq2RsJz4hv9; Wed, 11 Nov 2020 12:17:23 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 46D4114895; Wed, 11 Nov 2020 12:17:23 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0ABCHNk7092615; Wed, 11 Nov 2020 12:17:23 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0ABCHMnj092613; Wed, 11 Nov 2020 12:17:22 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202011111217.0ABCHMnj092613@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Wed, 11 Nov 2020 12:17:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554890 - head/graphics/oyranos X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/graphics/oyranos X-SVN-Commit-Revision: 554890 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Nov 2020 12:17:23 -0000 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