Attachment 244098 Details for Bug 273137 – Fix untracked dependency of alsa-plugins and 32-Bit pkg messages for wine7 and wine-devel

[patch] Fix untracked dependency of alsa-plugins and 32-Bit pkg messages for wine7 and wine-devel

0001-emulators-wine-Fix-untracked-run-dep-of-alsa-plugins.patch (text/plain), 2.84 KB, created by Alexander Vereeken on 2023-08-14 16:55:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Vereeken

Created: 2023-08-14 16:55:48 UTC

Size: 2.84 KB

patch

obsolete

>From bd31f98877a76f995803b0ffb968ed8cd9fc313b Mon Sep 17 00:00:00 2001
>From: Alexander Vereeken <Alexander88207@protonmail.com>
>Date: Mon, 14 Aug 2023 18:44:43 +0200
>Subject: [PATCH] emulators/wine: Fix untracked run-dep of alsa-plugins &
> emulators/wine-devel: Fix regression of 32-bit wine-devel pkg message
>
>---
> emulators/wine-devel/files/wine-wow64.sh | 2 +-
> emulators/wine/Makefile                  | 1 +
> emulators/wine7/Makefile                 | 1 +
> emulators/wine7/files/wine-wow64.sh      | 2 +-
> 4 files changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/emulators/wine-devel/files/wine-wow64.sh b/emulators/wine-devel/files/wine-wow64.sh
>index ca324c2d50a2..92b3659b7122 100644
>--- a/emulators/wine-devel/files/wine-wow64.sh
>+++ b/emulators/wine-devel/files/wine-wow64.sh
>@@ -9,7 +9,7 @@ I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}"
> if [ ! -f "$I386_ROOT/$PREFIX/bin/wine" ]
> then
>   printf "%s doesn't exist!\n\n" "$I386_ROOT/$PREFIX/bin/wine"
>-  printf "Try installing 32-bit Wine with\n\t%s\n" "$PREFIX/share/wine/pkg32.sh install wine mesa-dri"
>+  printf "Try installing 32-bit Wine with\n\t%s\n" "$PREFIX/share/wine/pkg32.sh install wine-devel mesa-dri"
>   ABI=$(pkg config ABI | sed s/amd64/i386/)
>   FREEBSD_VERSION_MAJOR=`uname -r | sed "s/\..*//"`
>   cat <<- HERE
>diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
>index b592882758a1..d190f3d40e8a 100644
>--- a/emulators/wine/Makefile
>+++ b/emulators/wine/Makefile
>@@ -78,6 +78,7 @@ PORTSCOUT=	limit:^7\.0
> 
> ALSA_CONFIGURE_ON=	--with-alsa --without-oss
> ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
>+ALSA_RUN_DEPENDS=	libasound_module_pcm_oss.so : audio/alsa-plugins
> 
> CUPS_CONFIGURE_WITH=	cups
> CUPS_LIB_DEPENDS=	libcups.so:print/cups
>diff --git a/emulators/wine7/Makefile b/emulators/wine7/Makefile
>index 9e8129be811f..93f29fe80d34 100644
>--- a/emulators/wine7/Makefile
>+++ b/emulators/wine7/Makefile
>@@ -77,6 +77,7 @@ PORTSCOUT=	limit:^7\.0
> 
> ALSA_CONFIGURE_ON=	--with-alsa --without-oss
> ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
>+ALSA_RUN_DEPENDS=	libasound_module_pcm_oss.so : audio/alsa-plugins
> 
> CUPS_CONFIGURE_WITH=	cups
> CUPS_LIB_DEPENDS=	libcups.so:print/cups
>diff --git a/emulators/wine7/files/wine-wow64.sh b/emulators/wine7/files/wine-wow64.sh
>index ca324c2d50a2..99d2e36975b5 100644
>--- a/emulators/wine7/files/wine-wow64.sh
>+++ b/emulators/wine7/files/wine-wow64.sh
>@@ -9,7 +9,7 @@ I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}"
> if [ ! -f "$I386_ROOT/$PREFIX/bin/wine" ]
> then
>   printf "%s doesn't exist!\n\n" "$I386_ROOT/$PREFIX/bin/wine"
>-  printf "Try installing 32-bit Wine with\n\t%s\n" "$PREFIX/share/wine/pkg32.sh install wine mesa-dri"
>+  printf "Try installing 32-bit Wine with\n\t%s\n" "$PREFIX/share/wine/pkg32.sh install wine7 mesa-dri"
>   ABI=$(pkg config ABI | sed s/amd64/i386/)
>   FREEBSD_VERSION_MAJOR=`uname -r | sed "s/\..*//"`
>   cat <<- HERE
>-- 
>2.41.0
>

Actions: View | Diff

Attachments on bug 273137: 244098 | 244099