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

Update to 6.x #14

Closed
wants to merge 2 commits into from
Closed

Update to 6.x #14

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
2624c75
Update to 6.x
jschueller Feb 28, 2022
ff84a84
MNT: Re-rendered with conda-build 3.21.8, conda-smithy 3.17.2, and co…
Mar 1, 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: 0 additions & 3 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

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

14 changes: 4 additions & 10 deletions .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
alsa_lib:
- 1.2.3
c_compiler:
- gcc
c_compiler_version:
Expand All @@ -26,16 +24,10 @@ freetype:
- '2'
glib:
- '2'
gst_plugins_base:
- '1.18'
gstreamer:
- '1.20'
icu:
- '69'
jpeg:
- '9'
krb5:
- '1.19'
libevent:
- 2.1.10
libpng:
Expand All @@ -48,6 +40,10 @@ nss:
- '3'
openssl:
- 1.1.1
pcre2:
- '10.37'
perl:
- 5.32.1
pin_run_as_build:
dbus:
max_pin: x
Expand All @@ -57,8 +53,6 @@ pin_run_as_build:
max_pin: x
jpeg:
max_pin: x
krb5:
max_pin: x.x
libevent:
max_pin: x.x.x
libpng:
Expand Down
14 changes: 4 additions & 10 deletions .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
alsa_lib:
- 1.2.3
c_compiler:
- gcc
c_compiler_version:
Expand Down Expand Up @@ -30,16 +28,10 @@ freetype:
- '2'
glib:
- '2'
gst_plugins_base:
- '1.18'
gstreamer:
- '1.20'
icu:
- '69'
jpeg:
- '9'
krb5:
- '1.19'
libevent:
- 2.1.10
libpng:
Expand All @@ -52,6 +44,10 @@ nss:
- '3'
openssl:
- 1.1.1
pcre2:
- '10.37'
perl:
- 5.32.1
pin_run_as_build:
dbus:
max_pin: x
Expand All @@ -61,8 +57,6 @@ pin_run_as_build:
max_pin: x
jpeg:
max_pin: x
krb5:
max_pin: x.x
libevent:
max_pin: x.x.x
libpng:
Expand Down
16 changes: 6 additions & 10 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.14'
MACOSX_SDK_VERSION:
- '10.15'
c_compiler:
- clang
c_compiler_version:
Expand All @@ -16,16 +16,10 @@ cxx_compiler_version:
- '12'
glib:
- '2'
gst_plugins_base:
- '1.18'
gstreamer:
- '1.20'
icu:
- '69'
jpeg:
- '9'
krb5:
- '1.19'
libpng:
- '1.6'
macos_machine:
Expand All @@ -36,11 +30,13 @@ nss:
- '3'
openssl:
- 1.1.1
pcre2:
- '10.37'
perl:
- 5.32.1
pin_run_as_build:
jpeg:
max_pin: x
krb5:
max_pin: x.x
libpng:
max_pin: x.x
nspr:
Expand Down
62 changes: 0 additions & 62 deletions .ci_support/osx_arm64_.yaml
View file
Open in desktop

This file was deleted.

16 changes: 6 additions & 10 deletions .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,32 @@
c_compiler:
- vs2017
- vs2019
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
curl:
- '7'
cxx_compiler:
- vs2017
- vs2019
glib:
- '2'
gst_plugins_base:
- '1.18'
gstreamer:
- '1.20'
icu:
- '69'
jpeg:
- '9'
krb5:
- '1.19'
libpng:
- '1.6'
openssl:
- 1.1.1
pcre2:
- '10.37'
perl:
- 5.32.1
pin_run_as_build:
curl:
max_pin: x
jpeg:
max_pin: x
krb5:
max_pin: x.x
libpng:
max_pin: x.x
sqlite:
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
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/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.

8 changes: 1 addition & 7 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.

13 changes: 13 additions & 0 deletions recipe/0010-qtmultimedia-novp9.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/multimedia/platform/darwin/qdarwinintegration.mm b/src/multimedia/platform/darwin/qdarwinintegration.mm
index a1d1cfe..f0ba102 100644
--- a/qtmultimedia/src/multimedia/platform/darwin/qdarwinintegration.mm
+++ b/qtmultimedia/src/multimedia/platform/darwin/qdarwinintegration.mm
@@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE

QDarwinIntegration::QDarwinIntegration()
{
-#ifdef Q_OS_MACOS
+#if 0
if (__builtin_available(macOS 11.0, *))
VTRegisterSupplementalVideoDecoderIfAvailable(kCMVideoCodecType_VP9);
#endif
Loading