From: Jakub Bogusz Date: Sat, 25 Feb 2017 10:21:14 +0000 (+0100) Subject: - updated to 0.18.1 X-Git-Tag: auto/th/libraw-0.18.1-1 X-Git-Url: https://git.pld-linux.org/?p=packages%2Flibraw.git;a=commitdiff_plain;h=0cfd1611e9ee5cbb32dd9e78f603a889dc948e39 - updated to 0.18.1 - added zlib patch (to enable zlib support easier than manually adding defines and libs) --- diff --git a/libraw-zlib.patch b/libraw-zlib.patch new file mode 100644 index 0000000..e2932e3 --- /dev/null +++ b/libraw-zlib.patch @@ -0,0 +1,47 @@ +--- LibRaw-0.18.1/configure.ac.orig 2017-02-12 09:07:54.000000000 +0100 ++++ LibRaw-0.18.1/configure.ac 2017-02-25 11:11:23.817486333 +0100 +@@ -84,7 +84,7 @@ + fi + + +- ++PACKAGE_REQUIRES= + # check if we want LCMS support + AC_ARG_ENABLE([lcms], + [ --enable-lcms Enable LCMS support], +@@ -98,18 +98,33 @@ + PKG_CHECK_MODULES([LCMS2],[lcms2],[ + CPPFLAGS="$CPPFLAGS $LCMS2_CFLAGS -DUSE_LCMS2" + LIBS="$LIBS $LCMS2_LIBS" +- AC_SUBST([PACKAGE_REQUIRES],[lcms2]) ++ PACKAGE_REQUIRES="lcms2" + ],[ + PKG_CHECK_MODULES([LCMS],[lcms],[ + CPPFLAGS="$CPPFLAGS $LCMS_CFLAGS -DUSE_LCMS" + LIBS="$LIBS $LCMS_LIBS" +- AC_SUBST([PACKAGE_REQUIRES],[lcms]) ++ PACKAGE_REQUIRES="lcms" + ],[ + AC_MSG_WARN([LCMS support cannot be enabled]) + ]) + ]) + fi + ++AC_ARG_ENABLE([zlib], ++ [ --enable-zlib Enable ZLIB for deflated DNG support]) ++ ++if test x$enable_zlib = xyes; then ++ PKG_CHECK_MODULES([ZLIB],[zlib],[ ++ CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS -DUSE_ZLIB" ++ LIBS="$LIBS $ZLIB_LIBS" ++ PACKAGE_REQUIRES="$PACKAGE_REQUIRES zlib" ++ ],[ ++ AC_MSG_ERROR([ZLIB support cannot be enabled]) ++ ]) ++fi ++ ++AC_SUBST([PACKAGE_REQUIRES]) ++ + # check if we want build examples + AC_ARG_ENABLE([examples], + [ --enable-examples Enable building of examples], diff --git a/libraw.spec b/libraw.spec index b34dea8..12dd431 100644 --- a/libraw.spec +++ b/libraw.spec @@ -3,6 +3,7 @@ %bcond_without openmp # OpenMP support %bcond_without gpl2 # GPL v2+ demosaic pack %bcond_without gpl3 # GPL v3+ demosaic pack +%bcond_without zlib # ZLIB for deflated DNG format support # %if %{without gpl2} %undefine gpl3 @@ -10,7 +11,7 @@ Summary: LibRaw - a library for reading RAW files Summary(pl.UTF-8): LibRaw - biblioteka do odczytu plików RAW Name: libraw -Version: 0.17.2 +Version: 0.18.1 Release: 1 %if %{with gpl3} License: GPL v3+ @@ -18,17 +19,18 @@ License: GPL v3+ %if %{with gpl2} License: GPL v2+ %else -License: LGPL v2.1 or CDDL v1.0 or LibRaw Software License +License: LGPL v2.1 or CDDL v1.0 %endif %endif Group: Libraries #Source0Download: http://www.libraw.org/download#stable Source0: http://www.libraw.org/data/LibRaw-%{version}.tar.gz -# Source0-md5: 456626300777209def1ea784910f326a +# Source0-md5: 93d7a3fee17aa847bf976bff93cec7c7 Source1: http://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-%{version}.tar.gz -# Source1-md5: ec783ebbef29721935525169b1eb51f7 +# Source1-md5: d72112a0df65baa45254fa7517dd6e33 Source2: http://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-%{version}.tar.gz -# Source2-md5: a1100769a0b29af114e38cd4fe080717 +# Source2-md5: 8242ca0eef8daadc9fa450c25ee275ba +Patch0: %{name}-zlib.patch URL: http://www.libraw.org/ BuildRequires: autoconf >= 2.50 BuildRequires: automake @@ -36,10 +38,12 @@ BuildRequires: automake BuildRequires: jasper-devel BuildRequires: lcms2-devel >= 2 %{?with_openmp:BuildRequires: libgomp-devel} -BuildRequires: libjpeg-devel +BuildRequires: libjpeg-devel >= 8 BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: pkgconfig +# zlib with pkgconfig support +%{?with_zlib:BuildRequires: zlib-devel >= 1.2.3.3} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -77,8 +81,9 @@ Requires: %{name} = %{version}-%{release} Requires: jasper-devel Requires: lcms2-devel >= 2 %{?with_openmp:Requires: libgomp-devel} -Requires: libjpeg-devel +Requires: libjpeg-devel >= 8 Requires: libstdc++-devel +%{?with_zlib:Requires: zlib-devel >= 1.2.3.3} %description devel Header files for LibRaw. @@ -100,6 +105,7 @@ Statyczna biblioteka LibRaw. %prep %setup -q -n LibRaw-%{version} %{?with_gpl2:-a1} %{?with_gpl3:-a2} +%patch0 -p1 %if %{with gpl2} for f in LibRaw-demosaic-pack-GPL2-%{version}/{COPYRIGHT,Changelog,README} ; do @@ -120,7 +126,8 @@ done %configure \ --enable-demosaic-pack-gpl2=%{?with_gpl2:LibRaw-demosaic-pack-GPL2-%{version}}%{!?with_gpl2:no} \ --enable-demosaic-pack-gpl3=%{?with_gpl3:LibRaw-demosaic-pack-GPL3-%{version}}%{!?with_gpl3:no} \ - %{!?with_openmp:--disable-openmp} + %{!?with_openmp:--disable-openmp} \ + %{?with_zlib:--enable-zlib} %{__make} \ %{?with_openmp:lib_libraw_la_LIBADD=-lgomp lib_libraw_r_la_LIBADD=-lgomp} @@ -131,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +# obsoleted by pkg-config +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libraw*.la + # packaged as %doc %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name} @@ -142,11 +152,11 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc COPYRIGHT Changelog.txt LICENSE.LibRaw.pdf README README.demosaic-packs %{?with_gpl2:*.demosaic-pack-GPL2} %{?with_gpl3:*.demosaic-pack-GPL3} +%doc COPYRIGHT Changelog.txt README README.demosaic-packs %{?with_gpl2:*.demosaic-pack-GPL2} %{?with_gpl3:*.demosaic-pack-GPL3} %attr(755,root,root) %{_libdir}/libraw.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libraw.so.15 +%attr(755,root,root) %ghost %{_libdir}/libraw.so.16 %attr(755,root,root) %{_libdir}/libraw_r.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libraw_r.so.15 +%attr(755,root,root) %ghost %{_libdir}/libraw_r.so.16 %files samples %defattr(644,root,root,755) @@ -166,8 +176,6 @@ rm -rf $RPM_BUILD_ROOT %doc doc/*.html %attr(755,root,root) %{_libdir}/libraw.so %attr(755,root,root) %{_libdir}/libraw_r.so -%{_libdir}/libraw.la -%{_libdir}/libraw_r.la %{_includedir}/libraw %{_pkgconfigdir}/libraw.pc %{_pkgconfigdir}/libraw_r.pc