code.vuplus.com Git - vuplus_openembedded/blob - packages/tuxbox/tuxbox-tuxtxt-32bpp/makelib.diff

   1 diff -ru tuxtxt.org/configure.ac tuxtxt/configure.ac
   2 --- tuxtxt.org/configure.ac     2008-05-22 11:30:43.000000000 +0200
   3 +++ tuxtxt/configure.ac 2008-05-22 11:37:20.000000000 +0200
   4 @@ -1,5 +1,9 @@
   5 -AC_INIT(tuxbox-tuxtxt-32bpp,1.96)
   6 -AM_INIT_AUTOMAKE(tuxbox-tuxtxt-32bpp,1.96)
   7 +AC_INIT(libtuxtxt32bpp,1.96)
   8 +AM_INIT_AUTOMAKE(libtuxtxt32bpp,1.96)
   9 +
  10 +AM_PROG_LIBTOOL
  11 +
  12 +AC_DISABLE_STATIC
  13
  14  TUXBOX_APPS
  15  TUXBOX_APPS_DIRECTORY
  16 diff -ru tuxtxt.org/Makefile.am tuxtxt/Makefile.am
  17 --- tuxtxt.org/Makefile.am      2008-05-22 11:30:43.000000000 +0200
  18 +++ tuxtxt/Makefile.am  2008-05-22 11:37:20.000000000 +0200
  19 @@ -6,13 +6,14 @@
  20         @FREETYPE_CFLAGS@ \
  21         -funsigned-char \
  22         -I$(top_srcdir)/include \
  23 -       -I$(prefix)/$(includedir)/tuxbox/tuxtxt
  24 +       -I$(prefix)/$(includedir)/tuxbox/tuxtxt
  25
  26 -bin_PROGRAMS = tuxtxt
  27 -tuxtxt_LDADD = -lpthread -lz \
  28 +libtuxtxt32bpp_la_LIBADD = -lpthread -lz \
  29         @FREETYPE_LIBS@ \
  30         @TUXTXT_LIBS@
  31
  32 -tuxtxt_SOURCES = tuxtxt.c
  33 +lib_LTLIBRARIES = libtuxtxt32bpp.la
  34 +
  35 +libtuxtxt32bpp_la_SOURCES = tuxtxt.c
  36
  37  install_DATA = tuxtxt2.conf
  38 diff -ru tuxtxt.org/tuxtxt.c tuxtxt/tuxtxt.c
  39 --- tuxtxt.org/tuxtxt.c 2008-05-23 10:32:31.000000000 +0200
  40 +++ tuxtxt/tuxtxt.c     2008-05-23 10:33:53.000000000 +0200
  41 @@ -317,7 +317,7 @@
  42   * main loop                                                                  *
  43   ******************************************************************************/
  44
  45 -int main(int argc, char **argv)
  46 +int tuxtxt_run_ui(int pid)
  47  {
  48         char cvs_revision[] = "$Revision: 1.99 $";
  49
  50 @@ -333,18 +333,8 @@
  51         printf("TuxTxt %s\n", versioninfo);
  52         printf("for 32bpp framebuffer\n");
  53
  54 -       /* get params */
  55 -       tuxtxt_cache.vtxtpid = fb = lcd = rc = sx = ex = sy = ey = -1;
  56 -       if (argc==1)
  57 -       {
  58 -               printf("\nUSAGE: tuxtxt vtpid\n");
  59 -               printf("No PID given, so scanning for PIDs ...\n\n");
  60 -               tuxtxt_cache.vtxtpid=0;
  61 -       }
  62 -       else
  63 -       {
  64 -               tuxtxt_cache.vtxtpid = atoi(argv[1]);
  65 -       }
  66 +       fb = lcd = rc = sx = ex = sy = ey = -1;
  67 +       tuxtxt_cache.vtxtpid = pid;
  68
  69         /* open Framebuffer */
  70         if ((fb=open("/dev/fb/0", O_RDWR)) == -1)
  71 Only in tuxtxt: tuxtxt.c.orig