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

add jpeg module #66

Merged
merged 4 commits into from
Mar 15, 2022
Merged

add jpeg module #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afc4294
add jpeg module
kuepe-sl Mar 2, 2022
1007539
MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.17.2, and co…
Mar 2, 2022
b080f14
fix tests
kuepe-sl Mar 2, 2022
bdb784a
find libjpeg under Windows
kuepe-sl Mar 9, 2022
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
3 changes: 1 addition & 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.

7 changes: 6 additions & 1 deletion .ci_support/README
View file
Open in desktop

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

8 changes: 6 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 @@ -3,7 +3,7 @@ alsa_lib:
c_compiler:
- gcc
c_compiler_version:
- '9'
- '10'
cdt_name:
- cos6
channel_sources:
Expand All @@ -13,14 +13,18 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '9'
- '10'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
glib:
- '2'
jpeg:
- '9'
libpng:
- '1.6'
pin_run_as_build:
jpeg:
max_pin: x
libpng:
max_pin: x.x
zlib:
Expand Down
8 changes: 6 additions & 2 deletions .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ alsa_lib:
c_compiler:
- gcc
c_compiler_version:
- '9'
- '10'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -17,14 +17,18 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '9'
- '10'
docker_image:
- quay.io/condaforge/linux-anvil-aarch64
glib:
- '2'
jpeg:
- '9'
libpng:
- '1.6'
pin_run_as_build:
jpeg:
max_pin: x
libpng:
max_pin: x.x
zlib:
Expand Down
8 changes: 6 additions & 2 deletions .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ alsa_lib:
c_compiler:
- gcc
c_compiler_version:
- '9'
- '10'
cdt_name:
- cos7
channel_sources:
Expand All @@ -13,14 +13,18 @@ channel_targets:
cxx_compiler:
- gxx
cxx_compiler_version:
- '9'
- '10'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
glib:
- '2'
jpeg:
- '9'
libpng:
- '1.6'
pin_run_as_build:
jpeg:
max_pin: x
libpng:
max_pin: x.x
zlib:
Expand Down
8 changes: 6 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 @@ -3,22 +3,26 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '11'
- '12'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '11'
- '12'
glib:
- '2'
jpeg:
- '9'
libpng:
- '1.6'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
jpeg:
max_pin: x
libpng:
max_pin: x.x
zlib:
Expand Down
8 changes: 6 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 @@ -3,22 +3,26 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '11'
- '12'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '11'
- '12'
glib:
- '2'
jpeg:
- '9'
libpng:
- '1.6'
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
jpeg:
max_pin: x
libpng:
max_pin: x.x
zlib:
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ cxx_compiler:
- vs2017
glib:
- '2'
jpeg:
- '9'
pin_run_as_build:
jpeg:
max_pin: x
zlib:
max_pin: x.x
target_platform:
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop

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

6 changes: 4 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.

2 changes: 1 addition & 1 deletion .scripts/run_docker_build.sh
View file
Open in desktop

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

42 changes: 29 additions & 13 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.

11 changes: 4 additions & 7 deletions build-locally.py
View file
Open in desktop

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

16 changes: 16 additions & 0 deletions recipe/jpeg-win.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
--- plugins_good/ext/jpeg/meson.build 2022-02-03 20:53:32.000000000 +0100
+++ plugins_good/ext/jpeg/meson.build 2022-03-09 10:33:53.947810300 +0100
@@ -5,8 +5,12 @@
'gstjpegdec.c',
]

-jpeglib = dependency('libjpeg', required : get_option('jpeg'),
+jpeglib = dependency('libjpeg', required : false,
fallback: ['libjpeg-turbo', 'jpeg_dep'])
+if not jpeglib.found()
+ c_comp = meson.get_compiler('c')
+ jpeglib = c_comp.find_library('libjpeg', has_headers: ['jpeglib.h'], required : get_option('jpeg'))
+endif

if jpeglib.found()
gstjpeg = library('gstjpeg',
12 changes: 10 additions & 2 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ source:
- url: https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-{{ version }}.tar.xz
sha256: 2d119c15ab8c9e79f8cd3c6bf582ff7a050b28ccae52ab4865e1a1464991659c
folder: plugins_good
patches:
- jpeg-win.patch # [win]

build:
number: 0
number: 1

outputs:
- name: gstreamer
Expand Down Expand Up @@ -183,10 +185,11 @@ outputs:
- glib
- libxcb # [linux]
- jack >=1.9.7 # [linux64]
- lame # [linux]
- lame # [unix]
- mpg123 # [linux64 or osx]
- zlib # [not ppc64le]
- libsoup # [not ppc64le]
- jpeg
run:
- {{ pin_compatible('gstreamer') }}
- {{ pin_subpackage('gst-plugins-base') }}
Expand All @@ -196,9 +199,14 @@ outputs:
commands:
- test -f $PREFIX/lib/gstreamer-1.0/libgstalpha${SHLIB_EXT} # [unix]
- test -f $PREFIX/lib/gstreamer-1.0/libgstdebug${SHLIB_EXT} # [unix]
- test -f $PREFIX/lib/gstreamer-1.0/libgstjack${SHLIB_EXT} # [linux64]
- test -f $PREFIX/lib/gstreamer-1.0/libgstjpeg${SHLIB_EXT} # [unix]
- test -f $PREFIX/lib/gstreamer-1.0/libgstlame${SHLIB_EXT} # [unix]
- test -f $PREFIX/lib/gstreamer-1.0/libgstmpg123${SHLIB_EXT} # [linux64 or osx]
- test -f $PREFIX/lib/gstreamer-1.0/libgstspectrum${SHLIB_EXT} # [unix]
- if not exist %LIBRARY_LIB%\\gstreamer-1.0\\gstalpha.dll exit 1 # [win]
- if not exist %LIBRARY_LIB%\\gstreamer-1.0\\gstdebug.dll exit 1 # [win]
- if not exist %LIBRARY_LIB%\\gstreamer-1.0\\gstjpeg.dll exit 1 # [win]
- if not exist %LIBRARY_LIB%\\gstreamer-1.0\\gstspectrum.dll exit 1 # [win]
- gst-inspect-1.0 --plugin alpha
about:
Expand Down