October 2021 - Wine-Commits

Alexandre Julliard : regedit: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: 8667b8d124f66b7c172a94e6b87e725fe647e114 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8667b8d124f66b7c172a94e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:01:38 2021 +0200 regedit: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 14 +++++++------- programs/regedit/regedit.c | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 813c1a1c84c..13f2256b2cb 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -44,7 +44,7 @@ struct edit_params DWORD size; }; -static int vmessagebox(HWND hwnd, int buttons, int titleId, int resId, __ms_va_list va_args) +static int vmessagebox(HWND hwnd, int buttons, int titleId, int resId, va_list va_args) { WCHAR title[256]; WCHAR fmt[1024]; @@ -64,23 +64,23 @@ static int vmessagebox(HWND hwnd, int buttons, int titleId, int resId, __ms_va_l int WINAPIV messagebox(HWND hwnd, int buttons, int titleId, int resId, ...) { - __ms_va_list ap; + va_list ap; INT result; - __ms_va_start(ap, resId); + va_start(ap, resId); result = vmessagebox(hwnd, buttons, titleId, resId, ap); - __ms_va_end(ap); + va_end(ap); return result; } static void WINAPIV error_code_messagebox(HWND hwnd, unsigned int msg_id, ...) { - __ms_va_list ap; + va_list ap; - __ms_va_start(ap, msg_id); + va_start(ap, msg_id); vmessagebox(hwnd, MB_OK|MB_ICONERROR, IDS_ERROR, msg_id, ap); - __ms_va_end(ap); + va_end(ap); } static BOOL change_dword_base(HWND hwndDlg, BOOL toHex) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index e25de19b527..c60d1ddb9b6 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -50,7 +50,7 @@ static void output_writeconsole(const WCHAR *str, DWORD wlen) } } -static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) +static void output_formatstring(const WCHAR *fmt, va_list va_args) { WCHAR *str; DWORD len; @@ -69,31 +69,31 @@ static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args) void WINAPIV output_message(unsigned int id, ...) { WCHAR fmt[1536]; - __ms_va_list va_args; + va_list va_args; if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); return; } - __ms_va_start(va_args, id); + va_start(va_args, id); output_formatstring(fmt, va_args); - __ms_va_end(va_args); + va_end(va_args); } void WINAPIV error_exit(unsigned int id, ...) { WCHAR fmt[1536]; - __ms_va_list va_args; + va_list va_args; if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { WINE_FIXME("LoadString failed with %u\n", GetLastError()); return; } - __ms_va_start(va_args, id); + va_start(va_args, id); output_formatstring(fmt, va_args); - __ms_va_end(va_args); + va_end(va_args); exit(0); /* regedit.exe always terminates with error code zero */ }

1 0

Alexandre Julliard : hostname: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: 2f680d281bdc8515cc95c949d7be15fa2b1f7a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f680d281bdc8515cc95c949… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:00:55 2021 +0200 hostname: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/hostname/hostname.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/hostname/hostname.c b/programs/hostname/hostname.c index 812703d909d..b8704cff7a7 100644 --- a/programs/hostname/hostname.c +++ b/programs/hostname/hostname.c @@ -29,7 +29,7 @@ #include "hostname.h" -static int hostname_vprintfW(const WCHAR *msg, __ms_va_list va_args) +static int hostname_vprintfW(const WCHAR *msg, va_list va_args) { int wlen; DWORD count, ret; @@ -63,27 +63,27 @@ static int hostname_vprintfW(const WCHAR *msg, __ms_va_list va_args) static int WINAPIV hostname_printfW(const WCHAR *msg, ...) { - __ms_va_list va_args; + va_list va_args; int len; - __ms_va_start(va_args, msg); + va_start(va_args, msg); len = hostname_vprintfW(msg, va_args); - __ms_va_end(va_args); + va_end(va_args); return len; } static int WINAPIV hostname_message_printfW(int msg, ...) { - __ms_va_list va_args; + va_list va_args; WCHAR msg_buffer[8192]; int len; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); - __ms_va_start(va_args, msg); + va_start(va_args, msg); len = hostname_vprintfW(msg_buffer, va_args); - __ms_va_end(va_args); + va_end(va_args); return len; }

1 0

Dmitry Timoshkov : mpg123: Fix compilation with clang.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: 981306c1f01112719850439a74e13693dfa6d3a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=981306c1f01112719850439a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 22 23:46:02 2021 +0300 mpg123: Fix compilation with clang. clang -c -o libs/mpg123/src/compat/compat.cross.o ../wine.src/libs/mpg123/src/compat/compat.c -Ilibs/mpg123 \ -I../wine.src/libs/mpg123 -Iinclude -I../wine.src/include -I../wine.src/include/msvcrt \ -I../wine.src/libs/mpg123/src -I../wine.src/libs/mpg123/src/compat \ -I../wine.src/libs/mpg123/src/libmpg123 -DOPT_GENERIC_DITHER -DREAL_IS_FLOAT -DNO_CATCHSIGNAL \ -D_UCRT -D__WINE_PE_BUILD -target x86_64-windows -fno-strict-aliasing -Wno-pragma-pack -Wno-format \ -mcx16 -gdwarf-2 -gstrict-dwarf -g -O2 In file included from ../wine.src/libs/mpg123/src/compat/compat.c:15: ../wine.src/libs/mpg123/src/compat/compat.h:74:10: fatal error: 'strings.h' file not found ^~~~~~~~~~~ 1 error generated. make: *** [Makefile:216382: libs/mpg123/src/compat/compat.cross.o] Error 1 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/mpg123/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/mpg123/config.h b/libs/mpg123/config.h index 77986b2a513..c0ad79f0ebf 100644 --- a/libs/mpg123/config.h +++ b/libs/mpg123/config.h @@ -219,7 +219,7 @@ #define HAVE_STRERROR 1 /* Define to 1 if you have the <strings.h> header file. */ -#define HAVE_STRINGS_H 1 +/* #undef HAVE_STRINGS_H 1 */ /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H 1

1 0

Alexandre Julliard : expand: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: f0fcb195251aad7c4e9bfa809037d741722d1e20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0fcb195251aad7c4e9bfa80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:00:40 2021 +0200 expand: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/expand/expand.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/expand/expand.c b/programs/expand/expand.c index fe2b4a1c81e..18e36d77a6b 100644 --- a/programs/expand/expand.c +++ b/programs/expand/expand.c @@ -28,16 +28,16 @@ static int WINAPIV myprintf(const char* format, ...) { - __ms_va_list va; + va_list va; char tmp[8192]; DWORD w = 0; int len; - __ms_va_start(va, format); + va_start(va, format); len = vsnprintf(tmp, sizeof(tmp), format, va); if (len > 0) WriteFile(GetStdHandle(STD_ERROR_HANDLE), tmp, len, &w, NULL); - __ms_va_end(va); + va_end(va); return w; }

1 0

Alexandre Julliard : cmd: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: a8a250cdbc0dec401ed9620da3538e42aec3c678 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8a250cdbc0dec401ed9620d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:00:27 2021 +0200 cmd: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmdmain.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 4ed1c96a9c2..675d7c5f464 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -122,15 +122,15 @@ static void WCMD_output_asis_len(const WCHAR *message, DWORD len, HANDLE device) void WINAPIV WCMD_output (const WCHAR *format, ...) { - __ms_va_list ap; + va_list ap; WCHAR* string; DWORD len; - __ms_va_start(ap,format); + va_start(ap,format); string = NULL; len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, format, 0, 0, (LPWSTR)&string, 0, &ap); - __ms_va_end(ap); + va_end(ap); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); else @@ -147,15 +147,15 @@ void WINAPIV WCMD_output (const WCHAR *format, ...) { void WINAPIV WCMD_output_stderr (const WCHAR *format, ...) { - __ms_va_list ap; + va_list ap; WCHAR* string; DWORD len; - __ms_va_start(ap,format); + va_start(ap,format); string = NULL; len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, format, 0, 0, (LPWSTR)&string, 0, &ap); - __ms_va_end(ap); + va_end(ap); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); else @@ -172,14 +172,14 @@ void WINAPIV WCMD_output_stderr (const WCHAR *format, ...) { WCHAR* WINAPIV WCMD_format_string (const WCHAR *format, ...) { - __ms_va_list ap; + va_list ap; WCHAR* string; DWORD len; - __ms_va_start(ap,format); + va_start(ap,format); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER, format, 0, 0, (LPWSTR)&string, 0, &ap); - __ms_va_end(ap); + va_end(ap); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); string = (WCHAR*)LocalAlloc(LMEM_FIXED, 2);

1 0

Alexandre Julliard : attrib: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: 9be401e3cb8533a5f87f107bb2942f3e7b9842c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9be401e3cb8533a5f87f107b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:00:16 2021 +0200 attrib: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/attrib/attrib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 13fedad4e34..f8257461fe2 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -52,7 +52,7 @@ static int WINAPIV ATTRIB_wprintf(const WCHAR *format, ...) static BOOL traceOutput = FALSE; #define MAX_WRITECONSOLE_SIZE 65535 - __ms_va_list parms; + va_list parms; DWORD nOut; int len; DWORD res = 0; @@ -70,10 +70,10 @@ static int WINAPIV ATTRIB_wprintf(const WCHAR *format, ...) return 0; } - __ms_va_start(parms, format); + va_start(parms, format); len = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, format, 0, 0, output_bufW, MAX_WRITECONSOLE_SIZE/sizeof(*output_bufW), &parms); - __ms_va_end(parms); + va_end(parms); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); return 0;

1 0

Alexandre Julliard : fsutil: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: wine Branch: master Commit: d39a23c51807d62c8b9a77cef6c078cdd25e5ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d39a23c51807d62c8b9a77ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 11:00:46 2021 +0200 fsutil: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/fsutil/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c index e4c036f9650..46deda8a51d 100644 --- a/programs/fsutil/main.c +++ b/programs/fsutil/main.c @@ -51,12 +51,12 @@ static void output_write(const WCHAR *str, DWORD wlen) static int WINAPIV output_string(int msg, ...) { WCHAR out[8192]; - __ms_va_list arguments; + va_list arguments; int len; - __ms_va_start(arguments, msg); + va_start(arguments, msg); len = FormatMessageW(FORMAT_MESSAGE_FROM_HMODULE, NULL, msg, 0, out, ARRAY_SIZE(out), &arguments); - __ms_va_end(arguments); + va_end(arguments); if (len == 0 && GetLastError() != NO_ERROR) WINE_FIXME("Could not format string: le=%u, msg=%d\n", GetLastError(), msg);

1 0

Alexandre Julliard : packaging: Add Fedora 35.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: tools Branch: master Commit: bf64386712ae6c1f6a7c36ca6558575fab4ef69f URL: https://source.winehq.org/git/tools.git/?a=commit;h=bf64386712ae6c1f6a7c36c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Oct 24 12:39:45 2021 +0200 packaging: Add Fedora 35. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/obs-sync | 2 +- packaging/obs/rsync-filter | 1 + packaging/obs/yum.conf | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 2c624ef..0691425 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -184,7 +184,7 @@ publish_files () cd $basedir -distros="33 34 buster bullseye bookworm bionic focal hirsute" +distros="33 34 35 buster bullseye bookworm bionic focal hirsute" dry_run= build=1 diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index cd6bc22..6d9f1a4 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -1,6 +1,7 @@ + /fedora + /fedora/33 + /fedora/34 ++ /fedora/35 - /fedora/* + /debian diff --git a/packaging/obs/yum.conf b/packaging/obs/yum.conf index c3f2fcd..15cb666 100644 --- a/packaging/obs/yum.conf +++ b/packaging/obs/yum.conf @@ -11,3 +11,7 @@ baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/… [fedora-34] name = Fedora 34 baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/… + +[fedora-35] +name = Fedora 35 +baseurl=https://download.opensuse.org/repositories/Emulators:/Wine:/Fedora/Fedora_35

1 0

Alexandre Julliard : packaging: Add Ubuntu 21.10.
by Alexandre Julliard Oct. 25, 2021

Oct. 25, 2021

Module: tools Branch: master Commit: 462984471bb2728275708850cfd355eb0e28334a URL: https://source.winehq.org/git/tools.git/?a=commit;h=462984471bb272827570885… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 21:44:56 2021 +0200 packaging: Add Ubuntu 21.10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/apt-mirror.cfg | 4 ++++ packaging/obs/obs-sync | 15 ++++++++------- packaging/obs/rsync-filter | 1 + 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index b8b7c61..186f65a 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -38,4 +38,8 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ +deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ + clean https://download.opensuse.org/repositories/Emulators:/Wine:/Debian diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 0691425..b33bbd3 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -184,7 +184,7 @@ publish_files () cd $basedir -distros="33 34 35 buster bullseye bookworm bionic focal hirsute" +distros="33 34 35 buster bullseye bookworm bionic focal hirsute impish" dry_run= build=1 @@ -238,12 +238,13 @@ do do case $i in 3?) add_rpm $i Fedora_$i ;; - buster) add_deb debian buster Debian_10 oldstable ;; - bullseye) add_deb debian bullseye Debian_11 stable ;; - bookworm) add_deb debian bookworm Debian_Testing_standard testing ;; - bionic) add_deb ubuntu bionic xUbuntu_18.04 ;; - focal) add_deb ubuntu focal xUbuntu_20.04 ;; - hirsute) add_deb ubuntu hirsute xUbuntu_21.04 ;; + buster) add_deb debian $i Debian_10 oldstable ;; + bullseye) add_deb debian $i Debian_11 stable ;; + bookworm) add_deb debian $i Debian_Testing_standard testing ;; + bionic) add_deb ubuntu $i xUbuntu_18.04 ;; + focal) add_deb ubuntu $i xUbuntu_20.04 ;; + hirsute) add_deb ubuntu $i xUbuntu_21.04 ;; + impish) add_deb ubuntu $i xUbuntu_21.10 ;; *) echo "Unknown distro $i"; exit 1 ;; esac done diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 6d9f1a4..8940d8b 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -20,6 +20,7 @@ + /ubuntu/dists/bionic + /ubuntu/dists/focal + /ubuntu/dists/hirsute ++ /ubuntu/dists/impish - /ubuntu/dists/* - /ubuntu/*

1 0

Alexandre Julliard : packaging/android: Stop building the libraries that are now bundled with Wine.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: tools Branch: master Commit: abf83815628102f18b57198623bdf73c57d85262 URL: https://source.winehq.org/git/tools.git/?a=commit;h=abf83815628102f18b57198… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 22:31:07 2021 +0200 packaging/android: Stop building the libraries that are now bundled with Wine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/android/build-apks | 93 ++------------------------------------------ 1 file changed, 3 insertions(+), 90 deletions(-) diff --git a/packaging/android/build-apks b/packaging/android/build-apks index f28a994..ef245cd 100755 --- a/packaging/android/build-apks +++ b/packaging/android/build-apks @@ -34,18 +34,11 @@ makeflags="--no-print-directory $silent -j$(nproc)" android_ndk=android-ndk-r21d llvm_mingw=llvm-mingw-20201020-ucrt-ubuntu-18.04 gradle=gradle-3.5.1 -png=libpng-1.6.37 -jpeg=jpeg-9d freetype=freetype-2.10.4 -lcms2=lcms2-2.11 -tiff=tiff-4.1.0 -xml2=libxml2-2.9.10 -xslt=libxslt-1.1.34 gmp=gmp-6.2.1 nettle=nettle-3.6 gnutls=gnutls-3.7.0 openldap=openldap-2.4.56 -mpeg=mpg123-1.26.3 cups=cups-2.3.3 gecko=wine-gecko-2.47.2 @@ -86,53 +79,10 @@ config_llvm_mingw () download $llvm_mingw https://github.com/mstorsjo/llvm-mingw/releases/download/20201020/$llvm_min… } -config_png () -{ - download $png $png.tar.xz https://sourceforge.net/projects/libpng/files/libpng16/1.6.37/$png.tar.xz/d… - (cd $png && $run_configure && make $makeflags) -} - -config_jpeg () -{ - download $jpeg http://www.ijg.org/files/jpegsrc.v9d.tar.gz - (cd $jpeg && $run_configure && make $makeflags) - # rename libjpeg.so to avoid conflicts with the system one - cp $jpeg/.libs/libjpeg.so $jpeg/.libs/libwjpeg.so -} - config_freetype () { - test -d $png || config_png download $freetype http://download.savannah.gnu.org/releases/freetype/$freetype.tar.xz - pngdir=$(pwd)/$png - (cd $freetype && $run_configure LIBPNG_CFLAGS=-I$pngdir LIBPNG_LIBS="-L$pngdir/.libs -lpng16" && make $makeflags) -} - -config_lcms2 () -{ - version=$(expr $lcms2 : '.*-$[0-9.]\+$$') - download $lcms2 $lcms2.tar.gz https://sourceforge.net/projects/lcms/files/lcms/$version/$lcms2.tar.gz/dow… - (cd $lcms2 && $run_configure && make $makeflags) -} - -config_tiff () -{ - download $tiff https://download.osgeo.org/libtiff/$tiff.zip - cp ../wine/tools/config.sub ../wine/tools/config.guess $tiff/config - (cd $tiff && $run_configure && make $makeflags) -} - -config_xml2 () -{ - download $xml2 ftp://xmlsoft.org/libxml2/$xml2.tar.gz - (cd $xml2 && $run_configure --without-python && make $makeflags libxml2.la) -} - -config_xslt () -{ - test -d $xml2 || config_xml2 - download $xslt ftp://xmlsoft.org/libxml2/$xslt.tar.gz - (cd $xslt && $run_configure --without-python --with-libxml-src=../$xml2 && make $makeflags) + (cd $freetype && $run_configure --without-png && make $makeflags) } config_gmp () @@ -169,17 +119,10 @@ config_gnutls () config_openldap () { download $openldap ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/$openldap.tgz - cp $jpeg/ltmain.sh $jpeg/config.guess $jpeg/config.sub $openldap/build + cp $gnutls/build-aux/ltmain.sh $gnutls/build-aux/config.guess $gnutls/build-aux/config.sub $openldap/build (cd $openldap && aclocal && autoconf && $run_configure --with-yielding_select=yes --disable-bdb --disable-hdb ac_cv_func_memcmp_working=yes CPPFLAGS=-DANDROID CC=$host-gcc && make $makeflags) } -config_mpeg () -{ - version=$(expr $mpeg : '.*-$[0-9.]\+$$') - download $mpeg $mpeg.tar.bz2 https://sourceforge.net/projects/mpg123/files/mpg123/$version/$mpeg.tar.bz2… - (cd $mpeg && $run_configure ac_cv_func_mmap_fixed_mapped=yes && make $makeflags) -} - config_cups () { version=v$(expr $cups : '.*-$[0-9.]\+$$') @@ -197,44 +140,21 @@ config_wine_tools () config_wine () { test -d toolchain || config_toolchain - test -d $png || config_png - test -d $jpeg || config_jpeg test -d $freetype || config_freetype - test -d $lcms2 || config_lcms2 - test -d $tiff || config_tiff - test -d $xml2 || config_xml2 - test -d $xslt || config_xslt test -d $gmp || config_gmp test -d $nettle || config_nettle test -d $gnutls || config_gnutls test -d $openldap || config_openldap - test -d $mpeg || config_mpeg test -d $cups || config_cups rm -rf wine mkdir wine (cd wine && ../../wine/configure $silent --host=$host --with-wine-tools=../../tools CC=$cc \ FREETYPE_CFLAGS="-I../$freetype/include" \ - FREETYPE_LIBS="-L../$freetype/objs/.libs -lfreetype -L../$png/.libs -lpng16" \ - LCMS2_CFLAGS="-I../$lcms2/include" \ - LCMS2_LIBS="-L../$lcms2/src/.libs -llcms2" \ - PNG_CFLAGS="-I../$png" \ - PNG_LIBS="-L../$png/.libs -lpng16" \ - ac_cv_lib_soname_png="libpng16.so" \ - JPEG_CFLAGS="-I../$jpeg" \ - JPEG_LIBS="-L../$jpeg/.libs -ljpeg" \ - ac_cv_lib_soname_jpeg="libwjpeg.so" \ - TIFF_CFLAGS="-I../$tiff/libtiff" \ - TIFF_LIBS="-L../$tiff/libtiff/.libs -ltiff" \ - XML2_CFLAGS="-I../$xml2/include" \ - XML2_LIBS="-L../$xml2/.libs -lxml2" \ - XSLT_CFLAGS="-I../$xml2/include -I../$xslt" \ - XSLT_LIBS="-L../$xslt/libxslt/.libs -L../$xml2/.libs -lxml2" \ + FREETYPE_LIBS="-L../$freetype/objs/.libs -lfreetype" \ GNUTLS_CFLAGS="-I../$gnutls/lib/includes" \ GNUTLS_LIBS="-L../$gnutls/lib/.libs -lgnutls -L../$gmp/.libs -lgmp" \ LDAP_CFLAGS="-I../$openldap/include" \ LDAP_LIBS="-L../$openldap/libraries/liblber/.libs -L../$openldap/libraries/libldap_r/.libs -lldap_r-2.4 -llber-2.4" \ - MPG123_CFLAGS="-I../$mpeg/src/libmpg123" \ - MPG123_LIBS="-L../$mpeg/src/libmpg123/.libs -lmpg123" \ CUPS_CFLAGS="-I../$cups" \ CUPS_LIBS="-L../$cups/cups -lcups -L../$gnutls/lib/.libs -lgnutls -L../$gmp/.libs -lgmp") } @@ -256,18 +176,11 @@ install_all () make $makeflags all install-lib DESTDIR=$(pwd) prefix=/assets-tmp for i in \ - ../$png/.libs/libpng16.so \ - ../$jpeg/.libs/libwjpeg.so \ ../$freetype/objs/.libs/libfreetype.so \ - ../$lcms2/src/.libs/liblcms2.so \ - ../$tiff/libtiff/.libs/libtiff.so \ - ../$xml2/.libs/libxml2.so \ - ../$xslt/libxslt/.libs/libxslt.so \ ../$gmp/.libs/libgmp.so \ ../$gnutls/lib/.libs/libgnutls.so \ ../$openldap/libraries/liblber/.libs/liblber-2.4.so \ ../$openldap/libraries/libldap_r/.libs/libldap_r-2.4.so \ - ../$mpeg/src/libmpg123/.libs/libmpg123.so \ ../$cups/cups/libcups.so do $install -s $i $destdir/lib/$exec_prefix/$(basename $i)

1 0