diff options
| -rw-r--r-- | media-libs/mlt/Manifest | 5 | ||||
| -rw-r--r-- | media-libs/mlt/files/mlt-7.24.0-musl-build-fix.patch | 54 | ||||
| -rw-r--r-- | media-libs/mlt/metadata.xml | 1 | ||||
| -rw-r--r-- | media-libs/mlt/mlt-7.24.0-r102.ebuild (renamed from media-libs/mlt/mlt-7.24.0-r101.ebuild) | 23 | ||||
| -rw-r--r-- | net-im/webex/Manifest | 4 | ||||
| -rw-r--r-- | net-im/webex/webex-44.8.0.30404.ebuild (renamed from net-im/webex/webex-44.5.0.29672.ebuild) | 0 | ||||
| -rw-r--r-- | net-p2p/gridcoin/Manifest | 3 | ||||
| -rw-r--r-- | net-p2p/gridcoin/gridcoin-5.4.8.0-r2.ebuild | 2 |
8 files changed, 74 insertions, 18 deletions
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest index bf784a0..f6fe353 100644 --- a/media-libs/mlt/Manifest +++ b/media-libs/mlt/Manifest @@ -1,6 +1,7 @@ AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160 AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee8b9eed2bc14c535abff02985d573e4606f4f8f42213bcbc86fa68af905ba6c39dddcbf63efa20172c608659153d79073 SHA512 b382ee68f2815b4aa62ce7708a7452536f2bc0287dc4d59f557c08fbf51d6bef7607f63e11e991b4f52eb7e06afbde06d53aac3d42b4a0c96f59332ec17d48cd AUX mlt-7.0.1-cmake-symlink.patch 569 BLAKE2B 06f7c8e7ec78206bb1344bab98f1d9ec816b16c458300964fe31ff30f8f2cc64d8f25a795773fd64db7249b031a164c350b55b6326c4d07d73ffd27f8786a911 SHA512 6deb458c3a89f800b4770460330c1e545c22d3a7304f0713b7ae214145d1413a3061c7c026ab2f6fc44801d1d7505352f03c0da7034e817b684e0ebb25d9a94f +AUX mlt-7.24.0-musl-build-fix.patch 3927 BLAKE2B a8d0d2a5597745cfb078477fd0118e77159723a4628d9272d0891c98c2f8f9aa495ee06b1f5717f612e6045dbc35b38bd7652de18141aa020459e835c5eb63a9 SHA512 19861879d68becd2122d4ad8b81b4017f2df671c12e245888496a0b079b9856d1ac4f5c8af6246b5b35be2e2766bd29d2cce4a9659e92bfd86dbf925e096a774 DIST mlt-7.24.0.tar.gz 1662552 BLAKE2B f6e83b3c3fd9e3bf64366a6f6165b1839003b0fd058e1368e0648e011eff6da1a9af9fa7652aff032bc4ed4465be4648b5f1ae25fc102397aa9ae2d19981643a SHA512 a9e7fd5dc04152e523456bad244416b4fdeb5961ee7cadb816dd1393277d1d801200db595dcd28e520d76e6b2caca17e65c39b0256beb7c42a58ef241b85471d -EBUILD mlt-7.24.0-r101.ebuild 4024 BLAKE2B b9901bc6145255b78e24a18efad7916463e66eafd9d9feb68e6ba7bed6cfacc8baf7d74c03873087cfdcb855f3a1ba5990722939fe8ed30969c0238ba55c242a SHA512 251e48f47339fb1730c816623cbc5eb8120e8281f9c8bdfa475b47f99c48d18942774adccbe1e76671a5a5f5ef7b792a5a8d0d090b83adbd26f6de94041eb9a3 -MISC metadata.xml 1512 BLAKE2B f4fa55b53a172a02258d8753474d2e536a918cad5a3d00d6405a74284aa0ff27cce5fb2f89d03656ec9d164a5e1e229b08c64923d5dfc0778f387242b73a7e46 SHA512 85025f11e0cd74831d5b6cd290d4721bb43799086c76f03ed36a27bf26181ff563dc58a3cd6e506182a2fa7114eeb92014c33633bccecf7d5509439681c454be +EBUILD mlt-7.24.0-r102.ebuild 4141 BLAKE2B 194296516ef8360d838ca98d14dd229e0cd19a0b7f81fdd94ff92b3320a66ef1f0a5297465028a3e71cac8546a271ff5de2b20c1a84457ad7d1b3a1e4be90de6 SHA512 8881ae2969c7232705c98a18380498051fff7d736fe8a0623a3cf189650ca1e428761f276d8d37e97cf1d2bd10a442ecf424bb4544d1cd54300a30d2b6d74eec +MISC metadata.xml 1412 BLAKE2B 8d4eed394f1d1e95e5559466ef1840978966e8f1f7b89fdfd2549b2a35b6ce8f114c9373374fdaefe320cc34a4dc8cbd9f6c4433740d1ae9680de54484b5e3d1 SHA512 b19c711dc3798f952e0223dc0628b25aa3c9a296d66ee2f2b7f46a55b82e71c0c583ee64517be88dcc55eb1e9c31aa782b9043eb7630a853077afb1bf8b4dedd diff --git a/media-libs/mlt/files/mlt-7.24.0-musl-build-fix.patch b/media-libs/mlt/files/mlt-7.24.0-musl-build-fix.patch new file mode 100644 index 0000000..7349c5d --- /dev/null +++ b/media-libs/mlt/files/mlt-7.24.0-musl-build-fix.patch @@ -0,0 +1,54 @@ +https://github.com/mltframework/mlt/pull/1009 +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Sat, 27 Jul 2024 14:51:47 +0000 +Subject: [PATCH 1/1] Fix building on musl libc + +Not every Linux distribution uses GLibc, hence the code under +``` +\#if defined(__linux__) || defined(__GLIBC__) +``` +is not evaluated properly on non GLibc Linux distributions resulting in +build errors such as: + +``` +/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_properties.c: In function 'mlt_properties_set_lcnumeric': +/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_properties.c:154:22: error: assignment to 'mlt_locale_t' {aka 'struct __locale_struct *'} from incompatible pointer type 'char *' [-Wincompatible-pointer-types] + 154 | list->locale = strdup(locale); + | ^ +/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_properties.c: In function 'mlt_properties_get_lcnumeric': +/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_properties.c:186:16: error: assignment to 'const char *' from incompatible pointer type 'mlt_locale_t' {aka 'struct __locale_struct *'} [-Wincompatible-pointer-types] + 186 | result = list->locale; + | ^ +[11/173] /usr/bin/x86_64-pc-linux-musl-gcc -DPREFIX_DATA=\"/usr/share/mlt-7\" -DPREFIX_LIB=\"/usr/lib/mlt-7\" -Dmlt_EXPORTS -I/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/.. -O2 -march=x86-64 -pipe -pipe -frecord-gcc-switches -fno-diagnostics-color -fmessage-length=0 -std=gnu11 -fPIC -mmmx -msse -msse2 -MD -MT src/framework/CMakeFiles/mlt.dir/mlt_property.c.o -MF src/framework/CMakeFiles/mlt.dir/mlt_property.c.o.d -o src/framework/CMakeFiles/mlt.dir/mlt_property.c.o -c /var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_property.c +FAILED: src/framework/CMakeFiles/mlt.dir/mlt_property.c.o +/usr/bin/x86_64-pc-linux-musl-gcc -DPREFIX_DATA=\"/usr/share/mlt-7\" -DPREFIX_LIB=\"/usr/lib/mlt-7\" -Dmlt_EXPORTS -I/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/.. -O2 -march=x86-64 -pipe -pipe -frecord-gcc-switches -fno-diagnostics-color -fmessage-length=0 -std=gnu11 -fPIC -mmmx -msse -msse2 -MD -MT src/framework/CMakeFiles/mlt.dir/mlt_property.c.o -MF src/framework/CMakeFiles/mlt.dir/mlt_property.c.o.d -o src/framework/CMakeFiles/mlt.dir/mlt_property.c.o -c /var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_property.c +/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_property.c: In function 'time_clock_to_frames': +/var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_property.c:331:31: error: passing argument 2 of 'setlocale' from incompatible pointer type [-Wincompatible-pointer-types] + 331 | setlocale(LC_NUMERIC, locale); + | ^~~~~~ + | | + | mlt_locale_t {aka struct __locale_struct *} +In file included from /var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_property.h:34, + from /var/tmp/portage/media-libs/mlt-7.24.0/work/mlt-7.24.0/src/framework/mlt_property.c:28: +/usr/include/locale.h:55:23: note: expected 'const char *' but argument is of type 'mlt_locale_t' {aka 'struct __locale_struct *'} + 55 | char *setlocale (int, const char *); +``` + +Reported on Gentoo Linux with musl libc. +Please refer bug: https://bugs.gentoo.org/936747 for more details. + +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +--- a/src/framework/mlt_property.h ++++ b/src/framework/mlt_property.h +@@ -30,7 +30,7 @@ + #include <sys/param.h> + #endif + +-#if defined(__linux__) || defined(__GLIBC__) ++#if defined(__GLIBC__) + #include <locale.h> + typedef locale_t mlt_locale_t; + #elif defined(__APPLE__) || (defined(__FreeBSD_version) && __FreeBSD_version >= 900506) +-- +2.45.2 + diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml index d06276d..632bde5 100644 --- a/media-libs/mlt/metadata.xml +++ b/media-libs/mlt/metadata.xml @@ -11,7 +11,6 @@ </maintainer> <use> <flag name="frei0r">Build the module for <pkg>media-plugins/frei0r-plugins</pkg></flag> - <flag name="glaxnimate" restrict=">=media-libs/mlt-7.16.0-r101">Build Glaxnimate plugin</flag> <flag name="opencv">Build motion tracking module using <pkg>media-libs/opencv</pkg></flag> <flag name="python">Build SWIG bindings for Python</flag> <flag name="rtaudio">Builds rtaudio consumer for native audio support on multiple platforms</flag> diff --git a/media-libs/mlt/mlt-7.24.0-r101.ebuild b/media-libs/mlt/mlt-7.24.0-r102.ebuild index 4ee68cf..8da8269 100644 --- a/media-libs/mlt/mlt-7.24.0-r101.ebuild +++ b/media-libs/mlt/mlt-7.24.0-r102.ebuild @@ -3,8 +3,8 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) -inherit python-single-r1 cmake +PYTHON_COMPAT=( python3_{10..12} ) +inherit python-single-r1 cmake flag-o-matic DESCRIPTION="Open source multimedia framework for television broadcasting" HOMEPAGE="https://www.mltframework.org/" @@ -13,13 +13,9 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar LICENSE="GPL-3" SLOT="0/7" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="debug ffmpeg frei0r glaxnimate gtk jack libsamplerate opencv opengl python qt5 qt6 rtaudio rubberband sdl sox test vdpau vidstab xine xml" +IUSE="debug ffmpeg frei0r gtk jack libsamplerate opencv opengl python qt5 qt6 rtaudio rubberband sdl sox test vdpau vidstab xine xml" -REQUIRED_USE=" - ?? ( qt5 qt6 ) - glaxnimate? ( || ( qt5 qt6 ) ) - python? ( ${PYTHON_REQUIRED_USE} ) -" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # Needs unpackaged 'kwalify' RESTRICT="test" @@ -60,7 +56,7 @@ DEPEND=" ) qt6? ( dev-qt/qt5compat:6 - dev-qt/qtbase:6[gui,widgets,xml] + dev-qt/qtbase:6[gui,network,opengl,widgets,xml] dev-qt/qtsvg:6 media-libs/libexif x11-libs/libX11 @@ -97,6 +93,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch "${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch "${FILESDIR}"/${PN}-7.0.1-cmake-symlink.patch + "${FILESDIR}"/${PN}-7.24.0-musl-build-fix.patch ) pkg_setup() { @@ -114,6 +111,9 @@ src_prepare() { } src_configure() { + # Workaround for bug #919981 + append-ldflags $(test-flags-CCLD -Wl,--undefined-version) + local mycmakeargs=( -DCMAKE_SKIP_RPATH=ON -DCLANG_FORMAT=OFF @@ -130,11 +130,12 @@ src_configure() { -DMOD_JACKRACK=$(usex jack) -DMOD_RESAMPLE=$(usex libsamplerate) -DMOD_OPENCV=$(usex opencv) + -DMOD_SPATIALAUDIO=OFF # TODO: package libspatialaudio -DMOD_MOVIT=$(usex opengl) -DMOD_QT=$(usex qt5) - -DMOD_GLAXNIMATE=$(usex glaxnimate $(usex qt5) OFF) + -DMOD_GLAXNIMATE=$(usex qt5) -DMOD_QT6=$(usex qt6) - -DMOD_GLAXNIMATE_QT6=$(usex glaxnimate $(usex qt6) OFF) + -DMOD_GLAXNIMATE_QT6=$(usex qt6) -DMOD_RTAUDIO=$(usex rtaudio) -DMOD_RUBBERBAND=$(usex rubberband) -DMOD_VIDSTAB=$(usex vidstab) diff --git a/net-im/webex/Manifest b/net-im/webex/Manifest index 00ec812..b7c9842 100644 --- a/net-im/webex/Manifest +++ b/net-im/webex/Manifest @@ -1,3 +1,3 @@ -DIST webex-44.5.0.29672.rpm 263028328 BLAKE2B 1916997d6cf0b448348f3703126fc566faec6c374567adf9dfd23499df82020e3450862d3387230afe5b01befa7f20b5d3b570a1fa20818e71e5909907624e90 SHA512 f0b8044543f3ae0c4b53a5801de4114b4ad20a4f973bceef28456e3392d349f966e069d9ba9025aee0688d2d02574970f42496b74235ad39c713e148acdff33f -EBUILD webex-44.5.0.29672.ebuild 1381 BLAKE2B 42a1a9a8b48c055babc119b4658af5058344bfea7b5716aeb39fe3697941a0ff6e273cabffc6eccfe7119b595abca32ed7945dc2c434cfadbb75328cb314ec78 SHA512 cf3bb40d7304906a95df0c89a2544f6da313f16f29297105c62c8217ce5e0a5c858e65fb0da884e1697d02b299060204d9fe5b58836836408d55810c3735e637 +DIST webex-44.8.0.30404.rpm 275006392 BLAKE2B c84af2df3537506a198c7ddf30f55632e4b7eab7c343ca78292f679c4031b06a89d9fe43a1cc292541ee19998b15f8ff4cb80242f8e16eacce55329ac99ba42a SHA512 4fe8baa3858d7e67ab2e84c0130853ddf8f6e09ca1320e4f778c65e3ec0b0bff546bdce01141f27961849c1f0e497945f864022e0a0ecbc2ca81f9cb3e387102 +EBUILD webex-44.8.0.30404.ebuild 1381 BLAKE2B 42a1a9a8b48c055babc119b4658af5058344bfea7b5716aeb39fe3697941a0ff6e273cabffc6eccfe7119b595abca32ed7945dc2c434cfadbb75328cb314ec78 SHA512 cf3bb40d7304906a95df0c89a2544f6da313f16f29297105c62c8217ce5e0a5c858e65fb0da884e1697d02b299060204d9fe5b58836836408d55810c3735e637 MISC metadata.xml 243 BLAKE2B 8cf8ac83ad1db0bd469d207675f7f21c96abd2703bd235ca50245afd7e69ebb5caa6ef4bdd4b21b5e447cbec6be1e40bba6be85265f2ada869a4188ba791dec5 SHA512 1bccbbadf8bcfb2fdf729bc19ac67db088c3aae8e7ed4d9310a7acab47990065d231f2279824e096e0216c6d25457127f81f7a73397464a96029d18ded9ad8db diff --git a/net-im/webex/webex-44.5.0.29672.ebuild b/net-im/webex/webex-44.8.0.30404.ebuild index 7e20823..7e20823 100644 --- a/net-im/webex/webex-44.5.0.29672.ebuild +++ b/net-im/webex/webex-44.8.0.30404.ebuild diff --git a/net-p2p/gridcoin/Manifest b/net-p2p/gridcoin/Manifest index a9ab9c1..aa65814 100644 --- a/net-p2p/gridcoin/Manifest +++ b/net-p2p/gridcoin/Manifest @@ -1,6 +1,7 @@ +AUX gridcoin-5.4.8.0-fix_upnp_call.patch 385 BLAKE2B 7e0c6c380a811e9f8ee2a3a579aa09a7972be5f2d097d077ecefa22f91c30d1b3dd4323e2e8e1bbaa1dda95fddd6fa007d61ebf10d88c2dbdb9067011f7e2362 SHA512 a452007387fdd4bb0b0bb506665d39d96be4343300951693d547e260e1b1e69b88363c6a808f89bdfc39da9abc32172059057fb0bc78a518d83a65dd9b1ddf6b AUX gridcoin.init 313 BLAKE2B c816b1726418146e786e9d78802e0dd0e5cd9177d93a791488bb2a5c919bf37cf785b3a51da03754f732f1c69b49ef334d82e62eda0838b9a049764e22660c65 SHA512 1bc3cfb07ecc01563ab5aaf53d02c6b70b8516d60ec54c4a0df5e2738568af6b1146095c5d673b716b95540bb65385b63c28ded041a09c841c8a37f556122f80 AUX gridcoin.service 191 BLAKE2B c828c4d95b3bc11da42221a8f3118d4a9af841fc19408e24d5aa657796e6e7697039f65e4fbd86287d35f81fef07af8157877dac5958f89c8acd4732a6e9359c SHA512 f892a5edbd9f2351e24adc6af4dcd35b5d450098c3eacd4a795ed959aef9e041c0a72aada59ef4a2076222fcedba7cef0f05f1726a2c5af970ec537665b6f81d AUX gridcoinresearch.conf 2880 BLAKE2B 75e768979cd317eff2cc9739e7eb11187f0330880121cecf025f6240164e1a0ccdd2e31d7614553ec8bdd5cade038809d53364c8fa868582b8b96d0361ffcc68 SHA512 bce85a30232fac19b8e207f4fa95acb388835ea12d9d7b9a461788898a3651d0d11dff3a208c28692b4d1f7cd2ec82421948e03b2130e72796ade6d53a31733d DIST gridcoin-5.4.8.0.tar.gz 42846011 BLAKE2B 915500d6b953d1fe2b735092d6c3e5e72d3ce64a6f3f4d1cb94bd8561969663dc98ca3b784b0ea643e9fb7bb70e0439abc122b9382bec073fe0eff4ad3715a8b SHA512 2e37d982ee257e87241d7545e5b15d4d756813089ff029c5c53863f791805942c0f4fb78c2d92684967ca9b5623c530d234e17d1c1f12a48fac8e6119f3f2957 -EBUILD gridcoin-5.4.8.0-r1.ebuild 4501 BLAKE2B 7a5942216a50d5eb5f96ba0fd46f6ef47b70cf0622d47eb95918828ac901483c41211d760427aeb2e5d05d0d9ed34805079c99a154acefff5f75606295a40b97 SHA512 77a351df2ac26cb8f86797fe9bb3347eb7c3f4b3db4945e49df5f740940223852c883c113bc143d3c67f97385ea829d2d2e1950ec16f1215b18f9630a1e367b2 +EBUILD gridcoin-5.4.8.0-r2.ebuild 4559 BLAKE2B 852b0e62a54ba923d5f49ab567c70c36dd07354e821291033e686c89e31a48e1118ab7ec347e9b6d86566b4dcf4ebe9543eab20067119cc212705f9c87142308 SHA512 5236437529878b914754922bf221b008783477209354c217060574047a196b4db8d2b72d83624712e0628146f931cbce5808d20ffb1f0584337dcfa5eb449a34 MISC metadata.xml 1398 BLAKE2B e29c901a967957b8cb3e9cccd96eb471df56a63f628f720325dfc6271c8fab9e87c065eaa91061abe6d6d3b98d3b6e6fab885076bfb84d74ca4f0fd5680bcf0d SHA512 0c03e4802731b2ffccf5ac438dd2dc6b493c72d38c4f396de55cf0315a2701213040d10afda4705a421ab1d2c33eddfe85e9e8876c326c97266b55be0e21019b diff --git a/net-p2p/gridcoin/gridcoin-5.4.8.0-r2.ebuild b/net-p2p/gridcoin/gridcoin-5.4.8.0-r2.ebuild index 15fd6b2..a9a4288 100644 --- a/net-p2p/gridcoin/gridcoin-5.4.8.0-r2.ebuild +++ b/net-p2p/gridcoin/gridcoin-5.4.8.0-r2.ebuild @@ -48,7 +48,7 @@ RDEPEND=" qrcode? ( media-gfx/qrencode ) upnp? ( net-libs/miniupnpc ) boinc? ( sci-misc/boinc ) - utils? ( net-p2p/bitcoin-core[cli] ) + utils? ( >=net-p2p/bitcoin-core-27[cli] ) " DEPEND=" ${RDEPEND} |