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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6BFEB138350 for ; Tue, 5 May 2020 03:40:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94C0AE087B; Tue, 5 May 2020 03:40:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1E4D0E087B for ; Tue, 5 May 2020 03:40:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6B19634EE8A for ; Tue, 5 May 2020 03:40:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C59302B for ; Tue, 5 May 2020 03:40:28 +0000 (UTC) From: "Richard Yao" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Yao" Message-ID: <1588650016.d0bd604f6b4e61fbb8459ca5217be44ad427b8f7.ryao@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/crossover-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild app-emulation/crossover-bin/crossover-bin-19.0.1-r1.ebuild app-emulation/crossover-bin/crossover-bin-19.0.1.ebuild X-VCS-Directories: app-emulation/crossover-bin/ X-VCS-Committer: ryao X-VCS-Committer-Name: Richard Yao X-VCS-Revision: d0bd604f6b4e61fbb8459ca5217be44ad427b8f7 X-VCS-Branch: master Date: Tue, 5 May 2020 03:40:28 +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: 8f944942-1cb6-46cc-9b65-9f5060830d1a X-Archives-Hash: 6535f12eefabbbb5bf767b1dc4bea903 commit: d0bd604f6b4e61fbb8459ca5217be44ad427b8f7 Author: Richard Yao gentoo org> AuthorDate: Tue May 5 03:39:07 2020 +0000 Commit: Richard Yao gentoo org> CommitDate: Tue May 5 03:40:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0bd604f app-emulation/crossover-bin: Update dependencies * Fixed missing libtiff dependency. * Fixed incorrect dependency on OpenSSL. Crossover switched to gnutls. * Fixed incorrect handling of broken pcap dependency. * Added warning for systems without OpenCL properly configured. * USE=vulkan is now on by default. * A few fixes were backported to the earlier 18.5.0-r1 package Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Richard Yao gentoo.org> .../crossover-bin/crossover-bin-18.5.0-r1.ebuild | 9 ++++-- ...9.0.1.ebuild => crossover-bin-19.0.1-r1.ebuild} | 35 ++++++++++++++++++---- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild index e103a45516a..ccf4360c42c 100644 --- a/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild +++ b/app-emulation/crossover-bin/crossover-bin-18.5.0-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crosso LICENSE="CROSSOVER-3" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l" +IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms ldap +mp3 +nls +openal +opencl +opengl +pcap +png scanner +ssl +v4l +vulkan" REQUIRED_USE=${PYTHON_REQUIRED_USE} RESTRICT="bindist test" @@ -52,7 +52,6 @@ RDEPEND="${DEPEND} >=dev-python/pygtk-2.10:2[${PYTHON_MULTI_USEDEP}] dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] ') - dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) @@ -70,13 +69,17 @@ RDEPEND="${DEPEND} virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) + pcap? ( net-libs/libpcap[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) - ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) + ssl? ( net-libs/gnutls:0/30[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) + vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] ) + dev-util/desktop-file-utils media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] + media-libs/tiff:0[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] diff --git a/app-emulation/crossover-bin/crossover-bin-19.0.1.ebuild b/app-emulation/crossover-bin/crossover-bin-19.0.1-r1.ebuild similarity index 85% rename from app-emulation/crossover-bin/crossover-bin-19.0.1.ebuild rename to app-emulation/crossover-bin/crossover-bin-19.0.1-r1.ebuild index 9c18f4311c8..e3e7f205d8a 100644 --- a/app-emulation/crossover-bin/crossover-bin-19.0.1.ebuild +++ b/app-emulation/crossover-bin/crossover-bin-19.0.1-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crosso LICENSE="CROSSOVER-3" SLOT="0" KEYWORDS="-* ~amd64 ~x86" -IUSE="+capi +cups doc +gphoto2 +gsm gstreamer +jpeg +lcms +ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l vulkan" +IUSE="+capi +cups doc +gphoto2 +gsm +gstreamer +jpeg +lcms ldap +mp3 +nls osmesa +openal +opencl +opengl +pcap +png +scanner +ssl +v4l +vulkan" REQUIRED_USE=${PYTHON_REQUIRED_USE} RESTRICT="bindist test" @@ -78,7 +78,7 @@ RDEPEND="${DEPEND} pcap? ( net-libs/libpcap[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) - ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) + ssl? ( net-libs/gnutls:0/30[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)] ) dev-libs/gobject-introspection @@ -86,6 +86,7 @@ RDEPEND="${DEPEND} media-libs/alsa-lib[abi_x86_32(-)] media-libs/freetype:2[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-),osmesa?] + media-libs/tiff:0[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses-compat:5[abi_x86_32(-)] @@ -191,10 +192,8 @@ src_install() { fi # It tries to load libpcap as packaged in Debian, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657900 if use pcap; then - bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib/wine/wpcap.dll.so" >tmp || die - bbe -e 's/libpcap.so.0.8/libpcap.so.1.9.1/' "${ED}/opt/cxoffice/lib64/wine/wpcap.dll.so" >tmp64 || die - mv tmp "${ED}/opt/cxoffice/lib/wine/wpcap.dll.so" || die - mv tmp64 "${ED}/opt/cxoffice/lib64/wine/wpcap.dll.so" || die + dosym "../../../usr/lib64/libpcap.so.1.9.1" "/opt/cxoffice/lib64/libpcap.so.0.8" + dosym "../../../usr/lib32/libpcap.so.1.9.1" "/opt/cxoffice/lib/libpcap.so.0.8" fi } @@ -203,4 +202,28 @@ pkg_postinst() { einfo "Source code can be obtained from:" einfo einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz" + + # The check done by /opt/cxoffice/bin/cxdiag is far superior to this. + # However, we do this check because I noticed that we could end up with a + # system that doesn't have a working OpenCL according to cxdiag, yet the + # dependencies have been installed. This is a defensive measure to reduce + # user frustration. A more robust check might be worthwhile. + if use opencl; then + local b32=false + local b64=false + if [[ ! -e "${EROOT}/usr/lib32/libOpenCL.so.1" ]]; then + b32=true + ewarn "32-bit libOpenCL.so.1 missing." + fi + + if use amd64 && [[ ! -e "${EROOT}/usr/lib64/libOpenCL.so.1" ]]; then + b64=true + ewarn "64-bit libOpenCL.so.1 missing." + fi + + if $b32 || $b64; then + ewarn + ewarn "Set OpenCL via eselect opencl to avoid problems" + fi + fi }