wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to fix compilation of winemp3.acm on Ubuntu Precise.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-02-20 19:06:50 +01:00
parent 53aeae58ad
commit 88a1a26f34
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/patchinstall.sh
View File

@ -416,6 +416,7 @@ patch_enable_all ()
enable_winedbg_Process_Arguments="$1"
enable_winedevice_Fix_Relocation="$1"
enable_winemenubuilder_Desktop_Icon_Path="$1"
enable_winemp3_acm_Fix_Compilation="$1"
enable_winemp3_acm_MPEG3_StreamOpen="$1"
enable_wineps_drv_PostScript_Fixes="$1"
enable_winepulse_PulseAudio_Support="$1"
@ -1462,6 +1463,9 @@ patch_enable ()
winemenubuilder-Desktop_Icon_Path)
enable_winemenubuilder_Desktop_Icon_Path="$2"
;;
winemp3.acm-Fix_Compilation)
enable_winemp3_acm_Fix_Compilation="$2"
;;
winemp3.acm-MPEG3_StreamOpen)
enable_winemp3_acm_MPEG3_StreamOpen="$2"
;;
@ -8506,6 +8510,18 @@ if test "$enable_winemenubuilder_Desktop_Icon_Path" -eq 1; then
) >> "$patchlist"
fi
# Patchset winemp3.acm-Fix_Compilation
# |
# | Modified files:
# | * dlls/winemp3.acm/mpegl3.c
# |
if test "$enable_winemp3_acm_Fix_Compilation" -eq 1; then
patch_apply winemp3.acm-Fix_Compilation/0001-winemp3.acm-Fixes-compilation-for-older-mpg123-libra.patch
(
printf '%s\n' '+ { "Bruno Jesus", "winemp3.acm: Fixes compilation for older mpg123 library versions.", 2 },';
) >> "$patchlist"
fi
# Patchset winemp3.acm-MPEG3_StreamOpen
# |
# | Modified files:

35
patches/winemp3.acm-Fix_Compilation/0001-winemp3.acm-Fixes-compilation-for-older-mpg123-libra.patch Normal file
View File

@ -0,0 +1,35 @@
From c112987a861f6d9bbb4813a95ed02667f0653462 Mon Sep 17 00:00:00 2001
From: Bruno Jesus <00cpxxx@gmail.com>
Date: Sun, 19 Feb 2017 22:16:18 -0300
Subject: winemp3.acm: Fixes compilation for older mpg123 library versions (try
2)
Thanks to Sebastian Lackner for the correct approach.
Signed-off-by: Bruno Jesus <00cpxxx@gmail.com>
---
dlls/winemp3.acm/mpegl3.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c
index 4a9f8949b1b..4da7541fdee 100644
--- a/dlls/winemp3.acm/mpegl3.c
+++ b/dlls/winemp3.acm/mpegl3.c
@@ -262,12 +262,14 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi)
aad->mh = mpg123_new(NULL,&err);
mpg123_open_feed(aad->mh);
+#if MPG123_API_VERSION >= 31 /* needed for MPG123_IGNORE_FRAMEINFO enum value */
/* mpg123 may find a XING header in the mp3 and use that information
* to ask for seeks in order to read specific frames in the file.
* We cannot allow that since the caller application is feeding us.
* This fixes problems for mp3 files encoded with LAME (bug 42361)
*/
mpg123_param(aad->mh, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0);
+#endif
}
/* no encoding yet
else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM &&
--
2.11.0