diff --git a/mingw-w64-libass/PKGBUILD b/mingw-w64-libass/PKGBUILD index 7f52183639..caac21cc5e 100644 --- a/mingw-w64-libass/PKGBUILD +++ b/mingw-w64-libass/PKGBUILD @@ -1,8 +1,9 @@ # Maintainer: Alexey Pavlov _realname=libass +pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.12.3 +pkgver=0.13.0 pkgrel=1 pkgdesc="A portable library for SSA/ASS subtitles rendering (mingw-w64)" arch=('any') @@ -11,19 +12,13 @@ license=('ISC') makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-yasm" "${MINGW_PACKAGE_PREFIX}-pkg-config") -depends=("${MINGW_PACKAGE_PREFIX}-enca" - "${MINGW_PACKAGE_PREFIX}-fribidi" +depends=("${MINGW_PACKAGE_PREFIX}-fribidi" "${MINGW_PACKAGE_PREFIX}-fontconfig" "${MINGW_PACKAGE_PREFIX}-freetype" "${MINGW_PACKAGE_PREFIX}-harfbuzz") options=('strip' 'staticlibs') -source=("${_realname}-${pkgver}.tar.gz"::https://github.com/libass/${_realname}/archive/${pkgver}.tar.gz) -md5sums=('1b53e739ab389335ce46fd626777ec61') - -prepare() { - cd "${srcdir}/${_realname}-${pkgver}" - ./autogen.sh -} +source=(https://github.com/libass/${_realname}/releases/download/${pkgver}/${_realname}-${pkgver}.tar.xz) +md5sums=('8e6a506b4e5a637764183083421dc827') build() { [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" @@ -38,7 +33,6 @@ build() { --enable-static \ --enable-harfbuzz \ --enable-fontconfig \ - --enable-enca \ --enable-asm make } diff --git a/mingw-w64-mpv/PKGBUILD b/mingw-w64-mpv/PKGBUILD index a6a6824818..eec17737e0 100644 --- a/mingw-w64-mpv/PKGBUILD +++ b/mingw-w64-mpv/PKGBUILD @@ -4,7 +4,7 @@ _realname=mpv pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.10.0 +pkgver=0.11.0 pkgrel=1 pkgdesc="Video player based on MPlayer/mplayer2 (mingw-w64)" url="http://mpv.io" @@ -30,7 +30,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "pkg-config" "python") source=(${_realname}-${pkgver}.tar.gz::https://github.com/mpv-player/${_realname}/archive/v${pkgver}.tar.gz) -md5sums=('e81a975e4fa17f500dc2e7ea3d3ecf25') +md5sums=('988bec97a4057beecc2f6a8a2c18e342') # strip doesn't work well with the mpv.com wrapper, so strip manually instead options=(!strip !emptydirs) @@ -56,7 +56,6 @@ build() { --check-c-compiler=gcc \ --enable-libmpv-shared \ --disable-cdda \ - --disable-ladspa \ --enable-caca \ --enable-dvdnav \ --enable-dvdread \ diff --git a/mingw-w64-python-pip/PKGBUILD b/mingw-w64-python-pip/PKGBUILD index 7ba10038ed..60ba8e2e24 100644 --- a/mingw-w64-python-pip/PKGBUILD +++ b/mingw-w64-python-pip/PKGBUILD @@ -2,7 +2,7 @@ _realname=pip pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=7.1.0 +pkgver=7.1.2 pkgrel=1 pkgdesc="An easy_install replacement for installing pypi python packages (mingw-w64)" arch=('any') @@ -13,7 +13,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-python2" "${MINGW_PACKAGE_PREFIX}-python3" "${MINGW_PACKAGE_PREFIX}-python3-setuptools") source=(http://pypi.python.org/packages/source/p/pip/${_realname}-${pkgver}.tar.gz) -md5sums=('d935ee9146074b1d3f26c5f0acfd120e') +md5sums=('3823d2343d9f3aaab21cf9c917710196') prepare() { cp -r ${_realname}-${pkgver} ${_realname}-python2 diff --git a/mingw-w64-python-pip/pip3-i686.install b/mingw-w64-python-pip/pip3-i686.install index d44ef170b8..9d29857c51 100644 --- a/mingw-w64-python-pip/pip3-i686.install +++ b/mingw-w64-python-pip/pip3-i686.install @@ -3,7 +3,7 @@ post_install() { local _prefix=$(pwd -W) cd - local _it - for _it in pip3 pip3.4; do + for _it in pip3 pip3.5; do sed -e "s|/mingw32|${_prefix}|g" \ -i mingw32/bin/${_it}-script.py done diff --git a/mingw-w64-python-pip/pip3-x86_64.install b/mingw-w64-python-pip/pip3-x86_64.install index def14d2a07..e552e22180 100644 --- a/mingw-w64-python-pip/pip3-x86_64.install +++ b/mingw-w64-python-pip/pip3-x86_64.install @@ -3,7 +3,7 @@ post_install() { local _prefix=$(pwd -W) cd - local _it - for _it in pip3 pip3.4; do + for _it in pip3 pip3.5; do sed -e "s|/mingw64|${_prefix}|g" \ -i mingw64/bin/${_it}-script.py done diff --git a/mingw-w64-python-setuptools/PKGBUILD b/mingw-w64-python-setuptools/PKGBUILD index 162b563708..5e91222f3b 100644 --- a/mingw-w64-python-setuptools/PKGBUILD +++ b/mingw-w64-python-setuptools/PKGBUILD @@ -5,9 +5,9 @@ _realname=setuptools pkgbase=mingw-w64-python-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-python2-setuptools" "${MINGW_PACKAGE_PREFIX}-python3-setuptools") -_py3_base=3.4 +_py3_base=3.5 _py2_base=2.7 -pkgver=18.2 +pkgver=18.3.2 pkgrel=1 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages (mingw-w64)" arch=('any') @@ -19,7 +19,7 @@ source=(http://pypi.python.org/packages/source/s/setuptools/${_realname}-${pkgve '0002-Allow-usr-bin-env-in-script.patch' '0003-MinGW-w64-Look-in-same-dir-as-script-for-exe.patch' '0004-dont-execute-msvc.patch') -sha1sums=('55033c6e68189bc10b848beda27044e07e384b41' +sha1sums=('7a0c0f378dcb6ffcb863ccd9503a647ff4ad3ae9' 'a26b8313592899ff6e5c18e5a4d489b7d8a6e021' '3f475c0510ecaa1ee86412197cb3624ebfba7105' '101db3f8acbd116c81ee170adea2b1453ccc709a' diff --git a/mingw-w64-python3/0950-mingw-w64-XP3-compat-GetProcAddress-GetTickCount64.patch b/mingw-w64-python3/0950-mingw-w64-XP3-compat-GetProcAddress-GetTickCount64.patch new file mode 100644 index 0000000000..8de82ac14c --- /dev/null +++ b/mingw-w64-python3/0950-mingw-w64-XP3-compat-GetProcAddress-GetTickCount64.patch @@ -0,0 +1,46 @@ +--- Python-3.5.0/Python/pytime.c.orig 2015-10-05 21:30:23.839918600 +0100 ++++ Python-3.5.0/Python/pytime.c 2015-10-05 21:30:28.078842500 +0100 +@@ -435,7 +435,7 @@ + /* 11,644,473,600,000,000,000: number of nanoseconds between + the 1st january 1601 and the 1st january 1970 (369 years + 89 leap + days). */ +- *tp = large.QuadPart * 100 - 11644473600000000000; ++ *tp = large.QuadPart * 100 - 11644473600000000000ULL; + if (info) { + DWORD timeAdjustment, timeIncrement; + BOOL isTimeAdjustmentDisabled, ok; +@@ -529,6 +529,34 @@ + return pygettimeofday_new(t, info, 1); + } + ++#if defined(MS_WINDOWS) && _WIN32_WINNT < 0x0600 ++/* GetTickCount64() is not available on XP. */ ++ULONGLONG GetTickCount64 () ++{ ++ static ULONGLONG (CALLBACK *Py_GetTickCount64)() = (ULONGLONG (*)(void))-1; ++ static DWORD last_ticks = 0; ++ static DWORD n_overflow = 0; ++ DWORD ticks = 0; ++ HINSTANCE hKernel32; ++ ++ if (Py_GetTickCount64 == (void*)-1) ++ { ++ hKernel32 = GetModuleHandleW(L"KERNEL32"); ++ Py_GetTickCount64 = *(ULONGLONG (*)(void))(GetProcAddress(hKernel32, ++ "GetTickCount64")); ++ } ++ if (Py_GetTickCount64 != (void*)-1) ++ { ++ return Py_GetTickCount64(); ++ } ++ ++ ticks = GetTickCount(); ++ if (ticks < last_ticks) ++ n_overflow++; ++ last_ticks = ticks; ++ return ((ULONGLONG)n_overflow << 32LL) + (ULONGLONG)GetTickCount(); ++} ++#endif + + static int + pymonotonic_new(_PyTime_t *tp, _Py_clock_info_t *info, int raise) diff --git a/mingw-w64-python3/0960-mingw-w64-XP3-compat-GetProcAddress-GetFinalPathNameByHandleW.patch b/mingw-w64-python3/0960-mingw-w64-XP3-compat-GetProcAddress-GetFinalPathNameByHandleW.patch new file mode 100644 index 0000000000..f16e347efc --- /dev/null +++ b/mingw-w64-python3/0960-mingw-w64-XP3-compat-GetProcAddress-GetFinalPathNameByHandleW.patch @@ -0,0 +1,114 @@ +--- Python-3.5.0/Modules/posixmodule.c.orig 2015-10-05 21:34:15.284022500 +0100 ++++ Python-3.5.0/Modules/posixmodule.c 2015-10-05 21:34:18.082536800 +0100 +@@ -1462,6 +1462,31 @@ + return TRUE; + } + ++/* Grab GetFinalPathNameByHandle dynamically from kernel32 */ ++static int has_GetFinalPathNameByHandle = -1; ++static DWORD (CALLBACK *Py_GetFinalPathNameByHandleW)(HANDLE, LPWSTR, DWORD, ++ DWORD); ++static int ++check_GetFinalPathNameByHandle() ++{ ++ HINSTANCE hKernel32; ++ DWORD (CALLBACK *Py_GetFinalPathNameByHandleA)(HANDLE, LPSTR, DWORD, ++ DWORD); ++ ++ /* only recheck */ ++ if (-1 == has_GetFinalPathNameByHandle) ++ { ++ hKernel32 = GetModuleHandleW(L"KERNEL32"); ++ *(FARPROC*)&Py_GetFinalPathNameByHandleA = GetProcAddress(hKernel32, ++ "GetFinalPathNameByHandleA"); ++ *(FARPROC*)&Py_GetFinalPathNameByHandleW = GetProcAddress(hKernel32, ++ "GetFinalPathNameByHandleW"); ++ has_GetFinalPathNameByHandle = Py_GetFinalPathNameByHandleA && ++ Py_GetFinalPathNameByHandleW; ++ } ++ return has_GetFinalPathNameByHandle; ++} ++ + static BOOL + get_target_path(HANDLE hdl, wchar_t **target_path) + { +@@ -1470,8 +1495,8 @@ + + /* We have a good handle to the target, use it to determine + the target path name (then we'll call lstat on it). */ +- buf_size = GetFinalPathNameByHandleW(hdl, 0, 0, +- VOLUME_NAME_DOS); ++ buf_size = Py_GetFinalPathNameByHandleW(hdl, 0, 0, ++ VOLUME_NAME_DOS); + if(!buf_size) + return FALSE; + +@@ -1481,7 +1506,7 @@ + return FALSE; + } + +- result_length = GetFinalPathNameByHandleW(hdl, ++ result_length = Py_GetFinalPathNameByHandleW(hdl, + buf, buf_size, VOLUME_NAME_DOS); + + if(!result_length) { +@@ -1514,6 +1539,12 @@ + wchar_t *target_path; + const char *dot; + ++ if(!check_GetFinalPathNameByHandle()) { ++ /* If the OS doesn't have GetFinalPathNameByHandle, don't ++ traverse reparse point. */ ++ traverse = FALSE; ++ } ++ + hFile = CreateFileA( + path, + FILE_READ_ATTRIBUTES, /* desired access */ +@@ -1604,6 +1635,12 @@ + wchar_t *target_path; + const wchar_t *dot; + ++ if(!check_GetFinalPathNameByHandle()) { ++ /* If the OS doesn't have GetFinalPathNameByHandle, don't ++ traverse reparse point. */ ++ traverse = FALSE; ++ } ++ + hFile = CreateFileW( + path, + FILE_READ_ATTRIBUTES, /* desired access */ +@@ -3846,6 +3883,13 @@ + if (path_wchar == NULL) + return NULL; + ++ if(!check_GetFinalPathNameByHandle()) { ++ /* If the OS doesn't have GetFinalPathNameByHandle, return a ++ NotImplementedError. */ ++ return PyErr_Format(PyExc_NotImplementedError, ++ "GetFinalPathNameByHandle not available on this platform"); ++ } ++ + hFile = CreateFileW( + path_wchar, + 0, /* desired access */ +@@ -3861,7 +3905,7 @@ + + /* We have a good handle to the target, use it to determine the + target path name. */ +- buf_size = GetFinalPathNameByHandleW(hFile, 0, 0, VOLUME_NAME_NT); ++ buf_size = Py_GetFinalPathNameByHandleW(hFile, 0, 0, VOLUME_NAME_NT); + + if(!buf_size) + return win32_error_object("GetFinalPathNameByHandle", path); +@@ -3870,8 +3914,8 @@ + if(!target_path) + return PyErr_NoMemory(); + +- result_length = GetFinalPathNameByHandleW(hFile, target_path, +- buf_size, VOLUME_NAME_DOS); ++ result_length = Py_GetFinalPathNameByHandleW(hFile, target_path, ++ buf_size, VOLUME_NAME_DOS); + if(!result_length) + return win32_error_object("GetFinalPathNamyByHandle", path); + diff --git a/mingw-w64-python3/PKGBUILD b/mingw-w64-python3/PKGBUILD index d4e25ca80c..94c073c454 100644 --- a/mingw-w64-python3/PKGBUILD +++ b/mingw-w64-python3/PKGBUILD @@ -18,7 +18,7 @@ pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" _pybasever=3.5 pkgver=${_pybasever}.0 -pkgrel=1 +pkgrel=2 pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') license=('PSF') @@ -120,6 +120,8 @@ source=("http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz" 0920-mingw-add-LIBPL-to-library-dirs.patch 0930-mingw-w64-build-overlapped-module.patch 0940-mingw-w64-Also-define-_Py_BEGIN_END_SUPPRESS_IPH-when-Py_BUILD_CORE_MODULE.patch + 0950-mingw-w64-XP3-compat-GetProcAddress-GetTickCount64.patch + 0960-mingw-w64-XP3-compat-GetProcAddress-GetFinalPathNameByHandleW.patch 1000-fix-building-posixmodule.patch 1010-install-msilib.patch 1500-mingw-w64-dont-look-in-DLLs-folder-for-python-dll.patch) @@ -222,6 +224,8 @@ prepare() { patch -Np1 -i "${srcdir}"/0920-mingw-add-LIBPL-to-library-dirs.patch patch -Np1 -i "${srcdir}"/0930-mingw-w64-build-overlapped-module.patch patch -Np1 -i "${srcdir}"/0940-mingw-w64-Also-define-_Py_BEGIN_END_SUPPRESS_IPH-when-Py_BUILD_CORE_MODULE.patch + patch -Np1 -i "${srcdir}"/0950-mingw-w64-XP3-compat-GetProcAddress-GetTickCount64.patch + patch -Np1 -i "${srcdir}"/0960-mingw-w64-XP3-compat-GetProcAddress-GetFinalPathNameByHandleW.patch patch -Np1 -i "${srcdir}"/1000-fix-building-posixmodule.patch patch -Np1 -i "${srcdir}"/1010-install-msilib.patch @@ -461,6 +465,8 @@ sha1sums=('871a06df9ab70984b7398ac53047fe125c757a70' 'ce026983639b7e5e503b32345bbcf81972447868' '8ca0fdb71ee8198997b30466c367ac0c84f14237' '4564e95c83e30dca025d6a7ecf0b24a709ea5120' + '79ff9a468dcfd2c55afa70758bd6a50b2a940ed4' + '2bf23da1017ab6ed5bc59c4f3fbf713093036a09' 'a97dbe5299385b9fde442779d00f9a161ef3f950' 'd5c9e4e47db62db241f4488d9bc974b083b7b0e3' 'c7eb543aee59f4c246018fa7943a1eaa12e6809c')