commit ab052576b4a35e40feced46fd52452b10ed95aad Author: Piyush Khandelwal Date: Sat Oct 8 16:20:56 2011 -0500 patch for natty diff --git a/artoolkit/ARToolKit-SVN-r311.tar.gz.md5sum b/artoolkit/ARToolKit-SVN-r311.tar.gz.md5sum deleted file mode 100644 index a8d3e4c..0000000 --- a/artoolkit/ARToolKit-SVN-r311.tar.gz.md5sum +++ /dev/null @@ -1 +0,0 @@ -2f3537f782b5506133bcc79f2daba3bb ARToolKit-SVN-r311.tar.gz diff --git a/artoolkit/ARToolKit-r311-Natty.tar.gz.md5sum b/artoolkit/ARToolKit-r311-Natty.tar.gz.md5sum new file mode 100644 index 0000000..de3cf95 --- /dev/null +++ b/artoolkit/ARToolKit-r311-Natty.tar.gz.md5sum @@ -0,0 +1 @@ +309ed9213c6d12871faeed781b0c5d82 ARToolKit-r311-Natty.tar.gz diff --git a/artoolkit/Makefile b/artoolkit/Makefile index 593fded..5645476 100755 --- a/artoolkit/Makefile +++ b/artoolkit/Makefile @@ -1,11 +1,11 @@ all: installed -TARBALL = build/ARToolKit-SVN-r311.tar.gz -TARBALL_URL = https://code.ros.org/svn/release/download/thirdparty/ARToolKit-SVN-r311.tar.gz +TARBALL = build/ARToolKit-r311-Natty.tar.gz +TARBALL_URL = http://www.cs.utexas.edu/~piyushk/ARToolKit-r311-Natty.tar.gz UNPACK_CMD = tar zxf SOURCE_DIR = build/artoolkit #TARBALL_PATCH = matrix.patch -MD5SUM_FILE = ARToolKit-SVN-r311.tar.gz.md5sum +MD5SUM_FILE = ARToolKit-r311-Natty.tar.gz.md5sum include $(shell rospack find mk)/download_unpack_build.mk diff --git a/artoolkit/patch_v4l b/artoolkit/patch_v4l index 9fcd82d..d91ac25 100755 --- a/artoolkit/patch_v4l +++ b/artoolkit/patch_v4l @@ -294,3 +294,20 @@ echo " create include/AR/config.h" sed -f $SED include/AR/config.h echo "Done." + +# +# Output step 3 - Test for v4l1 +# Figure out if linux/videodev.h +# + +cat > .test.h << EOM +#include +EOM +if gcc -E .test.h +then + echo '#define HAVE_CAMV4L 1' > include/AR/v4l-config.h +else + echo '#ifdef HAVE_CAMV4L' > include/AR/v4l-config.h + echo ' #undef HAVE_CAMV4L' >> include/AR/v4l-config.h + echo '#endif' >> include/AR/v4l-config.h +fi