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.

Sign up for GitHub

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

Jump to bottom

Rebuild for jpegturbo migration #7

Merged
merged 2 commits into from
Mar 11, 2023
Merged

Rebuild for jpegturbo migration #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba1cbf4
Rebuild for jpegturbo migration
regro-cf-autotick-bot Mar 11, 2023
4d0704d
MNT: Re-rendered with conda-build 3.23.3, conda-smithy 3.23.0, and co…
regro-cf-autotick-bot Mar 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
jpeg:
- '9'
libjpeg_turbo:
- 2.1.5
libpng:
- '1.6'
libtiff:
Expand Down
15 changes: 15 additions & 0 deletions .ci_support/migrations/jpeg_to_libjpeg_turbo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
migrator_ts: 1678152141
__migrator:
kind: version
migration_number: 3
bump_number: 1
commit_message: "Rebuild for jpegturbo migration"
paused: false
pr_limit: 10

libjpeg_turbo:
- 2.1.5
# This migration is matched with a minimigrator that will
# replace jpeg with libjpegturbo
jpeg:
- 10
4 changes: 2 additions & 2 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
jpeg:
- '9'
libjpeg_turbo:
- 2.1.5
libpng:
- '1.6'
libtiff:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
jpeg:
- '9'
libjpeg_turbo:
- 2.1.5
libpng:
- '1.6'
libtiff:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ channel_targets:
- conda-forge main
cxx_compiler:
- vs2019
jpeg:
- '9'
libjpeg_turbo:
- 2.1.5
libpng:
- '1.6'
libtiff:
Expand Down
4 changes: 2 additions & 2 deletions .scripts/build_steps.sh
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions .scripts/run_osx_build.sh
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ source:
- patches/0005-Deifne-c2pstr-for-mac-aarch64-as-well.patch # [osx and arm64]

build:
number: 4
number: 5
run_exports:
- {{ pin_subpackage('libpano13', max_pin='x.x.x') }}

Expand All @@ -31,7 +31,7 @@ requirements:
host:
- perl
- libpng
- jpeg
- libjpeg-turbo
- libtiff
- zlib
- openjdk
Expand Down