diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-28 20:40:51 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-28 20:40:51 +0000 |
| commit | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (patch) | |
| tree | 47c9d6e4243f39a1f48afd54c969b65b00a5c649 /media-libs/libheif | |
| parent | d934827bf44b7cfcf6711964418148fa60877668 (diff) | |
gentoo resync : 28.11.2020
Diffstat (limited to 'media-libs/libheif')
| -rw-r--r-- | media-libs/libheif/Manifest | 1 | ||||
| -rw-r--r-- | media-libs/libheif/files/libheif-1.7.0-aom.patch | 46 |
2 files changed, 0 insertions, 47 deletions
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest index 8618834ee8b6..6be4e633d120 100644 --- a/media-libs/libheif/Manifest +++ b/media-libs/libheif/Manifest @@ -1,4 +1,3 @@ -AUX libheif-1.7.0-aom.patch 1530 BLAKE2B 150b86b0b1ed872ff13dfc59933b1aec80d259456666f7bd3fac11d4c5d220349b2ca927f36835e8710f476e1df2ca13c7a5126545c80a2abd0b069953186f18 SHA512 f30474c9f31aa8676352b9848a49699c320ead37a8a59b5c62b98945e520af40fc24fcbf225240c3237cde638d7b274e45dc135a16a3e8a7b278bbafc2cfca3d DIST libheif-1.9.1.tar.gz 1556450 BLAKE2B 5829afbde9c8ad8d7a2ed46e736d17e84dc6f5f2c4deccd1647c3048588fb8bdec96764a31e7801aac81d5f0a3f1c3e1474b8bd5e2d4d84236ef07478e62933e SHA512 a41ff9666877904da095c72af743b56196c75ce90deaeb1998be7eba9729a62282827e7e916e2a067489cc78e558c55fbb6d70da6a5b5281f6d2efcccbe6dbbe EBUILD libheif-1.9.1.ebuild 1594 BLAKE2B 32fcf5315081f5aa4437c88de45393c2965a391f0d37fde470f3527d8ce5a5c346088ce0e119672cafc4788eced325c7eb415f4252a16d455995249636f38912 SHA512 45026b98d6cab726bea57cc32b16ac5ee535c1b56355f75108cb5c3e566a7df07d74caa566deb8baf3046803c69c35ed71626d07dbe7676ef0a9a4c5b8cfbdbf EBUILD libheif-9999.ebuild 1597 BLAKE2B 7cc9e56415e52d885e159897fee4ef8e1da9d8d8e3a545d409692f64d01f0cc23da0dbc994d725afd7090051dc790fc8e1e466bebfcbc9df7e53a336c1879f0f SHA512 5b9b509908870e681e34c7f037fec5682d1b18deefe3cfbbbbbfd73f9e1c0da6fb731c5aa0436c0f70544fbfaec4ec93e8ef85c7b807b7d285bb3d82bb75aea6 diff --git a/media-libs/libheif/files/libheif-1.7.0-aom.patch b/media-libs/libheif/files/libheif-1.7.0-aom.patch deleted file mode 100644 index 9dce291f9647..000000000000 --- a/media-libs/libheif/files/libheif-1.7.0-aom.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 331dff0ba58d5265ddcdadeaf5a45c1f0698a388 Mon Sep 17 00:00:00 2001 -From: Jakov Smolic <jakov.smolic@sartura.hr> -Date: Fri, 14 Aug 2020 22:03:25 +0200 -Subject: [PATCH] Fix building against aom 1.0 - -Taken from upstream commit: -https://github.com/strukturag/libheif/commit/6768552c0a99bb2957906be0f369850326486a58 - -Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr> ---- - libheif/heif_encoder_aom.cc | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/libheif/heif_encoder_aom.cc b/libheif/heif_encoder_aom.cc -index 9953e34..669a51a 100644 ---- a/libheif/heif_encoder_aom.cc -+++ b/libheif/heif_encoder_aom.cc -@@ -502,9 +502,11 @@ struct heif_error aom_encode_image(void* encoder_raw, const struct heif_image* i - - - // --- configure codec -- -- unsigned int aomUsage = (encoder->realtime_mode ? AOM_USAGE_REALTIME : AOM_USAGE_GOOD_QUALITY); -- -+ unsigned int aomUsage = 0; -+#if defined(AOM_USAGE_REALTIME) -+ // aom 2.0 -+ aomUsage = (encoder->realtime_mode ? AOM_USAGE_REALTIME : AOM_USAGE_GOOD_QUALITY); -+#endif - - aom_codec_enc_cfg_t cfg; - aom_codec_err_t res = aom_codec_enc_config_default(encoder->iface, &cfg, aomUsage); -@@ -540,7 +542,10 @@ struct heif_error aom_encode_image(void* encoder_raw, const struct heif_image* i - aom_codec_control(&encoder->codec, AOME_SET_CPUUSED, encoder->cpu_used); - - if (encoder->threads > 1) { -+#if defined(AV1E_SET_ROW_MT) -+ // aom 2.0 - aom_codec_control(&encoder->codec, AV1E_SET_ROW_MT, 1); -+#endif - } - - // --- encode frame --- -2.26.2 - |