Date: Sunday, October 20, 2019 @ 19:13:54 Author: kkeen Revision: 517950
upgpkg: opencascade 7.4.0-1 Modified: opencascade/trunk/PKGBUILD Deleted: opencascade/trunk/ffmpeg4.patch opencascade/trunk/vtk7.patch ---------------+ PKGBUILD | 10 +++------- ffmpeg4.patch | 22 ---------------------- vtk7.patch | 48 ------------------------------------------------ 3 files changed, 3 insertions(+), 77 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-10-20 19:12:51 UTC (rev 517949) +++ PKGBUILD 2019-10-20 19:13:54 UTC (rev 517950) @@ -6,7 +6,7 @@ # Contributor: Michele Mocciola <mickele> pkgname=opencascade -pkgver=7.3.0_p3 +pkgver=7.4.0 _pkgver=${pkgver//_/} _pkgver=V${_pkgver//./_} pkgrel=1 @@ -18,19 +18,15 @@ makedepends=('cmake' 'qt5-base') # VTK requires Qt5 to build source=("opencascade-${pkgver}.tgz::https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_pkgver};sf=tgz" 'opencascade.sh' 'fix-install-dir-references.patch' - 'vtk7.patch' 'ffmpeg4.patch' 'cmake-fix-variable.patch') -sha256sums=('fbd46db3e75313131b88a606024ea4d4496c3c7f6e68c23988e9d3e673d4f21b' + 'cmake-fix-variable.patch') +sha256sums=('655da7717dac3460a22a6a7ee68860c1da56da2fec9c380d8ac0ac0349d67676' '2064536a85d46fee368a8f1a712b2c6c77ca79c5bffcc68cba79d70d36efa2f4' 'afb584aa453993ae8d9e2b983594558531ede735a5892754b812be30650c9fb5' - 'bd230962173a80a971c8da9d3dc07238f249544bb67ee834be7d6466391d0315' - '461c44a1b635c09f23283c0b8f583a0d38079a1e20338c009776a621d0ed6efe' 'c7427082400b2d1ac58c59549d4dd1ee5b27d06847b7907842e9e2f2b68980fa') prepare() { cd "occt-${_pkgver}" patch -Np1 -i "$srcdir/fix-install-dir-references.patch" - patch -Np1 -i "$srcdir/vtk7.patch" - patch -Np1 -i "$srcdir/ffmpeg4.patch" patch -Np1 -i "$srcdir/cmake-fix-variable.patch" } Deleted: ffmpeg4.patch =================================================================== --- ffmpeg4.patch 2019-10-20 19:12:51 UTC (rev 517949) +++ ffmpeg4.patch 2019-10-20 19:13:54 UTC (rev 517950) @@ -1,22 +0,0 @@ -diff -Naur a/src/Image/Image_VideoRecorder.cxx b/src/Image/Image_VideoRecorder.cxx ---- a/src/Image/Image_VideoRecorder.cxx 2017-10-04 14:26:07.000000000 +0200 -+++ b/src/Image/Image_VideoRecorder.cxx 2017-10-04 14:26:07.000000000 +0200 -@@ -276,7 +276,7 @@ - // some formats want stream headers to be separate - if (myAVContext->oformat->flags & AVFMT_GLOBALHEADER) - { -- aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ aCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - } - return Standard_True; - #else -@@ -449,8 +449,7 @@ - AVPacket aPacket; - memset (&aPacket, 0, sizeof(aPacket)); - av_init_packet (&aPacket); -- if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0 -- && !theToFlush) -+ if (0) - { - // raw video case - directly store the picture in the packet - aPacket.flags |= AV_PKT_FLAG_KEY; Deleted: vtk7.patch =================================================================== --- vtk7.patch 2019-10-20 19:12:51 UTC (rev 517949) +++ vtk7.patch 2019-10-20 19:13:54 UTC (rev 517950) @@ -1,48 +0,0 @@ ---- a/src/IVtkVTK/IVtkVTK_ShapeData.cxx 2017-10-04 14:26:07.000000000 +0200 -+++ b/src/IVtkVTK/IVtkVTK_ShapeData.cxx 2018-04-07 14:43:32.920435032 +0200 -@@ -80,9 +80,9 @@ - vtkIdType aPointIdVTK = thePointId; - myPolyData->InsertNextCell (VTK_VERTEX, 1, &aPointIdVTK); - const vtkIdType aShapeIDVTK = theShapeID; -- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK); -+ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK); - const vtkIdType aType = theMeshType; -- myMeshTypes->InsertNextTupleValue (&aType); -+ myMeshTypes->InsertNextTypedTuple (&aType); - } - - //================================================================ -@@ -97,9 +97,9 @@ - vtkIdType aPoints[2] = { thePointId1, thePointId2 }; - myPolyData->InsertNextCell (VTK_LINE, 2, aPoints); - const vtkIdType aShapeIDVTK = theShapeID; -- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK); -+ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK); - const vtkIdType aType = theMeshType; -- myMeshTypes->InsertNextTupleValue (&aType); -+ myMeshTypes->InsertNextTypedTuple (&aType); - } - - //================================================================ -@@ -124,9 +124,9 @@ - - myPolyData->InsertNextCell (VTK_POLY_LINE, anIdList); - const vtkIdType aShapeIDVTK = theShapeID; -- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK); -+ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK); - const vtkIdType aType = theMeshType; -- myMeshTypes->InsertNextTupleValue (&aType); -+ myMeshTypes->InsertNextTypedTuple (&aType); - } - } - -@@ -143,7 +143,7 @@ - vtkIdType aPoints[3] = { thePointId1, thePointId2, thePointId3 }; - myPolyData->InsertNextCell (VTK_TRIANGLE, 3, aPoints); - const vtkIdType aShapeIDVTK = theShapeID; -- mySubShapeIDs->InsertNextTupleValue (&aShapeIDVTK); -+ mySubShapeIDs->InsertNextTypedTuple (&aShapeIDVTK); - const vtkIdType aType = theMeshType; -- myMeshTypes->InsertNextTupleValue (&aType); -+ myMeshTypes->InsertNextTypedTuple (&aType); - }