.gitignore

@@ -1,18 +1 @@
-/libjpeg-turbo-1.1.1.tar.gz
+SOURCES/libjpeg-turbo-1.5.1.tar.gz
-/libjpeg-turbo-1.2.1.tar.gz
-/libjpeg-turbo-1.2.90.tar.gz
-/libjpeg-turbo-1.3.0.tar.gz
-/libjpeg-turbo-1.3.1.tar.gz
-/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
-/libjpeg-turbo-2.0.2.tar.gz
-/libjpeg-turbo-2.0.3.tar.gz
-/libjpeg-turbo-2.0.4.tar.gz
-/libjpeg-turbo-2.0.5.tar.gz
-/libjpeg-turbo-2.0.90.tar.gz
-/libjpeg-turbo-2.1.0.tar.gz
-/libjpeg-turbo-2.1.1.tar.gz
-/libjpeg-turbo-2.1.2.tar.gz
-/libjpeg-turbo-2.1.3.tar.gz

.mingw-libjpeg-turbo.metadata

@@ -0,0 +1 @@
+ebb3f9e94044c77831a3e8c809c7ea7506944622 SOURCES/libjpeg-turbo-1.5.1.tar.gz

SOURCES/libjpeg-turbo-match-autoconf-behavior.patch

@@ -0,0 +1,29 @@
+--- 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 @@
+ 
+ #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 */
+ 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 */

SPECS/mingw-libjpeg-turbo.spec

@@ -1,19 +1,24 @@
-%{?mingw_package_header}
+%?mingw_package_header
 
 # Build the programs like cjpeg, etc.
 # https://bugzilla.redhat.com/show_bug.cgi?id=467401#c7
 %global build_programs 0
 
 Name:           mingw-libjpeg-turbo
-Version:        2.1.3
+Version:        1.5.1
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW Windows Libjpeg-turbo library
 
 License:        wxWidgets
 URL:            http://libjpeg-turbo.virtualgl.org/
 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
+ExclusiveArch: %{ix86} x86_64
 
 BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
@@ -27,8 +32,6 @@ BuildRequires:  mingw64-binutils
 
 BuildRequires:  nasm
 BuildRequires:  cmake
-BuildRequires:  make
-
 
 %description
 MinGW Windows cross compiled Libjpeg-turbo library.
@@ -43,7 +46,6 @@ Provides:       mingw32-libjpeg = 7-4
 %description -n mingw32-libjpeg-turbo
 MinGW Windows cross compiled Libjpeg-turbo library.
 
-
 %package -n mingw32-libjpeg-turbo-static
 Summary:        Static version of the MinGW Windows Libjpeg-turbo library
 Requires:       mingw32-libjpeg-turbo = %{version}-%{release}
@@ -53,22 +55,6 @@ Provides:       mingw32-libjpeg-static = 7-4
 %description -n mingw32-libjpeg-turbo-static
 Static version of the MinGW Windows cross compiled Libjpeg-turbo library.
 
-
-%package -n mingw32-turbojpeg
-Summary:        MinGW Windows turbojpeg library
-
-%description -n mingw32-turbojpeg
-MinGW Windows cross compiled turbojpeg library.
-
-
-%package -n mingw32-turbojpeg-static
-Summary:        Static version of the MinGW Windows turbojpeg library
-Requires:       mingw32-turbojpeg = %{version}-%{release}
-
-%description -n mingw32-turbojpeg-static
-Static version of the MinGW Windows turbojpeg library.
-
-
 # Win64
 %package -n mingw64-libjpeg-turbo
 Summary:        MinGW Windows Libjpeg-turbo library
@@ -78,7 +64,6 @@ Provides:       mingw64-libjpeg = 8a-2%{?dist}
 %description -n mingw64-libjpeg-turbo
 MinGW Windows cross compiled Libjpeg-turbo library.
 
-
 %package -n mingw64-libjpeg-turbo-static
 Summary:        Static version of the MinGW Windows Libjpeg-turbo library
 Requires:       mingw64-libjpeg-turbo = %{version}-%{release}
@@ -89,50 +74,34 @@ Provides:       mingw64-libjpeg-static = 8a-2%{?dist}
 Static version of the MinGW Windows cross compiled Libjpeg-turbo library.
 
 
-%package -n mingw64-turbojpeg
+%?mingw_debug_package
-Summary:        MinGW Windows turbojpeg library
-
-%description -n mingw64-turbojpeg
-MinGW Windows cross compiled turbojpeg library.
-
-
-%package -n mingw64-turbojpeg-static
-Summary:        Static version of the MinGW Windows turbojpeg library
-Requires:       mingw64-turbojpeg = %{version}-%{release}
-
-%description -n mingw64-turbojpeg-static
-Static version of the MinGW Windows turbojpeg library.
-
-
-%{?mingw_debug_package}
 
 
 %prep
-%autosetup -n libjpeg-turbo-%{version} -p1
+%setup -q -n libjpeg-turbo-%{version}
+%patch0 -p1
 
 
 %build
 %mingw_cmake
-%mingw_make_build
+%mingw_make %{?_smp_mflags}
 
 
 %install
-%mingw_make_install
+%mingw_make install DESTDIR=$RPM_BUILD_ROOT
 
-# Remove manual pages and docs which duplicate Fedora native.
+# Remove manual pages which duplicate Fedora native.
-rm -rf %{buildroot}%{mingw32_mandir}
+rm -rf $RPM_BUILD_ROOT%{mingw32_mandir}
-rm -rf %{buildroot}%{mingw64_mandir}
+rm -rf $RPM_BUILD_ROOT%{mingw64_mandir}
-rm -rf %{buildroot}%{mingw32_docdir}
-rm -rf %{buildroot}%{mingw64_docdir}
 
 # The CMake build system also installed some docs
-rm -rf %{buildroot}%{mingw32_prefix}/doc
+rm -rf $RPM_BUILD_ROOT%{mingw32_prefix}/doc
-rm -rf %{buildroot}%{mingw64_prefix}/doc
+rm -rf $RPM_BUILD_ROOT%{mingw64_prefix}/doc
 
 # Remove win32 native binaries if wanted
 %if %build_programs == 0
-rm -f %{buildroot}%{mingw32_bindir}/*.exe
+rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/*.exe
-rm -f %{buildroot}%{mingw64_bindir}/*.exe
+rm -f $RPM_BUILD_ROOT%{mingw64_bindir}/*.exe
 %endif
 
 # Fix perms
@@ -147,24 +116,17 @@ chmod -x README.md
 %{mingw32_bindir}/*.exe
 %endif
 %{mingw32_bindir}/libjpeg-62.dll
+%{mingw32_bindir}/libturbojpeg.dll
 %{mingw32_includedir}/jconfig.h
 %{mingw32_includedir}/jerror.h
 %{mingw32_includedir}/jmorecfg.h
 %{mingw32_includedir}/jpeglib.h
-%{mingw32_libdir}/cmake/libjpeg-turbo/
+%{mingw32_includedir}/turbojpeg.h
 %{mingw32_libdir}/libjpeg.dll.a
-%{mingw32_libdir}/pkgconfig/libjpeg.pc
+%{mingw32_libdir}/libturbojpeg.dll.a
 
 %files -n mingw32-libjpeg-turbo-static
 %{mingw32_libdir}/libjpeg.a
-
-%files -n mingw32-turbojpeg
-%{mingw32_bindir}/libturbojpeg.dll
-%{mingw32_includedir}/turbojpeg.h
-%{mingw32_libdir}/libturbojpeg.dll.a
-%{mingw32_libdir}/pkgconfig/libturbojpeg.pc
-
-%files -n mingw32-turbojpeg-static
 %{mingw32_libdir}/libturbojpeg.a
 
 # Win64
@@ -175,99 +137,24 @@ chmod -x README.md
 %{mingw64_bindir}/*.exe
 %endif
 %{mingw64_bindir}/libjpeg-62.dll
+%{mingw64_bindir}/libturbojpeg.dll
 %{mingw64_includedir}/jconfig.h
 %{mingw64_includedir}/jerror.h
 %{mingw64_includedir}/jmorecfg.h
 %{mingw64_includedir}/jpeglib.h
-%{mingw64_libdir}/cmake/libjpeg-turbo/
+%{mingw64_includedir}/turbojpeg.h
 %{mingw64_libdir}/libjpeg.dll.a
-%{mingw64_libdir}/pkgconfig/libjpeg.pc
+%{mingw64_libdir}/libturbojpeg.dll.a
 
 %files -n mingw64-libjpeg-turbo-static
 %{mingw64_libdir}/libjpeg.a
-
-%files -n mingw64-turbojpeg
-%{mingw64_bindir}/libturbojpeg.dll
-%{mingw64_includedir}/turbojpeg.h
-%{mingw64_libdir}/libturbojpeg.dll.a
-%{mingw64_libdir}/pkgconfig/libturbojpeg.pc
-
-%files -n mingw64-turbojpeg-static
 %{mingw64_libdir}/libturbojpeg.a
 
 
 %changelog
-* Fri Mar 25 2022 Sandro Mani <manisandro@gmail.com> - 2.1.3-2
+* Tue Aug 14 2018 Victor Toso <victortoso@redhat.com> - 1.5.1-5
-- Rebuild with mingw-gcc-12
+- ExclusiveArch: i686, x86_64
-
+- Related: rhbz#1615874
-* Mon Feb 28 2022 Sandro Mani <manisandro@gmail.com> - 2.1.3-1
-- Update to 2.1.3
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Nov 23 2021 Sandro Mani <manisandro@gmail.com> - 2.1.2-1
-- Update to 2.1.2
-
-* Wed Aug 11 2021 Sandro Mani <manisandro@gmail.com> - 2.1.1-1
-- Update to 2.1.1
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Mon May 10 2021 Sandro Mani <manisandro@gmail.com> - 2.1.0-3
-- Fix files packaged twice
-
-* Mon May 10 2021 Sandro Mani <manisandro@gmail.com> - 2.1.0-2
-- Split off turbojpeg library
-
-* Mon Apr 26 2021 Sandro Mani <manisandro@gmail.com> - 2.1.0-1
-- Update to 2.1.0
-
-* Mon Apr 12 2021 Sandro Mani <manisandro@gmail.com> - 2.0.90-2
-- Backport patch for CVE-2021-20205
-
-* Thu Jan 28 2021 Sandro Mani <manisandro@gmail.com> - 2.0.90-1
-- Update to 2.0.90
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 04 2020 Sandro Mani <manisandro@gmail.com> - 2.0.5-1
-- Update to 2.0.5
-
-* Tue Jun 16 2020 Kalev Lember <klember@redhat.com> - 2.0.4-3
-- Fix CVE-2020-13790 (#1847160)
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jan 09 2020 Sandro Mani <manisandro@gmail.com> - 2.0.4-1
-- Update to 2.0.4
-
-* Mon Sep 16 2019 Sandro Mani <manisandro@gmail.com> - 2.0.3-1
-- Update to 2.0.3
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Feb 27 2019 Kalev Lember <klember@redhat.com> - 2.0.2-1
-- Update to 2.0.2
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jan 11 2019 Kalev Lember <klember@redhat.com> - 2.0.0-2
-- Fix CVE-2018-19664 and CVE-2018-20330
-
-* Wed Aug 01 2018 Sandro Mani <manisandro@gmail.com> - 2.0.0-1
-- Update to 2.0.0
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

sources

@@ -1 +0,0 @@
-SHA512 (libjpeg-turbo-2.1.3.tar.gz) = 975c9835de7d70c6c8c5a1959adfa18f7f956bc9946fde8f1b40c1d853245c38a3118ac06b93841ec3e90be6945c38d687d062b371496c2ee9b5638d7f60418d