From nobody Sat Sep 9 13:11:38 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjYK62Cjtz4t7W7; Sat, 9 Sep 2023 13:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjYK61mZjz4nQw; Sat, 9 Sep 2023 13:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694265098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=al4XbRJT8L4RqDGM3taz+BZ/HGJZ/FG9HPVqx8fL5Ok=; b=ulQe2SAbCmQQaQfqUnXmf6TrbqB0gx/65McS4za/YB6nGlgz2lk0Fuo5LNdAhGrylwE3kA 4Bful8LvGjM1/+Rluv+0QIoaJzTAQRnbgyeN4ky76+aiZGGvzDcmZ4YXw915guCV5s9E5b HQGdcqbrQbArL3MDGstC6zojkr7YCwO+0fD0X19celQ7YwaxQZg7CzJbGq/csC9+bswK30 +ki23FLkXKhlCRUxrlD6kuKfz21BjfUs9ngHjI5RfFOLAlOG9M0vdk5637LbXygWUuGWeE XEAKORhVd4IrMVrVllkHpiu+5rgmZ3ZoQ2VI22D1huzNcPt0ykhYvykd/kaxig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694265098; a=rsa-sha256; cv=none; b=eS3uCyhPcQLPxUBpXtHel5M5jfvSNqBKEsRfI9wyDjcq2B+BSDVbXaq/fqf9o1Nlw7zVno 3FaHY1M2ZB5JlMgM6lxkr3epV6+KjIIKzuTsSRAkwrt9FCVzavacm97TOLVP9LXdV4bSdE PWkoZkQ/1Y4r4L7cQTvpLKjGFz5tKpoWmTGwdrwlyoqXysgyUnpgvuLHWSvEV8Vs4LtCH1 17udGRcg+d6ctJ8pfr8I5jpGr9Y4hK+bqiLWErCNj5hcprFtvx+M5Ic90SX3cFqWEGM3/R ZLlT8zYy2sSafn65G3LaAPtxnnMkSyDp0NmR9jrLbs3Xc+vGKmS87HJ9Cdt/8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694265098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=al4XbRJT8L4RqDGM3taz+BZ/HGJZ/FG9HPVqx8fL5Ok=; b=sp8SF80xxdJyc7D/IoIQVus6gscEZRJstMfoXKyE4dVAe4wGsDcIdTBiaDnIwvxIfzTM5F 6DtBwSXn3Tqi0OjUUVf3C6B59mrW0GOol0DvFkBkll/kZGwRlyljttyaULuLIJUzOmdpc7 j2VaAVhuh6zM8XLTQ2rw+OSzq0XNohpRSrt8BHrDSazWphzqesgfBnyerAcfLOEu5/zx13 CQQNTSPnJRTbcyX+WRr15HKuodl38sg7QGCvCtTYVnvYUwffzR4VfaJDhlnk+xmq1xTsAo ut4vdgYOP5Cdx/7i78vfsTTQ2MfgxE986kHcEMNVtwcTmHAIdp9f3OwPw6Fhjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RjYK60pS1zBBT; Sat, 9 Sep 2023 13:11:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389DBcNs031969; Sat, 9 Sep 2023 13:11:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389DBcZg031966; Sat, 9 Sep 2023 13:11:38 GMT (envelope-from git) Date: Sat, 9 Sep 2023 13:11:38 GMT Message-Id: <202309091311.389DBcZg031966@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 39f0209b6fa8 - main - emulators/wine-devel: Cover alsa-lib in LD_32_LIBMAP List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39f0209b6fa86c621d4253fd3ecd0ebe286f379e Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=39f0209b6fa86c621d4253fd3ecd0ebe286f379e commit 39f0209b6fa86c621d4253fd3ecd0ebe286f379e Author: Gerald Pfeifer AuthorDate: 2023-09-09 13:11:24 +0000 Commit: Gerald Pfeifer CommitDate: 2023-09-09 13:11:24 +0000 emulators/wine-devel: Cover alsa-lib in LD_32_LIBMAP Forward port commit 215305d603 from emulators/wine: Author: Alexander Vereeken Date: Sun Aug 27 21:19:15 2023 +0000 Ensure the ALSA run-time portions are found under WoW64. i386 and hence (the old way of) WoW64 is currently BROKEN, so this is not actually exercised right now. Still good to have this for when/if it may become relevant again. PR: 268164 --- emulators/wine-devel/files/wine-wow64.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/emulators/wine-devel/files/wine-wow64.sh b/emulators/wine-devel/files/wine-wow64.sh index 92b3659b7122..fd96577fb486 100644 --- a/emulators/wine-devel/files/wine-wow64.sh +++ b/emulators/wine-devel/files/wine-wow64.sh @@ -47,6 +47,7 @@ export LD_32_LIBMAP=" libgcc_s.so.1 /usr/lib32/libgcc_s.so.1 $LOCALBASE/lib/libvulkan_intel.so $I386_ROOT/$LOCALBASE/lib/libvulkan_intel.so $LOCALBASE/lib/libvulkan_radeon.so $I386_ROOT/$LOCALBASE/lib/libvulkan_radeon.so +$LOCALBASE/lib/alsa-lib/libasound_module_pcm_oss.so $I386_ROOT/$LOCALBASE/lib/alsa-lib/libasound_module_pcm_oss.so $LD_32_LIBMAP_CONF $LD_32_LIBMAP"