trainingsample 0.2.9__tar.gz → 0.2.10__tar.gz

{trainingsample-0.2.9 → trainingsample-0.2.10}/.github/workflows/publish.yml

@@ -41,7 +41,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: third_party/opencv-static
-        key: opencv-static-4.12.0-codecs-no-itt-no-openjpeg-linux-${{ matrix.os }}-${{ runner.arch }}-${{ matrix.manylinux }}
+        key: opencv-static-4.12.0-codecs-jasper-no-itt-no-openjpeg-linux-${{ matrix.os }}-${{ runner.arch }}-${{ matrix.manylinux }}
 
     - name: Install build dependencies
       run: |
@@ -84,7 +84,6 @@ jobs:
         echo "LLVM config at: $(which llvm-config-14 2>/dev/null || which llvm-config-18 2>/dev/null)"
 
     - name: Build static OpenCV
-      if: steps.cache-opencv.outputs.cache-hit != 'true'
       run: |
         ./scripts/build-opencv-static.sh
 
@@ -105,7 +104,7 @@ jobs:
         # OpenCV static linking configuration
         OPENCV_INCLUDE_PATHS: ${{ github.workspace }}/third_party/opencv-static/include/opencv4
         OPENCV_LINK_PATHS: ${{ github.workspace }}/third_party/opencv-static/lib
-        OPENCV_LINK_LIBS: static=opencv_world,static=jpeg,static=png,static=tiff,static=webp,static=z,static=stdc++
+        OPENCV_LINK_LIBS: static=opencv_world,static=jpeg,static=png,static=tiff,static=webp,static=z,static=jasper,static=stdc++
         OPENCV_DISABLE_PROBES: pkg_config,cmake,vcpkg,vcpkg_cmake
 
     - name: Upload wheels
@@ -131,7 +130,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: third_party/opencv-static
-        key: opencv-static-4.12.0-codecs-no-itt-no-openjpeg-macos-${{ runner.os }}-${{ runner.arch }}
+        key: opencv-static-4.12.0-codecs-jasper-no-itt-no-openjpeg-macos-${{ runner.os }}-${{ runner.arch }}
 
     - name: Install build dependencies
       run: |
@@ -143,7 +142,6 @@ jobs:
         echo "DYLD_LIBRARY_PATH=/opt/homebrew/opt/llvm/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
 
     - name: Build static OpenCV
-      if: steps.cache-opencv.outputs.cache-hit != 'true'
       run: |
         ./scripts/build-opencv-static.sh
 
@@ -159,7 +157,7 @@ jobs:
         # OpenCV static linking configuration
         OPENCV_INCLUDE_PATHS: ${{ github.workspace }}/third_party/opencv-static/include/opencv4
         OPENCV_LINK_PATHS: ${{ github.workspace }}/third_party/opencv-static/lib
-        OPENCV_LINK_LIBS: static=opencv_world,static=jpeg,static=png,static=tiff,static=webp,static=z,framework=Accelerate,dylib=c++
+        OPENCV_LINK_LIBS: static=opencv_world,static=jpeg,static=png,static=tiff,static=webp,static=z,static=jasper,framework=Accelerate,dylib=c++
         OPENCV_DISABLE_PROBES: pkg_config,cmake,vcpkg,vcpkg_cmake
     - name: Upload wheels
       uses: actions/upload-artifact@v4

{trainingsample-0.2.9 → trainingsample-0.2.10}/Cargo.lock

@@ -1746,7 +1746,7 @@ dependencies = [
 
 [[package]]
 name = "trainingsample"
-version = "0.2.9"
+version = "0.2.10"
 dependencies = [
  "anyhow",
  "criterion",

{trainingsample-0.2.9 → trainingsample-0.2.10}/Cargo.toml

@@ -38,7 +38,7 @@ description = "High-performance Rust reimplementation of GIL-blocking video/imag
 edition = "2021"
 license = "MIT"
 name = "trainingsample"
-version = "0.2.9"
+version = "0.2.10"
 readme = "README.md"
 
 [profile.release]

{trainingsample-0.2.9 → trainingsample-0.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trainingsample
-Version: 0.2.9
+Version: 0.2.10
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{trainingsample-0.2.9 → trainingsample-0.2.10}/pyproject.toml

@@ -14,7 +14,7 @@ description = "High-performance Rust reimplementation of GIL-blocking video/imag
 license = {text = "MIT"}
 name = "trainingsample"
 requires-python = ">=3.11"
-version = "0.2.9"
+version = "0.2.10"
 
 [project.optional-dependencies]
 dev = ["pytest>=6.0", "pytest-benchmark", "maturin>=1.0,<2.0", "pre-commit"]

{trainingsample-0.2.9 → trainingsample-0.2.10}/scripts/build-opencv-static.sh

@@ -10,7 +10,7 @@ PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
 BUILD_DIR="${PROJECT_ROOT}/opencv-build-tmp"
 INSTALL_DIR="${PROJECT_ROOT}/third_party/opencv-static"
 SIGNATURE_FILE="${INSTALL_DIR}/build_signature.txt"
-BUILD_SIGNATURE="opencv-${OPENCV_VERSION}-static-codecs-no-itt-no-openjpeg"
+BUILD_SIGNATURE="opencv-${OPENCV_VERSION}-static-codecs-jasper-no-itt-no-openjpeg"
 
 echo "Building static OpenCV ${OPENCV_VERSION}..."
 echo "Install directory: ${INSTALL_DIR}"
@@ -52,11 +52,13 @@ cmake -S "opencv-${OPENCV_VERSION}" \
       -DBUILD_TIFF=ON \
       -DBUILD_WEBP=ON \
       -DBUILD_ZLIB=ON \
+      -DBUILD_JASPER=ON \
       -DWITH_JPEG=ON \
       -DWITH_PNG=ON \
       -DWITH_TIFF=ON \
       -DWITH_WEBP=ON \
       -DWITH_ZLIB=ON \
+      -DWITH_JASPER=ON \
       -DBUILD_TESTS=OFF \
       -DBUILD_PERF_TESTS=OFF \
       -DBUILD_EXAMPLES=OFF \
@@ -94,6 +96,7 @@ declare -a CODEC_MAPPINGS=(
     "liblibtiff.a:libtiff.a"
     "liblibwebp.a:libwebp.a"
     "libzlib.a:libz.a"
+    "liblibjasper.a:libjasper.a"
 )
 
 for mapping in "${CODEC_MAPPINGS[@]}"; do
@@ -133,6 +136,7 @@ REQUIRED_ARCHIVES=(
     "libtiff.a"
     "libwebp.a"
     "libz.a"
+    "libjasper.a"
 )
 
 for archive in "${REQUIRED_ARCHIVES[@]}"; do