Attachment #241864 for bug #271136

View | Details | Raw Unified | Return to bug 271136
Collapse All | Expand All

Lines 1-6 Link Here

(-)b/graphics/mesa-devel/Makefile (-1 / +2 lines)
1	PORTNAME= mesa	1	PORTNAME= mesa
2	DISTVERSION= 23.1-branchpoint-780	2	DISTVERSION= 23.1-branchpoint-780
3	DISTVERSIONSUFFIX= -gb07f575a91d	3	DISTVERSIONSUFFIX= -gb07f575a91d
		4	PORTREVISION= 1
4	CATEGORIES= graphics	5	CATEGORIES= graphics
5	PKGNAMESUFFIX= -devel	6	PKGNAMESUFFIX= -devel
6		7
Lines 177-182 post-patch-COINST-on: Link Here
177		178
178	post-install-COINST-on:	179	post-install-COINST-on:
179	@${INSTALL_DATA} ${WRKDIR}/libmap.conf \	180	@${INSTALL_DATA} ${WRKDIR}/libmap.conf \
180	${STAGEDIR}${PREFIX}/etc/libmap.d/${PKGBASE}.conf.sample	181	${STAGEDIR}${PREFIX}/etc/libmap.d/${PKGBASE}.conf
181		182
182	.include <bsd.port.mk>	183	.include <bsd.port.mk>




%%VKLAYERS%%bin/mesa-overlay-control.py
%%NO_COINST%%%%OPENCL%%etc/OpenCL/vendors/mesa.icd
%%OPENCL%%etc/OpenCL/vendors/rusticl.icd
%%COINST%%etc/libmap.d/mesa%%SUFFIX%%.conf
%%NO_COINST%%include/EGL/eglext_angle.h
%%NO_COINST%%include/EGL/eglmesaext.h
%%NO_COINST%%include/GL/internal/dri_interface.h
 Adjust LIBGL_DRIVERS_PATH to prefer -devel
 Respect libmap.conf(5) in 32-bit packages
--
emulators/wine-devel/Makefile            | 2 +-
emulators/wine-devel/files/wine-wow64.sh | 4 +++-
emulators/wine/Makefile                  | 2 +-
emulators/wine/files/wine-wow64.sh       | 4 +++-
4 files changed, 8 insertions(+), 4 deletions(-)

Lines 1-6 Link Here

(-)b/emulators/wine-devel/Makefile (-1 / +1 lines)
1	PORTNAME= wine	1	PORTNAME= wine
2	DISTVERSION= 7.22	2	DISTVERSION= 7.22
3	PORTREVISION= 1	3	PORTREVISION= 2
4	PORTEPOCH= 1	4	PORTEPOCH= 1
5	CATEGORIES= emulators	5	CATEGORIES= emulators
6	MASTER_SITES= https://dl.winehq.org/wine/source/7.x/	6	MASTER_SITES= https://dl.winehq.org/wine/source/7.x/




  exit 1
fi

export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH:+$LIBGL_DRIVERS_PATH:}$LOCALBASE/lib/dri-devel:$LOCALBASE/lib32/dri-devel:$I386_ROOT/$LOCALBASE/lib/dri-devel:$LOCALBASE/lib/dri:$LOCALBASE/lib32/dri:$I386_ROOT/$LOCALBASE/lib/dri"
export LD_32_LIBRARY_PATH="${LD_32_LIBRARY_PATH:+$LD_32_LIBRARY_PATH:}$I386_ROOT/$PREFIX/lib/wine:$LOCALBASE/lib32:$I386_ROOT/$LOCALBASE/lib"
for d in "$I386_ROOT/$LOCALBASE"/llvm*/lib
do

  fi
done
export LD_32_LIBRARY_PATH_RPATH=y
LD_32_LIBMAP_CONF=$(sed "s,$LOCALBASE,$I386_ROOT&,2" "$I386_ROOT/$LOCALBASE"/etc/libmap.d/*.conf 2>/dev/null || true)
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
$LD_32_LIBMAP_CONF
$LD_32_LIBMAP"

if [ -z "$WINE_NO_WOW64" ]

Lines 1-6 Link Here

(-)b/emulators/wine/Makefile (-1 / +1 lines)
1	PORTNAME= wine	1	PORTNAME= wine
2	DISTVERSION= 7.0.2	2	DISTVERSION= 7.0.2
3	PORTREVISION= 1	3	PORTREVISION= 2
4	PORTEPOCH= 1	4	PORTEPOCH= 1
5	CATEGORIES= emulators	5	CATEGORIES= emulators
6	MASTER_SITES= https://dl.winehq.org/wine/source/7.0/	6	MASTER_SITES= https://dl.winehq.org/wine/source/7.0/




  exit 1
fi

export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH:+$LIBGL_DRIVERS_PATH:}$LOCALBASE/lib/dri-devel:$LOCALBASE/lib32/dri-devel:$I386_ROOT/$LOCALBASE/lib/dri-devel:$LOCALBASE/lib/dri:$LOCALBASE/lib32/dri:$I386_ROOT/$LOCALBASE/lib/dri"
export LD_32_LIBRARY_PATH="${LD_32_LIBRARY_PATH:+$LD_32_LIBRARY_PATH:}$I386_ROOT/$PREFIX/lib/wine:$LOCALBASE/lib32:$I386_ROOT/$LOCALBASE/lib"
for d in "$I386_ROOT/$LOCALBASE"/llvm*/lib
do

  fi
done
export LD_32_LIBRARY_PATH_RPATH=y
LD_32_LIBMAP_CONF=$(sed "s,$LOCALBASE,$I386_ROOT&,2" "$I386_ROOT/$LOCALBASE"/etc/libmap.d/*.conf 2>/dev/null || true)
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
$LD_32_LIBMAP_CONF
$LD_32_LIBMAP"

if [ -z "$WINE_NO_WOW64" ]

Return to bug 271136

Lines 1-7 Link Here

(-)b/graphics/mesa-devel/pkg-plist (-4 / +1 lines)
1	%%VKLAYERS%%bin/mesa-overlay-control.py	1	%%VKLAYERS%%bin/mesa-overlay-control.py
2	%%NO_COINST%%%%OPENCL%%etc/OpenCL/vendors/mesa.icd	2	%%NO_COINST%%%%OPENCL%%etc/OpenCL/vendors/mesa.icd
3	%%OPENCL%%etc/OpenCL/vendors/rusticl.icd	3	%%OPENCL%%etc/OpenCL/vendors/rusticl.icd
4	%%COINST%%@sample etc/libmap.d/mesa%%SUFFIX%%.conf.sample	4	%%COINST%%etc/libmap.d/mesa%%SUFFIX%%.conf
5	%%NO_COINST%%include/EGL/eglext_angle.h	5	%%NO_COINST%%include/EGL/eglext_angle.h
6	%%NO_COINST%%include/EGL/eglmesaext.h	6	%%NO_COINST%%include/EGL/eglmesaext.h
7	%%NO_COINST%%include/GL/internal/dri_interface.h	7	%%NO_COINST%%include/GL/internal/dri_interface.h
8	Adjust LIBGL_DRIVERS_PATH to prefer -devel
9	Respect libmap.conf(5) in 32-bit packages
10	--
11	emulators/wine-devel/Makefile \| 2 +-	8	emulators/wine-devel/Makefile \| 2 +-
12	emulators/wine-devel/files/wine-wow64.sh \| 4 +++-	9	emulators/wine-devel/files/wine-wow64.sh \| 4 +++-
13	emulators/wine/Makefile \| 2 +-	10	emulators/wine/Makefile \| 2 +-
14	emulators/wine/files/wine-wow64.sh \| 4 +++-	11	emulators/wine/files/wine-wow64.sh \| 4 +++-
15	4 files changed, 8 insertions(+), 4 deletions(-)	12	4 files changed, 8 insertions(+), 4 deletions(-)

Lines 32-38 then Link Here

(-)b/emulators/wine-devel/files/wine-wow64.sh (-1 / +3 lines)
32	exit 1	32	exit 1
33	fi	33	fi
34		34
35	export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH:+$LIBGL_DRIVERS_PATH:}$LOCALBASE/lib/dri:$LOCALBASE/lib32/dri:$I386_ROOT/$LOCALBASE/lib/dri"	35	export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH:+$LIBGL_DRIVERS_PATH:}$LOCALBASE/lib/dri-devel:$LOCALBASE/lib32/dri-devel:$I386_ROOT/$LOCALBASE/lib/dri-devel:$LOCALBASE/lib/dri:$LOCALBASE/lib32/dri:$I386_ROOT/$LOCALBASE/lib/dri"
36	export LD_32_LIBRARY_PATH="${LD_32_LIBRARY_PATH:+$LD_32_LIBRARY_PATH:}$I386_ROOT/$PREFIX/lib/wine:$LOCALBASE/lib32:$I386_ROOT/$LOCALBASE/lib"	36	export LD_32_LIBRARY_PATH="${LD_32_LIBRARY_PATH:+$LD_32_LIBRARY_PATH:}$I386_ROOT/$PREFIX/lib/wine:$LOCALBASE/lib32:$I386_ROOT/$LOCALBASE/lib"
37	for d in "$I386_ROOT/$LOCALBASE"/llvm*/lib	37	for d in "$I386_ROOT/$LOCALBASE"/llvm*/lib
38	do	38	do
Lines 42-51 do Link Here
42	fi	42	fi
43	done	43	done
44	export LD_32_LIBRARY_PATH_RPATH=y	44	export LD_32_LIBRARY_PATH_RPATH=y
		45	LD_32_LIBMAP_CONF=$(sed "s,$LOCALBASE,$I386_ROOT&,2" "$I386_ROOT/$LOCALBASE"/etc/libmap.d/*.conf 2>/dev/null \|\| true)
45	export LD_32_LIBMAP="	46	export LD_32_LIBMAP="
46	libgcc_s.so.1 /usr/lib32/libgcc_s.so.1	47	libgcc_s.so.1 /usr/lib32/libgcc_s.so.1
47	$LOCALBASE/lib/libvulkan_intel.so $I386_ROOT/$LOCALBASE/lib/libvulkan_intel.so	48	$LOCALBASE/lib/libvulkan_intel.so $I386_ROOT/$LOCALBASE/lib/libvulkan_intel.so
48	$LOCALBASE/lib/libvulkan_radeon.so $I386_ROOT/$LOCALBASE/lib/libvulkan_radeon.so	49	$LOCALBASE/lib/libvulkan_radeon.so $I386_ROOT/$LOCALBASE/lib/libvulkan_radeon.so
		50	$LD_32_LIBMAP_CONF
49	$LD_32_LIBMAP"	51	$LD_32_LIBMAP"
50		52
51	if [ -z "$WINE_NO_WOW64" ]	53	if [ -z "$WINE_NO_WOW64" ]

Lines 32-38 then Link Here

(-)b/emulators/wine/files/wine-wow64.sh (-1 / +3 lines)
32	exit 1	32	exit 1
33	fi	33	fi
34		34
35	export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH:+$LIBGL_DRIVERS_PATH:}$LOCALBASE/lib/dri:$LOCALBASE/lib32/dri:$I386_ROOT/$LOCALBASE/lib/dri"	35	export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH:+$LIBGL_DRIVERS_PATH:}$LOCALBASE/lib/dri-devel:$LOCALBASE/lib32/dri-devel:$I386_ROOT/$LOCALBASE/lib/dri-devel:$LOCALBASE/lib/dri:$LOCALBASE/lib32/dri:$I386_ROOT/$LOCALBASE/lib/dri"
36	export LD_32_LIBRARY_PATH="${LD_32_LIBRARY_PATH:+$LD_32_LIBRARY_PATH:}$I386_ROOT/$PREFIX/lib/wine:$LOCALBASE/lib32:$I386_ROOT/$LOCALBASE/lib"	36	export LD_32_LIBRARY_PATH="${LD_32_LIBRARY_PATH:+$LD_32_LIBRARY_PATH:}$I386_ROOT/$PREFIX/lib/wine:$LOCALBASE/lib32:$I386_ROOT/$LOCALBASE/lib"
37	for d in "$I386_ROOT/$LOCALBASE"/llvm*/lib	37	for d in "$I386_ROOT/$LOCALBASE"/llvm*/lib
38	do	38	do
Lines 42-51 do Link Here
42	fi	42	fi
43	done	43	done
44	export LD_32_LIBRARY_PATH_RPATH=y	44	export LD_32_LIBRARY_PATH_RPATH=y
		45	LD_32_LIBMAP_CONF=$(sed "s,$LOCALBASE,$I386_ROOT&,2" "$I386_ROOT/$LOCALBASE"/etc/libmap.d/*.conf 2>/dev/null \|\| true)
45	export LD_32_LIBMAP="	46	export LD_32_LIBMAP="
46	libgcc_s.so.1 /usr/lib32/libgcc_s.so.1	47	libgcc_s.so.1 /usr/lib32/libgcc_s.so.1
47	$LOCALBASE/lib/libvulkan_intel.so $I386_ROOT/$LOCALBASE/lib/libvulkan_intel.so	48	$LOCALBASE/lib/libvulkan_intel.so $I386_ROOT/$LOCALBASE/lib/libvulkan_intel.so
48	$LOCALBASE/lib/libvulkan_radeon.so $I386_ROOT/$LOCALBASE/lib/libvulkan_radeon.so	49	$LOCALBASE/lib/libvulkan_radeon.so $I386_ROOT/$LOCALBASE/lib/libvulkan_radeon.so
		50	$LD_32_LIBMAP_CONF
49	$LD_32_LIBMAP"	51	$LD_32_LIBMAP"
50		52
51	if [ -z "$WINE_NO_WOW64" ]	53	if [ -z "$WINE_NO_WOW64" ]