Index: devel/simgear/Makefile =================================================================== --- devel/simgear/Makefile +++ devel/simgear/Makefile @@ -2,6 +2,7 @@ PORTNAME= simgear PORTVERSION= 2017.3.1 +PORTREVISION= 1 CATEGORIES= devel games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} Index: games/flightgear/Makefile =================================================================== --- games/flightgear/Makefile +++ games/flightgear/Makefile @@ -3,7 +3,7 @@ PORTNAME= flightgear PORTVERSION= 2017.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} Index: games/openmw/Makefile =================================================================== --- games/openmw/Makefile +++ games/openmw/Makefile @@ -4,6 +4,7 @@ PORTNAME= openmw DISTVERSIONPREFIX= openmw- DISTVERSION= 0.43.0 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= tobik@FreeBSD.org Index: games/palomino/Makefile =================================================================== --- games/palomino/Makefile +++ games/palomino/Makefile @@ -3,7 +3,7 @@ PORTNAME= palomino PORTVERSION= 20131231 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF/palomino-sim DISTFILES= ${PORTNAME}_src_${PORTVERSION}.txz \ Index: graphics/osg/Makefile =================================================================== --- graphics/osg/Makefile +++ graphics/osg/Makefile @@ -1,13 +1,10 @@ # Created by: Randall Hopper # $FreeBSD$ -PORTNAME= osg -PORTVERSION= 3.4.0 -PORTREVISION= 4 +PORTNAME= OpenSceneGraph +DISTVERSIONPREFIX= ${PORTNAME}- +DISTVERSION= 3.5.9 CATEGORIES= graphics -MASTER_SITES= http://trac.openscenegraph.org/downloads/developer_releases/ \ - http://mirror.amdmi3.ru/distfiles/ -DISTNAME= OpenSceneGraph-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= C++ OpenGL scene graph library for real-time rendering @@ -17,24 +14,28 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +BUILD_DEPENDS= ${LOCALBASE}/include/asio.hpp:net/asio \ + ${LOCALBASE}/include/boost/variant.hpp:devel/boost-libs LIB_DEPENDS= libpng.so:graphics/png \ libtiff.so:graphics/tiff CONFLICTS= osg-devel-[0-9]* -USES= alias cmake:outsource jpeg pkgconfig zip +USES= alias cmake:outsource jpeg localbase:ldflags pkgconfig +USE_GITHUB= yes +GH_ACCOUNT= openscenegraph USE_GL= gl glu -USE_XORG= x11 +USE_XORG= x11 xinerama USE_LDCONFIG= yes PLIST_SUB= OSG_VERSION=${PORTVERSION} \ - OSG_SHLIBVER=130 \ - OPENTHREADS_VERSION=3.3.0 \ - OPENTHREADS_SHLIBVER=20 + OSG_SHLIBVER=153 \ + OPENTHREADS_VERSION=3.3.1 \ + OPENTHREADS_SHLIBVER=21 PORTSCOUT= limitw:1,even -OPTIONS_DEFINE= CURL FFMPEG FREETYPE GDAL GIF GSTREAMER GTA INVENTOR \ +OPTIONS_DEFINE= CURL EXAMPLES FFMPEG FREETYPE GDAL GIF GSTREAMER GTA INVENTOR \ JASPER LIBLAS LUA NVTT OPENEXR PDF SDL \ SVG VNC XINE XRANDR OPTIONS_RADIO= QT @@ -55,6 +56,7 @@ CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_VARS= FORCE_REQUIRE+=CURL CURL_VARS_OFF= FORCE_IGNORE+=CURL +EXAMPLES_CMAKE_BOOL= BUILD_OSG_EXAMPLES FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_VARS= FORCE_REQUIRE+=FFmpeg FFMPEG_VARS_OFF= FORCE_IGNORE+=FFmpeg @@ -90,7 +92,8 @@ NVTT_LIB_DEPENDS= libnvtt.so:graphics/nvidia-texture-tools NVTT_VARS= FORCE_REQUIRE+=NVTT NVTT_VARS_OFF= FORCE_IGNORE+=NVTT -OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/OpenEXR +OPENEXR_LIB_DEPENDS= libIex-2_2.so:graphics/ilmbase \ + libIlmImf-2_2.so.23:graphics/OpenEXR OPENEXR_VARS= FORCE_REQUIRE+=OpenEXR OPENEXR_VARS_OFF= FORCE_IGNORE+=OpenEXR PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib @@ -109,7 +112,7 @@ SDL_VARS= FORCE_REQUIRE+=SDL SDL_VARS_OFF= FORCE_IGNORE+=SDL SVG_LIB_DEPENDS= librsvg-2.so:graphics/librsvg2 -SVG_USE= gnome=cairo +SVG_USE= gnome=cairo,gdkpixbuf2 SVG_VARS= FORCE_REQUIRE+=RSVG SVG_VARS_OFF= FORCE_IGNORE+=RSVG VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver @@ -129,6 +132,8 @@ FORCE_IGNORE+= ITK # ports version doesn't build on 10.x FORCE_REQUIRE= Threads OpenGL X11 JPEG PNG TIFF ZLIB # common & lightweight +PORTEXAMPLES= * + .include .if ${PORT_OPTIONS:MQT4} || ${PORT_OPTIONS:MQT5} @@ -142,6 +147,8 @@ post-patch: @${FIND} ${WRKSRC}/CMakeModules -type f -print0 | ${XARGS} -0 \ ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' + @${REINPLACE_CMD} -e 's|share/${PORTNAME}/bin|share/examples/${PORTNAME}/bin|g' \ + ${WRKSRC}/CMakeModules/OsgMacroUtils.cmake @${REINPLACE_CMD} -e '/FIND_LIBRARY.*DL_LIBRARY/ d' \ ${WRKSRC}/CMakeLists.txt .for p in ${FORCE_REQUIRE} Index: graphics/osg/distinfo =================================================================== --- graphics/osg/distinfo +++ graphics/osg/distinfo @@ -1,2 +1,3 @@ -SHA256 (OpenSceneGraph-3.4.0.zip) = 5c727d84755da276adf8c4a4a3a8ba9c9570fc4b4969f06f1d2e9f89b1e3040e -SIZE (OpenSceneGraph-3.4.0.zip) = 7975023 +TIMESTAMP = 1512970648 +SHA256 (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.5.9_GH0.tar.gz) = e18bd54d7046ea73525941244ef4f77b38b2a90bdf21d81468ac3874c41e9448 +SIZE (openscenegraph-OpenSceneGraph-OpenSceneGraph-3.5.9_GH0.tar.gz) = 5768001 Index: graphics/osg/files/patch-CMakeModules-FindGTA.cmake =================================================================== --- graphics/osg/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) Index: graphics/osg/files/patch-CMakeModules_FindGStreamer.cmake =================================================================== --- graphics/osg/files/patch-CMakeModules_FindGStreamer.cmake +++ graphics/osg/files/patch-CMakeModules_FindGStreamer.cmake @@ -1,6 +1,6 @@ ---- CMakeModules/FindGStreamer.cmake 2015-07-17 21:31:19.000000000 +0300 -+++ CMakeModules/FindGStreamer.cmake 2015-02-25 22:25:34.000000000 +0300 -@@ -83,18 +83,18 @@ +--- CMakeModules/FindGStreamer.cmake.orig 2017-12-11 07:40:40 UTC ++++ CMakeModules/FindGStreamer.cmake +@@ -83,18 +83,18 @@ else () find_package(PkgConfig) macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library) @@ -12,17 +12,16 @@ -# HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} ${PC_${_component_prefix}_INCLUDEDIR} -# PATH_SUFFIXES gstreamer-1.0 -# ) -- --# find_library(${_component_prefix}_LIBRARIES --# NAMES ${_library} --# HINTS ${PC_${_component_prefix}_LIBRARY_DIRS} ${PC_${_component_prefix}_LIBDIR} --# ) + find_path(${_component_prefix}_INCLUDE_DIRS + NAMES ${_header} + HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} ${PC_${_component_prefix}_INCLUDEDIR} + PATH_SUFFIXES gstreamer-1.0 + ) -+ + +-# find_library(${_component_prefix}_LIBRARIES +-# NAMES ${_library} +-# HINTS ${PC_${_component_prefix}_LIBRARY_DIRS} ${PC_${_component_prefix}_LIBDIR} +-# ) + find_library(${_component_prefix}_LIBRARIES + NAMES ${_library} + HINTS ${PC_${_component_prefix}_LIBRARY_DIRS} ${PC_${_component_prefix}_LIBDIR} Index: graphics/osg/files/patch-ffmpeg3 =================================================================== --- graphics/osg/files/patch-ffmpeg3 +++ /dev/null @@ -1,157 +0,0 @@ -Description: Replace deprecated FFmpeg API -Author: Andreas Cadhalpun -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(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(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( 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 - } - --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; - - } - Index: graphics/osg/files/patch-shift-key-fix =================================================================== --- graphics/osg/files/patch-shift-key-fix +++ /dev/null @@ -1,23 +0,0 @@ -# Shift key not released if group switch is something other than Control-Shift: -# https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1218650.html - ---- src/osgGA/EventQueue.cpp.orig -+++ src/osgGA/EventQueue.cpp -@@ -337,7 +337,7 @@ void EventQueue::mouseButtonRelease(floa - - void EventQueue::keyPress(int key, double time, int unmodifiedKey) - { -- switch(key) -+ switch(unmodifiedKey) - { - case(GUIEventAdapter::KEY_Shift_L): _accumulateEventState->setModKeyMask(GUIEventAdapter::MODKEY_LEFT_SHIFT | _accumulateEventState->getModKeyMask()); break; - case(GUIEventAdapter::KEY_Shift_R): _accumulateEventState->setModKeyMask(GUIEventAdapter::MODKEY_RIGHT_SHIFT | _accumulateEventState->getModKeyMask()); break; -@@ -381,7 +381,7 @@ void EventQueue::keyPress(int key, doubl - - void EventQueue::keyRelease(int key, double time, int unmodifiedKey) - { -- switch(key) -+ switch(unmodifiedKey) - { - case(GUIEventAdapter::KEY_Shift_L): _accumulateEventState->setModKeyMask(~GUIEventAdapter::MODKEY_LEFT_SHIFT & _accumulateEventState->getModKeyMask()); break; - case(GUIEventAdapter::KEY_Shift_R): _accumulateEventState->setModKeyMask(~GUIEventAdapter::MODKEY_RIGHT_SHIFT & _accumulateEventState->getModKeyMask()); break; Index: graphics/osg/files/patch-src-OpenThreads-CMakeLists.txt =================================================================== --- graphics/osg/files/patch-src-OpenThreads-CMakeLists.txt +++ graphics/osg/files/patch-src-OpenThreads-CMakeLists.txt @@ -1,8 +1,8 @@ ---- 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 @@ +--- src/OpenThreads/CMakeLists.txt.orig 2017-11-29 14:49:00 UTC ++++ src/OpenThreads/CMakeLists.txt +@@ -113,4 +113,4 @@ CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/pac @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 lib${LIB_POSTFIX}/pkgconfig COMPONENT libopenthreads-dev) +INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/pkgconfig/openthreads.pc DESTINATION libdata/pkgconfig) Index: graphics/osg/files/patch-src-OpenThreads-pthreads-PThread.cpp =================================================================== --- graphics/osg/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 - #include - #include -+#include - #include - - #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) Index: graphics/osg/files/patch-src_OpenThreads_pthreads_CMakeLists.txt =================================================================== --- /dev/null +++ graphics/osg/files/patch-src_OpenThreads_pthreads_CMakeLists.txt @@ -0,0 +1,29 @@ +--- src/OpenThreads/pthreads/CMakeLists.txt.orig 2017-12-11 07:43:36 UTC ++++ src/OpenThreads/pthreads/CMakeLists.txt +@@ -72,7 +72,7 @@ ELSE() + CHECK_CXX_SOURCE_COMPILES(" + #include + int main() { +- cpu_set_t cpumask; ++ cpuset_t cpumask; + CPU_ZERO( &cpumask ); + CPU_SET( 0, &cpumask ); + pthread_setaffinity_np( pthread_self(), sizeof(cpumask), &cpumask); +@@ -90,7 +90,7 @@ ELSE() + CHECK_CXX_SOURCE_COMPILES(" + #include + int main() { +- cpu_set_t cpumask; ++ cpuset_t cpumask; + sched_setaffinity( 0, sizeof(cpumask), &cpumask ); + return 0; + }" HAVE_THREE_PARAM_SCHED_SETAFFINITY) +@@ -100,7 +100,7 @@ ELSE() + CHECK_CXX_SOURCE_COMPILES(" + #include + int main() { +- cpu_set_t cpumask; ++ cpuset_t cpumask; + sched_setaffinity( 0, &cpumask ); + return 0; + }" HAVE_TWO_PARAM_SCHED_SETAFFINITY) Index: graphics/osg/files/patch-src_OpenThreads_pthreads_PThread.cpp =================================================================== --- /dev/null +++ graphics/osg/files/patch-src_OpenThreads_pthreads_PThread.cpp @@ -0,0 +1,19 @@ +--- src/OpenThreads/pthreads/PThread.cpp.orig 2017-12-11 07:44:35 UTC ++++ src/OpenThreads/pthreads/PThread.cpp +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + + #if defined __linux__ || defined __sun || defined __APPLE__ || ANDROID +@@ -113,7 +114,7 @@ namespace OpenThreads + static void setAffinity(const Affinity& affinity) + { + //std::cout<<"setProcessAffinity : "<< affinity.activeCPUs.size() <setModKeyMask(GUIEventAdapter::MODKEY_LEFT_SHIFT | _accumulateEventState->getModKeyMask()); break; + case(GUIEventAdapter::KEY_Shift_R): _accumulateEventState->setModKeyMask(GUIEventAdapter::MODKEY_RIGHT_SHIFT | _accumulateEventState->getModKeyMask()); break; +@@ -403,7 +403,7 @@ osgGA::GUIEventAdapter* EventQueue::keyP + + osgGA::GUIEventAdapter* EventQueue::keyRelease(int key, double time, int unmodifiedKey) + { +- switch(key) ++ switch(unmodifiedKey) + { + case(GUIEventAdapter::KEY_Shift_L): _accumulateEventState->setModKeyMask(~GUIEventAdapter::MODKEY_LEFT_SHIFT & _accumulateEventState->getModKeyMask()); break; + case(GUIEventAdapter::KEY_Shift_R): _accumulateEventState->setModKeyMask(~GUIEventAdapter::MODKEY_RIGHT_SHIFT & _accumulateEventState->getModKeyMask()); break; Index: graphics/osg/pkg-plist =================================================================== --- graphics/osg/pkg-plist +++ graphics/osg/pkg-plist @@ -1,9 +1,12 @@ +bin/osg2cpp bin/osgarchive bin/osgconv bin/osgfilecache +bin/osgshaderpipeline bin/osgversion bin/osgviewer bin/present3D +include/OpenThreads/Affinity include/OpenThreads/Atomic include/OpenThreads/Barrier include/OpenThreads/Block @@ -21,7 +24,7 @@ include/osg/ApplicationUsage include/osg/ArgumentParser include/osg/Array -include/osg/ArrayDispatchers +include/osg/AttributeDispatchers include/osg/AudioStream include/osg/AutoTransform include/osg/Billboard @@ -51,7 +54,9 @@ include/osg/ColorMaski include/osg/ColorMatrix include/osg/ComputeBoundsVisitor +include/osg/ComputeDispatch include/osg/Config +include/osg/ContextData include/osg/ConvexPlanarOccluder include/osg/ConvexPlanarPolygon include/osg/CoordinateSystemNode @@ -62,6 +67,7 @@ include/osg/CullingSet include/osg/DeleteHandler include/osg/Depth +include/osg/DepthRangeIndexed include/osg/DisplaySettings include/osg/DrawPixels include/osg/Drawable @@ -74,7 +80,6 @@ include/osg/FrontFace include/osg/GL include/osg/GL2Extensions -include/osg/GLBeginEndAdapter include/osg/GLDefines include/osg/GLExtensions include/osg/GLObjects @@ -86,6 +91,7 @@ include/osg/GraphicsThread include/osg/Group include/osg/Hint +include/osg/Identifier include/osg/Image include/osg/ImageSequence include/osg/ImageStream @@ -130,6 +136,7 @@ include/osg/PositionAttitudeTransform include/osg/PrimitiveRestartIndex include/osg/PrimitiveSet +include/osg/PrimitiveSetIndirect include/osg/Program include/osg/Projection include/osg/ProxyNode @@ -138,6 +145,7 @@ include/osg/RenderInfo include/osg/SampleMaski include/osg/Scissor +include/osg/ScissorIndexed include/osg/ScriptEngine include/osg/Sequence include/osg/ShadeModel @@ -156,6 +164,7 @@ include/osg/StencilTwoSided include/osg/Switch include/osg/TemplatePrimitiveFunctor +include/osg/TemplatePrimitiveIndexFunctor include/osg/TexEnv include/osg/TexEnvCombine include/osg/TexEnvFilter @@ -176,10 +185,15 @@ 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/VertexArrayState +include/osg/ViewportIndexed include/osg/Vec2 include/osg/Vec2b include/osg/Vec2d @@ -238,6 +252,8 @@ include/osgAnimation/Interpolator include/osgAnimation/Keyframe include/osgAnimation/LinkVisitor +include/osgAnimation/MorphTransformHardware +include/osgAnimation/MorphTransformSoftware include/osgAnimation/MorphGeometry include/osgAnimation/RigGeometry include/osgAnimation/RigTransform @@ -556,6 +572,12 @@ include/osgUtil/TriStripVisitor include/osgUtil/UpdateVisitor include/osgUtil/Version +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/osgViewer/CompositeViewer include/osgViewer/Export include/osgViewer/GraphicsWindow @@ -685,7 +707,6 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgvolume.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_deprecated_osgwidget.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 @@ -732,6 +753,7 @@ lib/osgPlugins-%%OSG_VERSION%%/osgdb_pov.so lib/osgPlugins-%%OSG_VERSION%%/osgdb_pvr.so %%QT4%%lib/osgPlugins-%%OSG_VERSION%%/osgdb_qfont.so +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 Index: graphics/osgearth/Makefile =================================================================== --- graphics/osgearth/Makefile +++ graphics/osgearth/Makefile @@ -4,6 +4,7 @@ PORTNAME= osgearth PORTVERSION= 2.8 DISTVERSIONPREFIX= ${PORTNAME}- +PORTREVISION= 1 CATEGORIES= graphics geography MAINTAINER= lbartoletti@tuxfamily.org