Mercurial > mplayer.hg
changeset 6956:0380dfad2db9
HPUX porting fixes - patch by Gansser, Martin <MGansser@rand.de>
| author | arpi |
|---|---|
| date | Fri, 09 Aug 2002 21:30:21 +0000 |
| parents | 03520738aaf4 |
| children | bbff6ac5797c |
| files | configure libao2/ao_sdl.c libmpcodecs/native/msvidc.c libvo/vo_sdl.c |
| diffstat | 4 files changed, 26 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Fri Aug 09 18:08:57 2002 +0000 +++ b/configure Fri Aug 09 21:30:21 2002 +0000 @@ -57,6 +57,7 @@ } linux() { issystem "Linux" ; return "$?" ; } sunos() { issystem "SunOS" ; return "$?" ; } +hpux() { issystem "HP-UX" ; return "$?" ; } irix() { issystem "IRIX" ; return "$?" ; } cygwin() { issystem "CYGWIN" ; return "$?" ; } freebsd() { issystem "FreeBSD" ; return "$?" ; } @@ -309,6 +310,9 @@ IRIX*) system_name=IRIX ;; + HP-UX*) + system_name=HP-UX + ;; [cC][yY][gG][wW][iI][nN]*) system_name=CYGWIN ;; @@ -340,6 +344,7 @@ ppc) host_arch=ppc ;; alpha) host_arch=alpha ;; sparc*) host_arch=sparc ;; + 9000*) host_arch=hppa ;; arm*) host_arch=arm ;; s390) host_arch=s390 ;; s390x) host_arch=s390x ;; @@ -815,6 +820,15 @@ _mcpu='' ;; + hppa) + _def_arch='#define ARCH_PA_RISC 1' + _target_arch='TARGET_ARCH_PA_RISC = yes' + iproc='PA-RISC' + proc='' + _march='' + _mcpu='' + ;; + s390) _def_arch='#define ARCH_S390 1' _target_arch='TARGET_ARCH_S390 = yes' @@ -3987,6 +4001,10 @@ # use gnu style cpp on Darwin CFLAGS="$CFLAGS -no-cpp-precomp -DSYS_DARWIN" fi +if hpux ; then + # use flag for HPUX missing setenv() + CFLAGS="$CFLAGS -DHPUX" +fi # Thread support if linux ; then CFLAGS="$CFLAGS -D_REENTRANT" @@ -3994,7 +4012,6 @@ # FIXME bsd needs this so maybe other OS'es CFLAGS="$CFLAGS -D_THREAD_SAFE" fi - # 64 bit file offsets? if test "$_largefiles" = yes || freebsd ; then CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" @@ -4487,6 +4504,9 @@ #ifdef sun #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_DVD_DEVICE "/dev/dvd" #elif defined(WIN32) #define DEFAULT_CDROM_DEVICE "D:" #define DEFAULT_DVD_DEVICE "D:"
--- a/libao2/ao_sdl.c Fri Aug 09 18:08:57 2002 +0000 +++ b/libao2/ao_sdl.c Fri Aug 09 21:30:21 2002 +0000 @@ -95,8 +95,8 @@ // end ring buffer stuff -#if defined(sun) && defined(__svr4__) -/* setenv is missing on solaris */ +#if defined(HPUX) || defined(sun) && defined(__svr4__) +/* setenv is missing on solaris and HPUX */ static void setenv(const char *name, const char *val, int _xx) { int len = strlen(name) + strlen(val) + 2;
--- a/libmpcodecs/native/msvidc.c Fri Aug 09 18:08:57 2002 +0000 +++ b/libmpcodecs/native/msvidc.c Fri Aug 09 21:30:21 2002 +0000 @@ -11,6 +11,7 @@ #include "config.h" #include "bswap.h" +#define quad quad_m #define LE_16(x) (le2me_16(*(unsigned short *)(x)))
--- a/libvo/vo_sdl.c Fri Aug 09 18:08:57 2002 +0000 +++ b/libvo/vo_sdl.c Fri Aug 09 21:30:21 2002 +0000 @@ -143,8 +143,8 @@ #include <SDL.h> //#include <SDL/SDL_syswm.h> -#if defined(sun) && defined(__svr4__) -/* setenv is missing on solaris */ +#if defined(HPUX) || defined(sun) && defined(__svr4__) +/* setenv is missing on solaris and HPUX */ static void setenv(const char *name, const char *val, int _xx) { int len = strlen(name) + strlen(val) + 2;