From 60e5fe14d01b84bbef35d5286183a85ff72002dd Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Fri, 20 May 2005 19:42:13 +0000 Subject: [PATCH] undo shitty stuff.. sorry --- acinclude.m4 | 180 ++++++++++++++++++++++------------------------------ config.h.in | 18 +----- configure.ac | 2 +- lib/gdi/Makefile.am | 2 +- lib/gdi/gfbdc.cpp | 4 +- lib/gdi/sdl.cpp | 2 - main/Makefile.am | 5 +- main/enigma-gdi.cpp | 2 +- main/enigma-gui.cpp | 2 +- main/enigma.cpp | 5 +- 10 files changed, 88 insertions(+), 134 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index b92d02f..074e1a0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2,8 +2,6 @@ AC_DEFUN(TUXBOX_APPS,[ AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE -INSTALL="$INSTALL -p" - AC_GNU_SOURCE AC_SYS_LARGEFILE @@ -12,7 +10,7 @@ AC_ARG_WITH(target, [TARGET="$withval"],[TARGET="native"]) AC_ARG_WITH(targetprefix, - [ --with-targetprefix=PATH prefix relative to target root (only applicable in cdk mode)], + [ --with-targetprefix=PATH prefix relative to target root [[PREFIX[for native], /[for cdk]]]], [targetprefix="$withval"],[targetprefix="NONE"]) AC_ARG_WITH(debug, @@ -24,11 +22,7 @@ if test "$DEBUG" = "yes"; then AC_DEFINE(DEBUG,1,[Enable debug messages]) fi -AC_MSG_CHECKING(target) - if test "$TARGET" = "native"; then - AC_MSG_RESULT(native) - if test "$CFLAGS" = "" -a "$CXXFLAGS" = ""; then CFLAGS="-Wall -O2 -pipe $DEBUG_CFLAGS" CXXFLAGS="-Wall -O2 -pipe $DEBUG_CFLAGS" @@ -36,10 +30,13 @@ if test "$TARGET" = "native"; then if test "$prefix" = "NONE"; then prefix=/usr/local fi - targetprefix=$prefix + if test "$targetprefix" = "NONE"; then + targetprefix="\${prefix}" + _targetprefix="${prefix}" + else + _targetprefix="$targetprefix" + fi elif test "$TARGET" = "cdk"; then - AC_MSG_RESULT(cdk) - if test "$CC" = "" -a "$CXX" = ""; then CC=powerpc-tuxbox-linux-gnu-gcc CXX=powerpc-tuxbox-linux-gnu-g++ fi @@ -48,127 +45,99 @@ elif test "$TARGET" = "cdk"; then CXXFLAGS="-Wall -Os -mcpu=823 -pipe $DEBUG_CFLAGS" fi if test "$prefix" = "NONE"; then - AC_MSG_ERROR(invalid prefix, you need to specify one in cdk mode) + prefix=/dbox2/cdkroot fi if test "$targetprefix" = "NONE"; then targetprefix="" + _targetprefix="" + else + _targetprefix="$targetprefix" fi if test "$host_alias" = ""; then cross_compiling=yes host_alias=powerpc-tuxbox-linux-gnu fi else - AC_MSG_RESULT(none) AC_MSG_ERROR([invalid target $TARGET, choose on from native,cdk]); fi AC_CANONICAL_BUILD AC_CANONICAL_HOST +targetdatadir="\${targetprefix}/share" +_targetdatadir="${_targetprefix}/share" +targetsysconfdir="\${targetprefix}/etc" +_targetsysconfdir="${_targetprefix}/etc" +targetlocalstatedir="\${targetprefix}/var" +_targetlocalstatedir="${_targetprefix}/var" +targetlibdir="\${targetprefix}/lib" +_targetlibdir="${_targetprefix}/lib" +AC_SUBST(targetprefix) +AC_SUBST(targetdatadir) +AC_SUBST(targetsysconfdir) +AC_SUBST(targetlocalstatedir) + check_path () { return $(perl -e "if(\"$1\"=~m#^/usr/(local/)?bin#){print \"0\"}else{print \"1\";}") } ]) -AC_DEFUN(TUXBOX_APPS_DIRECTORY_ONE,[ -AC_ARG_WITH($1,[ $6$7 [[PREFIX$4$5]]],[ - _$2=$withval - if test "$TARGET" = "cdk"; then - $2=`eval echo "${targetprefix}$withval"` - else - $2=$withval - fi -],[ - $2="\${$3}$5" - if test "$TARGET" = "cdk"; then - _$2=`eval echo "${target$3}$5"` - else - _$2=`eval echo "${$3}$5"` - fi -]) - -dnl automake <= 1.6 don't support this -dnl AC_SUBST($2) -AC_DEFINE_UNQUOTED($2,"$_$2",$7) -]) - AC_DEFUN(TUXBOX_APPS_DIRECTORY,[ AC_REQUIRE([TUXBOX_APPS]) -if test "$TARGET" = "cdk"; then - datadir="\${prefix}/share" - tuxboxdatadir="\${prefix}/share/tuxbox" - zoneinfodir="\${datadir}/zoneinfo" - sysconfdir="\${prefix}/etc" - localstatedir="\${prefix}/var" - localedir="\${prefix}/var" - libdir="\${prefix}/lib" - targetdatadir="\${targetprefix}/share" - targetsysconfdir="\${targetprefix}/etc" - targetlocalstatedir="\${targetprefix}/var" - targetlibdir="\${targetprefix}/lib" -fi - -TUXBOX_APPS_DIRECTORY_ONE(configdir,CONFIGDIR,sysconfdir,/etc,, - [--with-configdir=PATH ],[where to find the config files]) - -TUXBOX_APPS_DIRECTORY_ONE(datadir,DATADIR,datadir,/share,, - [--with-datadir=PATH ],[where to find data]) - -TUXBOX_APPS_DIRECTORY_ONE(localedir,LOCALEDIR,datadir,/share,/locale, - [--with-localedir=PATH ],[where to find locales]) +CONFIGDIR="\${localstatedir}/tuxbox/config" +_CONFIGDIR="${_targetlocalstatedir}/tuxbox/config" +AC_SUBST(CONFIGDIR) +AC_DEFINE_UNQUOTED(CONFIGDIR,"$_CONFIGDIR",[where to find the config files]) -TUXBOX_APPS_DIRECTORY_ONE(fontdir,FONTDIR,datadir,/share,/fonts, - [--with-fontdir=PATH ],[where to find the fonts]) +DATADIR="\${datadir}/tuxbox" +_DATADIR="${_targetdatadir}/tuxbox" +AC_SUBST(DATADIR) +AC_DEFINE_UNQUOTED(DATADIR,"$_DATADIR",[where to find data like icons]) -TUXBOX_APPS_DIRECTORY_ONE(gamesdir,GAMESDIR,localstatedir,/var,/tuxbox/games, - [--with-gamesdir=PATH ],[where games data is stored]) +FONTDIR="\${datadir}/fonts" +_FONTDIR="${_targetdatadir}/fonts" +AC_SUBST(FONTDIR) +AC_DEFINE_UNQUOTED(FONTDIR,"$_FONTDIR",[where to find the fonts]) -TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,/tuxbox, - [--with-libdir=PATH ],[where to find the internal libs]) +GAMESDIR="\${localstatedir}/tuxbox/games" +_GAMESDIR="${_targetlocalstatedir}/tuxbox/games" +AC_SUBST(GAMESDIR) +AC_DEFINE_UNQUOTED(GAMESDIR,"$_GAMESDIR",[where games data is stored]) -TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins, - [--with-plugindir=PATH ],[where to find the plugins]) +LIBDIR="\${libdir}/tuxbox" +_LIBDIR="${_targetlibdir}/tuxbox" +AC_SUBST(LIBDIR) +AC_SUBST(_LIBDIR) +AC_DEFINE_UNQUOTED(LIBDIR,"$_LIBDIR",[where to find the internal libs]) -TUXBOX_APPS_DIRECTORY_ONE(tuxboxdatadir,TUXBOXDATADIR,datadir,/share,/tuxbox, - [--with-tuxboxdatadir=PATH],[where to find tuxbox data]) +PLUGINDIR="\${libdir}/tuxbox/plugins" +_PLUGINDIR="${_targetlibdir}/tuxbox/plugins" +AC_SUBST(PLUGINDIR) +AC_DEFINE_UNQUOTED(PLUGINDIR,"$_PLUGINDIR",[where to find the plugins]) -TUXBOX_APPS_DIRECTORY_ONE(zoneinfodir,ZONEINFODIR,datadir,/share,/zoneinfo, - [--with-zoneinfodir=PATH ],[where to find zoneinfo db]) +UCODEDIR="\${localstatedir}/tuxbox/ucodes" +_UCODEDIR="${_targetlocalstatedir}/tuxbox/ucodes" +AC_SUBST(UCODEDIR) +AC_DEFINE_UNQUOTED(UCODEDIR,"$_UCODEDIR",[where to find the ucodes (firmware)]) ]) -dnl automake <= 1.6 needs this specifications -AC_SUBST(CONFIGDIR) -AC_SUBST(DATADIR) -AC_SUBST(ZONEINFODIR) -AC_SUBST(FONTDIR) -AC_SUBST(GAMESDIR) -AC_SUBST(LIBDIR) -AC_SUBST(LOCALEDIR) -AC_SUBST(PLUGINDIR) -AC_SUBST(TUXBOXDATADIR) -dnl end workaround - AC_DEFUN(TUXBOX_APPS_ENDIAN,[ AC_CHECK_HEADERS(endian.h) AC_C_BIGENDIAN ]) AC_DEFUN(TUXBOX_APPS_DRIVER,[ -#AC_ARG_WITH(driver, -# [ --with-driver=PATH path for driver sources [[NONE]]], -# [DRIVER="$withval"],[DRIVER=""]) -# -#if test -d "$DRIVER/include"; then -# AC_DEFINE(HAVE_DBOX2_DRIVER,1,[Define to 1 if you have the dbox2 driver sources]) -#else -# AC_MSG_ERROR([can't find driver sources]) -#fi - -#AC_SUBST(DRIVER) - -#CPPFLAGS="$CPPFLAGS -I$DRIVER/include" +AC_ARG_WITH(driver, + [ --with-driver=PATH path for driver sources[[NONE]]], + [DRIVER="$withval"],[DRIVER=""]) + +if test -z "$DRIVER"; then + AC_MSG_ERROR([can't find driver sources]) +fi +CPPFLAGS="$CPPFLAGS -I$DRIVER/include" +AC_SUBST(DRIVER) ]) AC_DEFUN([TUXBOX_APPS_DVB],[ @@ -208,6 +177,7 @@ else fi ]) + AC_DEFUN(_TUXBOX_APPS_LIB_CONFIG,[ AC_PATH_PROG($1_CONFIG,$2,no) if test "$$1_CONFIG" != "no"; then @@ -242,7 +212,16 @@ fi ]) AC_DEFUN(_TUXBOX_APPS_LIB_PKGCONFIG,[ -PKG_CHECK_MODULES($1,$2) +AC_REQUIRE([TUXBOX_APPS_PKGCONFIG]) +AC_MSG_CHECKING(for package $2) +if PKG_CONFIG_PATH="${prefix}/lib/pkgconfig" $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + $1_CFLAGS=$(PKG_CONFIG_PATH="${prefix}/lib/pkgconfig" $PKG_CONFIG --cflags "$2") + $1_LIBS=$(PKG_CONFIG_PATH="${prefix}/lib/pkgconfig" $PKG_CONFIG --libs "$2") +else + AC_MSG_RESULT(no) +fi + AC_SUBST($1_CFLAGS) AC_SUBST($1_LIBS) ]) @@ -369,7 +348,8 @@ AC_SUBST(DUMMYPOFILES) AC_SUBST(CATALOGS) ]) -dnl backward compatiblity + + AC_DEFUN([AC_GNU_SOURCE], [AH_VERBATIM([_GNU_SOURCE], [/* Enable GNU extensions on systems that have them. */ @@ -381,13 +361,3 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl AC_DEFINE([_GNU_SOURCE]) ]) -AC_DEFUN([AC_PROG_EGREP], -[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], - [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi]) - EGREP=$ac_cv_prog_egrep - AC_SUBST([EGREP]) -]) - diff --git a/config.h.in b/config.h.in index ceee826..3224a09 100644 --- a/config.h.in +++ b/config.h.in @@ -3,7 +3,7 @@ /* where to find the config files */ #undef CONFIGDIR -/* where to find data */ +/* where to find data like icons */ #undef DATADIR /* Enable debug messages */ @@ -19,12 +19,6 @@ /* where games data is stored */ #undef GAMESDIR -/* Define to 1 if you have the dvb includes */ -#undef HAVE_DVB - -/* Define to the version of the dvb api */ -#undef HAVE_DVB_API_VERSION - /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H @@ -61,9 +55,6 @@ /* where to find the internal libs */ #undef LIBDIR -/* where to find locales */ -#undef LOCALEDIR - /* Name of package */ #undef PACKAGE @@ -88,15 +79,12 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* where to find tuxbox data */ -#undef TUXBOXDATADIR +/* where to find the ucodes (firmware) */ +#undef UCODEDIR /* Version number of package */ #undef VERSION -/* where to find zoneinfo db */ -#undef ZONEINFODIR - /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff --git a/configure.ac b/configure.ac index 8afbada..3372c80 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ TUXBOX_APPS_LIB_PKGCONFIG(MAD,mad) TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng) TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-1.2) #TUXBOX_APPS_LIB_PKGCONFIG(XMLTREE,tuxbox-xmltree) -#TUXBOX_APPS_LIB_CONFIG(SDL,sdl-config) +TUXBOX_APPS_LIB_CONFIG(SDL,sdl-config) # fixme: decent python stuff CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS $FRIBIDI_CFLAGS $ID3TAG_CFLAGS $MAD_CFLAGS $PLUGINS_CFLAGS $PNG_CFLAGS $SIGC_CFLAGS $XMLTREE_CFLAGS $SDL_CFLAGS -I/usr/include/python2.3 -DHAVE_CPP_FILT -DMEMLEAK_CHECK" diff --git a/lib/gdi/Makefile.am b/lib/gdi/Makefile.am index c3fc655..abb75b7 100644 --- a/lib/gdi/Makefile.am +++ b/lib/gdi/Makefile.am @@ -5,4 +5,4 @@ noinst_LIBRARIES = libenigma_gdi.a libenigma_gdi_a_SOURCES = \ region.cpp grc.cpp epng.cpp erect.cpp fb.cpp font.cpp font_arabic.cpp gfbdc.cpp \ - glcddc.cpp gpixmap.cpp lcd.cpp gfont.cpp + glcddc.cpp gpixmap.cpp lcd.cpp sdl.cpp gfont.cpp diff --git a/lib/gdi/gfbdc.cpp b/lib/gdi/gfbdc.cpp index 164258d..83ffed2 100644 --- a/lib/gdi/gfbdc.cpp +++ b/lib/gdi/gfbdc.cpp @@ -157,6 +157,4 @@ void gFBDC::reloadSettings() setPalette(); } -#ifndef SDLDC -eAutoInitPtr init_gFBDC(eAutoInitNumbers::graphic-1, "GFBDC"); -#endif \ No newline at end of file +// eAutoInitPtr init_gFBDC(eAutoInitNumbers::graphic-1, "GFBDC"); diff --git a/lib/gdi/sdl.cpp b/lib/gdi/sdl.cpp index bf2b585..591487f 100644 --- a/lib/gdi/sdl.cpp +++ b/lib/gdi/sdl.cpp @@ -82,6 +82,4 @@ void gSDLDC::exec(gOpcode *o) } } -#ifdef SDLDC eAutoInitPtr init_gSDLDC(eAutoInitNumbers::graphic-1, "gSDLDC"); -#endif diff --git a/main/Makefile.am b/main/Makefile.am index 39efea2..ad838f5 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -27,9 +27,10 @@ enigma2_LDADD = \ @MAD_LIBS@ \ @PNG_LIBS@ \ @SIGC_LIBS@ \ + @SDL_LIBS@ \ -ldl -lpthread -lcrypt -lresolv -lpython2.3 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE) @rm -f enigma2$(EXEEXT) - $(CXXLINK) $(enigma2_LDFLAGS) $(enigma2_OBJECTS) -Wl,--export-dynamic -Wl,--whole-archive $(enigma2_LDADD_WHOLE) -Wl,--no-whole-archive $(enigma2_LDADD) $(LIBS) -# g++ -o enigma2$(EXEEXT) $(enigma2_LDFLAGS) $(enigma2_OBJECTS) -Wl,--export-dynamic -Wl,--whole-archive $(enigma2_LDADD_WHOLE) -Wl,--no-whole-archive $(enigma2_LDADD) $(LIBS) +# $(CXXLINK) $(enigma2_LDFLAGS) $(enigma2_OBJECTS) -Wl,--export-dynamic -Wl,--whole-archive $(enigma2_LDADD_WHOLE) -Wl,--no-whole-archive $(enigma2_LDADD) $(LIBS) + g++ -o enigma2$(EXEEXT) $(enigma2_LDFLAGS) $(enigma2_OBJECTS) -Wl,--export-dynamic -Wl,--whole-archive $(enigma2_LDADD_WHOLE) -Wl,--no-whole-archive $(enigma2_LDADD) $(LIBS) diff --git a/main/enigma-gdi.cpp b/main/enigma-gdi.cpp index 003a3cc..d0010ad 100644 --- a/main/enigma-gdi.cpp +++ b/main/enigma-gdi.cpp @@ -68,7 +68,7 @@ int main() pal[a | 0x10] = (0x111111 * a) | 0xFF; p.setPalette(pal, 0, 256); - fontRenderClass::getInstance()->AddFont("/usr/share/fonts/arial.ttf", "Arial", 100); + fontRenderClass::getInstance()->AddFont("/dbox2/cdkroot/share/fonts/arial.ttf", "Arial", 100); p.resetClip(gRegion(eRect(0, 0, 720, 576))); diff --git a/main/enigma-gui.cpp b/main/enigma-gui.cpp index 31da7a5..475a453 100644 --- a/main/enigma-gui.cpp +++ b/main/enigma-gui.cpp @@ -67,7 +67,7 @@ int main() pal[a | 0x10] = (0x111111 * a) | 0xFF; p.setPalette(pal, 0, 256); - fontRenderClass::getInstance()->AddFont("/usr/share/fonts/arial.ttf", "Arial", 100); + fontRenderClass::getInstance()->AddFont("/dbox2/cdkroot/share/fonts/arial.ttf", "Arial", 100); eWidgetDesktop dsk(eSize(720, 576)); dsk.setDC(my_dc); diff --git a/main/enigma.cpp b/main/enigma.cpp index 4f3287f..156964c 100644 --- a/main/enigma.cpp +++ b/main/enigma.cpp @@ -1,3 +1,4 @@ +#define SDLDC #include #include #include @@ -9,9 +10,7 @@ #include #include -#ifdef SDLDC #include -#endif #include #include @@ -145,7 +144,7 @@ int main(int argc, char **argv) gFBDC::getInstance(my_dc); #endif - fontRenderClass::getInstance()->AddFont("/usr/share/fonts/arial.ttf", "Arial", 100); + fontRenderClass::getInstance()->AddFont("/home/tmbinc/enigma2/fonts/arial.ttf", "Arial", 100); eWidgetDesktop dsk(eSize(720, 576)); -- 2.7.4