From 023be7d6d9f6c8373b2fa35229ea264a785276c5 Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Sat, 27 Jan 2007 21:38:38 +0000 Subject: xaos: add 3.2.2, compiles but cannot find drivers when run --- packages/xaos/.mtn2git_empty | 0 packages/xaos/files/.mtn2git_empty | 0 packages/xaos/files/fix-aalib-configure.patch | 81 +++++++++++++++++++++++++++ packages/xaos/files/fix-build.patch | 61 ++++++++++++++++++++ packages/xaos/xaos_3.2.3.bb | 30 ++++++++++ 5 files changed, 172 insertions(+) create mode 100644 packages/xaos/.mtn2git_empty create mode 100644 packages/xaos/files/.mtn2git_empty create mode 100644 packages/xaos/files/fix-aalib-configure.patch create mode 100644 packages/xaos/files/fix-build.patch create mode 100644 packages/xaos/xaos_3.2.3.bb diff --git a/packages/xaos/.mtn2git_empty b/packages/xaos/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xaos/files/.mtn2git_empty b/packages/xaos/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xaos/files/fix-aalib-configure.patch b/packages/xaos/files/fix-aalib-configure.patch new file mode 100644 index 0000000000..120d85b6fe --- /dev/null +++ b/packages/xaos/files/fix-aalib-configure.patch @@ -0,0 +1,81 @@ +Index: XaoS-3.2.3/configure.in +=================================================================== +--- XaoS-3.2.3.orig/configure.in ++++ XaoS-3.2.3/configure.in +@@ -130,25 +130,7 @@ if test -z "`${CC-cc} -mno-ieee-fp -c co + rm -f conftest* + ])]) + +-AC_DEFUN(AC_PROG_AALIB_VER_OK, +-[AC_CACHE_CHECK(whether aalib version >= 1.4, ac_aalib_ver_ok, +-[echo '#include +-#include +-void f(){ +-#if AA_LIB_VERSIONCODE < 104000 +-#error aa_lib is probably buggy +-/* I am using SuSE 7.3 and 8.0. Both contains version 1.3, +- * however they report 102000 version code. +- */ +-#endif +-}' > conftest.c +-if test -z "`${CC-cc} -c conftest.c 2>&1`"; then +- ac_aalib_ver_ok=yes +- else +- ac_aalib_ver_ok=no +- fi +- rm -f conftest* +-])]) ++ac_aalib_ver_ok=yes + + AC_DEFUN(PROG_CC_SWITCH1, + [AC_CACHE_CHECK(whether ${CC-cc} accepts -$1, ac_$2, +@@ -478,7 +460,6 @@ AC_DEFUN(AC_AALIB, [ + AC_CHECK_LIB(aa, aa_init) + if test "x$ac_cv_lib_aa_aa_init" = xyes; then + AC_MSG_RESULT(Found aalib on $1/aalib.h) +- AC_PROG_AALIB_VER_OK + if test $ac_aalib_ver_ok = yes; then + #LIBS="$LIBS $2" + x11_linked=yes +@@ -616,22 +597,22 @@ if test "$aa_driver_test" = yes; then + dnl Replace `main' with a function in -lm: + AC_CHECK_LIB(slang, SLsmg_init_smg) + +- AC_NCURSES(/usr/include, ncurses.h, , -I/usr/include/ncurses , "ncurses on /usr/include") +- AC_NCURSES(/usr/include/ncurses, ncurses.h, , -I/usr/include/ncurses, "ncurses on /usr/include/ncurses") +- AC_NCURSES(/usr/local/include, ncurses.h, ,-L/usr/local/lib, -I/usr/local/include, "ncurses on /usr/local") +- AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, ncurses.h, , -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses , "ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, ncurses.h, , -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, "ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, ncurses.h, ,-L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, "ncurses on /usr/local") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, ncurses.h, -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib/ncurses, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, "ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses") + +- AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, curses.h, -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses") + +- AC_NCURSES(/usr/include/ncurses, curses.h, , -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses") +- AC_CURSES(/usr/include, curses.h, , , "curses on /usr/include") ++ AC_NCURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses, curses.h, , -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/ncurses") ++ AC_CURSES(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, curses.h, , , "curses on /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include") + + dnl + dnl We couldn't find ncurses, try SysV curses + dnl + if $search_ncurses + then +- AC_EGREP_HEADER(init_color, /usr/include/curses.h, ++ AC_EGREP_HEADER(init_color, /home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include/curses.h, + AC_USE_SYSV_CURSES) + fi + +@@ -653,8 +634,8 @@ if test "$aa_driver_test" = yes; then + LIBS="$LIBS $X_EXTRA_LIBS $X_LIBS" + CFLAGS="$CFLAGS $X_CFLAGS" + fi +- AC_AALIB(/usr/include, , ) +- AC_AALIB(/usr/local/include, -L/usr/local/lib, -I/usr/local/include) ++ AC_AALIB(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, , ) ++ AC_AALIB(/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include, -L/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/lib, -I/home/papercrane/oe/oz354.build/tmp/staging/arm-linux/include) + for name in ../aalib-*.* + do + AC_AALIB($name,"-L$name","-I$name") diff --git a/packages/xaos/files/fix-build.patch b/packages/xaos/files/fix-build.patch new file mode 100644 index 0000000000..064c0fb853 --- /dev/null +++ b/packages/xaos/files/fix-build.patch @@ -0,0 +1,61 @@ +Index: XaoS-3.2.3/src/util/xstdio.c +=================================================================== +--- XaoS-3.2.3.orig/src/util/xstdio.c ++++ XaoS-3.2.3/src/util/xstdio.c +@@ -1,3 +1,4 @@ ++#define DATAPATH "/usr/share/XaoS" + #ifndef _plan9_ + #include + #if defined(__EMX__) || defined(__APPLE__) +Index: XaoS-3.2.3/src/engine/formulas.c +=================================================================== +--- XaoS-3.2.3.orig/src/engine/formulas.c ++++ XaoS-3.2.3/src/engine/formulas.c +@@ -69,6 +69,8 @@ + #endif + + ++#include "../include/complex.h" ++ + CONST char *CONST incolorname[] = { + "0", + "zmag", +Index: XaoS-3.2.3/src/engine/plane.c +=================================================================== +--- XaoS-3.2.3.orig/src/engine/plane.c ++++ XaoS-3.2.3/src/engine/plane.c +@@ -53,6 +53,8 @@ CONST char *CONST planename[] = { + }; + + ++#include "../include/complex.h" ++ + REGISTERS (3) + void recalculate (int plane, number_t * x1, number_t * y1) + { +Index: XaoS-3.2.3/src/engine/fractal.c +=================================================================== +--- XaoS-3.2.3.orig/src/engine/fractal.c ++++ XaoS-3.2.3/src/engine/fractal.c +@@ -66,6 +66,8 @@ + #endif + #include + ++#include "../include/complex.h" ++ + struct symetryinfo2 cursymetry; + struct palette cpalette; + struct image cimage; +Index: XaoS-3.2.3/src/engine/zoom.c +=================================================================== +--- XaoS-3.2.3.orig/src/engine/zoom.c ++++ XaoS-3.2.3/src/engine/zoom.c +@@ -69,6 +69,8 @@ + #define gettext(STRING) STRING + #endif + ++#include "../include/complex.h" ++ + #define ASIZE 16 + #define ALIGN(x) (((x)+ASIZE-1)&(~(ASIZE-1))) + static int nsymetrized; diff --git a/packages/xaos/xaos_3.2.3.bb b/packages/xaos/xaos_3.2.3.bb new file mode 100644 index 0000000000..b59cb62686 --- /dev/null +++ b/packages/xaos/xaos_3.2.3.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "GNU XaoS, a realtime fractal generator zoomer" +HOMEPAGE = "http://wmi.math.u-szeged.hu/xaos/doku.php" +SECTION = "graphics" +LICENSE = "GPLv2" +MAINTAINER = "Justin Patrin " +DEPENDS = "aalib x11 zlib libpng" +RDEPENDS += "libxxf86dga1" +PR = "r0" + +SRC_URI = "http://easynews.dl.sourceforge.net/sourceforge/xaos/XaoS-3.2.3.tar.gz \ + file://fix-build.patch;patch=1 \ + file://fix-aalib-configure.patch;patch=1" + +S = "${WORKDIR}/XaoS-${PV}" + +inherit autotools + +EXTRA_OECONF = "--disable-nls" +#--with-x --with-ncurses=${STAGING_INCDIR} --with-dga-driver=no --with-x11-driver=no --with-aa-driver=yes + +do_configure_prepend() { + sed -i 's~/usr/include~${STAGING_INCDIR}~' ${S}/configure.in + sed -i 's~/usr/local/include~${STAGING_INCDIR}~' ${S}/configure.in + sed -i 's~/usr/lib~${STAGING_LIBDIR}~' ${S}/configure.in + sed -i 's~/usr/local/lib~${STAGING_LIBDIR}~' ${S}/configure.in +} + +FILES_${PN} = "${bindir} ${datadir}/XaoS/catalogs" + +CFLAGS = "-L${STAGING_LIBDIR}" -- cgit 1.2.3-korg