Commit 9c669a9f authored by Sam Hocevar's avatar Sam Hocevar

* ./modules/visualization/xosd/xosd.c: support for libxosd 1.0.0.

  * ./configure.in: added check for libxosd version.
parent 4df679a4
This diff is collapsed.
......@@ -724,7 +724,7 @@ then
CPPFLAGS="${save_CPPFLAGS} ${test_CFLAGS}"
AC_CHECK_HEADERS(dvdread/dvd_reader.h, [
AC_TRY_COMPILE([#include <dvdread/dvd_reader.h>],
[void foo() { int i=DVD_VIDEO_LB_LEN; }],[
[int foo() { return DVD_VIDEO_LB_LEN; }],[
PLUGINS="${PLUGINS} access/dvdread/dvdread"
dvdread_LDFLAGS="${dvdread_LDFLAGS} ${test_LDFLAGS} -ldvdread"
dvdread_CFLAGS="${dvdread_CFLAGS} ${test_CFLAGS}"
......@@ -1800,6 +1800,9 @@ AC_ARG_ENABLE(xosd,
if test "x${enable_xosd}" = "xyes"
then
AC_CHECK_HEADER(xosd.h, have_xosd="true", have_xosd="false")
AC_TRY_COMPILE([#include <xosd.h>],
[void foo() { xosd_init("foo","bar",12,XOSD_top,2,12,42); }],,
AC_DEFINE(HAVE_OLD_XOSD_H, 1, Define if <xosd.h> is pre-1.0.0))
if test "x${have_xosd}" = "xtrue"
then
PLUGINS="${PLUGINS} visualization/xosd/xosd"
......
......@@ -2,7 +2,7 @@ Source: vlc
Section: graphics
Priority: optional
Maintainer: Samuel Hocevar <sam@zoy.org>
Build-Depends: debhelper (>=2.2.0), xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt-dev, libasound2-dev (>=0.9.0beta10a), libarts-dev, libmad0-dev, liblircclient-dev, a52dec-dev, aalib1-dev, libdvbpsi1-dev, mozilla-dev, kdelibs-dev, dvb-dev, libdv-dev
Build-Depends: debhelper (>=2.2.0), xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt-dev, libasound2-dev (>=0.9.0beta10a), libarts-dev, libmad0-dev, liblircclient-dev, a52dec-dev, aalib1-dev, libdvbpsi1-dev, mozilla-dev, kdelibs-dev, dvb-dev, libdv-dev, libxosd-dev (>=1.0.2-1)
Standards-Version: 3.5.6
Package: vlc
......
......@@ -226,6 +226,9 @@
/* Define if you have the <gtk/gtk.h> header file. */
#undef HAVE_GTK_GTK_H
/* Define if you have the <id3tag.h> header file. */
#undef HAVE_ID3TAG_H
/* Define if you have the <image.h> header file. */
#undef HAVE_IMAGE_H
......@@ -419,6 +422,9 @@
/* Indicate whether we should use SDL/SDL.h or SDL11/SDL.h */
#undef SDL_INCLUDE_FILE
/* Define if <xosd.h> is pre-1.0.0 */
#undef HAVE_OLD_XOSD_H
/* big endian system */
#undef WORDS_BIGENDIAN
......
......@@ -2,7 +2,7 @@
* xosd.c : X On Screen Display interface
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: xosd.c,v 1.1 2002/08/04 17:23:44 sam Exp $
* $Id: xosd.c,v 1.2 2002/08/19 08:30:56 sam Exp $
*
* Authors: Loc Minier <lool@videolan.org>
*
......@@ -101,7 +101,11 @@ static int Open( vlc_object_t *p_this )
/* Initialize library */
p_intf->p_sys->p_osd =
#ifdef HAVE_OLD_XOSD_H
xosd_init( "fixed", "LawnGreen", 3, XOSD_top, 0, 1 );
#else
xosd_init( "fixed", "LawnGreen", 3, XOSD_top, 0, 0, 1 );
#endif
/* Initialize to NULL */
p_intf->p_sys->psz_source = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment