[MPlayer-dev-eng] [PATCH] Fix libdvdcss on OS/2

[Diego Biurrun]

On Tue, Jan 22, 2013 at 09:14:13AM -0800, Dave Yeo wrote:
> On 01/22/13 03:32 am, Diego Biurrun wrote:
> >On Tue, Jan 22, 2013 at 11:49:48AM +0100, Erik Auerswald wrote:
> >>On Tue, Jan 22, 2013 at 11:14:54AM +0100, Diego Biurrun wrote:
> >>>On Mon, Jan 21, 2013 at 11:47:56PM -0800, Dave Yeo wrote:
> >>>>r35807 seems to have broke compilation on OS/2 due to OS/2 having
> >>>>direct.h and it being unconditionally checked for.
> >>>
> >>>How can a check break OS/2?  The issue must be somewhere else.
> >>
> >>By activating a Windows-specific feature that was deactivated before...
> >
> >Yes, but how exactly?
> 
> libdvdcss/libdvdcss.c: In function 'dvdcss_open':
> libdvdcss/libdvdcss.c:242: error: expected ')' before '*' token
> libdvdcss/libdvdcss.c:249: error: 'MAX_PATH' undeclared (first use
> in this function)
> libdvdcss/libdvdcss.c:249: error: (Each undeclared identifier is
> reported only once
> libdvdcss/libdvdcss.c:249: error: for each function it appears in.)
> libdvdcss/libdvdcss.c:250: error: 'HINSTANCE' undeclared (first use
> in this function)
> libdvdcss/libdvdcss.c:250: error: expected ';' before 'p_dll'
> ...
> [more errors]
> 
> > And does upstream libdvdcss work?
> 
> Yes, the direct_h test includes win.h
> 
> >In any case patches to libdvdcss should be submitted upstream.
> 
> Or don't unconditionally include direct.h. It is only used in
> dvdcss.c and libavformat/os_support.h where it is wrapped in a
> #ifdef _WIN32.
> I'll look into it more after work

Please look into upstream libdvdcss and patch that, MPlayer can later
pick up the fix from there.

Diego