This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/xawtv3.git tree:
Subject: Remove the remaining requirements for libFS Author: Mauro Carvalho Chehab <[email protected]> Date: Fri Feb 4 14:24:44 2011 -0200 Signed-off-by: Mauro Carvalho Chehab <[email protected]> Makefile.in | 1 - configure.ac | 3 --- console/fs.h | 23 ----------------------- 3 files changed, 0 insertions(+), 27 deletions(-) --- http://git.linuxtv.org/xawtv3.git?a=commitdiff;h=04fb9e96e5cd63b36222e24b7db1c582f46b35cb diff --git a/Makefile.in b/Makefile.in index fc8d920..ee8127e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -51,7 +51,6 @@ QT_FLAGS := @QTFLAGS@ VBI_LIBS := @LIBZVBI@ GL_LIBS := @LIBGL@ DV_LIBS := @LIBDV@ -FS_LIBS := @FSLIB@ DLFLAGS := @DLFLAGS@ # stuff configure has found diff --git a/configure.ac b/configure.ac index 79dd68c..ea70469 100644 --- a/configure.ac +++ b/configure.ac @@ -143,7 +143,6 @@ AC_PATH_XTRA if test "$no_x" != "yes"; then FOUND_X11="yes" ATHENA="-lXaw -lXmu -lXt $X_PRE_LIBS -lXpm -lXext -lX11 $X_EXTRA_LIBS" - FSLIB="-lFS" XFT_FLAGS="" XFT_LIBS="" if test "$enable_xft" != "no"; then @@ -159,7 +158,6 @@ if test "$no_x" != "yes"; then fi else ATHENA="" - FSLIB="" fi AC_SUBST(X_CFLAGS) AC_SUBST(X_PRE_LIBS) @@ -167,7 +165,6 @@ AC_SUBST(X_EXTRA_LIBS) AC_SUBST(X_LIBS) AC_SUBST(x_includes) AC_SUBST(ATHENA) -AC_SUBST(FSLIB) AC_SUBST(SUBS) AC_SUBST(TOOLS) AC_SUBST(LDLIBS) diff --git a/console/fs.h b/console/fs.h index 290a00b..b237465 100644 --- a/console/fs.h +++ b/console/fs.h @@ -1,24 +1,3 @@ -#ifndef X_DISPLAY_MISSING -# include <FSlib.h> - -struct fs_font { - Font font; - FSXFontInfoHeader fontHeader; - FSPropInfo propInfo; - FSPropOffset *propOffsets; - unsigned char *propData; - - FSXCharInfo *extents; - FSOffset *offsets; - unsigned char *glyphs; - - int maxenc,width,height; - FSXCharInfo **eindex; - unsigned char **gindex; -}; - -#else - typedef struct _FSXCharInfo { short left; short right; @@ -49,8 +28,6 @@ struct fs_font { unsigned char **gindex; }; -#endif - /* ------------------------------------------------------------------ */ int fs_init_fb(int white8); _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
