*** empty log message ***

4 files changed, 6 insertions, 335 deletions

diff --git a/media-video/xanim-export/files/Makefile b/media-video/xanim-export/files/Makefile
index 1b9eb169d61a..377cb8178caa 100644
--- a/media-video/xanim-export/files/Makefile
+++ b/media-video/xanim-export/files/Makefile
@@ -535,7 +535,7 @@ XA_MISC_DEFS = $(XA_CMAP) $(XA_XTPTR) $(XA_SHARED) $(XA_MULTIBUF) $(XA_MACH_DEFS
 #  FINAL CFLAGS and OTHER_LIBS
 #
 
-XA_DEFS = $(XA_MISC_DEFS) $(XA_MOD_DEFS) $(XA_AUDIO_DEFS) -DXA_PETUNIA -DXA_KPCD -DXA_EXPORT_QT
+XA_DEFS = $(XA_MISC_DEFS) $(XA_MOD_DEFS) $(XA_AUDIO_DEFS) -DXA_PETUNIA -DXA_KPCD -DXA_EXPORT -DXA_EXPORT_QT
 XA_LIBS = $(XA_X11R6_LIBS) $(XA_MACH_LIBS) $(XA_MOD_LIBS) $(XA_AUDIO_LIBS) -lpthread quicktime/quicktime/libquicktime.a -ljpeg -lpng -lz
 XA_INCS = $(INCLUDE) $(XA_VIDEO_INCS) $(XA_AUDIO_INCS) -Iquicktime/quicktime
 CFLAGS	=  $(DEBUG) $(OPTIMIZE)
@@ -634,3 +634,4 @@ xa_wav.o: xanim.h xa_config.h xa_avi.h xa_wav.c
 xa_8svx.o: xanim.h xa_8svx.h xa_8svx.c
 xa_x11.o:  xanim.h xa_config.h xa_x11.h xa_x11.c
 xa_gsm.o: xanim.h xa_gsm_state.h xa_gsm.h xa_gsm.c
+
diff --git a/media-video/xanim-export/files/xa_audio.h b/media-video/xanim-export/files/xa_audio.h
deleted file mode 100644
index dda2aa44a1ec..000000000000
--- a/media-video/xanim-export/files/xa_audio.h
+++ /dev/null
@@ -1,213 +0,0 @@
-
-/*
- * xa_audio.h
- *
- * Copyright (C) 1994-1998,1999 by Mark Podlipec.
- * All rights reserved.
- *
- * This software may be freely used, copied and redistributed without
- * fee for non-commerical purposes provided that this copyright
- * notice is preserved intact on all copies.
- *
- * There is no warranty or other guarantee of fitness of this software.
- * It is provided solely "as is". The author disclaims all
- * responsibility and liability with respect to this software's usage
- * or its effect upon hardware or computer systems.
- *
- */
-
-
-#include "xanim.h"
-#include <Intrinsic.h>
-#include <StringDefs.h>
-#include <Shell.h>
-
-#include "xa_x11.h"
-#include "xa_ipc.h"
-#include "xa_ipc_cmds.h"
-#include "xa_export.h"
-
-extern xaULONG xa_forkit;
-
-/* Rather than spend time figuring out which ones are common
- * across machine types, just redo them all each time.
- * Eventually I'll simplify.
- */
-
-
-/*********************** SPARC INCLUDES ********************************/
-#ifdef XA_SPARC_AUDIO
-/* Sun 4.1 -I/usr/demo/SOUND/multimedia ??? */
-#include <errno.h>
-#include <fcntl.h>
-#include <stropts.h>
-#ifdef SVR4         /* was SOLARIS */
-#include <sys/audioio.h>
-#else
-#include <sun/audioio.h>
-#endif
-#include <sys/file.h>
-#include <sys/stat.h>
-#endif
-
-/*********************** DEC Multimedia Services INCLUDES = **************/
-#ifdef XA_MMS_AUDIO
-/*
-#ifdef BYTE
-#undef BYTE
-#endif
-#ifdef WORD
-#undef WORD
-#endif
-#ifdef LONG
-#undef LONG
-#endif
-#ifdef UWORD
-#undef UWORD
-#endif
-#ifdef SHORT
-#undef SHORT
-#endif
-*/
-#include <mme/mme_api.h>
-#ifdef XA_MMS_160
-#include <mme/mmsystem.h>
-#endif
-#endif
-
-
-/*********************** IBM S6000 INCLUDES ******************************/
-#ifdef XA_AIX_AUDIO
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/audio.h>
-#include <stropts.h>
-#include <sys/types.h>
-#include <sys/file.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#endif
-
-/*********************** NEC EWS INCLUDES ******************************/
-#ifdef XA_EWS_AUDIO
-#include <errno.h>
-#include <sys/audio.h>
-#endif
-
-/*********************** SONY NEWS INCLUDES ****************************/
-#ifdef XA_SONY_AUDIO
-#include <errno.h>
-#ifdef SVR4
-#include <sys/sound.h>
-#else /* SVR4 */
-#include <newsiodev/sound.h>
-#endif
-#endif /* XA_SONY_AUDIO */
-
-/*********************** NetBSD INCLUDES *******************************/
-#ifdef XA_NetBSD_AUDIO
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/audioio.h>
-#include <sys/file.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/ioccom.h>
-#endif
-
-
-/*********************** LINUX INCLUDES ********************************/
-#ifdef XA_LINUX_AUDIO
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/time.h>
-/* POD NOTE: possibly <machine/soundcard.h> ???*/
-
-#if defined(__bsdi__) && _BSDI_VERSION < 199510
-#include <i386/isa/sblast.h>
-#define SNDCTL_DSP_SYNC DSP_IOCTL_FLUSH
-#define SNDCTL_DSP_STEREO DSP_IOCTL_STEREO
-#define SNDCTL_DSP_SPEED DSP_IOCTL_SPEED
-  /* #define SNDCTL_DSP_SAMPLESIZE */
-  /* #define SNDCTL_DSP_GETBLKSIZE this value is ignored anyway */
-#define SOUND_MIXER_READ_DEVMASK MIXER_IOCTL_READ_PARAMS
-#define SOUND_MIXER_PCM 10 /* to make sure it's ignored */
-#define SOUND_MIXER_VOLUME MIXER_IOCTL_SET_LEVELS
-#define MIXER_WRITE(n) n
-#define _FILE_DSP "/dev/sb_dsp"
-#define _FILE_MIXER "/dev/sb_mixer"
-#else
-#define _FILE_DSP "/dev/dsp"
-#define _FILE_MIXER "/dev/mixer"
-#ifdef __FreeBSD__
-#include <machine/soundcard.h>
-#else
-#include <sys/soundcard.h>
-#endif
-#endif  /* end __bsdi__ */
-
-#endif /* end LINUX */
-
-/*********************** SGI INCLUDES **********************************/
-#ifdef XA_SGI_AUDIO
-#include <errno.h>
-#include <fcntl.h>
-#include <stropts.h>
-#include <sys/time.h>
-#include <audio.h>
-#include <math.h>
-#endif
-
-/*********************** HP INCLUDES ***********************************/
-#ifdef XA_HP_AUDIO
-#include <fcntl.h>
-#include <time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <errno.h>
-#ifdef XA_HP10
-#include <Alib.h>
-#include <CUlib.h>
-#else /* HPUX 9.x */
-#include <audio/Alib.h>
-#include <audio/CUlib.h>
-#endif
-#endif
-
-#ifdef XA_HPDEV_AUDIO
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <time.h>
-#include <errno.h>
-#include <sys/audio.h>
-#endif
-
-
-/*********************** AF(AudioFile) INCLUDES ************************/
-#ifdef XA_AF_AUDIO
-#include <AF/audio.h>
-#include <AF/AFlib.h>
-#include <AF/AFUtils.h>
-#endif
-
-/*********************** NAS(Network Audio System) INCLUDES *************/
-#ifdef XA_NAS_AUDIO
-#undef xaBYTE
-#include <audio/audiolib.h>
-#include <audio/soundlib.h>
-#include <audio/Xtutil.h>
-#endif
-
-/*********************** TOWNS Linux INCLUDES **************************/
-#ifdef XA_TOWNS_AUDIO
-#include <linux/fmmidi.h>
-#endif
-
-/*********************** TOWNS Linux 8 bit PCM INCLUDES *****************/
-#ifdef XA_TOWNS8_AUDIO
-#endif
-
-
-/*********************** END   INCLUDES ********************************/
-
diff --git a/media-video/xanim-export/files/xa_ipc.h b/media-video/xanim-export/files/xa_ipc.h
deleted file mode 100644
index 1f4890a94979..000000000000
--- a/media-video/xanim-export/files/xa_ipc.h
+++ /dev/null
@@ -1,119 +0,0 @@
-
-/*
- * xa_ipc.h
- *
- * Copyright (C) 1995-1998,1999 by Mark Podlipec. 
- * All rights reserved.
- *
- * This software may be freely used, copied and redistributed without
- * fee for non-commerical purposes provided that this copyright
- * notice is preserved intact on all copies.
- * 
- * There is no warranty or other guarantee of fitness of this software.
- * It is provided solely "as is". The author disclaims all
- * responsibility and liability with respect to this software's usage
- * or its effect upon hardware or computer systems.
- *
- */
-/****************
- * Rev History
- *
- * 03Jun95 - Created
- *
- *******************************/
-
-
-#include <errno.h>
-#include "xa_export.h"
-
-/* POD: Make this as big as possible without breaking pipes */
-/* #define XA_IPC_CHUNK 16384 */
-
-#ifdef XA_SOCKET
-#define XA_IPC_CHUNK 4096    /* or higher?? */
-#else  /* PIPE */
-#define XA_IPC_CHUNK 256
-#endif
-
-/*                               */
-#define XA_IPC_ERR		0x00000
-#define XA_IPC_OK		0x00001
-#define XA_IPC_TOD		0x00002
-#define XA_IPC_BOFL		0x00003
-/*                               */
-#define XA_IPC_HELLO		0x00010
-/*                               */
-#define XA_IPC_FILE		0x00100
-#define XA_IPC_UNFILE		0x00101
-#define XA_IPC_FNAME		0x00102
-#define XA_IPC_PLAY_FILE	0x00103
-#define XA_IPC_N_FILE		0x00104
-#define XA_IPC_P_FILE		0x00105
-#define XA_IPC_SND_INIT		0x00106
-#define XA_IPC_SND_ADD		0x00107
-#define XA_IPC_SND_BUF		0x00108
-#define XA_IPC_RST_TIME		0x00109
-#define XA_IPC_VID_TIME		0x0010a
-#define XA_IPC_MERGEFILE	0x0010b
-/*                               */
-#define XA_IPC_AUD_EXPORT	0x001ff
-#define XA_IPC_AUD_SETUP	0x00200
-#define XA_IPC_AUD_INIT		0x00201
-#define XA_IPC_AUD_KILL		0x00202
-#define XA_IPC_AUD_PREP		0x00203
-#define XA_IPC_AUD_ON		0x00204
-#define XA_IPC_AUD_OFF		0x00205
-#define XA_IPC_AUD_PORT		0x00206
-#define XA_IPC_AUD_STOG		0x00207
-#define XA_IPC_AUD_HTOG		0x00208
-#define XA_IPC_AUD_LTOG		0x00209
-
-#define XA_IPC_AUD_ENABLE	0x0020a
-#define XA_IPC_AUD_MUTE		0x0020b
-#define XA_IPC_AUD_VOL 		0x0020c
-#define XA_IPC_AUD_RATE		0x0020d
-#define XA_IPC_AUD_DEV 		0x0020e
-#define XA_IPC_AUD_FFLAG	0x0020f
-#define XA_IPC_AUD_BFLAG	0x00210
-/*                               */
-#define XA_IPC_GET_CFREQ	0x00300
-#define XA_IPC_GET_BSIZE	0x00301
-#define XA_IPC_GET_STATUS	0x00302
-#define XA_IPC_GET_PRESENT	0x00303
-/*                               */
-#define XA_IPC_SET_AUDBUFF	0x00400
-#define XA_IPC_SET_KLUDGE2	0x00401
-#define XA_IPC_SET_KLUDGE900	0x00402
-/*                               */
-#define XA_IPC_EXIT		0x0FFFF
-/*                               */
-#define XA_IPC_ACK_OK		0x10001
-#define XA_IPC_ACK_ERR		0x10002
-#define XA_IPC_ACK_BYE		0x10003
-
-typedef struct
-{
-  xaULONG cmd;
-   xaLONG time;
-  xaULONG len;
-  xaULONG id;
-  xaULONG value;
-} XA_IPC_HDR;
-
-#define XA_FD_READ  0
-#define XA_FD_WRITE 1
-#define XA_IAM_VIDEO 1
-#define XA_IAM_AUDIO 2
-
-typedef struct STRUCT_XA_AUD_HDR
-{
-  xaULONG num;
-  char *filename;
-  xaULONG max_faud_size;
-  XA_SND *first_snd;    /* ptr to first sound chunk */
-  XA_SND *last_snd;     /* ptr to last sound chunk */
-  void (*init_aud)();
-  struct STRUCT_XA_AUD_HDR *next;
-  struct STRUCT_XA_AUD_HDR *prev;
-} XA_AUD_HDR;
-
diff --git a/media-video/xanim-export/xanim-export-2.80.1.ebuild b/media-video/xanim-export/xanim-export-2.80.1.ebuild
index 6badaaa2c088..1ff530222db7 100644
--- a/media-video/xanim-export/xanim-export-2.80.1.ebuild
+++ b/media-video/xanim-export/xanim-export-2.80.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/xanim-export/xanim-export-2.80.1.ebuild,v 1.1 2000/09/08 20:33:34 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xanim-export/xanim-export-2.80.1.ebuild,v 1.2 2000/09/08 20:44:21 achim Exp $
 
 A="xanim_exporting_edition.tar.gz xa1.0_cyuv_linuxELFg21.o.gz xa2.0_cvid_linuxELFg21.o.gz
    xa2.1_iv32_linuxELFg21.o.gz"
@@ -24,8 +24,9 @@ src_unpack() {
   cp ${DISTDIR}/xa2.1_iv32_linuxELFg21.o.gz .
   gunzip xa2.1_iv32_linuxELFg21.o.gz
   cd ${S}
+  rm xanim
   sed -e "s:-O2:${CFLAGS}:" ${FILESDIR}/Makefile > ${S}/Makefile
-  cp ${FILESDIR}/*.h .
+#  cp ${FILESDIR}/*.h .
 }
 src_compile() {
 
@@ -48,3 +49,4 @@ src_install () {
 }
 
 
+