[arch-commits] Commit in opencascade/trunk (PKGBUILD ffmpeg4.4.patch)

[Antonio Rojas]

    Date: Monday, February 14, 2022 @ 16:40:44
  Author: arojas
Revision: 1133187

Use ffmpeg4.4

Added:
  opencascade/trunk/ffmpeg4.4.patch
Modified:
  opencascade/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   13 ++++++++-----
 ffmpeg4.4.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-14 16:39:24 UTC (rev 1133186)
+++ PKGBUILD	2022-02-14 16:40:44 UTC (rev 1133187)
@@ -8,7 +8,7 @@
 
 pkgname=opencascade
 pkgver=7.5.3
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="SDK intended for development of applications dealing with 3D CAD data"
 arch=('x86_64')
@@ -15,7 +15,7 @@
 url="https://www.opencascade.org"
 license=('LGPL2.1' 'custom:LGPL-exception')
 depends=(
-  'ffmpeg'
+  'ffmpeg4.4'
   'freeimage'
   'gl2ps'
   'intel-tbb'
@@ -52,6 +52,7 @@
   'skip-license-installation.patch'
   'vtk9.patch'
   'opencascade-tbb-2021.patch'
+  'ffmpeg4.4.patch'
 )
 sha512sums=('SKIP'
             'a7516028e55fd303dc1cfb61b75c9cb209d431d854b4d1c58f9c19df8ecee9d79da5c8745676c68a2de0980652de4c4d1c5a927c25db1e5146fb1f1f43c5906b'
@@ -59,7 +60,8 @@
             'ad6ce2f52462989bd990b52fd5428f3e5cbd4fb15c38d92c0e0954e6afc3368fca961b92efead8e8957213352fb87a469e1bfaccaf14b484351acc0a0bc10485'
             'fd8499793b12e4e59420f63351fef9599c3976d307979beea2681b873a340ae673ba643a7060c74bec1dd4801954c99f8f1f1a8bcc3baa3db9cbfce32153675e'
             '2725df308f23f11faa664391174a4f21bec13328c7b33ba065bfd28988a4bd815c86849d8815fcdb8f6ed5dd1d7b1a38ded1675c1c08dec1276367fc571917c0'
-            '1d6e0321d0b54caf0130b2c6f81dbbdc621913ffa1c38e464d9be65088085fc831ac69788393911a1dd269f4296c93d26c1706d262537912459eb795bc4f742b')
+            '1d6e0321d0b54caf0130b2c6f81dbbdc621913ffa1c38e464d9be65088085fc831ac69788393911a1dd269f4296c93d26c1706d262537912459eb795bc4f742b'
+            '4834d1fae697a580c258e7ce06db1dc05c891c6bf6e81a5125a3483616fb39200806fc17d0b5b79126ef7cdb5818f3e7fb867aabd15061e19b9ffa1fd7ec5aa7')
 b2sums=('SKIP'
         'da9db038ed2348d2d7736505eda2f40fe52c836bcedb74d9f369cc53f7d40a330bd87d6aedd773863745cd46e4dbe5876acda2d2d60177f00d5db9cae4f1f102'
         'a56cedf43366d52a81301d653834942fb74a4feafb4ac57923448d42164f060f1874a2180688e482c0dac70a5ea1d2fb53d4410503f22626ff5d2bab405a352f'
@@ -66,7 +68,8 @@
         'bb98b2b53a9a97ae15a353a9dbcc6d92a97ddaa56af0610cefe9de3a4b84c4a6021d9396f7e270c1d379278df069dbf90f9771db64947e52d38ad36bc3c6f913'
         'da815c14ad3a8283c4f3cf41b6b19b40408798f64374b909c776f5ab22ee9ccfc2653c09b33c7b550a138007ff2b36b40d742c9fddc7c1ea499dfe58e59f57ea'
         'af240c6f9ba62f336f59caa7cff2bb40915137a02f5b03ee54fa17a5ef27d0411800aa981090a17b3d7c780835625bd4b263975eb100aa71fdc58eb1806916ea'
-        '905d13cf39225c1148e215ad37ab601dfe649f3d4d66b099ae028cdf8fb2a92534e7b14361238566c295ae443a3a3dfeb5f69ab51987b952604eb53821fa92cd')
+        '905d13cf39225c1148e215ad37ab601dfe649f3d4d66b099ae028cdf8fb2a92534e7b14361238566c295ae443a3a3dfeb5f69ab51987b952604eb53821fa92cd'
+        'bf4753cfd5a28acbef35894959f77d9c8ff37d79075042ef70e57cab6ab2816960d61712f759487c1f200ea8b65deb0660b28012867014ebc5dc6cf2dde0a6dc')
 
 pkgver() {
   cd "$pkgname"
@@ -82,6 +85,7 @@
   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
 }
 
 build() {
@@ -97,7 +101,6 @@
     -DUSE_RAPIDJSON=ON \
     -DUSE_TBB=ON \
     -D3RDPARTY_VTK_INCLUDE_DIR=/usr/include/vtk
-
   cmake --build build
 }
 

Added: ffmpeg4.4.patch
===================================================================
--- ffmpeg4.4.patch	                        (rev 0)
+++ ffmpeg4.4.patch	2022-02-14 16:40:44 UTC (rev 1133187)
@@ -0,0 +1,28 @@
+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
+   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)