Attachment 215612 Details for Bug 245496 – test (correction 1)

[patch] test (correction 1)

wine-nvidia-test-conflict_2.diff (text/plain), 4.86 KB, created by Lorenzo Salvadore on 2020-06-16 12:21:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lorenzo Salvadore

Created: 2020-06-16 12:21:27 UTC

Size: 4.86 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 538538)
>+++ Makefile	(working copy)
>@@ -9,6 +9,9 @@
> # define a dummy DISTVERSION to avoid errors with poudriere bulk -a
> # on architectures unsupported by this port
> DISTVERSION?=	0
>+# define PORTREVISION with ?= to allow it to be overriden by
>+# wine-devel's PORTREVISION when cross building
>+PORTREVISION?=	1
> PKGNAMEPREFIX=	i386-
> PKGNAMESUFFIX=	-devel
> CATEGORIES=	emulators
>Index: Makefile.amd64
>===================================================================
>--- Makefile.amd64	(revision 538538)
>+++ Makefile.amd64	(working copy)
>@@ -4,7 +4,7 @@
> DISTVERSION=	5.8
> PORTEPOCH=	1
> MASTER_SITES=	LOCAL/salvadore/i386-wine-devel/${DIST_SUBDIR}/
>-DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION},${PORTEPOCH}
>+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION}
> DIST_SUBDIR=	FreeBSD:${OSREL:C/\..*//}:amd64
> 
> LICENSE=        LGPL21 LGPL3
>Index: distinfo
>===================================================================
>--- distinfo	(revision 538538)
>+++ distinfo	(working copy)
>@@ -1,7 +1,7 @@
>-TIMESTAMP = 1590229926
>-SHA256 (FreeBSD:11:amd64/i386-wine-devel-5.8,1.txz) = bbb31835ff02a80cc6113ee5adda82723ed2e37dde77c07d7200d40cb9f7e7f3
>-SIZE (FreeBSD:11:amd64/i386-wine-devel-5.8,1.txz) = 72862352
>-SHA256 (FreeBSD:12:amd64/i386-wine-devel-5.8,1.txz) = 929e0d6366afb0ffe1be5051ef5e1df86e37d9ccbcc7c0db660a98ccff7aab65
>-SIZE (FreeBSD:12:amd64/i386-wine-devel-5.8,1.txz) = 73104324
>-SHA256 (FreeBSD:13:amd64/i386-wine-devel-5.8,1.txz) = 22e78c3e39c473179742d8b5e2f08c8f3274d46bca1fa5d01db882633c912896
>-SIZE (FreeBSD:13:amd64/i386-wine-devel-5.8,1.txz) = 75179216
>+TIMESTAMP = 1592263837
>+SHA256 (FreeBSD:11:amd64/i386-wine-devel-5.8_1,1.txz) = 83a2f737811bbf15bc2573b0bd9f8be561d7405daa7dbdb8c3ba7e3b63ff524b
>+SIZE (FreeBSD:11:amd64/i386-wine-devel-5.8_1,1.txz) = 72849764
>+SHA256 (FreeBSD:12:amd64/i386-wine-devel-5.8_1,1.txz) = fd372de4a96a4e501466525561debcccdcb701fde8dc947fe86fc93067f2ce7e
>+SIZE (FreeBSD:12:amd64/i386-wine-devel-5.8_1,1.txz) = 73141456
>+SHA256 (FreeBSD:13:amd64/i386-wine-devel-5.8_1,1.txz) = 8c7053bad1d19ac93ebbaac175fe4924ba7009ac7aa6bf56df39804a2fa5d28d
>+SIZE (FreeBSD:13:amd64/i386-wine-devel-5.8_1,1.txz) = 74894708
>Index: files/binbounce
>===================================================================
>--- files/binbounce	(revision 538538)
>+++ files/binbounce	(working copy)
>@@ -10,10 +10,10 @@
>   export LIBGL_DRIVERS_PATH=$LOCALBASE/lib32/dri
>   if [ `uname -p` = i386 ]
>   then
>-    export LD_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_LIBRARY_PATH"
>+    export LD_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_LIBRARY_PATH":"$LOCALBASE/lib32/.libGL"
>     export LD_LIBRARY_PATH_RPATH=y
>   else
>-    export LD_32_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_32_LIBRARY_PATH":/usr/lib32
>+    export LD_32_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_32_LIBRARY_PATH":"$LOCALBASE/lib32/.libGL":/usr/lib32
>     export LD_32_LIBRARY_PATH_RPATH=y
>   fi
>   export PATH="$LOCALBASE/bin32":"$PATH"
>Index: files/nvidia.sh
>===================================================================
>--- files/nvidia.sh	(revision 538538)
>+++ files/nvidia.sh	(working copy)
>@@ -115,12 +115,6 @@
>       rm -f ${PREFIX}/lib32/libGLcore.so.1 ${PREFIX}/lib32/libnvidia-tls.so.1 
>       rm -f ${PREFIX}/lib32/libnvidia-glcore.so.1 ${PREFIX}/lib32/libnvidia-tls.so.1
>       rm -rf  ${PREFIX}/lib32/.nvidia/
>-      if [ -d ${PREFIX}/lib32/.libGL-new ]
>-      then
>-        ln -s .libGL-new/libGL.so.1 ${PREFIX}/lib32/libGL.so.1
>-      else
>-        ln -s .libGL/libGL.so.1 ${PREFIX}/lib32/libGL.so.1
>-      fi
>       exit 0
>       ;;
>     -n)
>Index: files/pkg-install
>===================================================================
>--- files/pkg-install	(revision 538538)
>+++ files/pkg-install	(working copy)
>@@ -3,20 +3,14 @@
> export PREFIX=${PKG_PREFIX:-/usr/local}
> export WINE=$1
> 
>-if [ -d ${PREFIX}/lib32/.libGL-new ]
>-then
>-    LIBGLDIR=.libGL-new
>-else
>-    LIBGLDIR=.libGL
>-fi
>+LIBGLDIR=.libGL
> 
> case "$2" in
>   DEINSTALL)
>     sh ${PREFIX}/share/wine/patch-nvidia.sh -d
>-    rm -r ${PREFIX}/lib32/libGL.so.1 ${PREFIX}/lib32/dri
>+    rm -r ${PREFIX}/lib32/dri
>     ;;
>   POST-INSTALL)
>-    ln -s ${LIBGLDIR}/libGL.so.1 ${PREFIX}/lib32/libGL.so.1
>     mkdir -p ${PREFIX}/lib32/dri
>     for dri in $(cd ${PREFIX}/lib32/${LIBGLDIR}/dri/; echo *.so)
>     do
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 538538)
>+++ pkg-plist	(working copy)
>@@ -1096,11 +1096,11 @@
> lib32/libglapi.so.0
> lib32/libgmp.so.10
> lib32/libgnutls.so.30
>-lib32/libhogweed.so.5
>+lib32/libhogweed.so.6
> lib32/libidn2.so.0
> %%NOOSREL13%%lib32/libjpeg.so.8
> lib32/liblcms2.so.2
>-lib32/libnettle.so.7
>+lib32/libnettle.so.8
> lib32/libp11-kit.so.0
> lib32/libpciaccess.so.0
> %%NOOSREL13%%lib32/libpng16.so.16

Actions: View | Diff

Attachments on bug 245496: 214949 | 215302 | 215612