[MPlayer-dev-eng] OpenBSD patch

Arpi arpi at thot.banki.hu
Thu Apr 25 12:45:41 CEST 2002


Hi,

> @@ -169,6 +172,9 @@.
>  		ioctl(dvd, DVDIOCREPORTKEY, &ai);.
>  	}.
>  #else.
> +#if defined(__OpenBSD__).
> +        union.
> +#endif.
>          dvd_authinfo ai;.
>          int i;.
>          for (i = 0; i < 4; i++) {.

i don't understand this change

> +#ifdef __OpenBSD__.
> +#define ASMSYM "_".
> +#else.
> +#define ASMSYM.
> +#endif.
>  int dvd_auth ( char *dev , char *filename ).
>  {.
>      	DVDHandle dvd;  /* DVD device handle */.
> @@ -223,12 +233,12 @@.
>  fprintf(stderr,"DVD: %s\n  Hint: use libcss version 0.1!\n",dlerror());\.
>  return 1; }.
>  .
> -	CSS_DLSYM(dl_CSSisEncrypted,"CSSisEncrypted");.
> -	CSS_DLSYM(dl_CSSAuthDisc,"CSSAuthDisc");.
> -	CSS_DLSYM(dl_CSSAuthTitle,"CSSAuthTitle");.
> -	CSS_DLSYM(dl_CSSGetASF,"CSSGetASF");.
> -	CSS_DLSYM(dl_CSSDecryptTitleKey,"CSSDecryptTitleKey");.
> -	CSS_DLSYM(dl_CSSDescramble,"CSSDescramble");.
> +	CSS_DLSYM(dl_CSSisEncrypted,ASMSYM"CSSisEncrypted");.
> +	CSS_DLSYM(dl_CSSAuthDisc,ASMSYM"CSSAuthDisc");.
> +	CSS_DLSYM(dl_CSSAuthTitle,ASMSYM"CSSAuthTitle");.
> +	CSS_DLSYM(dl_CSSGetASF,ASMSYM"CSSGetASF");.
> +	CSS_DLSYM(dl_CSSDecryptTitleKey,ASMSYM"CSSDecryptTitleKey");.
> +	CSS_DLSYM(dl_CSSDescramble,ASMSYM"CSSDescramble");.

is this the best solution?
imho libdl.so should handle the '_' problems, shouldn't?
or at least the CSS_DLSYM() macro

>  #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__).
> +#include <machine/segments.h>.
>  #include <machine/sysarch.h>.
>  #endif.

does this machine/segments.h exists (and required) on all BSD ?


A'rpi / Astral & ESP-team

--
Developer of MPlayer, the Movie Player for Linux - http://www.MPlayerHQ.hu



More information about the MPlayer-dev-eng mailing list