diff options
Diffstat (limited to 'media-libs')
64 files changed, 278 insertions, 3641 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex 21e84ad30d7c..dc0e73cf72db 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest index b6e57510a3eb..fd51051e6fd5 100644 --- a/media-libs/lcms/Manifest +++ b/media-libs/lcms/Manifest @@ -3,6 +3,6 @@ DIST lcms2-2.10.tar.gz 15763103 BLAKE2B d5fc0ffd4917c0b73d2df79a2d5acfd93e88b824 DIST lcms2-2.11.tar.gz 6574121 BLAKE2B c729b4dad8326675c73d1752b23b4b55be130441e9dc8754e41f4cbb9b547c7f657f204e8c9a142035a54c60d3a43f36209f5511270675ad6b98b03e9db869fb SHA512 96643da4770c86eb56f454e605d7661024afb33f4e621c23c590307c31a0eec02100eca4f4ac6718639d99d750ed4834a9b2523e910469da717c3ddd78b4b50e DIST lcms2-2.9.tar.gz 10953949 BLAKE2B 6f22a0a8901562e8a84a82c077f31b0155bf81d2b5023211059fa157061e78ebe170bd4744f6d15ab76c96ff9dae521a7560e9665a230337d149e1f0c9018788 SHA512 d91e320a97ef9d64cce31585b7df7c85accb52a0c46a10ed0f45a0ba46cc2ad6687de5151e59ac62170ea878ab48595c1493125f4afb1872824afe1c3f3c459b EBUILD lcms-2.10.ebuild 1210 BLAKE2B 581f9a7df0e9e19fa96e5c33ef9a3e2dbdbdba5910180b700d813e6a2072c097fca73c4635d01f5c3096b6b2acd0d03ccdf87535330024917735cc563ab2651a SHA512 ae33fefe9567e72daad621ccc286e4c2906d5f70e826f3de87e9d92f34be311164b9812935d375b3d3c6ddf4788872cb0eca6bb856fc3aaadf53fb21960bf12e -EBUILD lcms-2.11.ebuild 1184 BLAKE2B df281869e2f082e27ae89ce20a4ea1f70199675d5f92c8c848122ba8eac26ddf21b617e61e028cb09f6fba990908d7224da082593140444325637002a54f6b04 SHA512 20edb254a2fe9c339ca54d2fdd73c5278ec3cc094434cf9dfed7c69b900372f0c0562e9d1fcbaf302a44e875152590c4e0a8fa5dda45d9791bf97c7ccabf641d +EBUILD lcms-2.11.ebuild 1182 BLAKE2B b18e4bb2cea6a30234828d7ceae81b4b8912afe50e39931ea1e76d96b33cef1ea12a54b2bf54d069ad7498e2ec8701001631c73873fd0e90d716b4011e809d59 SHA512 8640186e5245993aac606c9425994633cb879fe547dbcb8a21bccce92a3aa21e9fc4f7839c72ba4be5815bd7a5c226d46d7c9c5ee74f24ffb238f1db109ef842 EBUILD lcms-2.9.ebuild 1240 BLAKE2B df6256d156b2b0dac0acf03c4fb2f7c503edbf0915931e9273c4547688d6980b84f7c1fb03a619dbb1bd967b2ac2694adac0a3ee21eafd59772c57c1a2f13328 SHA512 564d2afaa448d6d560d0c2c6bc8c5e6b90f81e170a16e470d3193c24e71be8accc570d0414dcb0f13a9a82dbc21e0b6e9df31a790ad704b69c8348b29b589bdc MISC metadata.xml 410 BLAKE2B 9349e230ddeb0fe27ff503a24fcfecb247c3f314b0a68b31c3ae998aca9707a2b513228a98f92dcadc15fc9b91e2d8fdb4b6153b35d9eb9ba5492e1b7d929b7c SHA512 d010ff15cb753002aa9a0f9c6c246e3b633cd4ea4bd75521a4c3c6c5b336852e108dafd0835c7533bf07e30dec8c1237e53218b672a01bf0d838cd48f0033d43 diff --git a/media-libs/lcms/lcms-2.11.ebuild b/media-libs/lcms/lcms-2.11.ebuild index 36ef2ecf3797..ab34f19770d8 100644 --- a/media-libs/lcms/lcms-2.11.ebuild +++ b/media-libs/lcms/lcms-2.11.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz" LICENSE="MIT" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc jpeg static-libs test +threads tiff" RESTRICT="!test? ( test )" diff --git a/media-libs/libavif/Manifest b/media-libs/libavif/Manifest new file mode 100644 index 000000000000..d6333be538eb --- /dev/null +++ b/media-libs/libavif/Manifest @@ -0,0 +1,4 @@ +DIST libavif-0.8.1.tar.gz 2915941 BLAKE2B 40030a5a002e68231adf48ecc6e8012f7ec53506770872fc79dfd73496fa3a214c10cf5fb5826f145fe1f881adf2a3ecca13c33989b2f048aa72e455ab6950e0 SHA512 03692fbba49fde08d76cebb847d0404a81113824e9e65edc6a0977f323d060c394d111e2a7647788fa3115f3ae80b0fc92d4fe5be53852e6734b96a8f1c1a078 +EBUILD libavif-0.8.1.ebuild 1659 BLAKE2B 67a47e9825f0372ac63c63c3995e21f9de3fd7c678a8ea509cf1fd474165ba5de133532e3e30c6786178622bdedfa311e692cd5c0a4ab5798694e50f59b44765 SHA512 69bfed41583ee92e65078db7a63ba01012722c0b064949999bfe33e1284a1842e1e2d8a32d75222fb3b6598ba844db5bc515d56c90f80f0db26605502d4549a6 +EBUILD libavif-9999.ebuild 1616 BLAKE2B 6fd97427b007b3ef0e892505eafd538cfd7eb13879fa6d5817608e4dfb027983b283b830b8a5a6fdaad10e764a3281f41a5a382286e27ffaa8db530d5f776749 SHA512 80003f7397e70ce3a50281c508fe43c96745a0c24b316a6f2f9b4abbfd6ff4312c2c3edf506d9325c5732c8ed379b050b503a9124ed62a4f3dcd6cf1c0d3bfc8 +MISC metadata.xml 887 BLAKE2B 07dd6586bb1553346742120a8a79e89df0df54b7d88673f2b05e04523ba9158dc1bb8ce43fe4202eabc053e039d44db886f2ddb22047cc76e240cd917313adc3 SHA512 ad588808bf4fbfb7065053a5178df233a106b4dd57191aab3439b620238aca08370099f2618c21126a0358c7100f572b499461eddb01770b8a270aed43e82a91 diff --git a/media-libs/libavif/libavif-0.8.1.ebuild b/media-libs/libavif/libavif-0.8.1.ebuild new file mode 100644 index 000000000000..4d120a5e644b --- /dev/null +++ b/media-libs/libavif/libavif-0.8.1.ebuild @@ -0,0 +1,73 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake gnome2-utils + +DESCRIPTION="Library for encoding and decoding .avif files" +HOMEPAGE="https://github.com/AOMediaCodec/libavif" +SRC_URI="https://github.com/AOMediaCodec/libavif/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="+aom dav1d examples extras gdk-pixbuf rav1e" + +DEPEND="media-libs/libpng + sys-libs/zlib + virtual/jpeg + aom? ( >=media-libs/libaom-2.0.0 ) + dav1d? ( media-libs/dav1d ) + gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) + rav1e? ( media-video/rav1e[capi] )" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +REQUIRED_USE="|| ( aom dav1d )" + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -DAVIF_CODEC_AOM=$(usex aom ON OFF) + -DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF) + -DAVIF_CODEC_LIBGAV1=OFF + -DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF) + + # Use system libraries. + -DAVIF_LOCAL_ZLIBPNG=OFF + -DAVIF_LOCAL_JPEG=OFF + + -DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF) + -DAVIF_BUILD_APPS=$(usex extras ON OFF) + -DAVIF_BUILD_TESTS=$(usex extras ON OFF) + + -DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF) + ) + + cmake_src_configure +} + +pkg_preinst() { + if use gdk-pixbuf ; then + gnome2_gdk_pixbuf_savelist + fi +} + +pkg_postinst() { + if ! use aom && ! use rav1e ; then + ewarn "aom and rav1e flags are not set," + ewarn "libavif will work in read-only mode." + ewarn "Enable aom or rav1e flag if you want to save .AVIF files." + fi + + if use gdk-pixbuf ; then + gnome2_gdk_pixbuf_update + fi +} + +pkg_postrm() { + if use gdk-pixbuf ; then + gnome2_gdk_pixbuf_update + fi +} diff --git a/media-libs/libavif/libavif-9999.ebuild b/media-libs/libavif/libavif-9999.ebuild new file mode 100644 index 000000000000..ffaba14b1959 --- /dev/null +++ b/media-libs/libavif/libavif-9999.ebuild @@ -0,0 +1,73 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake git-r3 gnome2-utils + +DESCRIPTION="Library for encoding and decoding .avif files" +HOMEPAGE="https://github.com/AOMediaCodec/libavif" +EGIT_REPO_URI="https://github.com/AOMediaCodec/libavif.git" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="" +IUSE="+aom dav1d examples extras gdk-pixbuf rav1e" + +DEPEND="media-libs/libpng + sys-libs/zlib + virtual/jpeg + aom? ( >=media-libs/libaom-2.0.0 ) + dav1d? ( media-libs/dav1d ) + gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 ) + rav1e? ( media-video/rav1e[capi] )" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +REQUIRED_USE="|| ( aom dav1d )" + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + -DAVIF_CODEC_AOM=$(usex aom ON OFF) + -DAVIF_CODEC_DAV1D=$(usex dav1d ON OFF) + -DAVIF_CODEC_LIBGAV1=OFF + -DAVIF_CODEC_RAV1E=$(usex rav1e ON OFF) + + # Use system libraries. + -DAVIF_LOCAL_ZLIBPNG=OFF + -DAVIF_LOCAL_JPEG=OFF + + -DAVIF_BUILD_EXAMPLES=$(usex examples ON OFF) + -DAVIF_BUILD_APPS=$(usex extras ON OFF) + -DAVIF_BUILD_TESTS=$(usex extras ON OFF) + + -DAVIF_BUILD_GDK_PIXBUF=$(usex gdk-pixbuf ON OFF) + ) + + cmake_src_configure +} + +pkg_preinst() { + if use gdk-pixbuf ; then + gnome2_gdk_pixbuf_savelist + fi +} + +pkg_postinst() { + if ! use aom && ! use rav1e ; then + ewarn "aom and rav1e flags are not set," + ewarn "libavif will work in read-only mode." + ewarn "Enable aom or rav1e flag if you want to save .AVIF files." + fi + + if use gdk-pixbuf ; then + gnome2_gdk_pixbuf_update + fi +} + +pkg_postrm() { + if use gdk-pixbuf ; then + gnome2_gdk_pixbuf_update + fi +} diff --git a/media-libs/libavif/metadata.xml b/media-libs/libavif/metadata.xml new file mode 100644 index 000000000000..31ef145a4ce5 --- /dev/null +++ b/media-libs/libavif/metadata.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>juippis@gentoo.org</email> + <name>Joonas Niilola</name> + </maintainer> + <maintainer type="person"> + <email>dnovomesky@gmail.com</email> + <name>Daniel Novomesky</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <use> + <flag name="aom">Enable support for the AOM codec encoding and decoding</flag> + <flag name="dav1d">Enable support for the dav1d codec decoding</flag> + <flag name="extras">Build extra apps (avifenc, avifdec) and test files</flag> + <flag name="gdk-pixbuf">Build a gdk-pixbuf loader</flag> + <flag name="rav1e">Enable support for the rav1e codec encoding</flag> + </use> +</pkgmetadata> diff --git a/media-libs/libffado/Manifest b/media-libs/libffado/Manifest index a80def47c395..85b69d74699f 100644 --- a/media-libs/libffado/Manifest +++ b/media-libs/libffado/Manifest @@ -1,6 +1,3 @@ -AUX libffado-2.4.1-python3-scons-fix.patch 982 BLAKE2B e9e6e5c8e9582db5e936d355abf8b7292c5a03d799dd3c36d567604a1f959b1b509856ee9ac1e7693a1147907ce7105841010c317d8d2981f35c1c125f4cb5a6 SHA512 5e3de46d1e9ff5d0ee0b555218d1d59deb81e87ccf3f4179c6c25fac0888abf27b96e6cd82a8815b58040b3ab949a5cf2128c709c91ea125c3194e19956817e1 -DIST libffado-2.4.1.tgz 1229295 BLAKE2B 3b42493b68fc8648e116784e04baee2278c21e01fa92b22d990340ef329f67c898e247891e76d494410a758009fcf186ba556e900598eaca539a9879664cc704 SHA512 0859f17b87c68108bbde726d1cf8ab0b99f6f7f02cbe36acd8b451e112688a4d1edc21134eb4a2edc8c92dcf5f5da52efeabb2ad0dc07804ed1aa664a3b38d74 DIST libffado-2.4.4.tgz 1228417 BLAKE2B 70d3b17f7d7317acc63351faaefb27fa850664015134887f0508b4a76aabbf6e9573f87eb2dd9792ac5f4f4b06ac7c872afa33af6af0341e6cceeb43e7a79526 SHA512 065b7f9ce9bf58320c02353b63ed17b3610d0ee8a2de58de27159b2190e39c779094b01ae1123c087387e6077375e646b564b9e7717b192865b2f1f22a3acc80 -EBUILD libffado-2.4.1-r1.ebuild 2834 BLAKE2B 076b3a28bd30ca0e70ee9965fd202b2dd70127c78b170eb7648f863326364a024c38b0341ad60384e6bd505a2f0889dee6b1ac96c8ff2b76557df728eee7e07d SHA512 72552a6e68f95e4063479512458e7b7cbaeb549947333c5f934f3fbe9831cdce98fba296240e7281e6050e7aa1626079a12680503dd31c2d53a8d57c42ef603b -EBUILD libffado-2.4.4.ebuild 2644 BLAKE2B b2a03b729d26cfd5a326ee1c96de3b9dbd17a528d709bce7bc878f2e4e445476d9936965f795b72812c41dc1c531b6713972b9b72f70d977d3d394eab50a7210 SHA512 2eb699ccb36194f5aa84e070df9d8ff443d5cb115ab9f972cea7bee9472cd041f0f188fb720d0c8a43674ce18064a8542c43cc31df6c733e16869e6b2127deb2 +EBUILD libffado-2.4.4.ebuild 2643 BLAKE2B f3203ee701775224cbc0fae2e8a0653c0c81cba08060ed5524cc3501bbdbdb1ab2479f485fb6fbbe68c73cca8ac1c5bd9ca7e7040d03a47a951c0b3f724d847b SHA512 e74563ba928c3f5027e6c66d7eb207f9db9e415f16d1bd3508dd609c68c0263844252d1f45fe153b45d1a1d3a4351ca6e82555401a5a16d2130f2f35ddcfe7fc MISC metadata.xml 566 BLAKE2B 66bf590980ba18079dfc4127aad3de692e4544f93518fec98e8c337c129df35fac11ff1c8b2c5c3b606855da6020f7abf311b14a4b8b607b08ed1662ae5adc3a SHA512 f1d19db6ac852100cae4d73b8608a892bae5d4907b35601c4c751a35555111de450edf1f0373c2f81cd68e947c76e9c36c7e2b76a8c9d3aa64345fa9b9227b34 diff --git a/media-libs/libffado/files/libffado-2.4.1-python3-scons-fix.patch b/media-libs/libffado/files/libffado-2.4.1-python3-scons-fix.patch deleted file mode 100644 index e9cb0fb94f46..000000000000 --- a/media-libs/libffado/files/libffado-2.4.1-python3-scons-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- libffado-2.4.1-old/support/mixer-qt4/SConscript 2015-04-12 20:18:15.000000000 +0900 -+++ libffado-2.4.1/support/mixer-qt4/SConscript 2018-06-26 19:59:19.015719710 +0900 -@@ -29,16 +29,12 @@ - if env['BUILD_MIXER'] == 'true': - e = env.Clone() - -- def findfiles( arg, dirname, names ): -- for name in names: -- if name.startswith("."): -- names.remove(name) -- for name in names: -- if '.pyc' not in name and '.in' not in name: -- arg.append( os.path.join( dirname, name ) ) -- - pythonfiles = [ 'ffado/config.py' ] -- os.path.walk( "ffado", findfiles, pythonfiles ) -+ for root, dirs, files in os.walk( "ffado" ): -+ for name in files: -+ if name.endswith( '.pyc' ) or '.in' in name or name.startswith("."): -+ continue -+ pythonfiles.append( os.path.join( root, name ) ) - - e.ScanReplace( "ffado/config.py.in" ) - e.Depends( "ffado/config.py", "#/SConstruct" ) diff --git a/media-libs/libffado/libffado-2.4.1-r1.ebuild b/media-libs/libffado/libffado-2.4.1-r1.ebuild deleted file mode 100644 index 4d945041ea53..000000000000 --- a/media-libs/libffado/libffado-2.4.1-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python3_6 ) - -inherit desktop python-single-r1 scons-utils toolchain-funcs udev multilib-minimal - -DESCRIPTION="Driver for IEEE1394 (Firewire) audio interfaces" -HOMEPAGE="http://www.ffado.org" - -if [[ "${PV}" = "9999" ]]; then - inherit subversion - ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}" -else - SRC_URI="http://www.ffado.org/files/${P}.tgz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" -fi - -LICENSE="GPL-2 GPL-3" -SLOT="0" -IUSE="debug qt5 test-programs" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND="${PYTHON_DEPS} - dev-cpp/libxmlpp:2.6[${MULTILIB_USEDEP}] - dev-libs/dbus-c++ - dev-libs/libconfig[cxx,${MULTILIB_USEDEP}] - media-libs/alsa-lib - media-libs/libiec61883[${MULTILIB_USEDEP}] - sys-apps/dbus - sys-libs/libavc1394[${MULTILIB_USEDEP}] - sys-libs/libraw1394[${MULTILIB_USEDEP}] - qt5? ( - $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] - dev-python/PyQt5[dbus,${PYTHON_MULTI_USEDEP}] - ') - x11-misc/xdg-utils - )" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - !<media-sound/jack-audio-connection-kit-0.122.0:0 - !<media-sound/jack-audio-connection-kit-1.9.9:2" - -PATCHES=( - "${FILESDIR}/${P}-python3-scons-fix.patch" -) - -myescons() { - local myesconsargs=( - PREFIX="${EPREFIX}/usr" - LIBDIR="${EPREFIX}/usr/$(get_libdir)" - MANDIR="${EPREFIX}/usr/share/man" - UDEVDIR="$(get_udevdir)/rules.d" - CUSTOM_ENV=true - DETECT_USERSPACE_ENV=false - DEBUG=$(usex debug) - PYPKGDIR="$(python_get_sitedir)" - # ENABLE_OPTIMIZATIONS detects cpu type and sets flags accordingly - # -fomit-frame-pointer is added also which can cripple debugging. - # we set flags from portage instead - ENABLE_OPTIMIZATIONS=false - # This only works for JACK1>=0.122.0 or JACK2>=1.9.9, so we block - # lower versions. - ENABLE_SETBUFFERSIZE_API_VER=force - ) - if multilib_is_native_abi; then - myesconsargs+=( - BUILD_MIXER=$(usex qt5 true false) - BUILD_TESTS=$(usex test-programs) - ) - else - myesconsargs+=( - BUILD_MIXER=false - BUILD_TESTS=false - ) - fi - escons "${myesconsargs[@]}" "${@}" -} - -src_prepare() { - default - - # Always use Qt5 - sed -i -e 's/try:/if False:/' -e 's/except.*/else:/' support/mixer-qt4/ffado/import_pyqt.py || die - - # Bugs #658052, #659226 - sed -i -e 's/^CacheDir/#CacheDir/' SConstruct || die - - multilib_copy_sources -} - -multilib_src_compile() { - tc-export CC CXX - myescons -} - -multilib_src_install() { - myescons DESTDIR="${D}" WILL_DEAL_WITH_XDG_MYSELF="True" install -} - -multilib_src_install_all() { - einstalldocs - - python_fix_shebang "${D}" - python_optimize "${D}" - - if use qt5; then - newicon "support/xdg/hi64-apps-ffado.png" "ffado.png" - newmenu "support/xdg/ffado.org-ffadomixer.desktop" "ffado-mixer.desktop" - fi -} diff --git a/media-libs/libffado/libffado-2.4.4.ebuild b/media-libs/libffado/libffado-2.4.4.ebuild index bb43175befea..71156c2cf4da 100644 --- a/media-libs/libffado/libffado-2.4.4.ebuild +++ b/media-libs/libffado/libffado-2.4.4.ebuild @@ -15,7 +15,7 @@ if [[ "${PV}" = "9999" ]]; then ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}" else SRC_URI="http://www.ffado.org/files/${P}.tgz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" fi LICENSE="GPL-2 GPL-3" diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest index 0bb7f9434dea..38c5fc7dd34f 100644 --- a/media-libs/libglvnd/Manifest +++ b/media-libs/libglvnd/Manifest @@ -1,4 +1,4 @@ DIST libglvnd-1.3.2.tar.bz2 715212 BLAKE2B 4f8d32d630a94dbce3d87926a25941fb915f9b1bb8ba167ee7392e32e55b26c5bb80db4000dd11188449f662b810f0c986b6ecf7f4c5ebf05d7a895b0fdb3c82 SHA512 4fea59150a7dd2c710ded26270e74ae73af00cc127d7141fe70e31263fb492c5c43eabc8ab27d5a568d12394a95023c22f1b60968f4c403dcf6ad6202bec508c EBUILD libglvnd-1.3.2.ebuild 1554 BLAKE2B 9262984fc8a25aca9a69be941e33f682664f22c6f830e0f9ff8f8e1ede4d0be76faada6bf92a3e3a075681eb4784627e301c66f8bfe117eda703ebc8563ea66f SHA512 f631b6da703bf214d4d03e86a695c586a4dad9f64f93f1038918021097d043abed4bf60978f3e6e52ec4e40f4f6bca49752e41e745f1d601ecb9c0339dc222ef -EBUILD libglvnd-9999.ebuild 1562 BLAKE2B 0116ea12b00f40491b76f30ddb5e98b9c1b62d4e16df367136fc6673656ca0300f6d9bc7c997fc144fe0b6a7050e7880212d433151f05fec69a43d5e14d32d30 SHA512 1753a9eb0e6f7d62176b9a4af37794d30f31ea3c5a522d44142e42cd981c2ed0c08d89c8cf6a3cd692654f83c16ca90b25ac88b1ab37ec616a2b4a82d4c06349 +EBUILD libglvnd-9999.ebuild 1600 BLAKE2B 5a15e3366336eea6da78c128b0874599b748eda9a27023eca9a899ce703965cdfae6e4b100c644ff70789672a7507f63dcecf901f256cdbb0357b2aecdc8d29e SHA512 37f1d07d8fc4a35031ca2c1275a613e951a370df8d341d06bf38903f1010ffbe58d3deeb86284768fd4925fd80190f3eb7fc34bd70397022a227737e0fa925c8 MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild index 4c976349c6d9..d83f52941487 100644 --- a/media-libs/libglvnd/libglvnd-9999.ebuild +++ b/media-libs/libglvnd/libglvnd-9999.ebuild @@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then GIT_ECLASS="git-r3" fi -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6..9} ) VIRTUALX_REQUIRED=manual inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 virtualx @@ -32,7 +32,10 @@ RESTRICT="!test? ( test )" BDEPEND="${PYTHON_DEPS} test? ( X? ( ${VIRTUALX_DEPEND} ) )" RDEPEND=" - !media-libs/mesa[-libglvnd(-)] + || ( + >=media-libs/mesa-20.3 + <media-libs/mesa-20.3[libglvnd(-)] + ) !<media-libs/mesa-19.2.2 X? ( x11-libs/libX11[${MULTILIB_USEDEP}] diff --git a/media-libs/libmatemixer/Manifest b/media-libs/libmatemixer/Manifest index b5ab3c0fc743..f6b26658b55d 100644 --- a/media-libs/libmatemixer/Manifest +++ b/media-libs/libmatemixer/Manifest @@ -1,3 +1,5 @@ DIST libmatemixer-1.24.0.tar.xz 484808 BLAKE2B 8527514cec0770381ce5943f8c87e66f101e92f34527af2b3d4c15696f63df8304f00102fbbfe5b98ebb9b8d8b515f64a3d63b53312f7892b1b4868895539a6f SHA512 bf8c807bd45f3626bbf881eefa1e4638165daf61637bc63a704492d2a67eeec622e35e58c041649d33411294f96f79c99b3ea2406ae6fcf83294ec625cca9dbf +DIST libmatemixer-1.24.1.tar.xz 484864 BLAKE2B 21458cdfa14119364c564993f6e67c320332fabc0595d5422b75dd57ea13bfd2754549de29be6cb11708cb016b459494920000df4f86953d55e0102652dc9816 SHA512 c4620d70c66196521296d2d4197a6e025629faf1324e726df7dd7b0e0444ee17b83355c5059ec17ef36f9f15e6ab3bf3bb82a152b087a11e929d7749c1e1d4e6 EBUILD libmatemixer-1.24.0-r1.ebuild 790 BLAKE2B 6af9babc4b49031bb2c021d65e1fa94f84d651b90b25826a81d20d55cf3a13770e14cac5de8223f9afc5ca715f3f11c92c94797896b7380331098a82ff42b93e SHA512 c3aa9397fccce85f87ab8545ec5c33c24fd4c3193fe483ec8b8692831ff5346a718c9a28b349c2b252c755d651e6781a1823c282b9b5c6a7dcad6f08b3e8b07b +EBUILD libmatemixer-1.24.1.ebuild 769 BLAKE2B 2bb5dbee84c2b4a650b2f9e5c32f94e212af6525c0559734d361c78d1a51f3b73ec7742ae69f8e5317dc7f1ea2be32c20b0f141445889680e1785da4d2269154 SHA512 85663d92287fe67c4e89cfeacf5596e3a4d324a2a8c0999cf68648d860f44563df0339f38d0b1659ddface5e80e5410934c51b946d1322eac17ff7d3f1bb2748 MISC metadata.xml 341 BLAKE2B e060b6c02aaaea5885ec10566d2e3b13fb2f480201b3b43144255fa1f27a93a648a9030fa02f0efd20c8f32ee93e03661f379a63576822ed5c27b094ff6d7d81 SHA512 0c6f04ebdfe4cd26e7fdad53fd184045f6d95c4b9c888883f255ddc566fc02e0cf86138d5557fb71c0e8e9ea12e0d19657b218e1d310ce414e2911470eaa9359 diff --git a/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild b/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild new file mode 100644 index 000000000000..f0193ee65c4d --- /dev/null +++ b/media-libs/libmatemixer/libmatemixer-1.24.1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit mate + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +DESCRIPTION="Mixer library for MATE Desktop" +LICENSE="LGPL-2+" +SLOT="0" + +IUSE="+alsa oss pulseaudio" + +COMMON_DEPEND=" + >=dev-libs/glib-2.50:2 + >=sys-devel/gettext-0.19.8:* + alsa? ( >=media-libs/alsa-lib-1.0.5 ) + pulseaudio? ( >=media-sound/pulseaudio-5.0.0:0[alsa?,glib] ) +" + +RDEPEND="${COMMON_DEPEND} + virtual/libintl +" + +DEPEND="${COMMON_DEPEND} + app-text/docbook-xml-dtd:4.1.2 + dev-util/gtk-doc + dev-util/gtk-doc-am + virtual/pkgconfig +" + +src_configure() { + mate_src_configure \ + --disable-null \ + $(use_enable alsa) \ + $(use_enable oss) \ + $(use_enable pulseaudio) +} diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest index 140d62fd16a7..440d7c3c87f9 100644 --- a/media-libs/libmypaint/Manifest +++ b/media-libs/libmypaint/Manifest @@ -1,9 +1,3 @@ -AUX libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch 940 BLAKE2B 229252af799b13bbb309407ad9ef0424c8315ed23e4a68459ba37737ee7bed5c787acfb034cf4aa195f0568e047bedfa83ecd5ace6dcdc181a806c27a0f4e5ac SHA512 4d45973d8775e227345de65ae6f6a2de5379eb4fcbe703bb88410c64986255b2de766a8d3665fc795d057c12df4aa1ea703e94c19a0aee28562c52e2b70b8bf8 -AUX libmypaint-1.4.0-drop-libmypaint-gegl-versioning.patch 2841 BLAKE2B ae03c291a4d0bc46e9e9daeea2760937273e910edf233a32ff257a10f10d81dbf7b91922bcfcd9c472b0c5190dbc1a51b313f092140a89e963702e1981f65291 SHA512 8034b0a332a5adf3c922009262d7cc602e0d16dc3050e967190b69fcec2d77b57378ebff674a058fe8d7ccece4cf74e61c82b54c823d1f75c5501c82e658798b -AUX libmypaint-1.4.0-drop-python2-requirement-recommendation.patch 1052 BLAKE2B de6af484456b680f6bb5be82d5b2c2a8749bcb7373c2be7fddc39037f45ddc8664cd3291cb2794e96d54d99bd18e2b94e41bdaa5333dc4a121cdaffcf6651f54 SHA512 6a25e66188010955120055d98124e9dc30757e30826386a45e1d8ed1fb3b11d642c7c63fe8b755a3b047fe70a35a0691848573791581cd6a7298b69207e3b56c -AUX libmypaint-1.4.0-gegl-0.4.14.patch 4198 BLAKE2B dad2b852ed3c8a68cba650993fa923491aecf31ff28784cd26f58486f62b1a66ee27c51320ba225489be66ad222389fabff819eaec1065e42f958bdd4f9b8a92 SHA512 100b0a6b3f2de32b6cee35924904e75a2c8c6ebd1483a8e02087945144ff078d6a570ebef8160c06194eb0965ebc78cd1d16232a85778414a8552926405bc783 -DIST libmypaint-1.4.0.tar.xz 441596 BLAKE2B d8c55f8dfedbb5cc07abe5c38c935abecf38f8e626b7fec83d7f7a29acdc722ededcd729f31e13e655242250f1d46cf44ca0473899b0de9510b062b123a711cb SHA512 c549a0b8f02976f7863c5ff49d5f16b5c3eae3e6e9e8803fef833edf78cc2a7413dd8dd751ed560c79d2527e0a54b462a92bb8059bcf69271654b2629f583c19 DIST libmypaint-1.6.1.tar.xz 519464 BLAKE2B 6302914ab7e0876012e5235573c5cb3a76cbca9b5f0707321b0fc0a8406f712b9164ccb02ecc8a63b13d1e640a04cba8063c568bcbe40fc8543fc4a2c1576e5b SHA512 e9413fd6a5336791ab3228a5ad9e7f06871d075c7ded236942f896a205ba44ea901a945fdc97b8be357453a1505331b59e824fe67500fbcda0cc4f11f79af608 -EBUILD libmypaint-1.4.0-r1.ebuild 1708 BLAKE2B 0a62cf06d349502020db734d24eadf4926967e827d76ab8e3cd372fcb377ac1e3a73c3336f71b5b8b81b732ebd1d7205db0dd9cbbdb4a6e86d909488cd970207 SHA512 ab64f9fc0e967a1b18ef377db3c2e7319d1ad6bc3127ddb3b4673a28c2be72e3ea393ea78d2516503da5a3483802eb03e458a820e807d3777425f551a710e0b3 -EBUILD libmypaint-1.6.1.ebuild 1402 BLAKE2B 50a281a4c0c6c822fab94801ad0bcd4bbba6ea03bc861df944703152d9e5662e56ebe2dfbad39a2b0703b6f10fd86f806b6b84f78166a584a1de420910e7021a SHA512 5c4dfbc0ff6192faeffef86245e5d2b5a438a6a84002006c2c4b70fdb01a6ec8ae769ecb3af081cacde1ed7c7390b948f1e0867eccbd3670137b6cd65873a3eb +EBUILD libmypaint-1.6.1.ebuild 1401 BLAKE2B 88ba990f1ab4247f467281fd90fbc9d69eea188350fee4309d732d73b9b2800cf26aa8a8ba032b10929997382cebdcea4630c350d8a0a8b8b7d22ba7ea82da3a SHA512 9e929c8e44a4a33257aca246da83c67f5f30c052e8109f7c56d1cb33004a789a2552d3647da2b4c5052329bc6a646360031a8ea47cc509ebc75795b737cc4034 MISC metadata.xml 335 BLAKE2B 9147fdc98c832807587c5435133f971898c59c5adc5bb17a49a4632c5eb051d1e7e43d7fbefb15f80763771c58faef55e505b8441309c5676130c3e0dd18eee3 SHA512 fd20f4baaf0a494c651b433e3c7a0a75d82db0264ce4ba0d8e34f965f7389bbc5ad27e222b3dcaab307042338993a2761765f217c87d80a83f53a909caadfbdc diff --git a/media-libs/libmypaint/files/libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch b/media-libs/libmypaint/files/libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch deleted file mode 100644 index 8f4b713b3af7..000000000000 --- a/media-libs/libmypaint/files/libmypaint-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 748e735e7fffd2524bb3552fd79b2a2c13f60711 Mon Sep 17 00:00:00 2001 -From: Jesper Lloyd <jpl.lloyd@gmail.com> -Date: Wed, 11 Dec 2019 18:02:35 +0100 -Subject: [PATCH] Adjust generation script to be runnable in Py3 - ---- - generate.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/generate.py b/generate.py -index 6ab3dd0e..1e0b4ee9 100644 ---- a/generate.py -+++ b/generate.py -@@ -26,6 +26,7 @@ - import json - from collections import namedtuple - -+PY3 = sys.version_info >= (3,) - - _SETTINGS = [] # brushsettings.settings - _SETTING_ORDER = [ -@@ -82,7 +83,8 @@ def validate(self): - - def _init_globals_from_json(filename): - """Populate global variables above from the canonical JSON definition.""" -- with open(filename, "rb") as fp: -+ flag = "r" if PY3 else "rb" -+ with open(filename, flag) as fp: - defs = json.load(fp) - for input_def in defs["inputs"]: - input = _BrushInput(**input_def) diff --git a/media-libs/libmypaint/files/libmypaint-1.4.0-drop-libmypaint-gegl-versioning.patch b/media-libs/libmypaint/files/libmypaint-1.4.0-drop-libmypaint-gegl-versioning.patch deleted file mode 100644 index d41079c4b316..000000000000 --- a/media-libs/libmypaint/files/libmypaint-1.4.0-drop-libmypaint-gegl-versioning.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 1b41e786dc0772528b873b6f5bcee64147bfec04 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Thu, 17 Oct 2019 14:44:34 +0200 -Subject: [PATCH] Revert "Not all of libmypaint-gegl was versionned." - -This reverts commit 5e0290c5fb8a175a9f0dd4c6897ff234361c321f. - -See https://github.com/mypaint/libmypaint/issues/144 ---- - gegl/Makefile.am | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/gegl/Makefile.am b/gegl/Makefile.am -index 79f66fa..b45707d 100644 ---- a/gegl/Makefile.am -+++ b/gegl/Makefile.am -@@ -37,10 +37,10 @@ introspection_sources = \ - ../glib/mypaint-gegl-glib.c \ - mypaint-gegl-surface.c - --MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl-@LIBMYPAINT_API_PLATFORM_VERSION@.la Makefile -+MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl.la Makefile - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3 - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I.. --MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl-@LIBMYPAINT_API_PLATFORM_VERSION@.la ../libmypaint-@LIBMYPAINT_API_PLATFORM_VERSION@.la -+MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl.la ../libmypaint.la - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources) - INTROSPECTION_GIRS += MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir - -@@ -56,10 +56,10 @@ endif # HAVE_INTROSPECTION - - ## pkg-config file ## - pkgconfigdir = $(libdir)/pkgconfig --pkgconfig_DATA = libmypaint-gegl-@LIBMYPAINT_API_PLATFORM_VERSION@.pc -+pkgconfig_DATA = libmypaint-gegl.pc - - ## libmypaint-gegl ## --lib_LTLIBRARIES = libmypaint-gegl-@LIBMYPAINT_API_PLATFORM_VERSION@.la -+lib_LTLIBRARIES = libmypaint-gegl.la - - libmypaint_gegl_publicdir = $(includedir)/libmypaint-gegl - -@@ -70,9 +70,9 @@ LIBMYPAINT_GEGL_SOURCES = \ - ../glib/mypaint-gegl-glib.c \ - mypaint-gegl-surface.c - --libmypaint_gegl_@LIBMYPAINT_API_PLATFORM_VERSION@_la_SOURCES = $(libmypaint_gegl_public_HEADERS) $(LIBMYPAINT_GEGL_SOURCES) -+libmypaint_gegl_la_SOURCES = $(libmypaint_gegl_public_HEADERS) $(LIBMYPAINT_GEGL_SOURCES) - --libmypaint_gegl_@LIBMYPAINT_API_PLATFORM_VERSION@_la_CFLAGS = $(JSON_CFLAGS) $(GLIB_CFLAGS) $(GEGL_CFLAGS) --libmypaint_gegl_@LIBMYPAINT_API_PLATFORM_VERSION@_la_LIBADD = $(top_builddir)/libmypaint-@LIBMYPAINT_API_PLATFORM_VERSION@.la $(GEGL_LIBS) -+libmypaint_gegl_la_CFLAGS = $(JSON_CFLAGS) $(GLIB_CFLAGS) $(GEGL_CFLAGS) -+libmypaint_gegl_la_LIBADD = $(top_builddir)/libmypaint.la $(GEGL_LIBS) - - endif # enable_gegl --- -2.23.0 - diff --git a/media-libs/libmypaint/files/libmypaint-1.4.0-drop-python2-requirement-recommendation.patch b/media-libs/libmypaint/files/libmypaint-1.4.0-drop-python2-requirement-recommendation.patch deleted file mode 100644 index 1413868094d5..000000000000 --- a/media-libs/libmypaint/files/libmypaint-1.4.0-drop-python2-requirement-recommendation.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 68e2c33add0aec09f1898aa80ef4f822bed67b87 Mon Sep 17 00:00:00 2001 -From: Jesper Lloyd <jpl.lloyd@gmail.com> -Date: Tue, 17 Dec 2019 17:36:22 +0100 -Subject: [PATCH] Drop python2 requirement/recommendation - ---- - README.md | 2 +- - autogen.sh | 2 +- - generate.py | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/README.md b/README.md -index 96c748da..fae90566 100644 ---- a/README.md -+++ b/README.md -@@ -35,7 +35,7 @@ to get started with a standard configuration: - - When building from git: - -- $ sudo apt install -y python2.7 autotools-dev intltool gettext libtool -+ $ sudo apt install -y python autotools-dev intltool gettext libtool - - ### Install dependencies (Red Hat and derivatives) - -diff --git a/generate.py b/generate.py -index b613f91d..cd7e99e8 100644 ---- a/generate.py -+++ b/generate.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!/usr/bin/env python - # libmypaint - The MyPaint Brush Library - # Copyright (C) 2007-2012 Martin Renold <martinxyz@gmx.ch> - # Copyright (C) 2012-2016 by the MyPaint Development Team. diff --git a/media-libs/libmypaint/files/libmypaint-1.4.0-gegl-0.4.14.patch b/media-libs/libmypaint/files/libmypaint-1.4.0-gegl-0.4.14.patch deleted file mode 100644 index 6855d80e5458..000000000000 --- a/media-libs/libmypaint/files/libmypaint-1.4.0-gegl-0.4.14.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 9e091ea6f3d818748898a9c7a3d6660f5c807027 Mon Sep 17 00:00:00 2001 -From: rezso <rezso@rezso.net> -Date: Thu, 17 Oct 2019 14:32:46 +0200 -Subject: [PATCH] Require gegl >=0.4.14 rather than 0.3.x - ---- - configure.ac | 4 ++-- - gegl/Makefile.am | 4 ++-- - gegl/libmypaint-gegl.pc.in | 2 +- - gegl/mypaint-gegl-surface.c | 8 ++++++++ - 4 files changed, 13 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a17c0a0..22c2e3e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,7 @@ m4_define([libmypaint_version_full], - [libmypaint_api_major().libmypaint_api_minor().libmypaint_api_micro()m4_bpatsubst(libmypaint_api_prerelease(), [^\(.\)], [-\1])]) - - # Dependencies. --m4_define([gegl_required_version], [0.3]) -+m4_define([gegl_required_version], [0.4.14]) - m4_define([introspection_required_version], [1.32.0]) - - AC_INIT([libmypaint], -@@ -249,7 +249,7 @@ AC_ARG_ENABLE(gegl, - ) - - if eval "test x$enable_gegl = xyes"; then -- PKG_CHECK_MODULES(GEGL, gegl-0.3 >= gegl_required_version) -+ PKG_CHECK_MODULES(GEGL, gegl-0.4 >= gegl_required_version) - fi - AM_CONDITIONAL(ENABLE_GEGL, test "x$enable_gegl" = "xyes") - -diff --git a/gegl/Makefile.am b/gegl/Makefile.am -index b45707d..5ef22c1 100644 ---- a/gegl/Makefile.am -+++ b/gegl/Makefile.am -@@ -11,7 +11,7 @@ AM_CPPFLAGS = \ - INTROSPECTION_GIRS = - INTROSPECTION_SCANNER_ARGS = \ - --warn-all \ -- --pkg="gegl-0.3" \ -+ --pkg="gegl-0.4" \ - --pkg="glib-2.0" \ - --namespace="MyPaintGegl" \ - --nsversion="$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION)" \ -@@ -38,7 +38,7 @@ introspection_sources = \ - mypaint-gegl-surface.c - - MyPaintGegl-@LIBMYPAINT_MAJOR_VERSION@.@LIBMYPAINT_MINOR_VERSION@.gir: libmypaint-gegl.la Makefile --MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.3 -+MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 MyPaint-$(LIBMYPAINT_MAJOR_VERSION).$(LIBMYPAINT_MINOR_VERSION) Gegl-0.4 - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_CFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) -I. -I.. - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_LIBS = libmypaint-gegl.la ../libmypaint.la - MyPaintGegl_@LIBMYPAINT_MAJOR_VERSION@_@LIBMYPAINT_MINOR_VERSION@_gir_FILES = $(introspection_sources) -diff --git a/gegl/libmypaint-gegl.pc.in b/gegl/libmypaint-gegl.pc.in -index 75aa729..9184980 100644 ---- a/gegl/libmypaint-gegl.pc.in -+++ b/gegl/libmypaint-gegl.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: libmypaint - Description: MyPaint brush engine library, with GEGL integration. - Version: @LIBMYPAINT_VERSION@ --Requires: gegl-0.3 libmypaint -+Requires: gegl-0.4 libmypaint - Cflags: -I${includedir}/libmypaint-gegl - Libs: -L${libdir} -lmypaint-gegl -diff --git a/gegl/mypaint-gegl-surface.c b/gegl/mypaint-gegl-surface.c -index 5c86d3c..d58ccc9 100644 ---- a/gegl/mypaint-gegl-surface.c -+++ b/gegl/mypaint-gegl-surface.c -@@ -78,7 +78,11 @@ tile_request_start(MyPaintTiledSurface *tiled_surface, MyPaintTileRequest *reque - - if (buffer_is_native(self)) { - GeglBufferIterator *iterator = gegl_buffer_iterator_new(self->buffer, &tile_bbox, 0, self->format, -+#if GEGL_MAJOR_VERSION == 0 && GEGL_MINOR_VERSION == 4 && GEGL_MICRO_VERSION >= 14 -+ read_write_flags, GEGL_ABYSS_NONE, 8); -+#else - read_write_flags, GEGL_ABYSS_NONE); -+#endif - - // Read out - gboolean completed = gegl_buffer_iterator_next(iterator); -@@ -88,7 +92,11 @@ tile_request_start(MyPaintTiledSurface *tiled_surface, MyPaintTileRequest *reque - g_critical("Unable to get tile aligned access to GeglBuffer"); - request->buffer = NULL; - } else { -+#if GEGL_MAJOR_VERSION == 0 && GEGL_MINOR_VERSION == 4 && GEGL_MICRO_VERSION >= 14 -+ request->buffer = (uint16_t *)(iterator->items[0].data); -+#else - request->buffer = (uint16_t *)(iterator->data[0]); -+#endif - } - - // So we can finish the iterator in tile_request_end() --- -2.23.0 - diff --git a/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild b/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild deleted file mode 100644 index 47f1fccbd44d..000000000000 --- a/media-libs/libmypaint/libmypaint-1.4.0-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit autotools python-any-r1 xdg-utils toolchain-funcs - -MY_PV=${PV/_beta/-beta.} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="Library for making brushstrokes" -HOMEPAGE="https://github.com/mypaint/libmypaint" -SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_P}.tar.xz" - -LICENSE="ISC" -SLOT="0/$(ver_cut 1-2)" # https://github.com/mypaint/libmypaint/wiki/Versioning -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86" -IUSE="gegl introspection nls openmp" - -CDEPEND=" - dev-libs/glib:2 - dev-libs/json-c:= - gegl? ( - media-libs/babl - >=media-libs/gegl-0.4.14:0.4[introspection?] - ) - introspection? ( >=dev-libs/gobject-introspection-1.32 ) - openmp? ( >sys-devel/gcc-5:*[openmp] ) - nls? ( sys-devel/gettext ) - " -DEPEND="${CDEPEND} - ${PYTHON_DEPS} - nls? ( dev-util/intltool ) - " -RDEPEND="${CDEPEND} - !<media-gfx/mypaint-1.2.1 - " - -S="${WORKDIR}"/${MY_P} - -PATCHES=( - "${FILESDIR}"/${PN}-1.4.0-drop-libmypaint-gegl-versioning.patch - "${FILESDIR}"/${PN}-1.4.0-gegl-0.4.14.patch - "${FILESDIR}"/${PN}-1.4.0-adjust-generation-script-to-be-runnable-in-Py3.patch - "${FILESDIR}"/${PN}-1.4.0-drop-python2-requirement-recommendation.patch -) - -src_prepare() { - xdg_environment_reset - default - eautoreconf -} - -src_configure() { - tc-ld-disable-gold # bug 589266 - econf \ - --disable-debug \ - --disable-docs \ - $(use_enable gegl) \ - --disable-gperftools \ - $(use_enable nls i18n) \ - $(use_enable introspection) \ - $(use_enable openmp) \ - --disable-profiling -} - -src_install() { - default - find "${D}" -name '*.la' -type f -delete || die -} diff --git a/media-libs/libmypaint/libmypaint-1.6.1.ebuild b/media-libs/libmypaint/libmypaint-1.6.1.ebuild index 66ffe69d2b66..8d0f65876039 100644 --- a/media-libs/libmypaint/libmypaint-1.6.1.ebuild +++ b/media-libs/libmypaint/libmypaint-1.6.1.ebuild @@ -19,7 +19,7 @@ LICENSE="ISC" # See https://github.com/mypaint/libmypaint/releases/tag/v1.6.1 # https://github.com/mypaint/libmypaint/compare/v1.6.0...v1.6.1 SLOT="0/0.0.0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86" IUSE="gegl introspection nls openmp" BDEPEND=" diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest index 54227ef1e0dc..185f09846c75 100644 --- a/media-libs/libraw/Manifest +++ b/media-libs/libraw/Manifest @@ -5,5 +5,5 @@ DIST LibRaw-0.20.0.tar.gz 1431412 BLAKE2B 455649b600926a6a53924e4cfea33143fdd865 EBUILD libraw-0.19.3.ebuild 1405 BLAKE2B 32da66b4f6550a70acb9229f0118ce592720e90a94a9d0a262a4e26a9c6f8fa29bb86625f4522e10839857d130a815bfd556becbe19ae83cdec80073712d9605 SHA512 98e4f79907e0edbe5d4052da27c24d08b95096c12f1f620a2618d20b066e903700ea1eba448e1aadb465dcc457656c0bb9a91e818c4f6a12a350571b44501d27 EBUILD libraw-0.19.4.ebuild 1412 BLAKE2B 06bb6d87b38e4b45f5184bfe5a82beb34562d58d829933508cef9bab6a6434a4b13e3e81146ca2843368020df93ea0909e6f99d8fb0acddaec579dc81dbdfccc SHA512 29b2b405a6f22339afb37cbcd7eff2b99a3c1695873746a189553028d1ecbc20d399d3ef028e34043e7abb7279d949e44397fa17654e9838dabdec26119bbc99 EBUILD libraw-0.19.5.ebuild 1412 BLAKE2B 06bb6d87b38e4b45f5184bfe5a82beb34562d58d829933508cef9bab6a6434a4b13e3e81146ca2843368020df93ea0909e6f99d8fb0acddaec579dc81dbdfccc SHA512 29b2b405a6f22339afb37cbcd7eff2b99a3c1695873746a189553028d1ecbc20d399d3ef028e34043e7abb7279d949e44397fa17654e9838dabdec26119bbc99 -EBUILD libraw-0.20.0.ebuild 1368 BLAKE2B 979877714fb974fe2709f07139130b77645c257b6e6bc89666c466d65a0a6a9ec12319ceb524079b949db64e60e678f14de6f13259702559225618bf8eb86359 SHA512 b41b27de05b7b4ca1565d5514fe8f488067879435dc68784b2e875525ad54431c9bac0c0489682c83a6d992e96ca367a34be4ce6b5097d4342b84c4fbd674416 +EBUILD libraw-0.20.0.ebuild 1366 BLAKE2B 321bd32371ba22654dbeceb6cca69aaec497e5479d59e497d953a89415bc5325e2ec73b9daa7502bf5298fe4d024a4d0e3f9887b245bdf5e9cfb41b40570b998 SHA512 74f6abae25f07559da75f00c0787e3998e23667f64fde1ef27e7118ea85b84f6c2f469a695ec4e9a9c39d0d46706ab0b59070f17c1e4e362ed6177b5d8f5e095 MISC metadata.xml 383 BLAKE2B 3e4195c6cba775cc80e977738b81f527ef45c4fdde631a9c0591b26500cbda7c09267e993d4a21b72b98ec681e1a80d7d99e3d6ce0e48d0d2870abbb1ae64add SHA512 710ff0b177c64460965225e90584cddbf3bc439aa5cc900bb5a3877207fd5ad8f275cca03330366357eff9e08b4effec9d29271e90fc1bdd7befac4eccf56c1b diff --git a/media-libs/libraw/libraw-0.20.0.ebuild b/media-libs/libraw/libraw-0.20.0.ebuild index 16d3dcca644d..16da26d6896a 100644 --- a/media-libs/libraw/libraw-0.20.0.ebuild +++ b/media-libs/libraw/libraw-0.20.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz" LICENSE="LGPL-2.1 CDDL" SLOT="0/20" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux" IUSE="examples jpeg +lcms openmp" RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) diff --git a/media-libs/libyami/Manifest b/media-libs/libyami/Manifest index 64acc2a4b663..247c97a546de 100644 --- a/media-libs/libyami/Manifest +++ b/media-libs/libyami/Manifest @@ -1,12 +1,4 @@ -DIST libyami-1.0.1.tar.gz 480656 BLAKE2B 245c26dcfd396000eaf60d25bf437aad8dcd5255aac2b23ab0299bbf707e52268a914df61e2194dfb67a76d52eb1a8b792c07e777b77975d19ff11a2aa616397 SHA512 01c0716011682ff8b5e6d2c58479aa574bc2cfb5ffe932952e430302aff090d56e0efa4f784f9cdd36d94800c8454802e4500096b3bea162d04ee6253a134c81 -DIST libyami-1.1.0.tar.gz 491537 BLAKE2B fc3b948954ceda10894ff29f5f540a5817a962e2da6d549f0d0b4d89602577437778a244bcaff5fee4f3760d98472d8cd1c0ac07146e3b6ad34618c9f937eeec SHA512 04ef34a994d23f8f5182c17975d6a28048a311c8090393d8cd54dd1fc74ec8b76af4028e1d5506568fb698e15f14833a01d4eaeb4ccd2484801f806a05cc86fa -DIST libyami-1.2.0.tar.gz 508386 BLAKE2B ed4892dddd66d03a5f37c4d28a449c18c722bd1a09aae6261d3b3a210fc4912f728f629a216efd7176c8a37de768a6fa2d1272ca223a387e5cfb8cb4e7cb284d SHA512 1d253d67e3aab7ff2a1add50f7a5ebd284518d12fa689e6160a2dadb3fd1c2a5ab1a1c5f66dfd3801d46d9666c73dabcd5302ca495b069f60671337c0d0bc539 -DIST libyami-1.3.0.tar.gz 820807 BLAKE2B 3764e591269f3c38e7b5f6f5c3dbfb59fe4cdb198cd80858a2c0150274be073c1b064b8c8482b87ba770a6ee3534430b00155b34fa70f6bab7ed537a85ba1ed1 SHA512 8858c7f8d0fa7ce4547f762484e4b82477e49a8cb893cde29d7a26ba0f39dfcabc530659722ee5b84dc6f95e65c3373057ef470c78b9c1d790907e7bd6c6fd75 DIST libyami-1.3.2.tar.gz 820517 BLAKE2B 189ef95bcd504422550f6df38433d042a45e2a1c36b30b1b5445ce69076c95f4d1b60e12e09ff4b11245e3fcdc70a4fa5e0879e3976c4891ca98fa00d79360c1 SHA512 25300d589119b5f5211b5a2445b408dbb35aea83bf18bc3d3b42d6b29151495f5118cf0f32bcc8c3756ac58fccb16932e78c8b6e7b29daffcc9ee08a3e0b5b54 -EBUILD libyami-1.0.1.ebuild 2074 BLAKE2B 37716a2166d5d332770d5a9b187fd9a3b20591d55bb2b6b8dd4d126f2cdb7b36c31406584a16d729d4812be5f580c0f907cd9e76ebf4b9dd5b23f7abca646078 SHA512 06d1c46650057b955ecffbf1b8bd935244a3f2642fdccf4192e9ac0217c3d971ab589e37bd1e4b5df59375b386bd957f3bc92166c72cc10e4b6b71e528a716a7 -EBUILD libyami-1.1.0.ebuild 2100 BLAKE2B e4f2d47816aec5535f2c60dba3e1a9912c2b32b125d567339d4eb75f603f675a3269924d24ab31c9a2053ff03468b9df884cfa385d5de63c33d63a6f9ebc8051 SHA512 82d08826b704ee00ccd0e8195c710fa95273d85171c11ef00b0dedca4ef670678c523ecf252914ee9b7cadfd5820cead79dec747099c7ad6cffc186c358bfc32 -EBUILD libyami-1.2.0.ebuild 2134 BLAKE2B 94e44fdd15ee0a6fc7dca0011fe2371249effb8ebab915defb653e2baa704ce14e731f2c34ec4860b42403d2f01f7fcd3d9d7d72d25cfcc71e03b4cc9f58eefe SHA512 c0972e6252c0d6e386c93da1988b39284dfbc08dd8542d0a3fe44c464df6f0de4e9814badfa36bd3c57cf37b314ec88b31413614e77b50f25be5139ed7261f71 -EBUILD libyami-1.3.0.ebuild 2204 BLAKE2B 45bcc846d25c5a31ff488969236a65a438c7f576de4c0ccefac410faee4d05b7d6da394fe7c0cdb92e08b5681dc2372f9b911c56852bf6f86a2a145cd113e5a3 SHA512 13988b6636f511043a8ac7e5ea192e03d000c54d9c8b9260163035c620ecaffd44a0d6c4efb762b2a7c0be892d620a591355394db5d1b1cd927460ea1787fde5 EBUILD libyami-1.3.2.ebuild 2377 BLAKE2B f1b3d291cdfad965ffa37ffd4926a75612ba66c79cc096399bb19dcb125ba0a89f3fb0df8a0073cb184a88a157fbb4cc69af06c8de79f831741cd2d1e44ea772 SHA512 a2c946869512c855da4ca12a68952a597d268473b4256790ea7cbc4f57f1d1fd9058dd836beb6bc31cab91dcd09e54404a9fc141f971099dbb3035da3d578cc2 EBUILD libyami-9999.ebuild 2377 BLAKE2B f1b3d291cdfad965ffa37ffd4926a75612ba66c79cc096399bb19dcb125ba0a89f3fb0df8a0073cb184a88a157fbb4cc69af06c8de79f831741cd2d1e44ea772 SHA512 a2c946869512c855da4ca12a68952a597d268473b4256790ea7cbc4f57f1d1fd9058dd836beb6bc31cab91dcd09e54404a9fc141f971099dbb3035da3d578cc2 MISC metadata.xml 564 BLAKE2B 5e0cdea946bb891106c1c04123df9ec34b6de1e92dc3ab8002ff0ae9d38eb580da6f7765efb99a299e073f5fa35f8d91c190aedb2040a6c8a95b71142c9495ea SHA512 db74b69f443e310f95f17b9c8112cb9f6ed5ba4600971b7eff65a1c98ccc2391d5d5a53f46efee8b4b6aa87a0becf8883a0a5dafb10e5d708dc8a8e584865008 diff --git a/media-libs/libyami/libyami-1.0.1.ebuild b/media-libs/libyami/libyami-1.0.1.ebuild deleted file mode 100644 index c794ddbb7383..000000000000 --- a/media-libs/libyami/libyami-1.0.1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM=git-r3 - EGIT_REPO_URI="https://github.com/01org/libyami" -fi - -inherit ${SCM} autotools multilib-minimal flag-o-matic - -DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceleration" -HOMEPAGE="https://github.com/01org/libyami" - -if [ "${PV#9999}" != "${PV}" ] ; then - KEYWORDS="" - SRC_URI="" -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/01org/libyami/archive/${P}.tar.gz" - S="${WORKDIR}/${PN}-${P}" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="debug dmabuf doc md5 v4l X test wayland" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=x11-libs/libva-1.7.2[drm,X?,wayland?,${MULTILIB_USEDEP}] - v4l? ( - >=virtual/opengl-7[${MULTILIB_USEDEP}] - >=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}] - >=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}] - ) - X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] ) - md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen ) - test? ( >=dev-cpp/gtest-1.7 ) -" - -src_prepare() { - eautoreconf -} - -multilib_src_configure() { - append-cppflags -I"${S}/" - ECONF_SOURCE="${S}" econf \ - $(use_enable debug) \ - $(use_enable v4l v4l2) \ - $(use_enable v4l v4l2-ops) \ - $(use_enable X x11) \ - $(use_enable dmabuf) \ - $(use_enable md5) \ - $(use_enable wayland) \ - $(use_enable test gtest) \ - $(multilib_native_use_enable doc docs) \ - --enable-h265dec \ - --enable-vc1dec \ - --enable-h264dec \ - --enable-jpegdec \ - --enable-mpeg2dec \ - --enable-vp8dec \ - --enable-vp9dec \ - --enable-h265enc \ - --enable-h264enc \ - --enable-jpegenc \ - --enable-vp8enc \ - --enable-vp9enc -} - -multilib_src_compile() { - emake - multilib_is_native_abi && use doc && emake -C doc -} - -multilib_src_install() { - emake DESTDIR="${D}" install - multilib_is_native_abi && use doc && dohtml -r doc/html/* -} - -src_install() { - multilib-minimal_src_install - find "${ED}" -name '*.la' -delete -} diff --git a/media-libs/libyami/libyami-1.1.0.ebuild b/media-libs/libyami/libyami-1.1.0.ebuild deleted file mode 100644 index 72dd062364d1..000000000000 --- a/media-libs/libyami/libyami-1.1.0.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM=git-r3 - EGIT_REPO_URI="https://github.com/01org/libyami" -fi - -inherit ${SCM} autotools multilib-minimal flag-o-matic - -DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceleration" -HOMEPAGE="https://github.com/01org/libyami" - -if [ "${PV#9999}" != "${PV}" ] ; then - KEYWORDS="" - SRC_URI="" -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/01org/libyami/archive/${P}.tar.gz" - S="${WORKDIR}/${PN}-${P}" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="debug egl dmabuf doc md5 v4l X test wayland" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=x11-libs/libva-1.7.2[drm,X?,wayland?,${MULTILIB_USEDEP}] - v4l? ( - >=virtual/opengl-7[${MULTILIB_USEDEP}] - >=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}] - >=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}] - ) - X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] ) - md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen ) - test? ( >=dev-cpp/gtest-1.7 ) -" - -src_prepare() { - eautoreconf -} - -multilib_src_configure() { - append-cppflags -I"${S}/" - ECONF_SOURCE="${S}" econf \ - $(use_enable debug) \ - $(use_enable egl) \ - $(use_enable v4l v4l2) \ - $(use_enable v4l v4l2-ops) \ - $(use_enable X x11) \ - $(use_enable dmabuf) \ - $(use_enable md5) \ - $(use_enable wayland) \ - $(use_enable test gtest) \ - $(multilib_native_use_enable doc docs) \ - --enable-h265dec \ - --enable-vc1dec \ - --enable-h264dec \ - --enable-jpegdec \ - --enable-mpeg2dec \ - --enable-vp8dec \ - --enable-vp9dec \ - --enable-h265enc \ - --enable-h264enc \ - --enable-jpegenc \ - --enable-vp8enc \ - --enable-vp9enc -} - -multilib_src_compile() { - emake - multilib_is_native_abi && use doc && emake -C doc -} - -multilib_src_install() { - emake DESTDIR="${D}" install - multilib_is_native_abi && use doc && dohtml -r doc/html/* -} - -src_install() { - multilib-minimal_src_install - find "${ED}" -name '*.la' -delete -} diff --git a/media-libs/libyami/libyami-1.2.0.ebuild b/media-libs/libyami/libyami-1.2.0.ebuild deleted file mode 100644 index 0b6bd2f08c04..000000000000 --- a/media-libs/libyami/libyami-1.2.0.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM=git-r3 - EGIT_REPO_URI="https://github.com/01org/libyami" -fi - -inherit ${SCM} autotools multilib-minimal flag-o-matic - -DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceleration" -HOMEPAGE="https://github.com/01org/libyami" - -if [ "${PV#9999}" != "${PV}" ] ; then - KEYWORDS="" - SRC_URI="" -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/01org/libyami/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="debug egl dmabuf doc md5 v4l X test wayland" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=x11-libs/libva-1.7.2[drm,X?,wayland?,${MULTILIB_USEDEP}] - v4l? ( - >=virtual/opengl-7[${MULTILIB_USEDEP}] - >=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}] - >=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}] - ) - X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] ) - md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen ) - test? ( >=dev-cpp/gtest-1.7 ) -" - -src_prepare() { - sed -i -e 's/-Werror//' configure.ac || die - eautoreconf -} - -multilib_src_configure() { - append-cppflags -I"${S}/" - ECONF_SOURCE="${S}" econf \ - $(use_enable debug) \ - $(use_enable egl) \ - $(use_enable v4l v4l2) \ - $(use_enable v4l v4l2-ops) \ - $(use_enable X x11) \ - $(use_enable dmabuf) \ - $(use_enable md5) \ - $(use_enable wayland) \ - $(use_enable test gtest) \ - $(multilib_native_use_enable doc docs) \ - --enable-h265dec \ - --enable-vc1dec \ - --enable-h264dec \ - --enable-jpegdec \ - --enable-mpeg2dec \ - --enable-vp8dec \ - --enable-vp9dec \ - --enable-h265enc \ - --enable-h264enc \ - --enable-jpegenc \ - --enable-vp8enc \ - --enable-vp9enc -} - -multilib_src_compile() { - emake - multilib_is_native_abi && use doc && emake -C doc -} - -multilib_src_install() { - emake DESTDIR="${D}" install - multilib_is_native_abi && use doc && dohtml -r doc/html/* -} - -src_install() { - multilib-minimal_src_install - find "${ED}" -name '*.la' -delete -} diff --git a/media-libs/libyami/libyami-1.3.0.ebuild b/media-libs/libyami/libyami-1.3.0.ebuild deleted file mode 100644 index ccd9e97aa740..000000000000 --- a/media-libs/libyami/libyami-1.3.0.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM=git-r3 - EGIT_REPO_URI="https://github.com/01org/libyami" -fi - -inherit ${SCM} autotools multilib-minimal flag-o-matic - -DESCRIPTION="Yet Another Media Infrastructure: Media codec with hardware acceleration" -HOMEPAGE="https://github.com/01org/libyami" - -if [ "${PV#9999}" != "${PV}" ] ; then - KEYWORDS="" - SRC_URI="" -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/01org/libyami/archive/${P}.tar.gz" - S="${WORKDIR}/${PN}-${P}" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="debug egl dmabuf doc md5 v4l X test wayland" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=x11-libs/libva-1.7.2:=[drm,X?,wayland?,${MULTILIB_USEDEP}] - v4l? ( - >=virtual/opengl-7[${MULTILIB_USEDEP}] - >=media-libs/libv4l-1.6.2[${MULTILIB_USEDEP}] - >=media-libs/mesa-10[egl,gles2,${MULTILIB_USEDEP}] - ) - X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] ) - md5? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - dmabuf? ( x11-libs/libdrm[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen ) - test? ( >=dev-cpp/gtest-1.7 ) -" - -src_prepare() { - sed -i -e 's/-Werror//' configure.ac || die - eautoreconf -} - -multilib_src_configure() { - append-cppflags -I"${S}/" -I"${BUILD_DIR}/interface" - append-cxxflags -fpermissive - ECONF_SOURCE="${S}" econf \ - $(use_enable debug) \ - $(use_enable egl) \ - $(use_enable v4l v4l2) \ - $(use_enable v4l v4l2-ops) \ - $(use_enable X x11) \ - $(use_enable dmabuf) \ - $(use_enable md5) \ - $(use_enable wayland) \ - $(use_enable test gtest) \ - $(multilib_native_use_enable doc docs) \ - --enable-h265dec \ - --enable-vc1dec \ - --enable-h264dec \ - --enable-jpegdec \ - --enable-mpeg2dec \ - --enable-vp8dec \ - --enable-vp9dec \ - --enable-h265enc \ - --enable-h264enc \ - --enable-jpegenc \ - --enable-vp8enc \ - --enable-vp9enc -} - -multilib_src_compile() { - emake - multilib_is_native_abi && use doc && emake -C doc -} - -multilib_src_install() { - emake DESTDIR="${D}" install - multilib_is_native_abi && use doc && dohtml -r doc/html/* -} - -src_install() { - multilib-minimal_src_install - find "${ED}" -name '*.la' -delete -} diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest index d0e562e3bbe2..a64898045018 100644 --- a/media-libs/lilv/Manifest +++ b/media-libs/lilv/Manifest @@ -1,5 +1,5 @@ DIST lilv-0.24.6.tar.bz2 541765 BLAKE2B fb3532b1a19c790207b894f88ea7d4f714bef8e9f743ca27f6eca36fe44da6e92bce47931791dfb0096e03f9efdf569b1f3f514debb1538c2727c65f61697627 SHA512 0cf89d7dac97727e744579d3f4f4b330f56cf72f1a30bd03abfd645233aaf04e9bbf2abf460a0e4b963ed40e1ae78ed5f36127553bdab16e3e7dd3e93b70cdad DIST lilv-0.24.8.tar.bz2 545545 BLAKE2B 606beb68d6e277dfea85e3d2e27b58adf22f0a47a91583e4f1cd85649f237e75fac9b397eb07be69b5a278d02346d58bdf35c4c8fb248e4899a4fc9b05288c23 SHA512 f2b2638372a8280041f6e88e2077f2109f89dad6feedb9d07a88c6b5a05c37b62112f5d03282da4335ddd0d14339cfb49ad96a3df3de310265a40c24718be192 EBUILD lilv-0.24.6-r2.ebuild 1700 BLAKE2B cb5acdff832430616f13aec5b2396166d6480ef0c01c3e5b0595100cb32c5af06100bdfa9d40c083987367db579eb259b58a38d36da3e15bcbf855aa8f3cb663 SHA512 9bc6eeb31effdb6609052075b5991ec602c94ca8a0b4a0d29ff8508067716aa6140be9729ce5251808d1cf0ebe86a729153ec92163b7eb9137b55bdde561057c -EBUILD lilv-0.24.8-r1.ebuild 1706 BLAKE2B bbcf8c9856d714b638caaf900be37c4f69f13ad4ee189b6edd0beae73af62d4abc1aa4831be8e2ab52c3188b6b386eea6e16410e2d7d359f0b8ea9d6bfb3ab4f SHA512 0eafa79adf988939890b8b56ff3d0e0899cbf7a6c5c705f1a2adc8b2eddc7ada325d086317371b1662b0caaad61c441af4666545135bea52e601d11e510250f2 +EBUILD lilv-0.24.8-r1.ebuild 1705 BLAKE2B ee1a668f0bc4f3bff412a50afa672a356f931f40bf0c6a974165b41d1ba225d0a6f25c67d8bd153ed69b5f4aab7e21da9326931fdc8801b57d0a84eebb8158ef SHA512 817640469c17b68d44f77d2602cba29ebf3287b83c0dd66b994322873e605c34f1ffccc2cf6945117808521d233ec44736c26ab7bc2853fc534261ff4124249b MISC metadata.xml 626 BLAKE2B 07ffc634a72982335c60d71732dca314e28b08ed40fe892f33514f0d13ac9e141fcb6a1d0507b6f35f4d6db963865ed87acb70aa8f2c1d20ff72eb4e62006841 SHA512 e2cd8e2459104889e6cc759146f86874a78784c07b966de2f6a18302098a028e7176270565922a44a72ada23eabbf5de919271296374d9547262684611ee74ce diff --git a/media-libs/lilv/lilv-0.24.8-r1.ebuild b/media-libs/lilv/lilv-0.24.8-r1.ebuild index 9478c738d163..c22bf170fdce 100644 --- a/media-libs/lilv/lilv-0.24.8-r1.ebuild +++ b/media-libs/lilv/lilv-0.24.8-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2" LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="doc +dyn-manifest static-libs test" RESTRICT="!test? ( test )" diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 6801ec47354d..4704494f6058 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,16 +1,8 @@ -DIST mesa-20.0.8.tar.xz 12360736 BLAKE2B 19e3f8a40b34b5f17ed76077c5d92f728a134b2479c43d86674ed1818ab99639a9b732041f67488251df808564f6abe5b587d756ef9c7c13dcada87cd0fc05de SHA512 d906330c412899907dd05a84034a929107fccaf3044814c4b1f30ba5690cbcf1587b5f17534c6345111f3cb7cf292afd5984a60486643ff6f534b57cec615374 -DIST mesa-20.1.6.tar.xz 12805724 BLAKE2B d652b59e4987436d2e05de9138f2e2fb4a8bf435c24d9c7ad08bcb82a3bf7c9c64bc71b15b4b6d334f8b574341719f372aa1b893283abc21191a4d71d9d30fee SHA512 5ef28334ecb7effaaf597ea3efe0406af62419e6fa629e835d843161ab8d83515626ec0f0495c4cc66af9e5669398ac96c16ca626e4965a9831e1704c995fb09 DIST mesa-20.1.7.tar.xz 12825368 BLAKE2B 2fedda518ff29bfda49af12d714dc258e48fca3492d2327ce5080d11bbaea5ad646d438f3e2d5ddabeffae83211976fb15001c650cd6ab4052ab09d97342afdc SHA512 5ff614c3f7568db7673cd2398615e5398c7f50093abdabd0730e07fe9c358310793fea3f130058110c9a2aa284c6efd207e1bdca3d1a1ba46fb18d76e34f361a DIST mesa-20.1.8.tar.xz 12846348 BLAKE2B b31680458100fc4394819a379a14237cfe39befea91f53641dc181d29891cb3e508c45f5ea1b07deee97f6bf04b6d8b2ca9cd8270bf79ab4a524035fbdc58c36 SHA512 519b0e2837982d097c362d974a90c94efd1cdf14505fc43eaa740a23c042bc0c3f04d0edaf6b371966d82667cade6d0c68c92528e1be6c12884b38c67fd064c1 -DIST mesa-20.2.0-rc2.tar.xz 13528208 BLAKE2B 6505446829ec2c01c0de7a7d9c1187db874111402da5ffe2f9f5872df7b6a5e53a3b628c190172bb9a806851b3b85aa0e3b53a4fcfb40f99adfc48cc3876c9f5 SHA512 36d9a74db50335bd31a8d5c47f7c657f05eeda044530fe123c06c472ed27c9b5dff19716d11d95256449223e82dde38895547cf6ae60b7460d3b1e9ed440704a -DIST mesa-20.2.0-rc3.tar.xz 13550928 BLAKE2B b3e8a257422c06d1cbd7b7309b73d988be51adf4a60c4cd8e401c8fb86a430c7059956ef8264bbbce45ee5e38535916903dc915ab3660b0e5bc14b980d557d67 SHA512 56a692e02abed95ee16be17930f4c71519191def1a6465d465af6ebbf9d8b7e204a240e720b0fc512f4f18da3e4f37dbf8d96c3231ffba15e7114c240be71444 DIST mesa-20.2.0-rc4.tar.xz 13569628 BLAKE2B 54068c298a57f2c19113828e2e9b94dd15070ecc0c899f7e3dc527b27579e4f8c3c84c7b841c8d0b8313556cca41bfefd3e08b360dd0e364cbc29e0609ff6f3d SHA512 1f718bfbadbc15b7216864226adb737f3a4a7801dc60ca9294effd4be5f260fffd31c988eed9550e8a7a7430acb05ba0c7d65693c1f375eab4b95d2d029755bb -EBUILD mesa-20.0.8.ebuild 14701 BLAKE2B 0109666f0c0db0a7333dad36a01e7bedda6b03eafcc5c0a2061ec48047bdbb3793bcd643195de0a5db39217011c88a4b558a3b665109b1ed32feb62d97683d12 SHA512 5958cc5ed07cc4308eeba3d68ae537de8645564db15ea095cd1daa10453f950a6ca8caa60635cb18f9d66262f8732a94e3df2f721d9ff7376f4cb8ae53dc8c68 -EBUILD mesa-20.1.6.ebuild 14719 BLAKE2B ad71c0427076d83142f05791f1c5a580b6ab89b470ff093c7a951aa7a7e6cb76c070521d545a6d54a11ae4ebb2fc43fb414ad12c7293f1e45f4318be5501171b SHA512 b7eeff6340a2a85cb73145d603e02ef574474f71cfcc1d4133aaf0160e4856327c67b3ba667863f38a096136920901c48da86245f91d3ec6a938d4a9cd219ad4 EBUILD mesa-20.1.7.ebuild 14701 BLAKE2B 0cb3259a8b9f6621024c9ad3c5aae4d84cb3cc4d63f3142521554675ea9753db7b525b54049429d35abb1cc221a7269e60b80e27ed9a01b03ac070977b61a167 SHA512 96b4eaee573bca46b5c51ad438ba5fd843372dc93b97507d3edd0d230c1a7086e3f386037ec8d97ed524d25f3ffa2d603abc4387dfac3ab32fab13317b1994a8 -EBUILD mesa-20.1.8.ebuild 14709 BLAKE2B 63b66a22e1f772e23a45aaf820cfe6fca7a6c7c389a4f3baca59408a4ca519db525e6724a2e6f5c704ad32cf3cb883d22958ad6223bf4d79d28ba3f0661a9536 SHA512 1cc6cb6324ef6f7cbfce159870f8ea9ce8384a23ab51d2c3ee762544cb4ec083b8c6e89dac47fd2a55a0075416035569d0303ccd2e3d0e9f54e0f13b6d988918 -EBUILD mesa-20.2.0_rc2.ebuild 15004 BLAKE2B 81a3aae627e1890283c3e1763c281d7cd4be2dc044e53c9e5c88508ca38b53e3c17ced3d734580eb1ac0d067266b97ed2eba5220e7704a038fe2c1ce9920fe71 SHA512 2349dd90f1a500d5b42a96c7ebdc06cdaafbc422cb0d3298797657093384adeade8f2c793c071f568a3f9f7a11e5f7f0191068c46b0cb472b206519b70e00881 -EBUILD mesa-20.2.0_rc3.ebuild 15004 BLAKE2B 81a3aae627e1890283c3e1763c281d7cd4be2dc044e53c9e5c88508ca38b53e3c17ced3d734580eb1ac0d067266b97ed2eba5220e7704a038fe2c1ce9920fe71 SHA512 2349dd90f1a500d5b42a96c7ebdc06cdaafbc422cb0d3298797657093384adeade8f2c793c071f568a3f9f7a11e5f7f0191068c46b0cb472b206519b70e00881 -EBUILD mesa-20.2.0_rc4.ebuild 14994 BLAKE2B 3461433ec43979c5a76fa1f065d4e0bb9963793d40066f74b9ed4e93935a36e43362509792bd3ea3195e20afd6c61e0cffbd736af46cf69256a72391e7dbe54c SHA512 5eec280b9c08b2e8849b853ceef60669d237e9aa15921795747d70b9ebbad34f1769121fabe36bc1e7a0231fe9d2efb263a5e988994cf46ea375367fd94e32c2 -EBUILD mesa-9999.ebuild 14994 BLAKE2B 3461433ec43979c5a76fa1f065d4e0bb9963793d40066f74b9ed4e93935a36e43362509792bd3ea3195e20afd6c61e0cffbd736af46cf69256a72391e7dbe54c SHA512 5eec280b9c08b2e8849b853ceef60669d237e9aa15921795747d70b9ebbad34f1769121fabe36bc1e7a0231fe9d2efb263a5e988994cf46ea375367fd94e32c2 +EBUILD mesa-20.1.8.ebuild 14701 BLAKE2B 0cb3259a8b9f6621024c9ad3c5aae4d84cb3cc4d63f3142521554675ea9753db7b525b54049429d35abb1cc221a7269e60b80e27ed9a01b03ac070977b61a167 SHA512 96b4eaee573bca46b5c51ad438ba5fd843372dc93b97507d3edd0d230c1a7086e3f386037ec8d97ed524d25f3ffa2d603abc4387dfac3ab32fab13317b1994a8 +EBUILD mesa-20.2.0_rc4.ebuild 14991 BLAKE2B 2fdc31ef274e01cadaae4790169c691a322a9c6427d98bc49c31d1db5308b075118e3ae879641af1b87e3f939bad6139776306eadaafb8cdb1257cb3ae407ad4 SHA512 074c61443188457230526576f087cd16cdc120e4a75210c1f8bdae550f0e8c7f96c819a473d2d9ca200261bf33b77719d6109a84bdb7260c0477250ffd5b23d8 +EBUILD mesa-9999.ebuild 14711 BLAKE2B 473089ec5a66bf30e4473590614ef8a29a209a3771a6bdab13e38beadabcf667c82134e2846862a2a810d24ddca321bc4c1efc0aaf2fa733aceb8da8b5e1e5a4 SHA512 82f90a9076a67f54167881b61c32675f5572a6c1b2c0ee897382c0954005f72a269f223a4559049056cc67bc43e2060ad28f1e97f2e09b712219ba7fe0904478 MISC metadata.xml 1953 BLAKE2B 809b2ae05dadf1ef3b78c8c0353032c77aaba205530a51e6e099170d186bc9fdaf289b135e68984aef8f71f69970f9e63a38de816f04199dc2e9965e71e940d0 SHA512 09b322501feafc80de4b81c7a30e1d6f4565247069dc7d80218684382a68b285ca1b80733b6f3126bd15c777cc5a896062686f06fc1822039595b3fed9bcb9e6 diff --git a/media-libs/mesa/mesa-20.0.8.ebuild b/media-libs/mesa/mesa-20.0.8.ebuild deleted file mode 100644 index f8e02ddc8cdb..000000000000 --- a/media-libs/mesa/mesa-20.0.8.ebuild +++ /dev/null @@ -1,557 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit llvm meson multilib-minimal python-any-r1 linux-info - -OPENGL_DIR="xorg-x11" - -MY_P="${P/_/-}" - -DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" - inherit git-r3 -else - SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="MIT" -SLOT="0" -RESTRICT=" - !test? ( test ) -" - -RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" -VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} - +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm - lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan - vulkan-overlay wayland +X xa xvmc +zstd" - -REQUIRED_USE=" - d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) - gles1? ( egl ) - gles2? ( egl ) - vulkan? ( dri3 - video_cards_radeonsi? ( llvm ) ) - vulkan-overlay? ( vulkan ) - wayland? ( egl gbm ) - video_cards_freedreno? ( gallium ) - video_cards_intel? ( classic ) - video_cards_i915? ( || ( classic gallium ) ) - video_cards_i965? ( classic ) - video_cards_iris? ( gallium ) - video_cards_lima? ( gallium ) - video_cards_nouveau? ( || ( classic gallium ) ) - video_cards_panfrost? ( gallium ) - video_cards_radeon? ( || ( classic gallium ) - gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) - video_cards_r100? ( classic ) - video_cards_r200? ( classic ) - video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) - video_cards_r600? ( gallium ) - video_cards_radeonsi? ( gallium llvm ) - video_cards_vc4? ( gallium ) - video_cards_virgl? ( gallium ) - video_cards_vivante? ( gallium gbm ) - video_cards_vmware? ( gallium ) - xa? ( X ) - xvmc? ( X ) -" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100" -RDEPEND=" - !app-eselect/eselect-mesa - >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] - libglvnd? ( - >=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}] - !app-eselect/eselect-opengl - ) - !libglvnd? ( - >=app-eselect/eselect-opengl-1.3.0 - ) - gallium? ( - unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) - llvm? ( - video_cards_radeonsi? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - video_cards_r600? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - video_cards_radeon? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - ) - lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) - opencl? ( - >=virtual/opencl-3[${MULTILIB_USEDEP}] - dev-libs/libclc - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - vaapi? ( - >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] - ) - vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) - xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) - ) - selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.8 - ) - ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] - video_cards_intel? ( - !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) - ) - video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) - vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] - x11-libs/libXfixes:=[${MULTILIB_USEDEP}] - ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) -" -for card in ${RADEON_CARDS}; do - RDEPEND="${RDEPEND} - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) - " -done -RDEPEND="${RDEPEND} - video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) -" - -# Please keep the LLVM dependency block separate. Since LLVM is slotted, -# we need to *really* make sure we're not pulling one than more slot -# simultaneously. -# -# How to use it: -# 1. List all the working slots (with min versions) in ||, newest first. -# 2. Update the := to specify *max* version, e.g. < 10. -# 3. Specify LLVM_MAX_SLOT, e.g. 9. -LLVM_MAX_SLOT="10" -LLVM_DEPSTR=" - || ( - sys-devel/llvm:10[${MULTILIB_USEDEP}] - sys-devel/llvm:9[${MULTILIB_USEDEP}] - sys-devel/llvm:8[${MULTILIB_USEDEP}] - ) - <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}] -" -LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]} -CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang} -CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]} -RDEPEND="${RDEPEND} - gallium? ( - llvm? ( - opencl? ( - video_cards_r600? ( - ${CLANG_DEPSTR_AMDGPU} - ) - !video_cards_r600? ( - video_cards_radeonsi? ( - ${CLANG_DEPSTR_AMDGPU} - ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( - ${CLANG_DEPSTR_AMDGPU} - ) - ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( - !video_cards_radeonsi? ( - ${CLANG_DEPSTR} - ) - ) - ) - ) - !opencl? ( - video_cards_r600? ( - ${LLVM_DEPSTR_AMDGPU} - ) - !video_cards_r600? ( - video_cards_radeonsi? ( - ${LLVM_DEPSTR_AMDGPU} - ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( - ${LLVM_DEPSTR_AMDGPU} - ) - ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( - !video_cards_radeonsi? ( - ${LLVM_DEPSTR} - ) - ) - ) - ) - ) - ) -" -unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} - -DEPEND="${RDEPEND} - valgrind? ( dev-util/valgrind ) - X? ( - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-base/xorg-proto - ) -" -BDEPEND=" - ${PYTHON_DEPS} - opencl? ( - >=sys-devel/gcc-4.6 - ) - sys-devel/bison - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") -" - -S="${WORKDIR}/${MY_P}" -EGIT_CHECKOUT_DIR=${S} - -QA_WX_LOAD=" -x86? ( - usr/lib*/libglapi.so.0.0.0 - usr/lib*/libGLESv1_CM.so.1.1.0 - usr/lib*/libGLESv2.so.2.0.0 - usr/lib*/libGL.so.1.2.0 - usr/lib*/libOSMesa.so.8.0.0 - libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 ) -)" - -llvm_check_deps() { - local flags=${MULTILIB_USEDEP} - if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi - then - flags+=",llvm_targets_AMDGPU(-)" - fi - - if use opencl; then - has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 - fi - has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" -} - -pkg_pretend() { - if use vulkan; then - if ! use video_cards_i965 && - ! use video_cards_iris && - ! use video_cards_radeonsi; then - ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, or radeonsi" - fi - fi - - if use opencl; then - if ! use video_cards_r600 && - ! use video_cards_radeonsi; then - ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi" - fi - fi - - if use vaapi; then - if ! use video_cards_r600 && - ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau" - fi - fi - - if use vdpau; then - if ! use video_cards_r300 && - ! use video_cards_r600 && - ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau" - fi - fi - - if use xa; then - if ! use video_cards_freedreno && - ! use video_cards_nouveau && - ! use video_cards_vmware; then - ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" - fi - fi - - if use xvmc; then - if ! use video_cards_r600 && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau" - fi - fi - - if ! use gallium; then - use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium" - use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium" - use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium" - use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium" - use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium" - use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium" - use xa && ewarn "Ignoring USE=xa since USE does not contain gallium" - use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium" - fi - - if ! use llvm; then - use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" - fi -} - -python_check_deps() { - has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" -} - -pkg_setup() { - # warning message for bug 459306 - if use llvm && has_version sys-devel/llvm[!debug=]; then - ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" - ewarn "detected! This can cause problems. For details, see bug 459306." - fi - - if use video_cards_i965 || - use video_cards_iris || - use video_cards_radeonsi; then - CONFIG_CHECK="~CHECKPOINT_RESTORE" - linux-info_pkg_setup - fi - - if use gallium && use llvm; then - llvm_pkg_setup - fi - python-any-r1_pkg_setup -} - -multilib_src_configure() { - local emesonargs=() - - if use classic; then - # Intel code - dri_driver_enable video_cards_i915 i915 - dri_driver_enable video_cards_i965 i965 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - dri_driver_enable video_cards_intel i915 i965 - fi - - # Nouveau code - dri_driver_enable video_cards_nouveau nouveau - - # ATI code - dri_driver_enable video_cards_r100 r100 - dri_driver_enable video_cards_r200 r200 - if ! use video_cards_r100 && \ - ! use video_cards_r200; then - dri_driver_enable video_cards_radeon r100 r200 - fi - fi - - emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless ) - - if use gallium; then - emesonargs+=( - $(meson_use llvm) - $(meson_use lm-sensors lmsensors) - $(meson_use unwind libunwind) - ) - - if use video_cards_iris || - use video_cards_r300 || - use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau || - use video_cards_vmware; then - emesonargs+=($(meson_use d3d9 gallium-nine)) - else - emesonargs+=(-Dgallium-nine=false) - fi - - if use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau; then - emesonargs+=($(meson_use vaapi gallium-va)) - use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) - else - emesonargs+=(-Dgallium-va=false) - fi - - if use video_cards_r300 || - use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau; then - emesonargs+=($(meson_use vdpau gallium-vdpau)) - else - emesonargs+=(-Dgallium-vdpau=false) - fi - - if use video_cards_freedreno || - use video_cards_nouveau || - use video_cards_vmware; then - emesonargs+=($(meson_use xa gallium-xa)) - else - emesonargs+=(-Dgallium-xa=false) - fi - - if use video_cards_r600 || - use video_cards_nouveau; then - emesonargs+=($(meson_use xvmc gallium-xvmc)) - else - emesonargs+=(-Dgallium-xvmc=false) - fi - - if use video_cards_freedreno || - use video_cards_lima || - use video_cards_panfrost || - use video_cards_vc4 || - use video_cards_vivante; then - gallium_enable -- kmsro - fi - - gallium_enable video_cards_lima lima - gallium_enable video_cards_panfrost panfrost - gallium_enable video_cards_vc4 vc4 - gallium_enable video_cards_vivante etnaviv - gallium_enable video_cards_vmware svga - gallium_enable video_cards_nouveau nouveau - - # Only one i915 driver (classic vs gallium). Default to classic. - if ! use classic; then - gallium_enable video_cards_i915 i915 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - gallium_enable video_cards_intel i915 - fi - fi - - gallium_enable video_cards_iris iris - - gallium_enable video_cards_r300 r300 - gallium_enable video_cards_r600 r600 - gallium_enable video_cards_radeonsi radeonsi - if ! use video_cards_r300 && \ - ! use video_cards_r600; then - gallium_enable video_cards_radeon r300 r600 - fi - - gallium_enable video_cards_freedreno freedreno - gallium_enable video_cards_virgl virgl - - # opencl stuff - emesonargs+=( - -Dgallium-opencl="$(usex opencl icd disabled)" - ) - fi - - if use vulkan; then - vulkan_enable video_cards_i965 intel - vulkan_enable video_cards_iris intel - vulkan_enable video_cards_radeonsi amd - fi - - if use gallium; then - gallium_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) - else - dri_driver_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) - fi - - driver_list() { - local drivers="$(sort -u <<< "${1// /$'\n'}")" - echo "${drivers//$'\n'/,}" - } - - emesonargs+=( - $(meson_use test build-tests) - -Dglx=$(usex X dri disabled) - -Dshared-glapi=true - $(meson_use dri3) - $(meson_use egl) - $(meson_use gbm) - $(meson_use gles1) - $(meson_use gles2) - $(meson_use libglvnd glvnd) - $(meson_use selinux) - $(meson_use zstd) - -Dvalgrind=$(usex valgrind auto false) - -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") - -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") - -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") - $(meson_use vulkan-overlay vulkan-overlay-layer) - --buildtype $(usex debug debug plain) - -Db_ndebug=$(usex debug false true) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install -} - -multilib_src_install_all() { - einstalldocs -} - -multilib_src_test() { - meson test -v -C "${BUILD_DIR}" -t 100 -} - -pkg_postinst() { - if ! use libglvnd; then - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} - fi -} - -# $1 - VIDEO_CARDS flag (check skipped for "--") -# other args - names of DRI drivers to enable -dri_driver_enable() { - if [[ $1 == -- ]] || use $1; then - shift - DRI_DRIVERS+=("$@") - fi -} - -gallium_enable() { - if [[ $1 == -- ]] || use $1; then - shift - GALLIUM_DRIVERS+=("$@") - fi -} - -vulkan_enable() { - if [[ $1 == -- ]] || use $1; then - shift - VULKAN_DRIVERS+=("$@") - fi -} diff --git a/media-libs/mesa/mesa-20.1.6.ebuild b/media-libs/mesa/mesa-20.1.6.ebuild deleted file mode 100644 index f50ead679471..000000000000 --- a/media-libs/mesa/mesa-20.1.6.ebuild +++ /dev/null @@ -1,557 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit llvm meson multilib-minimal python-any-r1 linux-info - -OPENGL_DIR="xorg-x11" - -MY_P="${P/_/-}" - -DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" - inherit git-r3 -else - SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="MIT" -SLOT="0" -RESTRICT=" - !test? ( test ) -" - -RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" -VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} - +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm - lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan - vulkan-overlay wayland +X xa xvmc +zstd" - -REQUIRED_USE=" - d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) - gles1? ( egl ) - gles2? ( egl ) - vulkan? ( dri3 - video_cards_radeonsi? ( llvm ) ) - vulkan-overlay? ( vulkan ) - wayland? ( egl gbm ) - video_cards_freedreno? ( gallium ) - video_cards_intel? ( classic ) - video_cards_i915? ( || ( classic gallium ) ) - video_cards_i965? ( classic ) - video_cards_iris? ( gallium ) - video_cards_lima? ( gallium ) - video_cards_nouveau? ( || ( classic gallium ) ) - video_cards_panfrost? ( gallium ) - video_cards_radeon? ( || ( classic gallium ) - gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) - video_cards_r100? ( classic ) - video_cards_r200? ( classic ) - video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) - video_cards_r600? ( gallium ) - video_cards_radeonsi? ( gallium llvm ) - video_cards_vc4? ( gallium ) - video_cards_virgl? ( gallium ) - video_cards_vivante? ( gallium gbm ) - video_cards_vmware? ( gallium ) - xa? ( X ) - xvmc? ( X ) -" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100" -RDEPEND=" - !app-eselect/eselect-mesa - >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] - libglvnd? ( - >=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}] - !app-eselect/eselect-opengl - ) - !libglvnd? ( - >=app-eselect/eselect-opengl-1.3.0 - ) - gallium? ( - unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) - llvm? ( - video_cards_radeonsi? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - video_cards_r600? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - video_cards_radeon? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - ) - lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) - opencl? ( - >=virtual/opencl-3[${MULTILIB_USEDEP}] - dev-libs/libclc - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - vaapi? ( - >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] - ) - vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) - xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) - ) - selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.8 - ) - ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] - video_cards_intel? ( - !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) - ) - video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) - vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] - x11-libs/libXfixes:=[${MULTILIB_USEDEP}] - ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) -" -for card in ${RADEON_CARDS}; do - RDEPEND="${RDEPEND} - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) - " -done -RDEPEND="${RDEPEND} - video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) -" - -# Please keep the LLVM dependency block separate. Since LLVM is slotted, -# we need to *really* make sure we're not pulling one than more slot -# simultaneously. -# -# How to use it: -# 1. List all the working slots (with min versions) in ||, newest first. -# 2. Update the := to specify *max* version, e.g. < 10. -# 3. Specify LLVM_MAX_SLOT, e.g. 9. -LLVM_MAX_SLOT="10" -LLVM_DEPSTR=" - || ( - sys-devel/llvm:10[${MULTILIB_USEDEP}] - sys-devel/llvm:9[${MULTILIB_USEDEP}] - ) - <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}] -" -LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]} -CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang} -CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]} -RDEPEND="${RDEPEND} - gallium? ( - llvm? ( - opencl? ( - video_cards_r600? ( - ${CLANG_DEPSTR_AMDGPU} - ) - !video_cards_r600? ( - video_cards_radeonsi? ( - ${CLANG_DEPSTR_AMDGPU} - ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( - ${CLANG_DEPSTR_AMDGPU} - ) - ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( - !video_cards_radeonsi? ( - ${CLANG_DEPSTR} - ) - ) - ) - ) - !opencl? ( - video_cards_r600? ( - ${LLVM_DEPSTR_AMDGPU} - ) - !video_cards_r600? ( - video_cards_radeonsi? ( - ${LLVM_DEPSTR_AMDGPU} - ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( - ${LLVM_DEPSTR_AMDGPU} - ) - ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( - !video_cards_radeonsi? ( - ${LLVM_DEPSTR} - ) - ) - ) - ) - ) - ) -" -unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} - -DEPEND="${RDEPEND} - valgrind? ( dev-util/valgrind ) - X? ( - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-base/xorg-proto - ) -" -BDEPEND=" - ${PYTHON_DEPS} - opencl? ( - >=sys-devel/gcc-4.6 - ) - sys-devel/bison - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") -" - -S="${WORKDIR}/${MY_P}" -EGIT_CHECKOUT_DIR=${S} - -QA_WX_LOAD=" -x86? ( - usr/lib*/libglapi.so.0.0.0 - usr/lib*/libGLESv1_CM.so.1.1.0 - usr/lib*/libGLESv2.so.2.0.0 - usr/lib*/libGL.so.1.2.0 - usr/lib*/libOSMesa.so.8.0.0 - libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 ) -)" - -llvm_check_deps() { - local flags=${MULTILIB_USEDEP} - if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi - then - flags+=",llvm_targets_AMDGPU(-)" - fi - - if use opencl; then - has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 - fi - has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" -} - -pkg_pretend() { - if use vulkan; then - if ! use video_cards_i965 && - ! use video_cards_iris && - ! use video_cards_radeonsi; then - ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, or radeonsi" - fi - fi - - if use opencl; then - if ! use video_cards_r600 && - ! use video_cards_radeonsi; then - ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi" - fi - fi - - if use vaapi; then - if ! use video_cards_r600 && - ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau" - fi - fi - - if use vdpau; then - if ! use video_cards_r300 && - ! use video_cards_r600 && - ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau" - fi - fi - - if use xa; then - if ! use video_cards_freedreno && - ! use video_cards_nouveau && - ! use video_cards_vmware; then - ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" - fi - fi - - if use xvmc; then - if ! use video_cards_r600 && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau" - fi - fi - - if ! use gallium; then - use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium" - use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium" - use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium" - use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium" - use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium" - use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium" - use xa && ewarn "Ignoring USE=xa since USE does not contain gallium" - use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium" - fi - - if ! use llvm; then - use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" - fi -} - -python_check_deps() { - has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" -} - -pkg_setup() { - # warning message for bug 459306 - if use llvm && has_version sys-devel/llvm[!debug=]; then - ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" - ewarn "detected! This can cause problems. For details, see bug 459306." - fi - - if use video_cards_i965 || - use video_cards_iris || - use video_cards_radeonsi; then - CONFIG_CHECK="~CHECKPOINT_RESTORE" - linux-info_pkg_setup - fi - - if use gallium && use llvm; then - llvm_pkg_setup - fi - python-any-r1_pkg_setup -} - -multilib_src_configure() { - local emesonargs=() - - if use classic; then - # Intel code - dri_driver_enable video_cards_i915 i915 - dri_driver_enable video_cards_i965 i965 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - dri_driver_enable video_cards_intel i915 i965 - fi - - # Nouveau code - dri_driver_enable video_cards_nouveau nouveau - - # ATI code - dri_driver_enable video_cards_r100 r100 - dri_driver_enable video_cards_r200 r200 - if ! use video_cards_r100 && \ - ! use video_cards_r200; then - dri_driver_enable video_cards_radeon r100 r200 - fi - fi - - emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless ) - - if use gallium; then - emesonargs+=( - $(meson_use llvm) - $(meson_use lm-sensors lmsensors) - $(meson_use unwind libunwind) - ) - - if use video_cards_iris || - use video_cards_r300 || - use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau || - use video_cards_vmware; then - emesonargs+=($(meson_use d3d9 gallium-nine)) - else - emesonargs+=(-Dgallium-nine=false) - fi - - if use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau; then - emesonargs+=($(meson_use vaapi gallium-va)) - use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) - else - emesonargs+=(-Dgallium-va=false) - fi - - if use video_cards_r300 || - use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau; then - emesonargs+=($(meson_use vdpau gallium-vdpau)) - else - emesonargs+=(-Dgallium-vdpau=false) - fi - - if use video_cards_freedreno || - use video_cards_nouveau || - use video_cards_vmware; then - emesonargs+=($(meson_use xa gallium-xa)) - else - emesonargs+=(-Dgallium-xa=false) - fi - - if use video_cards_r600 || - use video_cards_nouveau; then - emesonargs+=($(meson_use xvmc gallium-xvmc)) - else - emesonargs+=(-Dgallium-xvmc=false) - fi - - if use video_cards_freedreno || - use video_cards_lima || - use video_cards_panfrost || - use video_cards_vc4 || - use video_cards_vivante; then - gallium_enable -- kmsro - fi - - gallium_enable video_cards_lima lima - gallium_enable video_cards_panfrost panfrost - gallium_enable video_cards_vc4 vc4 - gallium_enable video_cards_vivante etnaviv - gallium_enable video_cards_vmware svga - gallium_enable video_cards_nouveau nouveau - - # Only one i915 driver (classic vs gallium). Default to classic. - if ! use classic; then - gallium_enable video_cards_i915 i915 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - gallium_enable video_cards_intel i915 - fi - fi - - gallium_enable video_cards_iris iris - - gallium_enable video_cards_r300 r300 - gallium_enable video_cards_r600 r600 - gallium_enable video_cards_radeonsi radeonsi - if ! use video_cards_r300 && \ - ! use video_cards_r600; then - gallium_enable video_cards_radeon r300 r600 - fi - - gallium_enable video_cards_freedreno freedreno - gallium_enable video_cards_virgl virgl - - # opencl stuff - emesonargs+=( - -Dgallium-opencl="$(usex opencl icd disabled)" - ) - fi - - if use vulkan; then - vulkan_enable video_cards_i965 intel - vulkan_enable video_cards_iris intel - vulkan_enable video_cards_radeonsi amd - fi - - if use gallium; then - gallium_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) - else - dri_driver_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) - fi - - driver_list() { - local drivers="$(sort -u <<< "${1// /$'\n'}")" - echo "${drivers//$'\n'/,}" - } - - emesonargs+=( - $(meson_use test build-tests) - -Dglx=$(usex X dri disabled) - -Dshared-glapi=true - $(meson_use dri3) - $(meson_use egl) - $(meson_use gbm) - $(meson_use gles1) - $(meson_use gles2) - $(meson_use libglvnd glvnd) - $(meson_use selinux) - $(meson_use zstd) - -Dvalgrind=$(usex valgrind auto false) - -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") - -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") - -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") - $(meson_use vulkan vulkan-device-select-layer) - $(meson_use vulkan-overlay vulkan-overlay-layer) - --buildtype $(usex debug debug plain) - -Db_ndebug=$(usex debug false true) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install -} - -multilib_src_install_all() { - einstalldocs -} - -multilib_src_test() { - meson test -v -C "${BUILD_DIR}" -t 100 -} - -pkg_postinst() { - if ! use libglvnd; then - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} - fi -} - -# $1 - VIDEO_CARDS flag (check skipped for "--") -# other args - names of DRI drivers to enable -dri_driver_enable() { - if [[ $1 == -- ]] || use $1; then - shift - DRI_DRIVERS+=("$@") - fi -} - -gallium_enable() { - if [[ $1 == -- ]] || use $1; then - shift - GALLIUM_DRIVERS+=("$@") - fi -} - -vulkan_enable() { - if [[ $1 == -- ]] || use $1; then - shift - VULKAN_DRIVERS+=("$@") - fi -} diff --git a/media-libs/mesa/mesa-20.1.8.ebuild b/media-libs/mesa/mesa-20.1.8.ebuild index b38b99a81f5b..934ec32ce41d 100644 --- a/media-libs/mesa/mesa-20.1.8.ebuild +++ b/media-libs/mesa/mesa-20.1.8.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" fi LICENSE="MIT" diff --git a/media-libs/mesa/mesa-20.2.0_rc2.ebuild b/media-libs/mesa/mesa-20.2.0_rc2.ebuild deleted file mode 100644 index 01f47e9da290..000000000000 --- a/media-libs/mesa/mesa-20.2.0_rc2.ebuild +++ /dev/null @@ -1,565 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit llvm meson multilib-minimal python-any-r1 linux-info - -OPENGL_DIR="xorg-x11" - -MY_P="${P/_/-}" - -DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" - inherit git-r3 -else - SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="MIT" -SLOT="0" -RESTRICT=" - !test? ( test ) -" - -RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" -VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} - +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm - lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan - vulkan-overlay wayland +X xa xvmc zink +zstd" - -REQUIRED_USE=" - d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) - gles1? ( egl ) - gles2? ( egl ) - vulkan? ( dri3 - video_cards_radeonsi? ( llvm ) ) - vulkan-overlay? ( vulkan ) - wayland? ( egl gbm ) - video_cards_freedreno? ( gallium ) - video_cards_intel? ( classic ) - video_cards_i915? ( || ( classic gallium ) ) - video_cards_i965? ( classic ) - video_cards_iris? ( gallium ) - video_cards_lima? ( gallium ) - video_cards_nouveau? ( || ( classic gallium ) ) - video_cards_panfrost? ( gallium ) - video_cards_radeon? ( || ( classic gallium ) - gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) - video_cards_r100? ( classic ) - video_cards_r200? ( classic ) - video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) - video_cards_r600? ( gallium ) - video_cards_radeonsi? ( gallium llvm ) - video_cards_v3d? ( gallium ) - video_cards_vc4? ( gallium ) - video_cards_virgl? ( gallium ) - video_cards_vivante? ( gallium gbm ) - video_cards_vmware? ( gallium ) - xa? ( X ) - xvmc? ( X ) - zink? ( gallium vulkan ) -" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100" -RDEPEND=" - !app-eselect/eselect-mesa - >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] - libglvnd? ( - >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] - !app-eselect/eselect-opengl - ) - !libglvnd? ( - >=app-eselect/eselect-opengl-1.3.0 - ) - gallium? ( - unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) - llvm? ( - video_cards_radeonsi? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - video_cards_r600? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - video_cards_radeon? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - ) - lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) - opencl? ( - >=virtual/opencl-3[${MULTILIB_USEDEP}] - dev-libs/libclc - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - vaapi? ( - >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] - ) - vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) - xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) - ) - selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.8 - ) - ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] - video_cards_intel? ( - !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) - ) - video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) - vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] - x11-libs/libXfixes:=[${MULTILIB_USEDEP}] - ) - zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) -" -for card in ${RADEON_CARDS}; do - RDEPEND="${RDEPEND} - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) - " -done -RDEPEND="${RDEPEND} - video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) -" - -# Please keep the LLVM dependency block separate. Since LLVM is slotted, -# we need to *really* make sure we're not pulling one than more slot -# simultaneously. -# -# How to use it: -# 1. List all the working slots (with min versions) in ||, newest first. -# 2. Update the := to specify *max* version, e.g. < 10. -# 3. Specify LLVM_MAX_SLOT, e.g. 9. -LLVM_MAX_SLOT="10" -LLVM_DEPSTR=" - || ( - sys-devel/llvm:10[${MULTILIB_USEDEP}] - sys-devel/llvm:9[${MULTILIB_USEDEP}] - ) - <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}] -" -LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]} -CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang} -CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]} -RDEPEND="${RDEPEND} - gallium? ( - llvm? ( - opencl? ( - video_cards_r600? ( - ${CLANG_DEPSTR_AMDGPU} - ) - !video_cards_r600? ( - video_cards_radeonsi? ( - ${CLANG_DEPSTR_AMDGPU} - ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( - ${CLANG_DEPSTR_AMDGPU} - ) - ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( - !video_cards_radeonsi? ( - ${CLANG_DEPSTR} - ) - ) - ) - ) - !opencl? ( - video_cards_r600? ( - ${LLVM_DEPSTR_AMDGPU} - ) - !video_cards_r600? ( - video_cards_radeonsi? ( - ${LLVM_DEPSTR_AMDGPU} - ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( - ${LLVM_DEPSTR_AMDGPU} - ) - ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( - !video_cards_radeonsi? ( - ${LLVM_DEPSTR} - ) - ) - ) - ) - ) - ) -" -unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} - -DEPEND="${RDEPEND} - valgrind? ( dev-util/valgrind ) - X? ( - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-base/xorg-proto - ) -" -BDEPEND=" - ${PYTHON_DEPS} - opencl? ( - >=sys-devel/gcc-4.6 - ) - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") -" - -S="${WORKDIR}/${MY_P}" -EGIT_CHECKOUT_DIR=${S} - -QA_WX_LOAD=" -x86? ( - usr/lib*/libglapi.so.0.0.0 - usr/lib*/libGLESv1_CM.so.1.1.0 - usr/lib*/libGLESv2.so.2.0.0 - usr/lib*/libGL.so.1.2.0 - usr/lib*/libOSMesa.so.8.0.0 - libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 ) -)" - -llvm_check_deps() { - local flags=${MULTILIB_USEDEP} - if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi - then - flags+=",llvm_targets_AMDGPU(-)" - fi - - if use opencl; then - has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 - fi - has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" -} - -pkg_pretend() { - if use vulkan; then - if ! use video_cards_i965 && - ! use video_cards_iris && - ! use video_cards_radeonsi; then - ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, or radeonsi" - fi - fi - - if use opencl; then - if ! use video_cards_r600 && - ! use video_cards_radeonsi; then - ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi" - fi - fi - - if use vaapi; then - if ! use video_cards_r600 && - ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau" - fi - fi - - if use vdpau; then - if ! use video_cards_r300 && - ! use video_cards_r600 && - ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau" - fi - fi - - if use xa; then - if ! use video_cards_freedreno && - ! use video_cards_nouveau && - ! use video_cards_vmware; then - ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" - fi - fi - - if use xvmc; then - if ! use video_cards_r600 && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau" - fi - fi - - if ! use gallium; then - use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium" - use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium" - use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium" - use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium" - use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium" - use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium" - use xa && ewarn "Ignoring USE=xa since USE does not contain gallium" - use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium" - fi - - if ! use llvm; then - use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" - fi -} - -python_check_deps() { - has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" -} - -pkg_setup() { - # warning message for bug 459306 - if use llvm && has_version sys-devel/llvm[!debug=]; then - ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" - ewarn "detected! This can cause problems. For details, see bug 459306." - fi - - if use video_cards_i965 || - use video_cards_iris || - use video_cards_radeonsi; then - CONFIG_CHECK="~CHECKPOINT_RESTORE" - linux-info_pkg_setup - fi - - if use gallium && use llvm; then - llvm_pkg_setup - fi - python-any-r1_pkg_setup -} - -multilib_src_configure() { - local emesonargs=() - - if use classic; then - # Intel code - dri_driver_enable video_cards_i915 i915 - dri_driver_enable video_cards_i965 i965 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - dri_driver_enable video_cards_intel i915 i965 - fi - - # Nouveau code - dri_driver_enable video_cards_nouveau nouveau - - # ATI code - dri_driver_enable video_cards_r100 r100 - dri_driver_enable video_cards_r200 r200 - if ! use video_cards_r100 && \ - ! use video_cards_r200; then - dri_driver_enable video_cards_radeon r100 r200 - fi - fi - - local platforms - use X && platforms+="x11" - use wayland && platforms+=",wayland" - [[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,}) - - if use gallium; then - emesonargs+=( - $(meson_feature llvm) - $(meson_feature lm-sensors lmsensors) - $(meson_feature unwind libunwind) - ) - - if use video_cards_iris || - use video_cards_r300 || - use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau || - use video_cards_vmware; then - emesonargs+=($(meson_use d3d9 gallium-nine)) - else - emesonargs+=(-Dgallium-nine=false) - fi - - if use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau; then - emesonargs+=($(meson_feature vaapi gallium-va)) - use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) - else - emesonargs+=(-Dgallium-va=disabled) - fi - - if use video_cards_r300 || - use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau; then - emesonargs+=($(meson_feature vdpau gallium-vdpau)) - else - emesonargs+=(-Dgallium-vdpau=disabled) - fi - - if use video_cards_freedreno || - use video_cards_nouveau || - use video_cards_vmware; then - emesonargs+=($(meson_feature xa gallium-xa)) - else - emesonargs+=(-Dgallium-xa=disabled) - fi - - if use video_cards_r600 || - use video_cards_nouveau; then - emesonargs+=($(meson_feature xvmc gallium-xvmc)) - else - emesonargs+=(-Dgallium-xvmc=disabled) - fi - - if use video_cards_freedreno || - use video_cards_lima || - use video_cards_panfrost || - use video_cards_v3d || - use video_cards_vc4 || - use video_cards_vivante; then - gallium_enable -- kmsro - fi - - gallium_enable video_cards_lima lima - gallium_enable video_cards_panfrost panfrost - gallium_enable video_cards_v3d v3d - gallium_enable video_cards_vc4 vc4 - gallium_enable video_cards_vivante etnaviv - gallium_enable video_cards_vmware svga - gallium_enable video_cards_nouveau nouveau - gallium_enable zink zink - - # Only one i915 driver (classic vs gallium). Default to classic. - if ! use classic; then - gallium_enable video_cards_i915 i915 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - gallium_enable video_cards_intel i915 - fi - fi - - gallium_enable video_cards_iris iris - - gallium_enable video_cards_r300 r300 - gallium_enable video_cards_r600 r600 - gallium_enable video_cards_radeonsi radeonsi - if ! use video_cards_r300 && \ - ! use video_cards_r600; then - gallium_enable video_cards_radeon r300 r600 - fi - - gallium_enable video_cards_freedreno freedreno - gallium_enable video_cards_virgl virgl - - # opencl stuff - emesonargs+=( - -Dgallium-opencl="$(usex opencl icd disabled)" - ) - fi - - if use vulkan; then - vulkan_enable video_cards_i965 intel - vulkan_enable video_cards_iris intel - vulkan_enable video_cards_radeonsi amd - fi - - if use gallium; then - gallium_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) - else - dri_driver_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) - fi - - driver_list() { - local drivers="$(sort -u <<< "${1// /$'\n'}")" - echo "${drivers//$'\n'/,}" - } - - emesonargs+=( - $(meson_use test build-tests) - -Dglx=$(usex X dri disabled) - -Dshared-glapi=enabled - $(meson_feature dri3) - $(meson_feature egl) - $(meson_feature gbm) - $(meson_feature gles1) - $(meson_feature gles2) - $(meson_use libglvnd glvnd) - $(meson_use selinux) - $(meson_feature zstd) - -Dvalgrind=$(usex valgrind auto false) - -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") - -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") - -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") - $(meson_use vulkan vulkan-device-select-layer) - $(meson_use vulkan-overlay vulkan-overlay-layer) - --buildtype $(usex debug debug plain) - -Db_ndebug=$(usex debug false true) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install -} - -multilib_src_install_all() { - einstalldocs -} - -multilib_src_test() { - meson test -v -C "${BUILD_DIR}" -t 100 -} - -pkg_postinst() { - if ! use libglvnd; then - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} - fi -} - -# $1 - VIDEO_CARDS flag (check skipped for "--") -# other args - names of DRI drivers to enable -dri_driver_enable() { - if [[ $1 == -- ]] || use $1; then - shift - DRI_DRIVERS+=("$@") - fi -} - -gallium_enable() { - if [[ $1 == -- ]] || use $1; then - shift - GALLIUM_DRIVERS+=("$@") - fi -} - -vulkan_enable() { - if [[ $1 == -- ]] || use $1; then - shift - VULKAN_DRIVERS+=("$@") - fi -} diff --git a/media-libs/mesa/mesa-20.2.0_rc3.ebuild b/media-libs/mesa/mesa-20.2.0_rc3.ebuild deleted file mode 100644 index 01f47e9da290..000000000000 --- a/media-libs/mesa/mesa-20.2.0_rc3.ebuild +++ /dev/null @@ -1,565 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit llvm meson multilib-minimal python-any-r1 linux-info - -OPENGL_DIR="xorg-x11" - -MY_P="${P/_/-}" - -DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" - inherit git-r3 -else - SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="MIT" -SLOT="0" -RESTRICT=" - !test? ( test ) -" - -RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" -VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d vc4 virgl vivante vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} - +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm - lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan - vulkan-overlay wayland +X xa xvmc zink +zstd" - -REQUIRED_USE=" - d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) - gles1? ( egl ) - gles2? ( egl ) - vulkan? ( dri3 - video_cards_radeonsi? ( llvm ) ) - vulkan-overlay? ( vulkan ) - wayland? ( egl gbm ) - video_cards_freedreno? ( gallium ) - video_cards_intel? ( classic ) - video_cards_i915? ( || ( classic gallium ) ) - video_cards_i965? ( classic ) - video_cards_iris? ( gallium ) - video_cards_lima? ( gallium ) - video_cards_nouveau? ( || ( classic gallium ) ) - video_cards_panfrost? ( gallium ) - video_cards_radeon? ( || ( classic gallium ) - gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) - video_cards_r100? ( classic ) - video_cards_r200? ( classic ) - video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) - video_cards_r600? ( gallium ) - video_cards_radeonsi? ( gallium llvm ) - video_cards_v3d? ( gallium ) - video_cards_vc4? ( gallium ) - video_cards_virgl? ( gallium ) - video_cards_vivante? ( gallium gbm ) - video_cards_vmware? ( gallium ) - xa? ( X ) - xvmc? ( X ) - zink? ( gallium vulkan ) -" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100" -RDEPEND=" - !app-eselect/eselect-mesa - >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] - libglvnd? ( - >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] - !app-eselect/eselect-opengl - ) - !libglvnd? ( - >=app-eselect/eselect-opengl-1.3.0 - ) - gallium? ( - unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) - llvm? ( - video_cards_radeonsi? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - video_cards_r600? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - video_cards_radeon? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - ) - lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) - opencl? ( - >=virtual/opencl-3[${MULTILIB_USEDEP}] - dev-libs/libclc - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - vaapi? ( - >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] - ) - vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) - xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) - ) - selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.8 - ) - ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] - video_cards_intel? ( - !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) - ) - video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) - vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] ) - X? ( - >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] - x11-libs/libXfixes:=[${MULTILIB_USEDEP}] - ) - zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) -" -for card in ${RADEON_CARDS}; do - RDEPEND="${RDEPEND} - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) - " -done -RDEPEND="${RDEPEND} - video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) -" - -# Please keep the LLVM dependency block separate. Since LLVM is slotted, -# we need to *really* make sure we're not pulling one than more slot -# simultaneously. -# -# How to use it: -# 1. List all the working slots (with min versions) in ||, newest first. -# 2. Update the := to specify *max* version, e.g. < 10. -# 3. Specify LLVM_MAX_SLOT, e.g. 9. -LLVM_MAX_SLOT="10" -LLVM_DEPSTR=" - || ( - sys-devel/llvm:10[${MULTILIB_USEDEP}] - sys-devel/llvm:9[${MULTILIB_USEDEP}] - ) - <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}] -" -LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]} -CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang} -CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]} -RDEPEND="${RDEPEND} - gallium? ( - llvm? ( - opencl? ( - video_cards_r600? ( - ${CLANG_DEPSTR_AMDGPU} - ) - !video_cards_r600? ( - video_cards_radeonsi? ( - ${CLANG_DEPSTR_AMDGPU} - ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( - ${CLANG_DEPSTR_AMDGPU} - ) - ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( - !video_cards_radeonsi? ( - ${CLANG_DEPSTR} - ) - ) - ) - ) - !opencl? ( - video_cards_r600? ( - ${LLVM_DEPSTR_AMDGPU} - ) - !video_cards_r600? ( - video_cards_radeonsi? ( - ${LLVM_DEPSTR_AMDGPU} - ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( - ${LLVM_DEPSTR_AMDGPU} - ) - ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( - !video_cards_radeonsi? ( - ${LLVM_DEPSTR} - ) - ) - ) - ) - ) - ) -" -unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} - -DEPEND="${RDEPEND} - valgrind? ( dev-util/valgrind ) - X? ( - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-base/xorg-proto - ) -" -BDEPEND=" - ${PYTHON_DEPS} - opencl? ( - >=sys-devel/gcc-4.6 - ) - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") -" - -S="${WORKDIR}/${MY_P}" -EGIT_CHECKOUT_DIR=${S} - -QA_WX_LOAD=" -x86? ( - usr/lib*/libglapi.so.0.0.0 - usr/lib*/libGLESv1_CM.so.1.1.0 - usr/lib*/libGLESv2.so.2.0.0 - usr/lib*/libGL.so.1.2.0 - usr/lib*/libOSMesa.so.8.0.0 - libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 ) -)" - -llvm_check_deps() { - local flags=${MULTILIB_USEDEP} - if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi - then - flags+=",llvm_targets_AMDGPU(-)" - fi - - if use opencl; then - has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 - fi - has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" -} - -pkg_pretend() { - if use vulkan; then - if ! use video_cards_i965 && - ! use video_cards_iris && - ! use video_cards_radeonsi; then - ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, or radeonsi" - fi - fi - - if use opencl; then - if ! use video_cards_r600 && - ! use video_cards_radeonsi; then - ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi" - fi - fi - - if use vaapi; then - if ! use video_cards_r600 && - ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau" - fi - fi - - if use vdpau; then - if ! use video_cards_r300 && - ! use video_cards_r600 && - ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau" - fi - fi - - if use xa; then - if ! use video_cards_freedreno && - ! use video_cards_nouveau && - ! use video_cards_vmware; then - ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" - fi - fi - - if use xvmc; then - if ! use video_cards_r600 && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau" - fi - fi - - if ! use gallium; then - use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium" - use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium" - use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium" - use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium" - use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium" - use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium" - use xa && ewarn "Ignoring USE=xa since USE does not contain gallium" - use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium" - fi - - if ! use llvm; then - use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" - fi -} - -python_check_deps() { - has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" -} - -pkg_setup() { - # warning message for bug 459306 - if use llvm && has_version sys-devel/llvm[!debug=]; then - ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" - ewarn "detected! This can cause problems. For details, see bug 459306." - fi - - if use video_cards_i965 || - use video_cards_iris || - use video_cards_radeonsi; then - CONFIG_CHECK="~CHECKPOINT_RESTORE" - linux-info_pkg_setup - fi - - if use gallium && use llvm; then - llvm_pkg_setup - fi - python-any-r1_pkg_setup -} - -multilib_src_configure() { - local emesonargs=() - - if use classic; then - # Intel code - dri_driver_enable video_cards_i915 i915 - dri_driver_enable video_cards_i965 i965 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - dri_driver_enable video_cards_intel i915 i965 - fi - - # Nouveau code - dri_driver_enable video_cards_nouveau nouveau - - # ATI code - dri_driver_enable video_cards_r100 r100 - dri_driver_enable video_cards_r200 r200 - if ! use video_cards_r100 && \ - ! use video_cards_r200; then - dri_driver_enable video_cards_radeon r100 r200 - fi - fi - - local platforms - use X && platforms+="x11" - use wayland && platforms+=",wayland" - [[ -n $platforms ]] && emesonargs+=(-Dplatforms=${platforms#,}) - - if use gallium; then - emesonargs+=( - $(meson_feature llvm) - $(meson_feature lm-sensors lmsensors) - $(meson_feature unwind libunwind) - ) - - if use video_cards_iris || - use video_cards_r300 || - use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau || - use video_cards_vmware; then - emesonargs+=($(meson_use d3d9 gallium-nine)) - else - emesonargs+=(-Dgallium-nine=false) - fi - - if use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau; then - emesonargs+=($(meson_feature vaapi gallium-va)) - use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) - else - emesonargs+=(-Dgallium-va=disabled) - fi - - if use video_cards_r300 || - use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau; then - emesonargs+=($(meson_feature vdpau gallium-vdpau)) - else - emesonargs+=(-Dgallium-vdpau=disabled) - fi - - if use video_cards_freedreno || - use video_cards_nouveau || - use video_cards_vmware; then - emesonargs+=($(meson_feature xa gallium-xa)) - else - emesonargs+=(-Dgallium-xa=disabled) - fi - - if use video_cards_r600 || - use video_cards_nouveau; then - emesonargs+=($(meson_feature xvmc gallium-xvmc)) - else - emesonargs+=(-Dgallium-xvmc=disabled) - fi - - if use video_cards_freedreno || - use video_cards_lima || - use video_cards_panfrost || - use video_cards_v3d || - use video_cards_vc4 || - use video_cards_vivante; then - gallium_enable -- kmsro - fi - - gallium_enable video_cards_lima lima - gallium_enable video_cards_panfrost panfrost - gallium_enable video_cards_v3d v3d - gallium_enable video_cards_vc4 vc4 - gallium_enable video_cards_vivante etnaviv - gallium_enable video_cards_vmware svga - gallium_enable video_cards_nouveau nouveau - gallium_enable zink zink - - # Only one i915 driver (classic vs gallium). Default to classic. - if ! use classic; then - gallium_enable video_cards_i915 i915 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - gallium_enable video_cards_intel i915 - fi - fi - - gallium_enable video_cards_iris iris - - gallium_enable video_cards_r300 r300 - gallium_enable video_cards_r600 r600 - gallium_enable video_cards_radeonsi radeonsi - if ! use video_cards_r300 && \ - ! use video_cards_r600; then - gallium_enable video_cards_radeon r300 r600 - fi - - gallium_enable video_cards_freedreno freedreno - gallium_enable video_cards_virgl virgl - - # opencl stuff - emesonargs+=( - -Dgallium-opencl="$(usex opencl icd disabled)" - ) - fi - - if use vulkan; then - vulkan_enable video_cards_i965 intel - vulkan_enable video_cards_iris intel - vulkan_enable video_cards_radeonsi amd - fi - - if use gallium; then - gallium_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) - else - dri_driver_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) - fi - - driver_list() { - local drivers="$(sort -u <<< "${1// /$'\n'}")" - echo "${drivers//$'\n'/,}" - } - - emesonargs+=( - $(meson_use test build-tests) - -Dglx=$(usex X dri disabled) - -Dshared-glapi=enabled - $(meson_feature dri3) - $(meson_feature egl) - $(meson_feature gbm) - $(meson_feature gles1) - $(meson_feature gles2) - $(meson_use libglvnd glvnd) - $(meson_use selinux) - $(meson_feature zstd) - -Dvalgrind=$(usex valgrind auto false) - -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") - -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") - -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") - $(meson_use vulkan vulkan-device-select-layer) - $(meson_use vulkan-overlay vulkan-overlay-layer) - --buildtype $(usex debug debug plain) - -Db_ndebug=$(usex debug false true) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install -} - -multilib_src_install_all() { - einstalldocs -} - -multilib_src_test() { - meson test -v -C "${BUILD_DIR}" -t 100 -} - -pkg_postinst() { - if ! use libglvnd; then - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} - fi -} - -# $1 - VIDEO_CARDS flag (check skipped for "--") -# other args - names of DRI drivers to enable -dri_driver_enable() { - if [[ $1 == -- ]] || use $1; then - shift - DRI_DRIVERS+=("$@") - fi -} - -gallium_enable() { - if [[ $1 == -- ]] || use $1; then - shift - GALLIUM_DRIVERS+=("$@") - fi -} - -vulkan_enable() { - if [[ $1 == -- ]] || use $1; then - shift - VULKAN_DRIVERS+=("$@") - fi -} diff --git a/media-libs/mesa/mesa-20.2.0_rc4.ebuild b/media-libs/mesa/mesa-20.2.0_rc4.ebuild index d7ceac80a260..049d7be7074a 100644 --- a/media-libs/mesa/mesa-20.2.0_rc4.ebuild +++ b/media-libs/mesa/mesa-20.2.0_rc4.ebuild @@ -496,7 +496,7 @@ multilib_src_configure() { emesonargs+=( $(meson_use test build-tests) -Dglx=$(usex X dri disabled) - -Dshared-glapi=enabled + -Dshared-glapi=true $(meson_feature dri3) $(meson_feature egl) $(meson_feature gbm) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index d7ceac80a260..7e2bd851871f 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -35,7 +35,7 @@ for card in ${VIDEO_CARDS}; do done IUSE="${IUSE_VIDEO_CARDS} - +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm + +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd" @@ -76,14 +76,8 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100" RDEPEND=" !app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] + >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] - libglvnd? ( - >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] - !app-eselect/eselect-opengl - ) - !libglvnd? ( - >=app-eselect/eselect-opengl-1.3.0 - ) gallium? ( unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) llvm? ( @@ -244,7 +238,7 @@ x86? ( usr/lib*/libGLESv2.so.2.0.0 usr/lib*/libGL.so.1.2.0 usr/lib*/libOSMesa.so.8.0.0 - libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 ) + usr/lib/libGLX_mesa.so.0.0.0 )" llvm_check_deps() { @@ -496,13 +490,13 @@ multilib_src_configure() { emesonargs+=( $(meson_use test build-tests) -Dglx=$(usex X dri disabled) - -Dshared-glapi=enabled + -Dglvnd=true + -Dshared-glapi=true $(meson_feature dri3) $(meson_feature egl) $(meson_feature gbm) $(meson_feature gles1) $(meson_feature gles2) - $(meson_use libglvnd glvnd) $(meson_use selinux) $(meson_feature zstd) -Dvalgrind=$(usex valgrind auto false) @@ -533,14 +527,6 @@ multilib_src_test() { meson test -v -C "${BUILD_DIR}" -t 100 } -pkg_postinst() { - if ! use libglvnd; then - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} - fi -} - # $1 - VIDEO_CARDS flag (check skipped for "--") # other args - names of DRI drivers to enable dri_driver_enable() { diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest index 90d203c2e7af..62c09e132950 100644 --- a/media-libs/mutagen/Manifest +++ b/media-libs/mutagen/Manifest @@ -1,5 +1,5 @@ DIST mutagen-1.43.0.tar.gz 1143839 BLAKE2B 044906b730763e001fa2cb863c8bb1fec45713aca57b6311f783f66218e4f3410987d04d56a1e4fbf41a229860bbb574b4077401e1f2384e70d80fdc9f3b23ad SHA512 66df63705a43befa9cf6688bc8b3acc4fd1559eb28920c105b47a97c35422b5e19527051445daa7aed66facc2e4c14d71058f8560bbd564fecbe56a076491e3f DIST mutagen-1.44.0.tar.gz 1143320 BLAKE2B 9e4ad11b7ee560a4940e3eaaecdb8b0fad4db54fd1fa9e4f925d84e55c217eb002e07602817fa92f6db9fdd6b6b339d5e147874bf587604c18b665d980d6604a SHA512 88c8c181b1333989451533951727b7c43e4a012defd3fd1f7ddd970d083f938783d61f98970e74c677ee9725dac92c47ee37af4bd7a474e85c7a56793c6063a8 EBUILD mutagen-1.43.0-r1.ebuild 1114 BLAKE2B 11fa4894e029448db8d903a9a63224c7803b3fdd64a49e820468a2fd40e0f089a917daa4b78edda79643ba759e0002aee394bb3b6392dd3f3afab0c7bfbfa4f1 SHA512 82659768180b836890c90750c62c6ea1583cd2d43badde3b54a29d2d9194f613ed1835877d436f4b3e279c72d50fdcf1d62c11ca86898f84fb306a87833155f0 -EBUILD mutagen-1.44.0.ebuild 1105 BLAKE2B 73411b9326d3230ae861f88e370f112cf7984734cd282e0289257d2f71d6f20f59cffefdd40498211f18f8905f5a35bc5072777127cb676883d2366592cf188f SHA512 ca7595747cd7be6ade76d2a6acd0a2de502f2e9cf247fe32303d4fb7e740de1ca175cf0d3065f726ced7842ad1348000a8cf3dbc664e5ee03bc6e41a37230d19 +EBUILD mutagen-1.44.0.ebuild 1104 BLAKE2B f36d2c00a4e64d2998d6771cd8cf79b560b5bfc90f68e3ee975e3f04266543cec934ba75c683b710ec18fc84f9f04e40b55db035f16e4bddd63e4304daeac71c SHA512 32dbe431944c217a85dcd32d85558498cca8e0bf997142e833d0a9606ccbf33de553c24a217d40f9c569904c84221c655aa47551bdb454e19c20c91372462337 MISC metadata.xml 380 BLAKE2B 9fd70ca6ca6e8d17b66ea703f65885b87714ed0560ffe7502d85da3ee8fdf1d62545c1166b64d99f2bd2bfa6105f8f8865bc28769069c1ae3da4b1c3c174fd69 SHA512 87ce1f85bd6aff7c159fd22a412eb9ea95ac4f58fb2cc70fd4c4f470bfe9f6366b906bc9cef833ae5c10b7a3601c15edab9e8418cf78d7d9e993191873f41d59 diff --git a/media-libs/mutagen/mutagen-1.44.0.ebuild b/media-libs/mutagen/mutagen-1.44.0.ebuild index 1794f9bbe91e..fbfc42e0aad5 100644 --- a/media-libs/mutagen/mutagen-1.44.0.ebuild +++ b/media-libs/mutagen/mutagen-1.44.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/quodlibet/mutagen/releases/download/release-${PV}/${ LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="doc test" # TODO: Missing support for >=dev-python/eyeD3-0.7 API diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest index c884831a90f6..72f977d884af 100644 --- a/media-libs/netpbm/Manifest +++ b/media-libs/netpbm/Manifest @@ -1,21 +1,13 @@ AUX make-tarball.sh 1364 BLAKE2B 40001ac396b0ff26bb8e5d1a1a160b1467b4f9453d930394cf66dbc5e60b9d1e04c419801ca4ea2cbcb930797fe07df305549b7d5155e3cac3ce099a4dddbfbf SHA512 89b0ebfe6f5a82c3e3fc678ec4599d7281a0978c3a53437f0fbcfcb33607f8087bca1263d8a52c5b25cb1ab91a6635385cf423213464af858fc2f9663d5446a7 AUX netpbm-10.31-build.patch 1629 BLAKE2B 26d46715ac933420fe5a9a0209edad51a754ad4f030cddd39d08f1d41418cb20ac8b0b9cc3dbaa847d6406a6778cff1b55618dee45a4a112c89a5d61be50efb3 SHA512 53e88bd1c85aa04d60ca2de7a32e5d00d9f959f3443e0c951c0694c814f6956708d8d12427a0fa8a8f76a1613d2982c3aa9b0c6ddd12b9cad3419ced1e5bb59e -AUX netpbm-10.66-failing-tests.patch 535 BLAKE2B ef4e1b2486d7aac82d8527571fbfd97819ceb2a5d8c31760ebbfe9c6411fd8fd7df7f1a21b1d17715337f16c23eea481d0e94ad59ed66bac1485f41ae260d020 SHA512 33101e745fdeb9159da48393622edf9163c85f2c133951ba33d48f80758179f18ce36e60e3357bb978c101a7a0e1688aa6dbbc1a1c646782089760908dfe2b04 -AUX netpbm-10.66-jasper-hack.patch 924 BLAKE2B c7a80010e4c61e22f0beb88f5800875a098f47fefd4b830f9d0e1b986a8def55cb1dde3ce0ec902dc2bfb922350228af08aa208268130c08aab210546c568861 SHA512 e58a5f6800e2ab511080d505e9286e4831cb498f9a02cd5823bd52bb8e267c780f4b792388ccc29023afe18005c753b6ea32a3e277b8b1e3ceb8e4b997afe359 -AUX netpbm-10.66-jbig-2.patch 725 BLAKE2B 6d8562ad0d9595b048c3e0afbd7ba0c829583aa9f9b42b47dd7c10b9bddf2e4f206b7de5efb793529ea38972d6b5a2a465a85fe4b937c8e98c0c17f0c47f1359 SHA512 5d7a90c982c67c17b37dc91b7b4668ddcbd67434873cfde86e04bac7d057d6e6cd8ace52c3fc6e0ce36f767333bb00bdfc4fb3f29f54427285214cbd2f41c42f -AUX netpbm-10.66-jpeg-dirs.patch 722 BLAKE2B e05df77a7c027263a21e5da60d9b224f31b4bc1766367503178350d8a79c2e5dd129da65fde7ae9963072a3e82c864a0ec68992237f6719e26b46ed0b0a81bdf SHA512 95a4ab08702faa3d25c75b71329ea28e5eb5f4f0b200d34d7350633e9a999160fe58e8f57fadab30e273c61a06c8d148fdebecbffa5c0b5023c59647f6d4c3ae -AUX netpbm-10.66-options-case.patch 3417 BLAKE2B adabb59db1fb2a5057aaa36bf76eaa227ac6caafeab35c377d883c509c7d800d512e8bfabe18ba202574016670a6440a381070e1539c2d095aead2daca7ba3fe SHA512 2895b71269d321f84e79808a2fe65a8886ce3e173550051ca40563636b3e8561d5c812a3bb9f2e607c2dc7244b56492332a4299d165059d866ca00701adefe23 AUX netpbm-10.66-test.patch 347 BLAKE2B e4f88878dd61c2d7e8ad642d5a32aec8351cdcf8ef2d4bf81dd9174a69d17b6c56fc3eb7160f63764360a7bdea99bcb2cb3e8dd47d04f881185f86e2a8f6cbf5 SHA512 bb271d77794fa8b3d5d4632e32d6bd2b5f9522853c6b96c7056fe9817da47b89153eba2653cf3a5a29f597e3fa616e1f6c810bd986651e610176d69b428afb74 -AUX netpbm-10.66-wordaccess_be_aligned.patch 942 BLAKE2B b109ea0dc1aa0fca67c6f2b80d66d929918445124b4cf82b017d15897e4099cf5ca1661b968639809b0f902bfcda3f33d5e61653d7ba21e3005e50261295a71d SHA512 b3b33b0e32c7bcb126104f0f100b56cb811c1ce5051be854a93d0227d9a684e440dd9e0787dfe3f4cb12df1fef5b2e6d1ecb6c3a49d630a32595a026ae1fb482 AUX netpbm-10.70-system-libs.patch 1016 BLAKE2B 84a9b4bb4552f98f0cc8b653c84e1efa437624f1895bd321ec0ef415284c93b59785ef451b9116a4e470394c43670b5c1d1028198931cce81ad166d573aca10d SHA512 156e668ff209ca42dc3bf7e9b89232065d1f5ed3284885beeb67c8c9728eb7f142aceb98898c8d8e2c2a90dd9fab927a698b4372f2f3bcbf06f6df44d1a81629 AUX netpbm-10.76.00-build.patch 1295 BLAKE2B 5ce1a973f503ded256fad7d8c2dddf24663466e8be04acbf52d30ca1ff50dae40dc24b0714cb50b00667f2d560c7f2ab5c7d457c90e8b31f322ca85498c3ba3d SHA512 db1d0593db6987933d7c937beeac65716866adaa079fb5329f8597b208c7dea9f6dd40b803f9dc4b3ef6cf61189c45dde9e139435b7d8e224bb83e037a7f076b AUX netpbm-10.76.00-misc-deps.patch 1665 BLAKE2B b4e87fa86fee8d66a354999ee6731cfad4238fc0c56015a5db17bcc058ca13849cd1ed2efc8d9f4bc370ac255528fc28bca30e9c82152f64000249e3eed9458e SHA512 81afe7189ac0d3cf24ec691eee89dc8fa1a1f6503c9d2e530dcdbbcf1c67c6a834b6b205c99ef633461e090baf6e8b4179954482c09b68370bea9eceabd1d3bd AUX netpbm-10.76.00-pbmtext-test.patch 707 BLAKE2B 42cbda583198a173a8210e0e6dd65392a9f138af6ee8f0271196841dd3adba65a34c59698eb5897982d5297500f8e456fa1de6e17d546f6957adf5b68237ae2e SHA512 d43a59bd92bbe7ebb8fcf60bf13fb4095beb546cb964108da740dd23c564beb2f97422535067189d49255a2ce8b7a89c01f8f98c807e6e37bfadf32e01f30bde AUX netpbm-10.76.00-test.patch 6005 BLAKE2B 0c8b0d9b1d7a0c5b139f85eb3a91838cc49687516cbd6fc12b00aef785877365503778b8c20226b07cf0f798eadf2da27ed5a6b9ce25ad4419358ccc88ebe8ea SHA512 49ee2306173e9cf39052e567aedf313ca7c7dd31a090defcd838a08a062d26e1320573a0ad6555e752edc8d0e8fd2e071016e2b075b20ac7e61ee3d60a3b7f14 -DIST netpbm-10.66.00.tar.xz 2575356 BLAKE2B db6336aaf6051d6b651b57d8d6692792698840546e82e61e4bff6c2dfa55041e8441eb3e4b7f09279181720bcbbaf3676903daf5ae85327b5cf742ec150df61c SHA512 44348eb1155353d5cd5a2ce025bc6d9301cc3239acea6b68418c14432f4bd61fc5a8669bb51b3e86b96abaf5b02cc20115c662e40fa5b41aee202b0c2ae605af DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4 DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3 -EBUILD netpbm-10.66.00.ebuild 5551 BLAKE2B 286f8f86ba048e3f24bd2c82e929e495481d2887d225f64ffdbae8e52b25d10977b26f3cec9fde5821419f03800d5e7beadb394aa2183565f04cf2da711eb97d SHA512 8e4ab18e164e50ecf5cc79f12bf5c5d4ce09b1ceffe82d278dd91acb664a934cf5f5c1ab6316976370745345ccccdaa22bcafaf40a803c4161bfdb640f2323f4 EBUILD netpbm-10.70.00.ebuild 5291 BLAKE2B 44d1e0f2a83811ad87ccbedc12787fd9ad45e8379ffe3901c8314515654c1dc5059a2c155e8730785287712f74d6ef5599943dc4add93458cb855b4675050c3f SHA512 1e0fd672914d2b607204a9ac7da290bc3b858395135a062218567879b110ecdbc8f24b63e06e60b1724aaf9bdf846473d9aa23705e8e11fcbf3732ab55eb8f7f EBUILD netpbm-10.76.00.ebuild 5181 BLAKE2B b0c32184934b4640f21f727ea579f9dc59c2f7e5562f346c3b61d5d3537cc18d19b2be3ee710b467b53ba342989fec56af6015213e666b52a56bca0c6b268361 SHA512 ba51a645c80128e8589a0c1f3193df358533e7f2da3e642c682e1d3e8d0596fcda6009540149c79bae0005f9fe7e5e229e431870cfd2d9560b8493b868a38957 MISC metadata.xml 342 BLAKE2B cd90d97e1e3d42554ec5feb7ab3db473ab52ba26e9ce4045a0bb55b89aca21f61c34043d0ec6db28af8f08dc95addcae6cd933544104259a334a794a467bcfdd SHA512 7bb2ebbf5bd2957fd06142bebe3271a0d4695b0b18d9bf9c0084ec7d0da65889efd5fbe39fa121b5f8dce0c3562bcd5ffc687d8092324ca85e43fa7f4cc53c7b diff --git a/media-libs/netpbm/files/netpbm-10.66-failing-tests.patch b/media-libs/netpbm/files/netpbm-10.66-failing-tests.patch deleted file mode 100644 index 63260de2e490..000000000000 --- a/media-libs/netpbm/files/netpbm-10.66-failing-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -punt failing tests; already notified upstream - ---- a/test/Test-Order -+++ b/test/Test-Order -@@ -50,7 +50,6 @@ pamditherbw.test - pbmclean.test - pamcut.test - pnmcat.test --pamflip.test - pamenlarge.test - pnminvert.test - pamchannel.test -@@ -70,7 +69,6 @@ ppmmix.test - - # Symmetry test - --symmetry.test - - # Format converter tests - -@@ -87,7 +85,6 @@ ppmdfont.test - pnm-plain-roundtrip.test - pnm-pam-roundtrip.test - pnminvert-roundtrip.test --pamflip-roundtrip.test - pamdepth-roundtrip.test - pad-crop-roundtrip.test - cut-paste-roundtrip.test diff --git a/media-libs/netpbm/files/netpbm-10.66-jasper-hack.patch b/media-libs/netpbm/files/netpbm-10.66-jasper-hack.patch deleted file mode 100644 index 285475dab062..000000000000 --- a/media-libs/netpbm/files/netpbm-10.66-jasper-hack.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://bugs.gentoo.org/513240 - -the jasper headers are horribly broken and break things like stdbool.h. -re-order the includes to work around this. - ---- a/converter/other/jpeg2000/jpeg2ktopam.c -+++ b/converter/other/jpeg2000/jpeg2ktopam.c -@@ -13,13 +13,14 @@ - #define _XOPEN_SOURCE 600 - #include <string.h> - -+#include <jasper/jasper.h> -+ - #include "pm_c_util.h" - #include "pam.h" - #include "shhopt.h" - #include "nstring.h" - #include "mallocvar.h" - --#include <jasper/jasper.h> - #include "libjasper_compat.h" - - enum compmode {COMPMODE_INTEGER, COMPMODE_REAL}; ---- a/converter/other/jpeg2000/pamtojpeg2k.c -+++ b/converter/other/jpeg2000/pamtojpeg2k.c -@@ -13,13 +13,14 @@ - #define _XOPEN_SOURCE 600 - #include <string.h> - -+#include <jasper/jasper.h> -+ - #include "pm_c_util.h" - #include "pam.h" - #include "shhopt.h" - #include "nstring.h" - #include "mallocvar.h" - --#include <jasper/jasper.h> - #include "libjasper_compat.h" - - diff --git a/media-libs/netpbm/files/netpbm-10.66-jbig-2.patch b/media-libs/netpbm/files/netpbm-10.66-jbig-2.patch deleted file mode 100644 index f7e8cf80d6c4..000000000000 --- a/media-libs/netpbm/files/netpbm-10.66-jbig-2.patch +++ /dev/null @@ -1,19 +0,0 @@ -fix building w/jbig-2.x - ---- a/converter/other/jbig/jbigtopnm.c -+++ b/converter/other/jbig/jbigtopnm.c -@@ -230,8 +230,12 @@ int main (int argc, char **argv) - if (ferror(fin)) - pm_error("Problem while reading input file '%s", fnin); - if (result != JBG_EOK && result != JBG_EOK_INTR) -- pm_error("Problem with input file '%s': %s\n", -- fnin, jbg_strerror(result, JBG_EN)); -+ pm_error("Problem with input file '%s': %s\n", fnin, -+#ifdef JBG_EN -+ jbg_strerror(result, JBG_EN)); -+#else -+ jbg_strerror(result)); -+#endif - if (plane >= 0 && jbg_dec_getplanes(&s) <= plane) - pm_error("Image has only %d planes!\n", jbg_dec_getplanes(&s)); - diff --git a/media-libs/netpbm/files/netpbm-10.66-jpeg-dirs.patch b/media-libs/netpbm/files/netpbm-10.66-jpeg-dirs.patch deleted file mode 100644 index fcf98211ba01..000000000000 --- a/media-libs/netpbm/files/netpbm-10.66-jpeg-dirs.patch +++ /dev/null @@ -1,28 +0,0 @@ -use same -I style as converter/other/Makefile so people can disable these - ---- a/converter/other/jbig/Makefile -+++ b/converter/other/jbig/Makefile -@@ -11,7 +11,9 @@ LIBJBIG_OBJECTS = jbig.o jbig_tab.o - - EXTERN_INCLUDES = - ifneq ($(JBIGHDR_DIR),NONE) -- EXTERN_INCLUDES += -I$(JBIGHDR_DIR) -+ ifneq ($(JBIGHDR_DIR)x,x) -+ EXTERN_INCLUDES += -I$(JBIGHDR_DIR) -+ endif - endif - - ifneq ($(JBIGHDR_DIR),NONE) ---- a/converter/other/jpeg2000/Makefile -+++ b/converter/other/jpeg2000/Makefile -@@ -11,7 +11,9 @@ include $(BUILDDIR)/config.mk - - EXTERN_INCLUDES = - ifneq ($(JASPERHDR_DIR),NONE) -- EXTERN_INCLUDES += -I$(JASPERHDR_DIR) -+ ifneq ($(JASPERHDR_DIR)x,x) -+ EXTERN_INCLUDES += -I$(JASPERHDR_DIR) -+ endif - endif - - diff --git a/media-libs/netpbm/files/netpbm-10.66-options-case.patch b/media-libs/netpbm/files/netpbm-10.66-options-case.patch deleted file mode 100644 index a865bc1f4514..000000000000 --- a/media-libs/netpbm/files/netpbm-10.66-options-case.patch +++ /dev/null @@ -1,105 +0,0 @@ -r2175 | giraffedata | 2014-04-01 22:28:23 -0400 (Tue, 01 Apr 2014) | 1 line - -Fix bug: inconsistent use of upper and lower case Y and N in make file variables. Make it consistently upper case - ---- buildtools/configure.pl (revision 2174) -+++ buildtools/configure.pl (revision 2175) -@@ -835,16 +835,16 @@ sub getLibTypes($$$$$$$$) { - my $response = prompt("(y)es or (n)o", $default); - - if (uc($response) =~ /^(Y|YES)$/) { -- $staticlib_too = "y"; -+ $staticlib_too = "Y"; - } elsif (uc($response) =~ /^(N|NO)$/) { -- $staticlib_too = "n"; -+ $staticlib_too = "N"; - } else { - print("'$response' isn't one of the choices. \n" . - "You must choose 'yes' or 'no' (or 'y' or 'n').\n"); - exit 12; - } - } else { -- $staticlib_too = "n"; -+ $staticlib_too = "N"; - } - print("\n"); - ---- config.mk.in (revision 2174) -+++ config.mk.in (revision 2175) -@@ -503,7 +503,7 @@ LINUXSVGAHDR_DIR = - #LINUXSVGALIB = /usr/lib/libvga.so - #LINUXSVGAHDR_DIR = /usr/include/vgalib - --# If you don't want any network functions, set OMIT_NETWORK to "y". -+# If you don't want any network functions, set OMIT_NETWORK to "Y". - # The only thing that requires network functions is the option in - # ppmtompeg to run it on multiple computers simultaneously. On some - # systems network functions don't work or we haven't figured out how to -@@ -512,11 +512,11 @@ OMIT_NETWORK = - #DJGPP/Windows, Tru64: - # (there's some minor header problem that prevents network functions from - # building on Tru64 2000.10.06) --#OMIT_NETWORK = y -+#OMIT_NETWORK = Y - - # These are -l options to link in the network libraries. Often, these are - # built into the standard C library, so this can be null. This is irrelevant --# if OMIT_NETWORK is "y". -+# if OMIT_NETWORK is "Y". - - NETWORKLD = - # Solaris, SunOS: -@@ -602,12 +602,12 @@ NETPBMLIBSUFFIX = so - # Windows shared library: - #NETPBMLIBSUFFIX = dll - --#STATICLIB_TOO is "y" to signify that you want a static library built -+#STATICLIB_TOO is "Y" to signify that you want a static library built - #and installed in addition to whatever library type you specified by - #NETPBMLIBTYPE. If NETPBMLIBTYPE specified a static library, - #STATICLIB_TOO simply has no effect. --STATICLIB_TOO = y --#STATICLIB_TOO = n -+STATICLIB_TOO = Y -+#STATICLIB_TOO = N - - #STATICLIBSUFFIX is the suffix that static libraries have. It's - #meaningless if you aren't building static libraries. ---- GNUmakefile (revision 2174) -+++ GNUmakefile (revision 2175) -@@ -396,19 +396,19 @@ lib/install.hdr: - $(MAKE) -C $(dir $@) -f $(SRCDIR)/lib/Makefile \ - SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) - --ifeq ($(STATICLIB_TOO),y) --BUILD_STATIC = y -+ifeq ($(STATICLIB_TOO),Y) -+BUILD_STATIC = Y - else - ifeq ($(NETPBMLIBTYPE),unixstatic) -- BUILD_STATIC = y -+ BUILD_STATIC = Y - else -- BUILD_STATIC = n -+ BUILD_STATIC = N - endif - endif - - .PHONY: install.staticlib - install.staticlib: --ifeq ($(BUILD_STATIC),y) -+ifeq ($(BUILD_STATIC),Y) - $(MAKE) -C lib -f $(SRCDIR)/lib/Makefile \ - SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) install.staticlib - endif ---- lib/Makefile (revision 2174) -+++ lib/Makefile (revision 2175) -@@ -175,7 +175,7 @@ else - ifeq ($(STATICLIB_TOO),Y) - BUILD_STATICLIB = Y - else -- BUILD_STATICLIB = n -+ BUILD_STATICLIB = N - endif - endif - diff --git a/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch b/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch deleted file mode 100644 index 0da719ae07d4..000000000000 --- a/media-libs/netpbm/files/netpbm-10.66-wordaccess_be_aligned.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://bugs.gentoo.org/547252 - ------------------------------------------------------------------------- -r2395 | giraffedata | 2015-01-23 13:51:17 -0500 (Fri, 23 Jan 2015) | 1 line - -Fix syntax error - -build: fix compile failure in wordint_access_be.h with -Bigendian target platforms. - -Index: trunk/lib/util/wordaccess_be_aligned.h -=================================================================== ---- trunk/lib/util/wordaccess_be_aligned.h (revision 2394) -+++ trunk/lib/util/wordaccess_be_aligned.h (revision 2395) -@@ -24,7 +24,7 @@ bytesToWordint(wordintBytes bytes) { - static __inline__ void - wordintToBytes(wordintBytes * const bytesP, - wordint const wordInt) { -- uint16_t const hi = ((wordInt >> 48) & 0xFF) -+ uint16_t const hi = ((wordInt >> 48) & 0xFF); - uint16_t const mh = ((wordInt >> 32) & 0xFF); - uint16_t const ml = ((wordInt >> 24) & 0xFF); - uint16_t const lo = ((wordInt >> 0) & 0xFF); diff --git a/media-libs/netpbm/netpbm-10.66.00.ebuild b/media-libs/netpbm/netpbm-10.66.00.ebuild deleted file mode 100644 index 3091275a3a1b..000000000000 --- a/media-libs/netpbm/netpbm-10.66.00.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit toolchain-funcs eutils multilib - -DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats" -HOMEPAGE="http://netpbm.sourceforge.net/" -SRC_URI="mirror://gentoo/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib" - -RDEPEND="jbig? ( media-libs/jbigkit ) - jpeg? ( virtual/jpeg:0 ) - png? ( >=media-libs/libpng-1.4:0 ) - rle? ( media-libs/urt ) - svga? ( media-libs/svgalib ) - tiff? ( >=media-libs/tiff-3.5.5:0 ) - xml? ( dev-libs/libxml2 ) - zlib? ( sys-libs/zlib ) - X? ( x11-libs/libX11 )" -DEPEND="${RDEPEND} - app-arch/xz-utils - sys-devel/flex" - -netpbm_libtype() { - case ${CHOST} in - *-darwin*) echo dylib;; - *) echo unixshared;; - esac -} -netpbm_libsuffix() { - local suffix=$(get_libname) - echo ${suffix//\.} -} -netpbm_ldshlib() { - case ${CHOST} in - *-darwin*) echo '$(LDFLAGS) -dynamiclib -install_name $(SONAME)';; - *) echo '$(LDFLAGS) -shared -Wl,-soname,$(SONAME)';; - esac -} -netpbm_config() { - if use $1 ; then - [[ $2 != "!" ]] && echo -l${2:-$1} - else - echo NONE - fi -} - -src_prepare() { - epatch "${FILESDIR}"/netpbm-10.31-build.patch - epatch "${FILESDIR}"/netpbm-10.66-test.patch #450530 - epatch "${FILESDIR}"/netpbm-10.66-jasper-hack.patch #513240 - epatch "${FILESDIR}"/netpbm-10.66-options-case.patch - epatch "${FILESDIR}"/netpbm-10.66-jpeg-dirs.patch - epatch "${FILESDIR}"/netpbm-10.66-jbig-2.patch - epatch "${FILESDIR}"/netpbm-10.66-failing-tests.patch - epatch "${FILESDIR}"/netpbm-10.66-wordaccess_be_aligned.patch #547252 - - # make sure we use system urt - sed -i '/SUPPORT_SUBDIRS/s:urt::' GNUmakefile || die - rm -rf urt - - # avoid mixing the local copy of jbig with the system - rm converter/other/jbig/jbig.h || die - - # disable certain tests based on active USE flags - local del=( - $(usex jbig '' 'jbigtopnm pnmtojbig jbig-roundtrip') - $(usex rle '' 'utahrle-roundtrip') - $(usex tiff '' 'tiff-roundtrip') - ) - if [[ ${#del[@]} -gt 0 ]] ; then - sed -i -r $(printf -- ' -e /%s.test/d' "${del[@]}") test/Test-Order || die - fi - del=( - pnmtofiasco fiascotopnm # We always disable fiasco - $(usex jbig '' 'jbigtopnm pnmtojbig') - jpeg2ktopam pamtojpeg2k # jasper has been removed - $(usex rle '' 'pnmtorle rletopnm') - $(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm') - ) - if [[ ${#del[@]} -gt 0 ]] ; then - sed -i -r $(printf -- ' -e s/\<%s\>(:.ok)?//' "${del[@]}") test/all-in-place.{ok,test} || die - sed -i '/^$/d' test/all-in-place.ok || die - fi - - # take care of the importinc stuff ourselves by only doing it once - # at the top level and having all subdirs use that one set #149843 - sed -i \ - -e '/^importinc:/s|^|importinc:\nmanual_|' \ - -e '/-Iimportinc/s|-Iimp|-I"$(BUILDDIR)"/imp|g'\ - common.mk || die - sed -i \ - -e '/%.c/s: importinc$::' \ - common.mk lib/Makefile lib/util/Makefile || die - - # avoid ugly depend.mk warnings - touch $(find . -name Makefile | sed s:Makefile:depend.mk:g) -} - -src_configure() { - cat config.mk.in - >> config.mk <<-EOF - # Misc crap - BUILD_FIASCO = N - SYMLINK = ln -sf - - # These vars let src_test work by default - PKGDIR_DEFAULT = ${T}/netpbm - RESULTDIR_DEFAULT = ${T}/netpbm-test - - # Toolchain options - CC = $(tc-getCC) -Wall - LD = \$(CC) - CC_FOR_BUILD = $(tc-getBUILD_CC) - LD_FOR_BUILD = \$(CC_FOR_BUILD) - AR = $(tc-getAR) - RANLIB = $(tc-getRANLIB) - - STRIPFLAG = - CFLAGS_SHLIB = -fPIC - - LDRELOC = \$(LD) -r - LDSHLIB = $(netpbm_ldshlib) - LINKER_CAN_DO_EXPLICIT_LIBRARY = N # we can, but dont want to - LINKERISCOMPILER = Y - NETPBMLIBSUFFIX = $(netpbm_libsuffix) - NETPBMLIBTYPE = $(netpbm_libtype) - STATICLIB_TOO = $(usex static-libs Y N) - - # The var is called SSE, but the code is actually SSE2. - WANT_SSE = $(usex cpu_flags_x86_sse2 Y N) - - # Gentoo build options - TIFFLIB = $(netpbm_config tiff) - # Let tiff worry about its own dependencies #395753 - TIFFLIB_NEEDS_JPEG = N - TIFFLIB_NEEDS_Z = N - JPEGLIB = $(netpbm_config jpeg) - PNGLIB = $(netpbm_config png) - ZLIB = $(netpbm_config zlib z) - LINUXSVGALIB = $(netpbm_config svga vga) - XML2_LIBS = $(netpbm_config xml xml2) - JBIGLIB = $(netpbm_config jbig) - JBIGHDR_DIR = - JASPERLIB = NONE - JASPERHDR_DIR = - URTLIB = $(netpbm_config rle) - URTHDR_DIR = - X11LIB = $(netpbm_config X X11) - X11HDR_DIR = - EOF - # cannot chain the die with the heredoc above as bash-3 - # has a parser bug in that setup #282902 - [ $? -eq 0 ] || die "writing config.mk failed" -} - -src_compile() { - emake -j1 pm_config.h version.h manual_importinc #149843 - emake -} - -src_test() { - # The code wants to install everything first and then test the result. - emake install.{bin,lib} - emake check -} - -src_install() { - # Subdir make targets like to use `mkdir` all over the place - # without any actual dependencies, thus the -j1. - emake -j1 package pkgdir="${ED}"/usr - - [[ $(get_libdir) != "lib" ]] && mv "${ED}"/usr/lib "${ED}"/usr/$(get_libdir) - - # Remove cruft that we don't need, and move around stuff we want - rm "${ED}"/usr/bin/{doc.url,manweb} || die - rm -r "${ED}"/usr/man/web || die - rm -r "${ED}"/usr/link || die - rm "${ED}"/usr/{README,VERSION,{pkgconfig,config}_template,pkginfo} || die - dodir /usr/share - mv "${ED}"/usr/man "${ED}"/usr/share/ || die - mv "${ED}"/usr/misc "${ED}"/usr/share/netpbm || die - - doman userguide/*.[0-9] - use doc && dohtml -r userguide - dodoc README - cd doc - dodoc HISTORY Netpbm.programming USERDOC - dohtml -r . -} diff --git a/media-libs/opencore-amr/Manifest b/media-libs/opencore-amr/Manifest index 557211181e75..77c3821c794b 100644 --- a/media-libs/opencore-amr/Manifest +++ b/media-libs/opencore-amr/Manifest @@ -1,7 +1,5 @@ DIST opencore-amr-0.1.3.tar.gz 881105 BLAKE2B e9e1d40b90aa819d1b4fce328ae8ff199c7656f3326199c005e8f0a47e4e3282ae02f93826e923c5128c4ec4cebc3f35b6f5ca9f3f49c7dd15d541fb77383d28 SHA512 f67e84604fe3fbb87d608343e595503e2057272fa0b3bf9158a176e88a96d272c35149483c3ee47ba2b064bd6b17cdb315888a5285aa82edc0401f17d2ae761b -DIST opencore-amr-0.1.4.tar.gz 929807 BLAKE2B ee3068a90589c9b9511fd0a5e1bbe945a50f72ef7ef7b919607c382ce820f357e6c2087bd1f16a4e5fe142377a94c452a5ae429e95c2e58c464d5457c6ec2457 SHA512 94251bd8fe4ac434f588722cbd180ac7de51296b820d68c85327ef1c88c56ede500b283832823988995371c3086e28f7dee048622aed799d3063982d03c3b867 DIST opencore-amr-0.1.5.tar.gz 929581 BLAKE2B 4943a27f0df3d874720c87f48c523d9aa4cce849dd0a3c9183466416a0629aa02dac8f01646e469e8c45438bf3c57047eb11e69f3f1b261449a0989a36639e59 SHA512 c324db9dcac5a31bfac633153bc054bfe42d5ff98202c4adb3c75a3fae9792f07f60d48cd659acf106dacd307174a62b2aeee22a4af53caa20d2bfba46488faf EBUILD opencore-amr-0.1.3-r1.ebuild 536 BLAKE2B 5600304d99b7209fa6d66edff43388ae077ebe58ab0aba308c9691df44e9921b2158d810db29ed78bd0807c6254d28959d614c1853a4d10c12b57243022705d5 SHA512 c5bf27226f0eb55a0e703170575b4eee0bd6c3cee981a5e3dc039e5feb146e9efb3b8c81374b67378cd98b499da4cc1b875b87ff0c4a7c58e900143142e430b3 -EBUILD opencore-amr-0.1.4.ebuild 538 BLAKE2B 196f22d01752e049c91d3582da072795a92b442ea30b112407b75250b4a4e7f29519469c638a4b0bc74ecacde869cf5ff69c11cbf9000cb2cc2c5841884e2f7b SHA512 316149cd0ee82b750a2f00bc8f6ad720447999c7ad7a1124ce9eb03461eb2cc48d4d947c636849d2a29f0cd2e84fb4ea9d4cf4b72b01c52be3d7b7693596b3d7 EBUILD opencore-amr-0.1.5.ebuild 545 BLAKE2B 1cefaf3cd50e6a185f4e5e0059e3d89396e514c0ebcf73c1e395f33cddf0584b48bae2fc15bc21f338a2c6c97a74acb037f697d95150da1606ab2861928489b9 SHA512 a35cde60fb74ac2a94d61a561203deb47fc7c8ef14dd93c4279271ef53efcd8c8693eaba9c3417b739dc83a53917b8d08a1fb6de25ea28131c1295e8c6f84b2c MISC metadata.xml 335 BLAKE2B 62ac5499e6bf0ca4ebb5cef78982a734cbc068fad39764b545089233f2c611937c4d8cddfa7f042705c7f7849a44f1e971431667eae02e7622d45f5b5ccdfb14 SHA512 25f894f204476ffe7bf81e7e81b16f569b34ac57572cba903bf447a53699f0e4cf5448fa27689b4baf60753e7f605f47c4a7d60f19616446b0c1f871d9b866e3 diff --git a/media-libs/opencore-amr/opencore-amr-0.1.4.ebuild b/media-libs/opencore-amr/opencore-amr-0.1.4.ebuild deleted file mode 100644 index 57398d12e5f5..000000000000 --- a/media-libs/opencore-amr/opencore-amr-0.1.4.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -AUTOTOOLS_PRUNE_LIBTOOL_FILES=all -inherit autotools-multilib - -DESCRIPTION="Implementation of Adaptive Multi Rate Narrowband and Wideband speech codec" -HOMEPAGE="http://opencore-amr.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos" -IUSE="static-libs" -DOCS=( ChangeLog README ) diff --git a/media-libs/plib/Manifest b/media-libs/plib/Manifest index 955911c9c481..aadcff8fba85 100644 --- a/media-libs/plib/Manifest +++ b/media-libs/plib/Manifest @@ -4,5 +4,5 @@ AUX plib-1.8.5-X11-r1.patch 341 BLAKE2B 09ba1a92f54dfb6bd5ca3a11f6c7201819ccc7b1 AUX plib-1.8.5-X11.patch 341 BLAKE2B b8d42813ff29c233c29183764d3d99ddafa123d418055014333713ac778951d0c671b196b35c7b1ac74fdabc29fb9f3bf87adc4f1b4f806d8e898d7f99802331 SHA512 1a605336ed46cdb7dca8b6f9eab488fd8fcf20a2beadcb70fc449d0ee6b2519b1658a9ca23b6c6a8285732dd4830bbf14ba2fb2ae47cd15a7ac431071e42d560 DIST plib-1.8.5.tar.gz 779133 BLAKE2B a74a0693463b1bbf8a6ac6a34e3a689775ac892d19e0fe2ed955e0bd4af2eb2a7f55ac2dfe5dc105333a07f634dc74a4f6347e8bbd75d2fcc5b55733aefb133d SHA512 17154cc77243fe576c2bcbcb0285b98aef1a0634658f5473e95fe0ac8fa3ed477dbe5620e44ccf0b7cc616f812af0cd44d6fcbba0c563180d3b61c9d6f158e1d EBUILD plib-1.8.5-r1.ebuild 782 BLAKE2B 2418061653e841c61a6cb5874849636e60dd3f6ecc11f4c4fc3dafbd1a9490c4804b75e0bb54a2d54125e1ea6a62a47e77cfdc697f6c80835452f71f95c005a3 SHA512 ed05e1ed616fd53c057da8c8376006a4f10852b46eb589e30545ef2e14f88e468d5226b9366e923d8e79e521d1e22df50d66af83510a0f391ac5bff54aa2ee7e -EBUILD plib-1.8.5-r2.ebuild 836 BLAKE2B 3bc1d35150631439bd8066b6f519cfeeb7284294e3daa3d64ae3f4c394bbd9ef6554e3d251e150a8e359e5cfb1aed3b8c8f6ac79548e49ee9f85b0343c00658f SHA512 e856100351f8878e3dfbc424d871efe0c2f7efdeea1fe7b119f5d9d045ec6fdbaabb860491e5a90b5766cd038ebef3c6be329b419ea6b5bbf1ee52c3af81508d +EBUILD plib-1.8.5-r2.ebuild 832 BLAKE2B 26c7ec4fbe5fa4e96fb653d42f42e626c7cd42bf9e36309b642b7be15e05ab22f7bd1b3a9a0631f28fa5b5099f6d2ccf76bc159835e3a8d6f5ef1693a90365f5 SHA512 9f52795f637c303a8649965ad2dc32946bdc7dcd60c9b0854ea6cddaaf63eb9ad5af44bc4152f6fea6c4f92d238f22e249b96566922b181aaf037ada1b7864aa MISC metadata.xml 327 BLAKE2B 65003679381c42a0e1bfecce661d9f264ac2117dbb071af263f480d349a9f1473acb191cfebd921036c598c1d5cf5d0d2e76851402d2dd4bf3cb58dfd18b3555 SHA512 63a4b8bd5cef9e67d1684542cc59b20d8276bc791a4d8293053f7be3fc276501c9d47c273c6b8a0a0d131e3842e93da4c02bde50315f642e6d742c87866f500a diff --git a/media-libs/plib/plib-1.8.5-r2.ebuild b/media-libs/plib/plib-1.8.5-r2.ebuild index d3ca9fa91384..8b02e9ee1777 100644 --- a/media-libs/plib/plib-1.8.5-r2.ebuild +++ b/media-libs/plib/plib-1.8.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -10,7 +10,7 @@ SRC_URI="http://plib.sourceforge.net/dist/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc sparc ~x86" DEPEND="virtual/opengl" RDEPEND=${DEPEND} diff --git a/media-libs/rlottie/Manifest b/media-libs/rlottie/Manifest index 7f8efe9a154b..328d134b11f5 100644 --- a/media-libs/rlottie/Manifest +++ b/media-libs/rlottie/Manifest @@ -1,6 +1,3 @@ -AUX rlottie-0.1-disable-werror.patch 381 BLAKE2B 26afddff05d0cfda88617473ec4affca4a721f081e393c31b409fc6a3e73efe73e4e661caf13aeaf5394f31533390b1439492e066ad19087d76b984b6304f421 SHA512 2363100f6b0ab09f3ad9ae46dd02dffd2a5ca2124ae1b4f3791c88b3b7563e9cafd68da4ee719f9460d781aab80b4a83f21f0d788db2eefa5cd9d2cab0ab69ce -DIST rlottie-0.1-1.tar.gz 3370181 BLAKE2B 7ba580af961f2af7b92c40b4640f8b515c21a354ef5e639c5f00b0ea26fd3e2929dbf2e926b58d39ad3f48228511ba42a42a24d4b7bb914389a7e43df810d667 SHA512 ab9b913d9e0bc938a878a6847851cd6965dc61efbf8ef71761b83d6ff577479cf0c0b214c36e58ddd6a29927a1954c3d3db9db427779b5a2d472c8962cd45ff1 DIST rlottie-0.2-1.tar.gz 3516947 BLAKE2B d5f6b643c910e0b831be223be4fcff3d42cde8239b01d413f2805eeccf2665abfbd209ee6877358c2434d3bc82ea7c5b3849f4dca1d0796436e47ffa6bcfed64 SHA512 1f645ae998ddbe83e4911addf28ec24ae3ff33f6439a9fb6c1e56986b46ac17dba155773ab02a59712e781febb31709a99075a3fbcda6136a0cb43dbd7c753de -EBUILD rlottie-0.1-r1.ebuild 936 BLAKE2B f72f77bd577b7b548591f23fc041d06f11a11e800ed3d4d24118ee3e7e559d2039f1c6cb6728a5375884ff680228d4e6e3cf68d8865e979cc402096b8a89f6a6 SHA512 d33157089ec5d865ae0d67d0889d18df3c4119f4191658fa72d65367183c7931e36d05f307d706f6ef723ee066d1fcad26d3e594600660257937b3cddf18dd10 -EBUILD rlottie-0.2.ebuild 872 BLAKE2B a9d2a628ce990f846238505494ebdb52da9529dbc3b7b950d390006da907f97cac01c94b3b748ffa329e2cdce406ee3d6bd965b5b5dc2eeccf018801650d1c6b SHA512 9922b6b60fc15c8f2df18a2f17d3f4cb773aa01ef0fcffd52777bcf6924e7933e6ada4a04efab7fa7f8acaa2d611cfa5e1b90feab9b7ebdbc5e70ef67bb98961 +EBUILD rlottie-0.2.ebuild 879 BLAKE2B b4a7951db369fff6b8a6cb4925903d2d59e7adaaf1a5ad4ce90299f2671f22a59ae0b918113d9f2038358fab2341d5a40c9db37a143e0b6e96e661ed4348ebb9 SHA512 4d2850e75042f6d0ed8438425025a8280703295062f8482e24cc44202953e37c48a0b278645d7c124d47e3580a170975b7d23d36393fdc510a683c020ef9f4ac MISC metadata.xml 901 BLAKE2B 0f2b146bafcbff57e44a91a21176114d15c9d81a076cc42f3d57e3849d1b3af3d46eb45bc74cf6e524679677b5394f440dc762c87ddc3652d0b754ebd62907b5 SHA512 f7e80a3946b2462a3718f508be57cdbbc3c85c632778b58393f467cfa5c4e80b96f3f264251d9fbb9ce4cf26e4907e534ee758c77661504f05f73577c4c06fab diff --git a/media-libs/rlottie/files/rlottie-0.1-disable-werror.patch b/media-libs/rlottie/files/rlottie-0.1-disable-werror.patch deleted file mode 100644 index 55e50d63a553..000000000000 --- a/media-libs/rlottie/files/rlottie-0.1-disable-werror.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/meson.build 2020-06-19 08:49:20.511888022 +0300 -+++ b/meson.build 2020-06-19 08:49:49.166640657 +0300 -@@ -1,6 +1,6 @@ - project('rlottie', - 'cpp', -- default_options : ['warning_level=3', 'werror=true', 'cpp_std=c++14', 'optimization=s'], -+ default_options : ['cpp_std=c++14', 'optimization=s'], - version : '0.1', - license : 'LGPL-v2.1') - diff --git a/media-libs/rlottie/rlottie-0.1-r1.ebuild b/media-libs/rlottie/rlottie-0.1-r1.ebuild deleted file mode 100644 index c3825364a0c3..000000000000 --- a/media-libs/rlottie/rlottie-0.1-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson - -DESCRIPTION="A platform independent standalone library that plays Lottie Animations" -HOMEPAGE="https://www.tizen.org/ https://github.com/Samsung/rlottie" -SRC_URI="https://github.com/Samsung/rlottie/archive/v${PV}.tar.gz -> ${P}-1.tar.gz" - -LICENSE="BSD FTL JSON LGPL-2.1 MIT" -SLOT="0/0.0.1" -KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="debug examples test" - -RESTRICT="!test? ( test )" - -DEPEND="test? ( dev-cpp/gtest )" - -PATCHES=( "${FILESDIR}"/${P}-disable-werror.patch ) - -src_configure() { - local emesonargs=( - -D cache=true - -D module=true - -D thread=true - - -D cmake=false - -D example=false - - $(meson_use debug dumptree) - $(meson_use debug log) - $(meson_use test) - ) - - meson_src_configure -} - -src_test() { - cd "${BUILD_DIR}" || die "Failed to switch into BUILD_DIR." - eninja test -} diff --git a/media-libs/rlottie/rlottie-0.2.ebuild b/media-libs/rlottie/rlottie-0.2.ebuild index d0ac8c17c14b..faec02176727 100644 --- a/media-libs/rlottie/rlottie-0.2.ebuild +++ b/media-libs/rlottie/rlottie-0.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/Samsung/rlottie/archive/v${PV}.tar.gz -> ${P}-1.tar. LICENSE="BSD FTL JSON MIT" SLOT="0/0.2" -KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" IUSE="debug examples test" RESTRICT="!test? ( test )" diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest index de6a90923374..455c9a98d646 100644 --- a/media-libs/rubberband/Manifest +++ b/media-libs/rubberband/Manifest @@ -1,5 +1,6 @@ +AUX rubberband-1.9.0-makefile.patch 339 BLAKE2B 93a60dde06e197578f8279b60551541bf69ac756fef348128bfbd3289ece20c98ccaebed6856cf7697588440c61bcfa6ac65b6480648cf63aed9f21ac642f270 SHA512 3921eb71daee708ace0c4f28075ac67a2b10af71ddeb85edea1cde0c2e0721d09ca590ce90255f49be0f284cc43a0cfda9b4805c82a09baeb4303cadb06ad3c3 DIST rubberband-1.8.2.tar.bz2 182232 BLAKE2B 991debac51e0a5516a35e1d063d5ea2c51b9d193b6a183200b0869a6743e184fe4296168d6caaea7b811a4022d25c08ca7909f05491a0e91cfe7dda532ed29cb SHA512 da677f9a843711c44c52c0153faa62e587ac7c010569523ef4fef7ce941b9d292e566f46147700e496f6cfff4c9f22f9901dcc93f2d701fdb9de152ddac0c3a6 DIST rubberband-1.9.0.tar.bz2 192240 BLAKE2B dd97f80e01b05883645bf7c78730f8a3f873a60379cc209887591a28d0b6292e083c2f522db35ef9435c0a446eaa9b5acab8b5e2c9703514019491a939a804c9 SHA512 2226cfec98f280a12f874f60620c3bf09f7399a7808af5e9f5c9a5154b989cfbf3c4220e162d722e319a4ef046f81c6a07eac2b8c6035c8f6230f0a20b1577a8 EBUILD rubberband-1.8.2-r1.ebuild 1480 BLAKE2B fae62ef316e3f342bc3b860378913a3e079a8d5a9c51489ac1fc5d5ef8e2db05bb9d2c300f48a09d44e7f83fc5330307cc6d554b096909ac0be66706963d7fae SHA512 00aca9daf40563191ad1771fcc7941eacca21112f4d70fcbc8059c149906c416fdca45e404586606229a1f4549c02f34a62dde0bbeba3e5b6bba1d525f6c91c2 -EBUILD rubberband-1.9.0.ebuild 1680 BLAKE2B 7df3dc19cf79cccaf9a937d6aeaac6c16f12ed3f4f68e9436485c53d6076508cdc41bdfd4f1dcb39352865d82a921c5471f9bc89cc0492307a0ff7982df26eb9 SHA512 853ac9d8972b50383088d050e9b6c4ec0e06a7f752a0b74e977cda6a924f9121f81d416ddfb89578ed8cf7950c8c1bb46033fd058ab475bb782a2d57dc8532b4 +EBUILD rubberband-1.9.0.ebuild 1796 BLAKE2B 717c03cb18b8d1838b21fe1cc3317982cbf8b1d2f141552cfe5649fbb85491e6208c171189597198ce7cf68ec15e3602054afec19e9d0fb5ac5419806992695d SHA512 565506a42268d1019c00c5e93e444f5d2792ac21b669c4c2950bdb3dd8370547070516991a8cf22dfc4103eea581b29ea3844635bc2825cbcaf0cd6c5f660cdf MISC metadata.xml 415 BLAKE2B 316ab3a0d89221f5db790350e3d6fb609656ffac3ab36ab1d53b1ea56d537005f41d5d4fec24e14000ba8dd32a094da7d05c1e814fba77bb4e209599129c685b SHA512 7b34bb720df7941a22d174b9f83407071110c9421b4207471f44a74c1bdb5cb6ef7b085386277c3d1f852ba48fc749e665337bc5d3b9fe862e76378a6d7ad4a0 diff --git a/media-libs/rubberband/files/rubberband-1.9.0-makefile.patch b/media-libs/rubberband/files/rubberband-1.9.0-makefile.patch new file mode 100644 index 000000000000..5539162dec29 --- /dev/null +++ b/media-libs/rubberband/files/rubberband-1.9.0-makefile.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index fdddb72..86c0548 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -19,7 +19,7 @@ VAMP_PLUGIN_LIBS := @Vamp_LIBS@ $(LIBRARY_LIBS) + LADSPA_PLUGIN_LIBS := $(LIBRARY_LIBS) + + MKDIR := mkdir +-AR := ar ++AR ?= ar + + INSTALL_BINDIR := $(PREFIX)/bin + INSTALL_INCDIR := $(PREFIX)/include/rubberband diff --git a/media-libs/rubberband/rubberband-1.9.0.ebuild b/media-libs/rubberband/rubberband-1.9.0.ebuild index 97b291d58908..38036981a9ee 100644 --- a/media-libs/rubberband/rubberband-1.9.0.ebuild +++ b/media-libs/rubberband/rubberband-1.9.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit multilib-minimal +inherit multilib-minimal toolchain-funcs DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program" HOMEPAGE="https://www.breakfastquay.com/rubberband/" @@ -27,6 +27,10 @@ CDEPEND=" RDEPEND="${CDEPEND}" DEPEND="${CDEPEND}" +PATCHES=( + "${FILESDIR}/${P}-makefile.patch" +) + src_prepare() { default if ! use static-libs ; then @@ -47,6 +51,10 @@ multilib_src_configure() { $(use_enable vamp ) } +multilib_src_compile() { + emake AR="$(tc-getAR)" +} + multilib_src_install() { # fix libdir in .pc file sed -iE "s%/lib$%/$(get_libdir)%g" "${BUILD_DIR}/rubberband.pc.in" || die "Failed to fix .pc file" diff --git a/media-libs/sdl-gfx/Manifest b/media-libs/sdl-gfx/Manifest index f8158b2b9471..2d422b2d1d1f 100644 --- a/media-libs/sdl-gfx/Manifest +++ b/media-libs/sdl-gfx/Manifest @@ -1,5 +1,5 @@ DIST SDL_gfx-2.0.25.tar.gz 1760656 BLAKE2B f0779c725529d52b675312a3f6fffac7581f2e3a6f609c433e0c1fc636a3f73660727ce8996764578dcb486252ceaf6064a6710a6b60a82fc3cc106097d2e7ab SHA512 42a5d78fe1a9b644d329fb688ed6c98558f8dd0aa029a1a0d99b1c59f94859269e0aef8f9e420b8018b687d8eae151652890be3994775644e1d3a80ba7b6fe8c DIST SDL_gfx-2.0.26.tar.gz 1771164 BLAKE2B 09556762bd9f3e19989d9db4117ec63deff466c015fe0d7b40595b8d3d0f2e7f17d142d101a1463a71144b6ee7700370513057f4f4753a4b4c605308cd42bc64 SHA512 e571caa0d7575683efd4cf8f0a41ab10f4acf913f9ece216ac823af11da22c8734fc2c0ea049009a3e1a53715e49622f5bfcfdbdafb95e5151990d0a4eb69c01 EBUILD sdl-gfx-2.0.25.ebuild 1093 BLAKE2B da17fb59a9352bd2f274228aef2f782b86fff1b957df3e8c8e949e586c633759b97c7101e2b04f442b14388004120890457a708222b17d18cdc734431a842dbd SHA512 606aa7a5da5b4c8ff97030e289e7bc7f3c39ad08676a15dc1c7b9a3e5e9856a9226ff2b54ee4e38e83780fb3811033e6a6cf1f684ee32ee217892bab72d0cc76 -EBUILD sdl-gfx-2.0.26.ebuild 1183 BLAKE2B 0df4f287bad2fe70fb07c6c1e7c26a735ee8810d0c883b1a9f7b957558dfcb6240d8d6277d56eca68d28e83fe6c786072cec7ba98ba70f4b1d8fb807818c9c16 SHA512 b5348c1a1fead83f1dd1b59fe384dd3dcd5447a3f03a61d98f3440abf8432488dcf039f01dde6250a8b5e78408e55b01b930f860d692171e0a489aeea6566e0f +EBUILD sdl-gfx-2.0.26.ebuild 1182 BLAKE2B 8ae285589be226f483e952a136dbcddba3a0f3367870e89913abc4663a62b906843f5c5e928701bfa71d6b22dc1eeb6937dbeacaa58fd31e72c0418eb261af3c SHA512 1312627f16e764ae2c4b2ee06e70522181c1a0199d4dff6ba0fe82e755ac8dc2066b5bfc03ccdea7da0d865b00c07ab3923bbcf73ac1719d3bc7d702df899cad MISC metadata.xml 913 BLAKE2B 24b8ef9a2b333c6df842a85ec91f6d3a70c4439ed6bcd829641b158d4fb6f100ac20134cba4b2b2e5732825730ed0a214f55b10ff38a328e6a004770b3d246a5 SHA512 495205062ad772f808daa2da58de9abf6ec504665e06ba9f38392bcae2b4ee343a935be43d5d82e56353d1b282c6e293a859d495f98face961f9c5921503c162 diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild b/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild index e0141aadd518..552639de3182 100644 --- a/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild +++ b/media-libs/sdl-gfx/sdl-gfx-2.0.26.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.ferzkopp.net/Software/SDL_gfx-2.0/${MY_P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="doc cpu_flags_x86_mmx static-libs" RDEPEND=">=media-libs/libsdl-1.2.15-r4[video,${MULTILIB_USEDEP}]" diff --git a/media-libs/vamp-plugin-sdk/Manifest b/media-libs/vamp-plugin-sdk/Manifest index 7a6aeba967b4..6bba9d1e6aba 100644 --- a/media-libs/vamp-plugin-sdk/Manifest +++ b/media-libs/vamp-plugin-sdk/Manifest @@ -1,5 +1,5 @@ DIST vamp-plugin-sdk-2.10.tar.gz 316165 BLAKE2B ba206443d4a6f94f56c1e3b7e8f47b7c8f893d2df6601f9d26a613d56bf58fee7d0a4a996964aa0690ecf69fd1d686db28165e73a0d37880a7891c67ecaaae5f SHA512 67a71e5396eab5ce9503e9111b4cfc16fc9755cf6ae2d8dfc99ed29fd91e75eaf0de9a9c55ce8f7751f04c235eb86430856eff18f02adde54f1850a87c917ef0 DIST vamp-plugin-sdk-2.7.1.tar.gz 306956 BLAKE2B d8e765f54cb3544efcca4b08241afc070026adeaa4c0273cc01dae26e0ad60a976bc443184cc83413c6e32f4cf6fbee6590954e7ab12872993abb78c2541653f SHA512 91dd7cae72334718dcbdac06b1ffa3f3ba76e977b82b928ab634d9982aa15ca4e30978a7778215753c61e56831077d7634d24e65e468ab6a8a87a5957fb09bf3 -EBUILD vamp-plugin-sdk-2.10.ebuild 1713 BLAKE2B cc11a402cb0e3eb625169d76557dbe26860b28dffeb21ee3c7562e89fc0e00cf3addf1f2f09b79a97aa40e830db5e256324852f47744f7e421f9b226786dfe21 SHA512 caf7175502d7f6579fd66e5fa0d0e942a86ff76d341700350effc10552fb928f30e69992d371abff68839abd658713642875719e74307c4d89a61b68657bc05c +EBUILD vamp-plugin-sdk-2.10.ebuild 1711 BLAKE2B 1a26d3a99fafffe9163651580e12f6c5c83feea68d5700a0b650f015661a0748288929b45f131d326d520576a7036e45aeb4ba3870ee4a4ec2191f5f56ae8782 SHA512 e02c906432e7ec78bca3b3493f4001ef3653e9b56adfbce2dcadb68261502321e50de8595e7bf5f9897cd17d68acfe9ca3a3249757f3dbe6a82d4ad775e34ac7 EBUILD vamp-plugin-sdk-2.7.1-r1.ebuild 1647 BLAKE2B 4b08eb7d49ea76bc132e3ee90e9f71be68c453978356fa89eadf7381b4a3d143861a2ec6409c1472cfa24bbed1269bac1794833aa31ae8dc1e83a6dbc694fdbb SHA512 cc59376395f69f3b7615f2484803f6b9f8b0d673ddf349e0ebc79784766f055aee09f69f0350a956e593500419c6b00da32926eca0a954c660ffa6640cdf5418 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8 diff --git a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild index 9e72385ee23e..f7752aceb915 100644 --- a/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild +++ b/media-libs/vamp-plugin-sdk/vamp-plugin-sdk-2.10.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/c4dm/${PN}/archive/${PN}-v${PV}.tar.gz -> ${P}.tar.g LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="doc" RDEPEND="media-libs/libsndfile:0=[${MULTILIB_USEDEP}]" |