wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against cf5616ffbb39df7ad3ac0a41e55777ab6c1abab9.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-10-14 10:21:44 +02:00
parent 71bcbb308e
commit 5149b192c9
4 changed files with 8 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "4b028bb09cb9563e111fedab0f4c3663dc278d0a"
echo "cf5616ffbb39df7ad3ac0a41e55777ab6c1abab9"
}
# Show version information
@ -481,7 +481,6 @@ patch_enable_all ()
enable_winedevice_Fix_Relocation="$1"
enable_winemenubuilder_Desktop_Icon_Path="$1"
enable_winemp3_acm_MPEG3_StreamOpen="$1"
enable_winemp3_acm_Revert_MPEG_Encode="$1"
enable_wineps_drv_PostScript_Fixes="$1"
enable_winepulse_PulseAudio_Support="$1"
enable_winex11_CandidateWindowPos="$1"
@ -1727,9 +1726,6 @@ patch_enable ()
winemp3.acm-MPEG3_StreamOpen)
enable_winemp3_acm_MPEG3_StreamOpen="$2"
;;
winemp3.acm-Revert_MPEG_Encode)
enable_winemp3_acm_Revert_MPEG_Encode="$2"
;;
wineps.drv-PostScript_Fixes)
enable_wineps_drv_PostScript_Fixes="$2"
;;
@ -10208,27 +10204,12 @@ fi
# Patchset winemp3.acm-MPEG3_StreamOpen
# |
# | Modified files:
# | * dlls/msacm32/tests/msacm.c, dlls/winemp3.acm/mpegl3.c
# | * dlls/l3codeca.acm/mpegl3.c, dlls/msacm32/tests/msacm.c
# |
if test "$enable_winemp3_acm_MPEG3_StreamOpen" -eq 1; then
patch_apply winemp3.acm-MPEG3_StreamOpen/0001-winemp3.acm-Check-input-format-in-MPEG3_StreamOpen.patch
(
printf '%s\n' '+ { "Michael Müller", "winemp3.acm: Check input format in MPEG3_StreamOpen.", 1 },';
) >> "$patchlist"
fi
# Patchset winemp3.acm-Revert_MPEG_Encode
# |
# | This patchset fixes the following Wine bugs:
# | * [#43236] Revert patch which broke in-game audio in multiple games
# |
# | Modified files:
# | * dlls/winemp3.acm/mpegl3.c
# |
if test "$enable_winemp3_acm_Revert_MPEG_Encode" -eq 1; then
patch_apply winemp3.acm-Revert_MPEG_Encode/0001-Revert-winemp3.acm-Disallow-operations-encoding-to-M.patch
(
printf '%s\n' '+ { "Sebastian Lackner", "Revert \"winemp3.acm: Disallow operations encoding to MPEG.\".", 1 },';
printf '%s\n' '+ { "Michael Müller", "l3codeca.acm: Check input format in MPEG3_StreamOpen.", 1 },';
) >> "$patchlist"
fi