Merge from 1.1 branch.

10 files changed, 28 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index f205af39b..181051c28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,9 @@ xine-lib (1.1.90) (Unreleased)
 xine-lib (1.1.8) (Unreleased)
   * Send a channel changed event to the frontend when receiving the SYNC
     string from last.fm streaming server.
+  * Disable mediaLib support by default (the licenses probably disallow the
+    distribution of xine binaries built against mediaLib, and on non-VIS
+    capable boxes is probably worse than our own code).
 
 xine-lib (1.1.7)
   * Support libdca (new name for libdts) by shuffling around the dts.h file.
diff --git a/m4/pthreads.m4 b/m4/pthreads.m4
index 826dbc72b..d29f0d660 100644
--- a/m4/pthreads.m4
+++ b/m4/pthreads.m4
@@ -22,7 +22,7 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [
        *-darwin*) PTHREAD_CFLAGS=""		;;
        *-solaris*)
                   # Handle Studio compiler
-                  CC_CHECK_CFLAGS([-mt], [PTHREAD_CFLAGS="-mt -D_REENTRANT"], [PTHREAD_CFLAGS="-D_REENTRANT"]);;
+                  CC_CHECK_CFLAGS([-mt], [PTHREAD_CFLAGS="-mt"]);;
        *)	  PTHREAD_CFLAGS="-pthread"	;;
      esac
   fi
@@ -31,8 +31,8 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [
        *-hpux11*) PTHREAD_LIBS="-lpthread"	;;
        *-darwin*) PTHREAD_LIBS=""		;;
        *-solaris*)
-                  # Handle Studio compiler
-                  CC_CHECK_CFLAGS([-mt], [PTHREAD_LIBS="-lpthread -lposix4 -lrt"], [PTHREAD_LIBS="-lpthread -lposix4 -lrt"]);;
+                  # Use the same libraries for gcc and sun studio cc
+                  PTHREAD_LIBS="-lpthread -lposix4 -lrt";;
        *)	  PTHREAD_LIBS="-pthread"	;;
      esac
   fi
diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c
index ac7458726..12083d26f 100644
--- a/src/demuxers/demux_flac.c
+++ b/src/demuxers/demux_flac.c
@@ -192,7 +192,7 @@ static int open_flac_file(demux_flac_t *flac) {
       lprintf ("VORBIS_COMMENT metadata\n");
       {
         char comments[block_length];
-        void *ptr = comments;
+        char *ptr = comments;
         uint32_t length, user_comment_list_length;
         int cn;
         char *comment;
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 38ad0be82..d29b08c49 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -120,7 +120,7 @@
 
 #define BUFSIZE 16384
 
-#define NOPID 0xffff
+#define DVB_NOPID 0xffff
 
 /* define stream types 
  * administrative/system PIDs first */
@@ -662,7 +662,7 @@ static int dvb_set_pidfilter(dvb_input_plugin_t * this, int filter, ushort pid,
 {
     tuner_t *tuner = this->tuner;
 
-   if(this->channels[this->channel].pid [filter] !=NOPID) {
+   if(this->channels[this->channel].pid [filter] !=DVB_NOPID) {
       ioctl(tuner->fd_pidfilter[filter], DMX_STOP);
     }
    
@@ -685,7 +685,7 @@ static int dvb_set_sectfilter(dvb_input_plugin_t * this, int filter, ushort pid,
 {
     tuner_t *tuner = this->tuner;
 
-    if(this->channels[this->channel].pid [filter] !=NOPID) {
+    if(this->channels[this->channel].pid [filter] !=DVB_NOPID) {
       ioctl(tuner->fd_pidfilter[filter], DMX_STOP);
     }
     
@@ -1153,7 +1153,7 @@ static void parse_pmt(dvb_input_plugin_t *this, const unsigned char *buf, int se
 	    * parsing the descriptor. */
 	    if(has_subs <= MAX_SUBTITLES) {
               xprintf(this->stream->xine,XINE_VERBOSITY_LOG,"input_dvb: Adding SUBTITLES: PID 0x%04x\n", elementary_pid);
-               if(this->channels[this->channel].subpid [has_subs] !=NOPID) {
+               if(this->channels[this->channel].subpid [has_subs] !=DVB_NOPID) {
                   ioctl(this->tuner->fd_subfilter[has_subs], DMX_STOP);
                }
                this->channels[this->channel].subpid [has_subs] = elementary_pid;
@@ -3063,7 +3063,7 @@ static int dvb_plugin_open(input_plugin_t * this_gen)
 
     /* Clear all pids, the pmt will tell us which to use */
     for (x = 0; x < MAX_FILTERS; x++){
-      this->channels[this->channel].pid[x] = NOPID;
+      this->channels[this->channel].pid[x] = DVB_NOPID;
     }  
 
 
diff --git a/src/input/libdvdnav/bswap.h b/src/input/libdvdnav/bswap.h
index 36543fba5..2a2d222fe 100644
--- a/src/input/libdvdnav/bswap.h
+++ b/src/input/libdvdnav/bswap.h
@@ -41,6 +41,12 @@
 #define B2N_32(x) x = bswap_32(x)
 #define B2N_64(x) x = bswap_64(x)
 
+#elif defined(__SVR4) && defined(__sun)
+#include <sys/byteorder.h>
+#define B2N_16(x) x = BSWAP_16(x)
+#define B2N_32(x) x = BSWAP_32(x)
+#define B2N_64(x) x = BSWAP_64(x)
+
 #elif defined(__APPLE__)
 #include <libkern/OSByteOrder.h>
 #define B2N_16(x) x = OSSwapBigToHostInt16(x)
@@ -67,11 +73,11 @@
 
 /* This is a slow but portable implementation, it has multiple evaluation 
  * problems so beware.
- * Old FreeBSD's and Solaris don't have <byteswap.h> or any other such 
+ * Old FreeBSD and Windows don't have <byteswap.h> or any other such 
  * functionality! 
  */
 
-#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__)
+#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__)
 #define B2N_16(x) \
  x = ((((x) & 0xff00) >> 8) | \
       (((x) & 0x00ff) << 8))
diff --git a/src/input/libreal/rmff.c b/src/input/libreal/rmff.c
index 0c4ee2ccd..419c5252e 100644
--- a/src/input/libreal/rmff.c
+++ b/src/input/libreal/rmff.c
@@ -30,14 +30,9 @@
 */
 
 #include "xineutils.h"
+#include "bswap.h"
 #include "rmff.h"
 
-#define BE_16(x)  ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1])
-#define BE_32(x)  ((((uint8_t*)(x))[0] << 24) | \
-                   (((uint8_t*)(x))[1] << 16) | \
-                   (((uint8_t*)(x))[2] << 8) | \
-                    ((uint8_t*)(x))[3])
-
 /*
  * writes header data to a buffer
  */
diff --git a/src/input/vcd/xine-extra.h b/src/input/vcd/xine-extra.h
index cde9a26f6..2f8b12a71 100644
--- a/src/input/vcd/xine-extra.h
+++ b/src/input/vcd/xine-extra.h
@@ -49,7 +49,7 @@
   In short this writes a message to buffer 'buf' and to stdout.
 */
 void 
-xine_vlog_msg(xine_t *this, int buf, const char *format, va_list args);
+xine_vlog_msg(xine_t *this, int buf, const char *format, va_list args) XINE_FORMAT_PRINTF(3, 0);
 
 /*! This routine is like xine_log, except it takes a va_list instead
   of a variable number of arguments and writes to stderr rather than
@@ -58,7 +58,7 @@ xine_vlog_msg(xine_t *this, int buf, const char *format, va_list args);
 
   In short this writes a message to buffer 'buf' and to stderr.
 */
-void xine_vlog_err(xine_t *this, int buf, const char *format, va_list args);
+void xine_vlog_err(xine_t *this, int buf, const char *format, va_list args) XINE_FORMAT_PRINTF(3, 0);
 
 /*! Call this before calling any of the xine_log_msg or xine_log_err
   routines. It sets up the xine buffer that will be used in error
diff --git a/src/video_out/x11osd.c b/src/video_out/x11osd.c
index f1e0656d1..dbfa53ec7 100644
--- a/src/video_out/x11osd.c
+++ b/src/video_out/x11osd.c
@@ -436,7 +436,7 @@ void x11osd_clear(x11osd *osd)
   osd->clean = WIPED;
 }
 
-#define TRANSPARENT 0xffffffff
+#define X11OSD_TRANSPARENT 0xffffffff
 
 #define saturate(n, l, u) ((n) < (l) ? (l) : ((n) > (u) ? (u) : (n)))
 
@@ -526,13 +526,13 @@ void x11osd_blend(x11osd *osd, vo_overlay_t *overlay)
               }
             }
             else {
-              palette[use_clip_palette][j] = TRANSPARENT;
+              palette[use_clip_palette][j] = X11OSD_TRANSPARENT;
             }
           }
           max_palette_colour[use_clip_palette] = overlay->rle[i].color;
         }
 
-        if(palette[use_clip_palette][overlay->rle[i].color] != TRANSPARENT) {
+        if(palette[use_clip_palette][overlay->rle[i].color] != X11OSD_TRANSPARENT) {
           XSetForeground(osd->display, osd->gc, palette[use_clip_palette][overlay->rle[i].color]);
           XFillRectangle(osd->display, osd->bitmap, osd->gc, overlay->x + x, overlay->y + y, width, 1);
 	  if(osd->mode==X11OSD_SHAPED)
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index b8c3a1fd2..ab34a11e9 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -1045,7 +1045,7 @@ static int osd_search(osd_fontchar_t *array, size_t n, uint16_t code) {
  * get next unicode value 
  */
 static uint16_t osd_iconv_getunicode(xine_t *xine, 
-				     iconv_t *cd, const char *encoding, ICONV_CONST char **inbuf,
+				     iconv_t cd, const char *encoding, ICONV_CONST char **inbuf,
 				     size_t *inbytesleft) {
   uint16_t unicode;
   char *outbuf = (char*)&unicode;
diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c
index 166d7a3ef..a4a7ecbf9 100644
--- a/src/xine-engine/xine_interface.c
+++ b/src/xine-engine/xine_interface.c
@@ -947,7 +947,7 @@ xine_post_out_t * xine_get_audio_source(xine_stream_t *stream) {
 int _x_message(xine_stream_t *stream, int type, ...) {
   xine_ui_message_data_t *data;
   xine_event_t            event;
-  char                   *explanation;
+  const char              *explanation;
   int                     size;
   int                     n;
   va_list                 ap;