Date: Wed, 16 Oct 2019 12:27:35 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514582 - in head/graphics: osg osg-devel Message-ID: <201910161227.x9GCRZmH090820@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Wed Oct 16 12:27:35 2019 New Revision: 514582 URL: https://svnweb.freebsd.org/changeset/ports/514582 Log: graphics/osg[-devel]: drop optional dependency on expired graphics/inventor While here modernize USES Modified: head/graphics/osg-devel/Makefile head/graphics/osg-devel/pkg-plist head/graphics/osg/Makefile head/graphics/osg/pkg-plist Modified: head/graphics/osg-devel/Makefile ============================================================================== --- head/graphics/osg-devel/Makefile Wed Oct 16 11:28:49 2019 (r514581) +++ head/graphics/osg-devel/Makefile Wed Oct 16 12:27:35 2019 (r514582) @@ -23,7 +23,7 @@ LIB_DEPENDS= libpng.so:graphics/png \ CONFLICTS= osg -USES= alias cmake jpeg gl pkgconfig zip +USES= alias cmake jpeg gl pkgconfig xorg zip USE_GL= gl glu USE_XORG= x11 USE_LDCONFIG= yes @@ -35,14 +35,13 @@ PLIST_SUB= OSG_VERSION=${PORTVERSION} \ PORTSCOUT= limitw:1,odd -OPTIONS_DEFINE= CURL FFMPEG FREETYPE GDAL GIF GSTREAMER GTA INVENTOR \ +OPTIONS_DEFINE= CURL FFMPEG FREETYPE GDAL GIF GSTREAMER GTA \ JASPER LIBLAS LUA NVTT OPENEXR PDF QT5 SDL \ SVG VNC XINE XRANDR OPTIONS_DEFAULT=FFMPEG FREETYPE GIF XRANDR GDAL_DESC= GDAL support GTA_DESC= GTA file format support -INVENTOR_DESC= SGI OpenInventor support LIBLAS_DESC= liblas support NVTT_DESC= Use NVidia texture tools SDL_DESC= Use SDL (joystick support in present3d) @@ -72,9 +71,6 @@ GSTREAMER_BROKEN= fails when linking gstreamer plugin, GTA_LIB_DEPENDS= libgta.so:devel/libgta GTA_VARS= FORCE_REQUIRE+=GTA GTA_VARS_OFF= FORCE_IGNORE+=GTA -INVENTOR_LIB_DEPENDS= libInventor.so:graphics/inventor -INVENTOR_VARS= FORCE_REQUIRE+=Inventor -INVENTOR_VARS_OFF= FORCE_IGNORE+=Inventor JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper JASPER_VARS= FORCE_REQUIRE+=Jasper JASPER_VARS_OFF= FORCE_IGNORE+=Jasper Modified: head/graphics/osg-devel/pkg-plist ============================================================================== --- head/graphics/osg-devel/pkg-plist Wed Oct 16 11:28:49 2019 (r514581) +++ head/graphics/osg-devel/pkg-plist Wed Oct 16 12:27:35 2019 (r514582) @@ -699,7 +699,6 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_glsl.so %%GTA%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gta.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_gz.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_hdr.so -%%INVENTOR%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_iv.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_ive.so %%JASPER%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_jp2.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_jpeg.so Modified: head/graphics/osg/Makefile ============================================================================== --- head/graphics/osg/Makefile Wed Oct 16 11:28:49 2019 (r514581) +++ head/graphics/osg/Makefile Wed Oct 16 12:27:35 2019 (r514582) @@ -24,7 +24,7 @@ GH_PROJECT= OpenSceneGraph CONFLICTS= osg-devel -USES= alias cmake compiler:c++11-lang gl jpeg pkgconfig +USES= alias cmake compiler:c++11-lang gl jpeg pkgconfig xorg USE_GL= gl glu USE_XORG= x11 USE_LDCONFIG= yes @@ -38,14 +38,13 @@ PLIST_SUB= OSG_VERSION=${PORTVERSION} \ PORTSCOUT= limitw:1,even -OPTIONS_DEFINE= CURL FFMPEG FREETYPE GDAL GIF GSTREAMER GTA INVENTOR \ +OPTIONS_DEFINE= CURL FFMPEG FREETYPE GDAL GIF GSTREAMER GTA \ JASPER LIBLAS LUA NVTT OPENEXR PDF QT5 SDL \ SVG VNC XINE XRANDR OPTIONS_DEFAULT=FFMPEG FREETYPE GIF XRANDR GDAL_DESC= GDAL support GTA_DESC= GTA file format support -INVENTOR_DESC= SGI OpenInventor support LIBLAS_DESC= liblas support NVTT_DESC= Use NVidia texture tools SDL_DESC= Use SDL (joystick support in present3d) @@ -75,9 +74,6 @@ GSTREAMER_BROKEN= fails when linking gstreamer plugin, GTA_LIB_DEPENDS= libgta.so:devel/libgta GTA_VARS= FORCE_REQUIRE+=GTA GTA_VARS_OFF= FORCE_IGNORE+=GTA -INVENTOR_LIB_DEPENDS= libInventor.so:graphics/inventor -INVENTOR_VARS= FORCE_REQUIRE+=Inventor -INVENTOR_VARS_OFF= FORCE_IGNORE+=Inventor JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper JASPER_VARS= FORCE_REQUIRE+=Jasper JASPER_VARS_OFF= FORCE_IGNORE+=Jasper Modified: head/graphics/osg/pkg-plist ============================================================================== --- head/graphics/osg/pkg-plist Wed Oct 16 11:28:49 2019 (r514581) +++ head/graphics/osg/pkg-plist Wed Oct 16 12:27:35 2019 (r514582) @@ -705,7 +705,6 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_glsl.so %%GTA%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_gta.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_gz.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_hdr.so -%%INVENTOR%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_iv.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_ive.so %%JASPER%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_jp2.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_jpeg.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910161227.x9GCRZmH090820>