From dd2097bd59dc16766c678bce03f2e19783cbc4ed Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2018 05:16:09 +0000
Subject: import libjpeg-turbo-1.2.90-6.el7


---

diff --git a/SOURCES/libjpeg-turbo12-pkgconfig.patch b/SOURCES/libjpeg-turbo12-pkgconfig.patch
new file mode 100644
index 0000000..2cdb60f
--- /dev/null
+++ b/SOURCES/libjpeg-turbo12-pkgconfig.patch
@@ -0,0 +1,67 @@
+diff --git a/Makefile.am b/Makefile.am
+index 728e30f..8717d3c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -10,6 +10,8 @@ endif
+ 
+ nodist_include_HEADERS = jconfig.h
+ 
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = pkgscripts/libjpeg.pc pkgscripts/libturbojpeg.pc
+ 
+ HDRS = jchuff.h jdct.h jdhuff.h jerror.h jinclude.h jmemsys.h jmorecfg.h \
+ 	jpegint.h jpeglib.h jversion.h jsimd.h jsimddct.h jpegcomp.h
+diff --git a/configure.ac b/configure.ac
+index 8e75dce..534558c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,6 +21,8 @@ AC_PROG_INSTALL
+ AC_PROG_LIBTOOL
+ AC_PROG_LN_S
+ 
++PKG_PROG_PKG_CONFIG
++
+ # Check whether compiler supports pointers to undefined structures
+ AC_MSG_CHECKING(whether compiler supports pointers to undefined structures)
+ AC_TRY_COMPILE([ typedef struct undefined_structure * undef_struct_ptr; ], ,
+@@ -411,6 +413,8 @@ AC_CONFIG_FILES([pkgscripts/makemacpkg:release/makemacpkg.in])
+ AC_CONFIG_FILES([pkgscripts/Description.plist:release/Description.plist.in])
+ AC_CONFIG_FILES([pkgscripts/Info.plist:release/Info.plist.in])
+ AC_CONFIG_FILES([pkgscripts/uninstall:release/uninstall.in])
++AC_CONFIG_FILES([pkgscripts/libjpeg.pc:release/libjpeg.pc.in])
++AC_CONFIG_FILES([pkgscripts/libturbojpeg.pc:release/libturbojpeg.pc.in])
+ if test "x$with_turbojpeg" != "xno"; then
+ AC_CONFIG_FILES([tjbenchtest])
+ fi
+diff --git a/release/libjpeg.pc.in b/release/libjpeg.pc.in
+new file mode 100644
+index 0000000..40795f7
+--- /dev/null
++++ b/release/libjpeg.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: libjpeg
++Description: A SIMD-accelerated JPEG codec that provides the libjpeg API
++Version: @PACKAGE_VERSION@
++Libs: -L${libdir} -ljpeg
++Cflags: -I${includedir}
+diff --git a/release/libturbojpeg.pc.in b/release/libturbojpeg.pc.in
+new file mode 100644
+index 0000000..7d4b656
+--- /dev/null
++++ b/release/libturbojpeg.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: libturbojpeg
++Description: A SIMD-accelerated JPEG codec that provides the TurboJPEG API
++Version: @PACKAGE_VERSION@
++Libs: -L${libdir} -lturbojpeg
++Cflags: -I${includedir}
diff --git a/SPECS/libjpeg-turbo.spec b/SPECS/libjpeg-turbo.spec
index 0f1284d..3473f19 100644
--- a/SPECS/libjpeg-turbo.spec
+++ b/SPECS/libjpeg-turbo.spec
@@ -1,6 +1,6 @@
 Name:		libjpeg-turbo
 Version:	1.2.90
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A MMX/SSE2 accelerated library for manipulating JPEG image files
 
 Group:		System Environment/Libraries
@@ -27,6 +27,7 @@ Provides:	libjpeg%{_isa} = 6b-47%{?dist}
 Patch0:		libjpeg-turbo12-noinst.patch
 Patch1:		libjpeg-turbo12-CVE-2013-6630.patch
 Patch2:		libjpeg-turbo12-CVE-2013-6629.patch
+Patch3:		libjpeg-turbo12-pkgconfig.patch
 
 %description
 The libjpeg-turbo package contains a library of functions for manipulating
@@ -96,6 +97,7 @@ will manipulate JPEG files using the TurboJPEG library.
 %patch0 -p1 -b .noinst
 %patch1 -p1 -b .CVE-2013-6630
 %patch2 -p1 -b .CVE-2013-6629
+%patch3 -p1 -b .pkgconfig
 
 %build
 autoreconf -fiv
@@ -142,6 +144,7 @@ make test
 %{_includedir}/jmorecfg.h
 %{_includedir}/jpeglib.h
 %{_libdir}/libjpeg.so
+%{_libdir}/pkgconfig/libjpeg.pc
 
 %files utils
 %defattr(-,root,root,-)
@@ -167,8 +170,12 @@ make test
 %files -n turbojpeg-devel
 %{_includedir}/turbojpeg.h
 %{_libdir}/libturbojpeg.so
+%{_libdir}/pkgconfig/libturbojpeg.pc
 
 %changelog
+* Thu May 24 2018 Nikola Forró <nforro@redhat.com> - 1.2.90-6
+- Add pkgconfig scripts (#1581687)
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 1.2.90-5
 - Mass rebuild 2014-01-24