Accepting request 57358 from KDE:Extra

reviewed ok Thanks for the update

OBS-URL: https://build.opensuse.org/request/show/57358
OBS-URL: https://build.opensuse.org/package/show/graphics/libraw?expand=0&rev=35
This commit is contained in:
OBS User mrdocs 2011-01-07 14:16:57 +00:00 committed by Git OBS Bridge
parent 57f9ea9dda
commit 8e2778be39
6 changed files with 96 additions and 49 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3d2ad744c60eb39fec4eb13274ba2bd7e2cee7955b5c4892807fe2effba216b8
size 641118

17
_service Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" ?>
<services>
<service name="download_url">
<param name="protocol">http</param>
<param name="host">www.libraw.org</param>
<param name="path">/data/LibRaw-0.12.2.tar.gz</param>
</service>
<service name="verify_file">
<param name="file">_service:download_url:LibRaw-0.12.2.tar.gz</param>
<param name="verifier">sha256</param>
<param name="checksum">b7f99d794282067cb1e6b174510032df57e25933f3508a1ef75b8be3d238fc7a</param>
</service>
<service name="recompress">
<param name="compression">bz2</param>
<param name="file">*.tar.gz</param>
</service>
</services>

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4d1f2305d63a5a8f056a1226ede2a114c515e20d5a78b5f6185c41ac18fc5427
size 645041

View File

@ -1,43 +1,62 @@
--- configure.ac
+++ configure.ac
@@ -47,10 +47,12 @@
PKG_CHECK_MODULES([LCMS2],[lcms2],[
CPPFLAGS="$CPPFLAGS $LCMS2_CFLAGS -DUSE_LCMS2"
LDFLAGS="$LDFLAGS $LCMS2_LIBS"
+ AC_SUBST([PACKAGE_REQUIRES],[lcms2])
],[
PKG_CHECK_MODULES([LCMS],[lcms],[
CPPFLAGS="$CPPFLAGS $LCMS_CFLAGS -DUSE_LCMS"
LDFLAGS="$LDFLAGS $LCMS_LIBS"
+ AC_SUBST([PACKAGE_REQUIRES],[lcms])
],[
AC_MSG_WARN([LCMS support cannot be enabled])
])
--- libraw.pc.in
+++ libraw.pc.in
@@ -5,7 +5,7 @@
Name: libraw
--- libraw.pc.in.orig 2011-01-07 14:48:29.110226430 +0100
+++ libraw.pc.in 2011-01-07 14:48:48.437617102 +0100
@@ -7,5 +7,5 @@
Description: Raw image decoder library (non-thread-safe)
-Requires: lcms
-Version: 0.9.1
-Libs: -L${libdir} -lraw -lstdc++ @LCMS_LIBS@
-Cflags: -I${includedir}/libraw@PC_OPENMP@
+Requires: @PACKAGE_REQUIRES@
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@
+Cflags: -I${includedir}/libraw
--- libraw_r.pc.in
+++ libraw_r.pc.in
@@ -5,7 +5,7 @@
Name: libraw
Requires: @PACKAGE_REQUIRES@
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@
+Libs: -L${libdir} -lraw -lstdc++@PC_OPENMP@ @LCMS_LIBS@ @LCMS2_LIBS@
Cflags: -I${includedir}/libraw
--- libraw_r.pc.in.orig 2011-01-04 16:28:30.000000000 +0100
+++ libraw_r.pc.in 2011-01-07 14:49:26.272254616 +0100
@@ -7,6 +7,6 @@
Description: Raw image decoder library (thread-safe)
-Requires: lcms
-Version: 0.9.1
-Libs: -L${libdir} -lraw_r -lstdc++ @LCMS_LIBS@
-Cflags: -I${includedir}/libraw@PC_OPENMP@
+Requires: @PACKAGE_REQUIRES@
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@
+Cflags: -I${includedir}/libraw
Requires: @PACKAGE_REQUIRES@
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@
+Libs: -L${libdir} -lraw_r -lstdc++@PC_OPENMP@ @LCMS_LIBS@ @LCMS2_LIBS@
Cflags: -I${includedir}/libraw
--- Makefile.am.orig 2011-01-07 14:55:52.612035926 +0100
+++ Makefile.am 2011-01-07 14:56:25.277767268 +0100
@@ -51,32 +51,32 @@
bin_raw_identify_SOURCES = samples/raw-identify.cpp
bin_raw_identify_CPPFLAGS = $(lib_libraw_a_CPPFLAGS)
-bin_raw_identify_LDADD = -Llib/ -lm -lraw $(LCMS_LIBS)
+bin_raw_identify_LDADD = -Llib/ -lm -lraw $(LCMS_LIBS) $(LCMS2_LIBS)
bin_unprocessed_raw_SOURCES = samples/unprocessed_raw.cpp
bin_unprocessed_raw_CPPFLAGS = $(lib_libraw_a_CPPFLAGS)
-bin_unprocessed_raw_LDADD = -Llib/ -lm -lraw $(LCMS_LIBS)
+bin_unprocessed_raw_LDADD = -Llib/ -lm -lraw $(LCMS_LIBS) $(LCMS2_LIBS)
bin_4channels_SOURCES = samples/4channels.cpp
bin_4channels_CPPFLAGS = $(lib_libraw_a_CPPFLAGS)
-bin_4channels_LDADD = -Llib/ -lm -lraw $(LCMS_LIBS)
+bin_4channels_LDADD = -Llib/ -lm -lraw $(LCMS_LIBS) $(LCMS2_LIBS)
bin_simple_dcraw_SOURCES = samples/simple_dcraw.cpp
bin_simple_dcraw_CPPFLAGS = $(lib_libraw_a_CPPFLAGS)
-bin_simple_dcraw_LDADD = -Llib/ -lm -lraw $(LCMS_LIBS)
+bin_simple_dcraw_LDADD = -Llib/ -lm -lraw $(LCMS_LIBS) $(LCMS2_LIBS)
bin_mem_image_SOURCES = samples/mem_image.cpp
bin_mem_image_CPPFLAGS = $(lib_libraw_a_CPPFLAGS)
-bin_mem_image_LDADD = -Llib/ -lm -lraw $(LCMS_LIBS)
+bin_mem_image_LDADD = -Llib/ -lm -lraw $(LCMS_LIBS) $(LCMS2_LIBS)
bin_dcraw_half_SOURCES = samples/dcraw_half.c
bin_dcraw_half_CPPFLAGS = $(lib_libraw_a_CPPFLAGS)
-bin_dcraw_half_LDADD = -Llib/ -lm -lraw -lstdc++ $(LCMS_LIBS)
+bin_dcraw_half_LDADD = -Llib/ -lm -lraw -lstdc++ $(LCMS_LIBS) $(LCMS2_LIBS)
bin_half_mt_SOURCES = samples/half_mt.c
bin_half_mt_CFLAGS = $(lib_libraw_r_a_CXXFLAGS)
-bin_half_mt_LDADD = -Llib/ -lm -lraw_r -lstdc++ $(LCMS_LIBS)
+bin_half_mt_LDADD = -Llib/ -lm -lraw_r -lstdc++ $(LCMS_LIBS) $(LCMS2_LIBS)
bin_dcraw_emu_SOURCES = samples/dcraw_emu.cpp
bin_dcraw_emu_CPPFLAGS = $(lib_libraw_a_CPPFLAGS)
-bin_dcraw_emu_LDADD = -Llib/ -lm -lraw $(LCMS_LIBS)
+bin_dcraw_emu_LDADD = -Llib/ -lm -lraw $(LCMS_LIBS) $(LCMS2_LIBS)

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Jan 7 13:57:57 UTC 2011 - adrian@suse.de
- Update to version 0.12.2
* Fuji FinePix S5500 size adjusted to ignore (rare?) garbage
at top of frame.
* Sigma DPx processing disabled because of unsupported
compession scheme and incompatible metadata format.
These cameras will be supported only if dcraw will
support them.
- use liblcms2 now
-------------------------------------------------------------------
Thu Dec 30 22:16:04 UTC 2010 - andreas.hanke@gmx-topmail.de

View File

@ -19,7 +19,7 @@
%define fake_name LibRaw
Name: libraw
Version: 0.12.0
Version: 0.12.2
Release: 2
License: CDDLv1.0 | LGPLv2.1
Summary: Library for reading RAW files obtained from digital photo cameras
@ -29,7 +29,7 @@ Source0: http://www.libraw.org/data/%{fake_name}-%{version}.tar.bz2
Patch0: %{name}-pkg-config.patch
BuildRequires: gcc-c++
BuildRequires: make
BuildRequires: liblcms-devel
BuildRequires: liblcms2-devel
BuildRequires: pkg-config
BuildRequires: libjpeg-devel
BuildRequires: fdupes
@ -87,10 +87,9 @@ against LibRaw. LibRaw does not provide dynamic libraries.
%patch0
%build
%configure
%__make
# build env is too broken for parallel build
make
%install
mv doc manual