diff options
author | wiz <wiz@pkgsrc.org> | 2019-05-02 07:58:03 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2019-05-02 07:58:03 +0000 |
commit | 2e9bc2e545f299084f2847467dfd2b5c13644a98 (patch) | |
tree | f6a4fbdaeec30a876bc593deb1220ebcb5ab4f5f /multimedia | |
parent | b4173da627f2d9b21c332908e70a48c4c0effd8e (diff) | |
download | pkgsrc-2e9bc2e545f299084f2847467dfd2b5c13644a98.tar.gz |
xanim: remove
This program used binary objects for the codes; these object files are from
1999 or earlier. The original site for this program has long disappeared, and
AFAICT there is one mirror left with only a part of the files this package
would like to use.
Use a source-code player like mpv or mplayer or ffmplay instead.
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/Makefile | 3 | ||||
-rw-r--r-- | multimedia/xanim/DESCR | 24 | ||||
-rw-r--r-- | multimedia/xanim/Makefile | 59 | ||||
-rw-r--r-- | multimedia/xanim/Makefile.codecs | 67 | ||||
-rw-r--r-- | multimedia/xanim/PLIST | 3 | ||||
-rw-r--r-- | multimedia/xanim/distinfo | 62 | ||||
-rw-r--r-- | multimedia/xanim/patches/patch-aa | 31 | ||||
-rw-r--r-- | multimedia/xanim/patches/patch-ab | 55 | ||||
-rw-r--r-- | multimedia/xanim/patches/patch-ae | 25 | ||||
-rw-r--r-- | multimedia/xanim/patches/patch-xa__input.c | 59 | ||||
-rw-r--r-- | multimedia/xanim/patches/patch-xa__x11.c | 89 |
11 files changed, 1 insertions, 476 deletions
diff --git a/multimedia/Makefile b/multimedia/Makefile index fbbee8d6be9..75170540f8b 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.268 2018/12/06 19:53:30 leot Exp $ +# $NetBSD: Makefile,v 1.269 2019/05/02 07:58:03 wiz Exp $ # COMMENT= Multimedia utilities @@ -212,7 +212,6 @@ SUBDIR+= vlc2 SUBDIR+= win32-codecs SUBDIR+= x264-devel SUBDIR+= x265 -SUBDIR+= xanim SUBDIR+= xawtv SUBDIR+= xfce4-mpc-plugin SUBDIR+= xfce4-thunar-media-tags diff --git a/multimedia/xanim/DESCR b/multimedia/xanim/DESCR deleted file mode 100644 index bfc9f89b69c..00000000000 --- a/multimedia/xanim/DESCR +++ /dev/null @@ -1,24 +0,0 @@ -XAnim is a program that can display animations of various -formats on systems running X11. XAnim currently supports -the following animation types: - - + FLI animations. - + FLC animations. - + IFF animations. - + GIF87a and GIF89a files. - + GIF89a animation extension support. - + a kludgy text file listing gifs and what order - to show them in. - + DL animations. Formats 1, 2 and partial 3. - + Amiga MovieSetter animations(For those Eric - Schwartz fans). - + Utah Raster Toolkit RLE images and anims. - + AVI animations. - + MPEG animations. - + WAV audio files may have their sound added to - any animation type that doesn't already have - audio, by specifying the .wav file after the - animation file on the command line. Currently - only the PCM audio codec is supported. - + any combination of the above on the same command - line. diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile deleted file mode 100644 index 91a155a4064..00000000000 --- a/multimedia/xanim/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# $NetBSD: Makefile,v 1.22 2017/01/19 18:52:19 agc Exp $ - -DISTNAME= xanim2920 -PKGNAME= xanim-2.92.0 -PKGREVISION= 3 -CATEGORIES= multimedia x11 -MASTER_SITES= ftp://ftp.informatik.uni-hamburg.de/pub/soft/graphics/xanim/ -MASTER_SITES+= ftp://ftp.informatik.uni-hamburg.de/pub/soft/graphics/xanim/modules/ -MASTER_SITES+= ftp://ftp.nstu.ru/pub/mirrors/xanim.va.pubnix.com/ -MASTER_SITES+= ftp://ftp.nstu.ru/pub/mirrors/xanim.va.pubnix.com/modules/ -DISTFILES= ${EXTRACT_ONLY} ${CODEC_FILES} - -MAINTAINER= pkgsrc-users@NetBSD.org -COMMENT= Play a variety of simple animation formats and show pictures -HOMEPAGE= http://xanim.polter.net/ -LICENSE= xanim-license - -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -.include "Makefile.codecs" - -USE_IMAKE= YES -USE_TOOLS+= gunzip - -.include "../../mk/bsd.prefs.mk" - -MAKE_ENV+= ${XANIM_AUDIO.${OPSYS}} -XANIM_AUDIO.Linux= XA_AUDIO_DEFS="-DXA_LINUX_AUDIO" \ - XA_AUDIO_LIBS="-lc" - -PKG_OPTIONS_VAR= PKG_OPTIONS.xanim -PKG_SUPPORTED_OPTIONS= oss - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Moss) -XANIM_AUDIO.NetBSD= XA_AUDIO_DEFS="-DXA_LINUX_AUDIO" \ - XA_AUDIO_LIBS="${LIBOSSAUDIO}" -.else -XANIM_AUDIO.NetBSD= XA_AUDIO_DEFS="-DXA_NetBSD_AUDIO" -.endif - -XANIM_AUDIO.SunOS= XA_AUDIO_DEFS="-DXA_SPARC_AUDIO -DSVR4 -DXA_SELECT" - -post-extract: - ${LN} -s docs/xanim.man ${WRKSRC} - ${MKDIR} ${WRKSRC}/mods -.if defined(CODEC_FILES) && !empty(CODEC_FILES) - for file in ${CODEC_FILES}; do \ - ${CP} ${DISTDIR}/$$file ${WRKSRC}/mods; \ - ${GUNZIP_CMD} ${WRKSRC}/mods/$$file; \ - done -.endif - -.include "../../devel/zlib/buildlink3.mk" -.include "../../x11/libXext/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" -.include "../../mk/oss.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/multimedia/xanim/Makefile.codecs b/multimedia/xanim/Makefile.codecs deleted file mode 100644 index cb9305da231..00000000000 --- a/multimedia/xanim/Makefile.codecs +++ /dev/null @@ -1,67 +0,0 @@ -# $NetBSD: Makefile.codecs,v 1.3 2006/04/22 09:22:12 rillig Exp $ - -.include "../../mk/bsd.prefs.mk" - -# cvid Radius Cinepak video decompression for AVI and Quicktime -# cyuv Creative CYUV video decompression for AVI -# iv32 Intel YVU9 and Indeo 3.2 decompression for AVI and Quicktime -# -XANIM_CODECS?= ${_XANIM_UNRESTRICTED_CODECS} -#XANIM_CODECS?= ${_XANIM_UNRESTRICTED_CODECS} ${_XANIM_RESTRICTED_CODECS} -_XANIM_RESTRICTED_CODECS= cyuv iv32 -_XANIM_UNRESTRICTED_CODECS= cvid - -_XANIM_CODEC.cvid.i386-a.out= xa2.0_cvid_netbsd386.o.gz -_XANIM_CODEC.cyuv.i386-a.out= xa1.0_cyuv_netbsd386.o.gz -_XANIM_CODEC.iv32.i386-a.out= xa2.0_iv32_netbsd386.o.gz - -_XANIM_CODEC.cvid.m68k-a.out= xa2.0_cvid_netbsd68k.o.gz -_XANIM_CODEC.cyuv.m68k-a.out= xa1.0_cyuv_netbsd68k.o.gz -_XANIM_CODEC.iv32.m68k-a.out= xa2.0_iv32_netbsd68k.o.gz - -_XANIM_CODEC.cvid.i386-ELF= xa2.0_cvid_linuxELF.o.gz -_XANIM_CODEC.cyuv.i386-ELF= xa1.0_cyuv_linuxELF.o.gz -_XANIM_CODEC.iv32.i386-ELF= xa2.0_iv32_linuxELF.o.gz - -_XANIM_CODEC.cvid.sparc-a.out= xa2.0_cvid_sparcCOFF.o.gz -_XANIM_CODEC.cyuv.sparc-a.out= xa1.0_cyuv_sparcAOUT.o.gz -_XANIM_CODEC.iv32.sparc-a.out= xa2.0_iv32_sparcCOFF.o.gz - -_XANIM_CODEC.cvid.sparc-ELF= xa2.0_cvid_sparcELF.o.gz -_XANIM_CODEC.cyuv.sparc-ELF= xa1.0_cyuv_sparcELF.o.gz -_XANIM_CODEC.iv32.sparc-ELF= xa2.0_iv32_sparcELF.o.gz - -_XANIM_CODEC.cvid.powerpc-ELF= xa2.0_cvid_linuxPPC.o.gz -_XANIM_CODEC.cyuv.powerpc-ELF= xa1.0_cyuv_linuxPPC.o.gz - -_XANIM_DEF.cvid= XA_CVID_DEF="-DXA_CVID" -_XANIM_DEF.cyuv= XA_CYUV_DEF="-DXA_CYUV" -_XANIM_DEF.iv32= XA_IV32_DEF="-DXA_IV32" - -_XANIM_LIB.cvid= XA_CVID_LIB -_XANIM_LIB.cyuv= XA_CYUV_LIB -_XANIM_LIB.iv32= XA_IV32_LIB - -_XANIM_MACH_TYPE= ${MACHINE_ARCH}-${OBJECT_FMT} - -.for _codec_ in ${XANIM_CODECS} -. if defined(_XANIM_CODEC.${_codec_}.${_XANIM_MACH_TYPE}) -CODECS+= ${_codec_} -CODEC_FILES+= ${_XANIM_CODEC.${_codec_}.${_XANIM_MACH_TYPE}} -MAKE_ENV+= ${_XANIM_DEF.${_codec_}} -MAKE_ENV+= ${_XANIM_LIB.${_codec_}}="mods/${_XANIM_CODEC.${_codec_}.${_XANIM_MACH_TYPE}:S/.gz$//}" -. if !empty(_XANIM_RESTRICTED_CODECS:M${_codec_}) -_RESTRICTED_CODECS+= ${_codec_} -. endif -. endif -.endfor - -BUILD_DEFS+= CODECS - -.if defined(_RESTRICTED_CODECS) -RESTRICTED= Can't mirror/distribute object modules: ${_RESTRICTED_CODECS}. -NO_SRC_ON_FTP= ${RESTRICTED} -NO_SRC_ON_CDROM= ${RESTRICTED} -NO_BIN_ON_FTP= ${RESTRICTED} -NO_BIN_ON_CDROM= ${RESTRICTED} -.endif diff --git a/multimedia/xanim/PLIST b/multimedia/xanim/PLIST deleted file mode 100644 index 0bbc8a04586..00000000000 --- a/multimedia/xanim/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 15:19:52 jmmv Exp $ -bin/xanim -${IMAKE_MAN_DIR}/xanim.${IMAKE_MANNEWSUFFIX} diff --git a/multimedia/xanim/distinfo b/multimedia/xanim/distinfo deleted file mode 100644 index e26df53a60c..00000000000 --- a/multimedia/xanim/distinfo +++ /dev/null @@ -1,62 +0,0 @@ -$NetBSD: distinfo,v 1.8 2015/11/03 23:54:33 agc Exp $ - -SHA1 (xanim2920.tar.gz) = 8adb5948cc6fd9bba5417aee4d319b5f041830e8 -RMD160 (xanim2920.tar.gz) = dae33cdbd9f20388a067df8269b625f2594cdfb9 -SHA512 (xanim2920.tar.gz) = 4c3c39d4fca42a6fdce80b3f4fddb300fc714c1466590e8f0d4c0b6f732c15c06604b059d8a6d3661d31dc54f967d789699b6c0fcbac1422b751673e46516455 -Size (xanim2920.tar.gz) = 431258 bytes -SHA1 (xa2.0_cvid_netbsd386.o.gz) = eace3d11b675d39dfa1d6522e963d3ec7185ba11 -RMD160 (xa2.0_cvid_netbsd386.o.gz) = 38159bb4b92b08475845df0e8a8ee4f01ef8be72 -Size (xa2.0_cvid_netbsd386.o.gz) = 2936 bytes -SHA1 (xa1.0_cyuv_netbsd386.o.gz) = 74da189ed5afb316e55ed359a8a4264e8f097863 -RMD160 (xa1.0_cyuv_netbsd386.o.gz) = 0c3c47f9ae439ccdad0424b5668042a46472aea7 -Size (xa1.0_cyuv_netbsd386.o.gz) = 827 bytes -SHA1 (xa2.0_iv32_netbsd386.o.gz) = 14ed3d5b3385af3ba58f1f76e5858cbf6955db00 -RMD160 (xa2.0_iv32_netbsd386.o.gz) = 40de38ee6572158c9275c2c651e3ad7c8833dc06 -Size (xa2.0_iv32_netbsd386.o.gz) = 28560 bytes -SHA1 (xa2.0_cvid_netbsd68k.o.gz) = eb8150b9c4e6960abb885e8aae7adc41b1310d02 -RMD160 (xa2.0_cvid_netbsd68k.o.gz) = 1627c7691cef564351948bcabea59fb823229fe3 -Size (xa2.0_cvid_netbsd68k.o.gz) = 2723 bytes -SHA1 (xa1.0_cyuv_netbsd68k.o.gz) = 1d6ac822ae35a6035901be560291663e6c1f01d2 -RMD160 (xa1.0_cyuv_netbsd68k.o.gz) = abdb391e6315ebe292c9778e4dc64e0dad5fe2d1 -Size (xa1.0_cyuv_netbsd68k.o.gz) = 815 bytes -SHA1 (xa2.0_iv32_netbsd68k.o.gz) = 8802dd29566281ea3d864898c35c9b664c27309b -RMD160 (xa2.0_iv32_netbsd68k.o.gz) = 0584e8df83cc1981d155ff427fcda52dad3dd4bf -Size (xa2.0_iv32_netbsd68k.o.gz) = 26741 bytes -SHA1 (xa2.0_cvid_linuxELF.o.gz) = ee89eac0b33bcee81093464824eed75aa52213f3 -RMD160 (xa2.0_cvid_linuxELF.o.gz) = a3835a5f07b5eaeafcc8dea9766c8e0d49a60746 -Size (xa2.0_cvid_linuxELF.o.gz) = 3174 bytes -SHA1 (xa1.0_cyuv_linuxELF.o.gz) = abca2c4ef91d540746fc34268468a33d1e09bf25 -RMD160 (xa1.0_cyuv_linuxELF.o.gz) = 59a1f05fd5f4667beb1a7394460217f0e99c778f -Size (xa1.0_cyuv_linuxELF.o.gz) = 1075 bytes -SHA1 (xa2.0_iv32_linuxELF.o.gz) = 05871ed3db8121cde6cbe56be100c7ea3dc454e7 -RMD160 (xa2.0_iv32_linuxELF.o.gz) = 5c5ea2d110f0b03fe4e3d00234df989a86d2f4d7 -Size (xa2.0_iv32_linuxELF.o.gz) = 28656 bytes -SHA1 (xa2.0_cvid_sparcCOFF.o.gz) = f8cf4111b33e7d27a5745ac5f671115bce3f81ee -RMD160 (xa2.0_cvid_sparcCOFF.o.gz) = ef7c902ff571e7112068875e42e9c9fc4ee3796c -Size (xa2.0_cvid_sparcCOFF.o.gz) = 3346 bytes -SHA1 (xa1.0_cyuv_sparcAOUT.o.gz) = 6d54a0c3d7f3fa7a400f9ff2cf7a48422ef22ada -RMD160 (xa1.0_cyuv_sparcAOUT.o.gz) = eb603066abcd1f3e8c612968e07bd3758e68c33c -Size (xa1.0_cyuv_sparcAOUT.o.gz) = 922 bytes -SHA1 (xa2.0_iv32_sparcCOFF.o.gz) = 81710d2167eb023179597aeb47f9ac967190b738 -RMD160 (xa2.0_iv32_sparcCOFF.o.gz) = 2398217f61131d55d312d38898e98ae27bbefad2 -Size (xa2.0_iv32_sparcCOFF.o.gz) = 29631 bytes -SHA1 (xa2.0_cvid_sparcELF.o.gz) = 3c86cf67dbcd5490e69b6f1b92a2b03b468123db -RMD160 (xa2.0_cvid_sparcELF.o.gz) = 29fca2266f98d4d14075545cc436f3b535d60ee5 -Size (xa2.0_cvid_sparcELF.o.gz) = 3524 bytes -SHA1 (xa1.0_cyuv_sparcELF.o.gz) = 9295a98f9fe233a9bfc4fd99e7ea9ace8af6b1be -RMD160 (xa1.0_cyuv_sparcELF.o.gz) = 162bfaec842e019e1ae4e07f375974ae940dfb63 -Size (xa1.0_cyuv_sparcELF.o.gz) = 1109 bytes -SHA1 (xa2.0_iv32_sparcELF.o.gz) = 9b091db3ecfac3dbcb841be9fba477c35be78ffa -RMD160 (xa2.0_iv32_sparcELF.o.gz) = 3727a4391e574308d84b17553d521994fbf284c0 -Size (xa2.0_iv32_sparcELF.o.gz) = 29805 bytes -SHA1 (xa2.0_cvid_linuxPPC.o.gz) = a7a7177600955d5599785952aa360aad7b573129 -RMD160 (xa2.0_cvid_linuxPPC.o.gz) = 1bd9db593229eda69ee9875a8f35e846fbe0c639 -Size (xa2.0_cvid_linuxPPC.o.gz) = 3873 bytes -SHA1 (xa1.0_cyuv_linuxPPC.o.gz) = 5f9b760d8fc2717b61288a765589a4b80387a6b1 -RMD160 (xa1.0_cyuv_linuxPPC.o.gz) = 9dd88d8eddb9f2f7b347e3673be5f388c639e821 -Size (xa1.0_cyuv_linuxPPC.o.gz) = 1287 bytes -SHA1 (patch-aa) = 4d2f360bca128e979951227b3ff1b645a82ce7f3 -SHA1 (patch-ab) = c9fd497ee20efc699a84367ee36d34f5aff6da66 -SHA1 (patch-ae) = 6023e76bc0471a0810b0789cd24355c06eac02b8 -SHA1 (patch-xa__input.c) = 2033ce6c68b5a87911011b6917705f08482060a2 -SHA1 (patch-xa__x11.c) = d51fea74991e9453c29bf82a7e41bf1b74a98f32 diff --git a/multimedia/xanim/patches/patch-aa b/multimedia/xanim/patches/patch-aa deleted file mode 100644 index 044e2913f40..00000000000 --- a/multimedia/xanim/patches/patch-aa +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2007/08/05 15:37:35 joerg Exp $ - ---- xanim.h.orig 2007-08-05 15:12:18.000000000 +0000 -+++ xanim.h -@@ -18,7 +18,7 @@ - #include <Xos.h> - #include <stdio.h> - #include <sys/types.h> --#include <stdio.h> -+#include <stdlib.h> - - #ifndef VMS - -@@ -27,17 +27,6 @@ - #include <memory.h> - #endif - --#ifdef __bsdi__ --#include <sys/malloc.h> --#else --#ifndef __CYGWIN32__ --#ifndef __FreeBSD__ --#include <malloc.h> --#endif --#endif --#endif -- -- - #include <unistd.h> - #else - #include <unixio.h> diff --git a/multimedia/xanim/patches/patch-ab b/multimedia/xanim/patches/patch-ab deleted file mode 100644 index a59bd27985e..00000000000 --- a/multimedia/xanim/patches/patch-ab +++ /dev/null @@ -1,55 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2006/12/23 10:33:29 wiz Exp $ - ---- Imakefile.orig 2002-04-20 23:25:06.000000000 +0000 -+++ Imakefile -@@ -120,14 +120,14 @@ XCOMM ### You may need this library. - XCOMM XA_DLL_LIB = -ldl - XCOMM - XCOMM HP/UX should use the following: --XA_DLL_DEF = -DXA_HPDLL --XA_DLL_LIB = -Wl,-E -ldld -+XCOMM XA_DLL_DEF = -DXA_HPDLL -+XCOMM XA_DLL_LIB = -Wl,-E -ldld - XCOMM - XCOMM - XCOMM If you'd like to change the default directory that XAnim searches while - XCOMM looking for dlls, then change the directory below. - XCOMM --XA_DLL_PATH = /usr/local/xanim/mods -+XA_DLL_PATH = ${PREFIX}/lib/xanim - - - XCOMM ######################################################################### -@@ -138,8 +138,8 @@ XCOMM - XCOMM ######################################################################### - XCOMM - XCOMM -- Uncomment these if you have the library libz.* on your machine. --XCOMM XA_ZLIB_DEF = -DXA_ZLIB --XCOMM XA_ZLIB_LIB = -lz -+XA_ZLIB_DEF = -DXA_ZLIB -+XA_ZLIB_LIB = -lz - XCOMM - XCOMM -- If the file libz.* is not in a directory that is normally - XCOMM searched by your linker, then you need to uncomment the -@@ -351,9 +351,9 @@ XCOMM XA_AUDIO_DEFS = -DXA_HP_AUDIO - XCOMM XA_AUDIO_LIBS = -lAlib - XCOMM -- - XCOMM -- HP/UX 10.x AServer --XA_AUDIO_DEFS = -DXA_HP_AUDIO -DXA_HP10 --XA_AUDIO_LIBS = -L/opt/audio/lib -lAlib --XA_AUDIO_INCS = -I/opt/audio/include -+XCOMM XA_AUDIO_DEFS = -DXA_HP_AUDIO -DXA_HP10 -+XCOMM XA_AUDIO_LIBS = -L/opt/audio/lib -lAlib -+XCOMM XA_AUDIO_INCS = -I/opt/audio/include - XCOMM - XCOMM ------ AF (AudioFile) Support ------------------------------------------ - XCOMM -- You need to indicate where the AF libraries libAFUtil.a and libAF.a -@@ -470,7 +470,7 @@ DEFINES = $(XA_DEFS) - - PROGRAMS = $(XANIM) - --INCLUDES = -I$(INCDIR) $(XA_INCS) -+INCLUDES = -I$(INCDIR) -I$(X11BASE)/include/X11 $(XA_INCS) - - LIBS1 = $(XA_LIBS) $(EXTENSIONLIB) $(XTOOLLIB) $(XLIB) -lm - DEPLIBS1 = $(DEPEXTENSIONLIB) $(DEPXTOOLLIB) $(DEPXLIB) diff --git a/multimedia/xanim/patches/patch-ae b/multimedia/xanim/patches/patch-ae deleted file mode 100644 index 0f254810f44..00000000000 --- a/multimedia/xanim/patches/patch-ae +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ae,v 1.1.1.1 2004/01/26 15:19:53 jmmv Exp $ - ---- xa_audio.c.orig Sun Mar 21 14:36:25 1999 -+++ xa_audio.c -@@ -4665,7 +4665,19 @@ void NetBSD_Audio_Init() - - a_info.mode = AUMODE_PLAY | AUMODE_PLAY_ALL; - ioctl(devAudio, AUDIO_SETINFO, &a_info); --#ifdef AUDIO_ENCODING_SLINEAR -+#ifdef AUDIO_ENCODING_SLINEAR_LE -+ /* Use new encoding names */ -+ AUDIO_INITINFO(&a_info); -+ a_info.play.encoding = AUDIO_ENCODING_SLINEAR_LE; -+ a_info.play.precision = 16; -+ if ( ioctl(devAudio, AUDIO_SETINFO, &a_info) < 0) -+ { -+ AUDIO_INITINFO(&a_info); -+ a_info.play.encoding = AUDIO_ENCODING_ULINEAR; -+ a_info.play.precision = 8; -+ ioctl(devAudio, AUDIO_SETINFO, &a_info); -+ } -+#elif defined(AUDIO_ENCODING_SLINEAR) - /* Use new encoding names */ - AUDIO_INITINFO(&a_info); - a_info.play.encoding = AUDIO_ENCODING_SLINEAR; diff --git a/multimedia/xanim/patches/patch-xa__input.c b/multimedia/xanim/patches/patch-xa__input.c deleted file mode 100644 index b15da480de1..00000000000 --- a/multimedia/xanim/patches/patch-xa__input.c +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: patch-xa__input.c,v 1.1 2013/08/31 14:52:50 joerg Exp $ - ---- xa_input.c.orig 2013-08-31 14:16:57.000000000 +0000 -+++ xa_input.c -@@ -1025,28 +1025,28 @@ char *machine, *user_cmd, *passwd_cmd, * - memset(&data,0,sizeof(data)); - memset(&from,0,sizeof(from)); - if (gethostname(hostname, sizeof(hostname)) < 0) -- return(xa_ftp_abort(xin)); -+ return(xa_ftp_abort(*xin)); - if ((host= (struct hostent *)gethostbyname(hostname)) == 0) -- return(xa_ftp_abort(xin)); -+ return(xa_ftp_abort(*xin)); - data.sin_family = host->h_addrtype; - memcpy( (char *)&data.sin_addr, (char *)host->h_addr_list[0], host->h_length); - if ((tmp_sock = socket ( AF_INET , SOCK_STREAM , 0 )) < 0) -- return(xa_ftp_abort(xin)); -+ return(xa_ftp_abort(*xin)); - len = 1; - if (setsockopt(tmp_sock, SOL_SOCKET, SO_REUSEADDR, - (char *)(&len), sizeof(len)) < 0) -- { close(tmp_sock); return(xa_ftp_abort(xin)); } -+ { close(tmp_sock); return(xa_ftp_abort(*xin)); } - - data.sin_port = 0; - if ( bind(tmp_sock, (struct sockaddr *)&data, sizeof(data)) < 0 ) -- { close(tmp_sock); return(xa_ftp_abort(xin)); } -+ { close(tmp_sock); return(xa_ftp_abort(*xin)); } - - len = sizeof(data); - if (getsockname(tmp_sock, (struct sockaddr *)&data, &len) < 0 ) -- { close(tmp_sock); return(xa_ftp_abort(xin)); } -+ { close(tmp_sock); return(xa_ftp_abort(*xin)); } - - if (listen(tmp_sock, 4) < 0 ) -- { close(tmp_sock); return(xa_ftp_abort(xin)); } -+ { close(tmp_sock); return(xa_ftp_abort(*xin)); } - - /* POD add support for PORT command? */ - addr = (xaUBYTE *) (&data.sin_addr); -@@ -1059,15 +1059,15 @@ char *machine, *user_cmd, *passwd_cmd, * - - if (xa_ftp_send_cmd(xin, port_cmd, &retcode) == xaFALSE) - { fprintf(stderr,"FTP: send cmd err\n"); -- close(tmp_sock); return(xa_ftp_abort(xin)); } -+ close(tmp_sock); return(xa_ftp_abort(*xin)); } - - if (xa_ftp_send_cmd(xin, file_cmd, &retcode) == xaFALSE) - { fprintf(stderr,"FTP: send cmd err\n"); -- close(tmp_sock); return(xa_ftp_abort(xin)); } -+ close(tmp_sock); return(xa_ftp_abort(*xin)); } - - len = sizeof(from); - xin->dsock = accept((int)tmp_sock, (struct sockaddr *) &from, (int *)&len); -- if (xin->dsock < 0) { close(tmp_sock); return(xa_ftp_abort(xin)); } -+ if (xin->dsock < 0) { close(tmp_sock); return(xa_ftp_abort(*xin)); } - close(tmp_sock); - return(xaTRUE); - } diff --git a/multimedia/xanim/patches/patch-xa__x11.c b/multimedia/xanim/patches/patch-xa__x11.c deleted file mode 100644 index ec21f4a3a20..00000000000 --- a/multimedia/xanim/patches/patch-xa__x11.c +++ /dev/null @@ -1,89 +0,0 @@ -$NetBSD: patch-xa__x11.c,v 1.1 2013/08/31 14:52:50 joerg Exp $ - ---- xa_x11.c.orig 2013-08-31 14:15:35.000000000 +0000 -+++ xa_x11.c -@@ -1464,7 +1464,7 @@ void xanim_events() - XChangeProperty(theDisp, mainW, window_atom, XA_STRING, 8, - PropModeReplace, (unsigned char *)command, 1); - if (xa_window_prepare_flag == xaFALSE) -- xanim_expose(theWG, event, NULL, 0); -+ xanim_expose(theWG, &event, NULL, 0); - while (1) - { - XtAppNextEvent(theContext, &event); -@@ -1504,50 +1504,50 @@ void xanim_events() - break; - case ' ': - if (xa_anim_status == XA_UNSTARTED) -- xanim_expose(theWG, event, NULL, 0); -- else xanim_toggle_action(theWG, event, NULL, 0); -+ xanim_expose(theWG, &event, NULL, 0); -+ else xanim_toggle_action(theWG, &event, NULL, 0); - break; - case ',': -- xanim_step_prev_action(theWG, event, NULL, 0); -+ xanim_step_prev_action(theWG, &event, NULL, 0); - break; - case '.': -- xanim_step_next_action(theWG, event, NULL, 0); -+ xanim_step_next_action(theWG, &event, NULL, 0); - break; - case 'm': -- xanim_step_prev_int_action(theWG, event, NULL, 0); -+ xanim_step_prev_int_action(theWG, &event, NULL, 0); - break; - case '/': -- xanim_step_next_int_action(theWG, event, NULL, 0); -+ xanim_step_next_int_action(theWG, &event, NULL, 0); - break; - case '-': -- xanim_faster_action(theWG, event, NULL, 0); -+ xanim_faster_action(theWG, &event, NULL, 0); - break; - case '=': -- xanim_slower_action(theWG, event, NULL, 0); -+ xanim_slower_action(theWG, &event, NULL, 0); - break; - case '0': -- xanim_speed_reset_action(theWG, event, NULL, 0); -+ xanim_speed_reset_action(theWG, &event, NULL, 0); - break; - case '1': -- xanim_dec_audio_5(theWG, event, NULL, 0); -+ xanim_dec_audio_5(theWG, &event, NULL, 0); - break; - case '2': -- xanim_dec_audio_1(theWG, event, NULL, 0); -+ xanim_dec_audio_1(theWG, &event, NULL, 0); - break; - case '3': -- xanim_inc_audio_1(theWG, event, NULL, 0); -+ xanim_inc_audio_1(theWG, &event, NULL, 0); - break; - case '4': -- xanim_inc_audio_5(theWG, event, NULL, 0); -+ xanim_inc_audio_5(theWG, &event, NULL, 0); - break; - case 's': -- xanim_mute_audio(theWG, event, NULL, 0); -+ xanim_mute_audio(theWG, &event, NULL, 0); - break; - case '8': -- xanim_speaker_tog(theWG, event, NULL, 0); -+ xanim_speaker_tog(theWG, &event, NULL, 0); - break; - case '9': -- xanim_headphone_tog(theWG, event, NULL, 0); -+ xanim_headphone_tog(theWG, &event, NULL, 0); - break; - case 'v': - vaudiof->volume = atoi( &command[1] ); -@@ -1559,7 +1559,7 @@ void xanim_events() - XA_AUDIO_SET_VOLUME(vaudiof->volume); - break; - case 'z': -- xanim_realize_remote(theWG, event, NULL, 0); -+ xanim_realize_remote(theWG, &event, NULL, 0); - break; - case 'e': - x11_expose_flag = xaTRUE; |