diff --git a/INSTALL b/INSTALL index 0f7a5004..2acb8ea0 100644 --- a/INSTALL +++ b/INSTALL @@ -43,20 +43,28 @@ FreeJ installation instructions :: INSTALL FROM DEBIAN PACKAGES You can do 'apt-get install freej' and you will have a precompiled FreeJ + Anyway to squeeze the best out of your box you want to compile this software with machine specific optimizations! + The source configure script guesses the best compiler optimization flags for your CPU. +the following commands are then necessary to set your build environment, +from inside the freej source directory do: + +sudo apt-get install autoconf automake1.9 +sudo apt-get build-dep freej +dpkg-buildpackage -rfakeroot If you have problems, you are welcome to ask on the mailinglist for -help, there you will probably find somebody to help you. +help, there you will probably find some good suggestions -Please try to not mix your problems with FreeJ's bugs. +Please try to not mix your system's problems with FreeJ's bugs. If you find bugs, you are welcome to report them in the bugtracking system on http://bugs.dyne.org -$Id$ +-jrml diff --git a/Makefile.am b/Makefile.am index b658a31c..b624c144 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,4 +11,4 @@ dist_pkgdata_DATA = \ #pkgdatadir = ${prefix}/share/freej -SUBDIRS = lib src py scripts +SUBDIRS = lib src bindings scripts diff --git a/py/Makefile.am b/bindings/Makefile.am similarity index 98% rename from py/Makefile.am rename to bindings/Makefile.am index f3c2a840..8750af8b 100644 --- a/py/Makefile.am +++ b/bindings/Makefile.am @@ -18,7 +18,7 @@ pkgpython_instdir = $(pythondir) pkgpython_inst_PYTHON = freej.pth -freej_py.cpp: +freej_py.cpp: freej.i swig -I../src/include/ -python -threads -c++ -shadow -O -o freej_py.cpp freej.i # lib_LTLIBRARIES = libfreej_py.la diff --git a/py/Makefile.ruby b/bindings/Makefile.ruby similarity index 100% rename from py/Makefile.ruby rename to bindings/Makefile.ruby diff --git a/py/Makefile.static b/bindings/Makefile.static similarity index 100% rename from py/Makefile.static rename to bindings/Makefile.static diff --git a/py/freej.i b/bindings/freej.i similarity index 100% rename from py/freej.i rename to bindings/freej.i diff --git a/py/freej.pth b/bindings/freej.pth similarity index 100% rename from py/freej.pth rename to bindings/freej.pth diff --git a/py/luapost.i b/bindings/luapost.i similarity index 100% rename from py/luapost.i rename to bindings/luapost.i diff --git a/py/pypost.i b/bindings/pypost.i similarity index 100% rename from py/pypost.i rename to bindings/pypost.i diff --git a/py/pypre.i b/bindings/pypre.i similarity index 100% rename from py/pypre.i rename to bindings/pypre.i diff --git a/py/rbpost.i b/bindings/rbpost.i similarity index 100% rename from py/rbpost.i rename to bindings/rbpost.i diff --git a/py/test.lua b/bindings/test.lua similarity index 100% rename from py/test.lua rename to bindings/test.lua diff --git a/py/test.rb b/bindings/test.rb similarity index 100% rename from py/test.rb rename to bindings/test.rb diff --git a/configure.in b/configure.in index 095a5d5a..1229ab4a 100644 --- a/configure.in +++ b/configure.in @@ -664,7 +664,7 @@ lib/frei0r/generator/lissajous0r/Makefile lib/frei0r/generator/nois0r/Makefile lib/frei0r/generator/onecol0r/Makefile lib/frei0r/generator/partik0l/Makefile -py/Makefile +bindings/Makefile scripts/Makefile ]) diff --git a/debian/control b/debian/control index cd081841..b80b3725 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Guido Trotter Uploaders: Luca Bigliardi , Denis Rojo -Build-Depends: c++-compiler, libtool, debhelper (>> 5.0.0), flex, bison, libsdl-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev, dpatch, libogg-dev, libvorbis-dev, libjpeg-dev, libslang2-dev, libtheora-dev, libavcodec-dev, libavformat-dev, libbluetooth-dev, fftw3-dev, libjack-dev, libasound-dev, libhtml-template-perl, python-devel, swig +Build-Depends: c++-compiler, libtool, debhelper (>> 5.0.0), flex, bison, libsdl-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev, dpatch, libogg-dev, libvorbis-dev, libjpeg-dev, libslang2-dev, libtheora-dev, libavcodec-dev, libavformat-dev, libswscale-dev, libbluetooth-dev, fftw3-dev, libjack-dev, libasound-dev, libhtml-template-perl, python-dev, swig Standards-Version: 3.8.0.1 diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index b3162633..00000000 --- a/debian/patches/00list +++ /dev/null @@ -1 +0,0 @@ -01-js_scripts_interpreter.dpatch diff --git a/debian/patches/01-js_scripts_interpreter.dpatch b/debian/patches/01-js_scripts_interpreter.dpatch deleted file mode 100755 index a7824dc9..00000000 --- a/debian/patches/01-js_scripts_interpreter.dpatch +++ /dev/null @@ -1,23 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01-js_scripts_interpreter.dpatch by Luca Bigliardi -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix javascript scripts interpreter path - -@DPATCH@ -diff -urNad freej-0.10~/scripts/pan.js freej-0.10/scripts/pan.js ---- freej-0.10~/scripts/pan.js 2008-06-12 21:30:03.000000000 +0100 -+++ freej-0.10/scripts/pan.js 2008-06-12 21:31:02.000000000 +0100 -@@ -1,4 +1,3 @@ --#!/usr/local/bin/freej -j - /* FreeJ example scripts - * (c) Copyright 2005 Christoph Rudorff aka MrGoil - * -diff -urNad freej-0.10~/scripts/pan_joy.js freej-0.10/scripts/pan_joy.js ---- freej-0.10~/scripts/pan_joy.js 2008-06-12 21:30:03.000000000 +0100 -+++ freej-0.10/scripts/pan_joy.js 2008-06-12 21:31:07.000000000 +0100 -@@ -1,4 +1,3 @@ --#!/usr/local/bin/freej -j - /* FreeJ example scripts - * (c) Copyright 2007 Christoph Rudorff aka MrGoil - * diff --git a/debian/rules b/debian/rules index 80792e26..964c2948 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,7 @@ endif config.status: configure dh_testdir # Add here commands to configure the package. - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-opengl build: patch-stamp build-stamp diff --git a/m4/ruby.m4 b/m4/ruby.m4 new file mode 100644 index 00000000..39839206 --- /dev/null +++ b/m4/ruby.m4 @@ -0,0 +1,105 @@ +dnl Thank you very much Vim for this lovely ruby configuration +dnl The hitchhiked code is from Vim configure.in version 1.98 + + +AC_DEFUN([EL_CONFIG_SCRIPTING_RUBY], +[ +AC_MSG_CHECKING([for Ruby]) + +CONFIG_SCRIPTING_RUBY_WITHVAL="no" +CONFIG_SCRIPTING_RUBY="no" + +EL_SAVE_FLAGS + +AC_ARG_WITH(ruby, + [ --with-ruby enable Ruby support], + [CONFIG_SCRIPTING_RUBY_WITHVAL="$withval"]) + +if test "$CONFIG_SCRIPTING_RUBY_WITHVAL" != no; then + CONFIG_SCRIPTING_RUBY="yes" +fi + +AC_MSG_RESULT($CONFIG_SCRIPTING_RUBY) + +if test "$CONFIG_SCRIPTING_RUBY" = "yes"; then + if test -d "$CONFIG_SCRIPTING_RUBY_WITHVAL"; then + RUBY_PATH="$CONFIG_SCRIPTING_RUBY_WITHVAL:$PATH" + else + RUBY_PATH="$PATH" + fi + + AC_PATH_PROG(CONFIG_SCRIPTING_RUBY, ruby, no, $RUBY_PATH) + if test "$CONFIG_SCRIPTING_RUBY" != "no"; then + + AC_MSG_CHECKING(Ruby version) + if $CONFIG_SCRIPTING_RUBY -e 'exit((VERSION or RUBY_VERSION) >= "1.6.0")' >/dev/null 2>/dev/null; then + ruby_version=`$CONFIG_SCRIPTING_RUBY -e 'puts "#{VERSION rescue RUBY_VERSION}"'` + AC_MSG_RESULT($ruby_version) + + AC_MSG_CHECKING(for Ruby header files) + rubyhdrdir=`$CONFIG_SCRIPTING_RUBY -r mkmf -e 'print Config::CONFIG[["archdir"]] || $hdrdir' 2>/dev/null` + + if test "X$rubyhdrdir" != "X"; then + AC_MSG_RESULT($rubyhdrdir) + RUBY_CFLAGS="-I$rubyhdrdir" + rubylibs=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[["LIBS"]]'` + + if test "X$rubylibs" != "X"; then + RUBY_LIBS="$rubylibs" + fi + + librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[["LIBRUBYARG"]])'` + + if test -f "$rubyhdrdir/$librubyarg"; then + librubyarg="$rubyhdrdir/$librubyarg" + + else + rubylibdir=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config.expand(Config::CONFIG[["libdir"]])'` + if test -f "$rubylibdir/$librubyarg"; then + librubyarg="$rubylibdir/$librubyarg" + elif test "$librubyarg" = "libruby.a"; then + dnl required on Mac OS 10.3 where libruby.a doesn't exist + librubyarg="-lruby" + else + librubyarg=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e "print '$librubyarg'.gsub(/-L\./, %'-L#{Config.expand(Config::CONFIG[\"libdir\"])}')"` + fi + fi + + if test "X$librubyarg" != "X"; then + RUBY_LIBS="$librubyarg $RUBY_LIBS" + fi + + rubyldflags=`$CONFIG_SCRIPTING_RUBY -r rbconfig -e 'print Config::CONFIG[["LDFLAGS"]]'` + if test "X$rubyldflags" != "X"; then + LDFLAGS="$rubyldflags $LDFLAGS" + fi + + LIBS="$RUBY_LIBS $LIBS" + CFLAGS="$RUBY_CFLAGS $CFLAGS" + CPPFLAGS="$CPPFLAGS $RUBY_CFLAGS" + + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[ruby_init();]])],[CONFIG_SCRIPTING_RUBY=yes],[CONFIG_SCRIPTING_RUBY=no]) + else + AC_MSG_RESULT([Ruby header files not found]) + fi + else + AC_MSG_RESULT(too old; need Ruby version 1.6.0 or later) + fi + fi +fi + +EL_RESTORE_FLAGS + +if test "$CONFIG_SCRIPTING_RUBY" != "yes"; then + if test -n "$CONFIG_SCRIPTING_RUBY_WITHVAL" && + test "$CONFIG_SCRIPTING_RUBY_WITHVAL" != no; then + AC_MSG_ERROR([Ruby not found]) + fi +else + EL_CONFIG(CONFIG_SCRIPTING_RUBY, [Ruby]) + + LIBS="$LIBS $RUBY_LIBS" + AC_SUBST(RUBY_CFLAGS) + AC_SUBST(RUBY_LIBS) +fi +]) diff --git a/py/test.py b/scripts/python/test.py similarity index 100% rename from py/test.py rename to scripts/python/test.py diff --git a/src/freej.cpp b/src/freej.cpp index 205a8dfa..a82856c3 100644 --- a/src/freej.cpp +++ b/src/freej.cpp @@ -258,7 +258,7 @@ int main (int argc, char **argv) { Layer *lay = NULL; notice("%s version %s free the veejay",PACKAGE,VERSION); - act("2001-2007 RASTASOFT :: freej.dyne.org"); + act("2001-2008 RASTASOFT :: freej.dyne.org"); act("----------------------------------------------"); cmdline(argc,argv); @@ -372,7 +372,5 @@ int main (int argc, char **argv) { // freej.close(); - jsleep(1,0); - exit(1); }