graphics/oyranos: Updated for version 0.4.0.

This version also adds a new dependency on yajl.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
Willy Sudiarto Raharjo 2012-09-20 07:36:34 +07:00 committed by Robby Workman
parent fc467c2bde
commit 6e99c96d47
6 changed files with 58 additions and 6 deletions

View file

@ -0,0 +1,10 @@
--- oyranos-0.4.0/configure_tests.sh 2012-03-10 19:28:12.016514261 +0100
+++ oyranos-0.4.0/configure_tests.sh.new 2012-03-10 19:30:04.230678948 +0100
@@ -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/-Wl[^ ]*//g ; s/-O.// ; s/-isysroot [[:graph:]]*// ; s/-arch ppc// ; s/-arch i386//'
mkdir -p tests

View file

@ -0,0 +1,11 @@
--- oyranos-0.4.0/makefile.in 2012-02-23 17:07:13.000000000 +0100
+++ oyranos-0.4.0/makefile.in.a 2012-03-15 13:02:20.492272906 +0100
@@ -999,7 +999,7 @@
OY_MODULE_PATHS=. LD_LIBRARY_PATH=./:$(libdir):$${LD_LIBRARY_PATH} tests/test_oyranos
examples: all
- cd examples && ($(MAKE) clean; PATH="$(PATH):$(bindir):.." LD_LIBRARY_PATH=./:$(libdir):$${LD_LIBRARY_PATH} PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(DESTDIR)$(libdir)/pkgconfig:.." INCLUDE="-I$(includedir) -I$(SRCDIR) -I../ -I$(SRCDIR)/$(GENDIR)" SRCDIR=$(SRCDIR)/examples/ CFLAGS="$(CFLAGS)" LIBS="-L$(libdir) -L../" intl="$(intl)" $(MAKE))
+ cd examples && ($(MAKE) clean; PATH="$(PATH):$(bindir):.." LD_LIBRARY_PATH=./:$(libdir):$${LD_LIBRARY_PATH} PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(DESTDIR)$(libdir)/pkgconfig:.." INCLUDE="-I$(includedir) -I$(SRCDIR) -I../ -I$(SRCDIR)/$(GENDIR)" SRCDIR=$(SRCDIR)/examples/ CFLAGS="$(CFLAGS)" LIBS="-L../ -L$(libdir)" intl="$(intl)" $(MAKE))
oforms: all $(LIB_FORMS_FLTK_NAME)
cd oforms && (PATH="$(PATH):$(bindir):.." LD_LIBRARY_PATH=./:$(libdir):$${LD_LIBRARY_PATH} PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(DESTDIR)$(libdir)/pkgconfig:.." CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" INCLUDE="-I$(includedir) -I$(SRCDIR) -I../ -I$(SRCDIR)/$(GENDIR)" SRCDIR=$(SRCDIR)/oforms/ LDFLAGS="-L../ $(intl) $(LDFLAGS)" $(MAKE) -f oyranos_xforms.makefile)

View file

@ -2,9 +2,10 @@
# Slackware build script for xcm
# Written by Diogo Leal (diogo@diogoleal.com)
# Modified by Willy Sudiarto Raharjo <willysr@slackware-id.org>
PRGNAM=oyranos
VERSION=${VERSION:-0.3.1}
VERSION=${VERSION:-0.4.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@ -41,7 +42,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvfz $CWD/$PRGNAM-$VERSION.tar.gz
tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
cd $PRGNAM-$VERSION
chown -R root:root .
find . \
@ -50,6 +51,11 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
patch -p1 < $CWD/configure_tests.patch
patch -p1 < $CWD/makefile.in.patch
patch -p1 < $CWD/oyranos_file.cpp.patch
patch -p1 < $CWD/qcmsevents.cpp.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \

View file

@ -1,10 +1,10 @@
PRGNAM="oyranos"
VERSION="0.3.1"
VERSION="0.4.0"
HOMEPAGE="http://www.oyranos.org/"
DOWNLOAD="http://downloads.sourceforge.net/oyranos/oyranos-0.3.1.tar.gz"
MD5SUM="5c88985801f6b3c097cef50a93970e38"
DOWNLOAD="http://downloads.sourceforge.net/oyranos/oyranos-0.4.0.tar.bz2"
MD5SUM="4ec2c728c5ca7d450c47d95405de3ade"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="fltk"
REQUIRES="fltk yajl"
MAINTAINER="Diogo Leal"
EMAIL="diogo@diogoleal.com"

View file

@ -0,0 +1,11 @@
--- oyranos-0.4.0/examples/libraw/oyranos_file.cpp 2012-03-10 20:39:13.754934907 +0100
+++ oyranos-0.4.0/examples/libraw/oyranos_file.cpp.new 2012-03-10 20:39:18.317895815 +0100
@@ -15,7 +15,7 @@
*/
/* c++ -Wall -g oyranos_file.cpp `pkg-config --cflags --libs oyranos` -o oyranos-file */
-#include <alpha/oyranos_alpha.h>
+#include <oyranos_alpha.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>

View file

@ -0,0 +1,14 @@
--- oyranos-0.4.0/examples/xcmsevents/qcmsevents.cpp 2012-05-02 21:58:50.309004915 +0200
+++ oyranos-0.4.0/examples/xcmsevents/qcmsevents.cpp.new 2012-05-02 21:58:32.533739653 +0200
@@ -118,8 +118,8 @@
else if (XCME_MSG_DISPLAY_STATUS)
{
int i;
- if(strstr(text, "atom: \""XCM_COLOR_DESKTOP"\":"))
- sscanf( text, "atom: \""XCM_COLOR_DESKTOP"\": %d %d", &i, &pid );
+ if(strstr(text, "atom: \"" XCM_COLOR_DESKTOP "\":"))
+ sscanf( text, "atom: \"" XCM_COLOR_DESKTOP "\": %d %d", &i, &pid );
if(pid == 0)
{
colour.setHsvF( 0.6, 0.4, 0.9 );