Accepting request 57493 from graphics

Accepted submit request 57493 from user mrdocs

OBS-URL: https://build.opensuse.org/request/show/57493
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libraw?expand=0&rev=10
This commit is contained in:
Berthold Gunreben 2011-01-10 10:43:51 +00:00 committed by Git OBS Bridge
commit ccc010003e
7 changed files with 66 additions and 57 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

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],[

View File

@ -1,43 +0,0 @@
--- 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
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
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

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
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
- 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,20 +19,19 @@
%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
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: liblcms-devel
BuildRequires: liblcms2-devel
BuildRequires: pkg-config
BuildRequires: libjpeg-devel
BuildRequires: fdupes
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -85,21 +84,22 @@ 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
%__make
# build env is too broken for parallel build
make
%install
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}
@ -122,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,-)