diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-11-29 11:39:14 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-11-29 11:39:14 +0100 |
| commit | 5057309e51cdc94325bbc2f9a0a171092a6f9cd0 (patch) | |
| tree | c60410e45dc26920fcc153478ee48322322547c7 /packages/opencv/artoolkit | |
| parent | 98907e530ca8f0860f8be6bb7028a97391b1061e (diff) | |
artoolkit: add 2.72.1
Diffstat (limited to 'packages/opencv/artoolkit')
| -rw-r--r-- | packages/opencv/artoolkit/configure.diff | 53 | ||||
| -rw-r--r-- | packages/opencv/artoolkit/paddle.diff | 12 |
2 files changed, 65 insertions, 0 deletions
diff --git a/packages/opencv/artoolkit/configure.diff b/packages/opencv/artoolkit/configure.diff new file mode 100644 index 0000000000..979e356578 --- /dev/null +++ b/packages/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/packages/opencv/artoolkit/paddle.diff b/packages/opencv/artoolkit/paddle.diff new file mode 100644 index 0000000000..6e181f51c9 --- /dev/null +++ b/packages/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); |