Accepting request 44939 from multimedia:libs

Copy from multimedia:libs/libopenraw based on submit request 44939 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/44939
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libopenraw?expand=0&rev=12

baselibs.conf

@@ -0,0 +1,5 @@
+libopenraw1
+gdk-pixbuf-loader-libopenraw
+  supplements "packageand(libopenraw1-<targettype>:gdk-pixbuf-<targettype>)"
+  post "%gdk_pixbuf_loader_post"
+  postun "%gdk_pixbuf_loader_postun"

libopenraw-gdk-pixbuf-loaders-path.patch

@@ -0,0 +1,54 @@
+Index: libopenraw-0.0.8/configure
+===================================================================
+--- libopenraw-0.0.8.orig/configure
++++ libopenraw-0.0.8/configure
+@@ -17567,8 +17567,7 @@ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LIBGDKPIXBUF 1
+ _ACEOF
+ 
+-		      GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+-		      GDK_PIXBUF_DIR="gtk-2.0/$GTK_VERSION/loaders"
++		      GDK_PIXBUF_DIR=`$PKG_CONFIG --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0`
+ 
+ 		      HAVE_LIBGDKPIXBUF=yes
+ fi
+Index: libopenraw-0.0.8/configure.in
+===================================================================
+--- libopenraw-0.0.8.orig/configure.in
++++ libopenraw-0.0.8/configure.in
+@@ -135,8 +135,7 @@ if test x$enable_gnome = xyes ; then
+    if test x$HAVE_LIBGLIB = xyes ; then
+       PKG_CHECK_MODULES(LIBGDKPIXBUF, gdk-pixbuf-2.0 >= $LIBGDKPIXBUF_REQUIRED,
+                      [AC_DEFINE(HAVE_LIBGDKPIXBUF, 1, [Define to 1 to enable libgdkpixbuf support])
+-		      GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+-		      GDK_PIXBUF_DIR="gtk-2.0/$GTK_VERSION/loaders"
++		      GDK_PIXBUF_DIR=`$PKG_CONFIG --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0`
+ 		      AC_SUBST(GDK_PIXBUF_DIR)
+ 		      HAVE_LIBGDKPIXBUF=yes],
+                      [HAVE_LIBGDKPIXBUF=no])
+Index: libopenraw-0.0.8/gnome/Makefile.am
+===================================================================
+--- libopenraw-0.0.8.orig/gnome/Makefile.am
++++ libopenraw-0.0.8/gnome/Makefile.am
+@@ -16,7 +16,7 @@ pkgconfig_DATA = $(PKG_CONFIG_FILES)
+ 
+ lib_LTLIBRARIES = $(GNOME_TARGETS)
+ 
+-loaderdir = $(libdir)/$(GDK_PIXBUF_DIR)
++loaderdir = $(GDK_PIXBUF_DIR)
+ loader_LTLIBRARIES = $(GDK_PIXBUF_PLUGIN)
+ 
+ libopenrawgnome_la_LDFLAGS = \
+Index: libopenraw-0.0.8/gnome/Makefile.in
+===================================================================
+--- libopenraw-0.0.8.orig/gnome/Makefile.in
++++ libopenraw-0.0.8/gnome/Makefile.in
+@@ -265,7 +265,7 @@ INCLUDES = -I$(top_srcdir)/include \
+ 
+ pkgconfig_DATA = $(PKG_CONFIG_FILES)
+ lib_LTLIBRARIES = $(GNOME_TARGETS)
+-loaderdir = $(libdir)/$(GDK_PIXBUF_DIR)
++loaderdir = $(GDK_PIXBUF_DIR)
+ loader_LTLIBRARIES = $(GDK_PIXBUF_PLUGIN)
+ libopenrawgnome_la_LDFLAGS = \
+ 	-version-info @LIBOPENRAW_VERSION_INFO@

libopenraw.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Jul 21 14:51:06 CEST 2010 - vuntz@opensuse.org
+
+- Change gtk2-devel and libxml2-devel BuildRequires to
+  pkgconfig(gdk-pixbuf-2.0) and pkgconfig(libxml-2.0).
+- Add explicit pkgconfig(glib-2.0) BuildRequires.
+- Add libopenraw-gdk-pixbuf-loaders-path.patch to have the
+  gdk-pixbuf loader installed where it should with the new
+  gdk-pixbuf library. Patch was committed upstream.
+- Note that we require gdk-pixbuf >= 2.21 for the build because of
+  the patch.
+- Split the gdk-pixbuf loader in a gdk-pixbuf-loader-libopenraw
+  subpackage (that gets installed automatically when gdk-pixbuf is
+  installed thanks to a Supplements).
+- Change gtk2-devel Requires in devel package to gdk-pixbuf-devel.
+- Add baselibs.conf, so that the pixbuf loader can work with 32bit
+  version of gdk-pixbuf.
+
 -------------------------------------------------------------------
 Fri May 22 13:55:25 CEST 2009 - vuntz@novell.com
 

libopenraw.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libopenraw (Version 0.0.8)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -15,70 +15,64 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 Url:            http://libopenraw.freedesktop.org/
 Summary:        A library to decode digtal camera RAW files
 
 Name:           libopenraw
 Version:        0.0.8
-Release:        1
+Release:        8
-License:        LGPL v3 or later
+License:        LGPLv2.1+
 Group:          Development/Libraries/C and C++
 Source0:        http://libopenraw.freedesktop.org/download/%name-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source99:       baselibs.conf
-%define debug_package_requires libopenraw1 = %{version}-%{release}
+# PATCH-FIX-UPSTREAM libopenraw-gdk-pixbuf-loaders-path.patch fdo29208 -- Install gdk-pixbuf module in the right directory, only works with gdk-pixbuf >= 2.21
+Patch0:         libopenraw-gdk-pixbuf-loaders-path.patch
 BuildRequires:  gcc-c++
 BuildRequires:  boost-devel >= 1.33.1
 BuildRequires:  libjpeg-devel
-BuildRequires:  gtk2-devel
+BuildRequires:  pkgconfig(gdk-pixbuf-2.0) >= 2.21
-BuildRequires:  libxml2-devel >= 2.5.0
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 libopenraw is a library that aim at decoding digital camera RAW files.
 
-
-
-Authors:
---------
-    Hubert Figuiere <hub AT figuiere DOT net>
-    Bradly Broom
-
 %package -n libopenraw1
-License:        LGPL v2.1 or later
+License:        LGPLv2.1+
 Summary:        A library to decode digtal camera RAW files
 Group:          Development/Libraries/C and C++
 
 %description -n libopenraw1
 libopenraw is a library that aim at decoding digital camera RAW files.
 
+%package -n gdk-pixbuf-loader-libopenraw
+License:        LGPLv2.1+
+Summary:        A library to decode digtal camera RAW files -- gdk-pixbuf loader
+Group:          Development/Libraries/C and C++
+Supplements:    packageand(libopenraw1:gdk-pixbuf)
+%gdk_pixbuf_loader_requires
 
+%description -n gdk-pixbuf-loader-libopenraw
+libopenraw is a library that aim at decoding digital camera RAW files.
 
-Authors:
+This package provides a libopenraw-based gdk-pixbuf loader.
---------
-    Hubert Figuiere <hub AT figuiere DOT net>
-    Bradly Broom
 
 %package -n libopenraw-devel
-License:        LGPL v2.1 or later
+License:        LGPLv2.1+
 Summary:        A library to decode digtal camera RAW files
 Requires:       libopenraw1 = %{version}
 #include gdk-pixbuf/gdk-pixbuf.h
-Requires:       gtk2-devel
+Requires:       gdk-pixbuf-devel
 Group:          Development/Libraries/C and C++
 
 %description  -n libopenraw-devel
 libopenraw is a library that aim at decoding digital camera RAW files.
 
-
-
-Authors:
---------
-    Hubert Figuiere <hub AT figuiere DOT net>
-    Bradly Broom
-
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static --with-pic
@@ -92,6 +86,12 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 %postun -n libopenraw1 -p /sbin/ldconfig
 
+%post -n gdk-pixbuf-loader-libopenraw
+%gdk_pixbuf_loader_post
+
+%postun -n gdk-pixbuf-loader-libopenraw
+%gdk_pixbuf_loader_postun
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -99,7 +99,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc README TODO COPYING ChangeLog
 %{_libdir}/*.so.*
-%{_libdir}/gtk-2.0/*/*/*.so
+
+%files -n gdk-pixbuf-loader-libopenraw
+%defattr(-,root,root)
+%{_libdir}/gdk-pixbuf-2.0/*/loaders/libopenraw_pixbuf.so
 
 %files -n libopenraw-devel
 %defattr(-,root,root)
@@ -109,49 +112,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Fri May 22 2009 vuntz@novell.com
-- Update to version 0.0.8:
-  + includes missing for gcc 4.4
-- Changes from version 0.0.7:
-  + fix some warnings in the test and demo programs.
-  + fix a huge memory leak (fdo#21435)
-- Changes from version 0.0.6:
-  + LICENSE change to LGPLv3+
-  + BUG: cfa output should write the data in PGM as big endian.
-  + BUG: added missing includes breaking on gcc 4.3 and other
-  platforms. (Closes bug fdo#18243).
-  + BUG: better handling of Canon CR2 "slices" to fix crasher
-  with Canon 450D/Digital Rebel XSi files (and possibly others).
-  + NEW: API or_rawfile_new_from_memory() to load a Raw file from
-  a memory buffer.
-  + NEW: API or_rawfile_get_typeid() and the associated consts.
-  + NEW: API or_rawdata_get_minmax()
-  + NEW: API or_get_file_extensions()
-  + NEW: API or_rawfile_get_rendered_image() to get a rendered
-  image.
-  + NEW: API or_bitmapdata_*()
-  + NEW: GdkPixbuf loader.
-  + NEW: Decompress NEF files.
-  + NEW: Python bindings.
-  + NEW: testsuite can be overridden with an override file.
-  + NEW: testsuite can be bootstrapped to download its files off
-  the internet.
-  + NEW: add shave to the build system for saner output.
-  + TODO: apply the coefficients.
-- Drop libopenraw-gcc44.patch: fixed upstream.
-- Use makeinstall.
-- Package new GdkPixbuf loader.
-* Wed Feb 25 2009 coolo@suse.de
-- update to compile against gcc 4.4
-* Mon Jan 05 2009 crrodriguez@suse.de
-- exclude static libraries
-- fix -devel package dependencies
-* Fri Nov 21 2008 hfiguiere@suse.de
-- Disable make check in the mean time until the boost issue is
-  solved.
-* Wed Oct 22 2008 mrueckert@suse.de
-- fix debug_packages_requires define
-* Fri Aug 01 2008 ro@suse.de
-- fix requires for debuginfo package
-* Thu Apr 03 2008 hfiguiere@suse.de
-- Initial checkin