Date: Saturday, November 5, 2022 @ 19:43:40
Author: svenstaro
Revision: 1342417
upgpkg: opencascade 1:7.6.3-1
Modified:
opencascade/trunk/PKGBUILD
opencascade/trunk/ffmpeg4.4.patch
-----------------+
PKGBUILD | 38 ++++++++++++++++++++------------------
ffmpeg4.4.patch | 2 --
2 files changed, 20 insertions(+), 20 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-11-05 19:42:49 UTC (rev 1342416)
+++ PKGBUILD 2022-11-05 19:43:40 UTC (rev 1342417)
@@ -7,12 +7,12 @@
# Contributor: Michele Mocciola <mickele>
pkgname=opencascade
-pkgver=7.5.3
-pkgrel=3
+pkgver=7.6.3
+pkgrel=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')
-url="https://www.opencascade.org";
+url='https://www.opencascade.org'
license=('LGPL2.1' 'custom:LGPL-exception')
depends=(
'ffmpeg4.4'
@@ -43,7 +43,8 @@
'unixodbc'
'utf8cpp'
)
-_commit='fecb042498514186bd37fa621cdcf09eb61899a3' # V7_5_3
+options=('debug')
+_commit='b079fb9877ef64d4a8158a60fa157f59b096debb'
source=(
"$pkgname::git+https://git.dev.opencascade.org/repos/occt.git#commit=$_commit";
'opencascade.sh'
@@ -61,7 +62,7 @@
'fd8499793b12e4e59420f63351fef9599c3976d307979beea2681b873a340ae673ba643a7060c74bec1dd4801954c99f8f1f1a8bcc3baa3db9cbfce32153675e'
'2725df308f23f11faa664391174a4f21bec13328c7b33ba065bfd28988a4bd815c86849d8815fcdb8f6ed5dd1d7b1a38ded1675c1c08dec1276367fc571917c0'
'1d6e0321d0b54caf0130b2c6f81dbbdc621913ffa1c38e464d9be65088085fc831ac69788393911a1dd269f4296c93d26c1706d262537912459eb795bc4f742b'
-
'4834d1fae697a580c258e7ce06db1dc05c891c6bf6e81a5125a3483616fb39200806fc17d0b5b79126ef7cdb5818f3e7fb867aabd15061e19b9ffa1fd7ec5aa7')
+
'cb2c9602e7f18ab0543bb84f9f6cd5f759c0bf9de599fc25015fef4efd96d216c044250fc49bafa2d71de2a36e4ccd534416da1971d04f2c8f932751c0db6c50')
b2sums=('SKIP'
'da9db038ed2348d2d7736505eda2f40fe52c836bcedb74d9f369cc53f7d40a330bd87d6aedd773863745cd46e4dbe5876acda2d2d60177f00d5db9cae4f1f102'
'a56cedf43366d52a81301d653834942fb74a4feafb4ac57923448d42164f060f1874a2180688e482c0dac70a5ea1d2fb53d4410503f22626ff5d2bab405a352f'
@@ -69,7 +70,7 @@
'da815c14ad3a8283c4f3cf41b6b19b40408798f64374b909c776f5ab22ee9ccfc2653c09b33c7b550a138007ff2b36b40d742c9fddc7c1ea499dfe58e59f57ea'
'af240c6f9ba62f336f59caa7cff2bb40915137a02f5b03ee54fa17a5ef27d0411800aa981090a17b3d7c780835625bd4b263975eb100aa71fdc58eb1806916ea'
'905d13cf39225c1148e215ad37ab601dfe649f3d4d66b099ae028cdf8fb2a92534e7b14361238566c295ae443a3a3dfeb5f69ab51987b952604eb53821fa92cd'
-
'bf4753cfd5a28acbef35894959f77d9c8ff37d79075042ef70e57cab6ab2816960d61712f759487c1f200ea8b65deb0660b28012867014ebc5dc6cf2dde0a6dc')
+
'2a7861d4273344f62b7356f4a171d461e607a217f07e37fa869d24c6ffed7682948c8870bccf71e80bd8bbdeffcf32d74fb25d6a20c4344c4017618d1606f27d')
pkgver() {
cd "$pkgname"
@@ -81,8 +82,8 @@
patch -p1 -i ../fix-install-dir-references.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 ../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 ../opencascade-tbb-2021.patch # Fix build with TBB 2021
patch -p1 -i ../ffmpeg4.4.patch # Use FFmpeg 4.4
@@ -92,15 +93,16 @@
cmake \
-B build \
-S "$pkgname" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_RELEASE_DISABLE_EXCEPTIONS=OFF \
- -DUSE_FREEIMAGE=ON \
- -DUSE_FFMPEG=ON \
- -DUSE_VTK=ON \
- -DUSE_RAPIDJSON=ON \
- -DUSE_TBB=ON \
- -D3RDPARTY_VTK_INCLUDE_DIR=/usr/include/vtk
+ -D CMAKE_BUILD_TYPE=Release \
+ -D CMAKE_INSTALL_PREFIX=/usr \
+ -D BUILD_RELEASE_DISABLE_EXCEPTIONS=OFF \
+ -D USE_FREEIMAGE=ON \
+ -D USE_FFMPEG=ON \
+ -D USE_VTK=ON \
+ -D USE_RAPIDJSON=ON \
+ -D USE_TBB=ON \
+ -D 3RDPARTY_VTK_INCLUDE_DIR=/usr/include/vtk
+
cmake --build build
}
Modified: ffmpeg4.4.patch
===================================================================
--- ffmpeg4.4.patch 2022-11-05 19:42:49 UTC (rev 1342416)
+++ ffmpeg4.4.patch 2022-11-05 19:43:40 UTC (rev 1342417)
@@ -1,5 +1,3 @@
-diff --git a/adm/cmake/ffmpeg.cmake b/adm/cmake/ffmpeg.cmake
-index f619d2d41..554c9669e 100644
--- 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
