Update runtime to 5.15-25.08

hfiguiere · hfiguiere · commit 9a10dabd4cba · 2025-11-18T18:51:52.000-05:00
Added patches for build
Updated pyzmq to 23.2 to build on py 3.13
nvcodec is now in the runtime

Signed-off-by: Hubert Figuière &lt;hub@figuiere.net&gt;
diff --git a/org.openshot.OpenShot.yaml b/org.openshot.OpenShot.yaml
@@ -1,8 +1,8 @@
 app-id: org.openshot.OpenShot
 base: com.riverbankcomputing.PyQt.BaseApp
-base-version: '5.15-24.08'
+base-version: '5.15-25.08'
 runtime: org.kde.Platform
-runtime-version: '5.15-24.08'
+runtime-version: '5.15-25.08'
 sdk: org.kde.Sdk
 command: openshot-qt
 rename-icon: openshot-qt
@@ -43,6 +43,7 @@ modules:
     buildsystem: cmake-ninja
     builddir: true
     config-opts:
+      - -DCMAKE_POLICY_VERSION_MINIMUM=3.5
       - -DCMAKE_BUILD_TYPE=Release
     cleanup:
       - /bin
@@ -68,6 +69,7 @@ modules:
     buildsystem: cmake-ninja
     builddir: true
     config-opts:
+      - -DCMAKE_POLICY_VERSION_MINIMUM=3.5
       - -DCMAKE_BUILD_TYPE=Release
       - -DCPPZMQ_BUILD_TESTS=OFF
     sources:
@@ -79,12 +81,12 @@ modules:
   - name: pyzmq
     buildsystem: simple
     build-commands:
-      - python3 setup.py install --prefix=/app --root=/
+      - pip3 install --no-build-isolation --prefix=/app .
     sources:
       - type: git
         url: https://github.com/zeromq/pyzmq.git
-        commit: 46af3b5f5fdfdfe4e3ea2a432081845c3c054609
-        tag: v22.3.0
+        commit: 015e616fbc50023e7c5c77db2ddd7bee2919c6c1
+        tag: v23.2.1
 
   - python3-requests.json
 
@@ -113,7 +115,9 @@ modules:
         commands:
           - sed -i 's|/usr/local/share/fonts/|/run/host/fonts/|' usvg/src/fontdb.rs
       - type: patch
-        path: patches/resvg-qt515.patch
+        paths:
+          - patches/resvg-qt515.patch
+          - patches/resvg-rust-191.patch
 
   - name: 'x264'
     config-opts:
@@ -124,18 +128,6 @@ modules:
         url: https://code.videolan.org/videolan/x264.git
         commit: cde9a93319bea766a92e306d69059c76de970190
 
-  - name: nv-codec-headers
-    no-autogen: true
-    make-install-args:
-      - PREFIX=/app
-    cleanup:
-      - '*'
-    sources:
-      - type: git
-        url: https://git.videolan.org/git/ffmpeg/nv-codec-headers.git
-        commit: a99740a84b49fd609e04b03279e66c5a8b767440
-        tag: n10.0.26.1
-
   - name: ffmpeg
     config-opts:
       - --enable-gpl
@@ -219,6 +211,8 @@ modules:
           project-id: 6615
           stable-only: true
           url-template: https://github.com/opencv/opencv_contrib/archive/$version.tar.gz
+      - type: patch
+        path: patches/opencv-cmake.patch
   - name: libopenshot
     buildsystem: cmake-ninja
     builddir: true
diff --git a/patches/opencv-cmake.patch b/patches/opencv-cmake.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake
+index 43d6a87..7eba012 100644
+--- a/cmake/OpenCVGenPkgconfig.cmake
++++ b/cmake/OpenCVGenPkgconfig.cmake
+@@ -94,7 +94,7 @@ file(GENERATE OUTPUT "${CMAKE_HELPER_SCRIPT}" CONTENT "${HELPER_SCRIPT}")
+ add_custom_target(developer_scripts)
+ add_custom_command(
+   OUTPUT "${CMAKE_BINARY_DIR}/unix-install/${OPENCV_PC_FILE_NAME}"
+-  COMMAND ${CMAKE_COMMAND} "-DCMAKE_HELPER_SCRIPT=${CMAKE_HELPER_SCRIPT}" -P "${OpenCV_SOURCE_DIR}/cmake/OpenCVGenPkgconfig.cmake"
++  COMMAND ${CMAKE_COMMAND} "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" "-DCMAKE_HELPER_SCRIPT=${CMAKE_HELPER_SCRIPT}" -P "${OpenCV_SOURCE_DIR}/cmake/OpenCVGenPkgconfig.cmake"
+   DEPENDS "${CMAKE_BINARY_DIR}/OpenCVGenPkgConfig.info.cmake"
+           "${OpenCV_SOURCE_DIR}/cmake/OpenCVGenPkgconfig.cmake"
+   COMMENT "Generate ${OPENCV_PC_FILE_NAME}"
diff --git a/patches/resvg-rust-191.patch b/patches/resvg-rust-191.patch
@@ -0,0 +1,13 @@
+diff --git a/src/backend_qt/mod.rs b/src/backend_qt/mod.rs
+index 4409a6f..4ba98a0 100644
+--- a/src/backend_qt/mod.rs
++++ b/src/backend_qt/mod.rs
+@@ -16,7 +16,7 @@ macro_rules! try_create_image {
+             qt::Image::new_rgba_premultiplied($size.width(), $size.height()),
+             $ret,
+             "Failed to create a {}x{} image.", $size.width(), $size.height()
+-        );
++        )
+     };
+ }
+ 
