Accepting request 369636 from graphics

- Update to version 1.4.2
  + Crash fixes
  + clang compatibility fixes
  + See the included ChangeLog.txt for the details
- Drop libjpeg-turbo-1.4.0-int32.patch, not needed anymore.
- Drop libjpeg-turbo-remove-test.patch, fixed upstream.

- Update to version 1.4.2
  + Crash fixes
  + clang compatibility fixes
  + See the included ChangeLog.txt for the details
- Drop libjpeg-turbo-1.4.0-int32.patch, not needed anymore.

OBS-URL: https://build.opensuse.org/request/show/369636
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libjpeg-turbo?expand=0&rev=31
This commit is contained in:
Dominique Leuenberger 2016-03-16 09:26:12 +00:00 committed by Git OBS Bridge
commit 58fe547543
8 changed files with 26 additions and 57 deletions

View File

@ -1,11 +0,0 @@
--- jmorecfg.h
+++ jmorecfg.h
@@ -148,7 +148,7 @@
/* INT32 must hold at least signed 32-bit values. */
#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
-typedef long INT32;
+typedef int INT32;
#endif
/* Datatype used for image dimensions. The JPEG standard only supports

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d93ad8546b510244f863b39b4c0da0fa4c0d53a77b61a8a3880f258c232bbbee
size 1524645

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e
size 1569306

View File

@ -1,31 +0,0 @@
From: Michel Normand <normand@linux.vnet.ibm.com>
Subject: libjpeg turbo remove test
Date: Mon, 02 Mar 2015 15:50:48 +0100
libjpeg turbo remove test
Do the same correction as done on fedora bug 1161585
that removed failing tests.
Related to upstream issue 83
https://sourceforge.net/p/libjpeg-turbo/bugs/83/
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---
Makefile.am | 4 ----
1 file changed, 4 deletions(-)
Index: libjpeg-turbo-1.4.0/Makefile.am
===================================================================
--- libjpeg-turbo-1.4.0.orig/Makefile.am
+++ libjpeg-turbo-1.4.0/Makefile.am
@@ -373,10 +373,6 @@ endif
# CC: RGB->YCC SAMP: fullsize/int FDCT: float ENT: prog huff
./cjpeg -sample 3x2 -dct float -prog -outfile testout_3x2_float_prog.jpg $(srcdir)/testimages/testorig.ppm
md5/md5cmp $(MD5_JPEG_3x2_FLOAT_PROG) testout_3x2_float_prog.jpg
-# CC: YCC->RGB SAMP: fullsize/int IDCT: float ENT: prog huff
- ./djpeg -dct float -outfile testout_3x2_float.ppm testout_3x2_float_prog.jpg
- md5/md5cmp $(MD5_PPM_3x2_FLOAT) testout_3x2_float.ppm
- rm testout_3x2_float.ppm testout_3x2_float_prog.jpg
if WITH_ARITH_ENC
# CC: YCC->RGB SAMP: fullsize/h2v2 FDCT: islow ENT: arith

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Oct 8 07:53:53 UTC 2015 - idonmez@suse.com
- Update to version 1.4.2
+ Crash fixes
+ clang compatibility fixes
+ See the included ChangeLog.txt for the details
- Drop libjpeg-turbo-1.4.0-int32.patch, not needed anymore.
- Drop libjpeg-turbo-remove-test.patch, fixed upstream.
-------------------------------------------------------------------
Thu Mar 5 11:43:27 UTC 2015 - jengelh@inai.de

View File

@ -1,7 +1,7 @@
#
# spec file for package libjpeg-turbo
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,7 +16,7 @@
#
%define srcver 1.4.0
%define srcver 1.4.2
%define major 8
%define minor 0
%define micro 2
@ -35,10 +35,8 @@ Group: Productivity/Graphics/Convertors
Url: http://sourceforge.net/projects/libjpeg-turbo
Source0: http://downloads.sf.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz
Source1: baselibs.conf
Patch0: libjpeg-turbo-1.4.0-int32.patch
Patch1: libjpeg-turbo-1.3.0-tiff-ojpeg.patch
Patch2: libjpeg-1.4.0-ocloexec.patch
Patch3: libjpeg-turbo-remove-test.patch
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: yasm
@ -102,13 +100,10 @@ files using the libjpeg library.
%prep
%setup -q
%patch0
%patch1
%patch2
%patch3 -p1
%build
autoreconf -fiv
export LDFLAGS="-Wl,-z,relro,-z,now"
%configure --disable-static \
--with-jpeg8

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Oct 8 07:56:34 UTC 2015 - idonmez@suse.com
- Update to version 1.4.2
+ Crash fixes
+ clang compatibility fixes
+ See the included ChangeLog.txt for the details
- Drop libjpeg-turbo-1.4.0-int32.patch, not needed anymore.
-------------------------------------------------------------------
Thu Mar 5 11:43:27 UTC 2015 - jengelh@inai.de

View File

@ -1,7 +1,7 @@
#
# spec file for package libjpeg62-turbo
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,7 +19,7 @@
%define major 62
%define minor 1
%define micro 0
%define srcver 1.4.0
%define srcver 1.4.2
%define libver %{major}.%{minor}.%{micro}
Name: libjpeg62-turbo
@ -31,7 +31,6 @@ Group: Productivity/Graphics/Convertors
Url: http://sourceforge.net/projects/libjpeg-turbo
Source0: http://downloads.sf.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz
Source1: baselibs.conf
Patch0: libjpeg-turbo-1.4.0-int32.patch
Patch1: libjpeg-turbo-1.3.0-tiff-ojpeg.patch
Patch2: libjpeg-1.4.0-ocloexec.patch
BuildRequires: gcc-c++
@ -82,12 +81,10 @@ files using the libjpeg library.
%prep
%setup -q -n libjpeg-turbo-%{srcver}
%patch0
%patch1
%patch2
%build
autoreconf -fiv
export LDFLAGS="-Wl,-z,relro,-z,now"
%configure --disable-static
make %{?_smp_mflags}