diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile index 8d85af3b4204..9c8f82fc2be1 100644 --- a/graphics/osg-devel/Makefile +++ b/graphics/osg-devel/Makefile @@ -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, with error cannot find -l 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 diff --git a/graphics/osg-devel/pkg-plist b/graphics/osg-devel/pkg-plist index a839ccdbf1ad..dae66ec40d8d 100644 --- a/graphics/osg-devel/pkg-plist +++ b/graphics/osg-devel/pkg-plist @@ -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 diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile index 496098a0bc8c..a8f09a671ceb 100644 --- a/graphics/osg/Makefile +++ b/graphics/osg/Makefile @@ -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, with error cannot find -l 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 diff --git a/graphics/osg/pkg-plist b/graphics/osg/pkg-plist index 03aab3fcfea2..8b0e12a6fefd 100644 --- a/graphics/osg/pkg-plist +++ b/graphics/osg/pkg-plist @@ -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