From a87704244d3173e3250f937f29c47a67c4eb884f Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 14 Apr 2018 09:30:07 +0200 Subject: [PATCH] - up to 9c - updated 12bit patch to cover .pc file rename --- libjpeg-12bit.patch | 32 ++++++++++++++++++++++++++++++++ libjpeg12.spec | 5 +++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/libjpeg-12bit.patch b/libjpeg-12bit.patch index 6998b12..ad23764 100644 --- a/libjpeg-12bit.patch +++ b/libjpeg-12bit.patch @@ -377,3 +377,35 @@ rdjpgcom_SOURCES = rdjpgcom.c wrjpgcom_SOURCES = wrjpgcom.c +--- jpeg-9c/Makefile.am.orig 2018-04-14 08:53:59.934089520 +0200 ++++ jpeg-9c/Makefile.am 2018-04-14 08:56:45.650754295 +0200 +@@ -105,7 +105,7 @@ + + # pkg-config file + pkgconfigdir = $(libdir)/pkgconfig +-nodist_pkgconfig_DATA = libjpeg.pc ++nodist_pkgconfig_DATA = libjpeg12.pc + + # Files to be cleaned + CLEANFILES = testout.ppm testout.bmp testout.jpg testoutp.ppm testoutp.jpg \ +--- jpeg-9c/configure.ac.orig 2018-04-14 08:57:46.364086935 +0200 ++++ jpeg-9c/configure.ac 2018-04-14 08:57:49.737420232 +0200 +@@ -361,5 +361,5 @@ + [`expr $major + $minor`:0:$minor]) + AC_MSG_RESULT([$JPEG_LIB_VERSION]) + +-AC_CONFIG_FILES([Makefile libjpeg.pc]) ++AC_CONFIG_FILES([Makefile libjpeg12.pc:libjpeg.pc.in]) + AC_OUTPUT +--- jpeg-9c/libjpeg.pc.in.orig 2018-04-14 08:59:59.494085415 +0200 ++++ jpeg-9c/libjpeg.pc.in 2018-04-14 09:00:18.150751868 +0200 +@@ -4,7 +4,7 @@ + includedir=@includedir@ + + Name: libjpeg +-Description: Reads and writes JPEG files ++Description: Reads and writes JPEG files, 12bpp + Version: @JPEG_LIB_VERSION@ +-Libs: -L${libdir} -ljpeg ++Libs: -L${libdir} -ljpeg12 + Cflags: -I${includedir} diff --git a/libjpeg12.spec b/libjpeg12.spec index 1f344f2..2efd83d 100644 --- a/libjpeg12.spec +++ b/libjpeg12.spec @@ -1,12 +1,12 @@ Summary: Library for handling different JPEG files - 12-bit version Summary(pl.UTF-8): Biblioteka do manipulacji plikami w formacie JPEG - wersja 12-bitowa Name: libjpeg12 -Version: 9b +Version: 9c Release: 1 License: distributable Group: Libraries Source0: http://www.ijg.org/files/jpegsrc.v%{version}.tar.gz -# Source0-md5: 6a9996ce116ec5c52b4870dbcd6d3ddb +# Source0-md5: 93c62597eeef81a84d988bccbda1e990 Patch0: libjpeg-maxmem-sysconf.patch Patch1: libjpeg-12bit.patch URL: http://www.ijg.org/ @@ -103,6 +103,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/libjpeg12.so %{_libdir}/libjpeg12.la %{_includedir}/libjpeg12 +%{_pkgconfigdir}/libjpeg12.pc %files static %defattr(644,root,root,755) -- 2.44.0