archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-08 22:45:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/opencascade to 7.7.2-2

Browse source
This commit is contained in:
Kevin Mihelich 2023-11-17 00:47:32 +00:00
parent 8389e09342
commit c9fbe6ec16
8 changed files with 61 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
extra/opencascade/.SRCINFO Normal file
View file

@ -0,0 +1,46 @@
pkgbase = opencascade
pkgdesc = SDK intended for development of applications dealing with 3D CAD data
pkgver = 7.7.2
pkgrel = 2
epoch = 1
url = https://www.opencascade.org
arch = x86_64
license = LGPL2.1
license = custom:LGPL-exception
makedepends = git
makedepends = adios2
makedepends = boost
makedepends = cmake
makedepends = eigen
makedepends = gdal
makedepends = glew
makedepends = libharu
makedepends = liblas
makedepends = openvr
makedepends = pdal
makedepends = proj
makedepends = pugixml
makedepends = python
makedepends = python-mpi4py
makedepends = qt5-base
makedepends = rapidjson
makedepends = unixodbc
makedepends = utf8cpp
depends = freeimage
depends = gl2ps
depends = tk
depends = vtk
source = opencascade::git+https://git.dev.opencascade.org/repos/occt.git#commit=cec1ecd0c9f3b3d2572c47035d11949e8dfa85e2
source = opencascade.sh
source = fix-cmake-variable.patch
source = skip-license-installation.patch
sha512sums = SKIP
sha512sums = a7516028e55fd303dc1cfb61b75c9cb209d431d854b4d1c58f9c19df8ecee9d79da5c8745676c68a2de0980652de4c4d1c5a927c25db1e5146fb1f1f43c5906b
sha512sums = ad6ce2f52462989bd990b52fd5428f3e5cbd4fb15c38d92c0e0954e6afc3368fca961b92efead8e8957213352fb87a469e1bfaccaf14b484351acc0a0bc10485
sha512sums = 86e6502c92cbb8c2736cdeaf25b2ea39b87a650e490e042d6d86c2d67d310ef4ee2050108228ff776061603840ec0aa74e534270fb5c53585475de715212c5fa
b2sums = SKIP
b2sums = da9db038ed2348d2d7736505eda2f40fe52c836bcedb74d9f369cc53f7d40a330bd87d6aedd773863745cd46e4dbe5876acda2d2d60177f00d5db9cae4f1f102
b2sums = bb98b2b53a9a97ae15a353a9dbcc6d92a97ddaa56af0610cefe9de3a4b84c4a6021d9396f7e270c1d379278df069dbf90f9771db64947e52d38ad36bc3c6f913
b2sums = 7562ce632b9a0db7faba4f373de5f108b27395a4dd62721711a7cd1f519c44348a1df5c6834e7691072abbdcef66365fc9245dee8775c51d122e0455874f8236
pkgname = opencascade

47
extra/opencascade/PKGBUILD
View file

@ -1,5 +1,5 @@
# Maintainer: Kyle Keen <keenerd@gmail.com>
# Maintainer: George Rawlinson <grawlinson@archlinux.org> # Maintainer: George Rawlinson <grawlinson@archlinux.org>
# Contributor: Kyle Keen <keenerd@gmail.com>
# Contributor: Gabriel Souza Franco <Z2FicmllbGZyYW5jb3NvdXphQGdtYWlsLmNvbQ==> # Contributor: Gabriel Souza Franco <Z2FicmllbGZyYW5jb3NvdXphQGdtYWlsLmNvbQ==>
# Contributor: Florian Pritz <bluewind@xinu.at> # Contributor: Florian Pritz <bluewind@xinu.at>
# Contributor: Giuseppe Borzi <gborzi@ieee.org> # Contributor: Giuseppe Borzi <gborzi@ieee.org>
@ -10,18 +10,16 @@
# - removed makedepends on adios2 # - removed makedepends on adios2
pkgname=opencascade pkgname=opencascade
pkgver=7.6.3 pkgver=7.7.2
pkgrel=3 pkgrel=2
epoch=1 epoch=1
pkgdesc='SDK intended for development of applications dealing with 3D CAD data' pkgdesc='SDK intended for development of applications dealing with 3D CAD data'
arch=('x86_64') arch=('x86_64')
url='https://www.opencascade.org' url='https://www.opencascade.org'
license=('LGPL2.1' 'custom:LGPL-exception') license=('LGPL2.1' 'custom:LGPL-exception')
depends=( depends=(
'ffmpeg4.4'
'freeimage' 'freeimage'
'gl2ps' 'gl2ps'
'intel-tbb'
'tk' 'tk'
'vtk' 'vtk'
) )
@ -45,36 +43,21 @@ makedepends=(
'unixodbc' 'unixodbc'
'utf8cpp' 'utf8cpp'
) )
_commit='b079fb9877ef64d4a8158a60fa157f59b096debb' _commit='cec1ecd0c9f3b3d2572c47035d11949e8dfa85e2'
source=( source=(
"$pkgname::git+https://git.dev.opencascade.org/repos/occt.git#commit=$_commit" "$pkgname::git+https://git.dev.opencascade.org/repos/occt.git#commit=$_commit"
'opencascade.sh' 'opencascade.sh'
'fix-install-dir-references.patch' 'fix-cmake-variable.patch'
'cmake-fix-variable.patch'
'skip-license-installation.patch' 'skip-license-installation.patch'
'vtk9.patch'
'opencascade-tbb-2021.patch'
'ffmpeg4.4.patch'
'vtk-6.2.patch::https://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff_plain;h=7f523af8'
) )
sha512sums=('SKIP' sha512sums=('SKIP'
'a7516028e55fd303dc1cfb61b75c9cb209d431d854b4d1c58f9c19df8ecee9d79da5c8745676c68a2de0980652de4c4d1c5a927c25db1e5146fb1f1f43c5906b' 'a7516028e55fd303dc1cfb61b75c9cb209d431d854b4d1c58f9c19df8ecee9d79da5c8745676c68a2de0980652de4c4d1c5a927c25db1e5146fb1f1f43c5906b'
'826b8572eb298696b0005701bca5ad0406151ec7aa88cd53f9ffaf23a306003a48416b6d120dc5c7e3c14d290e9a15ba93943c4846b6fee8bdb06bd699904f79'
'ad6ce2f52462989bd990b52fd5428f3e5cbd4fb15c38d92c0e0954e6afc3368fca961b92efead8e8957213352fb87a469e1bfaccaf14b484351acc0a0bc10485' 'ad6ce2f52462989bd990b52fd5428f3e5cbd4fb15c38d92c0e0954e6afc3368fca961b92efead8e8957213352fb87a469e1bfaccaf14b484351acc0a0bc10485'
'fd8499793b12e4e59420f63351fef9599c3976d307979beea2681b873a340ae673ba643a7060c74bec1dd4801954c99f8f1f1a8bcc3baa3db9cbfce32153675e' '86e6502c92cbb8c2736cdeaf25b2ea39b87a650e490e042d6d86c2d67d310ef4ee2050108228ff776061603840ec0aa74e534270fb5c53585475de715212c5fa')
'2725df308f23f11faa664391174a4f21bec13328c7b33ba065bfd28988a4bd815c86849d8815fcdb8f6ed5dd1d7b1a38ded1675c1c08dec1276367fc571917c0'
'1d6e0321d0b54caf0130b2c6f81dbbdc621913ffa1c38e464d9be65088085fc831ac69788393911a1dd269f4296c93d26c1706d262537912459eb795bc4f742b'
'cb2c9602e7f18ab0543bb84f9f6cd5f759c0bf9de599fc25015fef4efd96d216c044250fc49bafa2d71de2a36e4ccd534416da1971d04f2c8f932751c0db6c50'
'0f3ba616c840d972c8d0da620a607e685d44e00cf135924f381d9200bdc91ede8c3b542355123358f2cb554188580bb243cb5341596382b4ff5a404c66c8b6d2')
b2sums=('SKIP' b2sums=('SKIP'
'da9db038ed2348d2d7736505eda2f40fe52c836bcedb74d9f369cc53f7d40a330bd87d6aedd773863745cd46e4dbe5876acda2d2d60177f00d5db9cae4f1f102' 'da9db038ed2348d2d7736505eda2f40fe52c836bcedb74d9f369cc53f7d40a330bd87d6aedd773863745cd46e4dbe5876acda2d2d60177f00d5db9cae4f1f102'
'a56cedf43366d52a81301d653834942fb74a4feafb4ac57923448d42164f060f1874a2180688e482c0dac70a5ea1d2fb53d4410503f22626ff5d2bab405a352f'
'bb98b2b53a9a97ae15a353a9dbcc6d92a97ddaa56af0610cefe9de3a4b84c4a6021d9396f7e270c1d379278df069dbf90f9771db64947e52d38ad36bc3c6f913' 'bb98b2b53a9a97ae15a353a9dbcc6d92a97ddaa56af0610cefe9de3a4b84c4a6021d9396f7e270c1d379278df069dbf90f9771db64947e52d38ad36bc3c6f913'
'da815c14ad3a8283c4f3cf41b6b19b40408798f64374b909c776f5ab22ee9ccfc2653c09b33c7b550a138007ff2b36b40d742c9fddc7c1ea499dfe58e59f57ea' '7562ce632b9a0db7faba4f373de5f108b27395a4dd62721711a7cd1f519c44348a1df5c6834e7691072abbdcef66365fc9245dee8775c51d122e0455874f8236')
'af240c6f9ba62f336f59caa7cff2bb40915137a02f5b03ee54fa17a5ef27d0411800aa981090a17b3d7c780835625bd4b263975eb100aa71fdc58eb1806916ea'
'905d13cf39225c1148e215ad37ab601dfe649f3d4d66b099ae028cdf8fb2a92534e7b14361238566c295ae443a3a3dfeb5f69ab51987b952604eb53821fa92cd'
'2a7861d4273344f62b7356f4a171d461e607a217f07e37fa869d24c6ffed7682948c8870bccf71e80bd8bbdeffcf32d74fb25d6a20c4344c4017618d1606f27d'
'913993c78ef8afabca76ba45770a00507baa54d2b321a082f54357bb6cdadda1fe56de5e02c1f37b5b80188e3ef17993f0317838c2145e7d90566c648e6b77c3')
pkgver() { pkgver() {
cd "$pkgname" cd "$pkgname"
@ -84,14 +67,8 @@ pkgver() {
prepare() { prepare() {
cd "$pkgname" cd "$pkgname"
patch -p1 -i ../fix-install-dir-references.patch patch -p1 -i ../fix-cmake-variable.patch
patch -p1 -i ../cmake-fix-variable.patch
#patch -p1 -i ../vtk9.patch # Fix build with VTK 9 https://gitlab.kitware.com/vtk/vtk/-/issues/18240
#git cherry-pick -n 5e7632824302761b84cfceb5bfb2241d906d0eb4 # Fix build of FreeCAD
patch -p1 -i ../skip-license-installation.patch patch -p1 -i ../skip-license-installation.patch
patch -p1 -i ../opencascade-tbb-2021.patch # Fix build with TBB 2021
patch -p1 -i ../ffmpeg4.4.patch # Use FFmpeg 4.4
patch -p1 -i ../vtk-6.2.patch # Fix build with VTK 6.2
} }
build() { build() {
@ -102,10 +79,10 @@ build() {
-D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_PREFIX=/usr \
-D BUILD_RELEASE_DISABLE_EXCEPTIONS=OFF \ -D BUILD_RELEASE_DISABLE_EXCEPTIONS=OFF \
-D USE_FREEIMAGE=ON \ -D USE_FREEIMAGE=ON \
-D USE_FFMPEG=ON \ -D USE_FFMPEG=OFF \
-D USE_VTK=ON \ -D USE_VTK=ON \
-D USE_RAPIDJSON=ON \ -D USE_RAPIDJSON=ON \
-D USE_TBB=ON \ -D USE_TBB=OFF \
-D 3RDPARTY_VTK_INCLUDE_DIR=/usr/include/vtk -D 3RDPARTY_VTK_INCLUDE_DIR=/usr/include/vtk
cmake --build build cmake --build build
@ -125,6 +102,10 @@ package() {
# licenses # licenses
install -vDm755 -t "$pkgdir/usr/share/licenses/$pkgname" \ install -vDm755 -t "$pkgdir/usr/share/licenses/$pkgname" \
LICENSE_LGPL_21.txt OCCT_LGPL_EXCEPTION.txt LICENSE_LGPL_21.txt OCCT_LGPL_EXCEPTION.txt
# what the *hell* is this crap?
cd "$pkgdir/usr/lib/cmake/opencascade"
sed -e 's/\\\${OCCT_INSTALL_BIN_LETTER}//' -i *.cmake
} }
# vim:set ts=2 sw=2 et: # vim:set ts=2 sw=2 et:

26
extra/opencascade/ffmpeg4.4.patch
View file

@ -1,26 +0,0 @@
--- a/adm/cmake/ffmpeg.cmake
+++ b/adm/cmake/ffmpeg.cmake
@@ -93,12 +93,12 @@ if (NOT 3RDPARTY_FFMPEG_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_FFMPEG_INCLUDE_DIR
if (3RDPARTY_FFMPEG_DIR AND EXISTS "${3RDPARTY_FFMPEG_DIR}")
find_path (3RDPARTY_FFMPEG_INCLUDE_DIR NAMES ${HEADER_NAMES}
PATHS ${3RDPARTY_FFMPEG_DIR}
- PATH_SUFFIXES include
+ PATH_SUFFIXES include include/ffmpeg4.4
CMAKE_FIND_ROOT_PATH_BOTH
NO_DEFAULT_PATH)
else()
find_path (3RDPARTY_FFMPEG_INCLUDE_DIR NAMES ${HEADER_NAMES}
- PATH_SUFFIXES include
+ PATH_SUFFIXES include include/ffmpeg4.4
CMAKE_FIND_ROOT_PATH_BOTH)
endif()
endif()
@@ -116,7 +116,7 @@ foreach (LIBRARY_NAME ${CSF_FFmpeg})
if (NOT 3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME} OR NOT EXISTS "${3RDPARTY_FFMPEG_LIBRARY_${LIBRARY_NAME}}")
set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
- set (FFMPEG_PATH_SUFFIXES lib)
+ set (FFMPEG_PATH_SUFFIXES lib lib/ffmpeg4.4)
if (ANDROID)
set (FFMPEG_PATH_SUFFIXES ${FFMPEG_PATH_SUFFIXES} libs/${ANDROID_ABI})
elseif(APPLE)

0
extra/opencascade/cmake-fix-variable.patch → extra/opencascade/fix-cmake-variable.patch
View file

22
extra/opencascade/fix-install-dir-references.patch
View file

@ -1,22 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1229,7 +1229,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES})
endforeach()
# install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
-install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
foreach (OCCT_MODULE ${OCCT_MODULES})
if (BUILD_MODULE_${OCCT_MODULE})
--- a/adm/cmake/occt_macros.cmake
+++ b/adm/cmake/occt_macros.cmake
@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
"cmake_policy(PUSH)
cmake_policy(SET CMP0007 NEW)
string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
- file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
+ file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
file (REMOVE \"\${TARGET_FILENAME}\")

32
extra/opencascade/opencascade-tbb-2021.patch
View file

@ -1,32 +0,0 @@
--- a/src/OSD/OSD_Parallel_TBB.cxx
+++ b/src/OSD/OSD_Parallel_TBB.cxx
@@ -25,7 +25,7 @@ Standard_DISABLE_DEPRECATION_WARNINGS
#include <tbb/parallel_for.h>
#include <tbb/parallel_for_each.h>
#include <tbb/blocked_range.h>
-#include <tbb/task_scheduler_init.h>
+#include <tbb/global_control.h>
Standard_ENABLE_DEPRECATION_WARNINGS
//=======================================================================
@@ -38,19 +38,12 @@ void OSD_Parallel::forEachExternal (UniversalIterator& theBegin,
const FunctorInterface& theFunctor,
Standard_Integer theNbItems)
{
- try
- {
const Handle(OSD_ThreadPool)& aThreadPool = OSD_ThreadPool::DefaultPool();
const Standard_Integer aNbThreads = theNbItems > 0 ?
aThreadPool->NbDefaultThreadsToLaunch() : -1;
- tbb::task_scheduler_init aScheduler (aNbThreads);
+ tbb::global_control global_limit(tbb::global_control::max_allowed_parallelism, aNbThreads);
tbb::parallel_for_each (theBegin, theEnd, theFunctor);
- }
- catch (tbb::captured_exception& anException)
- {
- throw Standard_ProgramError (anException.what());
- }
}
#endif /* HAVE_TBB */

2
extra/opencascade/skip-license-installation.patch
View file

@ -1,6 +1,6 @@
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -337,15 +337,6 @@ endif() @@ -371,15 +371,6 @@ endif()
# include occt macros # include occt macros
OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_resources") OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_resources")

31
extra/opencascade/vtk9.patch
View file

@ -1,31 +0,0 @@
--- a/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx
+++ b/src/IVtkDraw/IVtkDraw_HighlightAndSelectionPipeline.hxx
@@ -23,6 +23,7 @@
// prevent disabling some MSVC warning messages by VTK headers
#include <Standard_WarningsDisable.hxx>
+#undef AllValues
#include <vtkActor.h>
#include <vtkPolyData.h>
#include <vtkPolyDataMapper.h>
--- a/src/IVtkVTK/IVtkVTK_ShapeData.hxx
+++ b/src/IVtkVTK/IVtkVTK_ShapeData.hxx
@@ -23,6 +23,7 @@
#include <vtkPolyData.h>
#include <vtkSmartPointer.h>
#include <vtkIdTypeArray.h>
+#include <vtkVersion.h>
#include <Standard_WarningsRestore.hxx>
class vtkIdTypeArray;
--- a/src/InterfaceGraphic/InterfaceGraphic.hxx
+++ b/src/InterfaceGraphic/InterfaceGraphic.hxx
@@ -40,6 +40,8 @@
#include <X11/Xatom.h>
#include <GL/glx.h>
+#undef AllValues
+
#endif
#endif // __INTERFACE_GRAPHIC_HXX