Skip to content

Commit

Permalink
natron: fix build in poudriere (#165)
Browse files Browse the repository at this point in the history
* natron: fix build in poudriere

* natron: fix build in poudriere
  • Loading branch information
Martinfx authored Nov 16, 2024
1 parent e41094d commit 6876e21
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 28 deletions.
6 changes: 4 additions & 2 deletions natron/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ RUN_DEPENDS= ${LOCALBASE}/OFX/Plugins/Shadertoy.ofx.bundle/Contents/Info.plist:g

LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \
libboost_system.so:devel/boost-libs \
libboost_serialization.so:devel/boost-libs \
libcairo.so:graphics/cairo \
libexpat.so:textproc/expat2 \
libfontconfig.so:x11-fonts/fontconfig \
Expand All @@ -24,10 +25,11 @@ LIB_DEPENDS= libavformat.so:multimedia/ffmpeg \
libshiboken2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/shiboken2@${PY_FLAVOR}

BUILD_DEPENDS= boost-libs>0:devel/boost-libs \
bash:shells/bash \
gsed:textproc/gsed

USES= cmake compiler:c++17-lang desktop-file-utils gettext-runtime \
pkgconfig python:3.11 qt:5 shared-mime-info shebangfix
pkgconfig localbase python:3.11 qt:5 shared-mime-info shebangfix

USE_GITHUB= yes
GH_ACCOUNT= NatronGitHub
Expand All @@ -40,7 +42,7 @@ GH_TUPLE= NatronGitHub:google-breakpad:9474c3f7f9939391f281d46c42bfe20cc0f0abd9:
NatronGitHub:SequenceParsing:3c93fcc488632b0bdfeee3181586809932357598:SequenceParsing/libs/SequenceParsing \
NatronGitHub:tinydir:3aae922:tinydir/libs/SequenceParsing/tinydir

USE_QT= concurrent core gui network opengl widgets
USE_QT= concurrent core gui network opengl widgets qmake:build buildtools:build
USE_XORG= pixman sm ice xext x11
USE_GL= gl

Expand Down
20 changes: 6 additions & 14 deletions natron/files/patch-Engine_CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,30 +1,22 @@
--- Engine/CMakeLists.txt.orig 2024-09-13 07:39:11 UTC
+++ Engine/CMakeLists.txt
@@ -74,11 +74,17 @@ add_library(NatronEngine STATIC ${NatronEngine_HEADERS
@@ -74,12 +74,17 @@ add_library(NatronEngine STATIC ${NatronEngine_HEADERS
../libs/SequenceParsing/SequenceParsing.cpp
)
add_library(NatronEngine STATIC ${NatronEngine_HEADERS} ${NatronEngine_SOURCES})
+
+find_package(Boost REQUIRED serialization)
+find_package(
+ Boost 1.85 REQUIRED
+ COMPONENTS serialization system)
+
+if(Boost_FOUND)
+ include_directories(${Boost_INCLUDE_DIRS})
+endif()
+
target_link_libraries(NatronEngine
PUBLIC
HostSupport
- Boost::headers
- Boost::serialization
+ ${Boost_LIBRARIES}
PkgConfig::Cairo
+ ${Boost_LIBRARIES}
PRIVATE
Shiboken2::libshiboken
@@ -99,6 +105,7 @@ endif()
#System library is required on windows to map network share names from drive letters
target_link_libraries(NatronEngine PRIVATE mpr)
endif()
+

target_include_directories(NatronEngine
PUBLIC
PySide2::pyside2
10 changes: 0 additions & 10 deletions natron/files/patch-config.pri

This file was deleted.

3 changes: 1 addition & 2 deletions natron/pkg-plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ share/applications/fr.natron.Natron.desktop
share/metainfo/fr.natron.Natron.appdata.xml
share/mime/x-natron.xml
share/pixmaps/natronIcon256_linux.png
share/pixmaps/natronProjectIcon_linux.png

share/pixmaps/natronProjectIcon_linux.png

0 comments on commit 6876e21

Please sign in to comment.