Update of /cvsroot/playerstage/code/player
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32041
Modified Files:
acinclude.m4
Log Message:
Apllied patches
[ 1874354 ] camera1394 fixes and Mac OS X support
[ 1875070 ] camera1394: allow setting of ISO speed
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/playerstage/code/player/acinclude.m4,v
retrieving revision 1.150
retrieving revision 1.151
diff -C2 -d -r1.150 -r1.151
*** acinclude.m4 18 Dec 2007 05:05:08 -0000 1.150
--- acinclude.m4 28 Jan 2008 04:56:22 -0000 1.151
***************
*** 164,182 ****
dnl Check to see if we have version 1 or 2 API for dc1394
!
AC_CHECK_HEADER(dc1394/control.h,[PLAYER_ADD_DRIVER([camera1394],[yes],["libraw1394/raw1394.h
dc1394/control.h"],[],["-lraw1394 -ldc1394"])],
! [PLAYER_ADD_DRIVER([camera1394],[yes],["libraw1394/raw1394.h
libdc1394/dc1394_control.h"],[],["-lraw1394 -ldc1394_control"])])
!
! dnl libdc1394 has varying API's, depending on the version. Do some checks
dnl to see what the function signatures look like
! if test "x$enable_camera1394" = "xyes"; then
!
! dc1394_dma_setup_args="0"
!
! AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
! [[#include "dc1394/control.h"]],
! []),
! dc1394_dma_setup_args="20")
!
! AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
[[#include "libdc1394/dc1394_control.h"]],
[[dc1394_dma_setup_capture(NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL)]]),
--- 164,179 ----
dnl Check to see if we have version 1 or 2 API for dc1394
! dnl libdc1394 v1 has varying API's, depending on the version. So also do
some checks
dnl to see what the function signatures look like
! dc1394_dma_setup_args="0"
! AC_CHECK_HEADER(dc1394/control.h,
! [dc1394_dma_setup_args="20"
! AC_CHECK_HEADER(
! libraw1394/raw1394.h,
! [PLAYER_ADD_DRIVER([camera1394],[yes],["libraw1394/raw1394.h
dc1394/control.h"],[],["-lraw1394 -ldc1394"])],
!
[PLAYER_ADD_DRIVER([camera1394],[yes],["dc1394/control.h"],[],["-ldc1394"])],
! )
! ],
! [AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
[[#include "libdc1394/dc1394_control.h"]],
[[dc1394_dma_setup_capture(NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL)]]),
***************
*** 187,194 ****
[[dc1394_dma_setup_capture(NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL,
NULL)]]),
dc1394_dma_setup_args="12")
! AC_DEFINE_UNQUOTED(DC1394_DMA_SETUP_CAPTURE_ARGS, $dc1394_dma_setup_args,
[arg count for dma capture function])
! fi
PLAYER_ADD_DRIVER([cameracompress],[yes],[jpeglib.h],[],[-ljpeg])
--- 184,195 ----
[[dc1394_dma_setup_capture(NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL,
NULL)]]),
dc1394_dma_setup_args="12")
+
+
+ PLAYER_ADD_DRIVER([camera1394],[yes],["libraw1394/raw1394.h
libdc1394/dc1394_control.h"],[],["-lraw1394 -ldc1394_control"])]
+ )
! AC_DEFINE_UNQUOTED(DC1394_DMA_SETUP_CAPTURE_ARGS, $dc1394_dma_setup_args,
[arg count for dma capture function])
!
PLAYER_ADD_DRIVER([cameracompress],[yes],[jpeglib.h],[],[-ljpeg])
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
