[MPlayer-dev-eng] [PATCH] Fix compilation on OpenBSD

[Diego Biurrun]

On Mon, Nov 17, 2008 at 11:25:53PM +0300, Andrew Savchenko wrote:
> 
> the following patches fix complation of mplayer svn head on 
> openbsd-4.2.
> 
> 1) socklen_t data type is defined in sys/types.h in OpenBSD, thus 
> compilation fails with the following:
> =======
> stream/network.h:29: error: conflicting types for `socklen_t'
> /usr/include/sys/types.h:161: error: previous declaration of 
> `socklen_t'
> =======
> socklen_t.patch fixes this.

Patch is fine, commit anytime.

But I do wonder why this does not cause you problems with FFmpeg.  Have
you just tested FFmpeg within MPlayer?

> 2) Include directories reported by pkg-config for theora are not 
> included in $_inc_extra, thus if theora is not installed in 
> standard location, compilation fails due to unknown header file 
> "theora/theora.h". In case on OpenBSD theora's headers are usually 
> installed in the /usr/local/include.
> theora_local.patch is the fix for this.

Hmmm, /usr/local/include should always be in the search path...

> --- configure	(revision 27949)
> +++ configure	(working copy)
> @@ -6055,6 +6055,7 @@
>  EOF
>    for _ld_theora in "`$_pkg_config --silence-errors --libs --cflags theora`" "-ltheora -logg"; do
>      cc_check $_ld_theora && _ld_extra="$_ld_extra $_ld_theora" \
> +                         && _inc_extra="$_inc_extra `$_pkg_config --silence-errors --cflags theora`" \
>                           && _theora=yes && break
>    done

Hmm, that will subtly break if the pkg-config call fails, but Theora is
installed.

Diego