[artoolkit-commits] artoolkit Configure, 1.5, 1.6 README.txt, 1.21, 1.22

[Hartmut S. <ret...@us...>]

Update of /cvsroot/artoolkit/artoolkit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11247

Modified Files:
	Configure README.txt 
Log Message:
added GStreamer support

Index: Configure
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/Configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Configure	10 Mar 2005 04:00:22 -0000	1.5
--- Configure	30 Jun 2006 04:38:39 -0000	1.6
***************
*** 10,13 ****
--- 10,14 ----
        lib/SRC/VideoLinuxV4L lib/SRC/VideoSGI \
        lib/SRC/VideoMacOSX \
+       lib/SRC/VideoGStreamer \
        lib/SRC/ARvrml \
        util \
***************
*** 35,38 ****
--- 36,40 ----
      echo "  3: Digital Video Camcoder through IEEE 1394 (DV Format)"
      echo "  4: Digital Video Camera through IEEE 1394 (VGA NONCOMPRESSED Image Format)"
+     echo "  5: GStreamer Media Framework"
      echo -n "Enter : "
      read ANS
***************
*** 86,93 ****
              echo "Please enter y or n."
              exit 0
!         fi
! 
      else
!         echo "Please enter 1,2,3 or 4."
          exit 0
      fi
--- 88,106 ----
              echo "Please enter y or n."
              exit 0
!         fi        
!     elif [ "$ANS" = "5" ]
!     then
!         VIDEO_DRIVER="VideoGStreamer"
! 		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"
!         ARFLAG="rs"
!         RANLIB=""
!         LIBS="-lpthread -lglut -lGLU -lGL -lXi -lXmu -lX11 -lm"
!         CONFIG="AR_INPUT_GSTREAMER"
      else
!         echo "Please enter 1,2,3,4 or 5."
          exit 0
      fi

Index: README.txt
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/README.txt,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** README.txt	18 Jun 2006 23:56:29 -0000	1.21
--- README.txt	30 Jun 2006 04:38:39 -0000	1.22
***************
*** 63,67 ****
  Unpack the ARToolKit to a convenient location. The root of this location will be referred to below as {ARToolKit}:
      tar zxvf ARToolKit-2.71.3.tgz
! Configure and build. The Linux builds support video input using either Video4Linux, an IIDC-compliant or DV camera connected via IEEE-1394, or a Sony EyeToy camera connected via USB. You will be prompted as to which of the four Linux video drivers you wish to use at the Configure step.
      cd {ARToolKit}
      ./Configure
--- 63,67 ----
  Unpack the ARToolKit to a convenient location. The root of this location will be referred to below as {ARToolKit}:
      tar zxvf ARToolKit-2.71.3.tgz
! Configure and build. The Linux builds support video input using either Video4Linux, an IIDC-compliant or DV camera connected via IEEE-1394, or a Sony EyeToy camera connected via USB. Alternatively you can use GStreamer 0.10 (0.8 is not supported and also not recommended) as input method. This requires you to install the gstreamer development packages for your Linux distribution. You will be prompted as to which of the four Linux video drivers you wish to use at the Configure step.
      cd {ARToolKit}
      ./Configure
***************
*** 173,175 ****
  
  --
! EOF
\ No newline at end of file
--- 173,175 ----
  
  --
! EOF