Accepting request 748021 from graphics
- fix upstream bug 388 [bsc#1156402] - added patches https://github.com/libjpeg-turbo/libjpeg-turbo/issues/388 + libjpeg-turbo-issue-388.patch OBS-URL: https://build.opensuse.org/request/show/748021 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libjpeg-turbo?expand=0&rev=50
This commit is contained in:
commit
145dbdb73a
21
libjpeg-turbo-issue-388.patch
Normal file
21
libjpeg-turbo-issue-388.patch
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
--- a/tjbench.c
|
||||||
|
+++ b/tjbench.c
|
||||||
|
@@ -171,7 +171,7 @@ static int decomp(unsigned char *srcBuf, unsigned char **jpegBuf,
|
||||||
|
}
|
||||||
|
/* Set the destination buffer to gray so we know whether the decompressor
|
||||||
|
attempted to write to it */
|
||||||
|
- memset(dstBuf, 127, pitch * scaledh);
|
||||||
|
+ memset(dstBuf, 127, (size_t)pitch * scaledh);
|
||||||
|
|
||||||
|
if (doYUV) {
|
||||||
|
int width = doTile ? tilew : scaledw;
|
||||||
|
@@ -193,7 +193,7 @@ static int decomp(unsigned char *srcBuf, unsigned char **jpegBuf,
|
||||||
|
double start = getTime();
|
||||||
|
|
||||||
|
for (row = 0, dstPtr = dstBuf; row < ntilesh;
|
||||||
|
- row++, dstPtr += pitch * tileh) {
|
||||||
|
+ row++, dstPtr += (size_t)pitch * tileh) {
|
||||||
|
for (col = 0, dstPtr2 = dstPtr; col < ntilesw;
|
||||||
|
col++, tile++, dstPtr2 += ps * tilew) {
|
||||||
|
int width = doTile ? min(tilew, w - col * tilew) : scaledw;
|
||||||
|
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Nov 12 14:09:12 UTC 2019 - pgajdos@suse.com
|
||||||
|
|
||||||
|
- fix upstream bug 388 [bsc#1156402]
|
||||||
|
- added patches
|
||||||
|
https://github.com/libjpeg-turbo/libjpeg-turbo/issues/388
|
||||||
|
+ libjpeg-turbo-issue-388.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Oct 5 09:08:03 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
|
Sat Oct 5 09:08:03 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||||
|
|
||||||
|
@ -39,6 +39,8 @@ Source0: http://downloads.sf.net/libjpeg-turbo/libjpeg-turbo-%{version}.t
|
|||||||
Source1: baselibs.conf
|
Source1: baselibs.conf
|
||||||
Patch1: libjpeg-turbo-1.3.0-tiff-ojpeg.patch
|
Patch1: libjpeg-turbo-1.3.0-tiff-ojpeg.patch
|
||||||
Patch2: ctest-depends.patch
|
Patch2: ctest-depends.patch
|
||||||
|
# https://github.com/libjpeg-turbo/libjpeg-turbo/issues/388
|
||||||
|
Patch3: libjpeg-turbo-issue-388.patch
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
@ -104,6 +106,7 @@ files using the libjpeg library.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch1
|
%patch1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
MYLDFLAGS="-Wl,-z,relro,-z,now"
|
MYLDFLAGS="-Wl,-z,relro,-z,now"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user