diff options
Diffstat (limited to 'graphics')
24 files changed, 176 insertions, 429 deletions
diff --git a/graphics/Makefile b/graphics/Makefile index d057b38042d1..778620492eef 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -600,8 +600,8 @@ SUBDIR += opensubdiv SUBDIR += optar SUBDIR += optipng + SUBDIR += osg SUBDIR += osg34 - SUBDIR += osg-devel SUBDIR += osgearth SUBDIR += ossim SUBDIR += oyranos diff --git a/graphics/osg-devel/distinfo b/graphics/osg-devel/distinfo deleted file mode 100644 index 781441f5edd4..000000000000 --- a/graphics/osg-devel/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1482850076 -SHA256 (OpenSceneGraph-3.5.1.zip) = c409e9095d77faab3db8fe2047d75e7ef348fd9f06ecd8b7629fceb8fe1d24e0 -SIZE (OpenSceneGraph-3.5.1.zip) = 8353019 diff --git a/graphics/osg-devel/files/patch-CMakeLists.txt b/graphics/osg-devel/files/patch-CMakeLists.txt deleted file mode 100644 index 36c0ee62ec06..000000000000 --- a/graphics/osg-devel/files/patch-CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ ---- CMakeLists.txt.orig 2014-12-18 20:47:08.000000000 +0300 -+++ CMakeLists.txt 2015-01-24 21:51:57.000000000 +0300 -@@ -805,7 +805,7 @@ - - IF(UNIX AND NOT WIN32 AND NOT APPLE) - IF(CMAKE_SIZEOF_VOID_P MATCHES "8") -- SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement") -+ SET(LIB_POSTFIX "" CACHE STRING "suffix for 32/64 dir placement") - MARK_AS_ADVANCED(LIB_POSTFIX) - ENDIF() - ENDIF() -@@ -1234,7 +1234,7 @@ - ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc - @ONLY - ) -- INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenscenegraph-dev) -+ INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/${PKGCONFIG_FILE}.pc DESTINATION libdata/pkgconfig COMPONENT libopenscenegraph-dev) - ENDFOREACH(PKGCONFIG_FILE) - - diff --git a/graphics/osg-devel/files/patch-CMakeModules-FindGTA.cmake b/graphics/osg-devel/files/patch-CMakeModules-FindGTA.cmake deleted file mode 100644 index 8a648a5ac524..000000000000 --- a/graphics/osg-devel/files/patch-CMakeModules-FindGTA.cmake +++ /dev/null @@ -1,25 +0,0 @@ ---- CMakeModules/FindGTA.cmake.orig 2014-01-19 17:46:13.693927259 +0400 -+++ CMakeModules/FindGTA.cmake 2014-01-19 18:38:17.868997891 +0400 -@@ -8,16 +8,6 @@ - # correspond to the ./configure --prefix=$GTA_DIR - # used in building libgta. - --INCLUDE(FindPkgConfig OPTIONAL) -- --IF(PKG_CONFIG_FOUND) -- -- INCLUDE(FindPkgConfig) -- -- PKG_CHECK_MODULES(GTA gta) -- --ELSE(PKG_CONFIG_FOUND) -- - FIND_PATH(GTA_INCLUDE_DIRS gta/gta.hpp - $ENV{GTA_DIR}/include - $ENV{GTA_DIR} -@@ -52,5 +42,3 @@ - IF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS) - SET(GTA_FOUND "YES") - ENDIF(GTA_LIBRARIES AND GTA_INCLUDE_DIRS) -- --ENDIF(PKG_CONFIG_FOUND) diff --git a/graphics/osg-devel/files/patch-ffmpeg3 b/graphics/osg-devel/files/patch-ffmpeg3 deleted file mode 100644 index f3f1a2c73de3..000000000000 --- a/graphics/osg-devel/files/patch-ffmpeg3 +++ /dev/null @@ -1,157 +0,0 @@ -Description: Replace deprecated FFmpeg API -Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> -Last-Update: <2015-11-02> - ---- src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp.orig -+++ src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp -@@ -71,7 +71,7 @@ void FFmpegDecoderVideo::open(AVStream * - findAspectRatio(); - - // Find out whether we support Alpha channel -- m_alpha_channel = (m_context->pix_fmt == PIX_FMT_YUVA420P); -+ m_alpha_channel = (m_context->pix_fmt == AV_PIX_FMT_YUVA420P); - - // Find out the framerate - m_frame_rate = av_q2d(stream->avg_frame_rate); -@@ -91,20 +91,19 @@ void FFmpegDecoderVideo::open(AVStream * - throw std::runtime_error("avcodec_open() failed"); - - // Allocate video frame -- m_frame.reset(avcodec_alloc_frame()); -+ m_frame.reset(av_frame_alloc()); - - // Allocate converted RGB frame -- m_frame_rgba.reset(avcodec_alloc_frame()); -- m_buffer_rgba[0].resize(avpicture_get_size(PIX_FMT_RGB24, width(), height())); -+ m_frame_rgba.reset(av_frame_alloc()); -+ m_buffer_rgba[0].resize(avpicture_get_size(AV_PIX_FMT_RGB24, width(), height())); - m_buffer_rgba[1].resize(m_buffer_rgba[0].size()); - - // Assign appropriate parts of the buffer to image planes in m_frame_rgba -- avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], PIX_FMT_RGB24, width(), height()); -+ avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[0])[0], AV_PIX_FMT_RGB24, width(), height()); - - // Override get_buffer()/release_buffer() from codec context in order to retrieve the PTS of each frame. - m_context->opaque = this; -- m_context->get_buffer = getBuffer; -- m_context->release_buffer = releaseBuffer; -+ m_context->get_buffer2 = getBuffer; - } - - -@@ -263,8 +262,8 @@ int FFmpegDecoderVideo::convert(AVPictur - #ifdef USE_SWSCALE - if (m_swscale_ctx==0) - { -- m_swscale_ctx = sws_getContext(src_width, src_height, (PixelFormat) src_pix_fmt, -- src_width, src_height, (PixelFormat) dst_pix_fmt, -+ m_swscale_ctx = sws_getContext(src_width, src_height, (AVPixelFormat) src_pix_fmt, -+ src_width, src_height, (AVPixelFormat) dst_pix_fmt, - /*SWS_BILINEAR*/ SWS_BICUBIC, NULL, NULL, NULL); - } - -@@ -311,14 +310,14 @@ void FFmpegDecoderVideo::publishFrame(co - AVPicture * const dst = (AVPicture *) m_frame_rgba.get(); - - // Assign appropriate parts of the buffer to image planes in m_frame_rgba -- avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[m_writeBuffer])[0], PIX_FMT_RGB24, width(), height()); -+ avpicture_fill((AVPicture *) (m_frame_rgba).get(), &(m_buffer_rgba[m_writeBuffer])[0], AV_PIX_FMT_RGB24, width(), height()); - - // Convert YUVA420p (i.e. YUV420p plus alpha channel) using our own routine - -- if (m_context->pix_fmt == PIX_FMT_YUVA420P) -+ if (m_context->pix_fmt == AV_PIX_FMT_YUVA420P) - yuva420pToRgba(dst, src, width(), height()); - else -- convert(dst, PIX_FMT_RGB24, src, m_context->pix_fmt, width(), height()); -+ convert(dst, AV_PIX_FMT_RGB24, src, m_context->pix_fmt, width(), height()); - - // Wait 'delay' seconds before publishing the picture. - int i_delay = static_cast<int>(delay * 1000000 + 0.5); -@@ -345,7 +344,7 @@ void FFmpegDecoderVideo::publishFrame(co - - void FFmpegDecoderVideo::yuva420pToRgba(AVPicture * const dst, AVPicture * const src, int width, int height) - { -- convert(dst, PIX_FMT_RGB24, src, m_context->pix_fmt, width, height); -+ convert(dst, AV_PIX_FMT_RGB24, src, m_context->pix_fmt, width, height); - - const size_t bpp = 4; - -@@ -363,31 +362,28 @@ void FFmpegDecoderVideo::yuva420pToRgba( - } - } - -- -- --int FFmpegDecoderVideo::getBuffer(AVCodecContext * const context, AVFrame * const picture) -+int FFmpegDecoderVideo::getBuffer(AVCodecContext * const context, AVFrame * const picture, int flags) - { -+ AVBufferRef *ref; - const FFmpegDecoderVideo * const this_ = reinterpret_cast<const FFmpegDecoderVideo*>(context->opaque); - -- const int result = avcodec_default_get_buffer(context, picture); -+ const int result = avcodec_default_get_buffer2(context, picture, flags); - int64_t * p_pts = reinterpret_cast<int64_t*>( av_malloc(sizeof(int64_t)) ); - - *p_pts = this_->m_packet_pts; - picture->opaque = p_pts; - -+ ref = av_buffer_create((uint8_t *)picture->opaque, sizeof(int64_t), FFmpegDecoderVideo::freeBuffer, picture->buf[0], flags); -+ picture->buf[0] = ref; -+ - return result; - } - -- -- --void FFmpegDecoderVideo::releaseBuffer(AVCodecContext * const context, AVFrame * const picture) -+void FFmpegDecoderVideo::freeBuffer(void *opaque, uint8_t *data) - { -- if (picture != 0) -- av_freep(&picture->opaque); -- -- avcodec_default_release_buffer(context, picture); -+ AVBufferRef *ref = (AVBufferRef *)opaque; -+ av_buffer_unref(&ref); -+ av_free(data); - } - -- -- - } // namespace osgFFmpeg ---- src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp.orig -+++ src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp -@@ -94,8 +94,8 @@ private: - int src_pix_fmt, int src_width, int src_height); - - -- static int getBuffer(AVCodecContext * context, AVFrame * picture); -- static void releaseBuffer(AVCodecContext * context, AVFrame * picture); -+ static int getBuffer(AVCodecContext * context, AVFrame * picture, int flags); -+ static void freeBuffer(void * opaque, uint8_t *data); - - PacketQueue & m_packets; - FFmpegClocks & m_clocks; ---- src/osgPlugins/ffmpeg/FFmpegParameters.cpp.orig -+++ src/osgPlugins/ffmpeg/FFmpegParameters.cpp -@@ -19,7 +19,7 @@ extern "C" - #include <libavutil/pixdesc.h> - } - --inline PixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); } -+inline AVPixelFormat osg_av_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); } - - - namespace osgFFmpeg { ---- src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp.orig 2016-02-18 21:25:39.627923629 +0000 -+++ src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp 2016-02-18 21:26:17.071140100 +0000 -@@ -227,8 +227,7 @@ - if (avcodec_open2(m_context, p_codec, NULL) < 0) - throw std::runtime_error("avcodec_open() failed"); - -- m_context->get_buffer = avcodec_default_get_buffer; -- m_context->release_buffer = avcodec_default_release_buffer; -+ m_context->get_buffer2 = avcodec_default_get_buffer2; - - } - diff --git a/graphics/osg-devel/files/patch-include_osgViewer_View b/graphics/osg-devel/files/patch-include_osgViewer_View deleted file mode 100644 index f4caca34ae3a..000000000000 --- a/graphics/osg-devel/files/patch-include_osgViewer_View +++ /dev/null @@ -1,11 +0,0 @@ ---- include/osgViewer/View.orig 2016-04-21 09:54:28.095530000 +0200 -+++ include/osgViewer/View 2016-04-21 09:55:04.918232000 +0200 -@@ -127,7 +127,7 @@ - /** Set the View's image pager.*/ - void setImagePager(osgDB::ImagePager* ip); - -- template<class T> void setImagePager(const osg::ref_ptr<T>* ip) { setImagePager(ip.get()); } -+ template<class T> void setImagePager(const osg::ref_ptr<T>& ip) { setImagePager(ip.get()); } - - /** Get the View's image pager.*/ - osgDB::ImagePager* getImagePager(); diff --git a/graphics/osg-devel/files/patch-src-OpenThreads-CMakeLists.txt b/graphics/osg-devel/files/patch-src-OpenThreads-CMakeLists.txt deleted file mode 100644 index 675ef5a726a0..000000000000 --- a/graphics/osg-devel/files/patch-src-OpenThreads-CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ ---- src/OpenThreads/CMakeLists.txt.orig 2009-01-27 18:34:57.000000000 +0300 -+++ src/OpenThreads/CMakeLists.txt 2009-02-05 17:54:57.000000000 +0300 -@@ -94,4 +94,4 @@ - @ONLY - ) - --INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openthreads.pc DESTINATION lib${LIB_POSTFIX}/pkgconfig) -+INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openthreads.pc DESTINATION libdata/pkgconfig) diff --git a/graphics/osg-devel/files/patch-src-OpenThreads-pthreads-PThread.cpp b/graphics/osg-devel/files/patch-src-OpenThreads-pthreads-PThread.cpp deleted file mode 100644 index eeaba23f077d..000000000000 --- a/graphics/osg-devel/files/patch-src-OpenThreads-pthreads-PThread.cpp +++ /dev/null @@ -1,37 +0,0 @@ ---- src/OpenThreads/pthreads/PThread.cpp.orig 2011-06-24 00:09:26.000000000 +0400 -+++ src/OpenThreads/pthreads/PThread.cpp 2012-03-05 05:57:02.886704932 +0400 -@@ -21,6 +21,7 @@ - #include <sys/types.h> - #include <unistd.h> - #include <pthread.h> -+#include <pthread_np.h> - #include <limits.h> - - #if defined __linux || defined __sun || defined __APPLE__ || ANDROID -@@ -136,7 +137,7 @@ - #if defined(__sgi) - pthread_setrunon_np( pd->cpunum ); - #elif defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY) -- cpu_set_t cpumask; -+ cpuset_t cpumask; - CPU_ZERO( &cpumask ); - CPU_SET( pd->cpunum, &cpumask ); - -@@ -569,7 +570,7 @@ - - if (pd->isRunning && Thread::CurrentThread()==this) - { -- cpu_set_t cpumask; -+ cpuset_t cpumask; - CPU_ZERO( &cpumask ); - CPU_SET( pd->cpunum, &cpumask ); - #if defined(HAVE_PTHREAD_SETAFFINITY_NP) -@@ -1031,7 +1032,7 @@ - else - { - #if defined(HAVE_PTHREAD_SETAFFINITY_NP) || defined(HAVE_THREE_PARAM_SCHED_SETAFFINITY) || defined(HAVE_TWO_PARAM_SCHED_SETAFFINITY) -- cpu_set_t cpumask; -+ cpuset_t cpumask; - CPU_ZERO( &cpumask ); - CPU_SET( cpunum, &cpumask ); - #if defined(HAVE_PTHREAD_SETAFFINITY_NP) diff --git a/graphics/osg-devel/files/patch-src_osgDB_ConvertBase64.cpp b/graphics/osg-devel/files/patch-src_osgDB_ConvertBase64.cpp deleted file mode 100644 index ee3b7b6fec07..000000000000 --- a/graphics/osg-devel/files/patch-src_osgDB_ConvertBase64.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/osgDB/ConvertBase64.cpp.orig 2019-10-09 09:44:59 UTC -+++ src/osgDB/ConvertBase64.cpp -@@ -28,7 +28,7 @@ namespace osgDB - - int base64_decode_value(char value_in) - { -- static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51}; -+ static const signed char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51}; - static const char decoding_size = sizeof(decoding); - value_in -= 43; - if (value_in < 0 || value_in > decoding_size) return -1; diff --git a/graphics/osg-devel/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt b/graphics/osg-devel/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt deleted file mode 100644 index 4b0da817bfe6..000000000000 --- a/graphics/osg-devel/files/patch-src_osgPlugins_ffmpeg_CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ ---- src/osgPlugins/ffmpeg/CMakeLists.txt.orig 2015-01-07 14:14:55 UTC -+++ src/osgPlugins/ffmpeg/CMakeLists.txt -@@ -3,7 +3,7 @@ LINK_DIRECTORIES(${FFMPEG_LIBRARY_DIRS}) - - IF(FFMPEG_LIBSWSCALE_FOUND) - -- INCLUDE_DIRECTORIES( ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale ) -+ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale ) - - ADD_DEFINITIONS(-DUSE_SWSCALE) - -@@ -12,14 +12,14 @@ IF(FFMPEG_LIBSWSCALE_FOUND) - ENDIF() - - IF(FFMPEG_LIBSWRESAMPLE_FOUND) -- INCLUDE_DIRECTORIES( ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS}/libswresample ) -+ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS}/libswresample ) - - ADD_DEFINITIONS(-DUSE_SWRESAMPLE) - - SET(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${FFMPEG_LIBSWRESAMPLE_LIBRARIES}) - ENDIF() - IF(FFMPEG_LIBAVRESAMPLE_FOUND) -- INCLUDE_DIRECTORIES( ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS}/libavresample ) -+ INCLUDE_DIRECTORIES(SYSTEM ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS} ${FFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS}/libavresample ) - - ADD_DEFINITIONS(-DUSE_AVRESAMPLE) - diff --git a/graphics/osg-devel/files/patch-src_osgPlugins_gdal_CMakeLists.txt b/graphics/osg-devel/files/patch-src_osgPlugins_gdal_CMakeLists.txt deleted file mode 100644 index acdc497a60b1..000000000000 --- a/graphics/osg-devel/files/patch-src_osgPlugins_gdal_CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ ---- ./src/osgPlugins/gdal/CMakeLists.txt.orig 2015-07-02 11:58:49 UTC -+++ ./src/osgPlugins/gdal/CMakeLists.txt -@@ -1,4 +1,4 @@ --INCLUDE_DIRECTORIES( ${GDAL_INCLUDE_DIR} ) -+INCLUDE_DIRECTORIES(SYSTEM ${GDAL_INCLUDE_DIR}) - - SET(TARGET_SRC - ReaderWriterGDAL.cpp diff --git a/graphics/osg-devel/files/patch-src_osgPlugins_nvtt_CMakeLists.txt b/graphics/osg-devel/files/patch-src_osgPlugins_nvtt_CMakeLists.txt deleted file mode 100644 index 40902a58bb5c..000000000000 --- a/graphics/osg-devel/files/patch-src_osgPlugins_nvtt_CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ ---- src/osgPlugins/nvtt/CMakeLists.txt.orig 2011-04-19 11:40:22 UTC -+++ src/osgPlugins/nvtt/CMakeLists.txt -@@ -1,4 +1,4 @@ --INCLUDE_DIRECTORIES( ${NVTT_INCLUDE_DIR} ) -+INCLUDE_DIRECTORIES(SYSTEM ${NVTT_INCLUDE_DIR}) - - - SET(TARGET_SRC diff --git a/graphics/osg-devel/files/patch-src_osgPlugins_ogr_CMakeLists.txt b/graphics/osg-devel/files/patch-src_osgPlugins_ogr_CMakeLists.txt deleted file mode 100644 index 73fd9c93c2ec..000000000000 --- a/graphics/osg-devel/files/patch-src_osgPlugins_ogr_CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ ---- ./src/osgPlugins/ogr/CMakeLists.txt.orig 2011-04-19 11:40:22 UTC -+++ ./src/osgPlugins/ogr/CMakeLists.txt -@@ -1,4 +1,4 @@ --INCLUDE_DIRECTORIES( ${GDAL_INCLUDE_DIR} ) -+INCLUDE_DIRECTORIES(SYSTEM ${GDAL_INCLUDE_DIR}) - - SET(TARGET_SRC ReaderWriterOGR.cpp) - diff --git a/graphics/osg-devel/files/patch-src_osgPlugins_osgjs_Base64 b/graphics/osg-devel/files/patch-src_osgPlugins_osgjs_Base64 deleted file mode 100644 index bce9c08db8fb..000000000000 --- a/graphics/osg-devel/files/patch-src_osgPlugins_osgjs_Base64 +++ /dev/null @@ -1,11 +0,0 @@ ---- src/osgPlugins/osgjs/Base64.orig 2019-10-09 12:55:34 UTC -+++ src/osgPlugins/osgjs/Base64 -@@ -61,7 +61,7 @@ namespace base64 - extern const char* to_table; - extern const char* to_table_end; - -- extern const char* from_table; -+ extern const signed char* from_table; - - - template <class InputIterator, class OutputIterator> diff --git a/graphics/osg-devel/files/patch-src_osgPlugins_osgjs_Base64.cpp b/graphics/osg-devel/files/patch-src_osgPlugins_osgjs_Base64.cpp deleted file mode 100644 index f3887cc69314..000000000000 --- a/graphics/osg-devel/files/patch-src_osgPlugins_osgjs_Base64.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- src/osgPlugins/osgjs/Base64.cpp.orig 2019-10-09 12:52:54 UTC -+++ src/osgPlugins/osgjs/Base64.cpp -@@ -18,7 +18,7 @@ namespace base64 - const char* to_table_end = - _to_table + sizeof(_to_table); - -- const char _from_table[128] = -+ const signed char _from_table[128] = - { - -1, -1, -1, -1, -1, -1, -1, -1, // 0 - -1, -1, -1, -1, -1, -1, -1, -1, // 8 -@@ -37,6 +37,6 @@ namespace base64 - 41, 42, 43, 44, 45, 46, 47, 48, // 112 - 49, 50, 51, -1, -1, -1, -1, -1 // 120 - }; -- const char* from_table = _from_table; -+ const signed char* from_table = _from_table; - } - diff --git a/graphics/osg-devel/Makefile b/graphics/osg/Makefile index 1d313c770c2b..db1f8c52b28f 100644 --- a/graphics/osg-devel/Makefile +++ b/graphics/osg/Makefile @@ -2,13 +2,9 @@ # $FreeBSD$ PORTNAME= osg -PORTVERSION= 3.5.1 -PORTREVISION= 13 +PORTVERSION= 3.6.4 +DISTVERSIONPREFIX= OpenSceneGraph- CATEGORIES= graphics -MASTER_SITES= http://trac.openscenegraph.org/downloads/developer_releases/ \ - http://mirror.amdmi3.ru/distfiles/ -PKGNAMESUFFIX= -devel -DISTNAME= OpenSceneGraph-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= C++ OpenGL scene graph library for real-time rendering @@ -21,33 +17,38 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LIB_DEPENDS= libpng.so:graphics/png \ libtiff.so:graphics/tiff -CONFLICTS= osg +USE_GITHUB= yes +GH_ACCOUNT= openscenegraph +GH_PROJECT= OpenSceneGraph -USES= alias cmake jpeg gl pkgconfig xorg zip -USE_GL= gl glu +CONFLICTS= osg34-[0-9]* + +USES= alias cmake jpeg gl localbase pkgconfig xorg +USE_GL= gl USE_XORG= x11 USE_LDCONFIG= yes PLIST_SUB= OSG_VERSION=${PORTVERSION} \ - OSG_SHLIBVER=141 \ - OPENTHREADS_VERSION=3.3.0 \ - OPENTHREADS_SHLIBVER=20 - -PORTSCOUT= limitw:1,odd + OSG_SHLIBVER=160 \ + OPENTHREADS_VERSION=3.3.1 \ + OPENTHREADS_SHLIBVER=21 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 -LIBLAS_DESC= liblas support -NVTT_DESC= Use NVidia texture tools -SDL_DESC= Use SDL (joystick support in present3d) -VNC_DESC= LibVNCServer support - -OPTIONS_SUB= yes + JASPER LIBLAS LUA NVTT OPENEXR PDF SDL ASIO \ + SVG VNC XRANDR XINERAMA FONTCONFIG DCMTK COLLADA +OPTIONS_DEFAULT=FFMPEG FREETYPE GIF XRANDR XINERAMA FONTCONFIG +OPTIONS_SUB= yes + +ASIO_DESC= ASIO support (resthttp plugin) +GDAL_DESC= GDAL support +GTA_DESC= GTA file format support +LIBLAS_DESC= liblas support +NVTT_DESC= Use NVidia texture tools +SDL_DESC= Use SDL (joystick support in present3d) +VNC_DESC= LibVNCServer support +OPENCASCADE_DESC= OpenCASCADE format support +DCMTK_DESC= DICOM format support +COLLADA_DESC= COLLADA (dae) format support CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_VARS= FORCE_REQUIRE+=CURL @@ -58,6 +59,8 @@ FFMPEG_VARS_OFF= FORCE_IGNORE+=FFmpeg FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_VARS= FORCE_REQUIRE+=Freetype FREETYPE_VARS_OFF= FORCE_IGNORE+=Freetype +FONTCONFIG_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig +FONTCONFIG_CMAKE_BOOL= OSG_TEXT_USE_FONTCONFIG GDAL_LIB_DEPENDS= libgdal.so:graphics/gdal GDAL_VARS= FORCE_REQUIRE+=GDAL GDAL_VARS_OFF= FORCE_IGNORE+=GDAL @@ -65,8 +68,8 @@ GIF_LIB_DEPENDS= libgif.so:graphics/giflib GIF_VARS= FORCE_REQUIRE+=GIFLIB GIF_VARS_OFF= FORCE_IGNORE+=GIFLIB GSTREAMER_USE= GNOME=glib20 GSTREAMER1=yes -GSTREAMER_VARS= FORCE_REQUIRE+=GStreamer -GSTREAMER_VARS_OFF= FORCE_IGNORE+=GStreamer +GSTREAMER_VARS= FORCE_REQUIRE+="GStreamer GLIB" +GSTREAMER_VARS_OFF= FORCE_IGNORE+="GStreamer GLIB" GSTREAMER_BROKEN= fails when linking gstreamer plugin, with error cannot find -lgstreamer-1.0 GTA_LIB_DEPENDS= libgta.so:devel/libgta GTA_VARS= FORCE_REQUIRE+=GTA @@ -88,49 +91,54 @@ OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr OPENEXR_VARS= FORCE_REQUIRE+=OpenEXR OPENEXR_VARS_OFF= FORCE_IGNORE+=OpenEXR PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib -PDF_USE= gnome=cairo +PDF_USE= GNOME=cairo PDF_VARS= FORCE_REQUIRE+=Poppler-glib PDF_VARS_OFF= FORCE_IGNORE+=Poppler-glib -QT5_USES= qt:5 -QT5_USE= qt=buildtools_build,core,gui,opengl,qmake_build,webkit -QT5_CMAKE_ON= -DDESIRED_QT_VERSION=5 -QT5_VARS= FORCE_REQUIRE+="Qt5Widgets Qt5WebKitWidgets" -QT5_VARS_OFF= FORCE_IGNORE+="Qt5Widgets Qt5WebKitWidgets" -SDL_USES= sdl -SDL_USE= sdl=sdl +SDL_USE= SDL=sdl SDL_VARS= FORCE_REQUIRE+=SDL SDL_VARS_OFF= FORCE_IGNORE+=SDL -SVG_USES= gnome -SVG_USE= gnome=cairo,librsvg2 +SVG_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 +SVG_USE= GNOME=cairo SVG_VARS= FORCE_REQUIRE+=RSVG SVG_VARS_OFF= FORCE_IGNORE+=RSVG VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver VNC_VARS= FORCE_REQUIRE+=LibVNCServer VNC_VARS_OFF= FORCE_IGNORE+=LibVNCServer -XINE_LIB_DEPENDS= libxine.so:multimedia/libxine -XINE_VARS= FORCE_REQUIRE+=Xine -XINE_VARS_OFF= FORCE_IGNORE+=Xine -XRANDR_CMAKE_ON= -DOSGVIEWER_USE_XRANDR:BOOL=ON -XRANDR_CMAKE_OFF= -DOSGVIEWER_USE_XRANDR:BOOL=OFF -XRANDR_USE= xorg=xrandr +XRANDR_CMAKE_BOOL= OSGVIEWER_USE_XRANDR +XRANDR_USE= XORG=xrandr +XINERAMA_CMAKE_BOOL= OSGVIEWER_USE_XINERAMA +XINERAMA_USE= XORG=xinerama +#OPENCASCADE_LIB_DEPENDS=libTKBRep.so:cad/opencascade +#OPENCASCADE_VARS= FORCE_REQUIRE+=OpenCascade +#OPENCASCADE_VARS_OFF= FORCE_IGNORE+=OpenCascade +#OPENCASCADE_CMAKE_ARGS= -DOPENCASCADE_LIBRARY_TYPE="Shared" +DCMTK_LIB_DEPENDS= libdcmrt.so:graphics/dcmtk \ + libxml2.so:textproc/libxml2 \ + libicuuc.so:devel/icu +DCMTK_USES= ssl +DCMTK_VARS= FORCE_REQUIRE+=DCMTK +DCMTK_VARS_OFF= FORCE_IGNORE+=DCMTK +#ILMBASE_LIB_DEPENDS= ${LOCALBASE}/lib/libImath.so:graphics/ilmbase +#ILMBASE_VARS= FORCE_REQUIRE+=ilmbase +#ILMBASE_VARS_OFF= FORCE_IGNORE+=ilmbase +COLLADA_LIB_DEPENDS= libcollada-dom2.5-dp.so:devel/collada-dom \ + libboost_filesystem.so:devel/boost-libs +COLLADA_VARS= FORCE_REQUIRE+=COLLADA +COLLADA_VARS_OFF= FORCE_IGNORE+=COLLADA +ASIO_BUILD_DEPENDS= ${LOCALBASE}/include/asio.hpp:net/asio +ASIO_VARS= FORCE_REQUIRE+=Asio +ASIO_VARS_OFF= FORCE_IGNORE+=Asio # GUI toolkits are only needed for building examples, which are not even installed -FORCE_IGNORE= FLTK GLUT FOX Qt3 wxWidgets OpenAL GtkGl SDL2 # only for examples -FORCE_IGNORE+= COLLADA Performer OurDCMTK XUL FBX # not in ports -FORCE_IGNORE+= OpenVRML # ports version too old -FORCE_IGNORE+= ITK # ports version doesn't build on 10.x -FORCE_REQUIRE= Threads OpenGL X11 JPEG PNG TIFF ZLIB # common & lightweight +FORCE_IGNORE= FLTK FOX wxWidgets GtkGl SDL2 # only for examples +FORCE_IGNORE+= FBX Inventor # not in ports +FORCE_IGNORE+= ilmbase # not used +FORCE_IGNORE+= OpenCascade # detection broken +FORCE_IGNORE+= ZeroConf # no avahi support yet +FORCE_REQUIRE= Threads OpenGL X11 JPEG PNG TIFF ZLIB # common & lightweight .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MQT5} -CMAKE_ARGS+= -DOSG_USE_QT:BOOL=ON -PLIST_SUB+= QT="" -.else -CMAKE_ARGS+= -DOSG_USE_QT:BOOL=OFF -PLIST_SUB+= QT="@comment " -.endif - post-patch: @${FIND} ${WRKSRC}/CMakeModules -type f -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' diff --git a/graphics/osg/distinfo b/graphics/osg/distinfo new file mode 100644 index 000000000000..b36ddb3ff2b1 --- /dev/null +++ b/graphics/osg/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1575910338 +SHA256 (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.6.4_GH0.tar.gz) = 81394d1b484c631028b85d21c5535280c21bbd911cb058e8746c87e93e7b9d33 +SIZE (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.6.4_GH0.tar.gz) = 5771539 diff --git a/graphics/osg/files/patch-CMakeModules-FindGTA.cmake b/graphics/osg/files/patch-CMakeModules-FindGTA.cmake new file mode 100644 index 000000000000..6c5c5f5de7ea --- /dev/null +++ b/graphics/osg/files/patch-CMakeModules-FindGTA.cmake @@ -0,0 +1,27 @@ +--- CMakeModules/FindGTA.cmake.orig 2017-05-19 16:06:36 UTC ++++ CMakeModules/FindGTA.cmake +@@ -8,17 +8,6 @@ + # correspond to the ./configure --prefix=$GTA_DIR + # used in building libgta. + +-INCLUDE(FindPkgConfig OPTIONAL) +- +-IF(PKG_CONFIG_FOUND) +- +- INCLUDE(FindPkgConfig) +- +- PKG_CHECK_MODULES(GTA gta) +- +-ENDIF(PKG_CONFIG_FOUND) +- +-IF(NOT GTA_FOUND) + FIND_PATH(GTA_INCLUDE_DIRS gta/gta.hpp + $ENV{GTA_DIR}/include + $ENV{GTA_DIR} +@@ -53,5 +42,3 @@ IF(NOT GTA_FOUND) + IF(GTA_LIBRARY AND GTA_INCLUDE_DIRS) + SET(GTA_FOUND "YES") + ENDIF(GTA_LIBRARY AND GTA_INCLUDE_DIRS) +- +-ENDIF(NOT GTA_FOUND) +\ No newline at end of file diff --git a/graphics/osg-devel/files/patch-CMakeModules_FindGStreamer.cmake b/graphics/osg/files/patch-CMakeModules_FindGStreamer.cmake index 7b3259726d4b..7b3259726d4b 100644 --- a/graphics/osg-devel/files/patch-CMakeModules_FindGStreamer.cmake +++ b/graphics/osg/files/patch-CMakeModules_FindGStreamer.cmake diff --git a/graphics/osg/files/patch-src_OpenThreads_pthreads_CMakeLists.txt b/graphics/osg/files/patch-src_OpenThreads_pthreads_CMakeLists.txt new file mode 100644 index 000000000000..73290c44d28c --- /dev/null +++ b/graphics/osg/files/patch-src_OpenThreads_pthreads_CMakeLists.txt @@ -0,0 +1,18 @@ +--- src/OpenThreads/pthreads/CMakeLists.txt.orig 2019-07-26 11:54:16 UTC ++++ src/OpenThreads/pthreads/CMakeLists.txt +@@ -80,8 +80,15 @@ ELSE() + # double check that pthread_setaffinity_np is available as FreeBSD header doesn't contain required function + CHECK_CXX_SOURCE_COMPILES(" + #include <pthread.h> ++ #ifdef __FreeBSD__ ++ #include <pthread_np.h> ++ #endif + int main() { ++ #ifdef __FreeBSD__ ++ cpuset_t cpumask; ++ #else + cpu_set_t cpumask; ++ #endif + CPU_ZERO( &cpumask ); + CPU_SET( 0, &cpumask ); + pthread_setaffinity_np( pthread_self(), sizeof(cpumask), &cpumask); diff --git a/graphics/osg/files/patch-src_OpenThreads_pthreads_PThread.cpp b/graphics/osg/files/patch-src_OpenThreads_pthreads_PThread.cpp new file mode 100644 index 000000000000..24a63b76fff9 --- /dev/null +++ b/graphics/osg/files/patch-src_OpenThreads_pthreads_PThread.cpp @@ -0,0 +1,24 @@ +--- src/OpenThreads/pthreads/PThread.cpp.orig 2019-07-26 11:54:16 UTC ++++ src/OpenThreads/pthreads/PThread.cpp +@@ -21,6 +21,9 @@ + #include <sys/types.h> + #include <unistd.h> + #include <pthread.h> ++#if defined(HAVE_PTHREAD_SETAFFINITY_NP) && defined(__FreeBSD__) ++ #include <pthread_np.h> ++#endif + #include <limits.h> + + #if defined __linux__ || defined __sun || defined __APPLE__ || ANDROID +@@ -113,7 +116,11 @@ namespace OpenThreads + static void setAffinity(const Affinity& affinity) + { + //std::cout<<"setProcessAffinity : "<< affinity.activeCPUs.size() <<std::endl; ++#if defined(__FreeBSD__) ++ cpuset_t cpumask; ++#else + cpu_set_t cpumask; ++#endif + CPU_ZERO( &cpumask ); + unsigned int numprocessors = OpenThreads::GetNumberOfProcessors(); + if (affinity) diff --git a/graphics/osg/files/patch-src_osgViewer_CMakeLists.txt b/graphics/osg/files/patch-src_osgViewer_CMakeLists.txt new file mode 100644 index 000000000000..5004572efabe --- /dev/null +++ b/graphics/osg/files/patch-src_osgViewer_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/osgViewer/CMakeLists.txt.orig 2019-07-26 11:54:16 UTC ++++ src/osgViewer/CMakeLists.txt +@@ -210,7 +210,7 @@ ELSEIF(${OSG_WINDOWING_SYSTEM} STREQUAL "X11") + IF(OSGVIEWER_USE_XINERAMA) + ADD_DEFINITIONS(-DOSGVIEWER_USE_XINERAMA) + SET(LIB_PRIVATE_HEADERS ${LIB_PRIVATE_HEADERS} ${XINERAMA_INCLUDE_DIRS} ) +- SET(LIB_EXTRA_LIBS -lXinerama ${LIB_EXTRA_LIBS}) ++ SET(LIB_EXTRA_LIBS ${X11_Xinerama_LIB} ${LIB_EXTRA_LIBS}) + ENDIF() + + # X11 on Apple requires X11 library plus OpenGL linking hack on Leopard diff --git a/graphics/osg-devel/pkg-descr b/graphics/osg/pkg-descr index 614609091396..614609091396 100644 --- a/graphics/osg-devel/pkg-descr +++ b/graphics/osg/pkg-descr diff --git a/graphics/osg-devel/pkg-plist b/graphics/osg/pkg-plist index dae66ec40d8d..ec30ad3f9a5c 100644 --- a/graphics/osg-devel/pkg-plist +++ b/graphics/osg/pkg-plist @@ -4,6 +4,7 @@ bin/osgfilecache bin/osgversion bin/osgviewer bin/present3D +include/OpenThreads/Affinity include/OpenThreads/Atomic include/OpenThreads/Barrier include/OpenThreads/Block @@ -21,10 +22,11 @@ include/osg/AnimationPath include/osg/ApplicationUsage include/osg/ArgumentParser include/osg/Array -include/osg/ArrayDispatchers +include/osg/AttributeDispatchers include/osg/AudioStream include/osg/AutoTransform include/osg/Billboard +include/osg/BindImageTexture include/osg/BlendColor include/osg/BlendEquation include/osg/BlendEquationi @@ -63,6 +65,8 @@ include/osg/CullStack include/osg/CullingSet include/osg/DeleteHandler include/osg/Depth +include/osg/DepthRangeIndexed +include/osg/DispatchCompute include/osg/DisplaySettings include/osg/DrawPixels include/osg/Drawable @@ -75,7 +79,6 @@ include/osg/FrameStamp include/osg/FrontFace include/osg/GL include/osg/GL2Extensions -include/osg/GLBeginEndAdapter include/osg/GLDefines include/osg/GLExtensions include/osg/GLObjects @@ -87,6 +90,7 @@ include/osg/GraphicsCostEstimator include/osg/GraphicsThread include/osg/Group include/osg/Hint +include/osg/Identifier include/osg/Image include/osg/ImageSequence include/osg/ImageStream @@ -131,6 +135,7 @@ include/osg/Polytope include/osg/PositionAttitudeTransform include/osg/PrimitiveRestartIndex include/osg/PrimitiveSet +include/osg/PrimitiveSetIndirect include/osg/Program include/osg/Projection include/osg/ProxyNode @@ -138,7 +143,9 @@ include/osg/Quat include/osg/Referenced include/osg/RenderInfo include/osg/SampleMaski +include/osg/Sampler include/osg/Scissor +include/osg/ScissorIndexed include/osg/ScriptEngine include/osg/Sequence include/osg/ShadeModel @@ -157,6 +164,7 @@ include/osg/Stencil include/osg/StencilTwoSided include/osg/Switch include/osg/TemplatePrimitiveFunctor +include/osg/TemplatePrimitiveIndexFunctor include/osg/TexEnv include/osg/TexEnvCombine include/osg/TexEnvFilter @@ -177,10 +185,13 @@ include/osg/TransferFunction include/osg/Transform include/osg/TriangleFunctor include/osg/TriangleIndexFunctor +include/osg/TriangleLinePointIndexFunctor include/osg/Types include/osg/Uniform include/osg/UserDataContainer +include/osg/ValueMap include/osg/ValueObject +include/osg/ValueStack include/osg/Vec2 include/osg/Vec2b include/osg/Vec2d @@ -209,14 +220,17 @@ include/osg/Vec4ub include/osg/Vec4ui include/osg/Vec4us include/osg/Version +include/osg/VertexArrayState include/osg/VertexAttribDivisor include/osg/VertexProgram include/osg/View include/osg/Viewport +include/osg/ViewportIndexed include/osg/buffered_value include/osg/fast_back_stack include/osg/io_utils include/osg/observer_ptr +include/osg/os_utils include/osg/ref_ptr include/osgAnimation/Action include/osgAnimation/ActionAnimation @@ -240,6 +254,8 @@ include/osgAnimation/Interpolator include/osgAnimation/Keyframe include/osgAnimation/LinkVisitor include/osgAnimation/MorphGeometry +include/osgAnimation/MorphTransformHardware +include/osgAnimation/MorphTransformSoftware include/osgAnimation/RigGeometry include/osgAnimation/RigTransform include/osgAnimation/RigTransformHardware @@ -423,13 +439,6 @@ include/osgPresentation/PropertyManager include/osgPresentation/SlideEventHandler include/osgPresentation/SlideShowConstructor include/osgPresentation/Timeout -%%QT%%include/osgQt/Export -%%QT%%include/osgQt/GraphicsWindowQt -%%QT%%include/osgQt/QFontImplementation -%%QT%%include/osgQt/QGraphicsViewAdapter -%%QT%%include/osgQt/QWebViewImage -%%QT%%include/osgQt/QWidgetImage -%%QT%%include/osgQt/Version include/osgShadow/ConvexPolyhedron include/osgShadow/DebugShadowMap include/osgShadow/Export @@ -437,14 +446,12 @@ include/osgShadow/LightSpacePerspectiveShadowMap include/osgShadow/MinimalCullBoundsShadowMap include/osgShadow/MinimalDrawBoundsShadowMap include/osgShadow/MinimalShadowMap -include/osgShadow/OccluderGeometry include/osgShadow/ParallelSplitShadowMap include/osgShadow/ProjectionShadowMap include/osgShadow/ShadowMap include/osgShadow/ShadowSettings include/osgShadow/ShadowTechnique include/osgShadow/ShadowTexture -include/osgShadow/ShadowVolume include/osgShadow/ShadowedScene include/osgShadow/SoftShadowMap include/osgShadow/StandardShadowMap @@ -571,6 +578,12 @@ include/osgViewer/ViewerEventHandlers include/osgViewer/api/X11/GraphicsHandleX11 include/osgViewer/api/X11/GraphicsWindowX11 include/osgViewer/api/X11/PixelBufferX11 +include/osgViewer/config/AcrossAllScreens +include/osgViewer/config/PanoramicSphericalDisplay +include/osgViewer/config/SingleScreen +include/osgViewer/config/SingleWindow +include/osgViewer/config/SphericalDisplay +include/osgViewer/config/WoWVxDisplay include/osgVolume/Export include/osgVolume/FixedFunctionTechnique include/osgVolume/Layer @@ -635,9 +648,6 @@ lib/libosgParticle.so.%%OSG_SHLIBVER%% lib/libosgPresentation.so lib/libosgPresentation.so.%%OSG_VERSION%% lib/libosgPresentation.so.%%OSG_SHLIBVER%% -%%QT%%lib/libosgQt.so -%%QT%%lib/libosgQt.so.%%OSG_VERSION%% -%%QT%%lib/libosgQt.so.%%OSG_SHLIBVER%% lib/libosgShadow.so lib/libosgShadow.so.%%OSG_VERSION%% lib/libosgShadow.so.%%OSG_SHLIBVER%% @@ -673,6 +683,7 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_bsp.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_bvh.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_cfg.so %%CURL%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_curl.so +%%COLLADA%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_dae.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_dds.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osg.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osganimation.so @@ -685,8 +696,8 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgtext.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgviewer.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgvolume.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgwidget.so +%%DCMTK%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_dicom.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_dot.so -lib/osgPlugins-%%OSG_VERSION%%/osgdb_dw.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_dxf.so %%OPENEXR%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_exr.so %%FFMPEG%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_ffmpeg.so @@ -731,6 +742,7 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_png.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_pnm.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_pov.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_pvr.so +%%ASIO%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_resthttp.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_revisions.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_rgb.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_rot.so @@ -764,7 +776,6 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_txp.so %%VNC%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_vnc.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_vtf.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_x.so -%%XINE%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_xine.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_zip.so libdata/pkgconfig/openscenegraph-osg.pc libdata/pkgconfig/openscenegraph-osgAnimation.pc @@ -773,7 +784,6 @@ libdata/pkgconfig/openscenegraph-osgFX.pc libdata/pkgconfig/openscenegraph-osgGA.pc libdata/pkgconfig/openscenegraph-osgManipulator.pc libdata/pkgconfig/openscenegraph-osgParticle.pc -%%QT%%libdata/pkgconfig/openscenegraph-osgQt.pc libdata/pkgconfig/openscenegraph-osgShadow.pc libdata/pkgconfig/openscenegraph-osgSim.pc libdata/pkgconfig/openscenegraph-osgTerrain.pc |