From cbab1e48ceddb36f04ef855f663d27fcfc982e3e63ae1d0b34b06cf5dbd42328 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 25 Jun 2008 22:40:27 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=41 --- wine-0.9.64_aka_1.0.rc3.tar.bz2 | 3 -- wine-0.9.65_aka_1.0.rc4.tar.bz2 | 3 ++ wine.changes | 10 ++++++ wine.spec | 13 ++++++-- winetricks | 58 +++++++++++++++++++++++++++++++-- 5 files changed, 79 insertions(+), 8 deletions(-) delete mode 100644 wine-0.9.64_aka_1.0.rc3.tar.bz2 create mode 100644 wine-0.9.65_aka_1.0.rc4.tar.bz2 diff --git a/wine-0.9.64_aka_1.0.rc3.tar.bz2 b/wine-0.9.64_aka_1.0.rc3.tar.bz2 deleted file mode 100644 index 1bac332..0000000 --- a/wine-0.9.64_aka_1.0.rc3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2557c1ca762c7c7f7d90b16353dbcd8acdd309f3dd33dfe29e75eb5a53903506 -size 13932512 diff --git a/wine-0.9.65_aka_1.0.rc4.tar.bz2 b/wine-0.9.65_aka_1.0.rc4.tar.bz2 new file mode 100644 index 0000000..812d4c1 --- /dev/null +++ b/wine-0.9.65_aka_1.0.rc4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2b59e6663919ec46e61740dabd3922a6c4909f0bc43dd42cf604aaa042b6fcd +size 13989896 diff --git a/wine.changes b/wine.changes index bd5266a..72409a9 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Jun 8 12:01:29 CEST 2008 - meissner@suse.de + +- Upgraded to upstream 1.0-rc4 (labeled 0.9.65_aka_1.0.rc4 + to avoid update problems to 1.0) + - Bug fixes only, we are in code freeze. +- updated to current winetricks + - added vlc,quicktime downloader and mplayerclient tool downloader +- Changelog only included in source tarball now + ------------------------------------------------------------------- Tue Jun 3 08:27:19 CEST 2008 - meissner@suse.de diff --git a/wine.spec b/wine.spec index 8cfde1b..54d07a7 100644 --- a/wine.spec +++ b/wine.spec @@ -1,5 +1,5 @@ # -# spec file for package wine (Version 0.9.64_aka_1.0.rc3) +# spec file for package wine (Version 0.9.65_aka_1.0.rc4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ BuildRequires: alsa-devel bison capi4linux-devel cups-devel desktop-file-utils License: LGPL v2.1 or later Group: System/Emulators/PC AutoReqProv: on -Version: 0.9.64_aka_1.0.rc3 +Version: 0.9.65_aka_1.0.rc4 Release: 1 Summary: An MS Windows Emulator Url: http://www.winehq.com @@ -78,7 +78,7 @@ make install prefix=$RPM_BUILD_ROOT%{_prefix} # # install documentation install -d -m 755 $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/ -cp ANNOUNCE AUTHORS ChangeLog LICENSE LICENSE.OLD README* \ +cp ANNOUNCE AUTHORS LICENSE LICENSE.OLD README* \ $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/ # find $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/ -type d|xargs chmod ogu+rx @@ -118,6 +118,13 @@ rm -rf $RPM_BUILD_ROOT /usr/share/aclocal/wine.m4 %changelog +* Sun Jun 08 2008 meissner@suse.de +- Upgraded to upstream 1.0-rc4 (labeled 0.9.65_aka_1.0.rc4 + to avoid update problems to 1.0) + - Bug fixes only, we are in code freeze. +- updated to current winetricks + - added vlc,quicktime downloader and mplayerclient tool downloader +- Changelog only included in source tarball now * Tue Jun 03 2008 meissner@suse.de - Upgraded to upstream 1.0-rc3 (labeled 0.9.64_aka_1.0.rc4 to avoid update problems to 1.0) diff --git a/winetricks b/winetricks index d59d442..2a51759 100644 --- a/winetricks +++ b/winetricks @@ -31,7 +31,7 @@ esac case "$1" in -V|--version) - echo "Winetricks version 20080523. (C) Dan Kegel. LGPL." + echo "Winetricks version 20080527. (C) Dan Kegel. LGPL." exit 0 ;; esac @@ -102,6 +102,7 @@ usage() { echo " msxml4 Microsoft XML version 4" echo " msxml6 Microsoft XML version 6" echo " pdh Install pdh.dll (Performance Data Helper)" + echo " quicktime72 Apple Quicktime 7.2" echo " riched20 Use Microsoft riched20 and riched32" echo " riched30 Use Microsoft riched30" echo " tahoma Install MS Tahoma font (not part of corefonts)" @@ -121,6 +122,9 @@ usage() { echo " wsh56js Windows scripting 5.6, jscript only, no cscript" echo " wsh56vb Windows scripting 5.6, vbscript only, no cscript" echo " xvid Install xvid video codecs" + echo "Apps:" + echo " vlc VLC media player" + echo " mpc Media Player Classic" echo "Pseudopackages:" echo " allfonts Install all listed fonts (corefonts, tahoma, liberation)" echo " allcodecs Install all listed codecs (xvid, ffdshow, icodecs)" @@ -233,7 +237,7 @@ case x"$1" in x) GUI=1; dogui ; set $todo ;; x-h|x--help|xhelp) usage ; exit 1 ;; esac -test -d "$WINEPREFIX" || $WINEPREFIXCREATE +test -d "$WINEPREFIX" || $WINEPREFIXCREATE > /dev/null 2>&1 mkdir -p "$WINETRICKS_CACHE" olddir=`pwd` # Clean up after failed runs, if needed @@ -895,6 +899,16 @@ _EOF_ #---------------------------------------------------------------- +load_mpc() { + download . $SOURCEFORGE/guliverkli2/mplayerc_20080414.zip bc9f922d7151e7cc7fef429b085cf208ef989bab + cd "$WINEPREFIX"/drive_c + try unzip "$WINETRICKS_CACHE"/mplayerc_20080414.zip + cd "$olddir" + echo MPC now available as c:/mplayerc.exe +} + +#---------------------------------------------------------------- + load_msi2() { # Install native msi per http://wiki.winehq.org/NativeMsi # http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=CEBBACD8-C094-4255-B702-DE3BB768148F @@ -982,6 +996,34 @@ load_pdh() { #---------------------------------------------------------------- +load_quicktime72() { + # http://www.apple.com/support/downloads/quicktime72forwindows.html + download quicktime72 'http://wsidecar.apple.com/cgi-bin/nph-reg3rdpty2.pl/product=14402&cat=59&platform=osx&method=sa/QuickTimeInstaller.exe' bb89981f10cf21de57b9453e53cf81b9194271a9 + unset QUICKTIME_QUIET + if test "$WINETRICKS_QUIET"x != x + then + QUICKTIME_QUIET="/qn" # ISSETUPDRIVEN=0 + fi + # set vista mode to inhibit directdraw overlay use that blacks the screen + set_winver vista + try $WINE "$WINETRICKS_CACHE"/quicktime72/QuickTimeInstaller.exe ALLUSERS=1 DESKTOP_SHORTCUTS=0 QTTaskRunFlags=0 QTINFO.BISQTPRO=1 SCHEDULE_ASUW=0 REBOOT_REQUIRED=No $QUICKTIME_QUIET + if test "$WINETRICKS_QUIET"x = x + then + echo "You probably want to select Advanced / Safe Mode in the Quicktime control panel" + try $WINE control ${programfilesdir_win}'\QuickTime\QTSystem\QuickTime.cpl' + fi + + unset_winver + # user might want to set vista mode himself, or run + # wine control ".wine/drive_c/Program Files/QuickTime/QTSystem/QuickTime.cpl" + # and pick Advanced / Safe Mode (gdi only). + # We could probably force that by overwriting QuickTime.qtp + # (probably in Program Files/QuickTime/QTSystem/QuickTime.qtp) + # but the format isn't known, so we'd have to override all other settings, too. +} + +#---------------------------------------------------------------- + volnum() { # Recent Microsoft installers are often based on "windows package manager", see # http://support.microsoft.com/kb/262841 and @@ -1163,6 +1205,14 @@ load_vcrun2008() { #---------------------------------------------------------------- +load_vlc() { + # want http://www.videolan.org/mirror.php?file=vlc/0.8.6f/win32/vlc-0.8.6f-win32.exe but it doesn't redirect? + download . http://mirrors.optralan.com/videolan/vlc/0.8.6f/win32/vlc-0.8.6f-win32.exe b83558e4232c47a385dbc93ebdc2e6b942fbcfbf + try $WINE "$WINETRICKS_CACHE"/vlc-0.8.6f-win32.exe $WINETRICKS_S +} + +#---------------------------------------------------------------- + load_wmp9() { # Not really expected to work well yet; see # http://appdb.winehq.org/appview.php?versionId=1449 @@ -1193,6 +1243,7 @@ load_wmp10() { download . http://download.microsoft.com/download/1/2/A/12A31F29-2FA9-4F50-B95D-E45EF7013F87/MP10Setup.exe 69862273a5d9d97b4a2e5a3bd93898d259e86657 # Crashes on exit, but otherwise ok; see http://bugs.winehq.org/show_bug.cgi?id=12633 + echo Executing $WINE "$WINETRICKS_CACHE"/MP10Setup.exe $WINETRICKS_QUIET $WINE "$WINETRICKS_CACHE"/MP10Setup.exe $WINETRICKS_QUIET || true # Also install the codecs @@ -1290,12 +1341,14 @@ do mdac28) load_mdac28;; mfc40) load_mfc40;; mono19) load_mono19;; + mpc) load_mpc;; msi2) load_msi2;; msls31) load_msls31;; msxml3) load_msxml3;; msxml4) load_msxml4;; msxml6) load_msxml6;; pdh) load_pdh;; + quicktime72) load_gdiplus; load_quicktime72;; # needs e.g. gdiplus.dll.GdipCloneImage riched20) load_riched20;; riched30) load_riched30;; tahoma) load_tahoma;; @@ -1308,6 +1361,7 @@ do vcrun2005) load_vcrun2005;; vcrun2005sp1) load_vcrun2005sp1;; vcrun2008) load_vcrun2008;; + vlc) load_vlc;; wmp9) load_vcrun6; load_wsh56; load_wmp9;; wmp10) load_vcrun6; load_wsh56; load_wmp10;; wsh51) load_wsh51;;