diff options
78 files changed, 1542 insertions, 1062 deletions
diff --git a/acct-group/adbusers/adbusers-0.ebuild b/acct-group/adbusers/adbusers-0.ebuild new file mode 100644 index 0000000..f8d84ac --- /dev/null +++ b/acct-group/adbusers/adbusers-0.ebuild @@ -0,0 +1,9 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit acct-group + +DESCRIPTION="Android Debug Bridge user group" +ACCT_GROUP_ID=-1 diff --git a/acct-group/adbusers/metadata.xml b/acct-group/adbusers/metadata.xml new file mode 100644 index 0000000..f453528 --- /dev/null +++ b/acct-group/adbusers/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> +</pkgmetadata> diff --git a/app-admin/keepassxc/keepassxc-2.6.6-r1.ebuild b/app-admin/keepassxc/keepassxc-2.6.6-r1.ebuild index 9ac2485..4f2605d 100644 --- a/app-admin/keepassxc/keepassxc-2.6.6-r1.ebuild +++ b/app-admin/keepassxc/keepassxc-2.6.6-r1.ebuild @@ -15,7 +15,7 @@ if [[ "${PV}" != 9999 ]] ; then else SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz" #SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 x86" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi else inherit git-r3 diff --git a/dev-java/freemarker-bin/metadata.xml b/app-arch/precomp-cpp/metadata.xml index 004555a..004555a 100644 --- a/dev-java/freemarker-bin/metadata.xml +++ b/app-arch/precomp-cpp/metadata.xml diff --git a/app-arch/unar/unar-1.10.7-r1.ebuild b/app-arch/unar/unar-1.10.7-r1.ebuild index f076cb7..30a0409 100644 --- a/app-arch/unar/unar-1.10.7-r1.ebuild +++ b/app-arch/unar/unar-1.10.7-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="~amd64" RDEPEND=" app-arch/bzip2:= diff --git a/dev-libs/highway/metadata.xml b/app-crypt/openpgp-keys-runescape/metadata.xml index 004555a..004555a 100644 --- a/dev-libs/highway/metadata.xml +++ b/app-crypt/openpgp-keys-runescape/metadata.xml diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest index 7d4f2bf..f37e47f 100644 --- a/app-emulation/dxvk/Manifest +++ b/app-emulation/dxvk/Manifest @@ -1 +1 @@ -DIST dxvk-1.9.1.tar.gz 1135785 BLAKE2B 49bb4aefff8385da238e334bcd99f992263d7266efc23efb3ca1c459ad6c7e7012dbb0390c7581e9b1b3004d9dfb4ddf56e0aa30a7bb1e016c3310b141e8ba29 SHA512 012c1b2b854585696f438e13bfd2334498419650bb9f0fb9decff690562f79701a42fe93738e2567802fc201916a9b33885c44ca7494d5e12ac877e770ab1e36 +DIST dxvk-1.9.2.tar.gz 1148537 BLAKE2B 7ff65080f63036afdeb88a517dcfb7712b0f15f6d02e98db1d3c05ba65ce22b6347990f40cc8690204aa347272c42504e1dd3f232e91ea79c4a983623caf3f5a SHA512 0f63ffd65b02263140e5c976de2466baa6e2e440257771c0627b355083072724c8ecc0c6952aefc6786263ebbe30030e7bcdbedc9e775dec0f31d393e4fcf1de diff --git a/app-emulation/dxvk/dxvk-1.9.1.ebuild b/app-emulation/dxvk/dxvk-1.9.2.ebuild index acb6291..acb6291 100644 --- a/app-emulation/dxvk/dxvk-1.9.1.ebuild +++ b/app-emulation/dxvk/dxvk-1.9.2.ebuild diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest new file mode 100644 index 0000000..f36dc8f --- /dev/null +++ b/app-text/zathura/Manifest @@ -0,0 +1 @@ +DIST zathura-0.4.8.tar.gz 202264 BLAKE2B 70916ac23624b8e55b39bc2b9329fc5d992d3e2e3989b17bebf0f8b1bcb26ed943c15866c0b37e0a4a29fee7c264d6309bf1d036d770817e13a14a13af7499d7 SHA512 00d7b735154ff0e857f8a0a21c24b3fbbff8c166d93a34bee725072ee00f2870adecb956e9445334be2a84827778bd874cc1d4bda7f8b32e4468ea3784834b86 diff --git a/app-text/zathura/files/zathura-docutils.patch b/app-text/zathura/files/zathura-docutils.patch new file mode 100644 index 0000000..7d313f6 --- /dev/null +++ b/app-text/zathura/files/zathura-docutils.patch @@ -0,0 +1,119 @@ +diff --git a/doc/man/conf.py b/doc/man/conf.py +deleted file mode 100644 +index 2aad25f..0000000 +--- a/doc/man/conf.py ++++ /dev/null +@@ -1,36 +0,0 @@ +-# -*- coding: utf-8 -*- +-# +-# SPDX-License-Identifier: Zlib +- +-import os.path +-import glob +-import time +- +-dirname = os.path.dirname(__file__) +-files = glob.glob(os.path.join(dirname, '*.rst')) +- +-maxdate = 0 +-for path in files: +- s = os.stat(path) +- maxdate = max(maxdate, s.st_mtime) +- +-# -- General configuration ------------------------------------------------ +- +-source_suffix = '.rst' +-master_doc = 'zathura.1' +-templates_path = ['_templates'] +-today = time.strftime('%Y-%m-%d', time.gmtime(maxdate)) +- +-# -- Project configuration ------------------------------------------------ +- +-project = 'zathura' +-copyright = '2009-2018, pwmt.org' +-version = '0.2.7' +-release = '0.2.7' +- +-# -- Options for manual page output --------------------------------------- +- +-man_pages = [ +- ('zathura.1', 'zathura', 'a document viewer', ['pwmt.org'], 1), +- ('zathurarc.5', 'zathurarc', 'zathura configuration file', ['pwmt.org'], 5) +-] +diff --git a/doc/man/zathura.1.rst b/doc/man/zathura.1.rst +index 089dbf7..19cc44c 100644 +--- a/doc/man/zathura.1.rst ++++ b/doc/man/zathura.1.rst +@@ -1,5 +1,14 @@ +-Manpage + ======= ++zathura ++======= ++ ++----------------- ++a document viewer ++----------------- ++ ++:Author: pwmt.org ++:Copyright: 2009-2018, pwmt.org ++:Manual section: 1 + + Synopsis + -------- +diff --git a/doc/man/zathurarc.5.rst b/doc/man/zathurarc.5.rst +index bf519ae..1ec6462 100644 +--- a/doc/man/zathurarc.5.rst ++++ b/doc/man/zathurarc.5.rst +@@ -2,6 +2,14 @@ + zathurarc + ********* + ++-------------------------- ++zathura configuration file ++-------------------------- ++ ++:Author: pwmt.org ++:Copyright: 2009-2018, pwmt.org ++:Manual section: 5 ++ + SYNOPSIS + ======== + +diff --git a/doc/meson.build b/doc/meson.build +index b67c8ab..a02116b 100644 +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -1,24 +1,10 @@ +-sphinx = find_program('sphinx-build', required: get_option('manpages')) +-if sphinx.found() +- custom_target('man pages', +- command: [ +- sphinx, +- '-b', 'man', +- '-D', 'version=' + version, +- '-D', 'release=' + version, +- join_paths(meson.current_source_dir(), 'man'), +- meson.current_build_dir()], +- output: ['zathura.1', 'zathurarc.5'], +- input: [ +- 'man/conf.py', +- 'man/zathurarc.5.rst', +- 'man/zathura.1.rst' +- ], +- build_by_default: true, +- install: true, +- install_dir: [ +- join_paths(get_option('mandir'), 'man1'), +- join_paths(get_option('mandir'), 'man5') +- ] +- ) ++rst2man = find_program('rst2man', 'rst2man.py', required: get_option('manpages')) ++ ++if rst2man.found() ++ custom_target('zathura.1', input: [ 'man/zathura.1.rst' ], output: [ 'zathura.1' ], ++ command: [rst2man, '@INPUT@', '@OUTPUT@'], install: true, ++ install_dir: join_paths(get_option('mandir'), 'man1')) ++ custom_target('zathurarc.5', input: [ 'man/zathurarc.5.rst' ], output: [ 'zathurarc.5' ], ++ command: [rst2man, '@INPUT@', '@OUTPUT@'], install: true, ++ install_dir: join_paths(get_option('mandir'), 'man5')) + endif diff --git a/app-text/zathura/metadata.xml b/app-text/zathura/metadata.xml new file mode 100644 index 0000000..f7b9cf8 --- /dev/null +++ b/app-text/zathura/metadata.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>slashbeast@gentoo.org</email> + <name>Piotr Karbowski</name> + </maintainer> + <use> + <flag name="synctex">Use libsynctex to get latex codeline from pdf</flag> + </use> + <upstream> + <maintainer status="active"> + <email>mlq@pwmt.org</email> + <name>Moritz Lipp</name> + </maintainer> + <maintainer status="active"> + <email>sebastian+dev@ramacher.at</email> + <name>Sebastian Ramacher</name> + </maintainer> + <changelog>http://pwmt.org/projects/zathura/download/</changelog> + <doc lang="en">http://pwmt.org/projects/zathura/</doc> + <bugs-to>http://bugs.pwmt.org/</bugs-to> + </upstream> +</pkgmetadata> diff --git a/app-text/zathura/zathura-0.4.8.ebuild b/app-text/zathura/zathura-0.4.8.ebuild new file mode 100644 index 0000000..c1bd16f --- /dev/null +++ b/app-text/zathura/zathura-0.4.8.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson virtualx xdg + +DESCRIPTION="A highly customizable and functional document viewer" +HOMEPAGE="https://pwmt.org/projects/zathura/" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git" + EGIT_BRANCH="develop" +else + SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="ZLIB" +SLOT="0" +IUSE="doc +magic seccomp sqlite synctex test" + +RESTRICT="!test? ( test )" + +DEPEND=">=dev-libs/girara-0.3.3 + >=dev-libs/glib-2.50:2 + >=sys-devel/gettext-0.19.8 + x11-libs/cairo + >=x11-libs/gtk+-3.22:3 + magic? ( sys-apps/file ) + seccomp? ( sys-libs/libseccomp ) + sqlite? ( >=dev-db/sqlite-3.5.9:3 ) + synctex? ( app-text/texlive-core )" + +RDEPEND="${DEPEND}" + +BDEPEND="doc? ( dev-python/docutils ) + test? ( dev-libs/appstream-glib + dev-libs/check ) + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/zathura-docutils.patch" +) + +src_configure() { + local emesonargs=( + -Dconvert-icon=disabled + -Dmagic=$(usex magic enabled disabled) + -Dmanpages=$(usex doc enabled disabled) + -Dseccomp=$(usex seccomp enabled disabled) + -Dsqlite=$(usex sqlite enabled disabled) + -Dsynctex=$(usex synctex enabled disabled) + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild new file mode 100644 index 0000000..00aa622 --- /dev/null +++ b/app-text/zathura/zathura-9999.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson virtualx + +DESCRIPTION="A highly customizable and functional document viewer" +HOMEPAGE="https://pwmt.org/projects/zathura/" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git" + EGIT_BRANCH="develop" +else + SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~riscv ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="ZLIB" +SLOT="0" +IUSE="doc +magic seccomp sqlite synctex test" + +RESTRICT="!test? ( test )" + +DEPEND=">=dev-libs/girara-0.3.3 + >=dev-libs/glib-2.50:2 + >=sys-devel/gettext-0.19.8 + x11-libs/cairo + >=x11-libs/gtk+-3.22:3 + magic? ( sys-apps/file ) + seccomp? ( sys-libs/libseccomp ) + sqlite? ( >=dev-db/sqlite-3.5.9:3 ) + synctex? ( app-text/texlive-core )" + +RDEPEND="${DEPEND}" + +BDEPEND="doc? ( dev-python/docutils ) + test? ( dev-libs/appstream-glib + dev-libs/check ) + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/zathura-docutils.patch" +) + +src_configure() { + local emesonargs=( + -Dconvert-icon=disabled + -Dmagic=$(usex magic enabled disabled) + -Dmanpages=$(usex doc enabled disabled) + -Dseccomp=$(usex seccomp enabled disabled) + -Dsqlite=$(usex sqlite enabled disabled) + -Dsynctex=$(usex synctex enabled disabled) + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} diff --git a/dev-cpp/highway/Manifest b/dev-cpp/highway/Manifest new file mode 100644 index 0000000..1512a64 --- /dev/null +++ b/dev-cpp/highway/Manifest @@ -0,0 +1 @@ +DIST highway-0.14.2.tar.gz 1545892 BLAKE2B c19d040ea7bf6d5ee0ff87213f36bfe77759cc4cec514b972379490dbac5e8d55f99490b998f73133ca0ba3b34a98f2684b85206ae32d655aa574aeaabeaeb27 SHA512 fc1a35463c95c45b646c53f91a9996112726de1d588dcd4d25a7d366840f704ad9a4c0bb6e0a001e929409f04aad6922cbffcf93774a0c360aff875956c7cc8d diff --git a/dev-libs/highway/highway-0.12.2.ebuild b/dev-cpp/highway/highway-0.14.2.ebuild index 7f21cc2..60d4459 100644 --- a/dev-libs/highway/highway-0.12.2.ebuild +++ b/dev-cpp/highway/highway-0.14.2.ebuild @@ -1,9 +1,9 @@ # Copyright 2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake +inherit cmake-multilib DESCRIPTION="Performance-portable, length-agnostic SIMD with runtime dispatch" HOMEPAGE="https://github.com/google/highway" @@ -14,11 +14,11 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="test" -DEPEND="test? ( dev-cpp/gtest )" +DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )" RDEPEND="" BDEPEND="" -src_configure() { +multilib_src_configure() { local mycmakeargs=( -DBUILD_TESTING=$(usex test ON OFF) -DHWY_SYSTEM_GTEST=ON diff --git a/dev-cpp/highway/metadata.xml b/dev-cpp/highway/metadata.xml new file mode 100644 index 0000000..004555a --- /dev/null +++ b/dev-cpp/highway/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>alex_y_xu@yahoo.ca</email> + <name>Alex Xu (Hello71)</name> + </maintainer> +</pkgmetadata> diff --git a/dev-java/freemarker-bin/Manifest b/dev-java/freemarker-bin/Manifest deleted file mode 100644 index d95f30d..0000000 --- a/dev-java/freemarker-bin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST apache-freemarker-2.3.31-bin.tar.gz 3193874 BLAKE2B 5f11d07c6c37d84820d00c56cea420c4b0570259e5e35e6f87f7eb6c0204735c58f72d181a9bc22f0a7234ef09292cba34b00b88a60546c79ad590ab8cd49359 SHA512 c3d9aefa0c0d2703835d7fbed7c6d3074b4be97b4e7c3ec7995f69e7dbb34e24e559ecf8261aa048a7230c1916db593de685a7af3b03e08ec75b1996d1f811fb diff --git a/dev-java/freemarker-bin/freemarker-bin-2.3.31.ebuild b/dev-java/freemarker-bin/freemarker-bin-2.3.31.ebuild deleted file mode 100644 index 04be86b..0000000 --- a/dev-java/freemarker-bin/freemarker-bin-2.3.31.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit java-pkg-2 - -DESCRIPTION="A Java tool to generate text output based on templates (binary package)" -HOMEPAGE="https://freemarker.apache.org/" -SRC_URI="https://downloads.apache.org/freemarker/engine/${PV}/binaries/apache-freemarker-${PV}-bin.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - !dev-java/freemarker - >=virtual/jre-1.7 -" - -S="${WORKDIR}/apache-freemarker-${PV}-bin" - -src_install() { - java-pkg_dojar freemarker.jar -} diff --git a/dev-java/openj9-openjdk-bin/Manifest b/dev-java/openj9-openjdk-bin/Manifest index 5c0a132..d5346b0 100644 --- a/dev-java/openj9-openjdk-bin/Manifest +++ b/dev-java/openj9-openjdk-bin/Manifest @@ -1,16 +1,18 @@ -DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.12_7_openj9-0.27.0.tar.gz 257296341 SHA256 c80416fd8e9f100746ca06166dd50a724d3b4b077162350f2b88ff6b746aefb8 +DIST ibm-semeru-open-debugimage_aarch64_linux_11.0.13_8_openj9-0.29.0.tar.gz 258280215 SHA256 0138156b0388f7f06bbe67a6ed982ea7d14a372c5e5d14c6e7d53dc17c58f932 DIST ibm-semeru-open-debugimage_aarch64_linux_16.0.2_7_openj9-0.27.0.tar.gz 260567193 SHA256 bd8c8f9a07444c5b4c5e88de3bf952d27ef93e1f95485a027d84b4158141593f -DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.12_7_openj9-0.27.0.tar.gz 310406729 SHA256 b3f2a7de056bd6a817a28baaca93b7337163941fe88a49ea2460ce677f4144d5 +DIST ibm-semeru-open-debugimage_ppc64le_linux_11.0.13_8_openj9-0.29.0.tar.gz 312477496 SHA256 f898c2a081a4e3cc56146ab731edf1ede9e72644ad9a5d8a4c5125766260403f DIST ibm-semeru-open-debugimage_ppc64le_linux_16.0.2_7_openj9-0.27.0.tar.gz 313671311 SHA256 92535ef6c071e6e00dba4988fb4ec2533cb1c27232d1b308cc872043ed4ffc98 -DIST ibm-semeru-open-debugimage_s390x_linux_11.0.12_7_openj9-0.27.0.tar.gz 275761551 SHA256 eb7b44331d65771f4ef72978b8088166007a340330c8eda0de0a6a29d566842c +DIST ibm-semeru-open-debugimage_ppc64le_linux_16.0.2_7_openj9-0.27.1.tar.gz 313670254 SHA256 4240e341755efea9e8c7ffb963132b199598de07926cd238e161d31dbd58acda +DIST ibm-semeru-open-debugimage_s390x_linux_11.0.13_8_openj9-0.29.0.tar.gz 276384710 SHA256 7632165750d00ed0ce5c14fcd5e261daf4e7873d53969183189779575e10d8c6 DIST ibm-semeru-open-debugimage_s390x_linux_16.0.2_7_openj9-0.27.0.tar.gz 279233218 SHA256 b771cd97b91cf9233b5ae3fa4970debac036c434ebce03c833bc73113f03986c -DIST ibm-semeru-open-debugimage_x64_linux_11.0.12_7_openj9-0.27.0.tar.gz 320291464 SHA256 a3bf2cf972394b0dfd4f984dfe2d71fea3552ba448c0c050057091c587bf4be3 +DIST ibm-semeru-open-debugimage_x64_linux_11.0.13_8_openj9-0.29.0.tar.gz 322796284 SHA256 b049b1dfe36079caa937262d5b1c83a7e0e5d88704315e819aac1d1480e0da60 DIST ibm-semeru-open-debugimage_x64_linux_16.0.2_7_openj9-0.27.0.tar.gz 323689143 SHA256 24a871c4ea86fec1bca82df385ef28d2315703d62c841344839b52a1ac21d6ad -DIST ibm-semeru-open-jdk_aarch64_linux_11.0.12_7_openj9-0.27.0.tar.gz 197763167 SHA256 f025af94a65872653baeb6f889ec6d592ce9d92391fa04e82fb68a50b96178a7 +DIST ibm-semeru-open-jdk_aarch64_linux_11.0.13_8_openj9-0.29.0.tar.gz 197781632 SHA256 151dca23e1fdb43eaa60631c96895be9aa7bb751e7fdf88ddffa1c32157fb417 DIST ibm-semeru-open-jdk_aarch64_linux_16.0.2_7_openj9-0.27.0.tar.gz 200907027 SHA256 022cda1210331488c3db3d0d1282ea74467397fdabc34cb482cdfe81c45f6a15 -DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.12_7_openj9-0.27.0.tar.gz 203013889 SHA256 7d49a5b29a84831526f7bffaaee399ac9a26d05712ac4b9cb7ca0a370ed3f020 +DIST ibm-semeru-open-jdk_ppc64le_linux_11.0.13_8_openj9-0.29.0.tar.gz 203079177 SHA256 7b304c52974f51611b45a2ab7949503e33a204b8a4ae705eb3c74789350174d3 DIST ibm-semeru-open-jdk_ppc64le_linux_16.0.2_7_openj9-0.27.0.tar.gz 206337625 SHA256 d5901996f2c0889b2b92de97fed0b36d5068da308be0fbd6c8293a6b6b91634d -DIST ibm-semeru-open-jdk_s390x_linux_11.0.12_7_openj9-0.27.0.tar.gz 200393575 SHA256 991f8df53079378782b9de3bbfd4c52a19920ea9ba90e9a54c871ce47b599cdb +DIST ibm-semeru-open-jdk_ppc64le_linux_16.0.2_7_openj9-0.27.1.tar.gz 206335729 SHA256 edc972a824a8c9993b1403eb33a2148f59d1fd8d6faa5e89582be9d518999441 +DIST ibm-semeru-open-jdk_s390x_linux_11.0.13_8_openj9-0.29.0.tar.gz 199870826 SHA256 6c3ebb4af0f4066e721e1f0078438458775f4b93bfd2d0be1066c54ccf015654 DIST ibm-semeru-open-jdk_s390x_linux_16.0.2_7_openj9-0.27.0.tar.gz 203152325 SHA256 3a2741a2e14b9934405a6c0b6af9e865687a70814af355e62dd84025707ccfdc -DIST ibm-semeru-open-jdk_x64_linux_11.0.12_7_openj9-0.27.0.tar.gz 202156239 SHA256 4c2d776f69e3ff7d01cd57c0938b7a7f058264425faf18e3708b905e93f915c4 +DIST ibm-semeru-open-jdk_x64_linux_11.0.13_8_openj9-0.29.0.tar.gz 202193589 SHA256 3975e2732cf632ca8f41c237ba7e033fd96bda262b79861f83b4e2ac62c90c3d DIST ibm-semeru-open-jdk_x64_linux_16.0.2_7_openj9-0.27.0.tar.gz 205317058 SHA256 1349eb9a1d9af491a1984d66a80126730357c4a5c4fcbe7112a2c832f6c0886e diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.12.7.0.27.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.13.8.0.29.0.ebuild index 2473ff0..f9a41b7 100644 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.12.7.0.27.0.ebuild +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-11.0.13.8.0.29.0.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit java-vm-2 toolchain-funcs versionator +inherit eapi7-ver java-vm-2 toolchain-funcs abi_uri() { echo "${2-$1}? ( @@ -14,9 +14,9 @@ abi_uri() { )" } -JDK_PV=$(get_version_component_range 1-3)+$(get_version_component_range 4) -DL_PV=${JDK_PV}_openj9-$(get_version_component_range 5-7) -SLOT=$(get_major_version) +JDK_PV=$(ver_cut 1-3)+$(ver_cut 4) +DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7) +SLOT=$(ver_cut 1) SRC_URI=" $(abi_uri aarch64 arm64) diff --git a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.0.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.0.ebuild index 2473ff0..f9a41b7 100644 --- a/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.0.ebuild +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.0.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit java-vm-2 toolchain-funcs versionator +inherit eapi7-ver java-vm-2 toolchain-funcs abi_uri() { echo "${2-$1}? ( @@ -14,9 +14,9 @@ abi_uri() { )" } -JDK_PV=$(get_version_component_range 1-3)+$(get_version_component_range 4) -DL_PV=${JDK_PV}_openj9-$(get_version_component_range 5-7) -SLOT=$(get_major_version) +JDK_PV=$(ver_cut 1-3)+$(ver_cut 4) +DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7) +SLOT=$(ver_cut 1) SRC_URI=" $(abi_uri aarch64 arm64) diff --git a/dev-java/openjdk-bin/openjdk-bin-16.0.2_p7.ebuild b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.1.ebuild index 82df0fe..f146d1f 100644 --- a/dev-java/openjdk-bin/openjdk-bin-16.0.2_p7.ebuild +++ b/dev-java/openj9-openjdk-bin/openj9-openjdk-bin-16.0.2.7.0.27.1.ebuild @@ -3,29 +3,30 @@ EAPI=6 -inherit java-vm-2 toolchain-funcs +inherit eapi7-ver java-vm-2 toolchain-funcs abi_uri() { echo "${2-$1}? ( - https://github.com/adoptium/temurin${SLOT}-binaries/releases/download/jdk-${MY_PV/+/%2B}/OpenJDK${SLOT}U-jdk_${1}_linux_hotspot_${MY_PV/+/_}.tar.gz - )" + debug? ( + https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-debugimage_${1}_linux_${DL_PV/+/_}.tar.gz + ) + https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-jdk_${1}_linux_${DL_PV/+/_}.tar.gz + )" } -MY_PV=${PV/_p/+} -SLOT=${MY_PV%%[.+]*} +JDK_PV=$(ver_cut 1-3)+$(ver_cut 4) +DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7) +SLOT=$(ver_cut 1) SRC_URI=" - $(abi_uri aarch64 arm64) $(abi_uri ppc64le ppc64) - $(abi_uri s390x s390) - $(abi_uri x64 amd64) " -DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin" -HOMEPAGE="https://adoptopenjdk.net" +DESCRIPTION="Prebuilt IBM Semeru JDK binaries provided by IBM" +HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~s390" -IUSE="alsa cups +gentoo-vm headless-awt selinux source" +KEYWORDS="-* ~ppc64" +IUSE="alsa cups debug +gentoo-vm headless-awt selinux source" RDEPEND=" media-libs/fontconfig:1.0 @@ -47,7 +48,7 @@ RDEPEND=" RESTRICT="preserve-libs splitdebug" QA_PREBUILT="*" -S="${WORKDIR}/jdk-${MY_PV}" +S="${WORKDIR}/jdk-${JDK_PV}" pkg_pretend() { if [[ "$(tc-is-softfloat)" != "no" ]]; then @@ -55,6 +56,13 @@ pkg_pretend() { fi } +do_rm() { + rm -v $1 || die + if use debug ; then + rm -v "${S}-debug-image"/$1 || die + fi +} + src_install() { local dest="/opt/${P}" local ddest="${ED%/}/${dest#/}" @@ -62,11 +70,11 @@ src_install() { # Oracle and IcedTea have libjsoundalsa.so depending on # libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird. if ! use alsa ; then - rm -v lib/libjsound.* || die + do_rm 'lib/libjsound.*' fi if use headless-awt ; then - rm -v lib/lib*{[jx]awt,splashscreen}* || die + do_rm 'lib/lib*{[jx]awt,splashscreen}*' fi if ! use source ; then diff --git a/dev-java/openj9-openjdk-jre-bin/Manifest b/dev-java/openj9-openjdk-jre-bin/Manifest index f037b57..e3eea2f 100644 --- a/dev-java/openj9-openjdk-jre-bin/Manifest +++ b/dev-java/openj9-openjdk-jre-bin/Manifest @@ -1,8 +1,9 @@ -DIST ibm-semeru-open-jre_aarch64_linux_11.0.12_7_openj9-0.27.0.tar.gz 41737266 SHA256 06fa66b99d3c9ba07f117860ef653d52bcb19dac1ea598c15f3b4eec9f832b36 +DIST ibm-semeru-open-jre_aarch64_linux_11.0.13_8_openj9-0.29.0.tar.gz 42122642 SHA256 b56f464c2f46aa779897f076edb4c3c37d0280784bcc3b7a46228a32a9e62470 DIST ibm-semeru-open-jre_aarch64_linux_16.0.2_7_openj9-0.27.0.tar.gz 41451784 SHA256 575dc3827077fc661fd1103effaa13ccd0f1606d01a33643956ed2eb1ece9763 -DIST ibm-semeru-open-jre_ppc64le_linux_11.0.12_7_openj9-0.27.0.tar.gz 44324701 SHA256 285bd388a497db61408d26a9f3328f62004714ede94456718cf6440a109e25d2 +DIST ibm-semeru-open-jre_ppc64le_linux_11.0.13_8_openj9-0.29.0.tar.gz 44652787 SHA256 3615940d4b26e8d11ff927dbf620a5247caecd84ba24c9d67f0e8b30ff463998 DIST ibm-semeru-open-jre_ppc64le_linux_16.0.2_7_openj9-0.27.0.tar.gz 44063048 SHA256 51dac9a69b594c72adabb2c36634a121be04a17c4ce34628cf9b37fd5010c1a8 -DIST ibm-semeru-open-jre_s390x_linux_11.0.12_7_openj9-0.27.0.tar.gz 43083467 SHA256 6e5829aeb37abfb122e0944e438ecb2043c56df14fcdcce39bd4e3c9a55571a8 +DIST ibm-semeru-open-jre_ppc64le_linux_16.0.2_7_openj9-0.27.1.tar.gz 44062139 SHA256 4251f3ec4f12a34131f40487b1216238fe3de12179da8e9475bf5fdf7933ccd5 +DIST ibm-semeru-open-jre_s390x_linux_11.0.13_8_openj9-0.29.0.tar.gz 43141369 SHA256 e942c0806163bbabe0b7ec8e630319489da400d58cd390011fc28428f468558e DIST ibm-semeru-open-jre_s390x_linux_16.0.2_7_openj9-0.27.0.tar.gz 42822005 SHA256 dba28e3e06bb7c76b4da2f46c48ed74dc72e168f9ee01439decadea181eb402c -DIST ibm-semeru-open-jre_x64_linux_11.0.12_7_openj9-0.27.0.tar.gz 43580993 SHA256 f352998f6fdf0b84f63c563608be57f30aa3f14c8117c1219422dbc712ad4f81 +DIST ibm-semeru-open-jre_x64_linux_11.0.13_8_openj9-0.29.0.tar.gz 43966499 SHA256 78eb54af15fac39eb2d254f51f0302aa213d3ad838f17766a9d081ca783edff4 DIST ibm-semeru-open-jre_x64_linux_16.0.2_7_openj9-0.27.0.tar.gz 43282252 SHA256 b077cd0b35d3ed1927c22e5b498264ecff67297992809056187b42662edfc536 diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.12.7.0.27.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.13.8.0.29.0.ebuild index 206c839..110e015 100644 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.12.7.0.27.0.ebuild +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-11.0.13.8.0.29.0.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit java-vm-2 toolchain-funcs versionator +inherit eapi7-ver java-vm-2 toolchain-funcs abi_uri() { echo "${2-$1}? ( @@ -11,9 +11,9 @@ abi_uri() { )" } -JDK_PV=$(get_version_component_range 1-3)+$(get_version_component_range 4) -DL_PV=${JDK_PV}_openj9-$(get_version_component_range 5-7) -SLOT=$(get_major_version) +JDK_PV=$(ver_cut 1-3)+$(ver_cut 4) +DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7) +SLOT=$(ver_cut 1) SRC_URI=" $(abi_uri aarch64 arm64) @@ -23,7 +23,7 @@ SRC_URI=" " DESCRIPTION="Prebuilt IBM Semeru JRE binaries provided by IBM" -HOMEPAGE="https://adoptopenjdk.net" +HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64 ~arm64 ~ppc64 ~s390" IUSE="alsa cups +gentoo-vm headless-awt selinux" diff --git a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-16.0.2.7.0.27.0.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-16.0.2.7.0.27.0.ebuild index 206c839..110e015 100644 --- a/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-16.0.2.7.0.27.0.ebuild +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-16.0.2.7.0.27.0.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit java-vm-2 toolchain-funcs versionator +inherit eapi7-ver java-vm-2 toolchain-funcs abi_uri() { echo "${2-$1}? ( @@ -11,9 +11,9 @@ abi_uri() { )" } -JDK_PV=$(get_version_component_range 1-3)+$(get_version_component_range 4) -DL_PV=${JDK_PV}_openj9-$(get_version_component_range 5-7) -SLOT=$(get_major_version) +JDK_PV=$(ver_cut 1-3)+$(ver_cut 4) +DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7) +SLOT=$(ver_cut 1) SRC_URI=" $(abi_uri aarch64 arm64) @@ -23,7 +23,7 @@ SRC_URI=" " DESCRIPTION="Prebuilt IBM Semeru JRE binaries provided by IBM" -HOMEPAGE="https://adoptopenjdk.net" +HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64 ~arm64 ~ppc64 ~s390" IUSE="alsa cups +gentoo-vm headless-awt selinux" diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-16.0.1_p9.ebuild b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-16.0.2.7.0.27.1.ebuild index 8e41243..b27afba 100644 --- a/dev-java/openjdk-jre-bin/openjdk-jre-bin-16.0.1_p9.ebuild +++ b/dev-java/openj9-openjdk-jre-bin/openj9-openjdk-jre-bin-16.0.2.7.0.27.1.ebuild @@ -3,28 +3,26 @@ EAPI=6 -inherit java-vm-2 +inherit eapi7-ver java-vm-2 toolchain-funcs abi_uri() { echo "${2-$1}? ( - https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk-${MY_PV/+/%2B}/OpenJDK${SLOT}U-jre_${1}_linux_hotspot_${MY_PV/+/_}.tar.gz - )" + https://github.com/ibmruntimes/semeru${SLOT}-binaries/releases/download/jdk-${DL_PV/+/%2B}/ibm-semeru-open-jre_${1}_linux_${DL_PV/+/_}.tar.gz + )" } -MY_PV=${PV/_p/+} -SLOT=${MY_PV%%[.+]*} +JDK_PV=$(ver_cut 1-3)+$(ver_cut 4) +DL_PV=${JDK_PV}_openj9-$(ver_cut 5-7) +SLOT=$(ver_cut 1) SRC_URI=" - $(abi_uri arm) - $(abi_uri aarch64 arm64) $(abi_uri ppc64le ppc64) - $(abi_uri x64 amd64) " -DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK" -HOMEPAGE="https://adoptopenjdk.net" +DESCRIPTION="Prebuilt IBM Semeru JRE binaries provided by IBM" +HOMEPAGE="https://developer.ibm.com/languages/java/semeru-runtimes/" LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +KEYWORDS="~ppc64" IUSE="alsa cups +gentoo-vm headless-awt selinux" RDEPEND=" @@ -48,7 +46,7 @@ RDEPEND=" RESTRICT="preserve-libs splitdebug" QA_PREBUILT="*" -S="${WORKDIR}/jdk-${MY_PV}-jre" +S="${WORKDIR}/jdk-${JDK_PV}-jre" src_install() { local dest="/opt/${P}" diff --git a/dev-java/openj9-openjdk/Manifest b/dev-java/openj9-openjdk/Manifest index 89d0bef..3155083 100644 --- a/dev-java/openj9-openjdk/Manifest +++ b/dev-java/openj9-openjdk/Manifest @@ -1,4 +1,4 @@ -DIST openj9-0.27.1.tar.gz 16668711 BLAKE2B 091047b3770d86b652042b49f419c4d4597bb13630b853223a909fa0a135b0252d280e9ba2f1735c9f1c02dceb33a997e7906464d83669cd20d7993766ac46fc SHA512 1ba28787cf92eafb0e789ecac33b0f772bea6d4856f6120befe9c1928a8dcac04569808b053209fafa09a097c32fd3eed2c6c7137250a4e8b6cb96d37e4eec4e -DIST openj9-omr-0.27.1.tar.gz 7815053 BLAKE2B 97d4481dbcd8643e95e2ff50b873f1018c297dff0140207c3352ba5c5395092d21a1b2abcb5796f4d96daf4635f3a86cf76fab8376457fca7f8d1f4692ff9b03 SHA512 980d13ad900aec0d644058f3738f53b29467f4fbda03a2094ccceaa34955e79165002dc2d441af0fe878b523f62b15d315375dea2d5fa57942b5d1509e7afbbd -DIST openj9-openjdk-jdk11-openj9-0.27.1.tar.gz 108889106 BLAKE2B 32260d462fd1daab077cd72f5bd16ae793309d1efa930dcc5cbb2c56b1fc33194f93a4aaef904b23c9a6d16b0206042fbd3a1bc812005e2d115a3f5564849b6f SHA512 a33d0382c4a13cc608341715214c52ef3a81d8476291c078f6a808ebd0674b5f6153645fbd61ec818298e8e82d962b92107b73be67d3ab2610bbbae06804c28b -DIST openj9-openjdk-jdk16-openj9-0.27.1.tar.gz 90946973 BLAKE2B 6e06d96e74b8201fbec23eca14329b13f2a828a0abc6b29658a0b84af927f04142d2f9fd7810e93a00ab6d99e8bc71d38c21fc4bc26eb334166d596567b0f51b SHA512 c170ded18e3f1a41b3cc83d8d16202b4debdcd3d2fa4fbca7ce2c78be1d3d3fa8bc0d466b0a280b7c63a1161e3f50ece3b468096876a61e0cdb999d402895e06 +DIST openj9-0.29.0.tar.gz 16776743 BLAKE2B 524fc53506be1521c07ce6a65ec17419e7d228baa7543342b4011a223c6f2d1e50d80e2d4eee51cc8cfe89bf387ae17a9eb7d28ce61a5d8ff8bc790307061882 SHA512 accfb336b52c94f6988ef47c79c8be3fe841e37611596e61edaad57c801856c53ea248daab41f05a5487873d002f75b3a684588cb81b0fb0270f2638d6d06ed7 +DIST openj9-omr-0.29.0.tar.gz 7852434 BLAKE2B 6f77abbf2597ee4f71aec7eb44e5a9f54c76fde7e3d432415d34c94c84dc00d49c3cd716c6cda4e0fea807b8ba87345b2c94a0014019154a0c60dde4a00db7b1 SHA512 de58cc6b3c2f3d657b8f588151b96acfffc63af274ef6d9c06e5e832c45c246476475c2d40b657c852d2d6f1915ea52095dae89defdaa644cd14f35500e0939f +DIST openj9-openjdk-jdk11-openj9-0.29.0.tar.gz 108964710 BLAKE2B 40526d85b988cbcd04ea254c120fd6cffecd2a1d3ce16e8dde54a3bffad81aea9d78b56804671a79684dfb327f6a8176d15b08e06f1e0b9f64f360c113a2b1b2 SHA512 a033b50bbe49c80c97ecf5f49757913815fcb15c1b8b6574f4039899b254febcbc8deaa49b2e5fd255d5dbcb9fccef9d7778971efa41ea3b0a09a40a0b65c87e +DIST openj9-openjdk-jdk17-openj9-0.29.0.tar.gz 93738465 BLAKE2B b1463c79f6d60f637f14ac3ba34c0c0eb3bf34a0963417bf203221f3dce71c6009bd3970e6d30d9b9156b2bbd9a5dbad837c5925f2bdf4f1e73b548c823dc7a4 SHA512 5f504301f9318afeaa48b3bf65637950604331209e8c2d8e5967eb9861df66eef62afaf9ed6018458fec8a6f4b01bd0f63623664282c06d1b40d560a5a43636e diff --git a/dev-java/openj9-openjdk/metadata.xml b/dev-java/openj9-openjdk/metadata.xml index 50669cc..1616443 100644 --- a/dev-java/openj9-openjdk/metadata.xml +++ b/dev-java/openj9-openjdk/metadata.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <longdescription> - Java™ is the world's leading programming language and platform. - The code for Java is open source and available at OpenJDK™. - </longdescription> - <slots> - <slot name="11">Java™ version 11</slot> - </slots> + <maintainer type="person"> + <email>alex_y_xu@yahoo.ca</email> + <name>Alex Xu (Hello71)</name> + </maintainer> <use> <flag name="ddr">Enable Direct Dump Reader</flag> + <flag name="custom-optimization">Override OpenJDK and OpenJ9 per-module optimization flags</flag> <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag> <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag> <flag name="javafx">Import OpenJFX modules at build time, via <pkg>dev-java/openjfx</pkg></flag> diff --git a/dev-java/openj9-openjdk/openj9-openjdk-11.0.27.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-11.0.29.0.ebuild index c9285f0..ab236c7 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-11.0.27.1.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-11.0.29.0.ebuild @@ -3,15 +3,14 @@ EAPI=6 -inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs versionator +inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs -SLOT="$(get_major_version)" -OPENJ9_PV="$(get_version_component_range 2-4)" +SLOT="$(ver_cut 1)" +OPENJ9_PV="$(ver_cut 2-4)" OPENJ9_P=openj9-${OPENJ9_PV} -FREEMARKER_PV=2.3.30 -DESCRIPTION="Open source implementation of the Java programming language" -HOMEPAGE="https://openjdk.java.net" +DESCRIPTION="Extensions for OpenJDK for Eclipse OpenJ9" +HOMEPAGE="https://www.eclipse.org/openj9/" if [[ ${OPENJ9_PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}.git" @@ -20,7 +19,7 @@ if [[ ${OPENJ9_PV} == 9999 ]]; then else SRC_URI=" https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}/archive/v${OPENJ9_PV}-release.tar.gz -> openj9-openjdk-jdk${SLOT}-${OPENJ9_P}.tar.gz - https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz + https://github.com/eclipse/openj9/archive/${OPENJ9_P}.tar.gz -> ${OPENJ9_P}.tar.gz https://github.com/eclipse/openj9-omr/archive/${OPENJ9_P}.tar.gz -> openj9-omr-${OPENJ9_PV}.tar.gz " fi @@ -28,7 +27,7 @@ fi LICENSE="GPL-2" KEYWORDS="~amd64" -IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap" +IUSE="alsa cups custom-optimization ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap" COMMON_DEPEND=" media-libs/freetype:2= @@ -80,7 +79,6 @@ DEPEND=" x11-libs/libXtst javafx? ( dev-java/openjfx:${SLOT}= ) || ( - virtual/jdk:${SLOT} dev-java/openj9-openjdk-bin:${SLOT} dev-java/openj9-openjdk:${SLOT} dev-java/openjdk-bin:${SLOT} @@ -90,11 +88,7 @@ DEPEND=" REQUIRED_USE="javafx? ( alsa !headless-awt )" -if [[ ${OPENJ9_PV} == 9999 ]]; then - S="${WORKDIR}/openj9-openjdk-jdk${SLOT}" -else - S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_P}" -fi +S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_PV}-release" # The space required to build varies wildly depending on USE flags, # ranging from 3GB to 16GB. This function is certainly not exact but @@ -113,7 +107,6 @@ pkg_pretend() { openjdk_check_requirements if [[ ${MERGE_TYPE} != binary ]]; then has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" - [[ $(gcc-major-version) == 11 ]] && die "gcc 11 hangs when optimizing exploded image" fi } @@ -189,12 +182,15 @@ src_prepare() { eapply -d omr -- "${FILESDIR}/omr-fam.patch" if [[ ${OPENJ9_PV} != 9999 ]]; then - sed -i -e '/^OPENJ9_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \ + sed -i -e '/^OPENJDK_SHA :=/s/:=.*/:= __OPENJDK_SHA__/' \ + -e '/^OPENJ9_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \ -e '/^OPENJ9_TAG :=/s/:=.*/:= '${OPENJ9_P}/ \ -e '/^OPENJ9OMR_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \ - closed/OpenJ9.gmk + closed/OpenJ9.gmk || die fi + find openj9/ omr/ -name CMakeLists.txt -exec sed -i -e '/set(OMR_WARNINGS_AS_ERRORS ON/s/ON/OFF/' {} + || die + chmod +x configure || die } @@ -202,12 +198,15 @@ src_configure() { # Work around stack alignment issue, bug #647954. in case we ever have x86 use x86 && append-flags -mincoming-stack-boundary=2 + use custom-optimization || filter-flags '-O*' + # Enabling full docs appears to break doc building. If not # explicitly disabled, the flag will get auto-enabled if pandoc and # graphviz are detected. pandoc has loads of dependencies anyway. local myconf=( --disable-ccache + --disable-warnings-as-errors{,-omr,-openj9} --enable-full-docs=no --with-boot-jdk="${JDK_HOME}" --with-extra-cflags="${CFLAGS}" @@ -233,7 +232,6 @@ src_configure() { --enable-headless-only=$(usex headless-awt yes no) $(tc-is-clang && echo "--with-toolchain-type=clang") - --disable-warnings-as-errors{,-omr,-openj9} --with-cmake $(use_enable ddr) ) @@ -263,14 +261,21 @@ src_configure() { } src_compile() { + local mycmakeargsx=( + "-DCMAKE_C_FLAGS='${CFLAGS}'" + "-DJ9JIT_EXTRA_CFLAGS='${CFLAGS}'" + "-DCMAKE_CXX_FLAGS='${CXXFLAGS}'" + "-DJ9JIT_EXTRA_CXXFLAGS='${CXXFLAGS}'" + "-DCMAKE_EXE_LINKER_FLAGS='${LDFLAGS}'" + -DOMR_WARNINGS_AS_ERRORS=OFF + ) local myemakeargs=( JOBS=$(makeopts_jobs) - # https://github.com/ibmruntimes/openj9-openjdk-jdk14/issues/72 - #LOG=debug + LOG=debug $(usex doc docs '') $(usex jbootstrap bootcycle-images product-images) - EXTRA_CMAKE_ARGS="-DOMR_WARNINGS_AS_ERRORS=OFF" + EXTRA_CMAKE_ARGS="${mycmakeargsx[*]}" ) emake "${myemakeargs[@]}" -j1 #nowarn } diff --git a/dev-java/openj9-openjdk/openj9-openjdk-16.0.27.1.ebuild b/dev-java/openj9-openjdk/openj9-openjdk-17.0.29.0.ebuild index 12447f2..5b50139 100644 --- a/dev-java/openj9-openjdk/openj9-openjdk-16.0.27.1.ebuild +++ b/dev-java/openj9-openjdk/openj9-openjdk-17.0.29.0.ebuild @@ -3,15 +3,14 @@ EAPI=6 -inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs versionator +inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs -SLOT="$(get_major_version)" -OPENJ9_PV="$(get_version_component_range 2-4)" +SLOT="$(ver_cut 1)" +OPENJ9_PV="$(ver_cut 2-4)" OPENJ9_P=openj9-${OPENJ9_PV} -FREEMARKER_PV=2.3.30 -DESCRIPTION="Open source implementation of the Java programming language" -HOMEPAGE="https://openjdk.java.net" +DESCRIPTION="Extensions for OpenJDK for Eclipse OpenJ9" +HOMEPAGE="https://www.eclipse.org/openj9/" if [[ ${OPENJ9_PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/ibmruntimes/openj9-openjdk-jdk${SLOT}.git" @@ -28,7 +27,7 @@ fi LICENSE="GPL-2" KEYWORDS="~amd64" -IUSE="alsa cups ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap" +IUSE="alsa cups custom-optimization ddr debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap" COMMON_DEPEND=" media-libs/freetype:2= @@ -80,18 +79,16 @@ DEPEND=" x11-libs/libXtst javafx? ( dev-java/openjfx:${SLOT}= ) || ( - virtual/jdk:${SLOT} - virtual/jdk:$((SLOT-1)) + dev-java/openj9-openjdk-bin:${SLOT} + dev-java/openj9-openjdk:${SLOT} + dev-java/openjdk-bin:${SLOT} + dev-java/openjdk:${SLOT} ) " REQUIRED_USE="javafx? ( alsa !headless-awt )" -if [[ ${OPENJ9_PV} == 9999 ]]; then - S="${WORKDIR}/openj9-openjdk-jdk${SLOT}" -else - S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_PV}-release" -fi +S="${WORKDIR}/openj9-openjdk-jdk${SLOT}-${OPENJ9_PV}-release" # The space required to build varies wildly depending on USE flags, # ranging from 3GB to 16GB. This function is certainly not exact but @@ -110,14 +107,52 @@ pkg_pretend() { openjdk_check_requirements if [[ ${MERGE_TYPE} != binary ]]; then has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" - [[ $(gcc-major-version) == 11 ]] && die "gcc 11 hangs when optimizing exploded image" fi } pkg_setup() { openjdk_check_requirements java-vm-2_pkg_setup - java-pkg-2_pkg_setup + + JAVA_PKG_WANT_BUILD_VM="openj9-openjdk-${SLOT} openj9-openjdk-bin-${SLOT} openjdk-${SLOT} openjdk-bin-${SLOT}" + JAVA_PKG_WANT_SOURCE="${SLOT}" + JAVA_PKG_WANT_TARGET="${SLOT}" + + # The nastiness below is necessary while the gentoo-vm USE flag is + # masked. First we call java-pkg-2_pkg_setup if it looks like the + # flag was unmasked against one of the possible build VMs. If not, + # we try finding one of them in their expected locations. This would + # have been slightly less messy if openjdk-bin had been installed to + # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env + # file but disable it so that it would not normally be selectable. + + local vm + for vm in ${JAVA_PKG_WANT_BUILD_VM}; do + if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then + java-pkg-2_pkg_setup + return + fi + done + + if [[ ${MERGE_TYPE} != binary ]]; then + if [[ -z ${JDK_HOME} ]]; then + for slot in ${SLOT} $((SLOT-1)); do + for variant in openj9- ''; do + if has_version --host-root dev-java/${variant}openjdk:${slot}; then + JDK_HOME=${EPREFIX}/usr/$(get_libdir)/${variant}openjdk-${slot} + break + elif has_version --host-root dev-java/${variant}openjdk-bin:${slot}; then + JDK_HOME=$(best_version --host-root dev-java/${variant}openjdk-bin:${slot}) + JDK_HOME=${JDK_HOME#*/} + JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} + break + fi + done + done + fi + [[ -n ${JDK_HOME} ]] || die "Build VM not found!" + export JDK_HOME + fi } src_unpack() { @@ -151,9 +186,11 @@ src_prepare() { -e '/^OPENJ9_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \ -e '/^OPENJ9_TAG :=/s/:=.*/:= '${OPENJ9_P}/ \ -e '/^OPENJ9OMR_SHA :=/s/:=.*/:= '${OPENJ9_P}/ \ - closed/OpenJ9.gmk + closed/OpenJ9.gmk || die fi + find openj9/ omr/ -name CMakeLists.txt -exec sed -i -e '/set(OMR_WARNINGS_AS_ERRORS ON/s/ON/OFF/' {} + || die + chmod +x configure || die } @@ -161,12 +198,15 @@ src_configure() { # Work around stack alignment issue, bug #647954. in case we ever have x86 use x86 && append-flags -mincoming-stack-boundary=2 + use custom-optimization || filter-flags '-O*' + # Enabling full docs appears to break doc building. If not # explicitly disabled, the flag will get auto-enabled if pandoc and # graphviz are detected. pandoc has loads of dependencies anyway. local myconf=( --disable-ccache + --disable-warnings-as-errors{,-omr,-openj9} --enable-full-docs=no --with-boot-jdk="${JDK_HOME}" --with-extra-cflags="${CFLAGS}" @@ -192,7 +232,6 @@ src_configure() { --enable-headless-only=$(usex headless-awt yes no) $(tc-is-clang && echo "--with-toolchain-type=clang") - --disable-warnings-as-errors{,-omr,-openj9} --with-cmake $(use_enable ddr) ) @@ -222,14 +261,21 @@ src_configure() { } src_compile() { + local mycmakeargsx=( + "-DCMAKE_C_FLAGS='${CFLAGS}'" + "-DJ9JIT_EXTRA_CFLAGS='${CFLAGS}'" + "-DCMAKE_CXX_FLAGS='${CXXFLAGS}'" + "-DJ9JIT_EXTRA_CXXFLAGS='${CXXFLAGS}'" + "-DCMAKE_EXE_LINKER_FLAGS='${LDFLAGS}'" + -DOMR_WARNINGS_AS_ERRORS=OFF + ) local myemakeargs=( JOBS=$(makeopts_jobs) - # https://github.com/ibmruntimes/openj9-openjdk-jdk14/issues/72 - #LOG=debug + LOG=debug $(usex doc docs '') $(usex jbootstrap bootcycle-images product-images) - EXTRA_CMAKE_ARGS="-DOMR_WARNINGS_AS_ERRORS=OFF" + EXTRA_CMAKE_ARGS="${mycmakeargsx[*]}" ) emake "${myemakeargs[@]}" -j1 #nowarn } @@ -286,7 +332,7 @@ pkg_postinst() { if use gentoo-vm ; then ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-11" + ewarn "many java ebuilds as they are not ready for openjdk-${SLOT}" else ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" ewarn "will not be recognised by the system. For example, simply calling" diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest deleted file mode 100644 index 4f83a41..0000000 --- a/dev-java/openjdk-bin/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -DIST OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz 203066417 SHA256 3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85 -DIST OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz 187587741 SHA256 20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df -DIST OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.1_9.tar.gz 186081896 SHA256 8d8e35ca5a7e24f16384bf32b110562921c19b4cfe65969980937bf879462bc6 -DIST OpenJDK16U-jdk_s390x_linux_hotspot_16.0.1_9.tar.gz 178964996 SHA256 421cd44661cdbf0c2da79ab3104c81a1fa171b974038e55b1b3d4a042865588f -DIST OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz 205449187 SHA256 7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f -DIST OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz 205463525 BLAKE2B 65b8cbf626840e8e3cf5daffda9aed3763ae5c4e2458e71c9854b955cbce8404d498222ec0b30ead9e718d1ee794559f2bcd7b60f630bd0c7e140f671546e873 SHA512 af25ffaeea4034c3d4b14daeacf719e9de87896069885d51c677aaddb3104bc64487fbb4ab33afb420ed88ea60771626f674d998eaed8d4237f1a7cb751c2146 diff --git a/dev-java/openjdk-bin/files/openjdk-bin.env.sh b/dev-java/openjdk-bin/files/openjdk-bin.env.sh deleted file mode 100644 index 9e9c5ec..0000000 --- a/dev-java/openjdk-bin/files/openjdk-bin.env.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -VERSION="AdoptOpenJDK ${PV}" -JAVA_HOME="${EPREFIX}/opt/${P}" -JDK_HOME="${EPREFIX}/opt/${P}" -JAVAC="\${JAVA_HOME}/bin/javac" -PATH="\${JAVA_HOME}/bin" -ROOTPATH="\${JAVA_HOME}/bin" -LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" -MANPATH="" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="${SLOT}" -BOOTCLASSPATH="" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openjdk-bin/metadata.xml b/dev-java/openjdk-bin/metadata.xml deleted file mode 100644 index 4c0b1aa..0000000 --- a/dev-java/openjdk-bin/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <longdescription> - Java™ is the world's leading programming language and platform. - The code for Java is open source and available at OpenJDK™. - AdoptOpenJDK provides prebuilt OpenJDK binaries from a fully open source set of build scripts and infrastructure. - </longdescription> - <use> - <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag> - <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag> - <flag name="source">Install JVM sources</flag> - </use> -</pkgmetadata> diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest deleted file mode 100644 index 8fc1426..0000000 --- a/dev-java/openjdk-jre-bin/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST OpenJDK16U-jre_aarch64_linux_hotspot_16.0.1_9.tar.gz 47622188 SHA256 4e47f1cbf46190727be74cd73445ec2b693f5ba4a74542c554d6b3285811cab5 -DIST OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz 43628046 SHA256 c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7 -DIST OpenJDK16U-jre_ppc64le_linux_hotspot_16.0.1_9.tar.gz 44094924 SHA256 495805e2e9bcabeac0d8271623b6c92604440608286f4ce411ea48f582854930 -DIST OpenJDK16U-jre_x64_linux_hotspot_16.0.1_9.tar.gz 48818276 SHA256 5eca19d406c6d130e9c3a4b932b9cb0a6e9cd45932450668c3e911bded4bcf40 diff --git a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin.env.sh b/dev-java/openjdk-jre-bin/files/openjdk-jre-bin.env.sh deleted file mode 100644 index ec0dca4..0000000 --- a/dev-java/openjdk-jre-bin/files/openjdk-jre-bin.env.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -VERSION="AdoptOpenJDK JRE ${PV}" -JAVA_HOME="${EPREFIX}/opt/${P}" -JDK_HOME="${EPREFIX}/opt/${P}" -JAVAC="\${JAVA_HOME}/bin/javac" -PATH="\${JAVA_HOME}/bin" -ROOTPATH="\${JAVA_HOME}/bin" -LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" -MANPATH="\${JAVA_HOME}/man" -PROVIDES_TYPE="JRE" -PROVIDES_VERSION="${SLOT}" -BOOTCLASSPATH="" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openjdk-jre-bin/metadata.xml b/dev-java/openjdk-jre-bin/metadata.xml deleted file mode 100644 index 8fa79b5..0000000 --- a/dev-java/openjdk-jre-bin/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>gyakovlev@gentoo.org</email> - <name>Georgy Yakovlev</name> - </maintainer> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <longdescription> - Java™ is the world's leading programming language and platform. - The code for Java is open source and available at OpenJDK™. - AdoptOpenJDK provides prebuilt OpenJDK JRE binaries from a fully open source set of build scripts and infrastructure. - </longdescription> - <use> - <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag> - <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag> - </use> -</pkgmetadata> diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest deleted file mode 100644 index d28c01e..0000000 --- a/dev-java/openjdk/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST openjdk-17.0.0_p35.tar.gz 104576069 BLAKE2B 079865c8c679836b7edf04e2341b60713bbd7dbc43a608a23c03359e2a636d9dd972d2c79ec3c45bcd3ad7ea54dd15ef697480efb86ee5ad0022fd360818696d SHA512 6f263bc78f00f42612c42282fb40370315e7c93454d69ad12ad98463a3397f6eeda21e661a42749c9807d84f672ed90bfce59c889a407f3cf60744e205233fff diff --git a/dev-java/openjdk/files/openjdk.env.sh b/dev-java/openjdk/files/openjdk.env.sh deleted file mode 100644 index 96c4be7..0000000 --- a/dev-java/openjdk/files/openjdk.env.sh +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -VERSION="OpenJDK ${PV}" -JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" -JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}" -JAVAC="\${JAVA_HOME}/bin/javac" -PATH="\${JAVA_HOME}/bin" -ROOTPATH="\${JAVA_HOME}/bin" -LDPATH="\${JAVA_HOME}/lib/:\${JAVA_HOME}/lib/server/" -MANPATH="" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="${SLOT}" -BOOTCLASSPATH="" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml deleted file mode 100644 index e95815a..0000000 --- a/dev-java/openjdk/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <slots> - <slot name="14">Java™ version 14</slot> - </slots> - <use> - <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag> - <flag name="gentoo-vm">Allow this JDK to be recognised by Gentoo (package manager, eselect, java-config, EXPERIMENTAL!)</flag> - <flag name="javafx">Import OpenJFX modules at build time, via <pkg>dev-java/openjfx</pkg></flag> - <flag name="jbootstrap">Build OpenJDK twice, the second time using the result of the first</flag> - <flag name="source">Install JVM sources</flag> - <flag name="systemtap">Enable SystemTAP/DTrace tracing</flag> - </use> -</pkgmetadata> diff --git a/dev-java/openjdk/openjdk-17.0.0_p35.ebuild b/dev-java/openjdk/openjdk-17.0.0_p35.ebuild deleted file mode 100644 index d1b1e48..0000000 --- a/dev-java/openjdk/openjdk-17.0.0_p35.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs - -# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to -# set build version properly -MY_PV="${PV%_p*}" -MY_PV="${MY_PV%.0.0}-ga" -SLOT="${PV%%[.+]*}" - -DESCRIPTION="Open source implementation of the Java programming language" -HOMEPAGE="https://openjdk.java.net" -SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" - -IUSE="alsa cups debug doc examples gentoo-vm headless-awt javafx +jbootstrap +pch selinux source systemtap" - -COMMON_DEPEND=" - media-libs/freetype:2= - media-libs/giflib:0/7 - media-libs/harfbuzz:= - media-libs/libpng:0= - media-libs/lcms:2= - sys-libs/zlib - virtual/jpeg:0= - systemtap? ( dev-util/systemtap ) -" - -# Many libs are required to build, but not to run, make is possible to remove -# by listing conditionally in RDEPEND unconditionally in DEPEND -RDEPEND=" - ${COMMON_DEPEND} - >=sys-apps/baselayout-java-0.1.0-r1 - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) -" - -DEPEND=" - ${COMMON_DEPEND} - app-arch/zip - media-libs/alsa-lib - net-print/cups - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - || ( - virtual/jdk:${SLOT} - virtual/jdk:$((SLOT-1)) - ) - javafx? ( dev-java/openjfx:${SLOT}= ) -" - -REQUIRED_USE="javafx? ( alsa !headless-awt )" - -S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV}" - -# The space required to build varies wildly depending on USE flags, -# ranging from 2GB to 16GB. This function is certainly not exact but -# should be close enough to be useful. -openjdk_check_requirements() { - local M - M=2048 - M=$(( $(usex jbootstrap 2 1) * $M )) - M=$(( $(usex debug 3 1) * $M )) - M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) - - CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} -} - -pkg_pretend() { - openjdk_check_requirements - if [[ ${MERGE_TYPE} != binary ]]; then - has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" - fi -} - -pkg_setup() { - openjdk_check_requirements - java-vm-2_pkg_setup - java-pkg-2_pkg_setup -} - -src_prepare() { - default - chmod +x configure || die -} - -src_configure() { - # Work around stack alignment issue, bug #647954. in case we ever have x86 - use x86 && append-flags -mincoming-stack-boundary=2 - - # Enabling full docs appears to break doc building. If not - # explicitly disabled, the flag will get auto-enabled if pandoc and - # graphviz are detected. pandoc has loads of dependencies anyway. - - local myconf=( - --disable-ccache - --enable-full-docs=no - --with-boot-jdk="${JDK_HOME}" - --with-extra-cflags="${CFLAGS}" - --with-extra-cxxflags="${CXXFLAGS}" - --with-extra-ldflags="${LDFLAGS}" - --with-freetype=system - --with-giflib=system - --with-harfbuzz=system - --with-lcms=system - --with-libjpeg=system - --with-libpng=system - --with-native-debug-symbols=$(usex debug internal none) - --with-vendor-name="Gentoo" - --with-vendor-url="https://gentoo.org" - --with-vendor-bug-url="https://bugs.gentoo.org" - --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" - --with-vendor-version-string="${PVR}" - --with-version-pre="" - --with-version-string="${PV%_p*}" - --with-version-build="${PV#*_p}" - --with-zlib=system - --enable-dtrace=$(usex systemtap yes no) - --enable-headless-only=$(usex headless-awt yes no) - $(tc-is-clang && echo "--with-toolchain-type=clang") - ) - - if use javafx; then - local zip="${EPREFIX%/}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" - if [[ -r ${zip} ]]; then - myconf+=( --with-import-modules="${zip}" ) - else - die "${zip} not found or not readable" - fi - fi - - # PaX breaks pch, bug #601016 - if use pch && ! host-is-pax; then - myconf+=( --enable-precompiled-headers ) - else - myconf+=( --disable-precompiled-headers ) - fi - - ( - unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS - CFLAGS= CXXFLAGS= LDFLAGS= \ - CONFIG_SITE=/dev/null \ - econf "${myconf[@]}" - ) -} - -src_compile() { - local myemakeargs=( - JOBS=$(makeopts_jobs) - LOG=debug - CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror - $(usex doc docs '') - $(usex jbootstrap bootcycle-images product-images) - ) - emake "${myemakeargs[@]}" -j1 #nowarn -} - -src_install() { - local dest="/usr/$(get_libdir)/${PN}-${SLOT}" - local ddest="${ED}${dest#/}" - - cd "${S}"/build/*-release/images/jdk || die - - # Create files used as storage for system preferences. - mkdir .systemPrefs || die - touch .systemPrefs/.system.lock || die - touch .systemPrefs/.systemRootModFile || die - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but OpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - rm -v lib/libjsound.* || die - fi - - if ! use examples ; then - rm -vr demo/ || die - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - rm -v lib/security/cacerts || die - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts - - # must be done before running itself - java-vm_set-pax-markings "${ddest}" - - einfo "Creating the Class Data Sharing archives and disabling usage tracking" - "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die - - use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}.env.sh - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter - - if use doc ; then - docinto html - dodoc -r "${S}"/build/*-release/images/docs/* - dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" - fi -} - -pkg_postinst() { - java-vm-2_pkg_postinst - - if use gentoo-vm ; then - ewarn "WARNING! You have enabled the gentoo-vm USE flag, making this JDK" - ewarn "recognised by the system. This will almost certainly break" - ewarn "many java ebuilds as they are not ready for openjdk-11" - else - ewarn "The experimental gentoo-vm USE flag has not been enabled so this JDK" - ewarn "will not be recognised by the system. For example, simply calling" - ewarn "\"java\" will launch a different JVM. This is necessary until Gentoo" - ewarn "fully supports Java ${SLOT}. This JDK must therefore be invoked using its" - ewarn "absolute location under ${EPREFIX}/usr/$(get_libdir)/${PN}-${SLOT}." - fi -} diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest new file mode 100644 index 0000000..b647de1 --- /dev/null +++ b/dev-libs/girara/Manifest @@ -0,0 +1 @@ +DIST girara-0.3.6.tar.xz 60056 BLAKE2B 4a9f651e2127c7924cd3e55c7f955b3f80b90849b5ee06f2785388ae3adbb8910bb90e59f934f426fdb6d8e7d797ac82a52bc7b05becff56e1aff610e5e56081 SHA512 e9496b1bb629d59377ed1fee8a2fab2c7e5d60845e6777ed9bb796e1843fea20abda32d7de885f01e892654ea996490403c442021528b6b4f2aa50cf54d74c42 diff --git a/dev-libs/girara/girara-0.3.6.ebuild b/dev-libs/girara/girara-0.3.6.ebuild new file mode 100644 index 0000000..712c70f --- /dev/null +++ b/dev-libs/girara/girara-0.3.6.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson virtualx + +DESCRIPTION="UI library that focuses on simplicity and minimalism" +HOMEPAGE="https://pwmt.org/projects/girara/" + +if [[ ${PV} == *999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git" + EGIT_BRANCH="develop" +else + SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~riscv ~x86" +fi + +LICENSE="ZLIB" +SLOT="0" +IUSE="doc libnotify test" + +RESTRICT="!test? ( test )" + +DEPEND="dev-libs/glib:2 + dev-libs/json-c:= + >=x11-libs/gtk+-3.20:3 + libnotify? ( x11-libs/libnotify )" +RDEPEND="${DEPEND}" +BDEPEND="doc? ( app-doc/doxygen ) + test? ( dev-libs/check ) + virtual/pkgconfig" + +src_configure() { + local emesonargs=( + -Djson=enabled + -Ddocs=$(usex doc enabled disabled) + -Dnotify=$(usex libnotify enabled disabled) + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} diff --git a/dev-libs/girara/metadata.xml b/dev-libs/girara/metadata.xml new file mode 100644 index 0000000..71bb9e0 --- /dev/null +++ b/dev-libs/girara/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <!-- maintainer-needed --> + <upstream> + <maintainer status="active"> + <email>mlq@pwmt.org</email> + <name>Moritz Lipp</name> + </maintainer> + <maintainer status="active"> + <email>sebastian+dev@ramacher.at</email> + <name>Sebastian Ramacher</name> + </maintainer> + <changelog>http://pwmt.org/projects/girara/download/</changelog> + <doc lang="en">http://pwmt.org/projects/girara/</doc> + <bugs-to>http://bugs.pwmt.org/</bugs-to> + </upstream> +</pkgmetadata> diff --git a/dev-libs/highway/Manifest b/dev-libs/highway/Manifest deleted file mode 100644 index 30461b0..0000000 --- a/dev-libs/highway/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST highway-0.12.2.tar.gz 1487685 BLAKE2B 7304dc2b3b8c704aa0f138f24d7118a3d364ad5a7f1ae359dcad16444c3f02a12d1454855459290a3d0bfae5b25e7d6baec2a8c5fd00d6165cb0f6695e02b479 SHA512 857a3ecbeaf13d69b9807d6f7daf0a1dc791008c7ce0413cb20457eb057f60fa9a5836eff7cf28c884566bae746d9b7d850b3cf88767bb299f10fd1440a56e06 diff --git a/dev-libs/libdwarf/Manifest b/dev-libs/libdwarf/Manifest index b1547de..e5a2a26 100644 --- a/dev-libs/libdwarf/Manifest +++ b/dev-libs/libdwarf/Manifest @@ -1 +1 @@ -DIST libdwarf-0.1.1.tar.xz 1929280 BLAKE2B 1a542e982db03cbf380de52db2b1fa5c7d29f4a1b56a6373f011819cf3677f09ebe7446c7f28cfd84f61365f022f25469b869eccd148cd5781218fb6875d669c SHA512 eb2502d847fd5ee15928651dcc1ef30dab04b7e65d7e772dd245da74bb071ce525cfdf97d1af5dbceb50c1a12cccda5c762f461d03a16c55557ab5e94e79e8ab +DIST libdwarf-0.2.0.tar.xz 1961916 BLAKE2B cc1942d4c9964ebb1da0a2b9e6fc2ef4de9908952d483cfab9dc5e0b75ee0b6bde8677a45724c333c520c6f32231e88e29bddf23ffddc226b2b0e1af1a55e914 SHA512 30d4076f3bc699449de44ac73637ebcb386fa548dbf7cc429628e54e6aa09bb69b10faa5c1d635249b2133354850f7e0c78f9b55e4c4cbfea4fe04081fa9e9b7 diff --git a/dev-libs/libdwarf/libdwarf-0.1.1.ebuild b/dev-libs/libdwarf/libdwarf-0.2.0.ebuild index 39a2c3c..39a2c3c 100644 --- a/dev-libs/libdwarf/libdwarf-0.1.1.ebuild +++ b/dev-libs/libdwarf/libdwarf-0.2.0.ebuild diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index e9a287e..fb7fb16 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -1,2 +1 @@ -DIST openssl-1.1.1i-bindist-1.0.tar.xz 18124 BLAKE2B bcbce700676d1d61498ac98281b7ad06f9970d91afa6bfb2c259ab7462b2554be79a1c06759bc7aaeca9948c2f5276bac2c4f42dbc6822669f863444b9913ccd SHA512 1dbb81bcb4cf7e634bb363c7e2bb2590a1fe3fcb6c3b5e377cac3c5241abd116c2a89c516be8e5fd1799ab64375a58052a4df944eeadc87b0b7785da710906d8 -DIST openssl-1.1.1l.tar.gz 9834044 BLAKE2B 9e8739015db63a013c05587e3d164d67c3f65f1f6c5fc75e4592bcd038c036cde88a7bc95fbc1f1b4ed876f6124ca4dabcd4f5dbb45d1b84299f2efe1a59431a SHA512 d9611f393e37577cca05004531388d3e0ebbf714894cab9f95f4903909cd4f45c214faab664c0cbc3ad3cca309d500b9e6d0ecbf9a0a0588d1677dc6b047f9e0 +DIST openssl-3.0.0.tar.gz 14978663 BLAKE2B 64721ee958fc47d57a479dffff91be5692d80d10a6727d804f8a9da66fcaea799b67fda8987f9ecdfb2777ec42033c5e8a6a135e30784d6422eb3c65e676abe6 SHA512 1fdf769ef69631eb802671a9e0bb3a01883d58282f651986212983c2d7c9d3499dabe99a6dee0411e997e6fcfa6f682b121b7698596de0d6c78850c2200241b1 diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml index 5ca8d93..c0cdc35 100644 --- a/dev-libs/openssl/metadata.xml +++ b/dev-libs/openssl/metadata.xml @@ -1,17 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> <use> <flag name="asm">Support assembly hand optimized crypto functions (i.e. faster run time)</flag> - <flag name="bindist">Disable/Restrict EC algorithms (as they seem to be patented) -- note: changes the ABI</flag> + <flag name="ktls">Enable support for Kernel implementation of TLS (kTLS)</flag> <flag name="rfc3779">Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)</flag> - <flag name="sslv2">Support for the old/insecure SSLv2 protocol -- note: not required for TLS/https</flag> - <flag name="sslv3">Support for the old/insecure SSLv3 protocol -- note: not required for TLS/https</flag> - <flag name="tls-heartbeat">Enable the Heartbeat Extension in TLS and DTLS</flag> + <flag name="tls-compression">Enable support for discouraged TLS compression</flag> </use> <upstream> <remote-id type="cpe">cpe:/a:openssl:openssl</remote-id> diff --git a/dev-libs/openssl/openssl-1.1.1l-r2.ebuild b/dev-libs/openssl/openssl-1.1.1l-r2.ebuild deleted file mode 100644 index 5b9585b..0000000 --- a/dev-libs/openssl/openssl-1.1.1l-r2.ebuild +++ /dev/null @@ -1,316 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic toolchain-funcs multilib-minimal - -MY_P=${P/_/-} - -# This patch set is based on the following files from Fedora 31, -# see https://src.fedoraproject.org/rpms/openssl/blob/f31/f/openssl.spec -# for more details: -# - hobble-openssl (SOURCE1) -# - ec_curve.c (SOURCE12) -- MODIFIED -# - ectest.c (SOURCE13) -# - openssl-1.1.1-ec-curves.patch (PATCH37) -- MODIFIED -BINDIST_PATCH_SET="openssl-1.1.1i-bindist-1.0.tar.xz" - -DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" -HOMEPAGE="https://www.openssl.org/" -SRC_URI="mirror://openssl/source/${MY_P}.tar.gz - bindist? ( - mirror://gentoo/${BINDIST_PATCH_SET} - https://dev.gentoo.org/~whissi/dist/openssl/${BINDIST_PATCH_SET} - )" - -LICENSE="openssl" -SLOT="0/1.1" # .so version of libssl/libcrypto -[[ "${PV}" = *_pre* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" -IUSE="+asm bindist elibc_musl rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla" -RESTRICT="!bindist? ( bindist ) - !test? ( test )" - -RDEPEND=">=app-misc/c_rehash-1.7-r1 - tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND=" - >=dev-lang/perl-5 - sctp? ( >=net-misc/lksctp-tools-1.0.12 ) - test? ( - sys-apps/diffutils - sys-devel/bc - sys-process/procps - )" -PDEPEND="app-misc/ca-certificates" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.0j-parallel_install_fix.patch #671602 - "${FILESDIR}"/${PN}-1.1.1i-riscv32.patch -) - -S="${WORKDIR}/${MY_P}" - -# force upgrade to prevent broken login, bug 696950 -RDEPEND+=" !<net-misc/openssh-8.0_p1-r3" - -MULTILIB_WRAPPED_HEADERS=( - usr/include/openssl/opensslconf.h -) - -pkg_setup() { - [[ ${MERGE_TYPE} == binary ]] && return - - # must check in pkg_setup; sysctl don't work with userpriv! - if use test && use sctp; then - # test_ssl_new will fail with "Ensure SCTP AUTH chunks are enabled in kernel" - # if sctp.auth_enable is not enabled. - local sctp_auth_status=$(sysctl -n net.sctp.auth_enable 2>/dev/null) - if [[ -z "${sctp_auth_status}" ]] || [[ ${sctp_auth_status} != 1 ]]; then - die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!" - fi - fi -} - -src_prepare() { - # allow openssl to be cross-compiled - cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die - chmod a+rx gentoo.config || die - - if use bindist; then - mv "${WORKDIR}"/bindist-patches/hobble-openssl "${WORKDIR}" || die - bash "${WORKDIR}"/hobble-openssl || die - - cp -f "${WORKDIR}"/bindist-patches/ec_curve.c "${S}"/crypto/ec/ || die - cp -f "${WORKDIR}"/bindist-patches/ectest.c "${S}"/test/ || die - - eapply "${WORKDIR}"/bindist-patches/ec-curves.patch - - local known_failing_test - for known_failing_test in \ - 30-test_evp_extra.t \ - 80-test_ssl_new.t \ - ; do - ebegin "Disabling test '${known_failing_test}' which is known to fail with USE=bindist" - rm test/recipes/${known_failing_test} || die - eend $? - done - - # Also see the configure parts below: - # enable-ec \ - # $(use_ssl !bindist ec2m) \ - fi - - # keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - - # Make sure we only ever touch Makefile.org and avoid patching a file - # that gets blown away anyways by the Configure script in src_configure - rm -f Makefile - - if ! use vanilla ; then - if [[ $(declare -p PATCHES 2>/dev/null) == "declare -a"* ]] ; then - [[ ${#PATCHES[@]} -gt 0 ]] && eapply "${PATCHES[@]}" - fi - fi - - eapply_user #332661 - - if use test && use sctp && has network-sandbox ${FEATURES}; then - ebegin "Disabling test '80-test_ssl_new.t' which is known to fail with FEATURES=network-sandbox" - rm test/recipes/80-test_ssl_new.t || die - eend $? - fi - - # make sure the man pages are suffixed #302165 - # don't bother building man pages if they're disabled - # Make DOCDIR Gentoo compliant - sed -i \ - -e '/^MANSUFFIX/s:=.*:=ssl:' \ - -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ - -e $(has noman FEATURES \ - && echo '/^install:/s:install_docs::' \ - || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ - -e "/^DOCDIR/s@\$(BASENAME)@&-${PVR}@" \ - Configurations/unix-Makefile.tmpl \ - || die - - # quiet out unknown driver argument warnings since openssl - # doesn't have well-split CFLAGS and we're making it even worse - # and 'make depend' uses -Werror for added fun (#417795 again) - [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments - - append-flags -fno-strict-aliasing - append-flags $(test-flags-CC -Wa,--noexecstack) - append-cppflags -DOPENSSL_NO_BUF_FREELISTS - - # Prefixify Configure shebang (#141906) - sed \ - -e "1s,/usr/bin/env,${EPREFIX}&," \ - -i Configure || die - # Remove test target when FEATURES=test isn't set - if ! use test ; then - sed \ - -e '/^$config{dirs}/s@ "test",@@' \ - -i Configure || die - fi - # The config script does stupid stuff to prompt the user. Kill it. - sed -i '/stty -icanon min 0 time 50; read waste/d' config || die - ./config --test-sanity || die "I AM NOT SANE" - - multilib_copy_sources -} - -multilib_src_configure() { - unset APPS #197996 - unset SCRIPTS #312551 - unset CROSS_COMPILE #311473 - - tc-export CC AR RANLIB RC - - # Clean out patent-or-otherwise-encumbered code - # Camellia: Royalty Free https://en.wikipedia.org/wiki/Camellia_(cipher) - # IDEA: Expired https://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm - # EC: ????????? ??/??/2015 https://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography - # MDC2: Expired https://en.wikipedia.org/wiki/MDC-2 - # RC5: Expired https://en.wikipedia.org/wiki/RC5 - - use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } - echoit() { echo "$@" ; "$@" ; } - - local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") - - local sslout=$(./gentoo.config) - einfo "Use configuration ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" - - # Fedora hobbled-EC needs 'no-ec2m' - # 'srp' was restricted until early 2017 as well. - # "disable-deprecated" option breaks too many consumers. - # Don't set it without thorough revdeps testing. - # Make sure user flags don't get added *yet* to avoid duplicated - # flags. - CFLAGS= LDFLAGS= echoit \ - ./${config} \ - ${sslout} \ - $(use cpu_flags_x86_sse2 || echo "no-sse2") \ - enable-camellia \ - enable-ec \ - $(use_ssl !bindist ec2m) \ - $(use_ssl !bindist sm2) \ - enable-srp \ - $(use elibc_musl && echo "no-async") \ - $(use amd64 && echo enable-ec_nistp_64_gcc_128) \ - enable-idea \ - enable-mdc2 \ - $(use_ssl sslv3 ssl3) \ - $(use_ssl sslv3 ssl3-method) \ - $(use_ssl asm) \ - $(use_ssl rfc3779) \ - $(use_ssl sctp) \ - $(use_ssl tls-compression zlib) \ - $(use_ssl tls-heartbeat heartbeats) \ - --prefix="${EPREFIX}"/usr \ - --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ - --libdir=$(get_libdir) \ - shared threads \ - || die - - # Clean out hardcoded flags that openssl uses - local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ - -e 's:^CFLAGS=::' \ - -e 's:\(^\| \)-fomit-frame-pointer::g' \ - -e 's:\(^\| \)-O[^ ]*::g' \ - -e 's:\(^\| \)-march=[^ ]*::g' \ - -e 's:\(^\| \)-mcpu=[^ ]*::g' \ - -e 's:\(^\| \)-m[^ ]*::g' \ - -e 's:^ *::' \ - -e 's: *$::' \ - -e 's: \+: :g' \ - -e 's:\\:\\\\:g' - ) - - # Now insert clean default flags with user flags - sed -i \ - -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ - -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ - Makefile || die -} - -multilib_src_compile() { - # depend is needed to use $confopts; it also doesn't matter - # that it's -j1 as the code itself serializes subdirs - emake -j1 depend - emake all -} - -multilib_src_test() { - emake -j1 test -} - -multilib_src_install() { - # We need to create $ED/usr on our own to avoid a race condition #665130 - if [[ ! -d "${ED}/usr" ]]; then - # We can only create this directory once - mkdir "${ED}"/usr || die - fi - - emake DESTDIR="${D}" install - - # This is crappy in that the static archives are still built even - # when USE=static-libs. But this is due to a failing in the openssl - # build system: the static archives are built as PIC all the time. - # Only way around this would be to manually configure+compile openssl - # twice; once with shared lib support enabled and once without. - if ! use static-libs; then - rm "${ED}"/usr/$(get_libdir)/lib{crypto,ssl}.a || die - fi -} - -multilib_src_install_all() { - # openssl installs perl version of c_rehash by default, but - # we provide a shell version via app-misc/c_rehash - rm "${ED}"/usr/bin/c_rehash || die - - dodoc CHANGES* FAQ NEWS README doc/*.txt doc/${PN}-c-indent.el - - # create the certs directory - keepdir ${SSL_CNF_DIR}/certs - - # Namespace openssl programs to prevent conflicts with other man pages - cd "${ED}"/usr/share/man || die - local m d s - for m in $(find . -type f | xargs grep -L '#include') ; do - d=${m%/*} ; d=${d#./} ; m=${m##*/} - [[ ${m} == openssl.1* ]] && continue - [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" - mv ${d}/{,ssl-}${m} - # fix up references to renamed man pages - sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} - ln -s ssl-${m} ${d}/openssl-${m} - # locate any symlinks that point to this man page ... we assume - # that any broken links are due to the above renaming - for s in $(find -L ${d} -type l) ; do - s=${s##*/} - rm -f ${d}/${s} - # We don't want to "|| die" here - ln -s ssl-${m} ${d}/ssl-${s} - ln -s ssl-${s} ${d}/openssl-${s} - done - done - [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" - - dodir /etc/sandbox.d #254521 - echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl - - diropts -m0700 - keepdir ${SSL_CNF_DIR}/private -} - -pkg_postinst() { - ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" - c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null - eend $? -} diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index a3b2a04..4b89203 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1 +1 @@ -DIST qtbase-5.15.2-c2ea67ec.tar.gz 67964503 BLAKE2B 2f55d1913d840a9150912074e81b7ebc38d86dbe259a51f65924868d97ed0cd5852fd6387e85933e956b0bd80404284b9e0f01506080f154751c0e1cf27ba398 SHA512 40eeaca1698613ab0c756053b58737cbef9fceed7cf7007aec5b558f992675a25d304ec83afdc7eab34bb854149d4e0ce61f2cc03003b553b4fc8a786f258e17 +DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388 diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml index cfa040f..6edd18d 100644 --- a/dev-qt/qtgui/metadata.xml +++ b/dev-qt/qtgui/metadata.xml @@ -1,16 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> <use> <flag name="egl">Enable EGL integration</flag> <flag name="eglfs">Build the EGL Full Screen/Single Surface platform plugin</flag> <flag name="evdev">Enable support for input devices via evdev</flag> <flag name="ibus">Build the IBus input method plugin</flag> <flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag> + <flag name="linuxfb">Enable Linux framebuffer support for embedded devices</flag> <flag name="tslib">Enable support for touchscreen devices via <pkg>x11-libs/tslib</pkg></flag> <flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag> <flag name="vulkan">Enable support for Vulkan</flag> diff --git a/dev-qt/qtgui/qtgui-5.15.2-r12.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild index 161da7c..47f2df9 100644 --- a/dev-qt/qtgui/qtgui-5.15.2-r12.ebuild +++ b/dev-qt/qtgui/qtgui-5.15.2-r13.ebuild @@ -3,7 +3,7 @@ EAPI=8 -KDE_ORG_COMMIT=c2ea67ecefe049f6e9bb8f910d7f9c60319d8619 +KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd QT5_MODULE="qtbase" inherit qt5-build @@ -26,21 +26,19 @@ REQUIRED_USE=" RDEPEND=" dev-libs/glib:2 - ~dev-qt/qtcore-${PV}:5= + =dev-qt/qtcore-${QT5_PV}*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig >=media-libs/freetype-2.6.1:2 >=media-libs/harfbuzz-1.6.0:= + media-libs/libglvnd sys-libs/zlib:= - dbus? ( ~dev-qt/qtdbus-${PV} ) - egl? ( media-libs/mesa[egl] ) + dbus? ( =dev-qt/qtdbus-${QT5_PV}* ) eglfs? ( media-libs/mesa[gbm] x11-libs/libdrm ) evdev? ( sys-libs/mtdev ) - gles2-only? ( media-libs/mesa[gles2] ) - !gles2-only? ( virtual/opengl ) jpeg? ( virtual/jpeg:0 ) libinput? ( dev-libs/libinput:= @@ -48,9 +46,9 @@ RDEPEND=" ) png? ( media-libs/libpng:0= ) tslib? ( >=x11-libs/tslib-1.21 ) - tuio? ( ~dev-qt/qtnetwork-${PV} ) + tuio? ( =dev-qt/qtnetwork-${QT5_PV}* ) udev? ( virtual/libudev:= ) - vnc? ( ~dev-qt/qtnetwork-${PV} ) + vnc? ( =dev-qt/qtnetwork-${QT5_PV}* ) vulkan? ( dev-util/vulkan-headers ) X? ( x11-libs/libICE @@ -70,7 +68,7 @@ DEPEND="${RDEPEND} " PDEPEND=" ibus? ( app-i18n/ibus ) - wayland? ( ~dev-qt/qtwayland-${PV} ) + wayland? ( =dev-qt/qtwayland-${QT5_PV}* ) " QT5_TARGET_SUBDIRS=( @@ -154,15 +152,15 @@ src_prepare() { src_configure() { local myconf=( - $(usex dbus -dbus-linked '') + $(usev dbus -dbus-linked) $(qt_use egl) $(qt_use eglfs) - $(usex eglfs '-gbm -kms' '') + $(usev eglfs '-gbm -kms') $(qt_use evdev) $(qt_use evdev mtdev) -fontconfig -system-freetype - $(usex gif '' -no-gif) + $(usev !gif -no-gif) -gui -system-harfbuzz $(qt_use jpeg libjpeg system) @@ -174,7 +172,7 @@ src_configure() { $(qt_use udev libudev) $(qt_use vulkan) $(qt_use X xcb) - $(usex X '-xcb-xlib -DUSE_X11' '') + $(usev X '-xcb-xlib') ) if use libinput || use X; then myconf+=( -xkbcommon ) diff --git a/dev-util/android-udev-rules/Manifest b/dev-util/android-udev-rules/Manifest index 4c73850..4fec771 100644 --- a/dev-util/android-udev-rules/Manifest +++ b/dev-util/android-udev-rules/Manifest @@ -1 +1 @@ -DIST android-udev-rules-20210501.tar.bz2 20765 BLAKE2B b2f4f95f75ed2d1cff3fc82659b1b50c592ca4ca861fd12540a2e367f7a84af2fbe3f76fb77b7129b6c47f7582b21405da34e703dfd3410aa18abba6e5a3b9ea SHA512 21d817ba751fcfc10d66128756dae0a6998e41a52eda6894281788de81db3f1f5dd4cce631cea07746f0031ac3eac7d02d210e0b79a80d86c9a0f1c002fea637 +DIST android-udev-rules-20210501.tar.gz 20765 BLAKE2B b2f4f95f75ed2d1cff3fc82659b1b50c592ca4ca861fd12540a2e367f7a84af2fbe3f76fb77b7129b6c47f7582b21405da34e703dfd3410aa18abba6e5a3b9ea SHA512 21d817ba751fcfc10d66128756dae0a6998e41a52eda6894281788de81db3f1f5dd4cce631cea07746f0031ac3eac7d02d210e0b79a80d86c9a0f1c002fea637 diff --git a/dev-util/android-udev-rules/android-udev-rules-20210501.ebuild b/dev-util/android-udev-rules/android-udev-rules-20210501-r1.ebuild index 09153b6..0365d66 100644 --- a/dev-util/android-udev-rules/android-udev-rules-20210501.ebuild +++ b/dev-util/android-udev-rules/android-udev-rules-20210501-r1.ebuild @@ -1,30 +1,28 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit vcs-snapshot udev user +inherit udev DESCRIPTION="Comprehensive list of udev rules to connect to android devices" HOMEPAGE="https://github.com/M0Rf30/android-udev-rules" -SRC_URI="https://github.com/M0Rf30/android-udev-rules/archive/${PV}.tar.gz -> ${P}.tar.bz2" +SRC_URI="https://github.com/M0Rf30/android-udev-rules/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND="virtual/udev" -DEPEND="${RDEPEND}" +RDEPEND=" + acct-group/adbusers + virtual/udev +" src_install() { udev_dorules 51-android.rules } -pkg_setup() { - enewgroup adbusers -} - pkg_postinst() { einfo "To be able to use android devices," einfo "add yourself to the 'adbusers' group by calling" diff --git a/games-rpg/runescape-launcher/Manifest b/games-rpg/runescape-launcher/Manifest index d0c1519..e5d3bbf 100644 --- a/games-rpg/runescape-launcher/Manifest +++ b/games-rpg/runescape-launcher/Manifest @@ -1,4 +1,4 @@ -DIST runescape-launcher_2.2.9_Packages 906 BLAKE2B d67ea3e957cd226de22385c95edcc618ed8a92eb70e9f66a3c0ea4a5cc2403d62a8fd2c47d70ed2218c7a03b195bde2f1a65112bd0e8cf1d8931afc22b4fffa6 SHA512 a4a2550b26a7dd943fccd61b15b1ada6b0ad8be8337675b9df977309b7e80561e5ccc2af9be8a41ebf008a75e4501d8cbb4523a482d013e8ca08f10fee58a40b -DIST runescape-launcher_2.2.9_Release 961 BLAKE2B 3d6cdb8eb32462991712e72438f3a5422ca3213eaa0d539e25c92d0b7d9123621518b82b2e39fd8c1cfe969b230a1cd25d5e688fae858646f799bf231997c864 SHA512 e7f934b7d168043f51b118339759b22199bc16821354ff119ede4ba2f709483d22b7ecbe113b5e3ab5b64186529845d8540fee4a458fb3ecbd7ea6ed01ef1910 -DIST runescape-launcher_2.2.9_Release.gpg 488 BLAKE2B d1bdba9fc3552e680ab13fb22f93e97e658f295e56b1788194ac412e4cf42c25dd83be63ba13df89662825f67cadc5da555df45eb4dca8bc7c2a50bb1a402dbc SHA512 4cee11514d5451f86cb0854370426d1c5dfa02f71ac8525c283a9eead6891bafadde8c1ada41462c33a3ed9685c86e9adcdc89b210145d353421d9d5eecc3d26 -DIST runescape-launcher_2.2.9_amd64.deb 3874760 BLAKE2B f5db69228e497dd8a8e973188b44bbc021b49f0bbf284f351f3d2f159155640cd6f9be20e0498a190c5eb95acccdcef3470222899da7114deb8ced6e2da0710a SHA512 7e09c100e9c2eae59000739c92b76970e9cc9088d5fdc2aa2c7304ab287765d069882174157d1021f605666f7d0ab5bde7f2b67176a4a038323ef44d05425afb +DIST runescape-launcher_2.2.9_Packages 906 BLAKE2B 21618120775dc4dc95fd9ca5cc2fbb2bf7d7333ba5d3b917b12191a5b88012424e2947a7b7623300d67959629bc85b8e58eb2ccf8106a9702a3ea32108c8e74b SHA512 6676ee36bd5206503c8b385e3b62029416bd0cdf057153a7b57d376d096c9eef917428fd435d52704c308710f24ba9ccc9b28e4b94eb6b82a2150f39f7f2e085 +DIST runescape-launcher_2.2.9_Release 961 BLAKE2B 6dc2d40a47a198feb438581b0e571043dccf49e2a265ac87fbbcaab58e3c090c7a49938941bb110b3a04add932316c5afbd32cf75c0678896163837e45ecef78 SHA512 c6b5e363d0a307f463e7b837b58121d8d3e6fa3dff0021a3998a947042cfd82a0d1f71da186eb09f247293b6c4b1bdc4a111a1ed1a702ed6ff27236e84cd0696 +DIST runescape-launcher_2.2.9_Release.gpg 488 BLAKE2B 8d2e18383d45803e8aa128a3a7f78bf087a8be4adccda94d9045eaab7269ea2a88414f598d43d307a701db9a82324f8ff023a41e0a3adbdeb7747484b271dea9 SHA512 01424a2e624d1bf4a3f0f2b57706170d2d44f5373cbca42e10a2d78d587246157f7665a9b12a2e9befc9322c417c3ab7ca877a7d831bbd6904797c12682d02aa +DIST runescape-launcher_2.2.9_amd64.deb 3877472 BLAKE2B 86733c5ee0c34a64cd2845ed4c6378ad66f6732253742c8d77d64bdb5bd4ea23351b6c918b31a2ff9c80f3ed4fb01c9046514e0ccdefd5a9228a3652b6e2b9f5 SHA512 7a3b596355811fbf35ce684de06de4ad7e219a20e36b51d9efc934e874874b287c03471e01b5bb59aa89e9038d40484eee6dc5cc7e63147117b7f6c864698ef3 diff --git a/games-rpg/runescape-launcher/runescape-launcher-2.2.9-r2.ebuild b/games-rpg/runescape-launcher/runescape-launcher-2.2.9-r3.ebuild index 9362aea..9362aea 100644 --- a/games-rpg/runescape-launcher/runescape-launcher-2.2.9-r2.ebuild +++ b/games-rpg/runescape-launcher/runescape-launcher-2.2.9-r3.ebuild diff --git a/media-libs/libjxl/Manifest b/media-libs/libjxl/Manifest new file mode 100644 index 0000000..05256c8 --- /dev/null +++ b/media-libs/libjxl/Manifest @@ -0,0 +1,2 @@ +DIST libjxl-0.6.tar.gz 16953410 BLAKE2B 8941987f6d31096a7286f9d98cdcc16e5fe338e6b3d966343f97fc5b5b932ec92c994fab5781448aa7d96324e5c9ce5c83754b01cf6e752d0702ce9fc0a2087f SHA512 934c86d079c7a1f5382fad158efac225b9d1b27e551ea85ea7ec43e7ffd5cba85ddbfa35658b242a9f9c9589decf245568349abfa8a4fe12898af78d51608852 +DIST lodepng-48e5364ef48ec2408f44c727657ac1b6703185f8.tar.gz 240079 BLAKE2B 08240bd72d22f789bc0e06ed1d641fbca21ca674697880d4f004e4e76bb1b6cf595e931d2447544d896c79576e942db3cbdcca91d717f4ad8ddcfbd6c5bdc97e SHA512 50a515f1f15122fa017637be30df0db05980d07f8891f16b0b68697ef0df797176bbe005df623e9f2dbb68b750b0a87e69c3cef215c7bf15187d00491c4023c7 diff --git a/media-libs/libjxl/files/roundtripanimationpatches-ifdef-gif.patch b/media-libs/libjxl/files/roundtripanimationpatches-ifdef-gif.patch new file mode 100644 index 0000000..c8baf7d --- /dev/null +++ b/media-libs/libjxl/files/roundtripanimationpatches-ifdef-gif.patch @@ -0,0 +1,71 @@ +From 134f1876473d9463332711a834e2ddc70fa7e38c Mon Sep 17 00:00:00 2001 +From: "Alex Xu (Hello71)" <alex_y_xu@yahoo.ca> +Date: Thu, 7 Oct 2021 14:07:35 -0400 +Subject: [PATCH] Run RoundtripAnimationPatches only if gif enabled + +--- + lib/jxl/jxl_test.cc | 42 +++++++++++++++++++++--------------------- + 1 file changed, 21 insertions(+), 21 deletions(-) + +diff --git a/lib/jxl/jxl_test.cc b/lib/jxl/jxl_test.cc +index aaf1f4e..815ec7c 100644 +--- a/lib/jxl/jxl_test.cc ++++ b/lib/jxl/jxl_test.cc +@@ -1336,6 +1336,27 @@ TEST(JxlTest, RoundtripLosslessAnimation) { + 5e-4); + } + ++TEST(JxlTest, RoundtripAnimationPatches) { ++ ThreadPool* pool = nullptr; ++ const PaddedBytes orig = ReadTestData("jxl/animation_patches.gif"); ++ CodecInOut io; ++ ASSERT_TRUE(SetFromBytes(Span<const uint8_t>(orig), &io, pool)); ++ ASSERT_EQ(2u, io.frames.size()); ++ ++ CompressParams cparams; ++ cparams.patches = Override::kOn; ++ DecompressParams dparams; ++ CodecInOut io2; ++ // 40k with no patches, 27k with patch frames encoded multiple times. ++ EXPECT_LE(Roundtrip(&io, cparams, dparams, pool, &io2), 24000u); ++ ++ EXPECT_EQ(io2.frames.size(), io.frames.size()); ++ // >10 with broken patches ++ EXPECT_LE(ButteraugliDistance(io, io2, cparams.ba_params, ++ /*distmap=*/nullptr, pool), ++ 2.0); ++} ++ + #endif // JPEGXL_ENABLE_GIF + + #if JPEGXL_ENABLE_JPEG +@@ -1629,26 +1650,5 @@ TEST(JxlTest, RoundtripProgressive) { + 4.0f); + } + +-TEST(JxlTest, RoundtripAnimationPatches) { +- ThreadPool* pool = nullptr; +- const PaddedBytes orig = ReadTestData("jxl/animation_patches.gif"); +- CodecInOut io; +- ASSERT_TRUE(SetFromBytes(Span<const uint8_t>(orig), &io, pool)); +- ASSERT_EQ(2u, io.frames.size()); +- +- CompressParams cparams; +- cparams.patches = Override::kOn; +- DecompressParams dparams; +- CodecInOut io2; +- // 40k with no patches, 27k with patch frames encoded multiple times. +- EXPECT_LE(Roundtrip(&io, cparams, dparams, pool, &io2), 24000u); +- +- EXPECT_EQ(io2.frames.size(), io.frames.size()); +- // >10 with broken patches +- EXPECT_LE(ButteraugliDistance(io, io2, cparams.ba_params, +- /*distmap=*/nullptr, pool), +- 2.0); +-} +- + } // namespace + } // namespace jxl +-- +2.33.0 + diff --git a/media-libs/libjxl/files/system-lcms.patch b/media-libs/libjxl/files/system-lcms.patch new file mode 100644 index 0000000..537e02c --- /dev/null +++ b/media-libs/libjxl/files/system-lcms.patch @@ -0,0 +1,47 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 280d4af..c9186df 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -127,6 +127,8 @@ set(JPEGXL_FORCE_SYSTEM_BROTLI false CACHE BOOL + "Force using system installed brotli instead of third_party/brotli source.") + set(JPEGXL_FORCE_SYSTEM_HWY false CACHE BOOL + "Force using system installed highway (libhwy-dev) instead of third_party/highway source.") ++set(JPEGXL_FORCE_SYSTEM_LCMS false CACHE BOOL ++ "Force using system installed lcms instead of third_party/lcms source.") + + # Check minimum compiler versions. Older compilers are not supported and fail + # with hard to understand errors. +diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt +index b5e1899..887d31d 100644 +--- a/third_party/CMakeLists.txt ++++ b/third_party/CMakeLists.txt +@@ -201,13 +201,23 @@ if (JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/skcms/LICENSE" + ${PROJECT_BINARY_DIR}/LICENSE.skcms COPYONLY) + endif () +-if (JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS) +- if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lcms/.git" ) +- message(SEND_ERROR "Please run git submodule update --init") ++if ((JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS)) ++ if(JPEGXL_FORCE_SYSTEM_LCMS) ++ pkg_check_modules(LCMS REQUIRED IMPORTED_TARGET lcms2) ++ add_library(lcms2 INTERFACE IMPORTED GLOBAL) ++ target_link_libraries(lcms2 INTERFACE PkgConfig::LCMS) ++ else() ++ if(JPEGXL_DEP_LICENSE_DIR) ++ configure_file("${JPEGXL_DEP_LICENSE_DIR}/libhwy-dev/copyright" ++ ${PROJECT_BINARY_DIR}/LICENSE.highway COPYONLY) ++ endif() # JPEGXL_DEP_LICENSE_DIR ++ if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lcms/.git" ) ++ message(SEND_ERROR "Please run git submodule update --init") ++ endif() ++ include(lcms2.cmake) ++ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lcms/COPYING" ++ ${PROJECT_BINARY_DIR}/LICENSE.lcms COPYONLY) + endif() +- include(lcms2.cmake) +- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lcms/COPYING" +- ${PROJECT_BINARY_DIR}/LICENSE.lcms COPYONLY) + endif() + + # sjpeg diff --git a/media-libs/libjxl/libjxl-0.6.ebuild b/media-libs/libjxl/libjxl-0.6.ebuild new file mode 100644 index 0000000..a931ef9 --- /dev/null +++ b/media-libs/libjxl/libjxl-0.6.ebuild @@ -0,0 +1,119 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_ECLASS=cmake +inherit cmake-multilib java-pkg-opt-2 + +DESCRIPTION="JPEG XL image format reference implementation" +HOMEPAGE="https://github.com/libjxl/libjxl" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/libjxl/libjxl.git" + EGIT_SUBMODULES=(third_party/lodepng) +else + LODEPNG_COMMIT="48e5364ef48ec2408f44c727657ac1b6703185f8" + SRC_URI=" + https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/lvandeve/lodepng/archive/${LODEPNG_COMMIT}.tar.gz -> lodepng-${LODEPNG_COMMIT}.tar.gz + " +fi + +LICENSE="Apache-2.0" +SLOT="0" +if [[ ${PV} != 9999 ]]; then + KEYWORDS="~amd64 ~x86" +fi +IUSE="apng doc gif java +jpeg +man openexr static-libs test viewers" + +RDEPEND="app-arch/brotli[${MULTILIB_USEDEP}] + dev-cpp/highway[${MULTILIB_USEDEP}] + media-libs/lcms[${MULTILIB_USEDEP}] + apng? ( + media-libs/libpng[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + ) + gif? ( media-libs/giflib[${MULTILIB_USEDEP}] ) + java? ( >=virtual/jre-1.8:* ) + jpeg? ( virtual/jpeg[${MULTILIB_USEDEP}] ) + openexr? ( media-libs/openexr:=[${MULTILIB_USEDEP}] ) + viewers? ( + dev-qt/qtwidgets + dev-qt/qtx11extras + ) +" +BDEPEND=" + doc? ( app-doc/doxygen ) + man? ( app-text/asciidoc ) + viewers? ( kde-frameworks/extra-cmake-modules ) +" +DEPEND="${RDEPEND} + test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] ) + java? ( >=virtual/jdk-1.8:* ) +" + +PATCHES=( + "${FILESDIR}/system-lcms.patch" + "${FILESDIR}/roundtripanimationpatches-ifdef-gif.patch" +) + +src_prepare() { + if [[ ${PV} != 9999 ]]; then + rmdir third_party/lodepng + ln -sv ../../lodepng-${LODEPNG_COMMIT} third_party/lodepng || die + fi + cmake_src_prepare + java-pkg-opt-2_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test ON OFF) + -DJPEGXL_ENABLE_BENCHMARK=OFF + -DJPEGXL_ENABLE_COVERAGE=OFF + -DJPEGXL_ENABLE_EXAMPLES=OFF + -DJPEGXL_ENABLE_FUZZERS=OFF + -DJPEGXL_ENABLE_JNI=$(multilib_native_usex java ON OFF) + -DJPEGXL_ENABLE_MANPAGES=$(multilib_native_usex man ON OFF) + -DJPEGXL_ENABLE_OPENEXR=$(usex openexr ON OFF) + -DJPEGXL_ENABLE_PLUGINS=OFF + -DJPEGXL_ENABLE_SJPEG=OFF + -DJPEGXL_ENABLE_SKCMS=OFF + -DJPEGXL_ENABLE_TCMALLOC=OFF + -DJPEGXL_ENABLE_VIEWERS=$(multilib_native_usex viewers ON OFF) + -DJPEGXL_FORCE_SYSTEM_BROTLI=ON + -DJPEGXL_FORCE_SYSTEM_GTEST=ON + -DJPEGXL_FORCE_SYSTEM_HWY=ON + -DJPEGXL_FORCE_SYSTEM_LCMS=ON + -DJPEGXL_WARNINGS_AS_ERRORS=OFF + + $(cmake_use_find_package apng PNG) + $(cmake_use_find_package apng ZLIB) + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON) + $(cmake_use_find_package gif GIF) + $(cmake_use_find_package jpeg JPEG) + ) + + cmake_src_configure +} + +multilib_src_test() { + # DecodeTest.PixelTestWithICCProfileLossy: https://github.com/libjxl/libjxl/issues/500 + # RobustStatisticsTest: https://github.com/libjxl/libjxl/issues/698 + local myctestargs=( + -E '^DecodeTest\.PixelTestWithICCProfileLossy$|^RobustStatisticsTest\.' + ) + cmake_src_test +} + +multilib_src_install() { + cmake_src_install + if ! use static-libs; then + rm "${ED}"/usr/$(get_libdir)/libjxl{,_dec}.a || die + fi + if use java && multilib_is_native_abi; then + java-pkg_doso tools/libjxl_jni.so + fi +} diff --git a/media-libs/libjxl/libjxl-9999.ebuild b/media-libs/libjxl/libjxl-9999.ebuild index a2b5eaf..8e1e475 100644 --- a/media-libs/libjxl/libjxl-9999.ebuild +++ b/media-libs/libjxl/libjxl-9999.ebuild @@ -1,30 +1,44 @@ # Copyright 2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 -inherit xdg cmake git-r3 +CMAKE_ECLASS=cmake +inherit cmake-multilib java-pkg-opt-2 DESCRIPTION="JPEG XL image format reference implementation" HOMEPAGE="https://github.com/libjxl/libjxl" -EGIT_REPO_URI="https://github.com/libjxl/libjxl.git" -EGIT_SUBMODULES=(third_party/lodepng third_party/skcms) +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/libjxl/libjxl.git" + EGIT_SUBMODULES=(third_party/lodepng) +else + LODEPNG_COMMIT="48e5364ef48ec2408f44c727657ac1b6703185f8" + SRC_URI=" + https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/lvandeve/lodepng/archive/${LODEPNG_COMMIT}.tar.gz -> lodepng-${LODEPNG_COMMIT}.tar.gz + " +fi LICENSE="Apache-2.0" SLOT="0" -IUSE="apng doc gif jpeg +man openexr static-libs test viewers" +if [[ ${PV} != 9999 ]]; then + KEYWORDS="~amd64 ~x86" +fi +IUSE="apng doc gif java +jpeg +man openexr static-libs test viewers" -RDEPEND="app-arch/brotli - dev-libs/highway +RDEPEND="app-arch/brotli[${MULTILIB_USEDEP}] + dev-cpp/highway[${MULTILIB_USEDEP}] + media-libs/lcms[${MULTILIB_USEDEP}] apng? ( - media-libs/libpng - sys-libs/zlib + media-libs/libpng[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] ) - gif? ( media-libs/giflib ) - jpeg? ( virtual/jpeg ) - man? ( app-text/asciidoc ) - openexr? ( media-libs/openexr:= ) + gif? ( media-libs/giflib[${MULTILIB_USEDEP}] ) + java? ( >=virtual/jre-1.8:* ) + jpeg? ( virtual/jpeg[${MULTILIB_USEDEP}] ) + openexr? ( media-libs/openexr:=[${MULTILIB_USEDEP}] ) viewers? ( dev-qt/qtwidgets dev-qt/qtx11extras @@ -32,29 +46,51 @@ RDEPEND="app-arch/brotli " BDEPEND=" doc? ( app-doc/doxygen ) + man? ( app-text/asciidoc ) + viewers? ( kde-frameworks/extra-cmake-modules ) " DEPEND="${RDEPEND} - test? ( dev-cpp/gtest ) + test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] ) + java? ( >=virtual/jdk-1.8:* ) " -src_configure() { +PATCHES=( + "${FILESDIR}/system-lcms.patch" +) + +src_prepare() { + if [[ ${PV} != 9999 ]]; then + rmdir third_party/lodepng + ln -sv ../../lodepng-${LODEPNG_COMMIT} third_party/lodepng || die + fi + cmake_src_prepare + java-pkg-opt-2_src_prepare +} + +multilib_src_configure() { local mycmakeargs=( -DBUILD_TESTING=$(usex test ON OFF) -DJPEGXL_ENABLE_BENCHMARK=OFF -DJPEGXL_ENABLE_COVERAGE=OFF - -DJPEGXL_ENABLE_EXAMPLES=ON + -DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_ENABLE_FUZZERS=OFF - -DJPEGXL_ENABLE_MANPAGES=$(usex man ON OFF) + -DJPEGXL_ENABLE_JNI=$(multilib_native_usex java ON OFF) + -DJPEGXL_ENABLE_MANPAGES=$(multilib_native_usex man ON OFF) -DJPEGXL_ENABLE_OPENEXR=$(usex openexr ON OFF) -DJPEGXL_ENABLE_PLUGINS=OFF -DJPEGXL_ENABLE_SJPEG=OFF - -DJPEGXL_ENABLE_VIEWERS=$(usex viewers ON OFF) + -DJPEGXL_ENABLE_SKCMS=OFF + -DJPEGXL_ENABLE_TCMALLOC=OFF + -DJPEGXL_ENABLE_VIEWERS=$(multilib_native_usex viewers ON OFF) -DJPEGXL_FORCE_SYSTEM_BROTLI=ON + -DJPEGXL_FORCE_SYSTEM_GTEST=ON + -DJPEGXL_FORCE_SYSTEM_HWY=ON + -DJPEGXL_FORCE_SYSTEM_LCMS=ON -DJPEGXL_WARNINGS_AS_ERRORS=OFF $(cmake_use_find_package apng PNG) $(cmake_use_find_package apng ZLIB) - $(cmake_use_find_package doc Doxygen) + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON) $(cmake_use_find_package gif GIF) $(cmake_use_find_package jpeg JPEG) ) @@ -62,10 +98,12 @@ src_configure() { cmake_src_configure } -src_install() { +multilib_src_install() { cmake_src_install - dobin "${BUILD_DIR}/examples/jxlinfo" if ! use static-libs; then rm "${ED}"/usr/$(get_libdir)/libjxl{,_dec}.a || die fi + if use java && multilib_is_native_abi; then + java-pkg_doso tools/libjxl_jni.so + fi } diff --git a/media-libs/libjxl/metadata.xml b/media-libs/libjxl/metadata.xml index c8bb826..4904832 100644 --- a/media-libs/libjxl/metadata.xml +++ b/media-libs/libjxl/metadata.xml @@ -7,6 +7,8 @@ </maintainer> <use> <flag name="apng">APNG support</flag> + <flag name="doc">Doxygen API documentation</flag> + <flag name="jpeg">Conversion from/to JPEG, including "reconstructed JPEG" files. If disabled, some JPEG XL files will not be decodable!</flag> <flag name="viewers">Viewer programs</flag> </use> </pkgmetadata> diff --git a/media-libs/svt-av1/Manifest b/media-libs/svt-av1/Manifest index 0f9abf8..6208e0d 100644 --- a/media-libs/svt-av1/Manifest +++ b/media-libs/svt-av1/Manifest @@ -1 +1 @@ -DIST svt-av1-0.8.6.tar.gz 6416120 BLAKE2B c30d3bfc2dba6d7964625c4505bb135aa335adf195df91ad058fb02496276cabdc651b09854a2d14136352a434e08f4974148e03e7d54bde0924d25a1c4524cd SHA512 07e7353e35bc581b23c71913e65f5fd27566f4bf1d317d474d57d5bb2b82f380f713a00be19bd3f703935da50f81f3abf1d4ae38fbdf253385edf423737c0543 +DIST svt-av1-0.8.7.tar.gz 6396358 BLAKE2B 21a0d319078887809d08276b1a11b6dcca1be90a79c6bda19b86749fabb623918b9112de8ae3c7740b14f23d52e4e1c12ec0190f49880b09993525a857f8e334 SHA512 812b794eda930f53dcba6bb02bc5a3f417346705d64f590d7acf2d45df8d10985bd40c313eaaed514601ab699e23c87852059b9eb0b0ff8a717ef9fd80a132f7 diff --git a/media-libs/svt-av1/files/svt-av1-0.8.6-fix-c-only-build.patch b/media-libs/svt-av1/files/svt-av1-0.8.6-fix-c-only-build.patch deleted file mode 100644 index 81c82bb..0000000 --- a/media-libs/svt-av1/files/svt-av1-0.8.6-fix-c-only-build.patch +++ /dev/null @@ -1,123 +0,0 @@ -https://bugs.gentoo.org/766156 -https://github.com/AOMediaCodec/SVT-AV1/commit/09c90e4cfb602b9a247a8a256923bdbddaf2ed9b - -From 09c90e4cfb602b9a247a8a256923bdbddaf2ed9b Mon Sep 17 00:00:00 2001 -From: Slawomir Pawlowski <slawomir.pawlowski@intel.com> -Date: Fri, 18 Dec 2020 16:47:20 +0100 -Subject: [PATCH] Fix C only build - ---- - CMakeLists.txt | 5 ++++- - Source/Lib/Common/Codec/common_dsp_rtcd.c | 5 ++++- - Source/Lib/Common/Codec/common_dsp_rtcd.h | 2 ++ - Source/Lib/Decoder/CMakeLists.txt | 5 ++++- - Source/Lib/Encoder/CMakeLists.txt | 5 ++++- - Source/Lib/Encoder/Codec/firstpass.c | 2 +- - 6 files changed, 19 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8baff740b1..efdd7385fb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -302,6 +302,9 @@ if(BUILD_TESTING) - endif() - - add_subdirectory(third_party/fastfeat) --add_subdirectory(third_party/cpuinfo) -+ -+if(NOT COMPILE_C_ONLY AND HAVE_X86_PLATFORM) -+ add_subdirectory(third_party/cpuinfo) -+endif() - - install(DIRECTORY ${PROJECT_SOURCE_DIR}/Source/API/ DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/svt-av1" FILES_MATCHING PATTERN "*.h") -diff --git a/Source/Lib/Common/Codec/common_dsp_rtcd.c b/Source/Lib/Common/Codec/common_dsp_rtcd.c -index e24f99f66b..c09f088b88 100644 ---- a/Source/Lib/Common/Codec/common_dsp_rtcd.c -+++ b/Source/Lib/Common/Codec/common_dsp_rtcd.c -@@ -17,8 +17,10 @@ - #include "EbPackUnPack_C.h" - #include "EbAvcStyleMcp.h" - -+#ifdef ARCH_X86_64 - // for get_cpu_flags - #include "cpuinfo.h" -+#endif - - /* - * DSP deprecated flags -@@ -69,7 +71,7 @@ int64_t svt_av1_block_error_c(const TranLow *coeff, const TranLow *dqcoeff, - /************************************** - * Instruction Set Support - **************************************/ -- -+#ifdef ARCH_X86_64 - CPU_FLAGS get_cpu_flags() { - CPU_FLAGS flags = 0; - -@@ -105,6 +107,7 @@ CPU_FLAGS get_cpu_flags_to_use() { - #endif - return flags; - } -+#endif /*ARCH_X86_64*/ - - #ifdef ARCH_X86_64 - #ifndef NON_AVX512_SUPPORT -diff --git a/Source/Lib/Common/Codec/common_dsp_rtcd.h b/Source/Lib/Common/Codec/common_dsp_rtcd.h -index b76882b003..f67243f3d4 100644 ---- a/Source/Lib/Common/Codec/common_dsp_rtcd.h -+++ b/Source/Lib/Common/Codec/common_dsp_rtcd.h -@@ -67,8 +67,10 @@ extern "C" { - #endif - - // Helper Functions -+#ifdef ARCH_X86_64 - CPU_FLAGS get_cpu_flags(); - CPU_FLAGS get_cpu_flags_to_use(); -+#endif - void setup_common_rtcd_internal(CPU_FLAGS flags); - void svt_aom_blend_a64_vmask_c(uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, int w, int h); - RTCD_EXTERN void(*svt_aom_blend_a64_vmask)(uint8_t *dst, uint32_t dst_stride, const uint8_t *src0, uint32_t src0_stride, const uint8_t *src1, uint32_t src1_stride, const uint8_t *mask, int w, int h); -diff --git a/Source/Lib/Decoder/CMakeLists.txt b/Source/Lib/Decoder/CMakeLists.txt -index c8ffc57657..c71c4da0b8 100644 ---- a/Source/Lib/Decoder/CMakeLists.txt -+++ b/Source/Lib/Decoder/CMakeLists.txt -@@ -99,7 +99,9 @@ set_target_properties(SvtAv1Dec PROPERTI - set_target_properties(SvtAv1Dec PROPERTIES SOVERSION ${DEC_VERSION_MAJOR}) - add_dependencies(SvtAv1Dec EbVersionHeaderGen) - target_link_libraries(SvtAv1Dec PUBLIC ${PLATFORM_LIBS}) --target_link_libraries(SvtAv1Dec PRIVATE cpuinfo_public) -+if(NOT COMPILE_C_ONLY AND HAVE_X86_PLATFORM) -+ target_link_libraries(SvtAv1Dec PRIVATE cpuinfo_public) -+endif() - install(TARGETS SvtAv1Dec DESTINATION "${CMAKE_INSTALL_LIBDIR}") - - configure_file(pkg-config.pc.in ${CMAKE_BINARY_DIR}/SvtAv1Dec.pc @ONLY) -diff --git a/Source/Lib/Encoder/CMakeLists.txt b/Source/Lib/Encoder/CMakeLists.txt -index 936592e1ce..ab310dcef1 100644 ---- a/Source/Lib/Encoder/CMakeLists.txt -+++ b/Source/Lib/Encoder/CMakeLists.txt -@@ -130,7 +130,9 @@ endif() - set_target_properties(SvtAv1Enc PROPERTIES VERSION ${ENC_VERSION}) - set_target_properties(SvtAv1Enc PROPERTIES SOVERSION ${ENC_VERSION_MAJOR}) - target_link_libraries(SvtAv1Enc PUBLIC ${PLATFORM_LIBS}) --target_link_libraries(SvtAv1Enc PRIVATE cpuinfo_public) -+if(NOT COMPILE_C_ONLY AND HAVE_X86_PLATFORM) -+ target_link_libraries(SvtAv1Enc PRIVATE cpuinfo_public) -+endif() - install(TARGETS SvtAv1Enc DESTINATION "${CMAKE_INSTALL_LIBDIR}") - - configure_file(pkg-config.pc.in ${CMAKE_BINARY_DIR}/SvtAv1Enc.pc @ONLY) -diff --git a/Source/Lib/Encoder/Codec/firstpass.c b/Source/Lib/Encoder/Codec/firstpass.c -index feb7a1fae7..80b7dd05d8 100644 ---- a/Source/Lib/Encoder/Codec/firstpass.c -+++ b/Source/Lib/Encoder/Codec/firstpass.c -@@ -1189,8 +1189,8 @@ static void first_pass_setup_me_context(MotionEstimationContext_t *context_ptr, - // set search method - context_ptr->me_context_ptr->hme_search_method = SUB_SAD_SEARCH; - -- uint8_t *src_ptr = &(input_picture_ptr->buffer_y[buffer_index]); - #ifdef ARCH_X86_64 -+ uint8_t *src_ptr = &(input_picture_ptr->buffer_y[buffer_index]); - //_MM_HINT_T0 //_MM_HINT_T1 //_MM_HINT_T2 //_MM_HINT_NTA - uint32_t i; - for (i = 0; i < sb_height; i++) { diff --git a/media-libs/svt-av1/files/svt-av1-0.8.6-no-force-avx.patch b/media-libs/svt-av1/files/svt-av1-0.8.6-no-force-avx.patch new file mode 100644 index 0000000..62f3b9b --- /dev/null +++ b/media-libs/svt-av1/files/svt-av1-0.8.6-no-force-avx.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/785556 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -170,14 +170,6 @@ + endif() + endforeach() + +-if(CMAKE_C_FLAGS MATCHES ".*-march=native.*") +- string(APPEND CMAKE_C_FLAGS " -mno-avx") +-endif() +- +-if(CMAKE_CXX_FLAGS MATCHES ".*-march=native.*") +- string(APPEND CMAKE_CXX_FLAGS " -mno-avx") +-endif() +- + if(CMAKE_ASM_NASM_OBJECT_FORMAT MATCHES "win") + set(CMAKE_ASM_NASM_FLAGS_DEBUG "${CMAKE_ASM_NASM_FLAGS_DEBUG} -gcv8") + elseif(CMAKE_ASM_NASM_COMPILER MATCHES "nasm") diff --git a/media-libs/svt-av1/svt-av1-0.8.6.ebuild b/media-libs/svt-av1/svt-av1-0.8.6.ebuild deleted file mode 100644 index d4f59a9..0000000 --- a/media-libs/svt-av1/svt-av1-0.8.6.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit flag-o-matic cmake-multilib - -DESCRIPTION="Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)" -HOMEPAGE="https://github.com/AOMediaCodec/SVT-AV1" - -if [[ ${PV} = 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/AOMediaCodec/SVT-AV1.git" -else - SRC_URI="https://github.com/AOMediaCodec/SVT-AV1/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231 - S="${WORKDIR}/SVT-AV1-${PV}" -fi - -# Also see "Alliance for Open Media Patent License 1.0" -LICENSE="BSD-2 Apache-2.0 BSD ISC LGPL-2.1+ MIT" -SLOT="0" - -DEPEND="amd64? ( dev-lang/yasm )" - -PATCHES=( "${FILESDIR}"/${P}-fix-c-only-build.patch ) - -multilib_src_configure() { - append-ldflags -Wl,-z,noexecstack - local mycmakeargs=( - # Tests require linking against https://github.com/Cidana-Developers/aom/tree/av1-normative ? - # undefined reference to `ifd_inspect' - # https://github.com/Cidana-Developers/aom/commit/cfc5c9e95bcb48a5a41ca7908b44df34ea1313c0 - -DBUILD_TESTING=OFF - ) - - cmake_src_configure -} diff --git a/media-libs/svt-av1/svt-av1-0.8.7.ebuild b/media-libs/svt-av1/svt-av1-0.8.7.ebuild new file mode 100644 index 0000000..7984c55 --- /dev/null +++ b/media-libs/svt-av1/svt-av1-0.8.7.ebuild @@ -0,0 +1,53 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib flag-o-matic + +DESCRIPTION="Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)" +HOMEPAGE="https://gitlab.com/AOMediaCodec/SVT-AV1" + +if [[ ${PV} = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.com/AOMediaCodec/SVT-AV1.git" +else + SRC_URI="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${PV}/SVT-AV1-v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + S="${WORKDIR}/SVT-AV1-v${PV}" +fi + +# Also see "Alliance for Open Media Patent License 1.0" +LICENSE="BSD-2 Apache-2.0 BSD ISC LGPL-2.1+ MIT" +SLOT="0" + +BDEPEND="amd64? ( dev-lang/yasm )" + +src_prepare() { + if ! use amd64 ; then + # This _should_ be possible on amd64 too, but breaks with -O3 + # without AVX. + # bug #785556 + eapply "${FILESDIR}"/${PN}-0.8.6-no-force-avx.patch + fi + + cmake_src_prepare +} + +multilib_src_configure() { + append-ldflags -Wl,-z,noexecstack + + local mycmakeargs=( + # Tests require linking against https://github.com/Cidana-Developers/aom/tree/av1-normative ? + # undefined reference to `ifd_inspect' + # https://github.com/Cidana-Developers/aom/commit/cfc5c9e95bcb48a5a41ca7908b44df34ea1313c0 + -DBUILD_TESTING=OFF + -DCMAKE_OUTPUT_DIRECTORY=$BUILD_DIR + ) + + if [[ ${ABI} != amd64 ]]; then + mycmakeargs+=( -DCOMPILE_C_ONLY=ON ) + fi + + cmake_src_configure +} diff --git a/media-libs/svt-av1/svt-av1-9999.ebuild b/media-libs/svt-av1/svt-av1-9999.ebuild index dbdcc33..7984c55 100644 --- a/media-libs/svt-av1/svt-av1-9999.ebuild +++ b/media-libs/svt-av1/svt-av1-9999.ebuild @@ -1,37 +1,53 @@ # Copyright 2020-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -CMAKE_ECLASS=cmake -inherit flag-o-matic cmake-multilib +inherit cmake-multilib flag-o-matic DESCRIPTION="Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)" -HOMEPAGE="https://github.com/AOMediaCodec/SVT-AV1" +HOMEPAGE="https://gitlab.com/AOMediaCodec/SVT-AV1" if [[ ${PV} = 9999 ]]; then inherit git-r3 - EGIT_REPO_URI="https://github.com/AOMediaCodec/SVT-AV1.git" + EGIT_REPO_URI="https://gitlab.com/AOMediaCodec/SVT-AV1.git" else - SRC_URI="https://github.com/AOMediaCodec/SVT-AV1/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 -x86" # -x86: https://github.com/AOMediaCodec/SVT-AV1/issues/1231 - S="${WORKDIR}/SVT-AV1-${PV}" + SRC_URI="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${PV}/SVT-AV1-v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + S="${WORKDIR}/SVT-AV1-v${PV}" fi # Also see "Alliance for Open Media Patent License 1.0" LICENSE="BSD-2 Apache-2.0 BSD ISC LGPL-2.1+ MIT" SLOT="0" -DEPEND="amd64? ( dev-lang/yasm )" +BDEPEND="amd64? ( dev-lang/yasm )" + +src_prepare() { + if ! use amd64 ; then + # This _should_ be possible on amd64 too, but breaks with -O3 + # without AVX. + # bug #785556 + eapply "${FILESDIR}"/${PN}-0.8.6-no-force-avx.patch + fi + + cmake_src_prepare +} multilib_src_configure() { append-ldflags -Wl,-z,noexecstack + local mycmakeargs=( # Tests require linking against https://github.com/Cidana-Developers/aom/tree/av1-normative ? # undefined reference to `ifd_inspect' # https://github.com/Cidana-Developers/aom/commit/cfc5c9e95bcb48a5a41ca7908b44df34ea1313c0 -DBUILD_TESTING=OFF + -DCMAKE_OUTPUT_DIRECTORY=$BUILD_DIR ) + if [[ ${ABI} != amd64 ]]; then + mycmakeargs+=( -DCOMPILE_C_ONLY=ON ) + fi + cmake_src_configure } diff --git a/media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild new file mode 100644 index 0000000..00ac60f --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-4.4.1-r2.ebuild @@ -0,0 +1,560 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Subslot: libavutil major.libavcodec major.libavformat major +# Since FFmpeg ships several libraries, subslot is kind of limited here. +# Most consumers will use those three libraries, if a "less used" library +# changes its soname, consumers will have to be rebuilt the old way +# (preserve-libs). +# If, for example, a package does not link to libavformat and only libavformat +# changes its ABI then this package will be rebuilt needlessly. Hence, such a +# package is free _not_ to := depend on FFmpeg but I would strongly encourage +# doing so since such a case is unlikely. +FFMPEG_SUBSLOT=56.58.58 + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_MIN_CLONE_TYPE="single" + EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git" +fi + +inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} + +DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" +HOMEPAGE="https://ffmpeg.org/" +if [ "${PV#9999}" != "${PV}" ] ; then + SRC_URI="" +elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot + SRC_URI="mirror://gentoo/${P}.tar.bz2" +else # Release + SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2" +fi +FFMPEG_REVISION="${PV#*_p}" + +SLOT="0/${FFMPEG_SUBSLOT}" +LICENSE=" + !gpl? ( LGPL-2.1 ) + gpl? ( GPL-2 ) + amr? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + gmp? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + libaribb24? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + encode? ( + amrenc? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + ) + samba? ( GPL-3 ) +" +if [ "${PV#9999}" = "${PV}" ] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +# Options to use as use_enable in the foo[:bar] form. +# This will feed configure with $(use_enable foo bar) +# or $(use_enable foo foo) if no :bar is set. +# foo is added to IUSE. +FFMPEG_FLAG_MAP=( + +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp + +gpl hardcoded-tables +iconv libxml2 lzma +network opencl + openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan + X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib + # libavdevice options + cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal + opengl + # indevs + libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack + # decoders + amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac + jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm + libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh + speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec + vorbis:libvorbis vpx:libvpx zvbi:libzvbi + # libavfilter options + appkit + bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r + fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab + rubberband:librubberband zeromq:libzmq zimg:libzimg + # libswresample options + libsoxr + # Threads; we only support pthread for now but ffmpeg supports more + +threads:pthreads +) + +# Same as above but for encoders, i.e. they do something only with USE=encode. +FFMPEG_ENCODER_FLAG_MAP=( + amrenc:libvo-amrwbenc mp3:libmp3lame + kvazaar:libkvazaar libaom + openh264:libopenh264 rav1e:librav1e snappy:libsnappy + svt-av1:libsvtav1 theora:libtheora twolame:libtwolame + webp:libwebp x264:libx264 x265:libx265 xvid:libxvid +) + +IUSE=" + alsa chromium doc +encode oss pic sndio static-libs test v4l + ${FFMPEG_FLAG_MAP[@]%:*} + ${FFMPEG_ENCODER_FLAG_MAP[@]%:*} +" + +# Strings for CPU features in the useflag[:configure_option] form +# if :configure_option isn't set, it will use 'useflag' as configure option +ARM_CPU_FEATURES=( + cpu_flags_arm_thumb:armv5te + cpu_flags_arm_v6:armv6 + cpu_flags_arm_thumb2:armv6t2 + cpu_flags_arm_neon:neon + cpu_flags_arm_vfp:vfp + cpu_flags_arm_vfpv3:vfpv3 + cpu_flags_arm_v8:armv8 +) +ARM_CPU_REQUIRED_USE=" + arm64? ( cpu_flags_arm_v8 ) + cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) + cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) + cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) + cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) + cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) +" +MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu ) +PPC_CPU_FEATURES=( cpu_flags_ppc_altivec:altivec cpu_flags_ppc_vsx:vsx cpu_flags_ppc_vsx2:power8 ) +PPC_CPU_REQUIRED_USE=" + cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) + cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) +" +X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) +X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) +X86_CPU_REQUIRED_USE=" + cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) + cpu_flags_x86_xop? ( cpu_flags_x86_avx ) + cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) + cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) + cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) + cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) + cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) + cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) + cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) + cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) + cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) +" + +CPU_FEATURES_MAP=( + ${ARM_CPU_FEATURES[@]} + ${MIPS_CPU_FEATURES[@]} + ${PPC_CPU_FEATURES[@]} + ${X86_CPU_FEATURES[@]} +) +IUSE="${IUSE} + ${CPU_FEATURES_MAP[@]%:*}" + +CPU_REQUIRED_USE=" + ${ARM_CPU_REQUIRED_USE} + ${PPC_CPU_REQUIRED_USE} + ${X86_CPU_REQUIRED_USE} +" + +FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher ) +IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" + +RDEPEND=" + alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) + amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) + bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] ) + bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) + cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) + chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) + codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] ) + dav1d? ( >=media-libs/dav1d-0.4.0:0=[${MULTILIB_USEDEP}] ) + encode? ( + amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) + kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) + openh264? ( >=media-libs/openh264-1.4.0-r1:=[${MULTILIB_USEDEP}] ) + rav1e? ( >=media-video/rav1e-0.4:=[capi] ) + snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] ) + theora? ( + >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] + ) + twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] ) + webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] ) + x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) + x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] ) + xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) + ) + fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] ) + flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] ) + fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) + frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] ) + fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] ) + gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] ) + gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] ) + gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] ) + gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) + iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) + iec61883? ( + >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}] + >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] + >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}] + ) + ieee1394? ( + >=media-libs/libdc1394-2.2.1:2=[${MULTILIB_USEDEP}] + >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] + ) + jack? ( virtual/jack[${MULTILIB_USEDEP}] ) + jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] ) + libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] ) + libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] ) + libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] ) + libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) + libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] ) + libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] ) + librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) + libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] ) + libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] ) + libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) + libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] ) + lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) + mmal? ( media-libs/raspberrypi-userland ) + modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) + openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) + opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) + opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) + opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) + pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) + rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] ) + samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] ) + sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] ) + sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) + speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) + srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] ) + svg? ( + gnome-base/librsvg:2=[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + ) + svt-av1? ( media-libs/svt-av1[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) + vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) + video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) + vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) + vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) + vorbis? ( + >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] + ) + vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] ) + vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.4:=[${MULTILIB_USEDEP}] + ) + zeromq? ( >=net-libs/zeromq-4.1.6 ) + zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) + zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] ) + postproc? ( !media-libs/libpostproc ) +" + +RDEPEND="${RDEPEND} + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) + !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) ) +" + +DEPEND="${RDEPEND} + ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] ) + v4l? ( sys-kernel/linux-headers ) +" +BDEPEND=" + >=sys-devel/make-3.81 + virtual/pkgconfig + cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) + cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) + doc? ( sys-apps/texinfo ) + test? ( net-misc/wget sys-devel/bc ) +" + +# Code requiring FFmpeg to be built under gpl license +GPL_REQUIRED_USE=" + postproc? ( gpl ) + frei0r? ( gpl ) + cdio? ( gpl ) + rubberband? ( gpl ) + vidstab? ( gpl ) + samba? ( gpl ) + encode? ( + x264? ( gpl ) + x265? ( gpl ) + xvid? ( gpl ) + ) +" +REQUIRED_USE=" + cuda? ( video_cards_nvidia ) + libv4l? ( v4l ) + fftools_cws2fws? ( zlib ) + test? ( encode ) + ${GPL_REQUIRED_USE} + ${CPU_REQUIRED_USE}" +RESTRICT=" + !test? ( test ) + gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) +" + +S=${WORKDIR}/${P/_/-} + +PATCHES=( + "${FILESDIR}"/chromium-r1.patch +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libavutil/avconfig.h +) + +build_separate_libffmpeg() { + use opencl +} + +src_prepare() { + if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot + export revision=git-N-${FFMPEG_REVISION} + fi + default + echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die +} + +multilib_src_configure() { + local myconf=( ) + + local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) + use openssl && myconf+=( --enable-nonfree ) + use samba && myconf+=( --enable-version3 ) + + # Encoders + if use encode ; then + ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" ) + + # Licensing. + if use amrenc ; then + myconf+=( --enable-version3 ) + fi + else + myconf+=( --disable-encoders ) + fi + + # Indevs + use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 ) + for i in alsa oss jack sndio ; do + use ${i} || myconf+=( --disable-indev=${i} ) + done + + # Outdevs + for i in alsa oss sndio ; do + use ${i} || myconf+=( --disable-outdev=${i} ) + done + + # Decoders + use amr && myconf+=( --enable-version3 ) + use gmp && myconf+=( --enable-version3 ) + use libaribb24 && myconf+=( --enable-version3 ) + use fdk && use gpl && myconf+=( --enable-nonfree ) + + for i in "${ffuse[@]#+}" ; do + myconf+=( $(use_enable ${i%:*} ${i#*:}) ) + done + + if use openssl ; then + myconf+=( --disable-gnutls ) + fi + + # (temporarily) disable non-multilib deps + if ! multilib_is_native_abi; then + for i in librav1e libzmq ; do + myconf+=( --disable-${i} ) + done + fi + + # CPU features + for i in "${CPU_FEATURES_MAP[@]}" ; do + use ${i%:*} || myconf+=( --disable-${i#*:} ) + done + + if use pic ; then + myconf+=( --enable-pic ) + # disable asm code if PIC is required + # as the provided asm decidedly is not PIC for x86. + [[ ${ABI} == x86 ]] && myconf+=( --disable-asm ) + fi + [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004 + + # Try to get cpu type based on CFLAGS. + # Bug #172723 + # We need to do this so that features of that CPU will be better used + # If they contain an unknown CPU it will not hurt since ffmpeg's configure + # will just ignore it. + for i in $(get-flag mcpu) $(get-flag march) ; do + [[ ${i} = native ]] && i="host" # bug #273421 + myconf+=( --cpu=${i} ) + break + done + + # LTO support, bug #566282, bug #754654 + is-flagq "-flto*" && myconf+=( "--enable-lto" ) + filter-flags "-flto*" + + # Mandatory configuration + myconf=( + --enable-avfilter + --enable-avresample + --disable-stripping + # This is only for hardcoded cflags; those are used in configure checks that may + # interfere with proper detections, bug #671746 and bug #645778 + # We use optflags, so that overrides them anyway. + --disable-optimizations + --disable-libcelt # bug #664158 + "${myconf[@]}" + ) + + # cross compile support + if tc-is-cross-compiler ; then + myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) + case ${CHOST} in + *freebsd*) + myconf+=( --target-os=freebsd ) + ;; + *mingw32*) + myconf+=( --target-os=mingw32 ) + ;; + *linux*) + myconf+=( --target-os=linux ) + ;; + esac + fi + + # doc + myconf+=( + $(multilib_native_use_enable doc) + $(multilib_native_use_enable doc htmlpages) + $(multilib_native_enable manpages) + ) + + local extra_libs + if use arm || use ppc ; then + # bug #782811 + # bug #790590 + extra_libs+="$(test-flags-CCLD -latomic) " + fi + + set -- "${S}/configure" \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --mandir="${EPREFIX}/usr/share/man" \ + --enable-shared \ + --cc="$(tc-getCC)" \ + --cxx="$(tc-getCXX)" \ + --ar="$(tc-getAR)" \ + --nm="$(tc-getNM)" \ + --ranlib="$(tc-getRANLIB)" \ + --pkg-config="$(tc-getPKG_CONFIG)" \ + --optflags="${CFLAGS}" \ + --extra-libs="${extra_libs}" \ + $(use_enable static-libs static) \ + "${myconf[@]}" \ + ${EXTRA_FFMPEG_CONF} + echo "${@}" + "${@}" || die + + if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then + einfo "Configuring for Chromium" + mkdir -p ../chromium || die + pushd ../chromium >/dev/null || die + set -- "${@}" \ + --disable-shared \ + --enable-static \ + --enable-pic \ + --disable-opencl + echo "${@}" + "${@}" || die + popd >/dev/null || die + fi +} + +multilib_src_compile() { + emake V=1 + + if multilib_is_native_abi; then + for i in "${FFTOOLS[@]}" ; do + if use fftools_${i} ; then + emake V=1 tools/${i}$(get_exeext) + fi + done + + if use chromium; then + if build_separate_libffmpeg; then + einfo "Compiling for Chromium" + pushd ../chromium >/dev/null || die + emake V=1 libffmpeg + popd >/dev/null || die + else + emake V=1 libffmpeg + fi + fi + fi +} + +multilib_src_test() { + LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \ + emake V=1 fate +} + +multilib_src_install() { + emake V=1 DESTDIR="${D}" install install-doc + + if multilib_is_native_abi; then + for i in "${FFTOOLS[@]}" ; do + if use fftools_${i} ; then + dobin tools/${i}$(get_exeext) + fi + done + + if use chromium; then + if build_separate_libffmpeg; then + einfo "Installing for Chromium" + pushd ../chromium >/dev/null || die + emake V=1 DESTDIR="${D}" install-libffmpeg + popd >/dev/null || die + else + emake V=1 DESTDIR="${D}" install-libffmpeg + + # When not built separately, libffmpeg has no code of + # its own so this QA check raises a false positive. + QA_FLAGS_IGNORED+=" usr/$(get_libdir)/chromium/.*" + fi + fi + fi +} + +multilib_src_install_all() { + dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges + [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" +} diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 3647d65..b01a905 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -59,7 +59,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#9999}" = "${PV}" ] ; then - 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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" fi # Options to use as use_enable in the foo[:bar] form. @@ -246,7 +246,10 @@ RDEPEND=" speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] ) ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] ) - svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] ) + svg? ( + gnome-base/librsvg:2=[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + ) svt-av1? ( media-libs/svt-av1[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) @@ -263,7 +266,7 @@ RDEPEND=" >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.4:=[${MULTILIB_USEDEP}] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] ) @@ -452,6 +455,13 @@ multilib_src_configure() { $(multilib_native_enable manpages) ) + local extra_libs + if use arm || use ppc ; then + # bug #782811 + # bug #790590 + extra_libs+="$(test-flags-CCLD -latomic) " + fi + set -- "${S}/configure" \ --prefix="${EPREFIX}/usr" \ --libdir="${EPREFIX}/usr/$(get_libdir)" \ @@ -466,6 +476,7 @@ multilib_src_configure() { --ranlib="$(tc-getRANLIB)" \ --pkg-config="$(tc-getPKG_CONFIG)" \ --optflags="${CFLAGS}" \ + --extra-libs="${extra_libs}" \ $(use_enable static-libs static) \ "${myconf[@]}" \ ${EXTRA_FFMPEG_CONF} diff --git a/media-video/mpv/mpv-0.33.1-r2.ebuild b/media-video/mpv/mpv-0.33.1-r2.ebuild index 941c9e6..42fc273 100644 --- a/media-video/mpv/mpv-0.33.1-r2.ebuild +++ b/media-video/mpv/mpv-0.33.1-r2.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv" if [[ ${PV} != *9999* ]]; then SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux" DOCS=( RELEASE_NOTES ) else EGIT_REPO_URI="https://github.com/mpv-player/mpv.git" diff --git a/profiles/package.mask b/profiles/package.mask index 3750f1d..818858f 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ # https://github.com/pts/pdfsizeopt/issues/139 app-text/pdfsizeopt -# 16.0.2 is out but no binaries yet -=dev-java/openjdk-jre-bin-16.0.1_p9 +# not officially supported upstream +=dev-java/openj9-openjdk-17.0.29.0 diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021 new file mode 100644 index 0000000..4d32a6a --- /dev/null +++ b/profiles/updates/4Q-2021 @@ -0,0 +1 @@ +move dev-libs/highway dev-cpp/highway diff --git a/sci-calculators/units/units-2.21-r1.ebuild b/sci-calculators/units/units-2.21-r1.ebuild index 6c005df..7668c5f 100644 --- a/sci-calculators/units/units-2.21-r1.ebuild +++ b/sci-calculators/units/units-2.21-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="+units-cur" REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )" diff --git a/virtual/jdk/jdk-11-r2.ebuild b/virtual/jdk/jdk-11-r3.ebuild index a18c1a8..a18c1a8 100644 --- a/virtual/jdk/jdk-11-r2.ebuild +++ b/virtual/jdk/jdk-11-r3.ebuild diff --git a/virtual/jdk/jdk-16.ebuild b/virtual/jdk/jdk-16.ebuild index a18c1a8..5a08766 100644 --- a/virtual/jdk/jdk-16.ebuild +++ b/virtual/jdk/jdk-16.ebuild @@ -5,11 +5,8 @@ EAPI=7 DESCRIPTION="Virtual for Java Development Kit (JDK)" SLOT="${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +KEYWORDS="~amd64 ~arm64 ~ppc64" RDEPEND="|| ( - dev-java/openjdk-bin:${SLOT}[gentoo-vm(+)] - dev-java/openjdk:${SLOT}[gentoo-vm(+)] dev-java/openj9-openjdk-bin:${SLOT}[gentoo-vm(+)] - dev-java/openj9-openjdk:${SLOT}[gentoo-vm(+)] )" diff --git a/virtual/jdk/jdk-17.ebuild b/virtual/jdk/jdk-17-r1.ebuild index a18c1a8..a18c1a8 100644 --- a/virtual/jdk/jdk-17.ebuild +++ b/virtual/jdk/jdk-17-r1.ebuild diff --git a/virtual/jre/jre-16.ebuild b/virtual/jre/jre-16.ebuild index faeb554..ede6623 100644 --- a/virtual/jre/jre-16.ebuild +++ b/virtual/jre/jre-16.ebuild @@ -5,10 +5,9 @@ EAPI=7 DESCRIPTION="Virtual for Java Runtime Environment (JRE)" SLOT="${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +KEYWORDS="~amd64 ~arm64 ~ppc64" RDEPEND="|| ( - dev-java/openjdk-jre-bin:${SLOT}[gentoo-vm(+)] dev-java/openj9-openjdk-jre-bin:${SLOT}[gentoo-vm(+)] virtual/jdk:${SLOT} )" |