- updated URL

[packages/libjpeg-turbo.git] / libjpeg-turbo.spec

diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec
index e992bab6b1554e63fa374c9b12093dbcf7de259e..b72c891313579d61a371c0a64092a554039b5499 100644 (file)
--- a/libjpeg-turbo.spec
+++ b/libjpeg-turbo.spec
@@ -5,22 +5,21 @@
 #
 %define                libjpeg_ver     8c
 %define                libjpeg_ver_lt  9-1
-Summary:       A MMX/SSE2 accelerated library for manipulating JPEG image files
-Summary(pl.UTF-8):     Biblioteka do obróbki plików obrazów JPEG z akceleracją MMX/SSE2
+Summary:       SIMD accelerated library for manipulating JPEG image files
+Summary(pl.UTF-8):     Biblioteka do obróbki plików obrazów JPEG z akceleracją SIMD
 Name:          libjpeg-turbo
-Version:       1.4.1
+Version:       2.0.5
 Release:       1
-License:       wxWidgets
+# more specifically: IJG, modified-BSD or Zlib
+License:       BSD-like
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/libjpeg-turbo/%{name}-%{version}.tar.gz
-# Source0-md5: b1f6b84859a16b8ebdcda951fa07c3f2
-URL:           http://libjpeg-turbo.virtualgl.org/
-BuildRequires: autoconf >= 2.56
-BuildRequires: automake
+# Source0-md5: 3a7dc293918775fc933f81e2bce36464
+URL:           https://libjpeg-turbo.org/
+BuildRequires: cmake >= 2.8.12
 %{?with_java:BuildRequires:    jdk}
 BuildRequires: libstdc++-devel
-BuildRequires: libtool
-# x86* SIMD code uses NASM; arm uses gas, no SIMD code for other archs
+# x86* SIMD code uses NASM; ARM and MIPS use gas, PowerPC uses gcc intrinsics, no SIMD code for other archs
 %ifarch %{ix86} %{x8664}
 BuildRequires: nasm
 %endif
@@ -30,16 +29,18 @@ Obsoletes:  libjpegsimd
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-libjpeg-turbo is a version of libjpeg which uses MMX, SSE, and SSE2
-SIMD instructions to accelerate baseline JPEG
-compression/decompression by about 2-4x on x86 and x86-64 platforms.
+libjpeg-turbo is a version of libjpeg which uses SIMD (MMX, SSE2,
+AVX2, NEON, AltiVec) instructions to accelerate JPEG
+compression/decompression x86, ARM and PowerPC platforms.
+
 It is based on libjpeg/SIMD but has numerous enhancements.
 
 %description -l pl.UTF-8
 libjpeg-turbo to wersja biblioteki libjpeg wykorzystująca instrukcje
-SIMD MMX, SSE i SSE2 w celu przyspieszenia kompresji/dekompresji JPEG
-o około 2-4 razy na platformach x86 i x86-64. Jest oparta na
-libjpeg/SIMD, ale ma wiele rozszerzeń.
+SIMD (MMX, SSE2, AVX2, NEON, AltiVec) w celu przyspieszenia
+kompresji/dekompresji JPEG na platformach x86, ARM i PowerPC.
+
+Jest oparta na libjpeg/SIMD, ale ma wiele rozszerzeń.
 
 %package devel
 Summary:       Headers for developing programs using libjpeg-turbo
@@ -169,36 +170,27 @@ Interfejs Javy do biblioteki TurboJPEG/OSS.
 %setup -q
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__automake}
-
-%configure \
-       --disable-silent-rules \
-       %{?with_java:JNI_CFLAGS="-I%{_jvmdir}/java/include -I%{_jvmdir}/java/include/linux"} \
-       --enable-shared \
-       --enable-static \
-       %{?with_java:--with-java} \
-%ifnarch %{ix86} %{x8664}
-       --without-simd \
+install -d build
+cd build
+%cmake .. \
+       %{?with_java:-DWITH_JAVA=ON} \
+%ifnarch %{ix86} %{x8664} %{arm} ppc
+       -DWITH_SIMD=OFF \
 %endif
-       --with-jpeg8
+       -DWITH_JPEG8=ON
 
-%{__make} -j1
+%{__make}
 
 %{?with_tests:%{__make} test}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%if %{with java}
-install -d $RPM_BUILD_ROOT%{_javadir}
-%{__mv} $RPM_BUILD_ROOT%{_datadir}/classes/turbojpeg.jar $RPM_BUILD_ROOT%{_javadir}
-%endif
+# packaged as %doc
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/{LICENSE.md,README.{ijg,md},%{?with_java:TJExample.java,}example.txt,libjpeg.txt,structure.txt,tjexample.c,usage.txt,wizard.txt}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -208,7 +200,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README change.log
+%doc ChangeLog.md LICENSE.md README.ijg README.md change.log usage.txt wizard.txt
 %attr(755,root,root) %{_libdir}/libjpeg.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libjpeg.so.8
 %attr(755,root,root) %{_libdir}/libturbojpeg.so.*.*.*
@@ -216,15 +208,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
+%doc example.txt libjpeg.txt structure.txt tjexample.c
 %attr(755,root,root) %{_libdir}/libjpeg.so
 %attr(755,root,root) %{_libdir}/libturbojpeg.so
-%{_libdir}/libjpeg.la
-%{_libdir}/libturbojpeg.la
 %{_includedir}/jconfig.h
 %{_includedir}/jerror.h
 %{_includedir}/jmorecfg.h
 %{_includedir}/jpeglib.h
 %{_includedir}/turbojpeg.h
+%{_pkgconfigdir}/libjpeg.pc
+%{_pkgconfigdir}/libturbojpeg.pc
 
 %files static
 %defattr(644,root,root,755)
@@ -248,6 +241,6 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with java}
 %files -n java-turbojpeg
 %defattr(644,root,root,755)
-%doc java/doc/*
+%doc java/TJExample.java java/doc/*
 %{_javadir}/turbojpeg.jar
 %endif