pool/libraw
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 57489 from home:andreas_hanke:branches:graphics

Browse Source 
reviewed ok Thanks for the fixes. Looks like a better solution.

OBS-URL: https://build.opensuse.org/request/show/57489
OBS-URL: https://build.opensuse.org/package/show/graphics/libraw?expand=0&rev=36
This commit is contained in:
OBS User mrdocs 2011-01-07 22:01:23 +00:00 committed by Git OBS Bridge
parent 1df26ead93
commit 99ee2cb094
4 changed files with 30 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraw-lcms2-build.patch Normal file
View File

@ -0,0 +1,15 @@
--- configure.ac
+++ configure.ac
@@ -44,9 +44,9 @@
esac],[lcms=true])
if test x$lcms = xtrue; then
- PKG_CHECK_MODULES([LCMS2],[lcms2],[
- CPPFLAGS="$CPPFLAGS $LCMS2_CFLAGS -DUSE_LCMS2"
- LDFLAGS="$LDFLAGS $LCMS2_LIBS"
+ PKG_CHECK_MODULES([LCMS],[lcms2],[
+ CPPFLAGS="$CPPFLAGS $LCMS_CFLAGS -DUSE_LCMS2"
+ LDFLAGS="$LDFLAGS $LCMS_LIBS"
AC_SUBST([PACKAGE_REQUIRES],[lcms2])
],[
PKG_CHECK_MODULES([LCMS],[lcms],[

62
libraw-pkg-config.patch
View File

@ -1,62 +0,0 @@
--- 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: @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: @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)

9
libraw.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Jan 7 19:53:50 UTC 2011 - andreas.hanke@gmx-topmail.de
- simplify lcms2 build fix and rename to libraw-lcms2-build.patch, as
it has nothing to do with the upstreamed libraw-pkg-config.patch
- remove duplicated documentation files rather than using fdupes
- build with -fPIC so the static archives can be linked into shared
libraries/plugins (cf. http://www.libraw.org/node/535)
-------------------------------------------------------------------
Fri Jan 7 13:57:57 UTC 2011 - adrian@suse.de

12
libraw.spec
View File

@ -26,13 +26,12 @@ Summary: Library for reading RAW files obtained from digital photo camera
Url: http://www.libraw.org/
Group: System/Libraries
Source0: http://www.libraw.org/data/%{fake_name}-%{version}.tar.bz2
Patch0: %{name}-pkg-config.patch
Patch0: %{name}-lcms2-build.patch
BuildRequires: gcc-c++
BuildRequires: make
BuildRequires: liblcms2-devel
BuildRequires: pkg-config
BuildRequires: libjpeg-devel
BuildRequires: fdupes
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -85,8 +84,10 @@ against LibRaw. LibRaw does not provide dynamic libraries.
%prep
%setup -q -n %{fake_name}-%{version}
%patch0
autoreconf -fi
%build
CXXFLAGS="$RPM_OPT_FLAGS -fPIC" \
%configure
# build env is too broken for parallel build
make
@ -96,9 +97,9 @@ mv doc manual
# The source tree has these with execute permissions for some reason
%{__chmod} -x Changelog.txt LICENSE.CDDL LICENSE.LGPL LICENSE.LibRaw.pdf
# The Libraries
%makeinstall LIBDIR=%{_lib}
%fdupes %{buildroot} \
%makeinstall
# duplicated files
%__rm -rf %{buildroot}%{_datadir}/doc
%clean
%__rm -rf %{buildroot}
@ -121,7 +122,6 @@ mv doc manual
%{_includedir}/%{name}/
%{_libdir}/pkgconfig/libraw.pc
%{_libdir}/pkgconfig/libraw_r.pc
%{_datadir}/doc/libraw
%files devel-static
%defattr(-,root,root,-)