diff --git a/srcpkgs/libjpeg-turbo/patches/0001-tjLoadImage-Fix-int-overflow-segfault-w-big-BMP.patch b/srcpkgs/libjpeg-turbo/patches/0001-tjLoadImage-Fix-int-overflow-segfault-w-big-BMP.patch deleted file mode 100644 index 1478bdf3dbd..00000000000 --- a/srcpkgs/libjpeg-turbo/patches/0001-tjLoadImage-Fix-int-overflow-segfault-w-big-BMP.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1e18a1a09af9f143400cedc54a210f616c80ffb9 Mon Sep 17 00:00:00 2001 -From: DRC -Date: Tue, 1 Jan 2019 18:57:36 -0600 -Subject: [PATCH] tjLoadImage(): Fix int overflow/segfault w/big BMP - -Fixes #304 ---- -diff --git turbojpeg.c turbojpeg.c -index 90a9ce6..3f7cd64 100644 ---- turbojpeg.c -+++ turbojpeg.c -@@ -1,5 +1,5 @@ - /* -- * Copyright (C)2009-2018 D. R. Commander. All Rights Reserved. -+ * Copyright (C)2009-2019 D. R. Commander. All Rights Reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: -@@ -1960,7 +1960,8 @@ DLLEXPORT unsigned char *tjLoadImage(const char *filename, int *width, - int align, int *height, int *pixelFormat, - int flags) - { -- int retval = 0, tempc, pitch; -+ int retval = 0, tempc; -+ size_t pitch; - tjhandle handle = NULL; - tjinstance *this; - j_compress_ptr cinfo = NULL; -@@ -2013,7 +2014,9 @@ DLLEXPORT unsigned char *tjLoadImage(const char *filename, int *width, - *pixelFormat = cs2pf[cinfo->in_color_space]; - - pitch = PAD((*width) * tjPixelSize[*pixelFormat], align); -- if ((dstBuf = (unsigned char *)malloc(pitch * (*height))) == NULL) -+ if ((unsigned long long)pitch * (unsigned long long)(*height) > -+ (unsigned long long)((size_t)-1) || -+ (dstBuf = (unsigned char *)malloc(pitch * (*height))) == NULL) - _throwg("tjLoadImage(): Memory allocation failure"); - - if (setjmp(this->jerr.setjmp_buffer)) { --- -2.20.1 - diff --git a/srcpkgs/libjpeg-turbo/patches/0002-wrbmp.c-Don-t-allow-quantization-w-non-RGB-CS.patch b/srcpkgs/libjpeg-turbo/patches/0002-wrbmp.c-Don-t-allow-quantization-w-non-RGB-CS.patch deleted file mode 100644 index b03ef9dc5d7..00000000000 --- a/srcpkgs/libjpeg-turbo/patches/0002-wrbmp.c-Don-t-allow-quantization-w-non-RGB-CS.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 64bbd161f2a82c76db1f62a44714416ef44648a7 Mon Sep 17 00:00:00 2001 -From: DRC -Date: Tue, 1 Jan 2019 20:32:40 -0600 -Subject: [PATCH] wrbmp.c: Don't allow quantization w/ non-RGB CS - -If cinfo->quantize_colors == 1, then jpeg_calc_output_dimensions() will -set cinfo->output_components to 1, and if cinfo->out_color_space is not -RGB (or extended RGB), hilarity will ensue. - -Fixes #305 ---- -diff --git wrbmp.c wrbmp.c -index 38a64e8..3489f14 100644 ---- wrbmp.c -+++ wrbmp.c -@@ -506,8 +506,9 @@ jinit_write_bmp(j_decompress_ptr cinfo, boolean is_os2, - dest->pub.put_pixel_rows = put_gray_rows; - else - dest->pub.put_pixel_rows = put_pixel_rows; -- } else if (cinfo->out_color_space == JCS_RGB565 || -- cinfo->out_color_space == JCS_CMYK) { -+ } else if (!cinfo->quantize_colors && -+ (cinfo->out_color_space == JCS_RGB565 || -+ cinfo->out_color_space == JCS_CMYK)) { - dest->pub.put_pixel_rows = put_pixel_rows; - } else { - ERREXIT(cinfo, JERR_BMP_COLORSPACE); --- -2.20.1 - diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template index 9c2eb479ddc..22b7f17525b 100644 --- a/srcpkgs/libjpeg-turbo/template +++ b/srcpkgs/libjpeg-turbo/template @@ -1,7 +1,7 @@ # Template file for 'libjpeg-turbo' pkgname=libjpeg-turbo -version=2.0.1 -revision=2 +version=2.0.2 +revision=1 build_style=cmake configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib" hostmakedepends="yasm" @@ -10,7 +10,7 @@ maintainer="Juan RP " license="IJG, BSD-3-Clause, Zlib" homepage="https://libjpeg-turbo.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=e5f86cec31df1d39596e0cca619ab1b01f99025a27dafdfc97a30f3a12f866ff +checksum=acb8599fe5399af114287ee5907aea4456f8f2c1cc96d26c28aebfdf5ee82fed provides="jpeg-8_1" replaces="jpeg>=0"