Mercurial > mplayer.hg
changeset 7423:ad967766679a
hpux DVD support fixes by Martin Gansser <mgansser@ngi.de>
| author | arpi |
|---|---|
| date | Mon, 16 Sep 2002 20:46:31 +0000 |
| parents | 69d6da12bc30 |
| children | 915bd635068e |
| files | configure libmpdemux/dvdauth.c libmpdvdkit2/dvd_reader.c |
| diffstat | 3 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon Sep 16 19:46:02 2002 +0000 +++ b/configure Mon Sep 16 20:46:31 2002 +0000 @@ -3106,7 +3106,7 @@ echocheck "DVD support (libmpdvdkit)" if test "$_dvdkit" = auto ; then _dvdkit=no - if linux || freebsd || netbsd || darwin || cygwin || openbsd || sunos; then + if linux || freebsd || netbsd || darwin || cygwin || openbsd || sunos || hpux; then test -f "./libmpdvdkit2/Makefile" && _dvdkit=yes test -f "./libmpdvdkit/Makefile" && _dvdkit=yes fi @@ -4711,7 +4711,7 @@ #define DEFAULT_CDROM_DEVICE "/vol/dev/aliases/cdrom0" #define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE #elif defined(HPUX) -#define DEFAULT_CDROM_DEVICE "/dev/cdrom:" +#define DEFAULT_CDROM_DEVICE "/dev/cdrom" #define DEFAULT_DVD_DEVICE "/dev/dvd" #elif defined(WIN32) #define DEFAULT_CDROM_DEVICE "D:"
--- a/libmpdemux/dvdauth.c Mon Sep 16 19:46:02 2002 +0000 +++ b/libmpdemux/dvdauth.c Mon Sep 16 20:46:31 2002 +0000 @@ -40,6 +40,8 @@ # include <linux/cdrom.h> #elif defined(__sun) # include <sun/dvdio.h> +#elif defined(hpux) +# include <sun/scsi.h> #elif defined(__bsdi__) # include <dvd.h> #else
--- a/libmpdvdkit2/dvd_reader.c Mon Sep 16 19:46:02 2002 +0000 +++ b/libmpdvdkit2/dvd_reader.c Mon Sep 16 20:46:31 2002 +0000 @@ -37,6 +37,8 @@ #if defined(__sun) #include <sys/mnttab.h> +#elif defined(hpux) +#include </usr/conf/h/mnttab.h> #elif defined(SYS_BSD) #include <fstab.h> #elif defined(__linux__)