Update to latest upstream release.

- Change from openjpeg to libjpeg-turbo.
This commit is contained in:
Richard M. Shaw 2016-05-02 09:18:49 -05:00
parent 7f89810f2d
commit cdc5b48a9b
3 changed files with 9 additions and 6 deletions

1
.gitignore vendored
View File

@ -40,3 +40,4 @@ clog
/OpenImageIO-1.6.10.tar.gz
/OpenImageIO-1.6.11.tar.gz
/OpenImageIO-1.6.12.tar.gz
/OpenImageIO-1.6.13.tar.gz

View File

@ -2,8 +2,8 @@
#global beta beta1
Name: OpenImageIO
Version: 1.6.12
Release: 3%{?dist}
Version: 1.6.13
Release: 1%{?dist}
Summary: Library for reading and writing images
Group: Development/Libraries
@ -22,7 +22,7 @@ BuildRequires: boost-devel
BuildRequires: glew-devel
BuildRequires: OpenEXR-devel ilmbase-devel
BuildRequires: python2-devel
BuildRequires: libpng-devel libtiff-devel openjpeg-devel giflib-devel
BuildRequires: libpng-devel libtiff-devel libjpeg-turbo-devel giflib-devel
%if ! 0%{?rhel}
BuildRequires: libwebp-devel
BuildRequires: Field3D-devel
@ -112,8 +112,6 @@ rm -rf src/include/tbb
%build
rm -rf build/linux && mkdir -p build/linux && pushd build/linux
# Temporary fix for OpenCV 3.1
export LDFLAGS='%{optflags} -lopencv_videoio'
# CMAKE_SKIP_RPATH is OK here because it is set to FALSE internally and causes
# CMAKE_INSTALL_RPATH to be cleared, which is the desiered result.
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
@ -179,6 +177,10 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
%changelog
* Sun May 1 2016 Richard Shaw <hobbes1069@gmail.com> - 1.6.13-1
- Update to latest upstream release.
- Change from openjpeg to libjpeg-turbo.
* Tue Apr 26 2016 Orion Poplawski <orion@cora.nwra.com> - 1.6.12-3
- Rebuild for OpenCV 3.1

View File

@ -1 +1 @@
41fdd53e390a199b2c6b71e1f715b30b OpenImageIO-1.6.12.tar.gz
cc10627cba515624d6e5d0b0360129e4 OpenImageIO-1.6.13.tar.gz