From 37cf2a8dbadd546a550aac7c8079c3f77427cb63 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 13 Apr 2023 05:42:42 +0100 Subject: gentoo auto-resync : 13:04:2023 - 05:42:42 --- media-libs/Manifest.gz | Bin 67878 -> 67872 bytes media-libs/lcms/Manifest | 3 +- .../lcms/files/lcms-2.15-pthread-linking.patch | 25 +++++ media-libs/lcms/lcms-2.15.ebuild | 1 + media-libs/libopenraw/Manifest | 3 + .../libopenraw/files/libopenraw-0.3.4-gcc13.patch | 24 +++++ media-libs/libopenraw/libopenraw-0.3.4.ebuild | 106 +++++++++++++++++++++ 7 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 media-libs/lcms/files/lcms-2.15-pthread-linking.patch create mode 100644 media-libs/libopenraw/files/libopenraw-0.3.4-gcc13.patch create mode 100644 media-libs/libopenraw/libopenraw-0.3.4.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index e3e5b9e364f1..23b640579f10 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest index 024dd8f7931d..c9285c45032d 100644 --- a/media-libs/lcms/Manifest +++ b/media-libs/lcms/Manifest @@ -3,10 +3,11 @@ AUX lcms-2.13.1-fix-configure-bashisms.patch 544 BLAKE2B 8b129f74cea00033a5cf02c AUX lcms-2.15-meson-big-endian.patch 732 BLAKE2B 9eba9b1b95a2a1ca63f50f8aa9f1a3b01e32473419b71677fc867fd51c395539b5b8a282e846a2ac89f827def7e8fe21491ebe6a191107a8a5527272f3de2593 SHA512 eaf89150f5317f8f87d13818fc8ad7f2229d87563f196332bb5bdffc71ec93867766011f6e104fbb733688aac7dba2774938c3f3fc790d98fffe3a1d94432119 AUX lcms-2.15-meson-psicc-man-page.patch 410 BLAKE2B 7c61e939f6d975524f7a071408e13335d34c28d848be293fba2369a5f58cebc2bd4b2f969b3765837868c7d53eaa3643af1fd8ba436a3fdb49fae41f3e4a7bb2 SHA512 8cbe9adeffc898d7cdad8a9cb0b1e99f6e157b4b5d07bca8aa62d4cb9813a4ebe05e2f49d179278e22a7381a78b17cdc60055b1317360861e413814ff83b3acb AUX lcms-2.15-meson-samples.patch 697 BLAKE2B 1d6908eb7c330219d5923f94dc2f1f036d29a9a681663a3f28648d08d3a1e6ebe6d3e879b62ab6be35572f005f34146633a819b88b4f65deb1cec644b33303de SHA512 b757d5b585fce74f6efbab1df4b35ef1c7ba81b560b2fda99e53869c21a5dde24827333c3de1140e2688f57640945b66912d88c943a187d1512435820899ae4b +AUX lcms-2.15-pthread-linking.patch 1376 BLAKE2B abeaeca00fb8bd7dcb1eb36163704874544f57e65be151cfc82e0bb64d1cc76efe92b9ba057d194e89331c77ce62c1656791a310cc11c8957ef2ed5666e49f37 SHA512 6ce3e6e8ca8ca22e5c43e58a1b5bdad61b5bb31988f1c66c7771311559681b447e07a2449c297eecc8985e24af086517c77477b3ff62f954874f47ad6483a728 DIST lcms2-2.13.1.tar.gz 7276499 BLAKE2B ff4815fc4bcea94dc942f8072741c592f1bbde9c8e997f4e21e36cd271062a341ecc9b1f3c56e3e36ec19091fec049ee9faf75df04c2bc1e11174dc4cfe8da9e SHA512 214ec63fa086b580a6507d493a54ccf5faf02c40e149d71e41f9fc8510efdb16554621c96d91cc886f09682c9631b10aa194b4b67eb6ffcc871d5d4666b05617 DIST lcms2-2.14.tar.gz 7406694 BLAKE2B 777b0bf65829121a3d32bca1ab936ac022f9af739bccdd02d5f86688c3386b974f526a012bdec4d36649566eea0aa659db317dd383eede6488236d601156a0f9 SHA512 92fba0a457ea81590eba0b8d98b7b621da6a83e3857948585e0b524235954954f9ac1670cf6a19b457c0fce22a87899ea4c5810db1ff2acf7c6b6e0dc4b61a1b DIST lcms2-2.15.tar.gz 7548405 BLAKE2B 97ce1e87c8de17e7d0dd1b00e1b49cf4e3c6912c74ff16d5afb9979565ad830fd8b3f08f7535ae8b5e763fbd22d2a058c577536ddb7487b7aa8fb25d585f8c84 SHA512 ab038c369e66736e0dd3810fbac6cf5381bc3102c4dd693819367b1224f59d9e853ede081388464c0e7c213d92e6cddc48c23020953af10ad6c6802cfa17e213 EBUILD lcms-2.13.1-r3.ebuild 1512 BLAKE2B fb15df98139327e95c3accca2ee48c0d8acd2c2eb7fd84b9ec3b200c49231ac513c531fd13444b58857970c6ba653cdedc417fcb5c8c2995581b5b07cd1e8b4a SHA512 0510bf343478291fead3e4e69bd74c5ba84eab1539e3e8e7cb78ccd56402ce42d6054baf501b1c9df5802131d18667121087b16aad1d4bb5868daf138778c307 EBUILD lcms-2.14-r4.ebuild 1362 BLAKE2B d8e7afbe30d08b3df83227a2f8a5c8f80d1d1105b1e808d6cec2238673173e34e572595062a9a205c78129c96c1df9271473bad1807fa6b5b3c407eb216bca90 SHA512 fc98c4e548540aa8c46afc44f940375ed05d5d5dd8a4828e4c0feb5541a5a94b24011cd0b0796e83c6e978c3c355a212f53290d2c68bfc1deeedb69b064a7aa6 -EBUILD lcms-2.15.ebuild 1344 BLAKE2B 9ec7b6c63c512b3c0f4a8a7f0a05b8c9ec012ed5a9b9756e782c3b6f7d3a7ec295e1b597745f7d6af9e4ae11f0e1e6613d87beacf520866b85487330ef53c8be SHA512 371a4fd3cd2ffe956531b76eaa20df167cacb0af92827514d25a38f9ecebd9512035b934baad91f0a5dff1d0f43bf705746db4bbf4171341c91f590862bbc019 +EBUILD lcms-2.15.ebuild 1392 BLAKE2B e2f4546805c22deb3938179cc9ff12ee0d6488bcfa25de35c08a4ba1e8b206873e2a42a5bc3761acd6cf218af86df7d800ba3f19ac042f895f591d5d6d87f172 SHA512 827a5195b5a7468963971e4e4b1808cb465e2ca647956c8c140b3cf097806a68eb59d5eef5b5bca5c1e1a9a20a3253061c8cd97561bb7145bd44fc11836cfa63 MISC metadata.xml 465 BLAKE2B eac440b8a48c75faaa51b0333582740e7e33b0b6222bf5376383764c9395cfa7a7936e19ec2dd22a043e3251ed4e40161c7a594f7f3157b8b809c620dd551430 SHA512 dabeaecc2fed3c2e63f2bb0219711961c51f7da710a5e90629df694c5c89deb9fd26c2329ed5ac577edbf60b51a8efd34f65fdd7e6759912c2513e4d8efa6f35 diff --git a/media-libs/lcms/files/lcms-2.15-pthread-linking.patch b/media-libs/lcms/files/lcms-2.15-pthread-linking.patch new file mode 100644 index 000000000000..613d43415b3d --- /dev/null +++ b/media-libs/lcms/files/lcms-2.15-pthread-linking.patch @@ -0,0 +1,25 @@ +https://github.com/mm2/Little-CMS/commit/1cb1e12fc298b86168ff5606d4ae8d5adb478021 + +From 1cb1e12fc298b86168ff5606d4ae8d5adb478021 Mon Sep 17 00:00:00 2001 +From: Daniel Engberg +Date: Sun, 19 Mar 2023 13:19:14 +0100 +Subject: [PATCH] meson: Link pthread library to threaded plugin + +Fixes +``` +cc -o plugins/threaded/src/liblcms2_threaded.so plugins/threaded/src/liblcms2_threaded.so.p/threaded_core.c.o plugins/threaded/src/liblcms2_threaded.so.p/threaded_main.c.o plugins/threaded/src/liblcms2_threaded.so.p/threaded_scheduler.c.o plugins/threaded/src/liblcms2_threaded.so.p/threaded_split.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -shared -fPIC -Wl,--start-group -Wl,-soname,liblcms2_threaded.so -fstack-protector-strong -O2 -pipe -fstack-protector-strong -fno-strict-aliasing '-Wl,-rpath,$ORIGIN/../../../src' -Wl,-rpath-link,/usr/ports/graphics/lcms2/work/lcms2-2.15/_build/src src/liblcms2.so.2.0.15 -Wl,--end-group +ld: error: undefined symbol: pthread_create +``` +OS: FreeBSD 13.2-BETA1 (amd64) +--- a/plugins/threaded/src/meson.build ++++ b/plugins/threaded/src/meson.build +@@ -21,7 +21,7 @@ liblcms2_threaded = library( + 'lcms2_threaded', + liblcms2_threaded_sources, + include_directories: lcms2_threaded_incdir, +- dependencies: liblcms2_dep, ++ dependencies: [ liblcms2_dep, threads_dep ], + c_args: cargs, + install: true, + ) + diff --git a/media-libs/lcms/lcms-2.15.ebuild b/media-libs/lcms/lcms-2.15.ebuild index 20c12e472a27..d7c7043df029 100644 --- a/media-libs/lcms/lcms-2.15.ebuild +++ b/media-libs/lcms/lcms-2.15.ebuild @@ -28,6 +28,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.15-meson-big-endian.patch "${FILESDIR}"/${PN}-2.15-meson-samples.patch "${FILESDIR}"/${PN}-2.15-meson-psicc-man-page.patch + "${FILESDIR}"/${PN}-2.15-pthread-linking.patch ) multilib_src_configure() { diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest index 3826523f919c..bdc353ff19c4 100644 --- a/media-libs/libopenraw/Manifest +++ b/media-libs/libopenraw/Manifest @@ -1,3 +1,4 @@ +AUX libopenraw-0.3.4-gcc13.patch 643 BLAKE2B 015d9b294b5daeca8c0e20467791530a03651963ad33f7af90aa3769d35d619e1ca7262df62aa2d38f55f8dd146662e876eb722af6b93104260dc9d049e1b101 SHA512 680bc3237b63843ced1ba0b2dec7a05653f2057a1648ec17d25cf06b2cbadc6f52a18eaed3d68ab345a8def217651f00b5af2d71bcd122a801869b2b86f01da9 DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 @@ -16,6 +17,7 @@ DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cd DIST libopenraw-0.1.3.tar.bz2 565458 BLAKE2B dec7cda78b6ff4b1411b93c0d48758920b73e087eaca3c262a0850eb5a3423fee38ba7537694b1a04bdafa6bbb34b290c059f483a5a6af339b76c132ac77c413 SHA512 c56d84610f0cf5da970c4c0c791fccf2f7e9f7c7dacf2aeac0b2702ce9a0cd3aaa2f6db0794b0466e1dd8316771973db1e64d013f635c1166b7ff2eebdcbf029 DIST libopenraw-0.3.2.tar.xz 563624 BLAKE2B 055d550af564f3b2c6c5e79f8875cbb1e996752b3a72f0b87ff1721efc008bd480b819f755b9e92bda63e69171d1533ce7f4a725aeaf69e819e5d8f3769e1d10 SHA512 de6c6b0bdc3847f615a159749648aa58700ad9213fb182853c43fc761c8606a07350f1980f76eb955c7629d16d82f4276108db617ecbd892069ba2daec5183bf DIST libopenraw-0.3.3.tar.xz 570284 BLAKE2B 3c0902e4d525aab919e8856041c563c4a56a58db70771b24d3c12bc9db268bb0a7a32a9a64604dcf6d1719c632663bea8e1d9c94c160ba3468466f333598ab93 SHA512 8c4894a0119c7f58fe965002b69cb2caa0c5b9d2e3656dddc0da0c07674290b155d50338a3f4b62e4faccaa908028ecf4c26a80b8a95d51638bf4bd7bec6c9e1 +DIST libopenraw-0.3.4.tar.xz 570500 BLAKE2B 5d90c07b60ada2daf2110f6e935b33b429e20666c95ae0ed684ea36f09bd27fef67a07c6f359ee1ea3397d1bd48ae5630c95d48327511f56d6a1d81b973804dc SHA512 01bb42cbfb4f88fc8580bdce562243be796829ed943e184299ed54046776e580a9595d5676bded92ed897a6a2267cb2d54c19e31ee8f25804704c558c29b971b DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8 @@ -33,4 +35,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e EBUILD libopenraw-0.1.3.ebuild 1057 BLAKE2B 9e61bd276c42c093126ed6882b70deb1c49e18f76be65fc7b128879b9a02488018fa497d88aedb7e9908eead67bb2b92db26d90373c5c5e4ccc10fa97db559a9 SHA512 bdd564e0c6cf441677c5d33f1c55fa513a7ae63e2f0ac3d73e570d0cfeecca4508a6718d7795ae85705fa186f1e3bf7a693301f69bf15f2720b92affd56d612d EBUILD libopenraw-0.3.2.ebuild 1766 BLAKE2B 93a1fe764ee16e6afb3c302e233e8cb9bf0cba6a24a59f4ce8ae16d0389b73aa38cb9b027f71c92f9783127f22926bd99849bb0a936af2c421d4003896db753f SHA512 59b0e0ca919f451e7af5466e528e7df17ddc4141c731c5b71fbc3d7cb3dba8a564d010515b3a7d3823504cffe8962c00620e1e0df0e79801bd360a9165da876b EBUILD libopenraw-0.3.3.ebuild 1765 BLAKE2B d0d408e7ae15fd86e507a1f4806326a92cfa1b049c99e3853401bf6e0e4641858042c64af5c3f1e9846d0441f7e3b92e4a4d4d36cd0c78c53bf83c49af9aa9a3 SHA512 60e032a3a67f70ca7e70b68c821ab35e27c1c8d8555c916734f0477d34b34462ca0467adbccbb888c0031205f2574883204719413878162d4db03f3847ce8dc4 +EBUILD libopenraw-0.3.4.ebuild 1879 BLAKE2B 55eca331af2418e8b10d1641ad841beb7e2c50cf16b5307c2c0643c72cc64c11fe417259c456e0260d52e02fa04d81e8dcfa5ca8e5bdc841118cdb6b09475853 SHA512 38c98de9d9610d25aa12e39ac73cfe7b67f4bf01c1278c2ed9d1c0d58f8501829c0213813cff559b95ae9fd2f0a15a385775e2365024bf84f9d322f5a514dfd9 MISC metadata.xml 327 BLAKE2B 535d53760f8b1440558a02aecb8ab27244d3583ded3843a38a8d418ae8a8a55859c08901a6fae91f8d63e7848a173e3e40b7ff168a0f86c710e53bcbe87f4161 SHA512 26f6a6a430380b878feabd5a692aed4cf6994701e935fda0f986b0b071702846389f8ada8f0c666f35a5107484879d7dce9f81b866081b0b06a1df1d02125cdb diff --git a/media-libs/libopenraw/files/libopenraw-0.3.4-gcc13.patch b/media-libs/libopenraw/files/libopenraw-0.3.4-gcc13.patch new file mode 100644 index 000000000000..a76630023591 --- /dev/null +++ b/media-libs/libopenraw/files/libopenraw-0.3.4-gcc13.patch @@ -0,0 +1,24 @@ +https://gitlab.freedesktop.org/libopenraw/libopenraw/-/commit/03f8270d6bb255ca6618505e83169ab9d95ccef1 +https://bugs.gentoo.org/895374 + +From 03f8270d6bb255ca6618505e83169ab9d95ccef1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= +Date: Tue, 21 Feb 2023 18:45:00 -0500 +Subject: [PATCH] Issue #12 - Include stdint.h where needed + +- This fixes an issue building with gcc 13 + +https://gitlab.freedesktop.org/libopenraw/libopenraw/-/issues/12 +--- a/lib/trace.hpp ++++ b/lib/trace.hpp +@@ -20,6 +20,8 @@ + + #pragma once + ++#include ++ + #include + #include + #include +-- +GitLab diff --git a/media-libs/libopenraw/libopenraw-0.3.4.ebuild b/media-libs/libopenraw/libopenraw-0.3.4.ebuild new file mode 100644 index 000000000000..e8416de6083c --- /dev/null +++ b/media-libs/libopenraw/libopenraw-0.3.4.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Run cargo-build or cargo fetch in lib/mp4 to get this list +# TODO: >0.3.4 should contain vendored crates in the tarball? +CRATES=" +ahash-0.7.6 +aho-corasick-0.7.18 +atty-0.2.14 +autocfg-1.0.0 +bitreader-0.3.2 +byteorder-1.2.2 +cfg-if-0.1.10 +cfg-if-1.0.0 +env_logger-0.8.4 +fallible_collections-0.4.4 +getrandom-0.2.7 +hashbrown-0.11.2 +hermit-abi-0.1.8 +humantime-2.1.0 +libc-0.2.126 +log-0.4.17 +memchr-2.5.0 +num-traits-0.2.15 +once_cell-1.12.0 +regex-1.5.6 +regex-syntax-0.6.26 +static_assertions-1.1.0 +termcolor-1.1.3 +version_check-0.9.4 +wasi-0.11.0+wasi-snapshot-preview1 +winapi-0.3.8 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-util-0.1.5 +winapi-x86_64-pc-windows-gnu-0.4.0 +" + +inherit cargo gnome2-utils + +DESCRIPTION="RAW image formats decoding library" +HOMEPAGE="https://libopenraw.freedesktop.org/" +SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.xz" +SRC_URI+=" $(cargo_crate_uris)" + +LICENSE="GPL-3 LGPL-3" +SLOT="0/9" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" +IUSE="gtk test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/libxml2 + media-libs/libjpeg-turbo:= + gtk? ( + dev-libs/glib:2 + >=x11-libs/gdk-pixbuf-2.24.0:2 + ) +" +DEPEND=" + ${RDEPEND} + dev-libs/boost +" +BDEPEND=" + virtual/pkgconfig + test? ( net-misc/curl ) +" + +PATCHES=( + "${FILESDIR}"/${P}-gcc13.patch +) + +src_configure() { + econf \ + --with-boost="${EPREFIX}"/usr \ + $(use_enable gtk gnome) +} + +src_compile() { + # Avoid cargo_src_compile + default +} + +src_test() { + # Avoid cargo_src_test + default +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} + +pkg_preinst() { + use gtk && gnome2_gdk_pixbuf_savelist +} + +pkg_postinst() { + use gtk && gnome2_gdk_pixbuf_update +} + +pkg_postrm() { + use gtk && gnome2_gdk_pixbuf_update +} -- cgit v1.2.3