File cinepaint-0.25-oyranos_header.patch of Package cinepaint

Overview Repositories Revisions Requests Users Attributes Meta

File cinepaint-0.25-oyranos_header.patch of Package cinepaint (Revision 016804aee960ec41d816ce7a7fcaaf5e)

Currently displaying revision 016804aee960ec41d816ce7a7fcaaf5e , Show latest

diff -ur cinepaint-0.25.0/plug-ins/jpeg/iccjpeg.c ./plug-ins/jpeg/iccjpeg.c
--- cinepaint-0.25.0/plug-ins/jpeg/iccjpeg.c	2008-06-09 18:14:28.000000000 +0200
+++ ./plug-ins/jpeg/iccjpeg.c	2008-12-30 13:11:38.000000000 +0100
@@ -19,12 +19,16 @@
 
 #include "iccjpeg.h"
 #include <stdlib.h>			/* define malloc() */
-# if HAVE_OY
+
+#if HAVE_OY
+# if OYRANOS_NVERSION > 107
+#include <oyranos.h>
+# else
 #include <oyranos/oyranos.h>
 # endif
-
-#ifndef OYRANOS_VERSION
-#define OYRANOS_VERSION 0
+# ifndef OYRANOS_VERSION
+# define OYRANOS_VERSION 0
+# endif
 #endif
 
 /*
diff -ur cinepaint-0.25.0/plug-ins/pdf/pdf.cpp ./plug-ins/pdf/pdf.cpp
--- cinepaint-0.25.0/plug-ins/pdf/pdf.cpp	2008-10-10 07:33:07.000000000 +0200
+++ ./plug-ins/pdf/pdf.cpp	2008-12-30 13:12:27.000000000 +0100
@@ -47,8 +47,16 @@
 #include "lib/wire/libtile.h"
 #include "plugin_pdb.h"
 #include "libgimp/stdplugins-intl.h"
-#ifdef HAVE_OY
+
+#if HAVE_OY
+# if OYRANOS_NVERSION > 107
+#include <oyranos.h>
+# else
 #include <oyranos/oyranos.h>
+# endif
+# ifndef OYRANOS_VERSION
+# define OYRANOS_VERSION 0
+# endif
 #endif
 }
 
diff -ur cinepaint-0.25.0/plug-ins/tiff/tiff.c ./plug-ins/tiff/tiff.c
--- cinepaint-0.25.0/plug-ins/tiff/tiff.c	2007-05-11 14:58:30.000000000 +0200
+++ ./plug-ins/tiff/tiff.c	2008-12-30 13:12:16.000000000 +0100
@@ -168,8 +168,15 @@
 #include "info.h"
 #include "gui.h"
 
-#ifdef HAVE_OY
+#if HAVE_OY
+# if OYRANOS_NVERSION > 107
+#include <oyranos.h>
+# else
 #include <oyranos/oyranos.h>
+# endif
+# ifndef OYRANOS_VERSION
+# define OYRANOS_VERSION 0
+# endif
 #endif
 
 /*** struct definitions ***/
diff -ur cinepaint-0.25.0/configure.in ./configure.in
--- cinepaint-0.25.0/configure.in	2008-12-16 10:53:39.000000000 +0100
+++ ./configure.in	2008-12-30 13:07:53.000000000 +0100
@@ -478,21 +478,17 @@
   fi
 
 dnl Test for Oyranos; beku
-dnl  AC_PATH_PROG(OY_CONFIG, [$PKG_CONFIG oyranos_monitor --exists], no)
   AC_PATH_PROG(OY_CONFIG, oyranos-config, no)
     if test "x$OY_CONFIG" != "xno"; then
+        OYRANOS="`$OY_CONFIG --version`"
+        OYRANOS_NVERSION="`$OY_CONFIG --num-version`"
         pkg-config --exists oyranos_monitor
         if test $? -eq 0; then
           OYRANOS_LIBS="-DHAVE_OY `$OY_CONFIG --ld_x_flags | sed  s/-O.\//`"
         else
           OYRANOS_LIBS="-DHAVE_OY `$OY_CONFIG --ldflags | sed  s/-O.\//`"
         fi
-        OYRANOS_CFLAGS="-DHAVE_OY `$OY_CONFIG --cflags | sed  s/-O.\//`"
-        OYRANOS="`$OY_CONFIG --version`"
-dnl     OY_CONFIG="$PKG_CONFIG oyranos_monitor"
-dnl     OYRANOS_LIBS="-DHAVE_OY `$OY_CONFIG --libs`"
-dnl     OYRANOS_CFLAGS="-DHAVE_OY `$OY_CONFIG --cflags`"
-dnl     OYRANOS="`$OY_CONFIG --modversion`"
+        OYRANOS_CFLAGS="-DHAVE_OY -DOYRANOS_NVERSION=$OYRANOS_NVERSION `$OY_CONFIG --cflags | sed  s/-O.\//`"
     else
       AC_MSG_WARN([
 *** Check for oyranos-config failed.
@@ -795,6 +791,7 @@
 AC_SUBST(OPENEXR_LIBS)
 AC_SUBST(OPENEXR_INCLUDES)
 AC_SUBST(OYRANOS)
+AC_SUBST(OYRANOS_NVERSION)
 AC_SUBST(OYRANOS_CFLAGS)
 AC_SUBST(OYRANOS_LIBS)
 AC_SUBST(LIBJPEG_LIB)

Places

File cinepaint-0.25-oyranos_header.patch of Package cinepaint (Revision 016804aee960ec41d816ce7a7fcaaf5e)

Places