diff --git a/mingw-w64-coin3d-hg/PKGBUILD b/mingw-w64-coin3d-hg/PKGBUILD index 1c5bd22f07..661179a08f 100644 --- a/mingw-w64-coin3d-hg/PKGBUILD +++ b/mingw-w64-coin3d-hg/PKGBUILD @@ -1,28 +1,27 @@ # Maintainer: Alexey Pavlov _realname=coin3d - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-hg" -pkgver=r11348.46b2e54e300b +pkgver=r11404.a9b4869bdc0e pkgrel=1 pkgdesc="High-level, retained-mode toolkit for effective 3D graphics development (mingw-w64)" arch=('any') license=('BSD') depends=("${MINGW_PACKAGE_PREFIX}-simage" - "${MINGW_PACKAGE_PREFIX}-bzip2" - "${MINGW_PACKAGE_PREFIX}-expat" - "${MINGW_PACKAGE_PREFIX}-openal" - #"${MINGW_PACKAGE_PREFIX}-freeglut" - "${MINGW_PACKAGE_PREFIX}-freetype" - "${MINGW_PACKAGE_PREFIX}-fontconfig" - "${MINGW_PACKAGE_PREFIX}-zlib") + "${MINGW_PACKAGE_PREFIX}-bzip2" + "${MINGW_PACKAGE_PREFIX}-expat" + "${MINGW_PACKAGE_PREFIX}-openal" + #"${MINGW_PACKAGE_PREFIX}-freeglut" + "${MINGW_PACKAGE_PREFIX}-freetype" + "${MINGW_PACKAGE_PREFIX}-fontconfig" + "${MINGW_PACKAGE_PREFIX}-zlib") makedepends=("mercurial" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc") provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") url=('https://bitbucket.org/Coin3D/coin') -source=("${_realname}"::"hg+https://bitbucket.org/Alexpux/coin" - hg+https://bitbucket.org/Alexpux/generalmsvcgeneration - hg+https://bitbucket.org/Alexpux/boost-header-libs-full) +source=("${_realname}"::"hg+https://bitbucket.org/msys2/coin" + hg+https://bitbucket.org/msys2/generalmsvcgeneration + hg+https://bitbucket.org/msys2/boost-header-libs-full) options=(!strip staticlibs) md5sums=('SKIP' 'SKIP' diff --git a/mingw-w64-crt-git/PKGBUILD b/mingw-w64-crt-git/PKGBUILD index 7cca039bcc..cef90aeb99 100644 --- a/mingw-w64-crt-git/PKGBUILD +++ b/mingw-w64-crt-git/PKGBUILD @@ -4,7 +4,7 @@ _realname=crt pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" replaces="${MINGW_PACKAGE_PREFIX}-${_realname}-svn" _ver_base=4.0.0 -pkgver=4.0.0.4344.b287205 +pkgver=4.0.0.4350.e5944ae pkgrel=1 pkgdesc='MinGW-w64 CRT for Windows' arch=('any') @@ -16,10 +16,8 @@ makedepends=("git" "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-binuti provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") options=('!strip' 'staticlibs' '!buildflags' '!emptydirs') -source=("${_realname}"::"git://git.code.sf.net/p/mingw-w64/mingw-w64" - qsort_s.diff) -md5sums=('SKIP' - 'de5beea7c6cb42861606768044fdc519') +source=("${_realname}"::"git://git.code.sf.net/p/mingw-w64/mingw-w64") +md5sums=('SKIP') pkgver() { cd "$srcdir/${_realname}" @@ -28,7 +26,6 @@ pkgver() { prepare() { cd ${srcdir}/${_realname} - git am ${srcdir}/qsort_s.diff } build() { diff --git a/mingw-w64-crt-git/qsort_s.diff b/mingw-w64-crt-git/qsort_s.diff deleted file mode 100644 index 0ba89e5d32..0000000000 --- a/mingw-w64-crt-git/qsort_s.diff +++ /dev/null @@ -1,63 +0,0 @@ -From 4eb3c7dffd4f27bcec3a0141de2a2b8448079cac Mon Sep 17 00:00:00 2001 -From: Alexpux -Date: Mon, 24 Nov 2014 12:38:17 +0300 -Subject: [PATCH] Add qsort_s declarations. Use msvcrt version. - ---- - mingw-w64-crt/lib32/msvcr80.def.in | 1 + - mingw-w64-crt/lib64/msvcr80.def.in | 1 + - mingw-w64-headers/crt/search.h | 1 + - mingw-w64-headers/crt/stdlib.h | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/mingw-w64-crt/lib32/msvcr80.def.in b/mingw-w64-crt/lib32/msvcr80.def.in -index 0d009e2..f3408b9 100644 ---- a/mingw-w64-crt/lib32/msvcr80.def.in -+++ b/mingw-w64-crt/lib32/msvcr80.def.in -@@ -653,6 +653,7 @@ puts - putwc - putwchar - qsort -+qsort_s - raise - rand - rand_s -diff --git a/mingw-w64-crt/lib64/msvcr80.def.in b/mingw-w64-crt/lib64/msvcr80.def.in -index d20cb82..18b8d2d 100644 ---- a/mingw-w64-crt/lib64/msvcr80.def.in -+++ b/mingw-w64-crt/lib64/msvcr80.def.in -@@ -780,6 +780,7 @@ puts - putwc - putwchar - qsort -+qsort_s - raise - rand - rand_s -diff --git a/mingw-w64-headers/crt/search.h b/mingw-w64-headers/crt/search.h -index 144b0f4..dd5f83e 100644 ---- a/mingw-w64-headers/crt/search.h -+++ b/mingw-w64-headers/crt/search.h -@@ -17,6 +17,7 @@ extern "C" { - #define _CRT_ALGO_DEFINED - void *__cdecl bsearch(const void *_Key,const void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); - void __cdecl qsort(void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); -+ void __cdecl qsort_s(void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(void *,const void *,const void *),void *_Context); - #endif - _CRTIMP void *__cdecl _lfind(const void *_Key,const void *_Base,unsigned int *_NumOfElements,unsigned int _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); - _CRTIMP void *__cdecl _lsearch(const void *_Key,void *_Base,unsigned int *_NumOfElements,unsigned int _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); -diff --git a/mingw-w64-headers/crt/stdlib.h b/mingw-w64-headers/crt/stdlib.h -index 7743452..8118304 100644 ---- a/mingw-w64-headers/crt/stdlib.h -+++ b/mingw-w64-headers/crt/stdlib.h -@@ -351,6 +351,7 @@ extern "C" { - #define _CRT_ALGO_DEFINED - void *__cdecl bsearch(const void *_Key,const void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); - void __cdecl qsort(void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); -+ void __cdecl qsort_s(void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(void *,const void *,const void *),void *_Context); - #endif - unsigned short __cdecl _byteswap_ushort(unsigned short _Short); - unsigned long __cdecl _byteswap_ulong (unsigned long _Long); --- -2.1.3 - diff --git a/mingw-w64-ffmpeg/PKGBUILD b/mingw-w64-ffmpeg/PKGBUILD index d8d4ef3834..658f620e49 100644 --- a/mingw-w64-ffmpeg/PKGBUILD +++ b/mingw-w64-ffmpeg/PKGBUILD @@ -2,7 +2,7 @@ _realname=ffmpeg pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=2.4.4 +pkgver=2.5 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution (mingw-w64)" arch=('any') @@ -24,6 +24,7 @@ depends=( "${MINGW_PACKAGE_PREFIX}-libtheora" "${MINGW_PACKAGE_PREFIX}-libvorbis" "${MINGW_PACKAGE_PREFIX}-libvpx" + "${MINGW_PACKAGE_PREFIX}-libwebp" "${MINGW_PACKAGE_PREFIX}-openal" "${MINGW_PACKAGE_PREFIX}-opencore-amr" "${MINGW_PACKAGE_PREFIX}-openjpeg" @@ -40,7 +41,7 @@ depends=( ) makedepends=("yasm" "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") source=(http://ffmpeg.org/releases/$_realname-$pkgver.tar.bz2) -md5sums=('7e2819c71484ffba1ba1a91dd5285643') +md5sums=('4346fe710cc6bdd981f6534d2420d1ab') prepare() { cd "${srcdir}/${_realname}-${pkgver}" diff --git a/mingw-w64-headers-git/PKGBUILD b/mingw-w64-headers-git/PKGBUILD index 04a1e436e6..fa03b5a58a 100644 --- a/mingw-w64-headers-git/PKGBUILD +++ b/mingw-w64-headers-git/PKGBUILD @@ -5,7 +5,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" replaces="${MINGW_PACKAGE_PREFIX}-${_realname}-svn" pkgdesc="MinGW-w64 headers for Windows" _ver_base=4.0.0 -pkgver=4.0.0.4344.b287205 +pkgver=4.0.0.4350.e5944ae pkgrel=1 arch=('any') url="http://mingw-w64.sourceforge.net" @@ -15,10 +15,8 @@ makedepends=('git') provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") options=('!strip' '!libtool' '!emptydirs') -source=("${_realname}"::"git://git.code.sf.net/p/mingw-w64/mingw-w64" - qsort_s.diff) -md5sums=('SKIP' - 'de5beea7c6cb42861606768044fdc519') +source=("${_realname}"::"git://git.code.sf.net/p/mingw-w64/mingw-w64") +md5sums=('SKIP') pkgver() { cd "$srcdir/$_realname" @@ -27,7 +25,6 @@ pkgver() { prepare() { cd ${srcdir}/${_realname} - git am ${srcdir}/qsort_s.diff } build() { diff --git a/mingw-w64-headers-git/qsort_s.diff b/mingw-w64-headers-git/qsort_s.diff deleted file mode 100644 index 0ba89e5d32..0000000000 --- a/mingw-w64-headers-git/qsort_s.diff +++ /dev/null @@ -1,63 +0,0 @@ -From 4eb3c7dffd4f27bcec3a0141de2a2b8448079cac Mon Sep 17 00:00:00 2001 -From: Alexpux -Date: Mon, 24 Nov 2014 12:38:17 +0300 -Subject: [PATCH] Add qsort_s declarations. Use msvcrt version. - ---- - mingw-w64-crt/lib32/msvcr80.def.in | 1 + - mingw-w64-crt/lib64/msvcr80.def.in | 1 + - mingw-w64-headers/crt/search.h | 1 + - mingw-w64-headers/crt/stdlib.h | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/mingw-w64-crt/lib32/msvcr80.def.in b/mingw-w64-crt/lib32/msvcr80.def.in -index 0d009e2..f3408b9 100644 ---- a/mingw-w64-crt/lib32/msvcr80.def.in -+++ b/mingw-w64-crt/lib32/msvcr80.def.in -@@ -653,6 +653,7 @@ puts - putwc - putwchar - qsort -+qsort_s - raise - rand - rand_s -diff --git a/mingw-w64-crt/lib64/msvcr80.def.in b/mingw-w64-crt/lib64/msvcr80.def.in -index d20cb82..18b8d2d 100644 ---- a/mingw-w64-crt/lib64/msvcr80.def.in -+++ b/mingw-w64-crt/lib64/msvcr80.def.in -@@ -780,6 +780,7 @@ puts - putwc - putwchar - qsort -+qsort_s - raise - rand - rand_s -diff --git a/mingw-w64-headers/crt/search.h b/mingw-w64-headers/crt/search.h -index 144b0f4..dd5f83e 100644 ---- a/mingw-w64-headers/crt/search.h -+++ b/mingw-w64-headers/crt/search.h -@@ -17,6 +17,7 @@ extern "C" { - #define _CRT_ALGO_DEFINED - void *__cdecl bsearch(const void *_Key,const void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); - void __cdecl qsort(void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); -+ void __cdecl qsort_s(void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(void *,const void *,const void *),void *_Context); - #endif - _CRTIMP void *__cdecl _lfind(const void *_Key,const void *_Base,unsigned int *_NumOfElements,unsigned int _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); - _CRTIMP void *__cdecl _lsearch(const void *_Key,void *_Base,unsigned int *_NumOfElements,unsigned int _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); -diff --git a/mingw-w64-headers/crt/stdlib.h b/mingw-w64-headers/crt/stdlib.h -index 7743452..8118304 100644 ---- a/mingw-w64-headers/crt/stdlib.h -+++ b/mingw-w64-headers/crt/stdlib.h -@@ -351,6 +351,7 @@ extern "C" { - #define _CRT_ALGO_DEFINED - void *__cdecl bsearch(const void *_Key,const void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); - void __cdecl qsort(void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); -+ void __cdecl qsort_s(void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(void *,const void *,const void *),void *_Context); - #endif - unsigned short __cdecl _byteswap_ushort(unsigned short _Short); - unsigned long __cdecl _byteswap_ulong (unsigned long _Long); --- -2.1.3 - diff --git a/mingw-w64-libpng/PKGBUILD b/mingw-w64-libpng/PKGBUILD index be09ae6e89..feee0db34e 100644 --- a/mingw-w64-libpng/PKGBUILD +++ b/mingw-w64-libpng/PKGBUILD @@ -2,7 +2,7 @@ _realname=libpng pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.6.14 +pkgver=1.6.15 pkgrel=1 arch=('any') pkgdesc="A collection of routines used to create PNG format graphics (mingw-w64)" @@ -15,8 +15,8 @@ options=('strip' '!libtool' 'staticlibs') source=("http://downloads.sourceforge.net/sourceforge/libpng/libpng-$pkgver.tar.xz" "http://downloads.sourceforge.net/project/libpng-apng/libpng16/$pkgver/libpng-$pkgver-apng.patch.gz") -md5sums=('aefd9fda2178acab908707737174a0cd' - '39f35cde00159c24b5a10258d8f2c5ce') +md5sums=('a95cb387c53215b034203b41ec57c7e5' + '612524080d5515f4ea81541a9b13bf61') prepare() { cd "$srcdir/libpng-$pkgver" diff --git a/mingw-w64-simage-hg/PKGBUILD b/mingw-w64-simage-hg/PKGBUILD index 8e02f74915..20af5a0536 100644 --- a/mingw-w64-simage-hg/PKGBUILD +++ b/mingw-w64-simage-hg/PKGBUILD @@ -1,26 +1,25 @@ # Maintainer: Alexey Pavlov _realname=simage - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-hg" -pkgver=r671.2dab4dadbb2e +pkgver=r672.8ea3f7b43f03 pkgrel=1 pkgdesc="Provides support for loading and saving images, sound and video (mingw-w64)" arch=('any') license=('BSD') depends=("${MINGW_PACKAGE_PREFIX}-libjpeg-turbo" - "${MINGW_PACKAGE_PREFIX}-libpng" - "${MINGW_PACKAGE_PREFIX}-libsndfile" - "${MINGW_PACKAGE_PREFIX}-libtiff" - "${MINGW_PACKAGE_PREFIX}-giflib" - "${MINGW_PACKAGE_PREFIX}-libvorbis" - "${MINGW_PACKAGE_PREFIX}-jasper" - "${MINGW_PACKAGE_PREFIX}-zlib") + "${MINGW_PACKAGE_PREFIX}-libpng" + "${MINGW_PACKAGE_PREFIX}-libsndfile" + "${MINGW_PACKAGE_PREFIX}-libtiff" + "${MINGW_PACKAGE_PREFIX}-giflib" + "${MINGW_PACKAGE_PREFIX}-libvorbis" + "${MINGW_PACKAGE_PREFIX}-jasper" + "${MINGW_PACKAGE_PREFIX}-zlib") makedepends=("mercurial" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc") provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") url=('https://bitbucket.org/Coin3D/simage/overview') -source=("${_realname}"::"hg+https://bitbucket.org/Alexpux/simage") +source=("${_realname}"::"hg+https://bitbucket.org/msys2/simage") options=(!strip staticlibs) md5sums=('SKIP')