diff options
author | wiz <wiz@pkgsrc.org> | 2003-03-04 11:45:58 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2003-03-04 11:45:58 +0000 |
commit | bad9234c19edba61f6fa9bd4080b76bd73a123c3 (patch) | |
tree | 42c7ad66bc0612162a43d138ada3c1bfec4287a4 /emulators/wine | |
parent | 838d9e330553ffee2f448e689bfbce5df79478a4 (diff) | |
download | pkgsrc-bad9234c19edba61f6fa9bd4080b76bd73a123c3.tar.gz |
Update to 20030219.
Changes:
20021219
- DLL linking now done through import libraries.
- A couple of new tools to make Winelib easier to use.
- Many Direct3D improvements.
- Improved Windows compatibility of the regression tests.
- Lots of bug fixes.
20030115
- Much better header files compatibility in Winelib.
- A ton of Direct3D work.
- Many improvements in sound support.
- New wineboot tool to simulate a Windows reboot.
- Lots of bug fixes.
20030219
- Better dead keys support.
- Many debugger fixes.
- More Direct3D work.
- Lots of bug fixes.
Diffstat (limited to 'emulators/wine')
-rw-r--r-- | emulators/wine/Makefile | 7 | ||||
-rw-r--r-- | emulators/wine/PLIST | 484 | ||||
-rw-r--r-- | emulators/wine/distinfo | 7 | ||||
-rw-r--r-- | emulators/wine/patches/patch-ab | 31 |
4 files changed, 331 insertions, 198 deletions
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index de26a3a5e81..648dbc51e33 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.39 2002/12/24 06:10:00 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2003/03/04 11:45:58 wiz Exp $ -DISTNAME= Wine-20021125 +DISTNAME= Wine-20030219 PKGNAME= ${DISTNAME:S/W/w/} -PKGREVISION= 1 -WRKSRC= ${WRKDIR}/wine-20021125 +WRKSRC= ${WRKDIR}/wine-20030219 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SUNSITE:=ALPHA/wine/development/} diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST index ccfcc03a6b8..2dd98c09d51 100644 --- a/emulators/wine/PLIST +++ b/emulators/wine/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2002/12/09 14:42:54 junyoung Exp $ +@comment $NetBSD: PLIST,v 1.9 2003/03/04 11:45:58 wiz Exp $ bin/function_grep.pl bin/notepad bin/progman @@ -8,89 +8,36 @@ bin/uninstaller bin/wcmd bin/widl bin/wine +bin/wineboot bin/winebuild bin/wineclipsrv bin/wineconsole bin/winedbg bin/winedump bin/winefile +bin/wineg++ +bin/winegcc bin/winelauncher bin/winemaker bin/winemine bin/winepath bin/wineserver bin/wineshelllink +bin/winewrap bin/winhelp bin/wmc bin/wrc -include/wine/audevcod.h -include/wine/basetsd.h -include/wine/cderr.h -include/wine/cguid.h -include/wine/comcat.h -include/wine/commctrl.h -include/wine/commdlg.h -include/wine/compobj.h -include/wine/cpl.h -include/wine/custcntl.h -include/wine/d3d.h -include/wine/d3d8.h -include/wine/d3d8caps.h -include/wine/d3d8types.h -include/wine/d3dcaps.h -include/wine/d3dtypes.h -include/wine/d3dvec.inl -include/wine/dde.h -include/wine/ddeml.h -include/wine/ddraw.h -include/wine/digitalv.h -include/wine/dinput.h -include/wine/dispdib.h -include/wine/dlgs.h -include/wine/dmo.h -include/wine/dmoreg.h -include/wine/dmort.h -include/wine/docobj.h -include/wine/dplay.h -include/wine/dplobby.h -include/wine/dshow.h -include/wine/dsound.h -include/wine/fci.h -include/wine/fdi.h -include/wine/guiddef.h -include/wine/imagehlp.h -include/wine/imm.h -include/wine/initguid.h -include/wine/instance.h -include/wine/lm.h -include/wine/lmaccess.h -include/wine/lmapibuf.h -include/wine/lmbrowsr.h -include/wine/lmcons.h -include/wine/lmerr.h -include/wine/lmwksta.h -include/wine/lzexpand.h -include/wine/mapi.h -include/wine/mapicode.h -include/wine/mapidefs.h -include/wine/mciavi.h -include/wine/mcx.h -include/wine/mediaerr.h -include/wine/mediaobj.h -include/wine/minmax.h -include/wine/mmreg.h -include/wine/mmsystem.h -include/wine/msacm.h -include/wine/msacmdlg.h -include/wine/mssip.h +include/wine/debug.h +include/wine/exception.h +include/wine/library.h include/wine/msvcrt/conio.h include/wine/msvcrt/crtdbg.h include/wine/msvcrt/ctype.h include/wine/msvcrt/direct.h +include/wine/msvcrt/dirent.h include/wine/msvcrt/dos.h include/wine/msvcrt/eh.h include/wine/msvcrt/errno.h -include/wine/msvcrt/excpt.h include/wine/msvcrt/fcntl.h include/wine/msvcrt/io.h include/wine/msvcrt/locale.h @@ -109,136 +56,198 @@ include/wine/msvcrt/sys/locking.h include/wine/msvcrt/sys/stat.h include/wine/msvcrt/sys/timeb.h include/wine/msvcrt/sys/types.h +include/wine/msvcrt/sys/unistd.h include/wine/msvcrt/sys/utime.h include/wine/msvcrt/time.h +include/wine/msvcrt/unistd.h include/wine/msvcrt/wchar.h include/wine/msvcrt/wctype.h -include/wine/mswsock.h -include/wine/nb30.h -include/wine/nspapi.h -include/wine/ntsecapi.h -include/wine/ntstatus.h -include/wine/oaidl.h -include/wine/objbase.h -include/wine/objidl.h -include/wine/ocidl.h -include/wine/ole2.h -include/wine/ole2ver.h -include/wine/oleauto.h -include/wine/olectl.h -include/wine/oledlg.h -include/wine/oleidl.h -include/wine/poppack.h -include/wine/prsht.h -include/wine/psapi.h -include/wine/pshpack1.h -include/wine/pshpack2.h -include/wine/pshpack4.h -include/wine/pshpack8.h -include/wine/ras.h -include/wine/regstr.h -include/wine/richedit.h -include/wine/richole.h -include/wine/rpc.h -include/wine/rpcdce.h -include/wine/rpcdcep.h -include/wine/rpcndr.h -include/wine/rpcnterr.h -include/wine/rpcproxy.h -include/wine/servprov.h -include/wine/setupapi.h -include/wine/shellapi.h -include/wine/shlguid.h -include/wine/shlobj.h -include/wine/shlwapi.h -include/wine/sipbase.h -include/wine/sql.h -include/wine/sqlext.h -include/wine/sqltypes.h -include/wine/storage.h -include/wine/tapi.h -include/wine/tchar.h -include/wine/tlhelp32.h -include/wine/unknwn.h -include/wine/urlmon.h -include/wine/uuids.h -include/wine/ver.h -include/wine/vfw.h -include/wine/vfwmsgs.h -include/wine/winbase.h -include/wine/wincon.h -include/wine/wincrypt.h -include/wine/windef.h -include/wine/windows.h -include/wine/windowsx.h -include/wine/wine/debug.h -include/wine/wine/exception.h -include/wine/wine/icmpapi.h -include/wine/wine/ipexport.h -include/wine/wine/library.h -include/wine/wine/obj_base.h -include/wine/wine/obj_cache.h -include/wine/wine/obj_channel.h -include/wine/wine/obj_clientserver.h -include/wine/wine/obj_comcat.h -include/wine/wine/obj_commdlgbrowser.h -include/wine/wine/obj_connection.h -include/wine/wine/obj_contextmenu.h -include/wine/wine/obj_control.h -include/wine/wine/obj_dataobject.h -include/wine/wine/obj_dockingwindowframe.h -include/wine/wine/obj_dragdrop.h -include/wine/wine/obj_dragdrophelper.h -include/wine/wine/obj_enumguid.h -include/wine/wine/obj_enumidlist.h -include/wine/wine/obj_errorinfo.h -include/wine/wine/obj_extracticon.h -include/wine/wine/obj_inplace.h -include/wine/wine/obj_marshal.h -include/wine/wine/obj_misc.h -include/wine/wine/obj_moniker.h -include/wine/wine/obj_oleaut.h -include/wine/wine/obj_olefont.h -include/wine/wine/obj_oleobj.h -include/wine/wine/obj_oleundo.h -include/wine/wine/obj_oleview.h -include/wine/wine/obj_picture.h -include/wine/wine/obj_property.h -include/wine/wine/obj_propertystorage.h -include/wine/wine/obj_serviceprovider.h -include/wine/wine/obj_shellbrowser.h -include/wine/wine/obj_shellextinit.h -include/wine/wine/obj_shellfolder.h -include/wine/wine/obj_shelllink.h -include/wine/wine/obj_shellview.h -include/wine/wine/obj_storage.h -include/wine/wine/obj_webbrowser.h -include/wine/wine/unicode.h -include/wine/winerror.h -include/wine/wingdi.h -include/wine/wininet.h -include/wine/winioctl.h -include/wine/winnetwk.h -include/wine/winnls.h -include/wine/winnt.h -include/wine/winreg.h -include/wine/winres.h -include/wine/winresrc.h -include/wine/winsock.h -include/wine/winsock2.h -include/wine/winspool.h -include/wine/winsvc.h -include/wine/winternl.h -include/wine/winuser.h -include/wine/winver.h -include/wine/wnaspi32.h -include/wine/wownt32.h -include/wine/ws2spi.h -include/wine/ws2tcpip.h -include/wine/wshisotp.h -include/wine/wsipx.h -include/wine/wtypes.h -include/wine/zmouse.h +include/wine/obj_cache.h +include/wine/obj_comcat.h +include/wine/obj_commdlgbrowser.h +include/wine/obj_connection.h +include/wine/obj_contextmenu.h +include/wine/obj_control.h +include/wine/obj_dockingwindowframe.h +include/wine/obj_dragdrop.h +include/wine/obj_dragdrophelper.h +include/wine/obj_enumguid.h +include/wine/obj_enumidlist.h +include/wine/obj_extracticon.h +include/wine/obj_inplace.h +include/wine/obj_olefont.h +include/wine/obj_oleobj.h +include/wine/obj_oleundo.h +include/wine/obj_oleview.h +include/wine/obj_picture.h +include/wine/obj_property.h +include/wine/obj_serviceprovider.h +include/wine/obj_shellbrowser.h +include/wine/obj_shellextinit.h +include/wine/obj_shellfolder.h +include/wine/obj_shelllink.h +include/wine/obj_shellview.h +include/wine/obj_webbrowser.h +include/wine/unicode.h +include/wine/windows/accctrl.h +include/wine/windows/audevcod.h +include/wine/windows/basetsd.h +include/wine/windows/cderr.h +include/wine/windows/cguid.h +include/wine/windows/comcat.h +include/wine/windows/commctrl.h +include/wine/windows/commdlg.h +include/wine/windows/compobj.h +include/wine/windows/cpl.h +include/wine/windows/custcntl.h +include/wine/windows/d3d.h +include/wine/windows/d3d8.h +include/wine/windows/d3d8caps.h +include/wine/windows/d3d8types.h +include/wine/windows/d3dcaps.h +include/wine/windows/d3dhal.h +include/wine/windows/d3dtypes.h +include/wine/windows/d3dvec.inl +include/wine/windows/d3dx8core.h +include/wine/windows/dde.h +include/wine/windows/ddeml.h +include/wine/windows/ddraw.h +include/wine/windows/ddrawi.h +include/wine/windows/digitalv.h +include/wine/windows/dinput.h +include/wine/windows/dispdib.h +include/wine/windows/dlgs.h +include/wine/windows/dmo.h +include/wine/windows/dmoreg.h +include/wine/windows/dmort.h +include/wine/windows/docobj.h +include/wine/windows/dplay.h +include/wine/windows/dplobby.h +include/wine/windows/dsdriver.h +include/wine/windows/dshow.h +include/wine/windows/dsound.h +include/wine/windows/excpt.h +include/wine/windows/fci.h +include/wine/windows/fdi.h +include/wine/windows/guiddef.h +include/wine/windows/icmpapi.h +include/wine/windows/imagehlp.h +include/wine/windows/imm.h +include/wine/windows/initguid.h +include/wine/windows/instance.h +include/wine/windows/ipexport.h +include/wine/windows/lm.h +include/wine/windows/lmaccess.h +include/wine/windows/lmapibuf.h +include/wine/windows/lmbrowsr.h +include/wine/windows/lmcons.h +include/wine/windows/lmerr.h +include/wine/windows/lmwksta.h +include/wine/windows/lzexpand.h +include/wine/windows/mapi.h +include/wine/windows/mapicode.h +include/wine/windows/mapidefs.h +include/wine/windows/mciavi.h +include/wine/windows/mcx.h +include/wine/windows/mediaerr.h +include/wine/windows/mediaobj.h +include/wine/windows/minmax.h +include/wine/windows/mmddk.h +include/wine/windows/mmreg.h +include/wine/windows/mmsystem.h +include/wine/windows/msacm.h +include/wine/windows/msacmdlg.h +include/wine/windows/mssip.h +include/wine/windows/mswsock.h +include/wine/windows/nb30.h +include/wine/windows/netspi.h +include/wine/windows/nspapi.h +include/wine/windows/ntddcdrm.h +include/wine/windows/ntddscsi.h +include/wine/windows/ntddstor.h +include/wine/windows/ntsecapi.h +include/wine/windows/ntstatus.h +include/wine/windows/oaidl.h +include/wine/windows/objbase.h +include/wine/windows/objidl.h +include/wine/windows/ocidl.h +include/wine/windows/ole2.h +include/wine/windows/ole2ver.h +include/wine/windows/oleauto.h +include/wine/windows/olectl.h +include/wine/windows/oledlg.h +include/wine/windows/oleidl.h +include/wine/windows/pktdef.h +include/wine/windows/poppack.h +include/wine/windows/prsht.h +include/wine/windows/psapi.h +include/wine/windows/pshpack1.h +include/wine/windows/pshpack2.h +include/wine/windows/pshpack4.h +include/wine/windows/pshpack8.h +include/wine/windows/ras.h +include/wine/windows/regstr.h +include/wine/windows/richedit.h +include/wine/windows/richole.h +include/wine/windows/rpc.h +include/wine/windows/rpcdce.h +include/wine/windows/rpcdcep.h +include/wine/windows/rpcndr.h +include/wine/windows/rpcnterr.h +include/wine/windows/rpcproxy.h +include/wine/windows/servprov.h +include/wine/windows/setupapi.h +include/wine/windows/shellapi.h +include/wine/windows/shlguid.h +include/wine/windows/shlobj.h +include/wine/windows/shlwapi.h +include/wine/windows/sipbase.h +include/wine/windows/sql.h +include/wine/windows/sqlext.h +include/wine/windows/sqltypes.h +include/wine/windows/storage.h +include/wine/windows/tapi.h +include/wine/windows/tchar.h +include/wine/windows/tlhelp32.h +include/wine/windows/unknwn.h +include/wine/windows/urlmon.h +include/wine/windows/uuids.h +include/wine/windows/ver.h +include/wine/windows/vfw.h +include/wine/windows/vfwmsgs.h +include/wine/windows/winbase.h +include/wine/windows/wincon.h +include/wine/windows/wincrypt.h +include/wine/windows/windef.h +include/wine/windows/windows.h +include/wine/windows/windowsx.h +include/wine/windows/winerror.h +include/wine/windows/wingdi.h +include/wine/windows/wininet.h +include/wine/windows/winioctl.h +include/wine/windows/winnetwk.h +include/wine/windows/winnls.h +include/wine/windows/winnt.h +include/wine/windows/winreg.h +include/wine/windows/winres.h +include/wine/windows/winresrc.h +include/wine/windows/winsock.h +include/wine/windows/winsock2.h +include/wine/windows/winspool.h +include/wine/windows/winsvc.h +include/wine/windows/wintab.h +include/wine/windows/wintabx.h +include/wine/windows/winternl.h +include/wine/windows/winuser.h +include/wine/windows/winver.h +include/wine/windows/wnaspi32.h +include/wine/windows/wownt32.h +include/wine/windows/ws2spi.h +include/wine/windows/ws2tcpip.h +include/wine/windows/wshisotp.h +include/wine/windows/wsipx.h +include/wine/windows/wtypes.h +include/wine/windows/zmouse.h lib/libntdll.dll.so lib/libwine.so lib/libwine.so.1.0 @@ -262,7 +271,12 @@ lib/wine/compobj.dll.so lib/wine/control.exe.so lib/wine/crtdll.dll.so lib/wine/crypt32.dll.so +lib/wine/ctl3d.dll.so +lib/wine/ctl3d32.dll.so +lib/wine/ctl3dv2.dll.so lib/wine/d3d8.dll.so +lib/wine/d3dim.dll.so +lib/wine/d3dx8.dll.so lib/wine/dciman32.dll.so lib/wine/ddeml.dll.so lib/wine/ddraw.dll.so @@ -288,6 +302,89 @@ lib/wine/joystick.drv.so lib/wine/kernel32.dll.so lib/wine/keyboard.dll.so lib/wine/krnl386.exe.so +lib/wine/libadvapi32.def +lib/wine/libavicap32.def +lib/wine/libavifil32.def +lib/wine/libcabinet.def +lib/wine/libcomcat.def +lib/wine/libcomctl32.def +lib/wine/libcomdlg32.def +lib/wine/libcrtdll.def +lib/wine/libcrypt32.def +lib/wine/libctl3d32.def +lib/wine/libd3d8.def +lib/wine/libd3dim.def +lib/wine/libd3dx8.def +lib/wine/libdciman32.def +lib/wine/libddraw.def +lib/wine/libdevenum.def +lib/wine/libdinput.def +lib/wine/libdinput8.def +lib/wine/libdplay.def +lib/wine/libdplayx.def +lib/wine/libdsound.def +lib/wine/libgdi32.def +lib/wine/libglu32.def +lib/wine/libicmp.def +lib/wine/libimagehlp.def +lib/wine/libimm32.def +lib/wine/libkernel32.def +lib/wine/liblz32.def +lib/wine/libmapi32.def +lib/wine/libmpr.def +lib/wine/libmsacm32.def +lib/wine/libmsdmo.def +lib/wine/libmsimg32.def +lib/wine/libmsnet32.def +lib/wine/libmsrle32.def +lib/wine/libmsvcrt.def +lib/wine/libmsvcrt20.def +lib/wine/libmsvfw32.def +lib/wine/libnetapi32.def +lib/wine/libntdll.def +lib/wine/libodbc32.def +lib/wine/libole32.def +lib/wine/liboleaut32.def +lib/wine/libolecli32.def +lib/wine/liboledlg.def +lib/wine/libolepro32.def +lib/wine/libolesvr32.def +lib/wine/libopengl32.def +lib/wine/libpsapi.def +lib/wine/libqcap.def +lib/wine/libquartz.def +lib/wine/librasapi32.def +lib/wine/libriched32.def +lib/wine/librpcrt4.def +lib/wine/libserialui.def +lib/wine/libsetupapi.def +lib/wine/libshdocvw.def +lib/wine/libshell32.def +lib/wine/libshfolder.def +lib/wine/libshlwapi.def +lib/wine/libsnmpapi.def +lib/wine/libsti.def +lib/wine/libtapi32.def +lib/wine/libttydrv.def +lib/wine/libtwain_32.def +lib/wine/liburl.def +lib/wine/liburlmon.def +lib/wine/libuser32.def +lib/wine/libversion.def +lib/wine/libw32skrnl.def +lib/wine/libwinedos.def +lib/wine/libwineps.def +lib/wine/libwininet.def +lib/wine/libwinmm.def +lib/wine/libwinnls32.def +lib/wine/libwinspool.def +lib/wine/libwintab32.def +lib/wine/libwintrust.def +lib/wine/libwnaspi32.def +lib/wine/libwow32.def +lib/wine/libws2_32.def +lib/wine/libwsock32.def +lib/wine/libx11drv.def lib/wine/lz32.dll.so lib/wine/lzexpand.dll.so lib/wine/mapi32.dll.so @@ -343,6 +440,7 @@ lib/wine/regedit.exe.so lib/wine/regsvr32.exe.so lib/wine/riched32.dll.so lib/wine/rpcrt4.dll.so +lib/wine/rpcss.exe.so lib/wine/rundll32.exe.so lib/wine/serialui.dll.so lib/wine/setupapi.dll.so @@ -354,6 +452,7 @@ lib/wine/shfolder.dll.so lib/wine/shlwapi.dll.so lib/wine/snmpapi.dll.so lib/wine/sound.dll.so +lib/wine/start.exe.so lib/wine/sti.dll.so lib/wine/storage.dll.so lib/wine/stress.dll.so @@ -380,18 +479,19 @@ lib/wine/windebug.dll.so lib/wine/winealsa.drv.so lib/wine/winearts.drv.so lib/wine/wineaudioio.drv.so +lib/wine/wineboot.exe.so lib/wine/wineconsole.exe.so lib/wine/winedbg.exe.so lib/wine/winedos.dll.so -lib/wine/winedos16.dll.so lib/wine/winefile.exe.so +lib/wine/winejack.drv.so lib/wine/winemine.exe.so lib/wine/winemp3.acm.so lib/wine/winenas.drv.so lib/wine/wineoss.drv.so lib/wine/winepath.exe.so lib/wine/wineps.dll.so -lib/wine/wineps16.dll.so +lib/wine/wineps16.drv.so lib/wine/wing.dll.so lib/wine/winhelp.exe.so lib/wine/wininet.dll.so @@ -400,6 +500,8 @@ lib/wine/winnls.dll.so lib/wine/winnls32.dll.so lib/wine/winsock.dll.so lib/wine/winspool.drv.so +lib/wine/wintab.dll.so +lib/wine/wintab32.dll.so lib/wine/wintrust.dll.so lib/wine/winver.exe.so lib/wine/wnaspi32.dll.so @@ -420,7 +522,7 @@ share/examples/wine/system.ini share/examples/wine/wine.conf @dirrm share/examples/wine @dirrm lib/wine -@dirrm include/wine/wine +@dirrm include/wine/windows @dirrm include/wine/msvcrt/sys @dirrm include/wine/msvcrt @dirrm include/wine diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index e08103671a0..84f0e1431a6 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.13 2002/12/09 14:42:55 junyoung Exp $ +$NetBSD: distinfo,v 1.14 2003/03/04 11:45:59 wiz Exp $ -SHA1 (Wine-20021125.tar.gz) = 1cf35d3f3c1ee88ef976e3d67c8f5d7ce52bb5ed -Size (Wine-20021125.tar.gz) = 7914022 bytes +SHA1 (Wine-20030219.tar.gz) = 682e20ab97b62809c5526cfbf708d22e30d29182 +Size (Wine-20030219.tar.gz) = 8314951 bytes SHA1 (patch-aa) = 3b903517cdde2dbe338bd41819de5a2787e5d0de +SHA1 (patch-ab) = ad0dd7b9c9ca3a9c0d13c52b78c48b95d55c0513 SHA1 (patch-ac) = a2555dca0eb87ebc63ba239428f030815ce97604 diff --git a/emulators/wine/patches/patch-ab b/emulators/wine/patches/patch-ab new file mode 100644 index 00000000000..aed9818ac40 --- /dev/null +++ b/emulators/wine/patches/patch-ab @@ -0,0 +1,31 @@ +$NetBSD: patch-ab,v 1.13 2003/03/04 11:46:00 wiz Exp $ + +--- dlls/ntdll/cdrom.c.orig Wed Feb 19 23:08:50 2003 ++++ dlls/ntdll/cdrom.c +@@ -53,6 +53,16 @@ + #endif + #ifdef HAVE_LINUX_CDROM_H + # include <linux/cdrom.h> ++#else ++# ifndef CD_FRAMES ++# define CD_FRAMES 75 ++# endif ++# ifndef CDROM_MSF ++# define CDROM_MSF 0x02 ++# endif ++# ifndef CD_SECS ++# define CD_SECS 60 ++# endif + #endif + #ifdef HAVE_LINUX_UCDROM_H + # include <linux/ucdrom.h> +@@ -286,7 +296,9 @@ static int CDROM_SyncCache(int dev) + toc->Length[0] = tsz >> 8; + toc->Length[1] = tsz; + ++#if 0 + TRACE("caching toc from=%d to=%d\n", hdr.cdth_trk0, hdr.cdth_trk1); ++#endif + + for (i = toc->FirstTrack; i <= toc->LastTrack + 1; i++) + { |