Browse Source

libjpeg-turbo:
- update to 1.3.1
- ship turbojpeg library and headers

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8944 ec354946-7b23-47d6-9f5a-488ba84defc7

daisuke 9 years ago
parent
commit
3371c0a900
1 changed files with 17 additions and 11 deletions
  1. 17 11
      lib/libj/libjpeg-turbo/libjpeg-turbo-vl.spec

+ 17 - 11
lib/libj/libjpeg-turbo/libjpeg-turbo-vl.spec

@@ -4,8 +4,8 @@ Summary:	A MMX/SSE2 accelerated library for manipulating JPEG image files
 Summary(ja):	MMX/SSE2 でアクセラレーションされた libjpeg ライブラリ
 
 Name:		libjpeg-turbo
-Version:	1.2.1
-Release:	2%{?_dist_release}
+Version:	1.3.1
+Release:	1%{?_dist_release}
 
 Group:		System Environment/Libraries
 License:	wxWidgets
@@ -22,6 +22,7 @@ Obsoletes:	libjpeg < 6b-50vl6
 Provides:	libjpeg = 6b-50vl6
 
 Patch0:         libjpeg-turbo12-noinst.patch
+Patch1:		libjpeg-turbo-header-files.patch
 
 %description
 The libjpeg-turbo package contains a library of functions for manipulating
@@ -83,6 +84,7 @@ will manipulate JPEG files using the libjpeg-turbo library
 %setup -q
 
 %patch0 -p1 -b .noinst_jpgtest
+%patch1 -p1 -b .turbo_headers
 
 %build
 autoreconf -fiv
@@ -101,10 +103,6 @@ chmod -x README-turbo.txt
 # Remove unwanted files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/lib{,turbo}jpeg.la
 
-# Don't distribute libjpegturbo because it is unversioned
-rm -f $RPM_BUILD_ROOT/%{_includedir}/turbojpeg.h
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libturbojpeg.so
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -115,22 +113,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README README-turbo.txt change.log ChangeLog.txt LGPL.txt LICENSE.txt
-%{_libdir}/libjpeg.so.62.0.0
-%{_libdir}/libjpeg.so.62
+%doc README README-turbo.txt change.log ChangeLog.txt
+%{_libdir}/libjpeg.so.62*
+%{_libdir}/libturbojpeg.so.0*
 
 %files devel
 %defattr(-,root,root,-)
-%doc coderules.doc jconfig.doc libjpeg.doc structure.doc example.c
+%doc coderules.txt jconfig.txt libjpeg.txt structure.txt example.c
 %{_includedir}/jconfig.h
 %{_includedir}/jerror.h
 %{_includedir}/jmorecfg.h
+%{_includedir}/jpegint.h
 %{_includedir}/jpeglib.h
+%{_includedir}/turbojpeg.h
 %{_libdir}/libjpeg.so
+%{_libdir}/libturbojpeg.so
 
 %files utils
 %defattr(-,root,root,-)
-%doc usage.doc wizard.doc
+%doc usage.txt wizard.txt
 %{_bindir}/cjpeg
 %{_bindir}/djpeg
 %{_bindir}/jpegtran
@@ -147,6 +148,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n compat32-%{name}
 %defattr(-,root,root)
 %{_libdir}/libjpeg.so.*
+%{_libdir}/libturbojpeg.so.*
 
 %files -n compat32-%{name}-devel
 %defattr(-,root,root)
@@ -154,6 +156,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Sep 07 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 1.3.1-1
+- update to 1.3.1
+- ship turbojpeg library and headers
+
 * Sun Jul 20 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.1-2
 - rebuild with VineSeed environment