From e3ae9f65ba27ed7e18441ac550c0ece3a77beca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20Henrik=20G=C3=B6bbert?= <goebbert1@jwlogin06.juwels>
Date: Mon, 21 Mar 2022 12:23:11 +0100
Subject: [PATCH] fix libvpx
---
Golden_Repo/l/libvpx/libvpx-1.11.0-GCCcore-11.2.0.eb | 5 ++++-
.../l/libyuv/libyuv-20210428-GCCcore-11.2.0.eb | 11 ++++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Golden_Repo/l/libvpx/libvpx-1.11.0-GCCcore-11.2.0.eb b/Golden_Repo/l/libvpx/libvpx-1.11.0-GCCcore-11.2.0.eb
index 7690e9e8a..1295f1116 100644
--- a/Golden_Repo/l/libvpx/libvpx-1.11.0-GCCcore-11.2.0.eb
+++ b/Golden_Repo/l/libvpx/libvpx-1.11.0-GCCcore-11.2.0.eb
@@ -21,7 +21,10 @@ builddependencies = [
('NASM', '2.15.05'),
]
-configopts = '--enable-pic --enable-shared'
+
+configopts = '--enable-pic --enable-shared '
+# https://github.com/Xpra-org/xpra/issues/3082
+configopts += '--enable-vp9-highbitdepth'
sanity_check_paths = {
# 'lib/libvpx.%s' % SHLIB_EXT],
diff --git a/Golden_Repo/l/libyuv/libyuv-20210428-GCCcore-11.2.0.eb b/Golden_Repo/l/libyuv/libyuv-20210428-GCCcore-11.2.0.eb
index 173da2ccd..21e7fad7f 100644
--- a/Golden_Repo/l/libyuv/libyuv-20210428-GCCcore-11.2.0.eb
+++ b/Golden_Repo/l/libyuv/libyuv-20210428-GCCcore-11.2.0.eb
@@ -2,6 +2,7 @@ easyblock = 'CMakeMake'
name = 'libyuv'
version = '20210428'
+versionsuffix = '-fix'
homepage = 'https://chromium.googlesource.com/libyuv/libyuv/'
description = """
@@ -18,7 +19,8 @@ sources = [
'download_filename': 'eb6e7bb63738e29efd82ea3cf2a115238a89fa51.tar.gz',
}
]
-checksums = ['92f70cbd168aaaabad33f59221013e6cee8e41aa802db592b027e4e01e0bcbba']
+# checksum changes with every download
+checksums = ['df3300c3c9d56b5d6b0ef02f330ca508ef4428b1b9af67083201004deb93991a']
builddependencies = [
('binutils', '2.37'),
@@ -28,14 +30,12 @@ builddependencies = [
separate_build_dir = True
start_dir = './'
-maxparallel = 12
-
configopts = '-DCMAKE_VERBOSE_MAKEFILE=ON '
postinstallcmds = [
(
'{ cat >> %(installdir)s/libyuv.pc; } << \'EOF\'\n'
- 'prefix=PREFIX_TEMPLATE\n'
+ 'prefix=%(installdir)s\n'
'exec_prefix=${prefix}\n'
'libdir=${prefix}/lib\n'
'includedir=${prefix}/include\n'
@@ -43,7 +43,8 @@ postinstallcmds = [
'Name: libyuv\n'
'Description: YUV conversion and scaling functionality library\n'
'Version: 0\n'
- 'Libs: -lyuv\n'
+ 'Cflags: -I${includedir}\n'
+ 'Libs: -L${libdir} -lyuv\n'
'EOF'
),
]
--
GitLab