diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index e1941bf..092f432 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -20,10 +20,6 @@ jobs: CONFIG: linux_64_python3.12.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.8.____cpythonpython_implcpython: - CONFIG: linux_64_python3.8.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_python3.9.____cpythonpython_implcpython: CONFIG: linux_64_python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' @@ -40,10 +36,6 @@ jobs: CONFIG: linux_aarch64_python3.12.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_python3.8.____cpythonpython_implcpython: - CONFIG: linux_aarch64_python3.8.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_python3.9.____cpythonpython_implcpython: CONFIG: linux_aarch64_python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' @@ -60,15 +52,12 @@ jobs: CONFIG: linux_ppc64le_python3.12.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_python3.8.____cpythonpython_implcpython: - CONFIG: linux_ppc64le_python3.8.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_python3.9.____cpythonpython_implcpython: CONFIG: linux_ppc64le_python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 68c3f40..fb818fc 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_python3.10.____cpythonpython_implcpython: @@ -17,9 +17,6 @@ jobs: osx_64_python3.12.____cpythonpython_implcpython: CONFIG: osx_64_python3.12.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____cpythonpython_implcpython: - CONFIG: osx_64_python3.8.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' osx_64_python3.9.____cpythonpython_implcpython: CONFIG: osx_64_python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' @@ -32,13 +29,11 @@ jobs: osx_arm64_python3.12.____cpython: CONFIG: osx_arm64_python3.12.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.8.____cpython: - CONFIG: osx_arm64_python3.8.____cpython - UPLOAD_PACKAGES: 'True' osx_arm64_python3.9.____cpython: CONFIG: osx_arm64_python3.9.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index b6d0ff8..5d4dc68 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -17,9 +17,6 @@ jobs: win_64_python3.12.____cpythonpython_implcpython: CONFIG: win_64_python3.12.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' - win_64_python3.8.____cpythonpython_implcpython: - CONFIG: win_64_python3.8.____cpythonpython_implcpython - UPLOAD_PACKAGES: 'True' win_64_python3.9.____cpythonpython_implcpython: CONFIG: win_64_python3.9.____cpythonpython_implcpython UPLOAD_PACKAGES: 'True' @@ -36,7 +33,7 @@ jobs: scriptSource: inline script: | import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" urllib.request.urlretrieve(url, path) diff --git a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml index fbd00ed..c5ac621 100644 --- a/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpythonpython_implcpython.yaml @@ -1,9 +1,13 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -11,15 +15,15 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' pin_run_as_build: python: min_pin: x.x @@ -33,5 +37,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml index 079ec33..2aedde4 100644 --- a/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.11.____cpythonpython_implcpython.yaml @@ -1,9 +1,13 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -11,15 +15,15 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' pin_run_as_build: python: min_pin: x.x @@ -33,5 +37,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml index ade84ad..d858c6e 100644 --- a/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.12.____cpythonpython_implcpython.yaml @@ -1,9 +1,13 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -11,15 +15,15 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' pin_run_as_build: python: min_pin: x.x @@ -33,5 +37,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml deleted file mode 100644 index 4b9ccc7..0000000 --- a/.ci_support/linux_64_python3.8.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,37 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos6 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -glib: -- '2' -gst_plugins_base: -- '1.22' -gstreamer: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -python_impl: -- cpython -target_platform: -- linux-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - python_impl diff --git a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml index afbe38f..dc29151 100644 --- a/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpythonpython_implcpython.yaml @@ -1,9 +1,13 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -11,15 +15,15 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' pin_run_as_build: python: min_pin: x.x @@ -33,5 +37,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml index 2add541..341ec99 100644 --- a/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.10.____cpythonpython_implcpython.yaml @@ -3,7 +3,11 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -15,15 +19,15 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' pin_run_as_build: python: min_pin: x.x @@ -37,5 +41,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml index 0fa2a8e..fdf4574 100644 --- a/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.11.____cpythonpython_implcpython.yaml @@ -3,7 +3,11 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -15,15 +19,15 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' pin_run_as_build: python: min_pin: x.x @@ -37,5 +41,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml index 2698dd2..e4a107d 100644 --- a/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.12.____cpythonpython_implcpython.yaml @@ -3,7 +3,11 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -15,15 +19,15 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' pin_run_as_build: python: min_pin: x.x @@ -37,5 +41,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml deleted file mode 100644 index 03f79e3..0000000 --- a/.ci_support/linux_aarch64_python3.8.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,41 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -glib: -- '2' -gst_plugins_base: -- '1.22' -gstreamer: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -python_impl: -- cpython -target_platform: -- linux-aarch64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - python_impl diff --git a/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml index d61123b..212a589 100644 --- a/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_aarch64_python3.9.____cpythonpython_implcpython.yaml @@ -3,7 +3,11 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_arch: - aarch64 cdt_name: @@ -15,15 +19,15 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' pin_run_as_build: python: min_pin: x.x @@ -37,5 +41,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_ppc64le_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.10.____cpythonpython_implcpython.yaml index 379baf8..872f8be 100644 --- a/.ci_support/linux_ppc64le_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_python3.10.____cpythonpython_implcpython.yaml @@ -1,7 +1,11 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -11,15 +15,15 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' pin_run_as_build: python: min_pin: x.x @@ -33,5 +37,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_ppc64le_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.11.____cpythonpython_implcpython.yaml index 7b56468..4a46603 100644 --- a/.ci_support/linux_ppc64le_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_python3.11.____cpythonpython_implcpython.yaml @@ -1,7 +1,11 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -11,15 +15,15 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' pin_run_as_build: python: min_pin: x.x @@ -33,5 +37,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_ppc64le_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.12.____cpythonpython_implcpython.yaml index 56b5a74..c27eb89 100644 --- a/.ci_support/linux_ppc64le_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_python3.12.____cpythonpython_implcpython.yaml @@ -1,7 +1,11 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -11,15 +15,15 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' pin_run_as_build: python: min_pin: x.x @@ -33,5 +37,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml deleted file mode 100644 index 5c2c061..0000000 --- a/.ci_support/linux_ppc64le_python3.8.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,37 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '12' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -glib: -- '2' -gst_plugins_base: -- '1.22' -gstreamer: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -python_impl: -- cpython -target_platform: -- linux-ppc64le -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - python_impl diff --git a/.ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml index 91d9849..6aaa19f 100644 --- a/.ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/linux_ppc64le_python3.9.____cpythonpython_implcpython.yaml @@ -1,7 +1,11 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' cdt_name: - cos7 channel_sources: @@ -11,15 +15,15 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' pin_run_as_build: python: min_pin: x.x @@ -33,5 +37,7 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +- - c_stdlib_version + - cdt_name - - python - python_impl diff --git a/.ci_support/migrations/gstreamer124.yaml b/.ci_support/migrations/gstreamer124.yaml new file mode 100644 index 0000000..e7a2822 --- /dev/null +++ b/.ci_support/migrations/gstreamer124.yaml @@ -0,0 +1,10 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for gstreamer 1.24 + kind: version + migration_number: 1 +gstreamer: +- '1.24' +gst_plugins_base: +- '1.24' +migrator_ts: 1711328385.659571 diff --git a/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml index 633bb1f..918aa00 100644 --- a/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpythonpython_implcpython.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: -- '16' +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -11,13 +17,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml index c1c6eb4..baea0b9 100644 --- a/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.11.____cpythonpython_implcpython.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: -- '16' +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -11,13 +17,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml index c55e4eb..c81b40c 100644 --- a/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.12.____cpythonpython_implcpython.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: -- '16' +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -11,13 +17,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml deleted file mode 100644 index 66adc77..0000000 --- a/.ci_support/osx_64_python3.8.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,37 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '16' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -glib: -- '2' -gst_plugins_base: -- '1.22' -gstreamer: -- '1.22' -macos_machine: -- x86_64-apple-darwin13.4.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -python_impl: -- cpython -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - python_impl diff --git a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml index 6908b7f..117adf0 100644 --- a/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpythonpython_implcpython.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_compiler: - clang c_compiler_version: -- '16' +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.13' channel_sources: - conda-forge channel_targets: @@ -11,13 +17,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml index b73ac2e..2010643 100644 --- a/.ci_support/osx_arm64_python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.10.____cpython.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '16' +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -11,13 +17,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml index ca9e387..c4fb35a 100644 --- a/.ci_support/osx_arm64_python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.11.____cpython.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '16' +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -11,13 +17,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: diff --git a/.ci_support/osx_arm64_python3.12.____cpython.yaml b/.ci_support/osx_arm64_python3.12.____cpython.yaml index f45acd4..7ffba1b 100644 --- a/.ci_support/osx_arm64_python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.12.____cpython.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '16' +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -11,13 +17,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml deleted file mode 100644 index e1a534a..0000000 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ /dev/null @@ -1,37 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '11.0' -c_compiler: -- clang -c_compiler_version: -- '16' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '16' -glib: -- '2' -gst_plugins_base: -- '1.22' -gstreamer: -- '1.22' -macos_machine: -- arm64-apple-darwin20.0.0 -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -python_impl: -- cpython -target_platform: -- osx-arm64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -- - python - - python_impl diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index 52c0416..b3add85 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -1,9 +1,15 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' c_compiler: - clang c_compiler_version: -- '16' +- '17' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' channel_sources: - conda-forge channel_targets: @@ -11,13 +17,13 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: diff --git a/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml index 11a9af6..4184b7b 100644 --- a/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.10.____cpythonpython_implcpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: @@ -9,9 +11,9 @@ cxx_compiler: glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml index 02bc51e..bde5a25 100644 --- a/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.11.____cpythonpython_implcpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: @@ -9,9 +11,9 @@ cxx_compiler: glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml index 22d5c29..d0e8688 100644 --- a/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.12.____cpythonpython_implcpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: @@ -9,9 +11,9 @@ cxx_compiler: glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml deleted file mode 100644 index 8e20b4e..0000000 --- a/.ci_support/win_64_python3.8.____cpythonpython_implcpython.yaml +++ /dev/null @@ -1,27 +0,0 @@ -c_compiler: -- vs2019 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- vs2019 -glib: -- '2' -gst_plugins_base: -- '1.22' -gstreamer: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -python_impl: -- cpython -target_platform: -- win-64 -zip_keys: -- - python - - python_impl diff --git a/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml b/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml index 9456e0e..be2ac12 100644 --- a/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml +++ b/.ci_support/win_64_python3.9.____cpythonpython_implcpython.yaml @@ -1,5 +1,7 @@ c_compiler: - vs2019 +c_stdlib: +- vs channel_sources: - conda-forge channel_targets: @@ -9,9 +11,9 @@ cxx_compiler: glib: - '2' gst_plugins_base: -- '1.22' +- '1.24' gstreamer: -- '1.22' +- '1.24' pin_run_as_build: python: min_pin: x.x diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index da1368a..0535f6a 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -9,8 +9,6 @@ jobs: runs-on: ubuntu-latest name: automerge steps: - - name: checkout - uses: actions/checkout@v3 - name: automerge-action id: automerge-action uses: conda-forge/automerge-action@main diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 6524cb2..375af20 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,15 +34,21 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup +( +# Due to https://bugzilla.redhat.com/show_bug.cgi?id=1537564 old versions of rpm +# are drastically slowed down when the number of file descriptors is very high. +# This can be visible during a `yum install` step of a feedstock build. +# => Set a lower limit in a subshell for the `yum install`s only. +ulimit -n 1024 # Install the yum requirements defined canonically in the # "recipe/yum_requirements.txt" file. After updating that file, @@ -51,7 +57,8 @@ source run_conda_forge_build_setup /usr/bin/sudo -n yum install -y mesa-libGL -# make the build number clobber + +)# make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then @@ -76,10 +83,16 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 9259eb9..420f051 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -11,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -81,10 +81,17 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 48734de..65650bf 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -55,9 +55,14 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" diff --git a/README.md b/README.md index d7c564c..5ced9c3 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Package license: LGPL-2.1-or-later Summary: GStreamer Python binding overrides -Development: https://gitlab.freedesktop.org/gstreamer/gst-python +Development: https://gitlab.freedesktop.org/gstreamer/gstreamer GStreamer Python binding overrides @@ -51,13 +51,6 @@ Current build status variant - - linux_64_python3.8.____cpythonpython_implcpython - - - variant - - linux_64_python3.9.____cpythonpython_implcpython @@ -86,13 +79,6 @@ Current build status variant - - linux_aarch64_python3.8.____cpythonpython_implcpython - - - variant - - linux_aarch64_python3.9.____cpythonpython_implcpython @@ -121,13 +107,6 @@ Current build status variant - - linux_ppc64le_python3.8.____cpythonpython_implcpython - - - variant - - linux_ppc64le_python3.9.____cpythonpython_implcpython @@ -156,13 +135,6 @@ Current build status variant - - osx_64_python3.8.____cpythonpython_implcpython - - - variant - - osx_64_python3.9.____cpythonpython_implcpython @@ -191,13 +163,6 @@ Current build status variant - - osx_arm64_python3.8.____cpython - - - variant - - osx_arm64_python3.9.____cpython @@ -226,13 +191,6 @@ Current build status variant - - win_64_python3.8.____cpythonpython_implcpython - - - variant - - win_64_python3.9.____cpythonpython_implcpython diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f5..e5306da 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 3f4b7a7..8ac9b84 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,13 +1,16 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): @@ -64,8 +67,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) diff --git a/recipe/bld.bat b/recipe/bld.bat index 687ca64..d817294 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -5,9 +5,15 @@ set "PKG_CONFIG_PATH=%LIBRARY_LIB%\pkgconfig;%LIBRARY_PREFIX%\share\pkgconfig;%BUILD_PREFIX%\Library\lib\pkgconfig" :: get mixed path (forward slash) form of prefix so host prefix replacement works -set "LIBRARY_PREFIX_M=%LIBRARY_PREFIX:\=/%" +set "PREFIX_M=%PREFIX:\=/%" -meson setup builddir --wrap-mode=nofallback --buildtype=release --prefix=%LIBRARY_PREFIX_M% --backend=ninja -Dpython=%PREFIX%\python.exe -Dpygi-overrides-dir=%SP_DIR%\gi\overrides +meson setup builddir ^ + --backend=ninja ^ + --buildtype=release ^ + --libdir=%LIBRARY_LIB% ^ + --prefix=%PREFIX_M% ^ + --wrap-mode=nofallback ^ + -Dpython=%PREFIX%\python.exe if errorlevel 1 exit 1 ninja -v -C builddir -j %CPU_COUNT% diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f4032fb..8a8b134 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,28 +1,23 @@ -{% set name = "gst-python" %} -{% set version = "1.22.9" %} -{% set sha256 = "3f9d5c6ffefda268703744b592a6b3983aa6723273b1220ecbcb62c2a5800009" %} +{% set version = "1.24.6" %} # handle GST versions {% set version_arr = version.split(".") %} {% set gst_version = ".".join((version_arr[0], version_arr[1])) %} package: - name: {{ name|lower }} + name: gst-python version: {{ version }} source: - url: https://gstreamer.freedesktop.org/src/{{ name }}/{{ name }}-{{ version }}.tar.xz - sha256: {{ sha256 }} - patches: - # see https://gitlab.freedesktop.org/gstreamer/gst-python/-/merge_requests/41 - - overlinking.patch + url: https://gstreamer.freedesktop.org/src/gst-python/gst-python-{{ version }}.tar.xz + sha256: 692e88820e097b30e5f92d37d0955c709a0a17b27f874a1907405244825bd700 build: + ignore_run_exports_from: + - {{ compiler('cxx') }} ignore_run_exports: # required by meson, but not actually used - gst-plugins-base - - libcxx # [osx] - - libstdcxx-ng # [linux] number: 0 skip: true # [python_impl != 'cpython'] @@ -31,6 +26,7 @@ requirements: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - {{ compiler('c') }} + - {{ stdlib('c') }} - {{ compiler('cxx') }} - {{ cdt('libxau-devel') }} # [linux] - {{ cdt('libxext-devel') }} # [linux] @@ -53,8 +49,6 @@ requirements: - {{ cdt('libselinux-devel') }} # [linux] - pkg-config - meson - # see https://github.com/mesonbuild/meson/issues/7611 - - meson !=0.56.* # [win] - ninja host: - gstreamer @@ -78,7 +72,7 @@ test: about: home: http://gstreamer.freedesktop.org/modules/gst-python.html - dev_url: https://gitlab.freedesktop.org/gstreamer/gst-python + dev_url: https://gitlab.freedesktop.org/gstreamer/gstreamer license: LGPL-2.1-or-later license_family: LGPL license_file: COPYING diff --git a/recipe/overlinking.patch b/recipe/overlinking.patch deleted file mode 100644 index d12ad9d..0000000 --- a/recipe/overlinking.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/subprojects/gst-python/gi/overrides/meson.build b/subprojects/gst-python/gi/overrides/meson.build -index 5977ee3c93..1b399af8ab 100644 ---- a/subprojects/gst-python/gi/overrides/meson.build -+++ b/subprojects/gst-python/gi/overrides/meson.build -@@ -3,13 +3,20 @@ install_data(pysources, - install_dir: pygi_override_dir, - install_tag: 'python-runtime') - -+# avoid overlinking -+if host_machine.system() == 'windows' -+ python_ext_dep = python_dep -+else -+ python_ext_dep = python_dep.partial_dependency(compile_args: true) -+endif -+ - gstpython = python.extension_module('_gi_gst', - sources: ['gstmodule.c'], - install: true, - install_dir : pygi_override_dir, - install_tag: 'python-runtime', - include_directories : [configinc], -- dependencies : [gst_dep, python_dep, pygobject_dep]) -+ dependencies : [gst_dep, python_ext_dep, pygobject_dep]) - - env = environment() - env.prepend('_GI_OVERRIDES_PATH', [