Marcus Meissner 2018-03-19 14:46:19 +00:00 committed by Git OBS Bridge
parent 218463a09d
commit 2a4a112928
4 changed files with 32 additions and 7 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ede0c407d68bc677d5108565657945311f4d8e5d0f60e05e49ddc2cf29a9ca11
size 42412

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9f109922d41f41c0a0ebf6ffa1a4744e2b55f77391973be81d5fc814012982b5
size 42368

View File

@ -148,7 +148,7 @@ BuildRequires: libva-devel
%endif %endif
%if %{nine} %if %{nine}
# upstream patch target version # upstream patch target version
%define nine_version 3.3 %define nine_version 3.4
BuildRequires: Mesa-libd3d-devel BuildRequires: Mesa-libd3d-devel
BuildRequires: dri2proto-devel BuildRequires: dri2proto-devel
BuildRequires: libOSMesa-devel BuildRequires: libOSMesa-devel

View File

@ -7589,6 +7589,7 @@ w_metadata dxdiagn dlls \
publisher="Microsoft" \ publisher="Microsoft" \
year="2011" \ year="2011" \
media="download" \ media="download" \
conflicts="dxdiagn_feb2010" \
file1="../win7sp1/windows6.1-KB976932-X86.exe" \ file1="../win7sp1/windows6.1-KB976932-X86.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/dxdiagn.dll" installed_file1="$W_SYSTEM32_DLLS_WIN/dxdiagn.dll"
@ -7607,6 +7608,26 @@ load_dxdiagn()
#---------------------------------------------------------------- #----------------------------------------------------------------
w_metadata dxdiagn_feb2010 dlls \
title="DirectX Diagnostic Library (February 2010)" \
publisher="Microsoft" \
year="2010" \
media="download" \
conflicts="dxdiagn" \
file1="../directx9/directx_feb2010_redist.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/dxdiagn.dll"
load_dxdiagn_feb2010()
{
helper_directx_dl
w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dxdiagn.dll' "$W_TMP/dxnt.cab"
w_override_dlls native dxdiagn
}
#----------------------------------------------------------------
w_metadata dsound dlls \ w_metadata dsound dlls \
title="MS DirectSound from DirectX user redistributable" \ title="MS DirectSound from DirectX user redistributable" \
publisher="Microsoft" \ publisher="Microsoft" \
@ -11435,10 +11456,14 @@ load_dxdiag()
w_override_dlls native dxdiag.exe w_override_dlls native dxdiag.exe
if w_workaround_wine_bug 1429; then if w_workaround_wine_bug 1429; then
w_call dxdiagn w_call dxdiagn_feb2010
fi fi
if w_workaround_wine_bug 9027; then if w_workaround_wine_bug 9027; then
w_call directmusic w_call dmband
w_call dmime
w_call dmstyle
w_call dmsynth
w_call dmusic
fi fi
} }
@ -12811,7 +12836,7 @@ load_vc2010express()
# Originally at: https://download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso # Originally at: https://download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso
# Mirror list at: http://www.filewatcher.com/_/?q=VS2010Express1.iso # Mirror list at: http://www.filewatcher.com/_/?q=VS2010Express1.iso
# Formerly at: ftp://www.daba.lv/pub/Programmeeshana/VisualStudio/VS2010Express1.iso a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b # Formerly at: ftp://www.daba.lv/pub/Programmeeshana/VisualStudio/VS2010Express1.iso a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b
w_download https://web.archive.org/web/20140227220734/download.microsoft.com/download/1/E/5/1E5F1C0A-0D5B-426A-A603-1798B951DDAE/VS2010Express1.iso a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b w_download https://debian.fmi.uni-sofia.bg/~aangelov/VS2010Express1.iso a9d5dcdf55e539a06547a8ebbc63d55dc167113e09ee9e42096ab9098313039b
# Unpack ISO # Unpack ISO
w_try_7z "$W_TMP" "$W_CACHE"/vc2010express/VS2010Express1.iso w_try_7z "$W_TMP" "$W_CACHE"/vc2010express/VS2010Express1.iso