[xawtv/el6/master] The fslib removal patch was incomplete. fix it.

Fri Feb 4 15:50:18 UTC 2011

commit 321f44893ea3072af2a11ee2896aaf58147a00af
Author: Mauro Carvalho Chehab <mchehab at redhat.com>
Date:   Fri Feb 4 13:49:41 2011 -0200

    The fslib removal patch was incomplete. fix it.
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>

 xawtv_more_fslib_removal.patch |  282 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 251 insertions(+), 31 deletions(-)
---

diff --git a/xawtv_more_fslib_removal.patch b/xawtv_more_fslib_removal.patch
index d7c0560..d6570f9 100644
--- a/xawtv_more_fslib_removal.patch
+++ b/xawtv_more_fslib_removal.patch
@@ -1,48 +1,268 @@
+diff --git a/Makefile b/Makefile
+index c19f663..bb0d13b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,25 +1,170 @@
++srcdir		:= .
++VPATH		:= $(srcdir)
+ 
+-# passed to configure
+-prefix = /usr/local
++# for package builds (buildroot install + no root privs needed)
++DESTDIR=
++SUID_ROOT=-m4755 -o root
++STRIP_FLAG=
+ 
+-# arch name -- for build directory
+-arch := $(shell echo "arch-`uname -m`-`uname -s`" | tr "A-Z" "a-z")
++# install paths
++prefix		:= /usr/local
++exec_prefix	:= ${prefix}
++bindir		:= $(DESTDIR)${exec_prefix}/bin
++mandir		:= $(DESTDIR)${prefix}/share/man
++libdir		:= $(DESTDIR)${exec_prefix}/lib/xawtv
++datadir		:= $(DESTDIR)${prefix}/share/xawtv
++resdir		:= $(DESTDIR)/usr/share/X11
++config		:= /etc/X11/xawtvrc
+ 
++# programs
++CC		:= gcc
++CXX		:= g++
++INSTALL		:= /usr/bin/install -c
++INSTALL_PROGRAM := ${INSTALL} $(STRIP_FLAG)
++INSTALL_DATA	:= ${INSTALL} -m 644
++INSTALL_DIR	:= /usr/bin/install -c -d -m 755
++
++# misc
++VERSION		:= 3.99.rc5
++
++# for CFLAGS
++WARN_FLAGS	:= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
++LFS_FLAGS	:= -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++X11_FLAGS	:=  -I/usr/include/freetype2   -I/usr/include/X11/fonts
++LIB_FLAGS	:= -I. -I./vbistuff -I./x11 \
++		   -I$(srcdir)/jwz -I$(srcdir)/common -I$(srcdir)/console \
++		   -I$(srcdir)/x11 -I$(srcdir)/structs \
++		   -I$(srcdir)/libng -Llibng
++
++# various libraries
++ATHENA_LIBS	:=  -lXft -lXrender -lfreetype -lX11 -lfontconfig   -lXv -lXrandr -lXrender -lXinerama -lXxf86vm -lXxf86dga  -lXaw -lXmu -lXt  -lSM -lICE -lXpm -lXext -lX11 
++MOTIF_LIBS	:=  -lXft -lXrender -lfreetype -lX11 -lfontconfig   -lXv -lXrandr -lXrender -lXinerama -lXxf86vm -lXxf86dga  -lXm -lXmu -lXt  -lSM -lICE \
++		   -lXp -lXpm -lXext -lX11 
++THREAD_LIBS	:= -lpthread
++CURSES_LIBS	:= -lncursesw
++LIRC_LIBS	:= -llirc_client
++OSS_LIBS	:= 
++ALSA_LIBS	:= -lasound
++AA_LIBS		:= -L/usr/lib64 -Wl,-rpath,/usr/lib -laa -lm -lX11 -lgpm -lncurses
++QT_LIBS		:= -lquicktime -ldl -Wl,-E -lglib-2.0   -lm
++QT_FLAGS	:= -I/usr/include/lqt  
++VBI_LIBS	:= -lzvbi -lpthread -lm -lpng -lz
++GL_LIBS		:= -lGL -lm
++DV_LIBS		:= -ldv -lm
++DLFLAGS		:= -ldl -Wl,-E
++
++# stuff configure has found
++FOUND_AALIB	:= yes
++FOUND_ALSA	:= yes
++FOUND_DV	:= yes
++FOUND_GL	:= yes
++FOUND_LQT	:= yes
++FOUND_MOTIF	:= yes
++FOUND_OS	:= linux
++FOUND_X11	:= yes
++FOUND_ZVBI	:= yes
++USE_MMX		:= no
++LIBV4L		:= yes
++
++# build final cflags
++CFLAGS   := -g -O2 -I/usr/include/ncursesw
++CFLAGS   += $(WARN_FLAGS)
++CFLAGS   += $(LFS_FLAGS)
++CFLAGS   += $(X11_FLAGS)
++CFLAGS   += $(LIB_FLAGS)
++CFLAGS   += $(QT_FLAGS)
++CFLAGS   += -DCONFIGFILE='"$(config)"'
++CFLAGS   += -DLIBDIR='"$(libdir)"'
++CFLAGS   += -DDATADIR='"$(datadir)"'
++CFLAGS   += -DVERSION='"$(VERSION)"'
++CXXFLAGS := $(CFLAGS)
++
++# for gcc3
++#CFLAGS   += -std-gnu99
++
++# shared objects need -fPIC
++%.so : CFLAGS   += -fPIC
++%.so : CXXFLAGS += -fPIC
++
++# libraries
++LDLIBS  := 
++
++
++#########################################################
+ # targets
+-build all install: $(arch)/Makefile configure
+-	$(MAKE) -C $(arch) $@
+ 
+-clean distclean:
+-	-test -d "$(arch)" && rm -rf "$(arch)"
++build: all
++
++Makefile: $(srcdir)/Makefile.in $(srcdir)/configure
++	$(srcdir)/configure
++
++$(srcdir)/configure: $(srcdir)/configure.ac
++	(cd $(srcdir); autoconf && autoheader && rm -rf autom4te.cache)
++
++install:: all
++	$(INSTALL_DIR) $(bindir)
++
++clean::
++	find . -name \*~ -print | xargs rm -f
++	find . -name \*.o -print | xargs rm -f
++	find . -name \*.a -print | xargs rm -f
++	find . -name \*.dep -print | xargs rm -f
++	rm -f $(depfiles)
++
++distclean:: clean
++	-rm -f Makefile Make.config
++	-rm -f config.cache config.h config.log config.status
++	cp Makefile.clean Makefile
++
++realclean:: distclean
++	find . -name snap0*.ppm  -print | xargs -i rm -f
++	find . -name snap0*.jpeg -print | xargs -i rm -f
++	find . -name .nfs* -print | xargs -i rm -f
++	find . -name core.* -print | xargs -i rm -f
++
++
++#########################################################
++# some rules ...
++
++include $(srcdir)/mk/Compile.mk
++
++%.h: %.in
++	perl $(srcdir)/scripts/html.pl < $< > $@
++
++%.h: %.ad
++	perl $(srcdir)/scripts/fallback.pl < $< > $@
++
++
++#########################################################
++# include stuff
++
++# must come first
++include $(srcdir)/common/Subdir.mk
++
++# subdirs
++include $(srcdir)/console/Subdir.mk
++include $(srcdir)/debug/Subdir.mk
++include $(srcdir)/frequencies/Subdir.mk
++include $(srcdir)/libng/Subdir.mk
++include $(srcdir)/libng/plugins/Subdir.mk
++include $(srcdir)/libng/contrib-plugins/Subdir.mk
++include $(srcdir)/man/Subdir.mk
++include $(srcdir)/scripts/Subdir.mk
++include $(srcdir)/vbistuff/Subdir.mk
++include $(srcdir)/x11/Subdir.mk
++
++# dependencies
++-include $(depfiles)
++
++
++#########################################################
++# just for me, some maintaining jobs.  Don't use them
+ 
+-configure:
+-	autoconf
++tag:
++	@git tag -a -m "Tag as xawtv-3.99.rc5" xawtv-3.99.rc5
++	@echo "Tagged as xawtv-3.99.rc5"
+ 
+-tag archive rpm dsc debs pbuild release snapshot snap: configure
+-	./configure
+-	$(MAKE) $@
++archive:
++	@git archive --format=tar --prefix=xawtv-3.99.rc5/ xawtv-3.99.rc5 > xawtv-3.99.rc5.tar
++	@bzip2 -f xawtv-3.99.rc5.tar
+ 
+-$(arch)/Makefile: configure
+-	mkdir -p $(arch)
+-	(cd $(arch); ../configure	\
+-		--prefix=$(prefix)	)
+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..c0c2a32 100644
+index 290a00b..b237465 100644
 --- a/console/fs.h
 +++ b/console/fs.h
-@@ -1,4 +1,3 @@
+@@ -1,24 +1,3 @@
 -#ifndef X_DISPLAY_MISSING
- # include <FSlib.h>
- 
- struct fs_font {
-@@ -17,40 +16,6 @@ struct fs_font {
-     unsigned char      **gindex;
- };
- 
--#else
--
--typedef struct _FSXCharInfo {
--    short       left;
--    short       right;
--    short       width;
--    short       ascent;
--    short       descent;
--    //unsigned short      attributes;
--} FSXCharInfo;
--
--typedef struct _FSXFontInfoHeader {
--    //int         flags;
--    //FSRange     char_range;
--    //unsigned    draw_direction;
--    //FSChar2b    default_char;
--    FSXCharInfo min_bounds;
--    FSXCharInfo max_bounds;
--    short       font_ascent;
--    short       font_descent;
--} FSXFontInfoHeader;
+-# include <FSlib.h>
 -
 -struct fs_font {
+-    Font               font;
 -    FSXFontInfoHeader  fontHeader;
--    //unsigned char      *propData;
+-    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
 -
  /* ------------------------------------------------------------------ */
