lib32-avifile/gcc.patch

   1 diff -wbBur avifile-0.7-0.7.45/avifile.pc avifile-0.7-0.7.45.my/avifile.pc
   2 --- avifile-0.7-0.7.45/avifile.pc       2006-03-06 12:12:26.000000000 +0300
   3 +++ avifile-0.7-0.7.45.my/avifile.pc    2009-05-25 13:10:17.347697640 +0400
   4 @@ -1,4 +1,4 @@
   5 -prefix=/var/tmp/avi6
   6 +prefix=/usr
   7  exec_prefix=${prefix}
   8  libdir=${exec_prefix}/lib
   9  includedir=${prefix}/include/avifile-0.7
  10 diff -wbBur avifile-0.7-0.7.45/include/avm_map.h avifile-0.7-0.7.45.my/include/avm_map.h
  11 --- avifile-0.7-0.7.45/include/avm_map.h        2004-02-19 14:39:56.000000000 +0300
  12 +++ avifile-0.7-0.7.45.my/include/avm_map.h     2009-05-25 13:10:21.014364635 +0400
  13 @@ -45,7 +45,7 @@
  14
  15      template <class Key1, class Value1> struct binary_tree_node
  16      {
  17 -       avm_map::pair<Key1, Value1>* entry;
  18 +       struct pair<Key1, Value1>* entry;
  19         binary_tree_node<Key1, Value1>* left;
  20         Key1 minval;
  21         binary_tree_node<Key1, Value1>* right;
  22 diff -wbBur avifile-0.7-0.7.45/include/version.h avifile-0.7-0.7.45.my/include/version.h
  23 --- avifile-0.7-0.7.45/include/version.h        2006-03-06 12:12:25.000000000 +0300
  24 +++ avifile-0.7-0.7.45.my/include/version.h     2009-05-25 13:10:16.841030758 +0400
  25 @@ -3,5 +3,5 @@
  26  #define AVIFILE_MINOR_VERSION 7
  27  #define AVIFILE_PATCHLEVEL 45
  28  #define AVIFILE_VERSION  ((AVIFILE_MAJOR_VERSION << 16) + (AVIFILE_MINOR_VERSION << 8) + AVIFILE_PATCHLEVEL)
  29 -#define AVIFILE_BUILD "CVS-0.7.45-060306-10:11-4.0.3"
  30 +#define AVIFILE_BUILD "RELEASE-0.7.45-090525-13:10-4.4.0"
  31  #endif
  32 diff -wbBur avifile-0.7-0.7.45/lib/aviplay/aviplay.cpp avifile-0.7-0.7.45.my/lib/aviplay/aviplay.cpp
  33 --- avifile-0.7-0.7.45/lib/aviplay/aviplay.cpp  2005-11-05 00:56:33.000000000 +0300
  34 +++ avifile-0.7-0.7.45.my/lib/aviplay/aviplay.cpp       2009-05-25 13:13:36.304347364 +0400
  35 @@ -242,7 +242,7 @@
  36         //printf("VSTREAMTIME %f\n", m_pVideostream->GetTime());
  37         // reading subtitles
  38         avm::string fn = m_Filename;
  39 -       char* p = strrchr(fn.c_str(), '.');
  40 +       char* p = (char*)strrchr(fn.c_str(), '.');
  41         if (p)
  42              *p = 0;
  43         InitSubtitles(m_Subfilename.size()
  44 diff -wbBur avifile-0.7-0.7.45/lib/codeckeeper.cpp avifile-0.7-0.7.45.my/lib/codeckeeper.cpp
  45 --- avifile-0.7-0.7.45/lib/codeckeeper.cpp      2004-03-10 16:27:38.000000000 +0300
  46 +++ avifile-0.7-0.7.45.my/lib/codeckeeper.cpp   2009-05-25 13:15:11.971004390 +0400
  47 @@ -143,7 +143,7 @@
  48      {
  49         char plgn[100];
  50         strcpy(plgn, "avm_codec_plugin_");
  51 -       char* x = strrchr(name, '/');
  52 +       char* x = (char*)strrchr(name, '/');
  53         strncat(plgn, x + 1, 50);
  54         x = strchr(plgn, '.');
  55         *x = 0;
  56 diff -wbBur avifile-0.7-0.7.45/lib/common/Args.cpp avifile-0.7-0.7.45.my/lib/common/Args.cpp
  57 --- avifile-0.7-0.7.45/lib/common/Args.cpp      2003-02-06 23:39:12.000000000 +0300
  58 +++ avifile-0.7-0.7.45.my/lib/common/Args.cpp   2009-05-25 13:14:38.562055811 +0400
  59 @@ -17,7 +17,7 @@
  60         {
  61              char* c = cp;
  62             char* b;
  63 -           while ((b = strchr(c, ':')))
  64 +           while ((b = (char*)strchr(c, ':')))
  65             {
  66                 *b++ = 0;
  67                 if (strlen(c))
  68 @@ -259,7 +259,7 @@
  69      }
  70      for (unsigned i = 0; i < arr.size(); i++)
  71      {
  72 -       char* par = strchr(arr[i], '=');
  73 +       char* par = (char*)strchr(arr[i], '=');
  74         if (par)
  75         {
  76             *par = 0;
  77 @@ -335,7 +335,7 @@
  78             {
  79                 for (unsigned j = 1; j < arr.size(); j++)
  80                 {
  81 -                   char* p = strchr(arr[j].c_str(), '=');
  82 +                   char* p = (char*)strchr(arr[j].c_str(), '=');
  83                     int val = 0;
  84                     bool valid = false;
  85                     if (p)
  86 diff -wbBur avifile-0.7-0.7.45/player/playercontrol.cpp avifile-0.7-0.7.45.my/player/playercontrol.cpp
  87 --- avifile-0.7-0.7.45/player/playercontrol.cpp 2005-09-27 17:40:09.000000000 +0400
  88 +++ avifile-0.7-0.7.45.my/player/playercontrol.cpp      2009-05-25 13:16:18.274330659 +0400
  89 @@ -764,7 +764,7 @@
  90         return;
  91
  92      avm::string path = RS("url", ".");
  93 -    char* cut = strrchr(path.c_str(), '/');
  94 +    char* cut = (char*)strrchr(path.c_str(), '/');
  95      if (!cut)
  96         path = "./";
  97  #if QT_VERSION <= 220
  98 diff -wbBur avifile-0.7-0.7.45/plugins/libmp3lame_audioenc/mp3encoder.cpp avifile-0.7-0.7.45.my/plugins/libmp3lame_audioenc/mp3encoder.cpp
  99 --- avifile-0.7-0.7.45/plugins/libmp3lame_audioenc/mp3encoder.cpp       2006-03-05 23:45:26.000000000 +0300
 100 +++ avifile-0.7-0.7.45.my/plugins/libmp3lame_audioenc/mp3encoder.cpp    2009-05-25 13:10:21.014364635 +0400
 101 @@ -30,7 +30,7 @@
 102         short  nCodecDelay;
 103      };
 104  public:
 105 -    MP3Encoder::MP3Encoder(const CodecInfo& info, const WAVEFORMATEX* format)
 106 +    MP3Encoder(const CodecInfo& info, const WAVEFORMATEX* format)
 107         :IAudioEncoder(info)
 108      {
 109         in_fmt=*format;
 110 diff -wbBur avifile-0.7-0.7.45/samples/qtvidcap/kv4lsetup.cpp avifile-0.7-0.7.45.my/samples/qtvidcap/kv4lsetup.cpp
 111 --- avifile-0.7-0.7.45/samples/qtvidcap/kv4lsetup.cpp   2005-03-23 18:18:21.000000000 +0300
 112 +++ avifile-0.7-0.7.45.my/samples/qtvidcap/kv4lsetup.cpp        2009-05-25 13:10:21.014364635 +0400
 113 @@ -229,7 +229,7 @@
 114      if (XF86DGAQueryExtension(dpy, &foo, &bar)) {
 115         XF86DGAQueryDirectVideo(dpy, XDefaultScreen(dpy),&flags);
 116         if (flags & XF86DGADirectPresent) {
 117 -           XF86DGAGetVideoLL(dpy,XDefaultScreen(dpy),(int*)&base,&width,&foo,&bar);
 118 +           XF86DGAGetVideoLL(dpy,XDefaultScreen(dpy),(unsigned int*)&base,&width,&foo,&bar);
 119             set_bpl  = width * set_bpp/8;
 120             set_base = base;
 121             if (verbose == 2) {
 122 diff -wbBur avifile-0.7-0.7.45/samples/qtvidcap/v4lxif.cpp avifile-0.7-0.7.45.my/samples/qtvidcap/v4lxif.cpp
 123 --- avifile-0.7-0.7.45/samples/qtvidcap/v4lxif.cpp      2005-03-23 19:16:09.000000000 +0300
 124 +++ avifile-0.7-0.7.45.my/samples/qtvidcap/v4lxif.cpp   2009-05-25 13:10:21.014364635 +0400
 125 @@ -1115,7 +1115,7 @@
 126                      major,minor, XDGA_MAJOR_VERSION,XDGA_MINOR_VERSION);
 127                 have_dga= false;
 128             } else {
 129 -               XF86DGAGetVideoLL(disp, DefaultScreen(disp), (int*)&base, &width, &bank, &ram);
 130 +               XF86DGAGetVideoLL(disp, DefaultScreen(disp), (unsigned int*)&base, &width, &bank, &ram);
 131                 if (!base)
 132                     avml(AVML_WARN,
 133                          "v4l1: can not allocate frame buffer base: %p\n", base);