diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
| commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
| tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/opencv/artoolkit | |
| parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) | |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/opencv/artoolkit')
| -rw-r--r-- | recipes/opencv/artoolkit/configure.diff | 53 | ||||
| -rw-r--r-- | recipes/opencv/artoolkit/paddle.diff | 12 |
2 files changed, 65 insertions, 0 deletions
diff --git a/recipes/opencv/artoolkit/configure.diff b/recipes/opencv/artoolkit/configure.diff new file mode 100644 index 0000000000..979e356578 --- /dev/null +++ b/recipes/opencv/artoolkit/configure.diff @@ -0,0 +1,53 @@ +--- /tmp/Configure 2008-11-28 23:58:06.000000000 +0100 ++++ ARToolKit/Configure 2008-11-28 23:59:59.000000000 +0100 +@@ -55,8 +55,7 @@ + exit 0 + fi + VIDEO_DRIVER="VideoLinuxV4L" +- CFLAG="-O -I/usr/X11R6/include" +- LDFLAG="-L/usr/X11R6/lib" ++ CFLAG="-O " + ARFLAG="rs" + RANLIB="" + LIBS="-lglut -lGLU -lGL -lXi -lXmu -lX11 -lm" +@@ -78,8 +77,7 @@ + exit 0 + fi + VIDEO_DRIVER="VideoLinuxV4L" +- CFLAG="-O -I/usr/X11R6/include -DUSE_EYETOY" +- LDFLAG="-L/usr/X11R6/lib" ++ CFLAG="-O -DUSE_EYETOY" + ARFLAG="rs" + RANLIB="" + LIBS="-lglut -lGLU -lGL -lXi -lXmu -lX11 -lm -ljpeg" +@@ -87,8 +85,7 @@ + elif [ "$ANS" = "3" ] + then + VIDEO_DRIVER="VideoLinuxDV" +- CFLAG="-O -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include" +- LDFLAG="-L/usr/X11R6/lib -L/usr/local/lib" ++ CFLAG="-O " + ARFLAG="rs" + RANLIB="" + LIBS="-lraw1394 -ldv -lpthread -lglut -lGLU -lGL -lXi -lXmu -lX11 -lm" +@@ -96,8 +93,7 @@ + elif [ "$ANS" = "4" ] + then + VIDEO_DRIVER="VideoLinux1394Cam" +- CFLAG="-O -I/usr/X11R6/include" +- LDFLAG="-L/usr/X11R6/lib" ++ CFLAG="-O " + ARFLAG="rs" + RANLIB="" + LIBS="-lglut -lGLU -lGL -lXi -lXmu -lX11 -lm -lraw1394 -ldc1394_control" +@@ -108,8 +104,8 @@ + GST_INCLUDE=`pkg-config --cflags gstreamer-0.10` + GST_LIBS=`pkg-config --libs gstreamer-0.10` + +- CFLAG="-O $GST_INCLUDE -I/usr/X11R6/include" +- LDFLAG="$GST_LIBS -L/usr/X11R6/lib -L/usr/local/lib" ++ CFLAG="-O $GST_INCLUDE " ++ LDFLAG="$GST_LIBS " + ARFLAG="rs" + RANLIB="" + LIBS="-lpthread -lglut -lGLU -lGL -lXi -lX11 -lm" diff --git a/recipes/opencv/artoolkit/paddle.diff b/recipes/opencv/artoolkit/paddle.diff new file mode 100644 index 0000000000..6e181f51c9 --- /dev/null +++ b/recipes/opencv/artoolkit/paddle.diff @@ -0,0 +1,12 @@ +--- /tmp/paddleDemo.c 2008-11-29 11:12:11.000000000 +0100 ++++ ARToolKit/examples/paddleDemo/paddleDemo.c 2008-11-29 11:12:27.000000000 +0100 +@@ -54,9 +54,6 @@ + GLfloat lightZeroColor[] = {0.9, 0.9, 0.9, 0.1}; + + +-PaddleItemInfo myPaddleItem; +-ItemList myListItem; +- + static int draw_paddle( ARPaddleInfo *paddleInfo, PaddleItemInfo *myPaddleItem); + static void init(void); + static void cleanup(void); |