diff --git a/0001-build-fix-return-of-random-data.patch b/0001-build-fix-return-of-random-data.patch deleted file mode 100644 index 7efed9d..0000000 --- a/0001-build-fix-return-of-random-data.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Jan Engelhardt -Date: Tue, 11 Jun 2013 15:02:28 +0200 -Subject: [PATCH] build: fix return of random data -X-Upstream: submission has not occurred yet - -!@#$ - -[ 11s] internal/./wf_filtering.cpp: In member function 'int LibRaw::wf_remove_banding()': -[ 11s] internal/./wf_filtering.cpp:686:1: warning: control reaches end of non-void function [-Wreturn-type] -[ 39s] I: Program returns random data in a function -[ 39s] E: libraw no-return-in-nonvoid-function internal/./wf_filtering.cpp:686 ---- - internal/wf_filtering.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/internal/wf_filtering.cpp b/internal/wf_filtering.cpp -index a54ced4..b383b1e 100644 ---- a/internal/wf_filtering.cpp -+++ b/internal/wf_filtering.cpp -@@ -683,6 +683,7 @@ int LibRaw::wf_remove_banding() - - free(dummy_line); - -+ return WF_DEBANDING_OK; - } - - double LibRaw::wf_filter_energy(int r1_greenmode, int r1, int r2_greenmode, int r2) --- -1.8.2 - diff --git a/LibRaw-0.15.4.tar.gz b/LibRaw-0.15.4.tar.gz deleted file mode 100644 index 4242804..0000000 --- a/LibRaw-0.15.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b3fcfee33bc34ae5869a9741880e28a62f029f196cb1d1a007ab156f4a110f79 -size 1427757 diff --git a/LibRaw-0.16.0.tar.gz b/LibRaw-0.16.0.tar.gz new file mode 100644 index 0000000..eb867cf --- /dev/null +++ b/LibRaw-0.16.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71f43871ec2535345c5c9b748f07813e49915170f9510b721a2be6478426cf96 +size 1472935 diff --git a/libraw.changes b/libraw.changes index ed073d4..8b9c503 100644 --- a/libraw.changes +++ b/libraw.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Thu Jan 30 13:52:19 UTC 2014 - pgajdos@suse.com + +- updated to 0.16.0: + * removed 0001-build-fix-return-of-random-data.patch (upstreamed) + * Support for new cameras: + Baumer TXG14 + Blackmagic Cinema + Canon EOS 70D, C500, S120, G16 + Fujifilm X-M1, X-A1, XE2, XQ1 + Hasselblad Lunar, Stellar + Leica C, X VARIO + Nikon D5200, P7800, D5300, D610, Df, 1 AW1 + Nokia Lumia 1020, 1520 + Olympus E-P5,E-M1, STYLUS1 + OmniVision OV5647 (Raspberry Pi) + Panasonic LF1, GX7, GF6, GM1 + Pentax K-50, K-500, Q7,K-3 + Richon GR + Samsung NX300, NX1100, NX2000, Galaxy NX (EK-GN120) + ------------------------------------------------------------------- Mon Sep 9 13:33:01 UTC 2013 - pgajdos@suse.com diff --git a/libraw.spec b/libraw.spec index 799952e..bc2d7ea 100644 --- a/libraw.spec +++ b/libraw.spec @@ -1,7 +1,7 @@ # # spec file for package libraw # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,8 +19,8 @@ %define tar_name LibRaw Name: libraw -%define lname libraw9 -Version: 0.15.4 +%define lnum 10 +Version: 0.16.0 Release: 0 Summary: Library for reading RAW files obtained from digital photo cameras License: CDDL-1.0 or LGPL-2.1 @@ -30,7 +30,6 @@ Url: http://www.libraw.org/ #Freecode-URL: http://freecode.com/projects/libraw #Git-Clone: git://github.com/LibRaw/LibRaw Source: http://www.libraw.org/data/%{tar_name}-%{version}.tar.gz -Patch2: 0001-build-fix-return-of-random-data.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libjasper-devel @@ -57,11 +56,11 @@ cameras (CRW/CR2, NEF, RAF, DNG, and others). LibRaw is based on the source codes of the dcraw utility, where part of drawbacks have already been eliminated and part will be fixed in future. -%package -n %lname +%package -n libraw%{lnum} Summary: Library for reading RAW files obtained from digital photo cameras Group: System/Libraries -%description -n %lname +%description -n libraw%{lnum} LibRaw is a library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others). @@ -71,7 +70,7 @@ drawbacks have already been eliminated and part will be fixed in future. %package devel Summary: Development files for %{name} Group: Development/Libraries/C and C++ -Requires: %lname = %version +Requires: libraw%{lnum} = %{version} %description devel LibRaw is a library for reading RAW files obtained from digital photo @@ -97,7 +96,6 @@ against LibRaw. LibRaw does not provide dynamic libraries. %prep %setup -q -n %{tar_name}-%{version} -%patch2 -p1 %build CXXFLAGS="%{optflags} -fPIC" \ @@ -117,9 +115,9 @@ rm -f "%buildroot/%_libdir"/*.la rm -rf %{buildroot}%{_datadir}/doc %fdupes %buildroot/%_prefix -%post -n %lname -p /sbin/ldconfig +%post -n libraw%{lnum} -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%postun -n libraw%{lnum} -p /sbin/ldconfig %files tools %defattr(-,root,root,-) @@ -144,10 +142,10 @@ rm -rf %{buildroot}%{_datadir}/doc %{_libdir}/libraw.so %{_libdir}/libraw_r.so -%files -n %lname +%files -n libraw%{lnum} %defattr(-,root,root,-) -%{_libdir}/libraw.so.9* -%{_libdir}/libraw_r.so.9* +%{_libdir}/libraw.so.%{lnum}* +%{_libdir}/libraw_r.so.%{lnum}* %files devel-static %defattr(-,root,root,-)