Skip to content

Commit 802414d

Browse files
committed
Update for 2026
1 parent bac370d commit 802414d

6 files changed

Lines changed: 14 additions & 14 deletions

File tree

.github/workflows/dist.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99

1010
container:
11-
image: wpilib/roborio-cross-ubuntu:2025-22.04-py313
11+
image: wpilib/roborio-cross-ubuntu:2026-22.04-py314
1212

1313
steps:
1414
- uses: actions/checkout@v4
@@ -17,7 +17,7 @@ jobs:
1717
run: |
1818
apt-get update
1919
apt-get install -y cmake --no-install-recommends
20-
pip3.13 install -r requirements.txt
20+
pip3.14 install -r requirements.txt
2121
2222
- name: Build wheels
2323
run: make package
@@ -28,4 +28,4 @@ jobs:
2828
with:
2929
user: ${{ secrets.WPI_ARTIFACTORY_USERNAME }}
3030
password: ${{ secrets.WPI_ARTIFACTORY_TOKEN }}
31-
repository-url: https://wpilib.jfrog.io/artifactory/api/pypi/wpilib-python-release-2025-local
31+
repository-url: https://wpilib.jfrog.io/artifactory/api/pypi/wpilib-python-release-2026-local

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
PYVERSION = 3.13
3-
VERSION = 4.8.0
2+
PYVERSION = 3.14
3+
VERSION = 4.12.0
44

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

3434
# create dev package
3535
mkdir -p devdata/usr/local/lib
@@ -44,4 +44,4 @@ package: ${BUILT_TGZ}
4444
mkdir -p data/usr/local/lib/python$(PYVERSION)/site-packages
4545
xtar -xf ${BUILT_TGZ} -C data/usr/local/lib/python$(PYVERSION)/site-packages --strip=4 \
4646
'*/lib/python$(PYVERSION)/site-packages/cv2*.so'
47-
roborio-gen-whl data-py.py data -o dist --strip arm-frc2024-linux-gnueabi-strip
47+
roborio-gen-whl data-py.py data -o dist --strip arm-frc2025-linux-gnueabi-strip

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash -e
22

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

77
pushd `dirname $0`
88
ROOT=`pwd`

data-core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name = "robotpy-opencv-core"
2-
version = "4.8.0+r2"
2+
version = "4.12.0"
33
url = "https://opencv.org"
44
license = "Apache 2"
55
install_requires = ["numpy"]

data-py.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name = "robotpy-opencv"
2-
version = "4.8.0+r2"
2+
version = "4.12.0"
33
url = "https://opencv.org"
44
license = "Apache 2"
55
install_requires = ["numpy", f"robotpy-opencv-core=={version}"]

toolchain.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.1)
2-
set(ARM_PREFIX arm-frc2024-linux-gnueabi)
2+
set(ARM_PREFIX arm-frc2025-linux-gnueabi)
33

44
set(CMAKE_SYSTEM_NAME Linux)
55
set(CMAKE_SYSTEM_PROCESSOR arm)
@@ -13,4 +13,4 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
1313
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
1414
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
1515

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

0 commit comments

Comments
 (0)