[asterisk-commits] rizzo: branch group/video_console r89614 - in /team/group/video_console: ./ c...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Nov 26 16:51:33 CST 2007


Author: rizzo
Date: Mon Nov 26 16:51:32 2007
New Revision: 89614

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89614
Log:
Add configure.ac checks for SDL_ttf, used for rendering fonts on the video console
(the library is not exactly small, we might end up using some simpler mechanism
that blits directly from an image with fixed-size fonts).

Wrap conditional code with #if HAVE_... / #endif

Fix some compile issues


Modified:
    team/group/video_console/channels/chan_oss.c
    team/group/video_console/channels/console_video.c
    team/group/video_console/configure
    team/group/video_console/configure.ac
    team/group/video_console/include/asterisk/autoconfig.h.in
    team/group/video_console/makeopts.in

Modified: team/group/video_console/channels/chan_oss.c
URL: http://svn.digium.com/view/asterisk/team/group/video_console/channels/chan_oss.c?view=diff&rev=89614&r1=89613&r2=89614
==============================================================================
--- team/group/video_console/channels/chan_oss.c (original)
+++ team/group/video_console/channels/chan_oss.c Mon Nov 26 16:51:32 2007
@@ -19,7 +19,7 @@
  * at the top of the source tree.
  */
 
-// #define HAVE_VIDEO_CONSOLE	// uncomment to enable video
+#define HAVE_VIDEO_CONSOLE	// uncomment to enable video
 /*! \file
  *
  * \brief Channel driver for OSS sound cards

Modified: team/group/video_console/channels/console_video.c
URL: http://svn.digium.com/view/asterisk/team/group/video_console/channels/console_video.c?view=diff&rev=89614&r1=89613&r2=89614
==============================================================================
--- team/group/video_console/channels/console_video.c (original)
+++ team/group/video_console/channels/console_video.c Mon Nov 26 16:51:32 2007
@@ -20,12 +20,6 @@
 //#define DROP_PACKETS 5       /* if set, drop this % of video packets */
 //#define OLD_FFMPEG	1	/* set for old ffmpeg with no swscale */
 
-/*
- * Codecs are absolutely necessary or we cannot do anything.
- * In principle SDL is optional too (used for rendering only, but we
- * could still source data withouth it), however at the moment it is required.
- */
-#if defined(HAVE_FFMPEG) && defined(HAVE_SDL)
 
 /*
 The code is structured as follows.
@@ -85,7 +79,16 @@
 
  */
 
+/*
+ * Codecs are absolutely necessary or we cannot do anything.
+ * In principle SDL is optional too (used for rendering only, but we
+ * could still source data withouth it), however at the moment it is required.
+ */
+#if defined(HAVE_FFMPEG) && defined(HAVE_SDL)
+
+#ifdef HAVE_X11
 #include <X11/Xlib.h>		/* this should be conditional */
+#endif
 
 #include <ffmpeg/avcodec.h>
 #ifndef OLD_FFMPEG
@@ -93,8 +96,12 @@
 #endif
 
 #include <SDL/SDL.h>
+#ifdef HAVE_SDL_IMAGE
 #include <SDL/SDL_image.h>	/* for loading images */
+#endif
+#ifdef HAVE_SDL_TTF
 #include <SDL/SDL_ttf.h>	/* render text on sdl surfaces */
+#endif
 
 /*
  * In many places we use buffers to store the raw frames (but not only),
@@ -155,8 +162,10 @@
 
 	/* device specific info */
 	int 		fd;		/* file descriptor, for webcam */
-	Display *dpy;			/* x11 grabber info */
-	XImage      *image;
+#ifdef HAVE_X11
+	Display		*dpy;			/* x11 grabber info */
+	XImage		*image;
+#endif
 };
 
 /*
@@ -261,7 +270,9 @@
 	char			keypad_mask[256];	/* background for the keypad */
 	char			inbuf[256];		/* buffer for keypad input */
 	int			inbuf_pos;	/* next free position in inbuf */
+#ifdef HAVE_SDL_TTF
 	TTF_Font                *font;          /* font to be used */ 
+#endif
 	char                    keypad_font[256];       /* font for the keypad */
 	int			outfd;		/* fd for output */
 	struct display_window	win[WIN_MAX];
@@ -1305,7 +1316,7 @@
 
 
 /* Video4Linux stuff is only used in video_open() */
-#ifdef HAVE_V4L
+#ifdef HAVE_VIDEODEV_H
 #include <linux/videodev.h>
 #endif
 
@@ -1358,7 +1369,7 @@
 	b->data = (uint8_t *)im->data;
 	v->fd = -2;
     }
-#ifdef HAVE_V4L
+#ifdef HAVE_VIDEODEV_H
     else {
 	/* V4L specific */
 	struct video_window vw = { 0 };	/* camera attributes */
@@ -1425,7 +1436,7 @@
 	}
 	ast_log(LOG_WARNING, "success opening camera\n");
     }
-#endif /* HAVE_V4L */
+#endif /* HAVE_VIDEODEV_H */
 
 	if (v->image == NULL && v->fd < 0)
 		goto error;
@@ -1463,6 +1474,7 @@
 		return 0;	/* too early */
 	v->last_frame = now; /* XXX actually, should correct for drift */
 
+#ifdef HAVE_X11
 	if (v->image) {
 		/* read frame from X11 */
 		AVPicture p;
@@ -1474,6 +1486,7 @@
 		fill_pict(b, &p);
 		return p.linesize[0] * b->h;
 	}
+#endif
 	if (v->fd < 0)			/* no other source */
 		return 0;
 	for (;;) {
@@ -1785,18 +1798,21 @@
 
 static void cleanup_sdl(struct video_desc *env)  
 {
+	int i;
+
+#ifdef HAVE_SDL_TTF
 	/* unload font file */ 
 	if (env->font) {
 		TTF_CloseFont(env->font);
 		env->font = NULL; 
-	}       
+	}
 
 	/* uninitialize SDL_ttf library */
 	if ( TTF_WasInit() )
 		TTF_Quit();
+#endif
 
 	/* uninitialize the SDL environment */
-	int i;
 	for (i = 0; i < WIN_MAX; i++) {
 		if (env->win[i].bmp)
 			SDL_FreeYUVOverlay(env->win[i].bmp);
@@ -2258,14 +2274,16 @@
 /* Print given text on the gui */
 static int gui_output(struct video_desc *env, const char *text, int x, int y)
 {
-	SDL_Surface *output;
+	SDL_Surface *output = NULL;
 	SDL_Color color = {0, 0, 0};	/* text color */
 	SDL_Rect dest = {env->win[WIN_KEYPAD].rect.x + x, y};
 
 	/* clean surface each rewrite */
 	SDL_BlitSurface(env->keypad, NULL, env->screen, &env->win[WIN_KEYPAD].rect);
 
+#ifdef HAVE_SDL_TTF
 	output = TTF_RenderText_Solid(env->font, text, color);
+#endif
 	if (output == NULL) {
 		ast_log(LOG_WARNING, "Cannot render text on gui - %s\n", TTF_GetError());
 		return 0;
@@ -2273,12 +2291,12 @@
 
 	SDL_BlitSurface(output, NULL, env->screen, &dest);
 	
-	#if 0
+#if 0
 	if (SDL_Flip(env->screen) < 0) {
 		ast_log(LOG_WARNING, "Error updating gui screen\n");
 		return 0;
 	}
-	#endif
+#endif
 
 	SDL_UpdateRects(env->keypad, 1, &env->win[WIN_KEYPAD].rect);
 	SDL_FreeSurface(output);
@@ -2290,7 +2308,7 @@
 	ast_log(LOG_WARNING, "keypad_write_message called\n");
 }
 
-static void keypad_test(struct video_desc *env)
+static attribute_unused void keypad_test(struct video_desc *env)
 {
 	ast_log(LOG_WARNING, "keypad_test called\n");
 }
@@ -2322,6 +2340,7 @@
 	env->inbuf_pos = 0;
 	env->inbuf[env->inbuf_pos] = '\0';
 
+#ifdef HAVE_SDL_TTF
 	/* Initialize SDL_ttf library and load font */
 	if (TTF_Init() == -1) {
 		ast_log(LOG_WARNING, "Unable to init SDL_ttf, no output avaiable\n");
@@ -2335,6 +2354,7 @@
 		return -1;
 	}
 	ast_log(LOG_WARNING, "Loaded font %s\n", env->keypad_font);
+#endif
 
 	env->outfd = open ("/dev/null", O_WRONLY);	/* discard output, temporary */
 	if ( env->outfd < 0 ) {

Modified: team/group/video_console/configure
URL: http://svn.digium.com/view/asterisk/team/group/video_console/configure?view=diff&rev=89614&r1=89613&r2=89614
==============================================================================
--- team/group/video_console/configure (original)
+++ team/group/video_console/configure Mon Nov 26 16:51:32 2007
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 89475 .
+# From configure.ac Revision: 89603 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -913,6 +913,10 @@
 SDL_IMAGE_INCLUDE
 SDL_IMAGE_DIR
 PBX_SDL_IMAGE
+SDL_TTF_LIB
+SDL_TTF_INCLUDE
+SDL_TTF_DIR
+PBX_SDL_TTF
 FFMPEG_LIB
 FFMPEG_INCLUDE
 FFMPEG_DIR
@@ -1600,6 +1604,7 @@
                           use Zaptel_vldtmf files in PATH
   --with-sdl=PATH         use Sdl files in PATH
   --with-SDL_image=PATH   use Sdl Image library files in PATH
+  --with-SDL_ttf=PATH     use Sdl ttf library files in PATH
   --with-avcodec=PATH     use Ffmpeg and avcodec library files in PATH
 
 Some influential environment variables:
@@ -9051,6 +9056,34 @@
 fi
 
     PBX_SDL_IMAGE=0
+
+
+
+
+
+
+    SDL_TTF_DESCRIP="Sdl ttf library"
+    SDL_TTF_OPTION="SDL_ttf"
+
+# Check whether --with-SDL_ttf was given.
+if test "${with_SDL_ttf+set}" = set; then
+  withval=$with_SDL_ttf;
+	case ${withval} in
+	n|no)
+	USE_SDL_TTF=no
+	;;
+	y|ye|yes)
+	ac_mandatory_list="${ac_mandatory_list} SDL_TTF"
+	;;
+	*)
+	SDL_TTF_DIR="${withval}"
+	ac_mandatory_list="${ac_mandatory_list} SDL_TTF"
+	;;
+	esac
+
+fi
+
+    PBX_SDL_TTF=0
 
 
 
@@ -45372,6 +45405,262 @@
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SDL_IMAGE_VERSION
+_ACEOF
+
+      fi
+   fi
+fi
+
+
+if test "x${PBX_SDL_TTF}" != "x1" -a "${USE_SDL_TTF}" != "no"; then
+   pbxlibdir=""
+   # if --with-SDL_TTF=DIR has been specified, use it.
+   if test "x${SDL_TTF_DIR}" != "x"; then
+      if test -d ${SDL_TTF_DIR}/lib; then
+      	 pbxlibdir="-L${SDL_TTF_DIR}/lib"
+      else
+      	 pbxlibdir="-L${SDL_TTF_DIR}"
+      fi
+   fi
+   pbxfuncname="TTF_Init"
+   if test "x${pbxfuncname}" = "x" ; then   # empty lib, assume only headers
+      AST_SDL_TTF_FOUND=yes
+   else
+      as_ac_Lib=`echo "ac_cv_lib_SDL_ttf_${pbxfuncname}" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lSDL_ttf" >&5
+echo $ECHO_N "checking for ${pbxfuncname} in -lSDL_ttf... $ECHO_C" >&6; }
+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lSDL_ttf ${pbxlibdir} ${SDL_LIB} $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ${pbxfuncname} ();
+int
+main ()
+{
+return ${pbxfuncname} ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  eval "$as_ac_Lib=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	eval "$as_ac_Lib=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+ac_res=`eval echo '${'$as_ac_Lib'}'`
+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Lib'}'` = yes; then
+  AST_SDL_TTF_FOUND=yes
+else
+  AST_SDL_TTF_FOUND=no
+fi
+
+   fi
+
+   # now check for the header.
+   if test "${AST_SDL_TTF_FOUND}" = "yes"; then
+      SDL_TTF_LIB="${pbxlibdir} -lSDL_ttf ${SDL_LIB}"
+      # if --with-SDL_TTF=DIR has been specified, use it.
+      if test "x${SDL_TTF_DIR}" != "x"; then
+	 SDL_TTF_INCLUDE="-I${SDL_TTF_DIR}/include"
+      fi
+      SDL_TTF_INCLUDE="${SDL_TTF_INCLUDE} ${SDL_INCLUDE}"
+      if test "xSDL_ttf.h" = "x" ; then	# no header, assume found
+         SDL_TTF_HEADER_FOUND="1"
+      else				# check for the header
+         saved_cppflags="${CPPFLAGS}"
+         CPPFLAGS="${CPPFLAGS} ${SDL_TTF_INCLUDE} ${SDL_INCLUDE}"
+	 if test "${ac_cv_header_SDL_ttf_h+set}" = set; then
+  { echo "$as_me:$LINENO: checking for SDL_ttf.h" >&5
+echo $ECHO_N "checking for SDL_ttf.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_SDL_ttf_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_SDL_ttf_h" >&5
+echo "${ECHO_T}$ac_cv_header_SDL_ttf_h" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking SDL_ttf.h usability" >&5
+echo $ECHO_N "checking SDL_ttf.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <SDL_ttf.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking SDL_ttf.h presence" >&5
+echo $ECHO_N "checking SDL_ttf.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <SDL_ttf.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: SDL_ttf.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: SDL_ttf.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: SDL_ttf.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: SDL_ttf.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: SDL_ttf.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: SDL_ttf.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: SDL_ttf.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: SDL_ttf.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: SDL_ttf.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: SDL_ttf.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: SDL_ttf.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: SDL_ttf.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: SDL_ttf.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: SDL_ttf.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: SDL_ttf.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: SDL_ttf.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for SDL_ttf.h" >&5
+echo $ECHO_N "checking for SDL_ttf.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_SDL_ttf_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_SDL_ttf_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_SDL_ttf_h" >&5
+echo "${ECHO_T}$ac_cv_header_SDL_ttf_h" >&6; }
+
+fi
+if test $ac_cv_header_SDL_ttf_h = yes; then
+  SDL_TTF_HEADER_FOUND=1
+else
+  SDL_TTF_HEADER_FOUND=0
+fi
+
+
+         CPPFLAGS="${saved_cppflags}"
+      fi
+      if test "x${SDL_TTF_HEADER_FOUND}" = "x0" ; then
+         SDL_TTF_LIB=""
+         SDL_TTF_INCLUDE=""
+      else
+         if test "x${pbxfuncname}" = "x" ; then		# only checking headers -> no library
+	    SDL_TTF_LIB=""
+	 fi
+         PBX_SDL_TTF=1
+         # XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SDL_TTF 1
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SDL_TTF_VERSION
 _ACEOF
 
       fi
@@ -47748,6 +48037,10 @@
 SDL_IMAGE_INCLUDE!$SDL_IMAGE_INCLUDE$ac_delim
 SDL_IMAGE_DIR!$SDL_IMAGE_DIR$ac_delim
 PBX_SDL_IMAGE!$PBX_SDL_IMAGE$ac_delim
+SDL_TTF_LIB!$SDL_TTF_LIB$ac_delim
+SDL_TTF_INCLUDE!$SDL_TTF_INCLUDE$ac_delim
+SDL_TTF_DIR!$SDL_TTF_DIR$ac_delim
+PBX_SDL_TTF!$PBX_SDL_TTF$ac_delim
 FFMPEG_LIB!$FFMPEG_LIB$ac_delim
 FFMPEG_INCLUDE!$FFMPEG_INCLUDE$ac_delim
 FFMPEG_DIR!$FFMPEG_DIR$ac_delim
@@ -47791,7 +48084,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 44; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 48; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Modified: team/group/video_console/configure.ac
URL: http://svn.digium.com/view/asterisk/team/group/video_console/configure.ac?view=diff&rev=89614&r1=89613&r2=89614
==============================================================================
--- team/group/video_console/configure.ac (original)
+++ team/group/video_console/configure.ac Mon Nov 26 16:51:32 2007
@@ -232,6 +232,7 @@
 
 AST_EXT_LIB_SETUP([SDL], [Sdl], [sdl])
 AST_EXT_LIB_SETUP([SDL_IMAGE], [Sdl Image library], [SDL_image])
+AST_EXT_LIB_SETUP([SDL_TTF], [Sdl ttf library], [SDL_ttf])
 AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec library], [avcodec])
 
 # check for basic system features and functionality before
@@ -1182,6 +1183,7 @@
 
 AST_EXT_TOOL_CHECK([SDL], [sdl])
 AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL_image.h], [${SDL_LIB}], [${SDL_INCLUDE}])
+AST_EXT_LIB_CHECK([SDL_TTF], [SDL_ttf], [TTF_Init], [SDL_ttf.h], [${SDL_LIB}], [${SDL_INCLUDE}])
 AST_EXT_LIB_CHECK([FFMPEG], [avcodec], [sws_getContext], [ffmpeg/avcodec.h], [-lpthread -lz -lm])
 
 # possible places for video4linux version 1

Modified: team/group/video_console/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/team/group/video_console/include/asterisk/autoconfig.h.in?view=diff&rev=89614&r1=89613&r2=89614
==============================================================================
--- team/group/video_console/include/asterisk/autoconfig.h.in (original)
+++ team/group/video_console/include/asterisk/autoconfig.h.in Mon Nov 26 16:51:32 2007
@@ -667,6 +667,12 @@
 
 /* Define to indicate the ${SDL_IMAGE_DESCRIP} library version */
 #undef HAVE_SDL_IMAGE_VERSION
+
+/* Define this to indicate the ${SDL_TTF_DESCRIP} library */
+#undef HAVE_SDL_TTF
+
+/* Define to indicate the ${SDL_TTF_DESCRIP} library version */
+#undef HAVE_SDL_TTF_VERSION
 
 /* Define to 1 if you have the `select' function. */
 #undef HAVE_SELECT

Modified: team/group/video_console/makeopts.in
URL: http://svn.digium.com/view/asterisk/team/group/video_console/makeopts.in?view=diff&rev=89614&r1=89613&r2=89614
==============================================================================
--- team/group/video_console/makeopts.in (original)
+++ team/group/video_console/makeopts.in Mon Nov 26 16:51:32 2007
@@ -120,10 +120,10 @@
 OSPTK_INCLUDE=@OSPTK_INCLUDE@
 OSPTK_LIB=@OSPTK_LIB@
 
-# ossaudio can optionally use ffmpeg, x11, sdl and sdl_image.
-# Because sdl_image in turn depends on sdl, we don't duplicate the include
+# ossaudio can optionally use ffmpeg, X11, SDL, SDL_image and SDL_ttf
+# Because sdl stuff in turn depends on sdl, we don't duplicate the includes
 OSSAUDIO_INCLUDE=@OSS_INCLUDE@ @FFMPEG_INCLUDE@ @SDL_INCLUDE@ @X11_INCLUDE@
-OSSAUDIO_LIB=@OSS_LIB@ @FFMPEG_LIB@ @SDL_LIB@ @SDL_IMAGE_LIB@ @X11_LIB@
+OSSAUDIO_LIB=@OSS_LIB@ @FFMPEG_LIB@ @SDL_LIB@ @SDL_IMAGE_LIB@ @SDL_TTF_LIB@ @X11_LIB@
 
 PGSQL_INCLUDE=@PGSQL_INCLUDE@
 PGSQL_LIB=@PGSQL_LIB@




More information about the asterisk-commits mailing list