diff options
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/Manifest.gz | bin | 69188 -> 69184 bytes | |||
-rw-r--r-- | media-libs/shaderc/Manifest | 2 | ||||
-rw-r--r-- | media-libs/shaderc/shaderc-2024.1.ebuild | 2 | ||||
-rw-r--r-- | media-libs/vulkan-layers/Manifest | 2 | ||||
-rw-r--r-- | media-libs/vulkan-layers/vulkan-layers-1.3.283.0.ebuild | 2 | ||||
-rw-r--r-- | media-libs/vulkan-loader/Manifest | 2 | ||||
-rw-r--r-- | media-libs/vulkan-loader/vulkan-loader-1.3.283.0.ebuild | 2 | ||||
-rw-r--r-- | media-libs/woff2/Manifest | 2 | ||||
-rw-r--r-- | media-libs/woff2/files/woff2-1.0.2-aliasing.patch | 79 | ||||
-rw-r--r-- | media-libs/woff2/woff2-1.0.2-r6.ebuild | 41 |
10 files changed, 128 insertions, 6 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex 70eed29c8754..d5e9c92dc659 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest index 87db27ac60bf..828464087322 100644 --- a/media-libs/shaderc/Manifest +++ b/media-libs/shaderc/Manifest @@ -2,5 +2,5 @@ AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b3773557 DIST shaderc-2024.0.tar.gz 227125 BLAKE2B f11f2acad796f41015d4738b964526f119e944b1cfa2103ab3452adcf5790a04adbd10f9d55423b3ce567e87f64eb241067c786c4a7b76bb884aa70c100d0eb8 SHA512 ca80b22a80bf1a222e6deecbe63f99c6eed980c6c31b4f7981b6c8dc5637b7271c861543566e01aaf945df40da095b63a69f2e22f061a41faad2ecca5dc187ae DIST shaderc-2024.1.tar.gz 227211 BLAKE2B a4c9790cb117e4cf2d528ed294ef0599dc3c17ac367a4f658254ff9e161f82b3338a2d70a033fabcdb7a2925c2f4668ee89cfff0d4b88cd2b22fcfb3f2786ea9 SHA512 017d8625c66da7eb5b431f595b27a4ddf146aaa12ef56777cb8c3f7f0f15eb01c3286e5905c5268de55d07cc19d5ffae4d4c08987d105b0a6be74616a467b736 EBUILD shaderc-2024.0.ebuild 1899 BLAKE2B 8bcd86131d201a2a4f67236fffddf896b13dffc4043af087f1615f50797026109e67cf8d035d0af1cf4cb04d374264579f81874bcea4fb9eb941f0c9c6283651 SHA512 c2743b91ee7c6cbff07c9a085a548513e654698a42c14c0c533e9cbc40c03e41b1ec784bdf298bd6be430d49c8f815be0e65d8e0566ddbfd35e35bda3b0bcf82 -EBUILD shaderc-2024.1.ebuild 1902 BLAKE2B d063baa561ba9c2c5e6c0de6f5cc2b313f9b4993f5c40cb0b10bcc5c8b8ff627bff0194ff7f7f7fe704341ac65e201eb8c491dd723effd8b1045e4c4c4b00d72 SHA512 cad7e6ff1eceec95c810c0f13f47a18a94a6ac0db6095af956b7cabde403a3d99f493dce582a949ea72af9015820c0dfba44d9ae8f002295bc234c5d14ccfb84 +EBUILD shaderc-2024.1.ebuild 1899 BLAKE2B 4018bd1a8d7ee87666cac490ac6d8ba0003cc2e13e3715e23c6ed5e2dfe7263abdc74af9cd75479f5a41493bb4e2614c21d8d42d022ea938f16f4a1ad8feb548 SHA512 2591db651e5b1f6a58b057113463f354aaed4c4487fc5d0c8add16a1f84895b17c214194b672b28d779379b5ba39c9b6ae54582fe01cd8d0e2858ad403bc2c90 MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70 diff --git a/media-libs/shaderc/shaderc-2024.1.ebuild b/media-libs/shaderc/shaderc-2024.1.ebuild index 7bc994a4ae41..c5075a684ba1 100644 --- a/media-libs/shaderc/shaderc-2024.1.ebuild +++ b/media-libs/shaderc/shaderc-2024.1.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~loong ppc64 ~riscv x86" IUSE="doc" RDEPEND=" diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest index 856aa2f79c20..d1049c4f54a0 100644 --- a/media-libs/vulkan-layers/Manifest +++ b/media-libs/vulkan-layers/Manifest @@ -1,6 +1,6 @@ DIST vulkan-layers-1.3.280.0.tar.gz 5465068 BLAKE2B c0b568b59cb8a17bea7dd1c1522c0a72279ad6a07f2f11383bc069f141fbb179529dd4ccd34b2a7a9a9a4af0e173ebbc49541a42c2b32ea8b54d90302f7ee449 SHA512 b397d4aa5406e25eb241a72f006fb05554d8ec96eec4c31ed08ef34d0b362f8e544a2e8bcf044112bdbb2733f2a9f50bf8b63aff64e143e450fa01298dc7838a DIST vulkan-layers-1.3.283.0.tar.gz 5230566 BLAKE2B c16a4af62900a4b053f7dd60da5279bc088cd297f22bc247be2718cc3187136b60e90530298c068fdd384c9135e83f91f3ffd7b3db9f12555d6dd88b6e9b66ef SHA512 fc2ca2c79be8e01fc39a7802644d5e10b5196317eaac246a17b73093409739e771ac267c1ed8aad08ba68afdebc583702980f195a5f93421a0c041da3f4b6e49 EBUILD vulkan-layers-1.3.280.0.ebuild 1640 BLAKE2B 49009411de0d6c2be662406cdd1bc527ac1706f0650439ce12f6b8e52172d5bf409a1f0a90338f9a469200b4b0a69e37d59662a746984aa4af383e72b67f5f10 SHA512 cf6779d49fb87776dfc772b0ac8e74c4e0c753c3a9544beb808622fafc39e851c083d2936aaedea0e821c2a0fed9315eecea9f8b951b3308a59fd699d0891167 -EBUILD vulkan-layers-1.3.283.0.ebuild 1644 BLAKE2B a3052e0b2c2822c79c9a8459e947840e3ae5d203c2a9ff903e737b1ce446610a078475ab5a67b6c21fea8b5c4e861ae6f80139f6ed2bce2d6e7d57e858b36b74 SHA512 943561dfc9ece07319fa56ca3b44745aa9e1102487a68207dbadb6a0a9b13ec485298fd9f16bbae454e6660da97ed3769772d9cd321e3ab0ec1ca468e37d23b0 +EBUILD vulkan-layers-1.3.283.0.ebuild 1638 BLAKE2B db7c8e50e9c433eb82d35b68cc0babdf1bed7ed2da5afa825e1fb4c893bd5b2d5056b3102fd600a07f5bf88fba108ec4ff0aa337439d0317adfa5b20ba1c05e5 SHA512 3267e6d4723ef07403e9013ebeb23ee449959f3be0e6654fa8444d58e75b945f4bec29165fa936537b97154140fab8f5cd8e9d91b61a566f9efb7e9ae1c4b4b7 EBUILD vulkan-layers-9999.ebuild 1644 BLAKE2B a3052e0b2c2822c79c9a8459e947840e3ae5d203c2a9ff903e737b1ce446610a078475ab5a67b6c21fea8b5c4e861ae6f80139f6ed2bce2d6e7d57e858b36b74 SHA512 943561dfc9ece07319fa56ca3b44745aa9e1102487a68207dbadb6a0a9b13ec485298fd9f16bbae454e6660da97ed3769772d9cd321e3ab0ec1ca468e37d23b0 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095 diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.283.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.283.0.ebuild index 81a4ba180a76..6ed6d70c0e99 100644 --- a/media-libs/vulkan-layers/vulkan-layers-1.3.283.0.ebuild +++ b/media-libs/vulkan-layers/vulkan-layers-1.3.283.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV} fi diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest index 48a3d96ee8bb..c3e3d81dcaec 100644 --- a/media-libs/vulkan-loader/Manifest +++ b/media-libs/vulkan-loader/Manifest @@ -1,6 +1,6 @@ DIST vulkan-loader-1.3.280.0.tar.gz 1702731 BLAKE2B 65b4af33af1f8bbf50fdf95bee1018195961c8d553494981459d9cc4b158ec9d78316ce0d91b8eba1c0679d73ce685adaabebcd2ece1aaf47440e40f8848b083 SHA512 8ec98e0da867f829e048e100a97d7b94a3c40f56f858e3eb81f11f6f58e20e59da6ca8785a9642958ff3b698c618b9968407028cc66dfa0ad296576bf9db45ca DIST vulkan-loader-1.3.283.0.tar.gz 1713233 BLAKE2B 13b01518f08a206ad9a66ba74bbfa5d5199deb556e1beb2d5bcd63780f399d526d9f5ff83d0bc809e47702fd1413e799e34a3e81f00b1f27f93a08aff16aab3e SHA512 0e62cc29a28e9d0898aa0a29b05158f75116f5a86468e879499503a20e95e49791150a0a458317223a04c65dfbc1fdcd22e71596a8cf939a5d38f9bf186851d6 EBUILD vulkan-loader-1.3.280.0.ebuild 1546 BLAKE2B 7d3b40829acc8939a7d592fe6db0d9cda8419aa342879c4ee99de6c8c65518e1b95bc58776f259dec45403c418c7d2662b58865832a9b683bfe686d8b427f911 SHA512 5a49910f2e06cc373dc101fbfbff0415a8c65d20ec46f21e4fdd19735b08138cedc7aba7594e88cca591b512d1ecab23a64acea2b4e37c6efc94da98944bbc69 -EBUILD vulkan-loader-1.3.283.0.ebuild 1552 BLAKE2B 2f42ef99792fb97542b7695ae89d396c5c2f0e2a16bd05e29ed019fce1795953b5795b54e7f42a4caf3e60bffa74a2cdf4a2df11fddfeb49a81cfd9f1aab0300 SHA512 a6fe7d5f1697dd1abfef7ffe42d53f208f9d4a956942fb3f96ce4ad54ca6ed9c950fdfdd205a16043bff91d77c29e2926cd70e61865d54baa8e150c98712fb7f +EBUILD vulkan-loader-1.3.283.0.ebuild 1546 BLAKE2B 7d3b40829acc8939a7d592fe6db0d9cda8419aa342879c4ee99de6c8c65518e1b95bc58776f259dec45403c418c7d2662b58865832a9b683bfe686d8b427f911 SHA512 5a49910f2e06cc373dc101fbfbff0415a8c65d20ec46f21e4fdd19735b08138cedc7aba7594e88cca591b512d1ecab23a64acea2b4e37c6efc94da98944bbc69 EBUILD vulkan-loader-9999.ebuild 1552 BLAKE2B 2f42ef99792fb97542b7695ae89d396c5c2f0e2a16bd05e29ed019fce1795953b5795b54e7f42a4caf3e60bffa74a2cdf4a2df11fddfeb49a81cfd9f1aab0300 SHA512 a6fe7d5f1697dd1abfef7ffe42d53f208f9d4a956942fb3f96ce4ad54ca6ed9c950fdfdd205a16043bff91d77c29e2926cd70e61865d54baa8e150c98712fb7f MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34 diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.283.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.283.0.ebuild index ca20e66ef4a1..0f0644b9342d 100644 --- a/media-libs/vulkan-loader/vulkan-loader-1.3.283.0.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-1.3.283.0.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV} fi diff --git a/media-libs/woff2/Manifest b/media-libs/woff2/Manifest index 6c10c45bf2fb..2a2c7db1c824 100644 --- a/media-libs/woff2/Manifest +++ b/media-libs/woff2/Manifest @@ -1,3 +1,5 @@ +AUX woff2-1.0.2-aliasing.patch 2961 BLAKE2B 75fc42d2c5e7b1eb5aaffb4b08a183e46aac8548f0d6c133ae9940158b6fce022bab53847585a321f22dccac1050d009d4c20ef7e1bba494f8b41f5acb711476 SHA512 e4d401713c5f409ad488762f26e5ce2837326905c4eb9b74eb04a7a93638e8c33bcb88377934fdc3a50b8a25b653af95dbe0524272d5328bacea23b062bf0b0b DIST woff2-1.0.2.tar.gz 38934 BLAKE2B b4a762cb2377b896147d9ebdae97f17e80bdb94fa8ec1b04e28e9df48c2f3456f83fc548b10a49bbc271bead349348f7582a85c5011f60a9feb4dda84920b6f3 SHA512 c788bba1530aec463e755e901f9342f4b599e3a07f54645fef1dc388ab5d5c30625535e5dd38e9e792e04a640574baa50eeefb6b7338ab403755f4a4e0c3044d EBUILD woff2-1.0.2-r5.ebuild 876 BLAKE2B a6803cb284df25b63d11e117534137639fd099c1c67eb2f98373838b795fb1026545d2558a4c0b3fbb5c8a0a6af7d40fdc9b01455ccd5b53a6f19f5cdfae329c SHA512 f52b1f5a8174a329013973e803df0756125048ddf55c50b1cba3425cc9023a219003ab150d8aa0f46fb6c7944f0a723ced988218b172af413a9cff6a4dccd60e +EBUILD woff2-1.0.2-r6.ebuild 932 BLAKE2B d8a1dde8f68a21eff61eace0e909c8f8292a6a2cd736c13e61a60e6170e7ab14bace35748ddacbd06e2dfd91adaa88d47d9542d8becdd11d646119c9d4eeb396 SHA512 460f38183942f459efaad1153a3e4d397c386f0919f0e14c94b2c19952098071717c1646c296f4509ad0f0206f8849bf52c64cad6024f483bfc8ea5ccd32642e MISC metadata.xml 455 BLAKE2B bad7293e8ad355104222c80ab6e6ec1d1c816629b6f16ff78036da29a2e2f9fb3ccbd92d0da40646ee5fc405f3137ea8ef70cd5028b0107bf3b62e9c2b20de17 SHA512 1b18c1af59f53418fb6847d92bb2ba1a016995b550c63f08d8168fc93802d0326599c254428aa995b81db3b65833e378d6295bb6a49ec4a6329d11aef1b38163 diff --git a/media-libs/woff2/files/woff2-1.0.2-aliasing.patch b/media-libs/woff2/files/woff2-1.0.2-aliasing.patch new file mode 100644 index 000000000000..5bc75b744559 --- /dev/null +++ b/media-libs/woff2/files/woff2-1.0.2-aliasing.patch @@ -0,0 +1,79 @@ +https://github.com/google/woff2/commit/23a34adec39d7cef30c1eebbf775a1ea5cc43c53 + +From 23a34adec39d7cef30c1eebbf775a1ea5cc43c53 Mon Sep 17 00:00:00 2001 +From: David Benjamin <davidben@google.com> +Date: Thu, 26 Oct 2023 10:16:05 -0400 +Subject: [PATCH] Fix undefined type-punning when loading/storing words + +Despite common practice, type-punning integer types out of buffers is +undefined in C and C++. It's both a strict aliasing violation on access, +and if the pointer isn't aligned, an alignment violation on cast. Being +undefined, the compiler is allowed to arbitrarily miscompile the code +when we rely on it. + +Instead, the two legal ways to pull a uint32_t out of a buffer are to +either use memcpy, or load byte by byte and use shifts. In both cases, +a good compiler should be smart enough to recognize what we're doing and +generate reasonable code. Since there was already fallback code for the +latter (for a middle-endian architecture?), I went ahead and switched to +that. + +This change is needed to fix UBSan violations in Chromium. +--- a/src/store_bytes.h ++++ b/src/store_bytes.h +@@ -27,15 +27,8 @@ inline size_t StoreU32(uint8_t* dst, size_t offset, uint32_t x) { + } + + inline size_t Store16(uint8_t* dst, size_t offset, int x) { +-#if defined(WOFF_LITTLE_ENDIAN) +- *reinterpret_cast<uint16_t*>(dst + offset) = +- ((x & 0xFF) << 8) | ((x & 0xFF00) >> 8); +-#elif defined(WOFF_BIG_ENDIAN) +- *reinterpret_cast<uint16_t*>(dst + offset) = static_cast<uint16_t>(x); +-#else + dst[offset] = x >> 8; + dst[offset + 1] = x; +-#endif + return offset + 2; + } + +@@ -47,17 +40,8 @@ inline void StoreU32(uint32_t val, size_t* offset, uint8_t* dst) { + } + + inline void Store16(int val, size_t* offset, uint8_t* dst) { +-#if defined(WOFF_LITTLE_ENDIAN) +- *reinterpret_cast<uint16_t*>(dst + *offset) = +- ((val & 0xFF) << 8) | ((val & 0xFF00) >> 8); +- *offset += 2; +-#elif defined(WOFF_BIG_ENDIAN) +- *reinterpret_cast<uint16_t*>(dst + *offset) = static_cast<uint16_t>(val); +- *offset += 2; +-#else + dst[(*offset)++] = val >> 8; + dst[(*offset)++] = val; +-#endif + } + + inline void StoreBytes(const uint8_t* data, size_t len, +--- a/src/woff2_common.cc ++++ b/src/woff2_common.cc +@@ -19,16 +19,8 @@ uint32_t ComputeULongSum(const uint8_t* buf, size_t size) { + uint32_t checksum = 0; + size_t aligned_size = size & ~3; + for (size_t i = 0; i < aligned_size; i += 4) { +-#if defined(WOFF_LITTLE_ENDIAN) +- uint32_t v = *reinterpret_cast<const uint32_t*>(buf + i); +- checksum += (((v & 0xFF) << 24) | ((v & 0xFF00) << 8) | +- ((v & 0xFF0000) >> 8) | ((v & 0xFF000000) >> 24)); +-#elif defined(WOFF_BIG_ENDIAN) +- checksum += *reinterpret_cast<const uint32_t*>(buf + i); +-#else +- checksum += (buf[i] << 24) | (buf[i + 1] << 16) | +- (buf[i + 2] << 8) | buf[i + 3]; +-#endif ++ checksum += ++ (buf[i] << 24) | (buf[i + 1] << 16) | (buf[i + 2] << 8) | buf[i + 3]; + } + + // treat size not aligned on 4 as if it were padded to 4 with 0's + diff --git a/media-libs/woff2/woff2-1.0.2-r6.ebuild b/media-libs/woff2/woff2-1.0.2-r6.ebuild new file mode 100644 index 000000000000..f104cb69f87d --- /dev/null +++ b/media-libs/woff2/woff2-1.0.2-r6.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Encode/decode WOFF2 font format" +HOMEPAGE="https://github.com/google/woff2" +SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" +IUSE="" + +RDEPEND="app-arch/brotli:=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-aliasing.patch +) + +src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON # needed, causes QA warnings otherwise + -DCANONICAL_PREFIXES=ON #661942 + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + dobin "${BUILD_DIR}"/woff2_compress + dobin "${BUILD_DIR}"/woff2_decompress + dobin "${BUILD_DIR}"/woff2_info + + einstalldocs +} |