Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebuild with qt6-main #48

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft
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
4 changes: 2 additions & 2 deletions .ci_support/linux_64_ffmpeg6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ python:
- 3.8.* *_cpython
- 3.9.* *_73_pypy
- 3.9.* *_cpython
qt_main:
- '5.15'
qt6_main:
- '6.7'
sqlite:
- '3'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_64_ffmpeg7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ python:
- 3.8.* *_cpython
- 3.9.* *_73_pypy
- 3.9.* *_cpython
qt_main:
- '5.15'
qt6_main:
- '6.7'
sqlite:
- '3'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_ffmpeg6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ python:
- 3.8.* *_cpython
- 3.9.* *_73_pypy
- 3.9.* *_cpython
qt_main:
- '5.15'
qt6_main:
- '6.7'
sqlite:
- '3'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_ffmpeg7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ python:
- 3.8.* *_cpython
- 3.9.* *_73_pypy
- 3.9.* *_cpython
qt_main:
- '5.15'
qt6_main:
- '6.7'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/linux_ppc64le_ffmpeg6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ python:
- 3.8.* *_cpython
- 3.9.* *_73_pypy
- 3.9.* *_cpython
qt_main:
- '5.15'
sqlite:
- '3'
target_platform:
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/linux_ppc64le_ffmpeg7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ python:
- 3.8.* *_cpython
- 3.9.* *_73_pypy
- 3.9.* *_cpython
qt_main:
- '5.15'
sqlite:
- '3'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_ffmpeg6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ python:
- 3.8.* *_cpython
- 3.9.* *_73_pypy
- 3.9.* *_cpython
qt_main:
- '5.15'
qt6_main:
- '6.7'
sqlite:
- '3'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_ffmpeg7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ python:
- 3.8.* *_cpython
- 3.9.* *_73_pypy
- 3.9.* *_cpython
qt_main:
- '5.15'
qt6_main:
- '6.7'
sqlite:
- '3'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_ffmpeg6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ python:
- 3.12.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
qt_main:
- '5.15'
qt6_main:
- '6.7'
sqlite:
- '3'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_ffmpeg7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ python:
- 3.12.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
qt_main:
- '5.15'
qt6_main:
- '6.7'
sqlite:
- '3'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_ffmpeg6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ python:
- 3.8.* *_cpython
- 3.9.* *_73_pypy
- 3.9.* *_cpython
qt_main:
- '5.15'
qt6_main:
- '6.7'
sqlite:
- '3'
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_ffmpeg7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ python:
- 3.8.* *_cpython
- 3.9.* *_73_pypy
- 3.9.* *_cpython
qt_main:
- '5.15'
qt6_main:
- '6.7'
sqlite:
- '3'
target_platform:
Expand Down
7 changes: 7 additions & 0 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ source:
- 3109bis.patch

build:
number: 5
number: 6

outputs:
- name: {{ namecxx }}
Expand Down Expand Up @@ -65,7 +65,7 @@ outputs:
- libedit # [not win]
- libopencv
- portaudio
- qt-main
- qt6-main # [not ppc64le]
- ffmpeg

run:
Expand All @@ -85,6 +85,12 @@ outputs:
- if not exist %PREFIX%\\Library\\lib\\YARP_os.lib exit 1 # [win]
- if not exist %PREFIX%\\Library\\bin\\YARP_os.dll exit 1 # [win]
- if not exist %PREFIX%\\Library\\lib\\cmake\\YARP_os\\YARP_osConfig.cmake exit 1 # [win]
- yarpmanager --help # [not ppc64le]
- yarprobotinterface --help # [not ppc64le]
- yarpaudiocontrolgui --help # [not ppc64le]
- yarpmobilebasegui --help # [not ppc64le]
- yarpmotorgui --help # [not ppc64le]
- yarpscope --help # [not ppc64le]

- name: {{ namepython }}
script: build_py.sh # [unix]
Expand Down
Loading