Version bump with upstream fixes (thanks Andreas Sturmlechner, bug 440838)

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

5 files changed, 273 insertions, 1 deletions

diff --git a/media-libs/oyranos/ChangeLog b/media-libs/oyranos/ChangeLog
index 3f640b0144cc..cb430e54f1cc 100644
--- a/media-libs/oyranos/ChangeLog
+++ b/media-libs/oyranos/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/oyranos
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.4 2012/11/04 11:26:02 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.5 2012/11/04 16:28:21 xmw Exp $
+
+*oyranos-0.9.0 (04 Nov 2012)
+
+  04 Nov 2012; Michael Weber <xmw@gentoo.org> +oyranos-0.9.0.ebuild,
+  +files/oyranos-0.9.0-array.patch, +files/oyranos-0.9.0-buildsystem.patch,
+  +files/oyranos-0.9.0-png.patch:
+  Version bump with upstream fixes (thanks Andreas Sturmlechner, bug 440838)
 
 *oyranos-0.4.0-r1 (04 Nov 2012)
 
diff --git a/media-libs/oyranos/files/oyranos-0.9.0-array.patch b/media-libs/oyranos/files/oyranos-0.9.0-array.patch
new file mode 100644
index 000000000000..bd8ee069e443
--- /dev/null
+++ b/media-libs/oyranos/files/oyranos-0.9.0-array.patch
@@ -0,0 +1,37 @@
+from http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff;h=0ed3aef1320ccc168c2753ac4cf426290fac6639
+--- a/API_generated/oyArray2d_s_.c
++++ b/API_generated/oyArray2d_s_.c
+@@ -13,7 +13,7 @@
+  *  @author   Kai-Uwe Behrmann <ku.b@gmx.de>
+  *  @par License:
+  *            new BSD - see: http://www.opensource.org/licenses/bsd-license.php
+- *  @date     2012/10/24
++ *  @date     2012/11/02
+  */
+ 
+ 
+@@ -404,9 +404,9 @@
+  *
+  *  @param[in,out] obj                 struct object
+  *
+- *  @version Oyranos: 0.1.11
++ *  @version Oyranos: 0.9.1
++ *  @date    2012/11/02
+  *  @since   2010/09/07 (Oyranos: 0.1.11)
+- *  @date    2010/09/07
+  */
+ int          oyArray2d_ReleaseArray_ ( oyArray2d_s       * obj )
+ {
+@@ -428,10 +428,10 @@
+     {
+       if((s->own_lines == 1 && y == s->data_area.y) ||
+          s->own_lines == 2)
+-        deallocateFunc( &s->array2d[y][dsize * (int)s->data_area.x] );
++	deallocateFunc( &s->array2d[y][dsize * (int)OY_ROUND(s->data_area.x)] );
+       s->array2d[y] = 0;
+     }
+-    deallocateFunc( s->array2d + (size_t)s->data_area.y );
++    deallocateFunc( s->array2d + (int)OY_ROUND(s->data_area.y) );
+     s->array2d = 0;
+   }
+ 
diff --git a/media-libs/oyranos/files/oyranos-0.9.0-buildsystem.patch b/media-libs/oyranos/files/oyranos-0.9.0-buildsystem.patch
new file mode 100644
index 000000000000..9821fd44be40
--- /dev/null
+++ b/media-libs/oyranos/files/oyranos-0.9.0-buildsystem.patch
@@ -0,0 +1,114 @@
+--- oyranos-0.4.0/configure_tests.sh
++++ oyranos-0.4.0/configure_tests.sh
+@@ -3,7 +3,7 @@
+ set > testset.txt
+ ERROR=0
+ WARNING=0
+-STRIPOPT='s/-O.// ; s/-isysroot [[:graph:]]*// ; s/-arch ppc// ; s/-arch i386//'
++STRIPOPT='s/-isysroot [[:graph:]]*// ; s/-arch ppc// ; s/-arch i386//'
+ 
+ mkdir -p tests
+ 
+--- oyranos-0.9.0/oforms/oyranos_xforms.makefile
++++ oyranos-0.9.0/oforms/oyranos_xforms.makefile
+@@ -1,8 +1,8 @@
+-INCL    = $(INCLUDE) -I../ -I./ $(DEBUG)
+-CC      = gcc
+-DEBUG  = -Wall -g -O0
++INCL    = $(INCLUDE) -I../ -I./
++CC      ?= gcc
++CXX     ?= c++
+ LDFLAGS_ = $$LDFLAGS -L../fl_i18n
+-OY_LIBS := $(shell pkg-config oyranos libxml-2.0 --libs --cflags)
++OY_LIBS := $(shell pkg-config libxml-2.0 --libs --cflags) ../liboyranos.so ../liboyranos_object.so ../liboyranos_core.so ../liboyranos_config.so ../liboyranos_modules.so
+ OY_FLAGS = -L../ $(OY_LIBS)
+ FLTK_FLAGS := $(shell fltk-config --ldflags --cxxflags | sed s/-O2//) -lpthread
+ 
+@@ -15,15 +15,15 @@
+ 
+ oyranos-xforms:	$(SRCDIR)oyranos_xforms.c
+ 	echo "Compiling $(SRCDIR)$< + Linking $@ ..."
+-	gcc -Wall -g $(CFLAGS) $(INCL)  $(SRCDIR)oyranos_xforms.c -o oyranos-xforms -pedantic $(OY_FLAGS) $(LDFLAGS_)
++	$(CC) -Wall $(CFLAGS) $(LDFLAGS) $(INCL)  $(SRCDIR)oyranos_xforms.c -o oyranos-xforms -pedantic $(OY_FLAGS) $(LDFLAGS_)
+ 
+ oyranos-xforms-modules:	$(SRCDIR)oyranos_xforms_modules.c
+ 	echo "Compiling $(SRCDIR)$< + Linking $@ ..."
+-	gcc -Wall -g $(CFLAGS) $(INCL)  $< -o $@ -pedantic $(OY_FLAGS) $(LDFLAGS_)
++	$(CC) -Wall $(CFLAGS) $(LDFLAGS) $(INCL)  $< -o $@ -pedantic $(OY_FLAGS) $(LDFLAGS_)
+ 
+ oyranos-xforms-fltk:	$(SRCDIR)oyranos_xforms_fltk.cxx $(SRCDIR)oyranos_forms_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.cxx $(SRCDIR)oyranos_widgets_fltk.h
+ 	echo "Compiling $(SRCDIR)$< + Linking $@ ..."
+-	-c++ $(LDFLAGS_) -Wall -g $(CXXFLAGS) $(INCL)  $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS)
++	$(CXX) $(LDFLAGS_) -Wall $(CXXFLAGS) $(LDFLAGS) $(INCL)  $(SRCDIR)oyranos_xforms_fltk.cxx -o oyranos-xforms-fltk -pedantic -loyforms_fltk -lfl_i18n $(FLTK_FLAGS) $(OY_FLAGS)
+ 
+ 
+ # Build commands and filename extensions...
+--- oyranos-0.9.0/oyranos-config.in
++++ oyranos-0.9.0/oyranos-config.in
+@@ -109,7 +109,7 @@
+ 
+ if [ "$echo_ldflags" = "yes" ]; then
+   if [ -f liboyranos.so ]; then
+-    echo "-L. -loyranos -loyranos_config -loyranos_modules -loyranos_object -loyranos_core $elektra $oyranos_add"
++    echo "lliboyranos.so liboyranos_config.so liboyranos_modules.so liboyranos_object.so liboyranos_core.so $elektra $oyranos_add"
+   else
+     echo "-L$libdir -loyranos -loyranos_config -loyranos_modules -loyranos_object -loyranos_core $elektra $oyranos_add"
+   fi
+--- oyranos-0.9.0/configure
++++ oyranos-0.9.0/configure
+@@ -121,8 +121,6 @@
+ fi
+ IFS=$old_IFS
+ 
+-STRIPOPT="sed s/-O.//"
+-
+ if [ $# -gt 0 ]; then
+   prefix=""
+   while [ $# -gt 0 ]; do
+@@ -680,17 +678,8 @@
+ test -n "$ECHO" && $ECHO "CC = $CC" >> $CONF_NV
+ export CC CXX
+ 
+-# many constant strings are much longer than the C90 allowed, skip the warning
+-CFLAGS_COMMON="`echo $CFLAGS_COMMON | $STRIPOPT` \$(DEBUG) \$(OPENMP)"
+-CXXFLAGS_COMMON="`echo $CXXFLAGS_COMMON | $STRIPOPT` \$(DEBUG) \$(OPENMP)"
+-CFLAGS="`echo $CFLAGS | $STRIPOPT`"
+-CXXFLAGS="`echo $CXXFLAGS | $STRIPOPT`"
+ 
+-if [ -z "$LDFLAGS" ]; then
+-  LDFLAGS="-L./ -L$libdir"
+-else
+-  LDFLAGS="`echo $LDFLAGS | $STRIPOPT` -L./ -L$libdir"
+-fi
++#LDFLAGS="-L./ -L$libdir"
+ 
+ 
+ # detect Libraries
+@@ -760,12 +749,12 @@
+         --copyright-holder='Kai-Uwe Behrmann' \
+         --msgid-bugs-address='ku.b@gmx.de' \
+         --from-code=utf-8" >> $CONF
+-  oyranos_add="-L\$libdir \$ltdl \$xml2 \$iconv \$intl \$yajl"
++  oyranos_add="\$ltdl \$xml2 \$iconv \$intl \$yajl"
+   if [ $OSUNAME = "Linux" ]; then
+     COPY="cp -vdpa"
+     MOVE="mv -v"
+     RM="rm -vf"
+-    LDFLAGS="$LDFLAGS -L."
++    LDFLAGS="$LDFLAGS"
+     test -n "$ECHO" && $ECHO "LINK_FLAGS_STATIC =" >> $CONF
+     if [ -n "$rpath" ]; then 
+       test -n "$ECHO" && $ECHO "LINK_LIB_PATH = -Wl,--rpath -Wl," >> $CONF
+@@ -1294,9 +1283,9 @@
+ test -n "$ECHO" && $ECHO "" >> $VERS_H
+ test -n "$ECHO" && $ECHO "#endif /*OYRANOS_VERSION_H*/" >> $VERS_H
+ 
+-CFLAGS="$CFLAGS_COMMON `echo $CFLAGS | $STRIPOPT`"
+-CXXFLAGS="$CXXFLAGS_COMMON `echo $CXXFLAGS | $STRIPOPT`"
+-LDFLAGS="`echo $LDFLAGS | $STRIPOPT` \$(dl) \$(DEVEL_LIBS)"
++CFLAGS="$CFLAGS_COMMON $CFLAGS"
++CXXFLAGS="$CXXFLAGS_COMMON $CXXFLAGS"
++LDFLAGS="$LDFLAGS \$(dl) \$(DEVEL_LIBS)"
+ 
+ test -n "$ECHO" && $ECHO "CFLAGS=$CFLAGS"     >> $CONF_NV
+ test -n "$ECHO" && $ECHO "CFLAGS = $CFLAGS"   >> $CONF_I18N
diff --git a/media-libs/oyranos/files/oyranos-0.9.0-png.patch b/media-libs/oyranos/files/oyranos-0.9.0-png.patch
new file mode 100644
index 000000000000..7bcc28651f1c
--- /dev/null
+++ b/media-libs/oyranos/files/oyranos-0.9.0-png.patch
@@ -0,0 +1,31 @@
+from http://www.oyranos.org/scm?p=oyranos.git;a=commitdiff;h=c39976bf5de8a70f71cef2ecafae13d17e811857
+--- a/modules/oyranos_cmm_oPNG.c
++++ b/modules/oyranos_cmm_oPNG.c
+@@ -816,7 +816,8 @@ oyImage_s *  oyImage_FromPNG         ( const char        * filename,
+        spp = 2; break;
+   case PNG_COLOR_TYPE_PALETTE:
+        png_set_palette_to_rgb( png_ptr );
+-       spp = 3; break;
++       /* expect alpha */
++       spp = 4; break;
+   case PNG_COLOR_TYPE_RGB:
+        spp = 3; break;
+   case PNG_COLOR_TYPE_RGB_ALPHA:
+@@ -884,10 +885,15 @@ oyImage_s *  oyImage_FromPNG         ( const char        * filename,
+                                         oyToDataType_m(pixel_layout),
+                                         0 );
+     png_byte ** array2d = (png_byte**) oyArray2d_GetData( a );
+-    int i;
++    int i,y;
+ 
++    /* both variants of libpng access appear equal */
++    if(1)
++      png_read_image( png_ptr, array2d );
++    else
+     for( i = 0; i < num_passes; ++i )
+-      png_read_rows( png_ptr, array2d, NULL, height );
++      for( y = 0; y < height; ++y )
++        png_read_row( png_ptr, array2d[y], NULL );
+ 
+     oyImage_SetData ( image_in, (oyStruct_s**) &a, 0,0,0,0,0,0 );
+   }
diff --git a/media-libs/oyranos/oyranos-0.9.0.ebuild b/media-libs/oyranos/oyranos-0.9.0.ebuild
new file mode 100644
index 000000000000..39fd9f8c7aca
--- /dev/null
+++ b/media-libs/oyranos/oyranos-0.9.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.0.ebuild,v 1.1 2012/11/04 16:28:21 xmw Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="colour management system allowing to share various settings across applications and services"
+HOMEPAGE="http://www.oyranos.org/"
+SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.4/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X doc static-libs test xinerama"
+
+RDEPEND="<app-admin/elektra-0.8.3
+	dev-libs/libxml2
+	dev-libs/yajl
+	media-gfx/exiv2
+	media-libs/lcms:0
+	media-libs/libpng:0
+	media-libs/libraw
+	>=media-libs/libXcm-0.5.1
+	X? ( x11-libs/fltk:1
+		x11-libs/libXfixes
+		x11-libs/libXrandr
+		x11-libs/libXxf86vm
+		xinerama? ( x11-libs/libXinerama ) )"
+DEPEND="${RDEPEND}
+	app-doc/doxygen
+	media-gfx/graphviz
+	test? ( media-libs/icc-profiles-basiccolor-printing2009
+		media-libs/icc-profiles-openicc )"
+
+RESTRICT="test"
+
+src_prepare() {
+	einfo remove bundled elektra yajl
+	rm -rf elektra* yajl || die
+	#keep bundled libXNVCtrl
+
+	epatch "${FILESDIR}"/${P}-buildsystem.patch
+	epatch "${FILESDIR}"/${P}-png.patch
+	epatch "${FILESDIR}"/${P}-array.patch
+
+	if ! use X ; then
+		sed -e '/FLTK_GUI =/s:=.*:=:' \
+			-i makefile.in || die
+	fi
+
+	sed -e '/^#include/s:kdb.h:elektra-kdb.h:' \
+		-i test.c test2.cpp oyranos_elektra.c || die
+}
+
+src_configure() {
+	tc-export CC CXX
+	econf --prefix=/usr \
+		--enable-verbose \
+		$(use_with X x) \
+		$(use_enable X libX11) \
+		$(use_enable X libXext) \
+		$(use_enable X libXrandr) \
+		$(use_enable X libXxf86vm) \
+		$(use_enable X fltk) \
+		$(use_enable static-libs static) \
+		$(use_enable xinerama libXinerama)
+}
+
+src_compile() {
+	emake all
+	use X && emake oforms
+	emake docu
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir=${EPREFIX}/usr/share/doc/${P} install-main
+
+	if ! use doc ; then
+		rm -rf "${ED}/usr/share/doc/${P}/html" || die
+	fi
+}