1 diff -Naur tuxtxt_org/AUTHORS tuxtxt/AUTHORS
2 --- tuxtxt_org/AUTHORS 1970-01-01 01:00:00.000000000 +0100
3 +++ tuxtxt/AUTHORS 2006-12-28 12:08:57.000000000 +0100
5 +In order of appearance in cvs:
6 +------------------------------------------------
7 +Felix Domke <tmbinc@berlios.de>
8 +Andreas Oberritter <obi@berlios.de>
9 +Steffen Hehn <mcclean@berlios.de>
10 +Andreas Monzner <ghostrider@berlios.de>
11 +Florian Roks <trh@berlios.de>
12 +Ronny Strutz <tripledes@berlios.de>
13 +Bastian Blank <waldi@berlios.de>
14 +Henning Heinold <woglinde@berlios.de>
15 +Rainer Scherg <rasc@berlios.de>
16 +Steffen Buehl <shadow@berlios.de>
17 +Wolfram Joost <wjoost@berlios.de>
18 +Thomas Herold <dertom@berlios.de>
19 +Stefan Pluecken <thedoc@berlios.de>
20 +Florian Schirmer <jolt@berlios.de>
21 +Christoph Ketzler <chkdesign@berlios.de>
22 +Bernhard Roth <bernroth@berlios.de>
23 +Roland Meier <RolandMeier@Siemens.com>
24 +DBLuelle <dbluelle@blau-weissoedingend.de>
27 +Also many thanks to everyone who supported development
28 +without having cvs write access
30 diff -Naur tuxtxt_org/Makefile.am tuxtxt/Makefile.am
31 --- tuxtxt_org/Makefile.am 2006-12-28 12:10:01.000000000 +0100
32 +++ tuxtxt/Makefile.am 2006-12-28 12:10:27.000000000 +0100
35 +installdir = $(CONFIGDIR)/tuxtxt
40 - -I$(top_srcdir)/include \
41 - -I$(includedir)/tuxbox/tuxtxt
42 +SUBDIRS = font python
52 -I$(top_srcdir)/include \
53 - -I$(includedir)/tuxbox/tuxtxt
54 + -I$(prefix)/$(includedir)/tuxbox/tuxtxt
58 +bin_PROGRAMS = tuxtxt
59 +tuxtxt_LDADD = -lpthread -lz \
64 -noinst_LTLIBRARIES = tuxtxt.la
66 -tuxtxt_la_SOURCES = tuxtxt.c
69 -tuxtxt_la_LDFLAGS = -rpath $(PLUGINDIR) -module -avoid-version
70 +tuxtxt_SOURCES = tuxtxt.c
73 - install -d $(DESTDIR)$(PLUGINDIR)
74 - install -d $(DESTDIR)$(CONFIGDIR)
75 - install -d $(DESTDIR)$(CONFIGDIR)/tuxtxt
76 - $(LIBTOOL) --mode=install install tuxtxt.la $(DESTDIR)$(PLUGINDIR)
77 - install -m 0644 $(srcdir)/tuxtxt.cfg $(DESTDIR)$(PLUGINDIR)
78 - install -m 0644 $(srcdir)/tuxtxt.conf $(DESTDIR)$(CONFIGDIR)/tuxtxt
79 +install_DATA = tuxtxt2.conf
80 diff -Naur tuxtxt_org/acinclude.m4 tuxtxt/acinclude.m4
81 --- tuxtxt_org/acinclude.m4 1970-01-01 01:00:00.000000000 +0100
82 +++ tuxtxt/acinclude.m4 2006-12-28 12:08:57.000000000 +0100
84 +AC_DEFUN(TUXBOX_APPS,[
85 +AM_CONFIG_HEADER(config.h)
88 +INSTALL="$INSTALL -p"
94 + [ --with-target=TARGET target for compilation [[native,cdk]]],
95 + [TARGET="$withval"],[TARGET="native"])
97 +AC_ARG_WITH(targetprefix,
98 + [ --with-targetprefix=PATH prefix relative to target root (only applicable in cdk mode)],
99 + [targetprefix="$withval"],[targetprefix="NONE"])
102 + [ --without-debug disable debugging code],
103 + [DEBUG="$withval"],[DEBUG="yes"])
105 +if test "$DEBUG" = "yes"; then
106 + DEBUG_CFLAGS="-g3 -ggdb"
107 + AC_DEFINE(DEBUG,1,[Enable debug messages])
110 +AC_MSG_CHECKING(target)
112 +if test "$TARGET" = "native"; then
113 + AC_MSG_RESULT(native)
115 + if test "$CFLAGS" = "" -a "$CXXFLAGS" = ""; then
116 + CFLAGS="-Wall -O2 -pipe $DEBUG_CFLAGS"
117 + CXXFLAGS="-Wall -O2 -pipe $DEBUG_CFLAGS"
119 + if test "$prefix" = "NONE"; then
122 + targetprefix=$prefix
123 +elif test "$TARGET" = "cdk"; then
126 + if test "$CC" = "" -a "$CXX" = ""; then
127 + CC=powerpc-tuxbox-linux-gnu-gcc CXX=powerpc-tuxbox-linux-gnu-g++
129 + if test "$CFLAGS" = "" -a "$CXXFLAGS" = ""; then
130 + CFLAGS="-Wall -Os -mcpu=823 -pipe $DEBUG_CFLAGS"
131 + CXXFLAGS="-Wall -Os -mcpu=823 -pipe $DEBUG_CFLAGS"
133 + if test "$prefix" = "NONE"; then
134 + AC_MSG_ERROR(invalid prefix, you need to specify one in cdk mode)
136 + if test "$targetprefix" = "NONE"; then
139 + if test "$host_alias" = ""; then
140 + cross_compiling=yes
141 + host_alias=powerpc-tuxbox-linux-gnu
144 + AC_MSG_RESULT(none)
145 + AC_MSG_ERROR([invalid target $TARGET, choose on from native,cdk]);
152 + return $(perl -e "if(\"$1\"=~m#^/usr/(local/)?bin#){print \"0\"}else{print \"1\";}")
157 +AC_DEFUN(TUXBOX_APPS_DIRECTORY_ONE,[
158 +AC_ARG_WITH($1,[ $6$7 [[PREFIX$4$5]]],[
160 + if test "$TARGET" = "cdk"; then
161 + $2=`eval echo "${targetprefix}$withval"`
167 + if test "$TARGET" = "cdk"; then
168 + _$2=`eval echo "${target$3}$5"`
170 + _$2=`eval echo "${$3}$5"`
174 +dnl automake <= 1.6 don't support this
176 +AC_DEFINE_UNQUOTED($2,"$_$2",$7)
179 +AC_DEFUN(TUXBOX_APPS_DIRECTORY,[
180 +AC_REQUIRE([TUXBOX_APPS])
182 +if test "$TARGET" = "cdk"; then
183 + datadir="\${prefix}/share"
184 + tuxboxdatadir="\${prefix}/share/tuxbox"
185 + zoneinfodir="\${datadir}/zoneinfo"
186 + sysconfdir="\${prefix}/etc"
187 + localstatedir="\${prefix}/var"
188 + localedir="\${prefix}/var"
189 + libdir="\${prefix}/lib"
190 + targetdatadir="\${targetprefix}/share"
191 + targetsysconfdir="\${targetprefix}/etc"
192 + targetlocalstatedir="\${targetprefix}/var"
193 + targetlibdir="\${targetprefix}/lib"
196 +TUXBOX_APPS_DIRECTORY_ONE(configdir,CONFIGDIR,sysconfdir,/etc,,
197 + [--with-configdir=PATH ],[where to find the config files])
199 +TUXBOX_APPS_DIRECTORY_ONE(datadir,DATADIR,datadir,/share,,
200 + [--with-datadir=PATH ],[where to find data])
202 +TUXBOX_APPS_DIRECTORY_ONE(localedir,LOCALEDIR,datadir,/share,/locale,
203 + [--with-localedir=PATH ],[where to find locales])
205 +TUXBOX_APPS_DIRECTORY_ONE(fontdir,FONTDIR,datadir,/share,/fonts,
206 + [--with-fontdir=PATH ],[where to find the fonts])
208 +TUXBOX_APPS_DIRECTORY_ONE(gamesdir,GAMESDIR,localstatedir,/var,/tuxbox/games,
209 + [--with-gamesdir=PATH ],[where games data is stored])
211 +TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,,
212 + [--with-libdir=PATH ],[where to find the internal libs])
214 +TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins,
215 + [--with-plugindir=PATH ],[where to find the plugins])
217 +TUXBOX_APPS_DIRECTORY_ONE(tuxboxdatadir,TUXBOXDATADIR,datadir,/share,,
218 + [--with-tuxboxdatadir=PATH],[where to find tuxbox data])
220 +TUXBOX_APPS_DIRECTORY_ONE(zoneinfodir,ZONEINFODIR,datadir,/share,/zoneinfo,
221 + [--with-zoneinfodir=PATH ],[where to find zoneinfo db])
224 +dnl automake <= 1.6 needs this specifications
227 +AC_SUBST(ZONEINFODIR)
233 +AC_SUBST(TUXBOXDATADIR)
236 +AC_DEFUN(TUXBOX_APPS_ENDIAN,[
237 +AC_CHECK_HEADERS(endian.h)
241 +AC_DEFUN(TUXBOX_APPS_DRIVER,[
242 +#AC_ARG_WITH(driver,
243 +# [ --with-driver=PATH path for driver sources [[NONE]]],
244 +# [DRIVER="$withval"],[DRIVER=""])
246 +#if test -d "$DRIVER/include"; then
247 +# AC_DEFINE(HAVE_DBOX2_DRIVER,1,[Define to 1 if you have the dbox2 driver sources])
249 +# AC_MSG_ERROR([can't find driver sources])
254 +#CPPFLAGS="$CPPFLAGS -I$DRIVER/include"
257 +AC_DEFUN([TUXBOX_APPS_DVB],[
258 +AC_ARG_WITH(dvbincludes,
259 + [ --with-dvbincludes=PATH path for dvb includes [[NONE]]],
260 + [DVBINCLUDES="$withval"],[DVBINCLUDES=""])
262 +if test "$DVBINCLUDES"; then
263 + CPPFLAGS="$CPPFLAGS -I$DVBINCLUDES"
266 +AC_CHECK_HEADERS(ost/dmx.h,[
268 + AC_MSG_NOTICE([found dvb version 1])
271 +if test -z "$DVB_API_VERSION"; then
272 +AC_CHECK_HEADERS(linux/dvb/version.h,[
273 + AC_LANG_PREPROC_REQUIRE()
274 + AC_REQUIRE([AC_PROG_EGREP])
275 + AC_LANG_CONFTEST([AC_LANG_SOURCE([[
276 +#include <linux/dvb/version.h>
277 +version DVB_API_VERSION
279 + DVB_API_VERSION=`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | $EGREP "^version" | sed "s,version\ ,,"`
282 + AC_MSG_NOTICE([found dvb version $DVB_API_VERSION])
286 +if test "$DVB_API_VERSION"; then
287 + AC_DEFINE(HAVE_DVB,1,[Define to 1 if you have the dvb includes])
288 + AC_DEFINE_UNQUOTED(HAVE_DVB_API_VERSION,$DVB_API_VERSION,[Define to the version of the dvb api])
290 + AC_MSG_ERROR([can't find dvb headers])
294 +AC_DEFUN(_TUXBOX_APPS_LIB_CONFIG,[
295 +AC_PATH_PROG($1_CONFIG,$2,no)
296 +if test "$$1_CONFIG" != "no"; then
297 + if test "$TARGET" = "cdk" && check_path "$$1_CONFIG"; then
298 + AC_MSG_$3([could not find a suitable version of $2]);
300 + $1_CFLAGS=$($$1_CONFIG --cflags)
301 + $1_LIBS=$($$1_CONFIG --libs)
309 +AC_DEFUN(TUXBOX_APPS_LIB_CONFIG,[
310 +_TUXBOX_APPS_LIB_CONFIG($1,$2,ERROR)
311 +if test "$$1_CONFIG" = "no"; then
312 + AC_MSG_ERROR([could not find $2]);
316 +AC_DEFUN(TUXBOX_APPS_LIB_CONFIG_CHECK,[
317 +_TUXBOX_APPS_LIB_CONFIG($1,$2,WARN)
320 +AC_DEFUN(TUXBOX_APPS_PKGCONFIG,[
321 +AC_PATH_PROG(PKG_CONFIG, pkg-config,no)
322 +if test "$PKG_CONFIG" = "no" ; then
323 + AC_MSG_ERROR([could not find pkg-config]);
327 +AC_DEFUN(_TUXBOX_APPS_LIB_PKGCONFIG,[
328 +PKG_CHECK_MODULES($1,$2)
333 +AC_DEFUN(TUXBOX_APPS_LIB_PKGCONFIG,[
334 +_TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
335 +if test -z "$$1_CFLAGS" ; then
336 + AC_MSG_ERROR([could not find package $2]);
340 +AC_DEFUN(TUXBOX_APPS_LIB_PKGCONFIG_CHECK,[
341 +_TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
344 +AC_DEFUN(_TUXBOX_APPS_LIB_SYMBOL,[
345 +AC_CHECK_LIB($2,$3,HAVE_$1="yes",HAVE_$1="no")
346 +if test "$HAVE_$1" = "yes"; then
353 +AC_DEFUN(TUXBOX_APPS_LIB_SYMBOL,[
354 +_TUXBOX_APPS_LIB_SYMBOL($1,$2,$3,ERROR)
355 +if test "$HAVE_$1" = "no"; then
356 + AC_MSG_ERROR([could not find $2]);
360 +AC_DEFUN(TUXBOX_APPS_LIB_CONFIG_SYMBOL,[
361 +_TUXBOX_APPS_LIB_SYMBOL($1,$2,$3,WARN)
364 +AC_DEFUN(TUXBOX_APPS_GETTEXT,[
365 +AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
366 + [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
367 + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
369 +AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
371 +AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
372 + [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
373 + (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
376 +AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,[$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1],:)
378 +AC_MSG_CHECKING([whether NLS is requested])
380 + [ --disable-nls do not use Native Language Support],
381 + USE_NLS=$enableval, USE_NLS=yes)
382 +AC_MSG_RESULT($USE_NLS)
385 +if test "$USE_NLS" = "yes"; then
386 + AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,[
388 + #include <libintl.h>
389 + #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
390 + #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
392 + extern int _nl_msg_cat_cntr;
393 + extern int *_nl_domain_bindings;
395 + bindtextdomain ("", "");
396 + return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings;
397 + ], gt_cv_func_gnugettext_libc=yes, gt_cv_func_gnugettext_libc=no
401 + if test "$gt_cv_func_gnugettext_libc" = "yes"; then
402 + AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if translation of program messages to the user's native language is requested.])
403 + gt_use_preinstalled_gnugettext=yes
409 +if test -f "$srcdir/po/LINGUAS"; then
410 + ALL_LINGUAS=$(sed -e "/^#/d" "$srcdir/po/LINGUAS")
417 +for lang in $ALL_LINGUAS; do
418 + POFILES="$POFILES $srcdirpre$lang.po"
419 + GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
420 + UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
421 + DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
424 +if test -n "$ALL_LINGUAS"; then
425 + for presentlang in $ALL_LINGUAS; do
427 + if test -n "$LINGUAS"; then
428 + desiredlanguages="$LINGUAS"
430 + desiredlanguages="$ALL_LINGUAS"
432 + for desiredlang in $desiredlanguages; do
433 + case "$desiredlang" in
434 + "$presentlang"*) useit=yes;;
437 + if test $useit = yes; then
438 + INST_LINGUAS="$INST_LINGUAS $presentlang"
443 +if test -n "$INST_LINGUAS"; then
444 + for lang in $INST_LINGUAS; do
445 + CATALOGS="$CATALOGS $lang.gmo"
450 +AC_SUBST(UPDATEPOFILES)
451 +AC_SUBST(DUMMYPOFILES)
455 +dnl backward compatiblity
456 +AC_DEFUN([AC_GNU_SOURCE],
457 +[AH_VERBATIM([_GNU_SOURCE],
458 +[/* Enable GNU extensions on systems that have them. */
462 +AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
463 +AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
464 +AC_DEFINE([_GNU_SOURCE])
467 +AC_DEFUN([AC_PROG_EGREP],
468 +[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
469 + [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
470 + then ac_cv_prog_egrep='grep -E'
471 + else ac_cv_prog_egrep='egrep'
473 + EGREP=$ac_cv_prog_egrep
477 +AC_DEFUN([AC_PYTHON_DEVEL],[
479 + # should allow for checking of python version here...
481 + AC_REQUIRE([AM_PATH_PYTHON])
483 + # Check for Python include path
484 + AC_MSG_CHECKING([for Python include path])
485 + python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
486 + for i in "$python_path/include/python$PYTHON_VERSION/" "$python_path/include/python/" "$python_path/" ; do
487 + python_path=`find $i -type f -name Python.h -print | sed "1q"`
488 + if test -n "$python_path" ; then
492 + python_path=`echo $python_path | sed "s,/Python.h$,,"`
493 + AC_MSG_RESULT([$python_path])
494 + if test -z "$python_path" ; then
495 + AC_MSG_ERROR([cannot find Python include path])
497 + AC_SUBST([PYTHON_CPPFLAGS],[-I$python_path])
499 + # Check for Python library path
500 + AC_MSG_CHECKING([for Python library path])
501 + python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
502 + for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
503 + python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
504 + if test -n "$python_path" ; then
508 + python_path=`echo $python_path | sed "s,/libpython.*$,,"`
509 + AC_MSG_RESULT([$python_path])
510 + if test -z "$python_path" ; then
511 + AC_MSG_ERROR([cannot find Python library path])
513 + AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -lpython$PYTHON_VERSION"])
515 + python_site=`echo $python_path | sed "s/config/site-packages/"`
516 + AC_SUBST([PYTHON_SITE_PKG],[$python_site])
518 diff -Naur tuxtxt_org/configure.ac tuxtxt/configure.ac
519 --- tuxtxt_org/configure.ac 1970-01-01 01:00:00.000000000 +0100
520 +++ tuxtxt/configure.ac 2006-12-28 12:08:58.000000000 +0100
522 +AC_INIT(tuxbox-tuxtxt-32bpp,1.96)
523 +AM_INIT_AUTOMAKE(tuxbox-tuxtxt-32bpp,1.96)
526 +TUXBOX_APPS_DIRECTORY
530 +# Checks for programs.
534 +TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
535 +TUXBOX_APPS_LIB_PKGCONFIG(TUXTXT,tuxbox-tuxtxt)
538 +AC_OUTPUT(font/Makefile)
539 +AC_OUTPUT(python/Makefile)
540 diff -Naur tuxtxt_32bpp/python/Makefile.am tuxtxt/python/Makefile.am
541 --- tuxtxt/python/Makefile.am 1970-01-01 01:00:00.000000000 +0100
542 +++ tuxtxt/python/Makefile.am 2006-03-10 21:43:45.000000000 +0100
544 +installdir = $(LIBDIR)/enigma2/python/Plugins/Extensions/Tuxtxt