From abb86da0677eb4ef6fa7c52d0802cc351e3d4e46 Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 6 May 2004 15:51:35 +0000 Subject: Changes 20040505: - Many more filesystem improvements, including autodetection of drive types and devices, and support for editing the drive configuration with winecfg. - Many Direct3D improvements. - Several fixes to the various sound drivers. - Lots of bug fixes --- emulators/wine/Makefile | 4 ++-- emulators/wine/PLIST | 16 +++++++++++++++- emulators/wine/distinfo | 9 ++++----- emulators/wine/patches/patch-ac | 8 ++++---- emulators/wine/patches/patch-af | 12 ------------ 5 files changed, 25 insertions(+), 24 deletions(-) delete mode 100644 emulators/wine/patches/patch-af (limited to 'emulators/wine') diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 34f3d5ba04e..2f5dcac84f1 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.71 2004/04/09 12:44:22 adam Exp $ +# $NetBSD: Makefile,v 1.72 2004/05/06 15:51:35 adam Exp $ # -DISTNAME= Wine-20040408 +DISTNAME= Wine-20040505 PKGNAME= ${DISTNAME:S/W/w/} CATEGORIES= emulators MASTER_SITES= http://www.ibiblio.org/pub/Linux/ALPHA/wine/development/ \ diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST index faf90ff6a98..bb315973ec1 100644 --- a/emulators/wine/PLIST +++ b/emulators/wine/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.25 2004/04/09 12:44:22 adam Exp $ +@comment $NetBSD: PLIST,v 1.26 2004/05/06 15:51:35 adam Exp $ bin/function_grep.pl bin/notepad bin/progman @@ -140,6 +140,7 @@ include/wine/windows/dsconf.h include/wine/windows/dsdriver.h include/wine/windows/dshow.h include/wine/windows/dsound.h +include/wine/windows/dxdiag.h include/wine/windows/dxerr8.h include/wine/windows/dxerr9.h include/wine/windows/dyngraph.idl @@ -174,6 +175,11 @@ include/wine/windows/lzexpand.h include/wine/windows/mapi.h include/wine/windows/mapicode.h include/wine/windows/mapidefs.h +include/wine/windows/mapiguid.h +include/wine/windows/mapitags.h +include/wine/windows/mapiutil.h +include/wine/windows/mapival.h +include/wine/windows/mapix.h include/wine/windows/mciavi.h include/wine/windows/mcx.h include/wine/windows/mediaerr.h @@ -222,6 +228,8 @@ include/wine/windows/pshpack1.h include/wine/windows/pshpack2.h include/wine/windows/pshpack4.h include/wine/windows/pshpack8.h +include/wine/windows/pstore.h +include/wine/windows/pstore.idl include/wine/windows/ras.h include/wine/windows/regstr.h include/wine/windows/richedit.h @@ -237,6 +245,8 @@ include/wine/windows/servprov.h include/wine/windows/servprov.idl include/wine/windows/setupapi.h include/wine/windows/shellapi.h +include/wine/windows/shldisp.h +include/wine/windows/shldisp.idl include/wine/windows/shlguid.h include/wine/windows/shlobj.h include/wine/windows/shlwapi.h @@ -298,6 +308,7 @@ include/wine/windows/wshisotp.h include/wine/windows/wsipx.h include/wine/windows/wtypes.h include/wine/windows/wtypes.idl +include/wine/windows/xcmc.h include/wine/windows/zmouse.h lib/libwine.so lib/libwine.so.1 @@ -355,11 +366,13 @@ lib/wine/dpnet.dll.so lib/wine/dpnhpast.dll.so lib/wine/dsound.dll.so lib/wine/dswave.dll.so +lib/wine/dxdiagn.dll.so lib/wine/expand.exe.so lib/wine/gdi.exe.so lib/wine/gdi32.dll.so lib/wine/glu32.dll.so lib/wine/glut32.dll.so +lib/wine/hhctrl.ocx.so lib/wine/iccvid.dll.so lib/wine/icinfo.exe.so lib/wine/icmp.dll.so @@ -412,6 +425,7 @@ lib/wine/libdpnet.def lib/wine/libdpnhpast.def lib/wine/libdsound.def lib/wine/libdswave.def +lib/wine/libdxdiagn.def lib/wine/libdxerr8.a lib/wine/libdxerr9.a lib/wine/libdxguid.a diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 2f6971c0910..247c680a2eb 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.24 2004/04/09 12:44:22 adam Exp $ +$NetBSD: distinfo,v 1.25 2004/05/06 15:51:35 adam Exp $ -SHA1 (Wine-20040408.tar.gz) = d15664ffe1dda11e224cab29d98ec8521ac4ca6d -Size (Wine-20040408.tar.gz) = 10354583 bytes +SHA1 (Wine-20040505.tar.gz) = 42de0d3323cfe001eb6c720d25cd1c531ec7928d +Size (Wine-20040505.tar.gz) = 10499070 bytes SHA1 (patch-aa) = 1e08fd0443c7c34271aab16b8434457105f93588 SHA1 (patch-ab) = 313180ea924c224ebecad0b8764584230497f8ed -SHA1 (patch-ac) = f47c96b54560c1f68ea09461819b35e87cee5662 +SHA1 (patch-ac) = e0b2c811a7bbcd07a7ca65d7eda30e1a7e4acef7 SHA1 (patch-ad) = 28c15181eab48f1e82d10046b77fa1ebac3c4ef6 SHA1 (patch-ae) = 691113bab9f24bcbabd786e7f1ff2fe0933d721f -SHA1 (patch-af) = 67612117fcd87d54619a8b521209e182cd0c0065 diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac index 4f1bedf4bbf..7426fee2dd2 100644 --- a/emulators/wine/patches/patch-ac +++ b/emulators/wine/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.14 2004/04/09 12:44:22 adam Exp $ +$NetBSD: patch-ac,v 1.15 2004/05/06 15:51:35 adam Exp $ ---- configure.orig 2004-04-08 22:38:17.000000000 +0000 +--- configure.orig 2004-05-06 00:40:39.000000000 +0000 +++ configure -@@ -17850,7 +17850,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -17852,7 +17852,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.14 2004/04/09 12:44:22 adam Exp $ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -19520,7 +19520,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c +@@ -19522,7 +19522,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then diff --git a/emulators/wine/patches/patch-af b/emulators/wine/patches/patch-af deleted file mode 100644 index a38a6e8b4a8..00000000000 --- a/emulators/wine/patches/patch-af +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-af,v 1.6 2004/04/09 12:44:22 adam Exp $ - ---- programs/winetest/util.c.orig 2004-04-09 14:30:40.000000000 +0000 -+++ programs/winetest/util.c -@@ -19,7 +19,6 @@ - * - */ - #include --#include - #include - - #include "winetest.h" -- cgit v1.2.3