* All: Compilation fixes for Solaris 9, courtesy of Mats Rojestal

diff --git a/THANKS b/THANKS
index 0a315dbd2ebe805e1e1ef2098576fc865540056d..1bfd8f91da5679bcd04ac9147df519b5f8a39f19 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -22,7 +22,7 @@ Bill Eldridge <bill@rfa.org> - documentation
 Brieuc Jeunhomme <bbp@via.ecp.fr> - bug fixes
 Bruno Vella <allevb@tin.it> - Italian localization
 Carlo Calabrò <murray@via.ecp.fr> - Italian localization
-Carsten Gottbehüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fixüt <gottbehuet at active-elements dot de> - v4l hotplug fix
+Carsten Gottbehüt <gottbehuet at active-elements dot de> - v4l hotplug fix
 Christof Baumgaertner - dbox web intf
 Christopher Johnson <cjohnson@mint.net> - Qt fix in vlc.spec
 Colin Simmonds <colin_simmonds@Mac.lover.org> - compile fix for Mac OS X
@@ -55,6 +55,7 @@ Mark Gritter <mgritter@kealia.com> - fix for netlist packet leak in demuxPSI
 Markus Kern <markus-kern at gmx dot net> - video output window fixes (win32)
 Markus Kuespert <ltlBeBoy@beosmail.com> - BeOS CSS support
 Mathias Kretschmer <mathias@research.att.com> - IP Multicast support
+Mats Rojestal <mats.rojestal at bredband dot net> - compilation fixes for Solaris 9
 Matthieu Lochegnies <lochegm1@cti.ecp.fr> - MPEG audio emphasis fix
 Max Rudberg <max_08 at mac.com> - Mac OS X controller art (v0.7.0)
 Michael Mondragon <mammon@lokmail.net> - ncurses compilation fix

diff --git a/configure.ac b/configure.ac
index f7b6a30f082d1fd7f85acdd375258fb2fb104566..8428850fa2de9cedc805a75add3ad69686efaa1f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1882,7 +1882,7 @@ then
       AC_MSG_RESULT(no)
       AC_MSG_ERROR([cannot find ${real_ffmpeg_tree}/libavcodec/libavcodec.a, make sure you compiled libavcodec in ${with_ffmpeg_tree}])
     fi
-    if ! grep -q "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then
+    if ! fgrep -s "pp_get_context" "${real_ffmpeg_tree}/libavcodec/libavcodec.a"; then
       dnl  The given libavcodec wasn't built with --enable-pp
       AC_MSG_RESULT(no)
       AC_MSG_ERROR([${real_ffmpeg_tree}/libavcodec/libavcodec.a was not compiled with postprocessing support, make sure you configured ffmpeg with --enable-pp])

diff --git a/modules/gui/skins2/controls/ctrl_list.cpp b/modules/gui/skins2/controls/ctrl_list.cpp
index e9e6988712f2fad8b99b7030c6b81bb69330155f..722c77ae74dbb4f4dacd191368c56949e649ebed 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_list.cpp
+++ b/modules/gui/skins2/controls/ctrl_list.cpp
@@ -34,6 +34,9 @@
 #include "../events/evt_mouse.hpp"
 #include "../events/evt_scroll.hpp"
 #include "vlc_keys.h"
+#ifdef sun
+#   include "solaris_specific.h" // for lrint
+#endif
 
 #define SCROLL_STEP 0.05
 #define LINE_INTERVAL 1  // Number of pixels inserted between 2 lines

diff --git a/modules/gui/skins2/utils/bezier.cpp b/modules/gui/skins2/utils/bezier.cpp
index f7a2f2dd1012b16290a026f4c611590c71508bef..9502f2ba060876188c7a280a6df32163cca6eebd 100644 (file)
--- a/modules/gui/skins2/utils/bezier.cpp
+++ b/modules/gui/skins2/utils/bezier.cpp
@@ -2,7 +2,7 @@
  * bezier.cpp
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: bezier.cpp,v 1.5 2004/03/03 22:57:15 asmax Exp $
+ * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
  *          Olivier Teulière <ipkiss@via.ecp.fr>
@@ -24,6 +24,9 @@
 
 #include "bezier.hpp"
 #include <math.h>
+#ifdef sun
+#   include "solaris_specific.h" // for lrintf
+#endif
 
 
 Bezier::Bezier( intf_thread_t *p_intf, const vector<float> &rAbscissas,

diff --git a/modules/gui/skins2/x11/x11_display.cpp b/modules/gui/skins2/x11/x11_display.cpp
index 6dea87605f1964abfa807ef65a0ee8028b6b5ae5..83909565f7659b6725c2fc5b388125a10eba5805 100644 (file)
--- a/modules/gui/skins2/x11/x11_display.cpp
+++ b/modules/gui/skins2/x11/x11_display.cpp
@@ -24,6 +24,7 @@
 
 #ifdef X11_SKINS
 
+#include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/shape.h>
 

diff --git a/modules/gui/skins2/x11/x11_graphics.cpp b/modules/gui/skins2/x11/x11_graphics.cpp
index 9296b03e5a511c2dc51d3d72202dee8620da2492..c3a45071837d808bce3d5bfbd777eca1e96196cd 100644 (file)
--- a/modules/gui/skins2/x11/x11_graphics.cpp
+++ b/modules/gui/skins2/x11/x11_graphics.cpp
@@ -25,6 +25,8 @@
 #ifdef X11_SKINS
 
 #include <stdlib.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 #include <X11/extensions/shape.h>
 
 #include "x11_display.hpp"