Index: head/graphics/natron/Makefile =================================================================== --- head/graphics/natron/Makefile (revision 473668) +++ head/graphics/natron/Makefile (revision 473669) @@ -1,57 +1,57 @@ # $FreeBSD$ PORTNAME= natron -PORTVERSION= 2.3.12 +PORTVERSION= 2.3.13 CATEGORIES= graphics MAINTAINER= olivier@FreeBSD.org COMMENT= Video compositing software LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 BUILD_DEPENDS= python-config:lang/python \ pyside${PYTHON_PKGNAMESUFFIX}>0:devel/pyside RUN_DEPENDS= ${LOCALBASE}/OFX/Plugins/IO.ofx.bundle/Contents/Info.plist:graphics/openfx-io \ ${LOCALBASE}/OFX/Plugins/Shadertoy.ofx.bundle/Contents/Info.plist:graphics/openfx-misc \ ${LOCALBASE}/OFX/Plugins/Arena.ofx.bundle/Contents/Info.plist:graphics/openfx-arena LIB_DEPENDS= libcairo.so:graphics/cairo \ libexpat.so:textproc/expat2 \ libboost_system.so:devel/boost-libs \ libshiboken-${PYTHON_VERSION}.so:devel/shiboken \ libfontconfig.so:x11-fonts/fontconfig \ libavformat.so:multimedia/ffmpeg \ libpyside-${PYTHON_VERSION}.so:devel/pyside \ libfreetype.so:print/freetype2 USES= pkgconfig python qmake qt:4 shebangfix desktop-file-utils shared-mime-info \ gettext-runtime desktop-file-utils USE_GITHUB= yes GH_ACCOUNT= NatronGitHub GH_PROJECT= Natron GH_TUPLE= NatronGitHub:openfx:a85dc34:openfx/libs/OpenFX \ NatronGitHub:google-test:50d6fc3:google_test/Tests/google-test \ NatronGitHub:google-mock:17945db:google_mock/Tests/google-mock \ NatronGitHub:google-breakpad:9474c3f:google_breakpad/libs/google-breakpad \ NatronGitHub:SequenceParsing:9e8b77a:SequenceParsing/libs/SequenceParsing \ NatronGitHub:tinydir:3aae922:tinydir/libs/SequenceParsing/tinydir \ NatronGitHub:OpenColorIO-Configs:Natron-v3.0:OpenColorIO_Configs/OpenColorIO-Configs USE_QT= corelib gui moc_build qmake_build rcc_build uic_build network opengl USE_XORG= x11 pixman USE_GL= gl SHEBANG_FILES= OpenColorIO-Configs/nuke-default/make.py post-patch: @${REINPLACE_CMD} -e 's|/usr/OFX/Plugins|${PREFIX}/OFX/Plugins|g' \ ${WRKSRC}/libs/OpenFX/Examples/Makefile.master \ ${WRKSRC}/libs/OpenFX/Support/Plugins/Makefile.master \ ${WRKSRC}/libs/OpenFX/HostSupport/src/ofxhPluginCache.cpp \ ${WRKSRC}/Engine/Settings.cpp @${REINPLACE_CMD} -e 's|/usr/share/|${PREFIX}/share/|g' \ ${WRKSRC}/Engine/AppManager.cpp \ ${WRKSRC}/Engine/Settings.cpp \ ${WRKSRC}/Natron.spec .include <bsd.port.mk> Index: head/graphics/natron/distinfo =================================================================== --- head/graphics/natron/distinfo (revision 473668) +++ head/graphics/natron/distinfo (revision 473669) @@ -1,17 +1,17 @@ -TIMESTAMP = 1528270561 -SHA256 (NatronGitHub-Natron-2.3.12_GH0.tar.gz) = 72a047c041dbd212efac2a93c0cacc4a1cd146765c7f1494f6299e444debf43f -SIZE (NatronGitHub-Natron-2.3.12_GH0.tar.gz) = 21386042 +TIMESTAMP = 1530438566 +SHA256 (NatronGitHub-Natron-2.3.13_GH0.tar.gz) = dbb6bf6b0bf9004ac2d62748a646535f117912a015d011ab8e730eda5fc09866 +SIZE (NatronGitHub-Natron-2.3.13_GH0.tar.gz) = 21393064 SHA256 (NatronGitHub-openfx-a85dc34_GH0.tar.gz) = c59082fcd9327e87ff544e93179ddc5b81d39442854283064480526ab153bfde SIZE (NatronGitHub-openfx-a85dc34_GH0.tar.gz) = 10651841 SHA256 (NatronGitHub-google-test-50d6fc3_GH0.tar.gz) = e4604551d0179cb6c38815680c119c2cebde9bccb84cb86ec47259857135e0d8 SIZE (NatronGitHub-google-test-50d6fc3_GH0.tar.gz) = 474226 SHA256 (NatronGitHub-google-mock-17945db_GH0.tar.gz) = acc265b223d50483e8113a18b29fe4930fbb21c776e0e063afd85b855bb5dd27 SIZE (NatronGitHub-google-mock-17945db_GH0.tar.gz) = 299273 SHA256 (NatronGitHub-google-breakpad-9474c3f_GH0.tar.gz) = 7bb300511e6511789c733b48d9065ff0f9694042e65e508d833b28553038cb73 SIZE (NatronGitHub-google-breakpad-9474c3f_GH0.tar.gz) = 4890247 SHA256 (NatronGitHub-SequenceParsing-9e8b77a_GH0.tar.gz) = 7a2c1591b3198f8780bf2b791494da0d9bbd74d073653baa295ff30bf00c16fe SIZE (NatronGitHub-SequenceParsing-9e8b77a_GH0.tar.gz) = 15980 SHA256 (NatronGitHub-tinydir-3aae922_GH0.tar.gz) = eb816fff00d9713742a1f1367432fee0ea73ccb0f458c90035543e923e8e55d1 SIZE (NatronGitHub-tinydir-3aae922_GH0.tar.gz) = 24552 SHA256 (NatronGitHub-OpenColorIO-Configs-Natron-v3.0_GH0.tar.gz) = 1d760f6a97fa0b44f69bdfe7d8e9949957fe4ccd1389b3059630094649ff249e SIZE (NatronGitHub-OpenColorIO-Configs-Natron-v3.0_GH0.tar.gz) = 292562114 Index: head/graphics/natron/files/patch-Engine_AppManagerPrivate.cpp =================================================================== --- head/graphics/natron/files/patch-Engine_AppManagerPrivate.cpp (revision 473668) +++ head/graphics/natron/files/patch-Engine_AppManagerPrivate.cpp (nonexistent) @@ -1,29 +0,0 @@ ---- Engine/AppManagerPrivate.cpp.orig 2018-05-23 13:32:30.000000000 +0200 -+++ Engine/AppManagerPrivate.cpp 2018-06-06 10:16:23.029583000 +0200 -@@ -191,7 +191,7 @@ AppManagerPrivate::createBreakpadHandler(const QString - (void*)NULL, - true, - breakpadPipePath.toStdString().c_str() ); --#elif defined(Q_OS_LINUX) -+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - Q_UNUSED(breakpadPipePath); - breakpadHandler = boost::make_shared<google_breakpad::ExceptionHandler>( google_breakpad::MinidumpDescriptor( dumpPath.toStdString() ), - google_breakpad::ExceptionHandler::FilterCallback(NULL), -@@ -616,7 +616,7 @@ AppManagerPrivate::initGLAPISpecific() - // scoped_ptr - wglInfo.reset(new OSGLContext_wgl_data); - OSGLContext_win::initWGLData( wglInfo.get() ); --#elif defined(Q_OS_LINUX) -+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - // scoped_ptr - glxInfo.reset(new OSGLContext_glx_data); - OSGLContext_x11::initGLXData( glxInfo.get() ); -@@ -994,7 +994,7 @@ AppManagerPrivate::tearDownGL() - if (wglInfo) { - OSGLContext_win::destroyWGLData( wglInfo.get() ); - } --#elif defined(Q_OS_LINUX) -+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - if (glxInfo) { - OSGLContext_x11::destroyGLXData( glxInfo.get() ); - } Property changes on: head/graphics/natron/files/patch-Engine_AppManagerPrivate.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/natron/files/patch-Engine_AppManagerPrivate.h =================================================================== --- head/graphics/natron/files/patch-Engine_AppManagerPrivate.h (revision 473668) +++ head/graphics/natron/files/patch-Engine_AppManagerPrivate.h (nonexistent) @@ -1,20 +0,0 @@ ---- Engine/AppManagerPrivate.h.orig 2017-08-13 15:26:35 UTC -+++ Engine/AppManagerPrivate.h -@@ -52,7 +52,7 @@ GCC_DIAG_ON(deprecated) - #endif - #endif - --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - #include "Engine/OSGLContext_x11.h" - #elif defined(Q_OS_WIN32) - #include "Engine/OSGLContext_win.h" -@@ -184,7 +184,7 @@ struct AppManagerPrivate (public) - #ifdef Q_OS_WIN32 - boost::scoped_ptr<OSGLContext_wgl_data> wglInfo; - #endif --#ifdef Q_OS_LINUX -+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - boost::scoped_ptr<OSGLContext_glx_data> glxInfo; - #endif - Property changes on: head/graphics/natron/files/patch-Engine_AppManagerPrivate.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/natron/files/patch-global.pri =================================================================== --- head/graphics/natron/files/patch-global.pri (revision 473668) +++ head/graphics/natron/files/patch-global.pri (nonexistent) @@ -1,25 +0,0 @@ ---- global.pri.orig 2017-08-13 15:26:35 UTC -+++ global.pri -@@ -308,18 +308,20 @@ unix { - expat: PKGCONFIG += expat - - # GLFW will require a link to X11 on linux and OpenGL framework on OS X -- linux-* { -+ linux-*|freebsd-* { - LIBS += -lGL -lX11 - # link with static cairo on linux, to avoid linking to X11 libraries in NatronRenderer - cairo { - PKGCONFIG += pixman-1 freetype2 fontconfig - LIBS += $$system(pkg-config --variable=libdir cairo)/libcairo.a - } -- LIBS += -ldl - QMAKE_LFLAGS += '-Wl,-rpath,\'\$$ORIGIN/../lib\',-z,origin' - } else { - LIBS += -framework OpenGL - cairo: PKGCONFIG += cairo -+ } -+ linux-* { -+ LIBS += -ldl - } - - # User may specify an alternate python2-config from the command-line, Property changes on: head/graphics/natron/files/patch-global.pri ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/natron/files/patch-Engine_StandardPaths.cpp =================================================================== --- head/graphics/natron/files/patch-Engine_StandardPaths.cpp (revision 473668) +++ head/graphics/natron/files/patch-Engine_StandardPaths.cpp (nonexistent) @@ -1,29 +0,0 @@ ---- Engine/StandardPaths.cpp.orig 2017-08-13 15:26:35 UTC -+++ Engine/StandardPaths.cpp -@@ -46,7 +46,7 @@ - #endif - #include <QtCore/QFileInfo> - --#elif defined(Q_OS_LINUX) -+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - #include <cerrno> - #include <unistd.h> - #include <sys/stat.h> -@@ -182,7 +182,7 @@ convertCharArray(const wchar_t *path) - return QDir::fromNativeSeparators( QString::fromWCharArray(path) ); - } - --#elif defined(Q_OS_LINUX) -+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - //static - QString - resolveUserName(uint userId) -@@ -333,7 +333,7 @@ StandardPaths::writableLocation(StandardLocationEnum t - - return macLocation(type, kOnAppropriateDisk); - } --#elif defined(Q_OS_LINUX) -+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - switch (type) { - case eStandardLocationHome: - Property changes on: head/graphics/natron/files/patch-Engine_StandardPaths.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property