Update to 1.3.0 and make jconfig.h more autoconf friendly
This commit is contained in:
parent
ec88fc9714
commit
8f8b58073d
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
|||||||
/libjpeg-turbo-1.1.1.tar.gz
|
/libjpeg-turbo-1.1.1.tar.gz
|
||||||
/libjpeg-turbo-1.2.1.tar.gz
|
/libjpeg-turbo-1.2.1.tar.gz
|
||||||
/libjpeg-turbo-1.2.90.tar.gz
|
/libjpeg-turbo-1.2.90.tar.gz
|
||||||
|
/libjpeg-turbo-1.3.0.tar.gz
|
||||||
|
31
libjpeg-turbo-match-autoconf-behavior.patch
Normal file
31
libjpeg-turbo-match-autoconf-behavior.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
--- libjpeg-turbo-1.3.0/win/jconfig.h.in.orig 2013-08-03 21:52:45.115856655 +0200
|
||||||
|
+++ libjpeg-turbo-1.3.0/win/jconfig.h.in 2013-08-03 21:53:40.335912080 +0200
|
||||||
|
@@ -7,14 +7,14 @@
|
||||||
|
#cmakedefine D_ARITH_CODING_SUPPORTED
|
||||||
|
#cmakedefine MEM_SRCDST_SUPPORTED
|
||||||
|
|
||||||
|
-#define HAVE_PROTOTYPES
|
||||||
|
-#define HAVE_UNSIGNED_CHAR
|
||||||
|
-#define HAVE_UNSIGNED_SHORT
|
||||||
|
+#define HAVE_PROTOTYPES 1
|
||||||
|
+#define HAVE_UNSIGNED_CHAR 1
|
||||||
|
+#define HAVE_UNSIGNED_SHORT 1
|
||||||
|
/* #define void char */
|
||||||
|
/* #define const */
|
||||||
|
#undef CHAR_IS_UNSIGNED
|
||||||
|
-#define HAVE_STDDEF_H
|
||||||
|
-#define HAVE_STDLIB_H
|
||||||
|
+#define HAVE_STDDEF_H 1
|
||||||
|
+#define HAVE_STDLIB_H 1
|
||||||
|
#undef NEED_BSD_STRINGS
|
||||||
|
#undef NEED_SYS_TYPES_H
|
||||||
|
#undef NEED_FAR_POINTERS /* we presume a 32-bit flat memory model */
|
||||||
|
@@ -25,7 +25,7 @@
|
||||||
|
#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
|
||||||
|
typedef unsigned char boolean;
|
||||||
|
#endif
|
||||||
|
-#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
|
||||||
|
+#define HAVE_BOOLEAN 1 /* prevent jmorecfg.h from redefining it */
|
||||||
|
|
||||||
|
/* Define "INT32" as int, not long, per Windows custom */
|
||||||
|
#if !(defined(_BASETSD_H_) || defined(_BASETSD_H)) /* don't conflict if basetsd.h already read */
|
@ -5,8 +5,8 @@
|
|||||||
%global build_programs 0
|
%global build_programs 0
|
||||||
|
|
||||||
Name: mingw-libjpeg-turbo
|
Name: mingw-libjpeg-turbo
|
||||||
Version: 1.2.90
|
Version: 1.3.0
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: MinGW Windows Libjpeg-turbo library
|
Summary: MinGW Windows Libjpeg-turbo library
|
||||||
|
|
||||||
License: wxWidgets
|
License: wxWidgets
|
||||||
@ -14,6 +14,10 @@ URL: http://libjpeg-turbo.virtualgl.org/
|
|||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz
|
Source0: http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz
|
||||||
|
|
||||||
|
# Make jconfig.h more autoconf friendly
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=843193
|
||||||
|
Patch0: libjpeg-turbo-match-autoconf-behavior.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
BuildRequires: mingw32-filesystem >= 95
|
BuildRequires: mingw32-filesystem >= 95
|
||||||
@ -75,6 +79,7 @@ Static version of the MinGW Windows cross compiled Libjpeg-turbo library.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n libjpeg-turbo-%{version}
|
%setup -q -n libjpeg-turbo-%{version}
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -145,6 +150,10 @@ chmod -x README-turbo.txt
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Aug 3 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.3.0-1
|
||||||
|
- Update to 1.3.0
|
||||||
|
- Make jconfig.h more autoconf friendly (RHBZ #843193)
|
||||||
|
|
||||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.90-2
|
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.90-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user