Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: wpilib/roborio-cross-ubuntu:2025-22.04-py313
image: wpilib/roborio-cross-ubuntu:2026-22.04-py314

steps:
- uses: actions/checkout@v4
Expand All @@ -17,7 +17,7 @@ jobs:
run: |
apt-get update
apt-get install -y cmake --no-install-recommends
pip3.13 install -r requirements.txt
pip3.14 install -r requirements.txt

- name: Build wheels
run: make package
Expand All @@ -28,4 +28,4 @@ jobs:
with:
user: ${{ secrets.WPI_ARTIFACTORY_USERNAME }}
password: ${{ secrets.WPI_ARTIFACTORY_TOKEN }}
repository-url: https://wpilib.jfrog.io/artifactory/api/pypi/wpilib-python-release-2025-local
repository-url: https://wpilib.jfrog.io/artifactory/api/pypi/wpilib-python-release-2026-local
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

PYVERSION = 3.13
VERSION = 4.8.0
PYVERSION = 3.14
VERSION = 4.12.0

DOWNLOAD_FROM = https://github.com/opencv/opencv/archive/${VERSION}.tar.gz
LIBGZIP = $(abspath $(notdir ${DOWNLOAD_FROM}))
Expand All @@ -26,10 +26,10 @@ package: ${BUILT_TGZ}
# create release package
mkdir -p coredata/usr/local/lib
xtar -xf ${BUILT_TGZ} -C coredata/usr/local --strip=1 \
'*/lib/lib*so.408' \
'*/lib/lib*so.412' \
'*/share/opencv4/haarcascades/*.xml' \
'*/share/opencv4/lbpcascades/*.xml'
roborio-gen-whl data-core.py coredata -o dist --strip arm-frc2024-linux-gnueabi-strip
roborio-gen-whl data-core.py coredata -o dist --strip arm-frc2025-linux-gnueabi-strip

# create dev package
mkdir -p devdata/usr/local/lib
Expand All @@ -44,4 +44,4 @@ package: ${BUILT_TGZ}
mkdir -p data/usr/local/lib/python$(PYVERSION)/site-packages
xtar -xf ${BUILT_TGZ} -C data/usr/local/lib/python$(PYVERSION)/site-packages --strip=4 \
'*/lib/python$(PYVERSION)/site-packages/cv2*.so'
roborio-gen-whl data-py.py data -o dist --strip arm-frc2024-linux-gnueabi-strip
roborio-gen-whl data-py.py data -o dist --strip arm-frc2025-linux-gnueabi-strip
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash -e

OPENCV_VERSION=4.8.0
OPENCV_VERSION=4.12.0
PYTHON_VERSION=$(/build/venv/bin/cross-python -c 'import sys; print("%d.%d" % sys.version_info[:2])')
COMPILER=arm-frc2024-linux-gnueabi
COMPILER=arm-frc2025-linux-gnueabi

pushd `dirname $0`
ROOT=`pwd`
Expand Down
2 changes: 1 addition & 1 deletion data-core.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name = "robotpy-opencv-core"
version = "4.8.0+r2"
version = "4.12.0"
url = "https://opencv.org"
license = "Apache 2"
install_requires = ["numpy"]
2 changes: 1 addition & 1 deletion data-py.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name = "robotpy-opencv"
version = "4.8.0+r2"
version = "4.12.0"
url = "https://opencv.org"
license = "Apache 2"
install_requires = ["numpy", f"robotpy-opencv-core=={version}"]
4 changes: 2 additions & 2 deletions toolchain.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.1)
set(ARM_PREFIX arm-frc2024-linux-gnueabi)
set(ARM_PREFIX arm-frc2025-linux-gnueabi)

set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_SYSTEM_PROCESSOR arm)
Expand All @@ -13,4 +13,4 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)

include("${CMAKE_CURRENT_LIST_DIR}/opencv-4.8.0/platforms/linux/arm-gnueabi.toolchain.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/opencv-4.12.0/platforms/linux/arm-gnueabi.toolchain.cmake")