From 181b7fa84894efb6d914b6a99b6f2b35085e90d5 Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Thu, 29 Apr 2021 12:31:41 +0200 Subject: [PATCH 01/23] media-libs/vips: Fix econf, replace prune_libtool_files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The econf command would only go until `$(use_with openexr OpenEXR)` and then print the error: “--without-orc: command not found”. prune_libtool_files is deprecated. Replaced with find. Closes: https://bugs.gentoo.org/786225 Signed-off-by: Ronny (tastytea) Gutbrod --- media-libs/vips/vips-8.10.6.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/media-libs/vips/vips-8.10.6.ebuild b/media-libs/vips/vips-8.10.6.ebuild index 59394e6977..09f6fd6b84 100644 --- a/media-libs/vips/vips-8.10.6.ebuild +++ b/media-libs/vips/vips-8.10.6.ebuild @@ -80,7 +80,6 @@ multilib_src_configure() { $(use_with lcms) \ $(use_with matio ) \ $(use_with openexr OpenEXR) \ -# $(use_with openslide) \ $(use_with orc) \ $(use_with pango pangoft2) \ $(use_with pango pangocairo) \ @@ -101,5 +100,5 @@ multilib_src_install() { } multilib_src_install_all() { einstalldocs - prune_libtool_files + find "${D}" -name '*.la' -type f -delete || die } From 16baf25c0d891bf0e82ff10e1c2eed612f0ea462 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Thu, 29 Apr 2021 18:52:43 +0800 Subject: [PATCH 02/23] sci-electronics/verilator: bump to 4.202 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Huang Rui --- sci-electronics/verilator/Manifest | 1 + .../verilator/verilator-4.202.ebuild | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 sci-electronics/verilator/verilator-4.202.ebuild diff --git a/sci-electronics/verilator/Manifest b/sci-electronics/verilator/Manifest index bea46e7223..3b506958b4 100644 --- a/sci-electronics/verilator/Manifest +++ b/sci-electronics/verilator/Manifest @@ -1 +1,2 @@ DIST verilator-4.200.tar.gz 2245877 BLAKE2B e0606966777c9d3c364bc6d6e84a246a27f4ad4ee67871194a4738cf2c3f76529fe23d2a555139bc9b8eba268ed1929b651a161a7434dd380ec9762cb907f43e SHA512 f2fac4c46006c064b4a31b0edf0c3b1aebdea7e158ca6f8445ae3ece97f1132cd95dbfd63dc5e0f0cb4566a839f44ae0547e0e604cdd3231cf79a7400353fbb5 +DIST verilator-4.202.tar.gz 2352846 BLAKE2B 9bd1744c3a8b4b750fbf57731078a09d41eb4708a7a3806d2110ab197fb60f23cf0956cb625058d6c6b6e03058ad15cf112f38f920ce93a8cc82a17b90363421 SHA512 2241d06f06cee708269e09d50725973bb1fc1c20f8873114ad6525c2b4bea940a0ed42369b2a2e19ba72dbc40b9271c35124b1d9db9f6421c2856075b0636780 diff --git a/sci-electronics/verilator/verilator-4.202.ebuild b/sci-electronics/verilator/verilator-4.202.ebuild new file mode 100644 index 0000000000..d8ccd0c016 --- /dev/null +++ b/sci-electronics/verilator/verilator-4.202.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit autotools + +DESCRIPTION="The fast free Verilog/SystemVerilog simulator" +HOMEPAGE=" + https://verilator.org + https://github.com/verilator/verilator +" + +if [[ "${PV}" == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +LICENSE="|| ( Artistic-2 LGPL-3 )" +SLOT="0" + +RDEPEND=" + dev-lang/perl + sys-libs/zlib +" + +DEPEND=" + ${RDEPEND} +" + +BDEPEND=" + sys-devel/bison + sys-devel/flex +" + +src_prepare() { + default + eautoconf --force +} From ac0678bdf8966db59b16bad87b3aa28aa2f7b9c3 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Thu, 29 Apr 2021 18:53:59 +0800 Subject: [PATCH 03/23] sys-libs/libnvidia-container: bump to 1.4.0 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Huang Rui --- sys-libs/libnvidia-container/Manifest | 1 + .../libnvidia-container-1.4.0.ebuild | 53 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 sys-libs/libnvidia-container/libnvidia-container-1.4.0.ebuild diff --git a/sys-libs/libnvidia-container/Manifest b/sys-libs/libnvidia-container/Manifest index 0c79291746..48641d524a 100644 --- a/sys-libs/libnvidia-container/Manifest +++ b/sys-libs/libnvidia-container/Manifest @@ -1 +1,2 @@ DIST libnvidia-container-1.3.3.tar.gz 157342 BLAKE2B cff60d310eb9e6924a24397fb599f96d1bc0fea6bff81c8efa0b1e6a913dc33115479035b853dc3bab0c7aab1c0c4fd7c12b67736038fa502ff3a14158127981 SHA512 5f07087a9d6b633be82cea68fb5b00fad670eaeb27ce3f88438530556086f5ba34690b832b132e0e0ba29bfd5abe985c6940ec9039baa3ea392669e88a0d50a9 +DIST libnvidia-container-1.4.0.tar.gz 158137 BLAKE2B cdf0ce9024b79f9b5ebfc78b5cec8cb026fed47bcc192ce874639b8968d00af40ab9f0446bc65d5496502dd7f9a4c0d060c904c0894d463930795bc1bcd56d04 SHA512 0978a44f6a9c242b6493aadd54cfaac7055447bc1e76708b4f51e398df8575137b120396fc26019c63c78b34bf0aec49dd6870895370b1852b081bfe7cd34dc7 diff --git a/sys-libs/libnvidia-container/libnvidia-container-1.4.0.ebuild b/sys-libs/libnvidia-container/libnvidia-container-1.4.0.ebuild new file mode 100644 index 0000000000..7ae98bb6dc --- /dev/null +++ b/sys-libs/libnvidia-container/libnvidia-container-1.4.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="NVIDIA container runtime library" +HOMEPAGE="https://github.com/NVIDIA/libnvidia-container" + +if [[ "${PV}" == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git" +else + SRC_URI=" + https://github.com/NVIDIA/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + " + KEYWORDS="~amd64" +fi + +LICENSE="Apache-2.0" +SLOT="0" + +IUSE="" + +RDEPEND=" + net-libs/libtirpc + sys-libs/libcap + sys-libs/libseccomp + x11-drivers/nvidia-drivers +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + net-libs/rpcsvc-proto + sys-apps/lsb-release + sys-devel/bmake + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.1-add-enum-h.patch + "${FILESDIR}"/${PN}-1.1.1-add-sysfs-c.patch + "${FILESDIR}"/${PN}-1.1.1-add-sysfs-h.patch + "${FILESDIR}"/${PN}-1.1.1-add-utils-c.patch + "${FILESDIR}"/${PN}-1.1.1-add-utils-h.patch + "${FILESDIR}"/${PN}-1.1.1-fix-git.patch + "${FILESDIR}"/${PN}-1.1.1-fix-makefile.patch + "${FILESDIR}"/${PN}-1.1.1-fix-nvc.patch + "${FILESDIR}"/${PN}-1.3.0-fix-nvc-info.patch + "${FILESDIR}"/${PN}-1.3.0-fix-nvc-mount.patch + "${FILESDIR}"/${PN}-1.3.0-fix-modprobe-utils-c.patch + "${FILESDIR}"/${PN}-1.3.0-fix-modprobe-utils-h.patch +) From 4b38adf7e881d6c547386e7685fca24177bdbb3e Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Thu, 29 Apr 2021 12:59:49 +0200 Subject: [PATCH 04/23] media-libs/vips: Remove unrecognized configure option. --with[out]-pangocairo was introduced after 8.10.6: Signed-off-by: Ronny (tastytea) Gutbrod --- media-libs/vips/vips-8.10.6.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/vips/vips-8.10.6.ebuild b/media-libs/vips/vips-8.10.6.ebuild index 09f6fd6b84..860d2d5aa8 100644 --- a/media-libs/vips/vips-8.10.6.ebuild +++ b/media-libs/vips/vips-8.10.6.ebuild @@ -66,6 +66,7 @@ multilib_src_configure() { use imagemagick && magick="--with-magickpackage=MagickCore" use graphicsmagick && magick="--with-magickpackage=GraphicsMagick" + # NOTE: Replace pangoft2 with pangocairo in > 8.10.6. econf \ ${magick} \ $(multilib_native_use_enable doc gtk-doc) \ @@ -82,7 +83,6 @@ multilib_src_configure() { $(use_with openexr OpenEXR) \ $(use_with orc) \ $(use_with pango pangoft2) \ - $(use_with pango pangocairo) \ $(use_with pdf poppler) \ $(use_with png) \ $(use_with svg rsvg) \ From 78a236627a03d4eea7c2238601f50650e3ddd823 Mon Sep 17 00:00:00 2001 From: William Breathitt Gray Date: Thu, 29 Apr 2021 20:55:13 +0900 Subject: [PATCH 05/23] dev-lang/fbc: Drop old versions Closes: https://bugs.gentoo.org/781002 Closes: https://bugs.gentoo.org/781005 Signed-off-by: William Breathitt Gray --- dev-lang/fbc/Manifest | 4 - dev-lang/fbc/fbc-1.07.1.ebuild | 89 ------------------ dev-lang/fbc/fbc-1.07.2-r2.ebuild | 61 ------------ dev-lang/fbc/fbc-1.07.2.ebuild | 92 ------------------- .../fbc-1.07.0-Pass-ltinfo-to-linker.patch | 25 ----- 5 files changed, 271 deletions(-) delete mode 100644 dev-lang/fbc/fbc-1.07.1.ebuild delete mode 100644 dev-lang/fbc/fbc-1.07.2-r2.ebuild delete mode 100644 dev-lang/fbc/fbc-1.07.2.ebuild delete mode 100644 dev-lang/fbc/files/fbc-1.07.0-Pass-ltinfo-to-linker.patch diff --git a/dev-lang/fbc/Manifest b/dev-lang/fbc/Manifest index ef633a4334..f56b456a5c 100644 --- a/dev-lang/fbc/Manifest +++ b/dev-lang/fbc/Manifest @@ -1,5 +1 @@ -DIST FreeBASIC-1.07.1-source-bootstrap.tar.xz 9098748 BLAKE2B 3c3970ab014f79193dad23b6f22c5ffc61d6f588219dcf00f430ce2c9045dc2af8aa42bdad4f1d63d76591aae14b42553cf6ece88052f0dc78e09c6fb5c4d875 SHA512 89250fb4d79e420151bae8208945e26c5d4e63ba8bbb60658b2c5601ceeea238b387d7d7a2b52d60da2243e5d3d31f602c3657394be72a37c256e777be23b0a8 -DIST FreeBASIC-1.07.2-source-bootstrap.tar.xz 10700992 BLAKE2B e7016e5f58ae79086c0445bf6a09f33d4335af771422778be407e3351d583522e16f137763e471ba88e47b4318ab5bd2aec882ef5e5ff85cc334b0eccf27fdc5 SHA512 f381d14343496f68d3401ad1a66ff4fb1314270eddebb72ed2bc5624b856c4b29e7e14062f531a5158d892bb73d9aa80ff54fe7c260b4b8967b1330d26b2ecfc -DIST fbc-1.07.1.tar.gz 8938056 BLAKE2B 965425426605b9e0018e066852a67c355d168276b434e6779e151fad38820a956b5b763aad427c6728be4a74b0956b099a0bb8abd0d76fececc6cf8f0204d3c1 SHA512 7d49b9546e242b1c366b2378f71cf1640b85c85e09f4c2bd99ef268e6b4e5e45a710b7a00f7d807245aec518f299d173635572b77483826c1f273e047dbe3679 -DIST fbc-1.07.2.tar.gz 9032306 BLAKE2B c44eb74bb0b11f8315cda29e13157ce5f7a92070f0e6df833ad9dda4ebe37db6450afe2b82eb763ebee5ed0c33b4ce458fd3b53430f32da8ad5a71cd84411c67 SHA512 0577203fb8a325f611c88456446721e8bb14656beb235f3965bcd53e14cc7c7fa012a68535ff4c12351fad31d9a22a759f12bc9fe0be5d1dad124d3fe377daaf DIST fbc-1.07.3.tar.gz 9035460 BLAKE2B c0356c36ebd455954993ce5d4a983d06c33abc5bf0a059a44832d441514643c7d08e40268a7b3b9a0cba21368058199be395cc28dd7f87df23d576f78aece276 SHA512 6040248c433db3191678209401ff4a643c500d967d67352f1aeca347648056b0a2cdef25bbb7532fec0351a13984c72e80cb7b00faf3ead6c219422955d148fb diff --git a/dev-lang/fbc/fbc-1.07.1.ebuild b/dev-lang/fbc/fbc-1.07.1.ebuild deleted file mode 100644 index dff47787ba..0000000000 --- a/dev-lang/fbc/fbc-1.07.1.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A free/open source, multi-platform BASIC compiler." -HOMEPAGE="https://www.freebasic.net" -SRC_URI="https://github.com/freebasic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/freebasic/${PN}/releases/download/${PV}/FreeBASIC-${PV}-source-bootstrap.tar.xz" - -LICENSE="FDL-1.2 GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gpm libffi opengl X" - -DEPEND=" - sys-libs/ncurses:= - gpm? ( sys-libs/gpm ) - libffi? ( dev-libs/libffi ) - opengl? ( virtual/opengl ) - X? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXpm - x11-libs/libXrandr - x11-libs/libXrender - )" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-1.07.0-Pass-ltinfo-to-linker.patch ) - -DOCS="${S}/doc/fbc.1" - -BOOTSTRAP_S="${WORKDIR}/FreeBASIC-${PV}-source-bootstrap" - -src_unpack() { - # We only need bootstrap source code if fbc is not already present - if ! has_version dev-lang/fbc; then - unpack FreeBASIC-${PV}-source-bootstrap.tar.xz - fi - unpack ${P}.tar.gz -} - -src_prepare() { - # We only need bootstrap source code if fbc is not already present - if ! has_version dev-lang/fbc; then - cd "${BOOTSTRAP_S}" || die "cd failed" - eapply "${PATCHES[@]}" - cd "${S}" || die "cd failed" - fi - eapply_user -} - -src_compile() { - local fbc="fbc" - local fbcflags="" - - # We only need bootstrap compiler if fbc is not already present - if ! has_version dev-lang/fbc; then - cd "${BOOTSTRAP_S}" || die "cd failed" - - # Build bootstrap compiler - emake bootstrap-minimal - - # Set bootstrap compiler to build fbc - fbc="${BOOTSTRAP_S}/bin/fbc" - fbcflags="-i ${BOOTSTRAP_S}/inc" - - cd "${S}" || die "cd failed" - fi - - local xcflags=( - $(usex gpm "" "-DDISABLE_GPM") - $(usex libffi "" " -DDISABLE_FFI") - $(usex opengl "" " -DDISABLE_OPENGL") - $(usex X "" " -DDISABLE_X11") - ) - - # fbc requires a space after the -Wl option - local fblflags=${LDFLAGS//-Wl,/-Wl } - - # Build fbc - emake CFLAGS="${CFLAGS} ${xcflags[*]}" FBC="${fbc}" FBCFLAGS="${fbcflags}" FBLFLAGS="${fblflags}" TARGET=${CHOST} -} - -src_install() { - emake DESTDIR="${D}" prefix="/usr" TARGET=${CHOST} install - einstalldocs -} diff --git a/dev-lang/fbc/fbc-1.07.2-r2.ebuild b/dev-lang/fbc/fbc-1.07.2-r2.ebuild deleted file mode 100644 index 2d430eead1..0000000000 --- a/dev-lang/fbc/fbc-1.07.2-r2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A free/open source, multi-platform BASIC compiler." -HOMEPAGE="https://www.freebasic.net" -SRC_URI="https://github.com/freebasic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="FDL-1.2 GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gpm libffi opengl X" - -DEPEND=" - sys-libs/ncurses:= - gpm? ( sys-libs/gpm ) - libffi? ( dev-libs/libffi ) - opengl? ( virtual/opengl ) - X? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXpm - x11-libs/libXrandr - x11-libs/libXrender - ) -" -RDEPEND="${DEPEND}" -BDEPEND="|| ( - dev-lang/fbc - dev-lang/fbc-bootstrap )" - -DOCS="${S}/doc/fbc.1" - -src_compile() { - local xcflags=( - $(usex gpm "" "-DDISABLE_GPM") - $(usex libffi "" " -DDISABLE_FFI") - $(usex opengl "" " -DDISABLE_OPENGL") - $(usex X "" " -DDISABLE_X11") - ) - - local fbc="fbc" - local fbcflags="" - # fbc requires a space after the -Wl option - local fblflags="${LDFLAGS//-Wl,/-Wl }" - - if has_version -b dev-lang/fbc-bootstrap; then - fbc="fbc-bootstrap" - fbcflags="-prefix ${EPREFIX}/usr/share/freebasic-bootstrap" - fblflags+=" -prefix ${EPREFIX}/usr/share/freebasic-bootstrap" - fi - - # Build fbc - emake CFLAGS="${CFLAGS} ${xcflags[*]} -I/usr/$(get_libdir)/libffi/include" FBC="${fbc}" FBCFLAGS="${fbcflags}" FBLFLAGS="${fblflags}" TARGET="${CHOST}" -} - -src_install() { - emake DESTDIR="${D}" prefix="/usr" TARGET="${CHOST}" install - einstalldocs -} diff --git a/dev-lang/fbc/fbc-1.07.2.ebuild b/dev-lang/fbc/fbc-1.07.2.ebuild deleted file mode 100644 index 2db1af5cd1..0000000000 --- a/dev-lang/fbc/fbc-1.07.2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A free/open source, multi-platform BASIC compiler." -HOMEPAGE="https://www.freebasic.net" -SRC_URI=" - https://github.com/freebasic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/freebasic/${PN}/releases/download/${PV}/FreeBASIC-${PV}-source-bootstrap.tar.xz -" - -LICENSE="FDL-1.2 GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gpm libffi opengl X" - -DEPEND=" - sys-libs/ncurses:= - gpm? ( sys-libs/gpm ) - libffi? ( dev-libs/libffi ) - opengl? ( virtual/opengl ) - X? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXpm - x11-libs/libXrandr - x11-libs/libXrender - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-1.07.0-Pass-ltinfo-to-linker.patch ) - -DOCS="${S}/doc/fbc.1" - -BOOTSTRAP_S="${WORKDIR}/FreeBASIC-${PV}-source-bootstrap" - -src_unpack() { - # We only need bootstrap source code if fbc is not already present - if ! has_version dev-lang/fbc; then - unpack FreeBASIC-${PV}-source-bootstrap.tar.xz - fi - unpack ${P}.tar.gz -} - -src_prepare() { - # We only need bootstrap source code if fbc is not already present - if ! has_version dev-lang/fbc; then - cd "${BOOTSTRAP_S}" || die "cd failed" - eapply "${PATCHES[@]}" - cd "${S}" || die "cd failed" - fi - eapply_user -} - -src_compile() { - local fbc="fbc" - local fbcflags="" - - # We only need bootstrap compiler if fbc is not already present - if ! has_version dev-lang/fbc; then - cd "${BOOTSTRAP_S}" || die "cd failed" - - # Build bootstrap compiler - emake bootstrap-minimal - - # Set bootstrap compiler to build fbc - fbc="${BOOTSTRAP_S}/bin/fbc" - fbcflags="-i ${BOOTSTRAP_S}/inc" - - cd "${S}" || die "cd failed" - fi - - local xcflags=( - $(usex gpm "" "-DDISABLE_GPM") - $(usex libffi "" " -DDISABLE_FFI") - $(usex opengl "" " -DDISABLE_OPENGL") - $(usex X "" " -DDISABLE_X11") - ) - - # fbc requires a space after the -Wl option - local fblflags=${LDFLAGS//-Wl,/-Wl } - - # Build fbc - emake CFLAGS="${CFLAGS} ${xcflags[*]}" FBC="${fbc}" FBCFLAGS="${fbcflags}" FBLFLAGS="${fblflags}" TARGET=${CHOST} -} - -src_install() { - emake DESTDIR="${D}" prefix="/usr" TARGET=${CHOST} install - einstalldocs -} diff --git a/dev-lang/fbc/files/fbc-1.07.0-Pass-ltinfo-to-linker.patch b/dev-lang/fbc/files/fbc-1.07.0-Pass-ltinfo-to-linker.patch deleted file mode 100644 index 72bd51faf2..0000000000 --- a/dev-lang/fbc/files/fbc-1.07.0-Pass-ltinfo-to-linker.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c62adcd85c4e9d8b793a7a4f71fc88f6fbb79798 Mon Sep 17 00:00:00 2001 -From: William Breathitt Gray -Date: Tue, 27 Aug 2019 20:41:07 +0900 -Subject: [PATCH] Pass -ltinfo to linker - ---- - makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/makefile b/makefile -index e093bb1..eb3f759 100644 ---- a/makefile -+++ b/makefile -@@ -1109,7 +1109,7 @@ endif - # Use gcc to link fbc from the bootstrap .o's - # (assuming the rtlib was built already) - ifneq ($(filter darwin freebsd linux netbsd openbsd solaris,$(TARGET_OS)),) -- BOOTSTRAP_LIBS := -lncurses -lm -pthread -+ BOOTSTRAP_LIBS := -ltinfo -lncurses -lm -pthread - endif - $(BOOTSTRAP_FBC): rtlib $(BOOTSTRAP_OBJ) - $(QUIET_LINK)$(CC) -o $@ $(libdir)/fbrt0.o bootstrap/$(FBTARGET)/*.o $(libdir)/libfb.a $(BOOTSTRAP_LIBS) --- -2.22.1 - From 30ecba553847add9b44b2f038e5852e3e49532fe Mon Sep 17 00:00:00 2001 From: William Breathitt Gray Date: Thu, 29 Apr 2021 20:57:43 +0900 Subject: [PATCH 06/23] dev-lang/fbc: Drop old version Signed-off-by: William Breathitt Gray --- dev-lang/fbc/fbc-1.07.2-r1.ebuild | 92 ------------------------------- 1 file changed, 92 deletions(-) delete mode 100644 dev-lang/fbc/fbc-1.07.2-r1.ebuild diff --git a/dev-lang/fbc/fbc-1.07.2-r1.ebuild b/dev-lang/fbc/fbc-1.07.2-r1.ebuild deleted file mode 100644 index 324c8741cc..0000000000 --- a/dev-lang/fbc/fbc-1.07.2-r1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A free/open source, multi-platform BASIC compiler." -HOMEPAGE="https://www.freebasic.net" -SRC_URI=" - https://github.com/freebasic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/freebasic/${PN}/releases/download/${PV}/FreeBASIC-${PV}-source-bootstrap.tar.xz -" - -LICENSE="FDL-1.2 GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gpm libffi opengl X" - -DEPEND=" - sys-libs/ncurses:= - gpm? ( sys-libs/gpm ) - libffi? ( dev-libs/libffi ) - opengl? ( virtual/opengl ) - X? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXpm - x11-libs/libXrandr - x11-libs/libXrender - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-1.07.0-Pass-ltinfo-to-linker.patch" ) - -DOCS="${S}/doc/fbc.1" - -BOOTSTRAP_S="${WORKDIR}/FreeBASIC-${PV}-source-bootstrap" - -src_unpack() { - # We only need bootstrap source code if fbc is not already present - if ! has_version dev-lang/fbc; then - unpack "FreeBASIC-${PV}-source-bootstrap.tar.xz" - fi - unpack "${P}.tar.gz" -} - -src_prepare() { - # We only need bootstrap source code if fbc is not already present - if ! has_version dev-lang/fbc; then - cd "${BOOTSTRAP_S}" || die "cd failed" - eapply "${PATCHES[@]}" - cd "${S}" || die "cd failed" - fi - eapply_user -} - -src_compile() { - local fbc="fbc" - local fbcflags="" - - # We only need bootstrap compiler if fbc is not already present - if ! has_version dev-lang/fbc; then - cd "${BOOTSTRAP_S}" || die "cd failed" - - # Build bootstrap compiler - emake bootstrap-minimal - - # Set bootstrap compiler to build fbc - fbc="${BOOTSTRAP_S}/bin/fbc" - fbcflags="-i ${BOOTSTRAP_S}/inc" - - cd "${S}" || die "cd failed" - fi - - local xcflags=( - $(usex gpm "" "-DDISABLE_GPM") - $(usex libffi "" " -DDISABLE_FFI") - $(usex opengl "" " -DDISABLE_OPENGL") - $(usex X "" " -DDISABLE_X11") - ) - - # fbc requires a space after the -Wl option - local fblflags="${LDFLAGS//-Wl,/-Wl }" - - # Build fbc - emake CFLAGS="${CFLAGS} ${xcflags[*]} -I/usr/$(get_libdir)/libffi/include" FBC="${fbc}" FBCFLAGS="${fbcflags}" FBLFLAGS="${fblflags}" TARGET="${CHOST}" -} - -src_install() { - emake DESTDIR="${D}" prefix="/usr" TARGET="${CHOST}" install - einstalldocs -} From 55d3efc5a491601620c1646d3400fe5182e1b0c8 Mon Sep 17 00:00:00 2001 From: William Breathitt Gray Date: Thu, 29 Apr 2021 20:59:12 +0900 Subject: [PATCH 07/23] dev-lang/fbc-bootstrap: Drop old version Closes: https://bugs.gentoo.org/781005 Signed-off-by: William Breathitt Gray --- dev-lang/fbc-bootstrap/Manifest | 1 - .../fbc-bootstrap/fbc-bootstrap-1.07.2.ebuild | 26 ------------------- 2 files changed, 27 deletions(-) delete mode 100644 dev-lang/fbc-bootstrap/fbc-bootstrap-1.07.2.ebuild diff --git a/dev-lang/fbc-bootstrap/Manifest b/dev-lang/fbc-bootstrap/Manifest index 0546ca8826..934b90671d 100644 --- a/dev-lang/fbc-bootstrap/Manifest +++ b/dev-lang/fbc-bootstrap/Manifest @@ -1,2 +1 @@ -DIST FreeBASIC-1.07.2-source-bootstrap.tar.xz 10700992 BLAKE2B e7016e5f58ae79086c0445bf6a09f33d4335af771422778be407e3351d583522e16f137763e471ba88e47b4318ab5bd2aec882ef5e5ff85cc334b0eccf27fdc5 SHA512 f381d14343496f68d3401ad1a66ff4fb1314270eddebb72ed2bc5624b856c4b29e7e14062f531a5158d892bb73d9aa80ff54fe7c260b4b8967b1330d26b2ecfc DIST FreeBASIC-1.07.3-source-bootstrap.tar.xz 10702984 BLAKE2B dbf68351c54d9a1ec6f5952e7867bc370fdc36db406c9a76d18f9e85757c26f3c954d91ce56593af9ceacf1e24e8038ba7cfeaa66a988923fd5d57d5f160584d SHA512 59a06e633b2bf5054d2b5f7a9da7e539a51657a20d50ac2e055255dab30acc87e03596a53613e1d7f1ac74798d4919b5d7aa32b20a229c7725ebc1e53460b70e diff --git a/dev-lang/fbc-bootstrap/fbc-bootstrap-1.07.2.ebuild b/dev-lang/fbc-bootstrap/fbc-bootstrap-1.07.2.ebuild deleted file mode 100644 index 747c02a567..0000000000 --- a/dev-lang/fbc-bootstrap/fbc-bootstrap-1.07.2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Bootstrap package for dev-lang/fbc" -HOMEPAGE="https://www.freebasic.net" -SRC_URI="https://github.com/freebasic/fbc/releases/download/${PV}/FreeBASIC-${PV}-source-bootstrap.tar.xz" - -LICENSE="FDL-1.2 GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -PATCHES=( "${FILESDIR}"/fbc-1.07.0-Pass-ltinfo-to-linker.patch ) - -S="${WORKDIR}/FreeBASIC-${PV}-source-bootstrap" - -src_compile() { - emake bootstrap-minimal -} - -src_install() { - newbin bin/fbc fbc-bootstrap - emake DESTDIR="${D}" prefix="/usr/share/freebasic-bootstrap" TARGET=${CHOST} install-includes - emake DESTDIR="${D}" prefix="/usr/share/freebasic-bootstrap" TARGET=${CHOST} install-rtlib -} From a8c0c82417f73f98ede069c181eb4c8ec3cd7c4a Mon Sep 17 00:00:00 2001 From: William Breathitt Gray Date: Thu, 29 Apr 2021 21:05:19 +0900 Subject: [PATCH 08/23] dev-lang/fbc-bootstrap: Remove William Breathitt Gray as maintainer Signed-off-by: William Breathitt Gray --- dev-lang/fbc-bootstrap/metadata.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dev-lang/fbc-bootstrap/metadata.xml b/dev-lang/fbc-bootstrap/metadata.xml index 5ef896cc90..a2056f3a9b 100644 --- a/dev-lang/fbc-bootstrap/metadata.xml +++ b/dev-lang/fbc-bootstrap/metadata.xml @@ -5,10 +5,6 @@ This package is used only to boot strap dev-lang/fbc. It is not meant to be used by end users directly. - - vilhelm.gray@gmail.com - William Breathitt Gray - https://github.com/freebasic/fbc/issues https://www.freebasic.net From 36563c1d617431c22533d96ba603d8de8e8cd396 Mon Sep 17 00:00:00 2001 From: William Breathitt Gray Date: Thu, 29 Apr 2021 21:06:34 +0900 Subject: [PATCH 09/23] dev-lang/fbc: Remove William Breathitt Gray as maintainer Signed-off-by: William Breathitt Gray --- dev-lang/fbc/metadata.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dev-lang/fbc/metadata.xml b/dev-lang/fbc/metadata.xml index 4ea4d49671..cf1e493334 100644 --- a/dev-lang/fbc/metadata.xml +++ b/dev-lang/fbc/metadata.xml @@ -7,10 +7,6 @@ new features such as pointers, unsigned data types, inline assembly, object orientation, and many others. - - vilhelm.gray@gmail.com - William Breathitt Gray - https://github.com/freebasic/fbc/issues https://www.freebasic.net From 3ad9fe8f741b1fe67da5652a0b553e11044c2564 Mon Sep 17 00:00:00 2001 From: Samuel Bauer Date: Thu, 29 Apr 2021 14:52:08 +0200 Subject: [PATCH 10/23] games-emulation/yuzu: drop compatibility list support Signed-off-by: Samuel Bauer --- games-emulation/yuzu/yuzu-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild index 545451680c..fe7ee3c0b5 100644 --- a/games-emulation/yuzu/yuzu-9999.ebuild +++ b/games-emulation/yuzu/yuzu-9999.ebuild @@ -112,6 +112,6 @@ src_configure() { ) cmake_src_configure - # This would be better in src_unpack but it would be unlinked - mv "${S}"/compatibility_list.json "${BUILD_DIR}"/dist/compatibility_list/ || die + ## This would be better in src_unpack but it would be unlinked + #mv "${S}"/compatibility_list.json "${BUILD_DIR}"/dist/compatibility_list/ || die } From 0bc42939052c20522a125c2af6f5821217d4a7a2 Mon Sep 17 00:00:00 2001 From: Samuel Bauer Date: Thu, 29 Apr 2021 16:19:29 +0200 Subject: [PATCH 11/23] games-emulation/yuzu: update sdl requirements Signed-off-by: Samuel Bauer --- games-emulation/yuzu/yuzu-9999.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild index fe7ee3c0b5..9ffff31847 100644 --- a/games-emulation/yuzu/yuzu-9999.ebuild +++ b/games-emulation/yuzu/yuzu-9999.ebuild @@ -10,7 +10,7 @@ inherit cmake git-r3 flag-o-matic toolchain-funcs xdg DESCRIPTION="An emulator for Nintendo Switch" HOMEPAGE="https://yuzu-emu.org" EGIT_REPO_URI="https://github.com/yuzu-emu/yuzu" -EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus' ) +EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus' '-SDL' ) # TODO '-Vulkan-Headers' need to fix API in code # TODO '-xbyak' wait for bump in tree # TODO cubeb auto-links to jack, pulse, alsa .., allow determining cubeb output @@ -32,7 +32,7 @@ DEPEND=" >=dev-qt/qtwidgets-5.15 ) sdl? ( - media-libs/libsdl2 + >=media-libs/libsdl2-2.0.14 >=dev-libs/inih-52 ) >=app-arch/lz4-1.8 From 6a5c5eef7a33520fb29783ca9d5768c58852babc Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Thu, 29 Apr 2021 16:38:10 +0200 Subject: [PATCH 12/23] net-misc/castor: Update checksums. Upstream checksums are different but not changed. Probably due to . Closes: https://bugs.gentoo.org/786837 Signed-off-by: Ronny (tastytea) Gutbrod --- net-misc/castor/Manifest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/castor/Manifest b/net-misc/castor/Manifest index 28574d890d..0fc321f859 100644 --- a/net-misc/castor/Manifest +++ b/net-misc/castor/Manifest @@ -10,8 +10,8 @@ DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022 DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a DIST cairo-rs-0.8.1.crate 46018 BLAKE2B f3879b08d404495a401df205a4e51c67caa36722e0661b6eb3bc6c1dc830d52b01149d4cb27ad2c40b4870771f9f5f356ed1cd02c879dcce3bba5e18fd81b7a8 SHA512 33ec3b7b1069934aae88b76c11a6be76974fdc6d2eedee3e6d20328a4a2df7d248960a3fa4de7deb696f6c0dd332f77f9d8004cdf0bc36be1187cbb5ccf9b682 DIST cairo-sys-rs-0.9.2.crate 11650 BLAKE2B ac664b7976de57907ae543c1afc2fd8fe166b2a147e1be31d6f60aec0b08949bb53b9f59c16e02f33a299a225f8e8202c5d7ad744c6aa8c5f03ec421a773ff33 SHA512 cab877b76951212710c7e668093fda218ac9c7e1e26fcffc448d759a3f968a7faeeea347025189a1aee7579b15916c141d0d727f986bb7061183a695b52bf39b -DIST castor-0.8.15.tar.gz 91971 BLAKE2B c66c5cb3a3453ea669b78a74d99c7310a3f7de4ba3493d9d1eef1c98f9139d36beff715ad3fdedd2bfc4cba692e6adf982a5ecf6290c489040c32d536d06d1cf SHA512 4534f263992c1c000719e44ab6172eba0e6333bcb955b7073b98f8b32a0a1a283648fe14bb498a2afecead23a01808ca5abdacf4ee3707e21bfb0fbb03c70165 -DIST castor-0.8.16.tar.gz 92128 BLAKE2B 6307ae98a23413fe758e0c9d25c8aa7ebbd2830b0e33f795c599b332ec35af293c994036d9b55c7ac4062101a6ecca5a967bf96942a0d604214cd11462f20bd2 SHA512 a26c56fc6258f67d7f97cb0b2ec264ebede7a20b0ac167e0aaee35cc02d7326da84febf881d3473a93cd441a372d9466d5bf816fd662fe0ad09f008c566a8c2a +DIST castor-0.8.15.tar.gz 92121 BLAKE2B c83ad5f923c3cac5264f044cbffa59eeb8b08c6e09c3a6393a564f31c8edddbd1e944ef8e5dee8be11dc248fd707081f9e2c1560f7650e301bedb993391e2c22 SHA512 0fe588fda71d8c642b11fe44f2763bbc0574aa5f54bf0f83770c690ea17f66d65f3086bc4bce27bdf073974f6639371231b45ea96fd0f5cea28c552a843c1714 +DIST castor-0.8.16.tar.gz 92279 BLAKE2B 5b244850a5d350df083b9a3ee028fabe576a037b6c3de8f76f90aecaf9d12e0610f05bb9e65c73967c09240d56f6457f6d0168245de33ac2181ade35e9c4723c SHA512 e2a5911003499e0ee9ac2b8687a9bf8a8a46f8f841bbe67d1ad487022f7b0ab5f08c11454053c9ebd0ba4eb0ba253c46f4a312782cc97a2dd8ca941e6ea23f02 DIST cc-1.0.55.crate 52090 BLAKE2B 1ace1ad556b030d3d81dd9af06767acf6e31d00f3eabf5d72a41a537e4e984defdac4ab0d802cbf83dee3f726a9aefd9c87ed702fec08a0cc9ed1e1410544b40 SHA512 a20aa18cfba9ee0d9fa0bbf3117be6d37c4420ef45e1b01f5505b138ffb2b2052c9464f964c5c2881f93fd4c903cb3b78b4c15ed14ea27585351313f189d1725 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01 From da79392782e1d0096eb094e8337dbbd7779fcc39 Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Thu, 29 Apr 2021 18:24:03 +0200 Subject: [PATCH 13/23] media-libs/vips: Add test dependencies. Some tests need JPEG and PNG support. Closes: https://bugs.gentoo.org/786210 Signed-off-by: Ronny (tastytea) Gutbrod --- media-libs/vips/vips-8.10.6.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/media-libs/vips/vips-8.10.6.ebuild b/media-libs/vips/vips-8.10.6.ebuild index 860d2d5aa8..1dbc34b978 100644 --- a/media-libs/vips/vips-8.10.6.ebuild +++ b/media-libs/vips/vips-8.10.6.ebuild @@ -11,8 +11,9 @@ HOMEPAGE="https://libvips.github.io/libvips/" LICENSE="LGPL-2.1+" SLOT="1" KEYWORDS="~amd64 ~x86" -IUSE="doc debug exif fftw fits heif gsf graphicsmagick imagemagick imagequant jpeg lcms matio openexr orc pango pdf png svg static-libs tiff webp zlib" -REQUIRED_USE="imagequant? ( png )" +IUSE="doc debug exif fftw fits heif gsf graphicsmagick imagemagick imagequant jpeg lcms matio openexr orc pango pdf png svg static-libs test tiff webp zlib" +REQUIRED_USE="imagequant? ( png ) test? ( jpeg png )" +RESTRICT="!test? ( test )" # FIXME: nitfi (FIND_NIFTI) # openslide? ( >=media-libs/openslide-3.3.0 ) From 9b29bd2ce654700486b2d1f1232c83bc4dcda804 Mon Sep 17 00:00:00 2001 From: tiotags Date: Thu, 29 Apr 2021 22:05:17 +0300 Subject: [PATCH 14/23] www-servers/hinsightd: version bump v0.9.2 Closes: https://bugs.gentoo.org/786822 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Alexandru Campeanu --- www-servers/hinsightd/Manifest | 2 +- .../{hinsightd-0.9.1.ebuild => hinsightd-0.9.2.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename www-servers/hinsightd/{hinsightd-0.9.1.ebuild => hinsightd-0.9.2.ebuild} (100%) diff --git a/www-servers/hinsightd/Manifest b/www-servers/hinsightd/Manifest index e91d4ba719..bd726cf855 100644 --- a/www-servers/hinsightd/Manifest +++ b/www-servers/hinsightd/Manifest @@ -1 +1 @@ -DIST hin9-v0.9.1.tar.gz 64851 BLAKE2B ca646af3b2a752f2b0ba2eec983f807d148b302a7a2db627117686dea3d16811829a1f89a3347708c775d8141372dd91ca46c79c32684b9366b703eb7018706e SHA512 175bbb25bd8be5052bcda96b709b33a996945c63f71249750ab11a46bafdb425818437023a882858e34692abc341d99141954ca31f6296383b26f617e76ac11a +DIST hin9-v0.9.2.tar.gz 65277 BLAKE2B 64f68db310ddd9438bd2b0247a285a9f7c4b162bfb105802760e4a231693116d159aaa4052d9c596356a2a6768379033b0bc1334a4da9ec9c845a1c835965922 SHA512 1ce3fd028e32be3daabf0b743c1005e9670df4f704c862aa871418dcb877d1780c174ae1c054be06bea62600e573a9ef80e67e4759c6722f9e25f3d656faa431 diff --git a/www-servers/hinsightd/hinsightd-0.9.1.ebuild b/www-servers/hinsightd/hinsightd-0.9.2.ebuild similarity index 100% rename from www-servers/hinsightd/hinsightd-0.9.1.ebuild rename to www-servers/hinsightd/hinsightd-0.9.2.ebuild From d09ae1a39e6408d3577ef7037fc8738b83aaeae8 Mon Sep 17 00:00:00 2001 From: Samuel Bauer Date: Thu, 29 Apr 2021 22:04:42 +0200 Subject: [PATCH 15/23] app-emulation/arnold: new ebuild Signed-off-by: Samuel Bauer --- app-emulation/arnold/Manifest | 1 + app-emulation/arnold/arnold-20170513.ebuild | 51 ++++++++++++++++++++ app-emulation/arnold/files/arnold.png | Bin 0 -> 378 bytes app-emulation/arnold/metadata.xml | 11 +++++ 4 files changed, 63 insertions(+) create mode 100644 app-emulation/arnold/Manifest create mode 100644 app-emulation/arnold/arnold-20170513.ebuild create mode 100644 app-emulation/arnold/files/arnold.png create mode 100644 app-emulation/arnold/metadata.xml diff --git a/app-emulation/arnold/Manifest b/app-emulation/arnold/Manifest new file mode 100644 index 0000000000..108e379005 --- /dev/null +++ b/app-emulation/arnold/Manifest @@ -0,0 +1 @@ +DIST arnold-20170513.zip 17247943 BLAKE2B 53212fe2b517adb065b874c9b2c86a322429f87e22d563bb6cc63a48a37d4498aaaece6bee05a4509b7940a3b38af2f6c7fb40043a448ae56a15284079f010d8 SHA512 f1e56d7a887e459cc9679582ffebd230c7c86a971832a6030a12f5025c32a70338f3f6b3060c925321d0fd52759097a3ecb1801d2fbd75ceaa668e98184cc0ca diff --git a/app-emulation/arnold/arnold-20170513.ebuild b/app-emulation/arnold/arnold-20170513.ebuild new file mode 100644 index 0000000000..ceda03f89b --- /dev/null +++ b/app-emulation/arnold/arnold-20170513.ebuild @@ -0,0 +1,51 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop wxwidgets + +DESCRIPTION="Amstrad CPC emulator" +HOMEPAGE="http://www.cpctech.org.uk" +SRC_URI="http://cpctech.cpc-live.com/arnsrc.zip -> ${P}.zip" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="inkz80" + +DEPEND=" + media-libs/libsdl2 + virtual/opengl +" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/src + +WX_GTK_VER="3.0-gtk3" + +src_prepare() { + setup-wxwidgets + sed -i "4421s:=.*$:=wxT(\"/usr/share/${PN}/\");:" arngui/arnguiApp.cpp || die + # Prevent running at 150% of original speed + sed -i '390s/20000/30000/' arngui/sdl2/SDL2PlatformSpecific.cpp || die + cmake_src_prepare +} + +src_configure() { + mycmakeargs=( + -DBUILD_SHARED_LIBS=OFF + -DCMAKE_SKIP_RPATH=YES + -DZ80_VERSION="USE_$(usex inkz80 INK ARN)Z80" + -DSDL_VERSION="USE_SDL2" + ) + cmake_src_configure +} + +src_install() { + cd "${WORKDIR}"/exe/Gentoo/${PN} || die + doicon "${FILESDIR}"/${PN}.png + insinto /usr/share/${PN}/ + dobin arnold + doins *.* +} diff --git a/app-emulation/arnold/files/arnold.png b/app-emulation/arnold/files/arnold.png new file mode 100644 index 0000000000000000000000000000000000000000..e54d0be9317f0e8eb6143d508c70b4679fbe66c9 GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvmUKs7M+SzC{oH>NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fgAsyfo;tHgJ;6G3q1H*v> z2O1h0Ae{gI{|6d$0F^T^mIV0)GdMiEkp|)~@oc>21sUttwvWahYY z_fQT{$lue&F+}5ha)JW00oNjiUz{A8yIXb~5(r~Vd>p{Sz}c~M>H*OmNumP!`mWa} z^%;n+Zm6iV+$E+GypfAx>y$+qjLhO12Xq@2wk}dokz`=V7jk0kTNyYPXtZjHYeY#( zVo9o1a#1RfVlXl=G}Se*&^0y;F)*|;HnlP})iyA)GBCKV|41A~LvDUbW?CgsgMo>z hfvK*M5lDl9v6X=ZL<8S)r^`SM44$rjF6*2UngDB=XdnOp literal 0 HcmV?d00001 diff --git a/app-emulation/arnold/metadata.xml b/app-emulation/arnold/metadata.xml new file mode 100644 index 0000000000..257786bedf --- /dev/null +++ b/app-emulation/arnold/metadata.xml @@ -0,0 +1,11 @@ + + + + + mazes-80 + mazes-80@none.org + + + Use inkz80 processor emulation + + From 3476a3262beada5fd1f938c649228e0a6fb09b07 Mon Sep 17 00:00:00 2001 From: Samuel Bauer Date: Thu, 29 Apr 2021 22:18:56 +0200 Subject: [PATCH 16/23] games-action/blackvoxel: new ebuild Signed-off-by: Samuel Bauer --- games-action/blackvoxel/Manifest | 1 + .../blackvoxel/blackvoxel-2.42.ebuild | 48 +++++++++++++++++++ .../blackvoxel/blackvoxel-9999.ebuild | 46 ++++++++++++++++++ .../files/blackvoxel-2.42-makefile.patch | 30 ++++++++++++ .../files/blackvoxel-2.42-savedir.patch | 18 +++++++ games-action/blackvoxel/metadata.xml | 8 ++++ 6 files changed, 151 insertions(+) create mode 100644 games-action/blackvoxel/Manifest create mode 100644 games-action/blackvoxel/blackvoxel-2.42.ebuild create mode 100644 games-action/blackvoxel/blackvoxel-9999.ebuild create mode 100644 games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch create mode 100644 games-action/blackvoxel/files/blackvoxel-2.42-savedir.patch create mode 100644 games-action/blackvoxel/metadata.xml diff --git a/games-action/blackvoxel/Manifest b/games-action/blackvoxel/Manifest new file mode 100644 index 0000000000..9493eb6ce8 --- /dev/null +++ b/games-action/blackvoxel/Manifest @@ -0,0 +1 @@ +DIST blackvoxel-2.42.tar.bz2 18367949 BLAKE2B f45da57846370ae2109709cb28f3bb02fbd63ff208306705dd8da544737f84250542a4c58b3889e603f16ca898f9ee4458361c326fd28f68cb2a70f891de0f67 SHA512 275c7cb34c58bbd772bc1daf7beb26395c509d37341fe1c343f745bc3fa73223f9d36b275f0813a06908f258b39f94c1e4229f8e27fb822cf71881e66fccd3fb diff --git a/games-action/blackvoxel/blackvoxel-2.42.ebuild b/games-action/blackvoxel/blackvoxel-2.42.ebuild new file mode 100644 index 0000000000..125773d8b5 --- /dev/null +++ b/games-action/blackvoxel/blackvoxel-2.42.ebuild @@ -0,0 +1,48 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop eutils xdg + +DESCRIPTION="Blackvoxel Video Game" +HOMEPAGE="https://www.blackvoxel.com/" +SRC_URI="https://www.blackvoxel.com/dm_download.php?file=163&key=1 -> ${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + dev-libs/expat + media-libs/alsa-lib + media-libs/glew:0 + media-libs/libsdl + x11-libs/libX11 + virtual/opengl +" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PN}_source_${PV//./_}" + +PATCHES=( + "${FILESDIR}"/${P}-makefile.patch + "${FILESDIR}"/${P}-savedir.patch +) + +src_compile() { + emake blackvoxeldatadir="/usr/share/${PN}" bindir="/usr/bin" +} + +src_install() { + dodoc Contributors.txt + doman blackvoxel.6 + newicon -s 16 Icons/blackvoxel-16x16.png blackvoxel.png + newicon -s 32 Icons/blackvoxel-32x32.png blackvoxel.png + newicon -s 128 Icons/blackvoxel_128x128.png blackvoxel.png + + dobin blackvoxel + insinto "/usr/share/${PN}" + doins -r Misc Sound VoxelTypes gui randomnum.dat +} diff --git a/games-action/blackvoxel/blackvoxel-9999.ebuild b/games-action/blackvoxel/blackvoxel-9999.ebuild new file mode 100644 index 0000000000..6e3d112565 --- /dev/null +++ b/games-action/blackvoxel/blackvoxel-9999.ebuild @@ -0,0 +1,46 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils git-r3 + +DESCRIPTION="Blackvoxel Video Game" +HOMEPAGE="https://www.blackvoxel.com/" +EGIT_REPO_URI="https://github.com/Blackvoxel/Blackvoxel" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="" +IUSE="" + +DEPEND=" + dev-libs/expat + media-libs/alsa-lib + media-libs/glew:0 + media-libs/libsdl + x11-libs/libX11 + virtual/opengl +" +RDEPEND="${DEPEND}" + +src_prepare() { + sed -i -e '/COMPILEOPTION_SAVEFOLDERNAME/s:Blackvoxel:.local/share/blackvoxel:' \ + src/ACompileSettings.h || die + sed -i -e 's/LDFLAGS=/LDFLAGS+= /' -e 's/LDFLAGS/s/-s //' \ + -e '/(CPU_BITS)/ { s/; make //; s/cd/+make -C/}' \ + -e '/CFLAGS+/d' -e 's/CFLAGS=/CFLAGS+=/' Makefile || die + default +} + +src_compile() { + emake blackvoxeldatadir="/usr/share/${PN}" bindir="/usr/bin" +} + +src_install() { + dodoc Contributors.txt README.md + + dobin blackvoxel + insinto "/usr/share/${PN}" + doins -r Misc Sound VoxelTypes gui randomnum.dat +} diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch new file mode 100644 index 0000000000..5ce5184b4d --- /dev/null +++ b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch @@ -0,0 +1,30 @@ +--- a/Makefile ++++ b/Makefile +@@ -11,7 +11,7 @@ + CC=g++ + LD=g++ + PROGNAME=blackvoxel +-CFLAGS=-I "src/sc_Squirrel3/include" -DCOMPILEOPTION_DEMO=0 -DDEVELOPPEMENT_ON=0 -DCOMPILEOPTION_SPECIAL=0 -DCOMPILEOPTION_DATAFILESPATH="\"$(blackvoxeldatadir)\"" ++CFLAGS+=-I "src/sc_Squirrel3/include" -DCOMPILEOPTION_DEMO=0 -DDEVELOPPEMENT_ON=0 -DCOMPILEOPTION_SPECIAL=0 -DCOMPILEOPTION_DATAFILESPATH="\"$(blackvoxeldatadir)\"" + SRC= $(wildcard src/*.cpp) $(wildcard src/z/*.cpp) + OBJ= $(SRC:src/%.cpp=obj/%.o) + +@@ -28,8 +28,7 @@ + KERNELNAME =$(shell uname -s) + + ifeq ($(KERNELNAME),Linux) +- CFLAGS+= -O3 -c -fmessage-length=0 +- LDFLAGS=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib ++ LDFLAGS+= -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib + else ifeq ($(KERNELNAME), FreeBSD) + # To be done... + CFLAGS+= -O3 -c -fmessage-length=0 +@@ -57,7 +56,7 @@ + + + squirrel: +- cd src/sc_Squirrel3 ; make sq$(CPU_BITS) ++ +make -C src/sc_Squirrel3 sq$(CPU_BITS) + + clean: + @rm -rf obj diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-savedir.patch b/games-action/blackvoxel/files/blackvoxel-2.42-savedir.patch new file mode 100644 index 0000000000..d5bad7b218 --- /dev/null +++ b/games-action/blackvoxel/files/blackvoxel-2.42-savedir.patch @@ -0,0 +1,18 @@ +--- a/src/ACompileSettings.h ++++ b/src/ACompileSettings.h +@@ -129,13 +129,11 @@ + + #ifdef __linux__ + +- #define COMPILEOPTION_SAVEFOLDERNAME "Blackvoxel" ++ #define COMPILEOPTION_SAVEFOLDERNAME ".local/share/blackvoxel" + #define COMPILEOPTION_USEHOMEDIRSTORAGE 1 + #define COMPILEOPTION_WINXPTIMECOMPUTING 0 + +- #if DEVELOPPEMENT_ON == 1 +- #define COMPILEOPTION_DATAFILESPATH "" +- #else ++ #if DEVELOPPEMENT_ON == 0 + #ifndef COMPILEOPTION_DATAFILESPATH + #if COMPILEOPTION_ONLYSCHOOLMODE + #define COMPILEOPTION_DATAFILESPATH "/usr/share/blackvoxel_school" diff --git a/games-action/blackvoxel/metadata.xml b/games-action/blackvoxel/metadata.xml new file mode 100644 index 0000000000..ffffe40227 --- /dev/null +++ b/games-action/blackvoxel/metadata.xml @@ -0,0 +1,8 @@ + + + + + mazes-80 + mazes-80@none.org + + From 0bbe59f19e3cd7cb2941dbdbf740514b23098971 Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Thu, 29 Apr 2021 23:41:34 +0200 Subject: [PATCH 17/23] dev-lang/quickjs: Remove hard-coded tools, make it respect flags. Closes: https://bugs.gentoo.org/784941 Closes: https://bugs.gentoo.org/781008 Signed-off-by: Ronny (tastytea) Gutbrod --- dev-lang/quickjs/quickjs-2020.11.08.ebuild | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dev-lang/quickjs/quickjs-2020.11.08.ebuild b/dev-lang/quickjs/quickjs-2020.11.08.ebuild index 7b32fafd7c..1a296d5899 100644 --- a/dev-lang/quickjs/quickjs-2020.11.08.ebuild +++ b/dev-lang/quickjs/quickjs-2020.11.08.ebuild @@ -3,6 +3,8 @@ EAPI=7 +inherit toolchain-funcs + MY_P="${PN}-${PV//./-}" DESCRIPTION="Small embeddable Javascript engine" @@ -19,5 +21,14 @@ src_prepare() { -e '/$(STRIP) .*/d' \ Makefile || die "Failed setting prefix" + sed -Ei '/^\s*(CC|AR)=/d' Makefile \ + || die "Failed to remove hard-coded tools." + + sed -Ei 's/(^\s*(C|LD)FLAGS)=/\1\+=/' Makefile \ + || die "Failed to change build flag assignment into addition." + + export CC="$(tc-getCC)" + export AR="$(tc-getAR)" + default } From cb92f649888c05df354386c9593e695bb4bb5141 Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Fri, 30 Apr 2021 00:09:16 +0200 Subject: [PATCH 18/23] dev-lang/quickjs: Remove TTY check in test. Closes: https://bugs.gentoo.org/783987 Signed-off-by: Ronny (tastytea) Gutbrod --- ...-2020.11.08_Remove-TTY-check-in-test.patch | 25 +++++++++++++++++++ dev-lang/quickjs/quickjs-2020.11.08.ebuild | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 dev-lang/quickjs/files/quickjs-2020.11.08_Remove-TTY-check-in-test.patch diff --git a/dev-lang/quickjs/files/quickjs-2020.11.08_Remove-TTY-check-in-test.patch b/dev-lang/quickjs/files/quickjs-2020.11.08_Remove-TTY-check-in-test.patch new file mode 100644 index 0000000000..bf7957d3ee --- /dev/null +++ b/dev-lang/quickjs/files/quickjs-2020.11.08_Remove-TTY-check-in-test.patch @@ -0,0 +1,25 @@ +From aa3c213319f6df61f727a604798e8c120b7c37f4 Mon Sep 17 00:00:00 2001 +From: tastytea +Date: Fri, 30 Apr 2021 00:03:42 +0200 +Subject: [PATCH] Remove TTY check in test. + +--- + tests/test_std.js | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/tests/test_std.js b/tests/test_std.js +index 3ea6e34..a12cb81 100644 +--- a/tests/test_std.js ++++ b/tests/test_std.js +@@ -143,8 +143,6 @@ function test_os() + { + var fd, fpath, fname, fdir, buf, buf2, i, files, err, fdate, st, link_path; + +- assert(os.isatty(0)); +- + fdir = "test_tmp_dir"; + fname = "tmp_file.txt"; + fpath = fdir + "/" + fname; +-- +2.26.3 + diff --git a/dev-lang/quickjs/quickjs-2020.11.08.ebuild b/dev-lang/quickjs/quickjs-2020.11.08.ebuild index 1a296d5899..c787f5c8ad 100644 --- a/dev-lang/quickjs/quickjs-2020.11.08.ebuild +++ b/dev-lang/quickjs/quickjs-2020.11.08.ebuild @@ -15,6 +15,8 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" +PATCHES=( "${FILESDIR}/${PN}-2020.11.08_Remove-TTY-check-in-test.patch" ) + src_prepare() { sed -i \ -e 's;prefix=/usr/local;prefix=/usr;' \ From 55cc99be60d45eea636071cdb623d59156805425 Mon Sep 17 00:00:00 2001 From: "Ronny (tastytea) Gutbrod" Date: Fri, 30 Apr 2021 00:10:55 +0200 Subject: [PATCH 19/23] dev-lang/quickjs: Version bump: 2021.03.27. Signed-off-by: Ronny (tastytea) Gutbrod --- dev-lang/quickjs/Manifest | 1 + dev-lang/quickjs/quickjs-2021.03.27.ebuild | 36 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 dev-lang/quickjs/quickjs-2021.03.27.ebuild diff --git a/dev-lang/quickjs/Manifest b/dev-lang/quickjs/Manifest index 0ce68514d3..63f196f342 100644 --- a/dev-lang/quickjs/Manifest +++ b/dev-lang/quickjs/Manifest @@ -1 +1,2 @@ DIST quickjs-2020-11-08.tar.xz 752132 BLAKE2B 6382bac9f42f89f63ee90af1845f3d6370d434f4b05415559801d9e8c4d06ed672b7db8296300e884a1ac8a96e174257b25097ee299689da2d6c2ece42ad680d SHA512 d437813948269bab6046c0219eb20ccea45613073bea1c4eee5b553831fdaaa5e2165b14fcb436e86bf70d488200845f7821864abb6f40b115f0ef7f24971e02 +DIST quickjs-2021-03-27.tar.xz 753556 BLAKE2B a959da95ca4861b5675359ac81598b50a80170ec4f4d819c44d666dd4ecb5a2e11d63230f98b611d5109941f5b21f5c8f791d56d153b818408ec1c59350d5e1d SHA512 eeb810083484df213bc658a8703ca3ef094b7789c2b49eed86cb4068c9f9da401ad0300261d61a163c6ea82306f3ef50bf8e29a64920f704fd8958ef08a7286c diff --git a/dev-lang/quickjs/quickjs-2021.03.27.ebuild b/dev-lang/quickjs/quickjs-2021.03.27.ebuild new file mode 100644 index 0000000000..c787f5c8ad --- /dev/null +++ b/dev-lang/quickjs/quickjs-2021.03.27.ebuild @@ -0,0 +1,36 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +MY_P="${PN}-${PV//./-}" + +DESCRIPTION="Small embeddable Javascript engine" +HOMEPAGE="https://bellard.org/quickjs/" +SRC_URI="https://bellard.org/quickjs/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +PATCHES=( "${FILESDIR}/${PN}-2020.11.08_Remove-TTY-check-in-test.patch" ) + +src_prepare() { + sed -i \ + -e 's;prefix=/usr/local;prefix=/usr;' \ + -e '/$(STRIP) .*/d' \ + Makefile || die "Failed setting prefix" + + sed -Ei '/^\s*(CC|AR)=/d' Makefile \ + || die "Failed to remove hard-coded tools." + + sed -Ei 's/(^\s*(C|LD)FLAGS)=/\1\+=/' Makefile \ + || die "Failed to change build flag assignment into addition." + + export CC="$(tc-getCC)" + export AR="$(tc-getAR)" + + default +} From 46ee80599cf0e0f4a069cbc332bc62a8e83ef64b Mon Sep 17 00:00:00 2001 From: Samuel Bauer Date: Fri, 30 Apr 2021 00:27:24 +0200 Subject: [PATCH 20/23] games-action/blackvoxel: drop eutils Signed-off-by: Samuel Bauer --- games-action/blackvoxel/blackvoxel-2.42.ebuild | 2 +- games-action/blackvoxel/blackvoxel-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/games-action/blackvoxel/blackvoxel-2.42.ebuild b/games-action/blackvoxel/blackvoxel-2.42.ebuild index 125773d8b5..aac110c091 100644 --- a/games-action/blackvoxel/blackvoxel-2.42.ebuild +++ b/games-action/blackvoxel/blackvoxel-2.42.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop eutils xdg +inherit desktop xdg DESCRIPTION="Blackvoxel Video Game" HOMEPAGE="https://www.blackvoxel.com/" diff --git a/games-action/blackvoxel/blackvoxel-9999.ebuild b/games-action/blackvoxel/blackvoxel-9999.ebuild index 6e3d112565..b52f4b8b1b 100644 --- a/games-action/blackvoxel/blackvoxel-9999.ebuild +++ b/games-action/blackvoxel/blackvoxel-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit eutils git-r3 +inherit git-r3 DESCRIPTION="Blackvoxel Video Game" HOMEPAGE="https://www.blackvoxel.com/" From 5acf308c9431a30925d0381398391c0bb806d390 Mon Sep 17 00:00:00 2001 From: Samuel Bauer Date: Fri, 30 Apr 2021 03:09:17 +0200 Subject: [PATCH 21/23] games-emulation/yuzu: unbundle vulkan-headers Signed-off-by: Samuel Bauer --- games-emulation/yuzu/yuzu-9999.ebuild | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild index 9ffff31847..ae1aac9077 100644 --- a/games-emulation/yuzu/yuzu-9999.ebuild +++ b/games-emulation/yuzu/yuzu-9999.ebuild @@ -2,23 +2,18 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -# PYTHON_COMPAT=( python2_7 ) -#inherit cmake git-r3 flag-o-matic python-any-r1 toolchain-funcs xdg inherit cmake git-r3 flag-o-matic toolchain-funcs xdg DESCRIPTION="An emulator for Nintendo Switch" HOMEPAGE="https://yuzu-emu.org" EGIT_REPO_URI="https://github.com/yuzu-emu/yuzu" -EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus' '-SDL' ) -# TODO '-Vulkan-Headers' need to fix API in code +EGIT_SUBMODULES=( '*' '-ffmpeg' '-inih' '-libressl' '-libusb' '-libzip' '-opus' '-SDL' '-Vulkan-Headers' ) # TODO '-xbyak' wait for bump in tree # TODO cubeb auto-links to jack, pulse, alsa .., allow determining cubeb output # media-libs/cubeb would benefit to a lot of packages: dolphin-emu, firefox, citra, self, ... # TODO many submodules produce static libraries which forces to unset BUILD_SHARED_LIBS # this may be better to generate shared libraries and install them under /usr/$(get_libdir)/yuzu -# TODO python2 code should be needed only for submodules test -# until verified keep track of python specific ebuild stuffs as comment LICENSE="GPL-3" SLOT="0" @@ -44,6 +39,7 @@ DEPEND=" >=dev-libs/libzip-1.5 >=media-libs/opus-1.3.1 >=sys-libs/zlib-1.2 + dev-util/vulkan-headers virtual/libusb:1 " # >=dev-libs/xbyak-5.96 @@ -89,7 +85,8 @@ src_prepare() { # sed -i -e '/target_include_directories(xbyak/s:./xbyak/xbyak:/usr/include/xbyak/:' externals/CMakeLists.txt # Unbundle vulkan headers - # sed -i -e 's:../../externals/Vulkan-Headers/include:/usr/include/vulkan/:' src/video_core/CMakeLists.txt src/yuzu/CMakeLists.txt src/yuzu_cmd/CMakeLists.txt + sed -i -e 's:../../externals/Vulkan-Headers/include:/usr/include/vulkan/:' src/video_core/CMakeLists.txt src/yuzu/CMakeLists.txt src/yuzu_cmd/CMakeLists.txt + sed -i -e '/VK_ERROR_INCOMPATIBLE_VERSION_KHR/d' src/video_core/vulkan_common/vulkan_wrapper.cpp # Unbundle discord rapidjson sed -i '/NOT RAPIDJSONTEST/,/endif(NOT RAPIDJSONTEST)/d;/find_file(RAPIDJSON/d;s:\${RAPIDJSON}:"/usr/include/rapidjson":' externals/discord-rpc/CMakeLists.txt || die From 82d2ff05ea04217bfcd504e9066c902f0ce3a6f6 Mon Sep 17 00:00:00 2001 From: Samuel Bauer Date: Fri, 30 Apr 2021 05:15:34 +0200 Subject: [PATCH 22/23] games-action/blackvoxel: drop -zrelro ldflag Signed-off-by: Samuel Bauer --- games-action/blackvoxel/blackvoxel-9999.ebuild | 5 +++-- games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/games-action/blackvoxel/blackvoxel-9999.ebuild b/games-action/blackvoxel/blackvoxel-9999.ebuild index b52f4b8b1b..d20271cefc 100644 --- a/games-action/blackvoxel/blackvoxel-9999.ebuild +++ b/games-action/blackvoxel/blackvoxel-9999.ebuild @@ -27,9 +27,10 @@ RDEPEND="${DEPEND}" src_prepare() { sed -i -e '/COMPILEOPTION_SAVEFOLDERNAME/s:Blackvoxel:.local/share/blackvoxel:' \ src/ACompileSettings.h || die - sed -i -e 's/LDFLAGS=/LDFLAGS+= /' -e 's/LDFLAGS/s/-s //' \ + sed -i -e 's/LDFLAGS=/LDFLAGS+= /' -e '/LDFLAGS/s/-s -zrelro //' \ -e '/(CPU_BITS)/ { s/; make //; s/cd/+make -C/}' \ - -e '/CFLAGS+/d' -e 's/CFLAGS=/CFLAGS+=/' Makefile || die + -e '/CFLAGS+/d' -e 's/CFLAGS=/CFLAGS+=/' \ + Makefile || die default } diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch index 5ce5184b4d..c8e826c68d 100644 --- a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch +++ b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch @@ -15,7 +15,7 @@ ifeq ($(KERNELNAME),Linux) - CFLAGS+= -O3 -c -fmessage-length=0 - LDFLAGS=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib -+ LDFLAGS+= -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib ++ LDFLAGS+= -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib else ifeq ($(KERNELNAME), FreeBSD) # To be done... CFLAGS+= -O3 -c -fmessage-length=0 From dd66bf574e8930d531d826c41b7330071716d2ee Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 30 Apr 2021 09:43:43 +0200 Subject: [PATCH 23/23] app-emulation/arnold: add dep on unzip Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- app-emulation/arnold/arnold-20170513.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/app-emulation/arnold/arnold-20170513.ebuild b/app-emulation/arnold/arnold-20170513.ebuild index ceda03f89b..d026d59eb5 100644 --- a/app-emulation/arnold/arnold-20170513.ebuild +++ b/app-emulation/arnold/arnold-20170513.ebuild @@ -19,6 +19,7 @@ DEPEND=" virtual/opengl " RDEPEND="${DEPEND}" +BDEPEND="app-arch/unzip" S=${WORKDIR}/src