From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 65A1D158020 for ; Mon, 26 Dec 2022 13:33:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87BA5E0968; Mon, 26 Dec 2022 13:33:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6DD46E0968 for ; Mon, 26 Dec 2022 13:33:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7BBDA341123 for ; Mon, 26 Dec 2022 13:33:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C79116F2 for ; Mon, 26 Dec 2022 13:33:30 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1672061534.c3fcffdf3e1a9c54fba9f664c6f11bb194f9986e.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/vice/Manifest app-emulation/vice/vice-3.7.ebuild X-VCS-Directories: app-emulation/vice/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: c3fcffdf3e1a9c54fba9f664c6f11bb194f9986e X-VCS-Branch: master Date: Mon, 26 Dec 2022 13:33:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3c718c5b-af7b-4bed-9c71-3a97359d5736 X-Archives-Hash: 9644a46cd04c416bab207f6caa5693d6 commit: c3fcffdf3e1a9c54fba9f664c6f11bb194f9986e Author: Ionen Wolkens gentoo org> AuthorDate: Mon Dec 26 11:07:07 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Dec 26 13:32:14 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3fcffdf app-emulation/vice: add 3.7 ebuild changes: - drop IUSE=cpuhistory, new upstream default is enabled and just going with that (no deps, and impact should be minimal) - drop IUSE=jpeg, upstream removed support - drop --disable-static QA, not an issue with current portage and just harmless noise if still using an older one - replace deprecated atk dep - adjust for renamed configure options (may be some oversights given a lot of noise in build system changes). Upstream disabled catweasel/parsid/ssi2001 by default leaving only hardsid enabled out of this group. Given rather obscure, left disabled for now with the exception of parsid enabled with USE=parport. If someone use/know these and feel may make sense to enable with USE=pci, parport, or their own USE please file a bug. wrt bug #834359, unfortunately still broken and upstream instead added an explicit check: configure: error: ffmpeg version is not compatible. Use 4.x So keeping the gentoo.org> app-emulation/vice/Manifest | 1 + app-emulation/vice/vice-3.7.ebuild | 189 +++++++++++++++++++++++++++++++++++++ 2 files changed, 190 insertions(+) diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest index ffc8aa7514d5..6f0b856e1933 100644 --- a/app-emulation/vice/Manifest +++ b/app-emulation/vice/Manifest @@ -1 +1,2 @@ DIST vice-3.6.1.tar.gz 11454300 BLAKE2B 129171380f3bd23d579dc29a96419446169cf9a98d2fec82951fa192914846053d213a19b395c9ca30596859cce35bcfea0de0c0a7461c45cb38511a546ca4b2 SHA512 9aeb1c84dc71976d12a9907d60c637ec4cc938aad103340b70a13906bbf2bebab579edc78221c7fba47f0750be3f9ded947200b42fcfc8a9169fb4bb9f288cb7 +DIST vice-3.7.tar.gz 13442624 BLAKE2B 1723db7370e4fbc84148edc6b29f8ad08b153272a8306083add2e412659d7c2178e03372cffde4a3674368b8c4ed6ffd43e37bda158ec97969b400a351e47f7b SHA512 d86157880925070198b482292fa93a98280932824f723df2e62e2b7f7c54f924047bad46d18340ed6e0ce9fc9a786a6cc88f6a1e8433046ab9dec8a638c26b13 diff --git a/app-emulation/vice/vice-3.7.ebuild b/app-emulation/vice/vice-3.7.ebuild new file mode 100644 index 000000000000..f091da7b7b74 --- /dev/null +++ b/app-emulation/vice/vice-3.7.ebuild @@ -0,0 +1,189 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multibuild toolchain-funcs xdg + +DESCRIPTION="Versatile Commodore Emulator" +HOMEPAGE="https://vice-emu.sourceforge.io/" +SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE=" + alsa debug doc ethernet ffmpeg flac gif +gtk headless lame mpg123 + ogg openmp oss parport pci png portaudio pulseaudio sdl zlib" +REQUIRED_USE=" + || ( gtk headless sdl ) + gtk? ( zlib )" + +# ffmpeg/lame are loaded by dlopen(), keeping := to rebuild with same headers +# (see bug #834359 for the ffmpeg upper bound) +RDEPEND=" + virtual/libintl + alsa? ( media-libs/alsa-lib ) + ethernet? ( + net-libs/libpcap + sys-libs/libcap + ) + ffmpeg? ( =app-accessibility/at-spi2-core-2.46:2 + dev-libs/glib:2 + media-libs/fontconfig:1.0 + media-libs/glew:0= + sys-libs/readline:= + virtual/opengl + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3[X] + x11-libs/libX11 + x11-libs/pango + ) + lame? ( media-sound/lame ) + mpg123? ( media-sound/mpg123 ) + ogg? ( + media-libs/libogg + media-libs/libvorbis + ) + parport? ( sys-libs/libieee1284 ) + pci? ( sys-apps/pciutils ) + png? ( media-libs/libpng:= ) + portaudio? ( media-libs/portaudio ) + pulseaudio? ( || ( media-libs/libpulse media-sound/pulseaudio ) ) + sdl? ( + media-libs/libsdl2[video] + media-libs/sdl2-image + sys-libs/readline:= + ) + zlib? ( sys-libs/zlib:= )" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + app-arch/unzip + app-text/dos2unix + dev-embedded/xa + dev-lang/perl + sys-apps/texinfo + sys-devel/flex + sys-devel/gettext + virtual/pkgconfig + app-alternatives/yacc + doc? ( virtual/texi2dvi ) + gtk? ( x11-misc/xdg-utils )" + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_prepare() { + default + + # Strip the predefined C(XX)FLAGS. + sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die + + MULTIBUILD_VARIANTS=( + $(usev gtk) + $(usev headless) + $(usev sdl) + ) + + # Debug build currently broken without copy sources. + multibuild_copy_sources +} + +src_configure() { + tc-export AR + + multibuild_foreach_variant run_in_build_dir multibuild_src_configure +} + +multibuild_src_configure() { + # Append ".variant" to x* programs if building multiple variants. + local xform + (( ${#MULTIBUILD_VARIANTS[@]} > 1 )) && + xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/" + + vice-multi_enable() { + if [[ ${MULTIBUILD_VARIANT} == ${1} ]]; then + echo --enable-${2} + else + echo --disable-${2} + fi + } + + local econfargs=( + --program-transform-name="${xform}" + $(vice-multi_enable gtk desktop-files) + $(vice-multi_enable gtk gtk3ui) + $(vice-multi_enable headless headlessui) + $(vice-multi_enable sdl sdl2ui) + $(usex debug $(vice-multi_enable gtk debug-gtk3ui) --disable-debug-gtk3ui) + $(use_enable debug) + $(use_enable doc pdf-docs) + $(use_enable ethernet) + $(use_enable ffmpeg) + $(use_enable lame) + $(use_enable openmp) + $(use_enable parport libieee1284) + $(use_enable parport parsid) + $(use_enable portaudio) + $(use_with alsa) + $(use_with flac) + $(use_with gif) + $(use_with mpg123) + $(use_with ogg vorbis) + $(use_with oss) + $(use_with png) + $(use_with pulseaudio pulse) + $(use_with zlib) + $(usex alsa --enable-midi $(use_enable oss midi)) + $(usev !pci ac_cv_header_pci_pci_h=no) + --disable-arch + --disable-sdl1ui + ac_cv_lib_ungif_EGifPutLine=no # ensure use giflib, not ungif + + # $(use_with curl libcurl) # new in 3.6 but is a unused placeholder + # --enable-io-simulation # likewise + ) + + econf "${econfargs[@]}" +} + +src_compile() { + multibuild_foreach_variant run_in_build_dir emake +} + +src_install() { + # Get xdg-desktop-menu to play nicely while doing the install. + dodir /etc/xdg/menus /usr/share/{applications,desktop-directories} + + XDG_UTILS_INSTALL_MODE=system \ + XDG_DATA_DIRS="${ED}"/usr/share \ + XDG_CONFIG_DIRS="${ED}"/etc/xdg \ + multibuild_foreach_variant run_in_build_dir default + + rm -f "${ED}"/usr/share/applications/*.cache || die + + vice-install_extras() { + docinto html + dodoc doc/html/*.{html,css} + dodoc -r doc/html/images + + insinto /usr/share/vim/vimfiles/ftdetect + doins doc/vim/ftdetect/*.vim + + insinto /usr/share/vim/vimfiles/syntax + doins doc/vim/syntax/*.vim + } + multibuild_for_best_variant run_in_build_dir vice-install_extras +}