Notification time stamped 2018-07-31 23:07:24 UTC
From 725cc42085232267f4d237db40e456d5d71e9aba Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro(a)gmail.com>
Date: Jul 31 2018 23:07:16 +0000
Subject: Update to 2.0.0
---
diff --git a/.gitignore b/.gitignore
index 81a4c26..ff4f2be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/libjpeg-turbo-1.4.2.tar.gz
/libjpeg-turbo-1.5.0.tar.gz
/libjpeg-turbo-1.5.1.tar.gz
+/libjpeg-turbo-2.0.0.tar.gz
diff --git a/libjpeg-turbo-match-autoconf-behavior.patch
b/libjpeg-turbo-match-autoconf-behavior.patch
index 597fc0a..8928690 100644
--- a/libjpeg-turbo-match-autoconf-behavior.patch
+++ b/libjpeg-turbo-match-autoconf-behavior.patch
@@ -1,29 +1,30 @@
---- libjpeg-turbo-1.4.2/win/jconfig.h.in.orig 2016-05-10 17:10:15.359564444 +0200
-+++ libjpeg-turbo-1.4.2/win/jconfig.h.in 2016-05-10 17:11:10.705555543 +0200
-@@ -18,13 +18,13 @@
+diff -rupN libjpeg-turbo-2.0.0/win/jconfig.h.in libjpeg-turbo-2.0.0-new/win/jconfig.h.in
+--- libjpeg-turbo-2.0.0/win/jconfig.h.in 2018-07-27 18:47:48.000000000 +0200
++++ libjpeg-turbo-2.0.0-new/win/jconfig.h.in 2018-08-01 00:53:23.644702905 +0200
+@@ -9,13 +9,13 @@
#define BITS_IN_JSAMPLE @BITS_IN_JSAMPLE@ /* use 8 or 12 */
--#define HAVE_UNSIGNED_CHAR
--#define HAVE_UNSIGNED_SHORT
-+#define HAVE_UNSIGNED_CHAR 1
-+#define HAVE_UNSIGNED_SHORT 1
- /* #define void char */
- /* #define const */
- #undef __CHAR_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 */
-@@ -34,7 +34,7 @@
- #ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
+ #undef NEED_BSD_STRINGS
+
+-#define HAVE_UNSIGNED_CHAR
+-#define HAVE_UNSIGNED_SHORT
++#define HAVE_UNSIGNED_CHAR 1
++#define HAVE_UNSIGNED_SHORT 1
+ #undef INCOMPLETE_TYPES_BROKEN
+ #undef RIGHT_SHIFT_IS_UNSIGNED
+ #undef __CHAR_UNSIGNED__
+@@ -24,7 +24,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 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 */
diff --git a/mingw-libjpeg-turbo.spec b/mingw-libjpeg-turbo.spec
index 083b516..956e259 100644
--- a/mingw-libjpeg-turbo.spec
+++ b/mingw-libjpeg-turbo.spec
@@ -5,8 +5,8 @@
%global build_programs 0
Name: mingw-libjpeg-turbo
-Version: 1.5.1
-Release: 5%{?dist}
+Version: 2.0.0
+Release: 1%{?dist}
Summary: MinGW Windows Libjpeg-turbo library
License: wxWidgets
@@ -89,9 +89,11 @@ Static version of the MinGW Windows cross compiled Libjpeg-turbo
library.
%install
%mingw_make install DESTDIR=$RPM_BUILD_ROOT
-# Remove manual pages which duplicate Fedora native.
+# Remove manual pages and docs which duplicate Fedora native.
rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}
+rm -rf $RPM_BUILD_ROOT%{mingw32_docdir}
+rm -rf $RPM_BUILD_ROOT%{mingw64_docdir}
# The CMake build system also installed some docs
rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/doc
@@ -123,6 +125,8 @@ chmod -x README.md
%{mingw32_includedir}/turbojpeg.h
%{mingw32_libdir}/libjpeg.dll.a
%{mingw32_libdir}/libturbojpeg.dll.a
+%{mingw32_libdir}/pkgconfig/libjpeg.pc
+%{mingw32_libdir}/pkgconfig/libturbojpeg.pc
%files -n mingw32-libjpeg-turbo-static
%{mingw32_libdir}/libjpeg.a
@@ -144,6 +148,8 @@ chmod -x README.md
%{mingw64_includedir}/turbojpeg.h
%{mingw64_libdir}/libjpeg.dll.a
%{mingw64_libdir}/libturbojpeg.dll.a
+%{mingw64_libdir}/pkgconfig/libjpeg.pc
+%{mingw64_libdir}/pkgconfig/libturbojpeg.pc
%files -n mingw64-libjpeg-turbo-static
%{mingw64_libdir}/libjpeg.a
@@ -151,6 +157,9 @@ chmod -x README.md
%changelog
+* Wed Aug 01 2018 Sandro Mani <manisandro(a)gmail.com> - 2.0.0-1
+- Update to 2.0.0
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.5.1-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 7da3223..86499b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-55deb139b0cac3c8200b75d485fc13f3 libjpeg-turbo-1.5.1.tar.gz
+SHA512 (libjpeg-turbo-2.0.0.tar.gz) =
220e5248e780d3c40c7842ba52937b9b0860e89164bca16ec6e2afaf99dd5d0bc706dd9320f4d2aef67ac11d4876453ef688b1efeaf93ceb42e8c25e83da2487
https://src.fedoraproject.org/rpms/mingw-libjpeg-turbo/c/725cc42085232267...