[MPlayer-cvslog] r20441 - in trunk: Copyright libmpdvdkit2/common.h libmpdvdkit2/device.c libmpdvdkit2/device.h libmpdvdkit2/libdvdcss.c libmpdvdkit2/libdvdcss.h libmpdvdkit2/libdvdcss_changes.diff

[Robert Swain]

Hello,

On 25/10/06, diego <subversion at mplayerhq.hu> wrote:
> Author: diego
> Date: Wed Oct 25 13:55:06 2006
> New Revision: 20441
>
> Removed:
>    trunk/libmpdvdkit2/libdvdcss_changes.diff
> Modified:
>    trunk/Copyright
>    trunk/libmpdvdkit2/common.h
>    trunk/libmpdvdkit2/device.c
>    trunk/libmpdvdkit2/device.h
>    trunk/libmpdvdkit2/libdvdcss.c
>    trunk/libmpdvdkit2/libdvdcss.h
>
> Log:
> Sync with upstream r201.
>
>
> Modified: trunk/libmpdvdkit2/device.c
> ==============================================================================
> --- trunk/libmpdvdkit2/device.c (original)
> +++ trunk/libmpdvdkit2/device.c Wed Oct 25 13:55:06 2006
> @@ -1,14 +1,11 @@
>  /*****************************************************************************
>   * device.h: DVD device access
>   *****************************************************************************
> - * Copyright (C) 1998-2002 VideoLAN
> - *
> - * Modified for use with MPlayer, changes contained in libdvdcss_changes.diff.
> - * detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/
> + * Copyright (C) 1998-2006 VideoLAN
>   * $Id$
>   *
>   * Authors: St�phane Borel <stef at via.ecp.fr>
> - *          Samuel Hocevar <sam at zoy.org>
> + *          Sam Hocevar <sam at zoy.org>
>   *          H�kan Hjort <d95hjort at dtek.chalmers.se>
>   *
>   * This program is free software; you can redistribute it and/or modify
> @@ -58,6 +55,16 @@
>  #   include <sys/uio.h>                                      /* struct iovec */
>  #endif
>
> +#ifdef DARWIN_DVD_IOCTL
> +#   include <paths.h>
> +#   include <CoreFoundation/CoreFoundation.h>
> +#   include <IOKit/IOKitLib.h>
> +#   include <IOKit/IOBSD.h>
> +#   include <IOKit/storage/IOMedia.h>
> +#   include <IOKit/storage/IOCDMedia.h>
> +#   include <IOKit/storage/IODVDMedia.h>
> +#endif
> +
>  #include "dvdcss/dvdcss.h"
>
>  #include "common.h"

This now requires that "-framework IOKit" be present when finally
linking I think. I was getting undefined symbols on various IO*
symbols and --extra-libs="-framework IOKit" fixed the issue. I don't
know how to properly fix this so I thought I'd just make you aware of
it. :)

Kind regards,
Rob