Accepting request 56944 from home:andreas_hanke:branches:graphics

reviewed ok Thanks for the update Note for Factory this fixes a crash in shotwell  see: http://trac.yorba.org/ticket/3032 and http://www.libraw.org/node/534

OBS-URL: https://build.opensuse.org/request/show/56944
OBS-URL: https://build.opensuse.org/package/show/graphics/libraw?expand=0&rev=33
This commit is contained in:
OBS User mrdocs 2010-12-30 23:16:00 +00:00 committed by Git OBS Bridge
parent f0308a49dc
commit 6cd955a039
3 changed files with 51 additions and 0 deletions

43
libraw-pkg-config.patch Normal file
View File

@ -0,0 +1,43 @@
--- 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,9 @@
-------------------------------------------------------------------
Thu Dec 30 22:16:04 UTC 2010 - andreas.hanke@gmx-topmail.de
- add libraw-pkg-config.patch to fix build issues in shotwell
(already accepted upstream, cf. http://www.libraw.org/node/534)
-------------------------------------------------------------------
Sun Dec 12 23:13:11 UTC 2010 - mrdocs@opensuse.org

View File

@ -26,6 +26,7 @@ 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
BuildRequires: gcc-c++
BuildRequires: make
BuildRequires: liblcms-devel
@ -83,6 +84,7 @@ against LibRaw. LibRaw does not provide dynamic libraries.
%prep
%setup -q -n %{fake_name}-%{version}
%patch0
%build