New upstream release 1.5.90 (#1560219)

2018-03-28 18:22:36 +02:00 · 2018-03-28 18:22:36 +02:00 · 00790f8027
parent dfe8cc3746
commit 00790f8027
5 changed files with 70 additions and 54 deletions
--- a/libjpeg-turbo-cmake.patch
+++ b/libjpeg-turbo-cmake.patch
@ -0,0 +1,52 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cc548f5..023ff66 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -1314,7 +1314,7 @@ endif()
+ 
+ if(WITH_TURBOJPEG)
+   if(ENABLE_SHARED)
+-    install(TARGETS turbojpeg tjbench
+    install(TARGETS turbojpeg
+       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+@@ -1322,10 +1322,6 @@ if(WITH_TURBOJPEG)
+   if(ENABLE_STATIC)
+     install(TARGETS turbojpeg-static ARCHIVE
+       DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-    if(NOT ENABLE_SHARED)
+-      install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tjbench-static${EXE}
+-        DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE})
+-    endif()
+   endif()
+   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
+     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+@@ -1345,18 +1341,6 @@ endif()
+ 
+ install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg
+-  ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt
+-  ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c
+-  ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg.txt
+-  ${CMAKE_CURRENT_SOURCE_DIR}/structure.txt
+-  ${CMAKE_CURRENT_SOURCE_DIR}/usage.txt ${CMAKE_CURRENT_SOURCE_DIR}/wizard.txt
+-  ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
+-if(WITH_JAVA)
+-  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java
+-    DESTINATION ${CMAKE_INSTALL_DOCDIR})
+-endif()
+-
+ if(UNIX OR MINGW)
+   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1
+     ${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1
+@@ -1370,7 +1354,7 @@ endif()
+ 
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
+   ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h
+-  ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h ${CMAKE_CURRENT_SOURCE_DIR}/jpegint.h
+   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ include(cmakescripts/BuildPackages.cmake)
--- a/libjpeg-turbo-header-files.patch
+++ b/libjpeg-turbo-header-files.patch
@ -1,12 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index d767e4f..584d0c0 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,6 @@
- lib_LTLIBRARIES = libjpeg.la
- libjpeg_la_LDFLAGS = -version-info ${LIBTOOL_CURRENT}:${SO_MINOR_VERSION}:${SO_AGE} -no-undefined
-include_HEADERS = jerror.h jmorecfg.h jpeglib.h
-+include_HEADERS = jerror.h jmorecfg.h jpegint.h jconfig.h jpeglib.h
- 
- if WITH_TURBOJPEG
- lib_LTLIBRARIES += libturbojpeg.la
--- a/libjpeg-turbo.spec
+++ b/libjpeg-turbo.spec
@ -1,17 +1,15 @@
 Name:           libjpeg-turbo
-Version:        1.5.3
-Release:        4%{?dist}
+Version:        1.5.90
+Release:        1%{?dist}
 Summary:        A MMX/SSE2/SIMD accelerated library for manipulating JPEG image files
 License:        IJG
 URL:            http://sourceforge.net/projects/libjpeg-turbo

 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:         libjpeg-turbo14-noinst.patch
-Patch1:         libjpeg-turbo-header-files.patch
+Patch0:         libjpeg-turbo-cmake.patch

 BuildRequires:  gcc
-BuildRequires:  autoconf
-BuildRequires:  automake
+BuildRequires:  cmake
 BuildRequires:  libtool
 BuildRequires:  nasm

@ -70,12 +68,12 @@ manipulate JPEG files using the TurboJPEG library.

 %prep
 %setup -q
-%patch0 -p1 -b .noinst
-%patch1 -p1 -b .header-files
+%patch0 -p1

 %build
-autoreconf -vif
-%configure --disable-static
+%{cmake} -DCMAKE_SKIP_RPATH:BOOL=YES \
+         -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \
+         -DENABLE_STATIC:BOOL=NO .

 make %{?_smp_mflags} V=1

@ -125,17 +123,18 @@ EOF
 fi

 %check
-make test %{?_smp_mflags}
+LD_LIBRARY_PATH=%{buildroot}%{_libdir} make test %{?_smp_mflags}

 %ldconfig_scriptlets
 %ldconfig_scriptlets -n turbojpeg

 %files
+%license LICENSE.md
 %doc README.md README.ijg ChangeLog.md
 %{_libdir}/libjpeg.so.62*

 %files devel
-%doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.c
+%doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.txt
 %{_includedir}/jconfig*.h
 %{_includedir}/jerror.h
 %{_includedir}/jmorecfg.h
@ -158,14 +157,20 @@ make test %{?_smp_mflags}
 %{_mandir}/man1/wrjpgcom.1*

 %files -n turbojpeg
+%license LICENSE.md
+%doc README.md README.ijg ChangeLog.md
 %{_libdir}/libturbojpeg.so.0*

 %files -n turbojpeg-devel
+%doc tjexample.c
 %{_includedir}/turbojpeg.h
 %{_libdir}/libturbojpeg.so
 %{_libdir}/pkgconfig/libturbojpeg.pc

 %changelog
+* Wed Mar 28 2018 Nikola Forró <nforro@redhat.com> - 1.5.90-1
+- New upstream release 1.5.90 (#1560219)
+
 * Tue Feb 20 2018 Nikola Forró <nforro@redhat.com> - 1.5.3-4
 - Add missing gcc build dependency

--- a/libjpeg-turbo14-noinst.patch
+++ b/libjpeg-turbo14-noinst.patch
@ -1,29 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 80f0059..eea9a32 100644
--- a/Makefile.am
-+++ b/Makefile.am
-@@ -92,9 +92,7 @@ noinst_PROGRAMS = jcstest
- 
- if WITH_TURBOJPEG
- 
-bin_PROGRAMS += tjbench
-
-noinst_PROGRAMS += tjunittest
-+noinst_PROGRAMS += tjbench tjunittest
- 
- tjbench_SOURCES = tjbench.c bmp.h bmp.c tjutil.h tjutil.c rdbmp.c rdppm.c \
- 	wrbmp.c wrppm.c
-@@ -160,13 +158,6 @@ dist_man1_MANS = cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
- DOCS= coderules.txt jconfig.txt change.log rdrle.c wrrle.c BUILDING.md \
- 	ChangeLog.md
- 
-dist_doc_DATA = README.ijg README.md libjpeg.txt structure.txt usage.txt \
-	wizard.txt LICENSE.md
-
-exampledir = $(docdir)
-dist_example_DATA = example.c
-
-
- EXTRA_DIST = win release $(DOCS) testimages CMakeLists.txt \
- 	sharedlib/CMakeLists.txt cmakescripts libjpeg.map.in doc doxygen.config \
- 	doxygen-extra.css jccolext.c jdcolext.c jdcol565.c jdmrgext.c jdmrg565.c \
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (libjpeg-turbo-1.5.3.tar.gz) = b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
+SHA512 (libjpeg-turbo-1.5.90.tar.gz) = 6322f1013ace231fa51aa2cd2799fa526da14074cde08349c7c6f1719954aa4862d4e9b3975c0041aa93f7efce679dc782abdc5e60f92adfdf7d0c8aa2158e30