diff --git a/mingw-w64-libjpeg-turbo/0001-header-compat.mingw.patch b/mingw-w64-libjpeg-turbo/0001-header-compat.mingw.patch index 9cd5b985e4..b54267f232 100644 --- a/mingw-w64-libjpeg-turbo/0001-header-compat.mingw.patch +++ b/mingw-w64-libjpeg-turbo/0001-header-compat.mingw.patch @@ -13,19 +13,16 @@ /* * Define BITS_IN_JSAMPLE as either -@@ -154,14 +154,18 @@ - /* INT16 must hold at least the values -32768..32767. */ +@@ -118,6 +118,7 @@ + #endif /* HAVE_UNSIGNED_CHAR */ - #ifndef XMD_H /* X11/xmd.h correctly defines INT16 */ -+#ifndef _BASETSD_H_ /* basestd.h from mingw-w64 defines INT16 */ - typedef short INT16; - #endif -+#endif - - /* INT32 must hold at least signed 32-bit values. */ ++#ifndef _BASETSD_H_ /* basestd.h from mingw-w64 defines UINT8, UINT16, INT16, INT32 */ + /* These typedefs are used for various table entries and so forth. + * They must be at least as wide as specified; but making them too big + * won't cost a huge amount of memory, so we don't provide special +@@ -158,6 +158,7 @@ #ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ -+#ifndef _BASETSD_H_ /* basestd.h from mingw-w64 defines INT32 */ typedef long INT32; #endif +#endif diff --git a/mingw-w64-libjpeg-turbo/PKGBUILD b/mingw-w64-libjpeg-turbo/PKGBUILD index 2381ad7df1..2286a3b635 100644 --- a/mingw-w64-libjpeg-turbo/PKGBUILD +++ b/mingw-w64-libjpeg-turbo/PKGBUILD @@ -3,7 +3,7 @@ _realname=libjpeg-turbo pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="JPEG image codec with accelerated baseline compression and decompression (mingw-w64)" arch=('any') url="http://libjpeg-turbo.virtualgl.org" @@ -19,7 +19,7 @@ source=("http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-$pkgver.ta "0001-header-compat.mingw.patch" "libjpeg-turbo-1.3.1-libmng-compatibility.patch") md5sums=('039153dabe61e1ac8d9323b5522b56b0' - '4c7074385609de7310e3592a91f608f8' + '11e4818dd682ae73cd75f11013a97e72' 'b54c2ab69837e1b72605184364360af0') prepare() {