diff options
Diffstat (limited to 'multimedia')
115 files changed, 0 insertions, 5146 deletions
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile deleted file mode 100644 index 554a63cfc7c3..000000000000 --- a/multimedia/fxtv/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# New ports collection makefile for: fxtv -# Version required: 1.00 -# Date created: Sun Sep 7 17:55:07 EDT 1997 -# Whom: Randall Hopper <aa8vb@ipass.net> -# -# $FreeBSD$ -# - -DISTNAME= fxtv-1.00 -CATEGORIES= graphics -MASTER_SITES= http://www.ipass.net/~dbhopper/aa8vb/fxtv/ -EXTRACT_SUFX= .tgz - -MAINTAINER= aa8vb@ipass.net - -LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ - Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d \ - Xpm.4:${PORTSDIR}/graphics/xpm - -NOT_FOR_ARCHS= alpha - -# This program does not actually require the programs below unless you -# use audio/video recording and/or playback and save to a non-raw format. -#RUN_DEPENDS= sox:${PORTSDIR}/audio/sox \ -# mpg123:${PORTSDIR}/audio/mpg123 \ -# mpeg_musicin:${PORTSDIR}/audio/mpegaudio \ -# mpeg_encode:${PORTSDIR}/graphics/mpeg_encode \ -# mplex:${PORTSDIR}/graphics/mplex - -USE_X_PREFIX= yes -USE_GMAKE= yes -MAKE_FLAGS= -e -MAN1= fxtv.1 - -pre-install: - ${CP} ${WRKSRC}/fxtv.1 ${WRKSRC}/fxtv.man - - -.include <bsd.port.mk> diff --git a/multimedia/fxtv/distinfo b/multimedia/fxtv/distinfo deleted file mode 100644 index c8ef3c1f2fae..000000000000 --- a/multimedia/fxtv/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (fxtv-1.00.tgz) = 5609a5c6530fce5d8f70735eb2d18011 diff --git a/multimedia/fxtv/files/patch-aa b/multimedia/fxtv/files/patch-aa deleted file mode 100644 index f68737fa1c4f..000000000000 --- a/multimedia/fxtv/files/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ -*** tvcapture.c.orig Tue Sep 7 03:11:47 1999 ---- tvcapture.c Wed Sep 8 17:46:13 1999 -*************** char *TVCAPTUREGetTunerFreqSetName( TV_C -*** 684,693 **** ---- 684,697 ---- - return "jpnbcst"; - case CHNLSET_JPNCABLE: - return "jpncable"; -+ #ifdef CHNLSET_XUSSR - case CHNLSET_XUSSR: - return "xussr"; -+ #endif -+ #ifdef CHNLSET_AUSTRALIA - case CHNLSET_AUSTRALIA: - return "australia"; -+ #endif - default: - return NULL; - } diff --git a/multimedia/fxtv/files/patch-ab b/multimedia/fxtv/files/patch-ab deleted file mode 100644 index ce2a6bc2ceea..000000000000 --- a/multimedia/fxtv/files/patch-ab +++ /dev/null @@ -1,25 +0,0 @@ ---- t/fxtv-1.00/vidsav_dlg.c Mon Sep 6 10:39:18 1999 -+++ vidsav_dlg.c Wed Sep 8 16:39:04 1999 -@@ -70,7 +70,7 @@ - /* ******************** Local defines ************** */ - - #define AV_RAWNAME_FMT "%s.AVraw" --#define SCRIPT_FNAME_FMT "./%s.sh" -+#define SCRIPT_FNAME_FMT "%s%s.sh" - - #define OPTIMIZE_NUM_FRAMES 200 - -@@ -801,9 +801,12 @@ - char *str; - struct stat stat; - TV_INT32 i; -+ TV_BOOL has_path; - - /* Open output script file */ -- sprintf( p->script_fname, SCRIPT_FNAME_FMT, p->fname_base ); -+ has_path = strchr( "p->fname_base", '/' ) != NULL; -+ sprintf( p->script_fname, SCRIPT_FNAME_FMT, -+ (has_path ? "./" : ""), p->fname_base ); - - if ( (fp = fopen( p->script_fname, "wt" )) == NULL ) { - fprintf( stderr, "Failed to open for write: %s\n", p->script_fname ); diff --git a/multimedia/fxtv/pkg-comment b/multimedia/fxtv/pkg-comment deleted file mode 100644 index 02cedb710c9b..000000000000 --- a/multimedia/fxtv/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -X-based TV Display and Capture Application (for use with bt848 driver) diff --git a/multimedia/fxtv/pkg-descr b/multimedia/fxtv/pkg-descr deleted file mode 100644 index e3926ea59f2d..000000000000 --- a/multimedia/fxtv/pkg-descr +++ /dev/null @@ -1,23 +0,0 @@ - Fxtv is an X11-based FreeBSD app that provides TV-in-a-window and - image/audio/video capture capabilities for Bt848/878-based tuner/capture - cards. - - To use this app, you need FreeBSD 2.2.x, 3.x, -current as well as a - capture card based on the Brooktree 848/878 chip. Examples include the - Hauppauge Wincast/TV, the STB TV PCI, and the Intel Smart Video Recorder - III. - - Refer to the README for details on usage - - URL: http://www.freebsd.org/~rhh/fxtv - - - Note on Bt848/Bt878 bktr driver: - FXTV 1.00 requires release 1.66 (or later) of the Bt848/Bt878 driver. - (Note, this is the driver release, not the CVS version) - - Newer versions of the Bt848/Bt878 driver for FreeBSD 2.2.x, 3.x and 4.x - can be found - at http://www.freebsd.org/~roger - or http://telepresence.dmem.strath.ac.uk/bt848 - diff --git a/multimedia/fxtv/pkg-plist b/multimedia/fxtv/pkg-plist deleted file mode 100644 index 22e59c47f156..000000000000 --- a/multimedia/fxtv/pkg-plist +++ /dev/null @@ -1,13 +0,0 @@ -bin/fxtv -lib/X11/app-defaults/Fxtv -lib/X11/fxtv/README -lib/X11/fxtv/bitmaps/mini-camera.xpm -lib/X11/fxtv/bitmaps/mini-down.xbm -lib/X11/fxtv/bitmaps/mini-resize.xpm -lib/X11/fxtv/bitmaps/mini-sound.xbm -lib/X11/fxtv/bitmaps/mini-up.xbm -lib/X11/fxtv/bitmaps/radio_off.xbm -lib/X11/fxtv/bitmaps/radio_on.xbm -lib/X11/fxtv/fxtv_cnvt.sh -@dirrm lib/X11/fxtv/bitmaps -@dirrm lib/X11/fxtv diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile deleted file mode 100644 index d7c6222e1b5d..000000000000 --- a/multimedia/kdemultimedia3/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# New ports collection makefile for: kdemultimedia -# Version required: Beta1 -# Date created: 28 October 1997 -# Whom: Stefan Eßer <se@freebsd.org> -# -# $FreeBSD$ -# - -DISTNAME= kdemultimedia-1.1.1 -CATEGORIES= audio kde -MASTER_SITES= $(MASTER_SITE_KDE) -MASTER_SITE_SUBDIR= stable/1.1.1/distribution/tar/generic/source/bz2 - -MAINTAINER= se@freebsd.org - -LIB_DEPENDS= gif.3:${PORTSDIR}/graphics/giflib \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ - kdecore.2:${PORTSDIR}/x11/kdelibs11 - -USE_BZIP2= yes -USE_QT= yes -HAS_CONFIGURE= yes -CONFIGURE_ARGS= "--prefix=$(PREFIX)" -CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \ - INSTALL_SCRIPT="install -c -m 555" -USE_GMAKE= yes - -.include <bsd.port.mk> diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo deleted file mode 100644 index f05b71f08d07..000000000000 --- a/multimedia/kdemultimedia3/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (kdemultimedia-1.1.1.tar.bz2) = 499871e7920bc8bbecc90574f74c8387 diff --git a/multimedia/kdemultimedia3/pkg-comment b/multimedia/kdemultimedia3/pkg-comment deleted file mode 100644 index 6f31b51504cc..000000000000 --- a/multimedia/kdemultimedia3/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -KDE audio tools diff --git a/multimedia/kdemultimedia3/pkg-descr b/multimedia/kdemultimedia3/pkg-descr deleted file mode 100644 index 90ae45773bea..000000000000 --- a/multimedia/kdemultimedia3/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -KDE provides an integrated X11 based environment, much like CDE. diff --git a/multimedia/kdemultimedia3/pkg-plist b/multimedia/kdemultimedia3/pkg-plist deleted file mode 100644 index 05bffa8a2889..000000000000 --- a/multimedia/kdemultimedia3/pkg-plist +++ /dev/null @@ -1,313 +0,0 @@ -bin/cddaslave -bin/kmedia -bin/kmid -bin/kmidi -bin/kmix -bin/kscd -bin/kscdmagic -bin/workman2cddb.pl -share/applnk/Multimedia/KMedia.kdelnk -share/applnk/Multimedia/KMidi.kdelnk -share/applnk/Multimedia/KMix.kdelnk -share/applnk/Multimedia/kmid.kdelnk -share/applnk/Multimedia/kscd.kdelnk -share/apps/kmedia/pics/eject.xbm -share/apps/kmedia/pics/ff.xbm -share/apps/kmedia/pics/kmedia.xpm -share/apps/kmedia/pics/kmedia_mini.xpm -share/apps/kmedia/pics/lock.xbm -share/apps/kmedia/pics/logo.xbm -share/apps/kmedia/pics/nexttrk.xbm -share/apps/kmedia/pics/playpause.xbm -share/apps/kmedia/pics/playpause_both.xpm -share/apps/kmedia/pics/playpause_play.xpm -share/apps/kmedia/pics/poweroff.xbm -share/apps/kmedia/pics/prevtrk.xbm -share/apps/kmedia/pics/rew.xbm -share/apps/kmedia/pics/stop.xbm -share/apps/kmid/AnotherGlitchInTheCall.kar -share/apps/kmid/OFortuna.kar -share/apps/kmid/StopInTheNameOfLove.kar -share/apps/kmid/TheGirlFromIpanema.kar -share/apps/kmid/fm/drums.o3 -share/apps/kmid/fm/drums.sb -share/apps/kmid/fm/std.o3 -share/apps/kmid/fm/std.sb -share/apps/kmid/maps/YamahaPSR500.map -share/apps/kmid/maps/YamahaPSS790.map -share/apps/kmid/maps/gm.map -share/apps/kmid/pics/button1.xpm -share/apps/kmid/pics/button2.xpm -share/apps/kmid/pics/keyboard.xpm -share/apps/kmid/toolbar/kmid_chn.xpm -share/apps/kmid/toolbar/kmid_fforward.xpm -share/apps/kmid/toolbar/kmid_frewind.xpm -share/apps/kmid/toolbar/kmid_next.xpm -share/apps/kmid/toolbar/kmid_pause.xpm -share/apps/kmid/toolbar/kmid_play.xpm -share/apps/kmid/toolbar/kmid_prev.xpm -share/apps/kmid/toolbar/kmid_stop.xpm -share/apps/kmid/toolbar/kmid_volume.xpm -share/apps/kmidi/config/chaos12-voices -share/apps/kmidi/config/chaos8-voices -share/apps/kmidi/config/gravis.cfg -share/apps/kmidi/config/gsdrum.cfg -share/apps/kmidi/config/megadrum -share/apps/kmidi/config/megainst -share/apps/kmidi/config/midia.cfg -share/apps/kmidi/config/mt32.cfg -share/apps/kmidi/config/patch/acpiano.pat -share/apps/kmidi/config/patch/nylongt2.pat -share/apps/kmidi/config/pila-voices -share/apps/kmidi/config/sndfont.cfg -share/apps/kmidi/config/sound-canvas-drums -share/apps/kmidi/config/timidity.cfg -share/apps/kmidi/config/wowpats.cfg -share/apps/kmidi/pics/kmidilogo.xpm -share/apps/kmix/pics/kmixdocked.xpm -share/apps/kmix/pics/mix_audio.xpm -share/apps/kmix/pics/mix_bass.xpm -share/apps/kmix/pics/mix_cd.xpm -share/apps/kmix/pics/mix_ext.xpm -share/apps/kmix/pics/mix_microphone.xpm -share/apps/kmix/pics/mix_midi.xpm -share/apps/kmix/pics/mix_recmon.xpm -share/apps/kmix/pics/mix_treble.xpm -share/apps/kmix/pics/mix_unknown.xpm -share/apps/kmix/pics/mix_volume.xpm -share/apps/kscd/pics/cdsmall.xpm -share/apps/kscd/pics/kscdlogo.xpm -share/doc/HTML/de/kmidi/kmidi-1.html -share/doc/HTML/de/kmidi/kmidi-2.html -share/doc/HTML/de/kmidi/kmidi-3.html -share/doc/HTML/de/kmidi/kmidi-4.html -share/doc/HTML/de/kmidi/kmidi-5.html -share/doc/HTML/de/kmidi/kmidi.html -share/doc/HTML/de/kmidi/kmidi.sgml -share/doc/HTML/de/kmidi/logotp3.gif -share/doc/HTML/en/kmedia/index-1.html -share/doc/HTML/en/kmedia/index-2.html -share/doc/HTML/en/kmedia/index-3.html -share/doc/HTML/en/kmedia/index-4.html -share/doc/HTML/en/kmedia/index-5.html -share/doc/HTML/en/kmedia/index.html -share/doc/HTML/en/kmedia/logotp3.gif -share/doc/HTML/en/kmid/index-1.html -share/doc/HTML/en/kmid/index-2.html -share/doc/HTML/en/kmid/index-3.html -share/doc/HTML/en/kmid/index-4.html -share/doc/HTML/en/kmid/index-5.html -share/doc/HTML/en/kmid/index-6.html -share/doc/HTML/en/kmid/index-7.html -share/doc/HTML/en/kmid/index-8.html -share/doc/HTML/en/kmid/index-9.html -share/doc/HTML/en/kmid/index.html -share/doc/HTML/en/kmid/logotp3.gif -share/doc/HTML/en/kmidi/kmidi-1.html -share/doc/HTML/en/kmidi/kmidi-2.html -share/doc/HTML/en/kmidi/kmidi-3.html -share/doc/HTML/en/kmidi/kmidi-4.html -share/doc/HTML/en/kmidi/kmidi-5.html -share/doc/HTML/en/kmidi/kmidi.html -share/doc/HTML/en/kmidi/kmidi.nif -share/doc/HTML/en/kmidi/kmidi.sgml -share/doc/HTML/en/kmidi/logotp3.gif -share/doc/HTML/en/kmix/index-1.html -share/doc/HTML/en/kmix/index-2.html -share/doc/HTML/en/kmix/index-3.html -share/doc/HTML/en/kmix/index-4.html -share/doc/HTML/en/kmix/index-5.html -share/doc/HTML/en/kmix/index-6.html -share/doc/HTML/en/kmix/index.html -share/doc/HTML/en/kmix/logotp3.gif -share/doc/HTML/en/kscd/kscd-1.html -share/doc/HTML/en/kscd/kscd-2.html -share/doc/HTML/en/kscd/kscd-3.html -share/doc/HTML/en/kscd/kscd-4.html -share/doc/HTML/en/kscd/kscd-5.html -share/doc/HTML/en/kscd/kscd-6.html -share/doc/HTML/en/kscd/kscd-7.html -share/doc/HTML/en/kscd/kscd-8.html -share/doc/HTML/en/kscd/kscd.html -share/doc/HTML/en/kscd/kscd1.gif -share/doc/HTML/en/kscd/kscd10.gif -share/doc/HTML/en/kscd/kscd11.gif -share/doc/HTML/en/kscd/kscd12.gif -share/doc/HTML/en/kscd/kscd13.gif -share/doc/HTML/en/kscd/kscd14.gif -share/doc/HTML/en/kscd/kscd15.gif -share/doc/HTML/en/kscd/kscd16.gif -share/doc/HTML/en/kscd/kscd2.gif -share/doc/HTML/en/kscd/kscd2a.gif -share/doc/HTML/en/kscd/kscd3.gif -share/doc/HTML/en/kscd/kscd4.gif -share/doc/HTML/en/kscd/kscd5.gif -share/doc/HTML/en/kscd/kscd6.gif -share/doc/HTML/en/kscd/kscd7.gif -share/doc/HTML/en/kscd/kscd8.gif -share/doc/HTML/en/kscd/kscd9.gif -share/doc/HTML/en/kscd/logotp3.gif -share/doc/HTML/es/kmid/index-1.html -share/doc/HTML/es/kmid/index-2.html -share/doc/HTML/es/kmid/index-3.html -share/doc/HTML/es/kmid/index-4.html -share/doc/HTML/es/kmid/index-5.html -share/doc/HTML/es/kmid/index-6.html -share/doc/HTML/es/kmid/index-7.html -share/doc/HTML/es/kmid/index-8.html -share/doc/HTML/es/kmid/index-9.html -share/doc/HTML/es/kmid/index.html -share/doc/HTML/es/kmid/logotp3.gif -share/icons/cd.xpm -share/icons/kmedia.xpm -share/icons/kmid.xpm -share/icons/kmidi.xpm -share/icons/kmix.xpm -share/icons/kscd.xpm -share/icons/mini/kmedia.xpm -share/icons/mini/kmid.xpm -share/icons/mini/kmidi.xpm -share/icons/mini/kmix.xpm -share/icons/mini/kscd.xpm -share/locale/br/LC_MESSAGES/kmedia.mo -share/locale/br/LC_MESSAGES/kmid.mo -share/locale/br/LC_MESSAGES/kmidi.mo -share/locale/br/LC_MESSAGES/kmix.mo -share/locale/br/LC_MESSAGES/kscd.mo -share/locale/ca/LC_MESSAGES/kmedia.mo -share/locale/ca/LC_MESSAGES/kmid.mo -share/locale/ca/LC_MESSAGES/kmidi.mo -share/locale/ca/LC_MESSAGES/kmix.mo -share/locale/ca/LC_MESSAGES/kscd.mo -share/locale/cs/LC_MESSAGES/kmedia.mo -share/locale/cs/LC_MESSAGES/kmid.mo -share/locale/cs/LC_MESSAGES/kmidi.mo -share/locale/cs/LC_MESSAGES/kmix.mo -share/locale/cs/LC_MESSAGES/kscd.mo -share/locale/da/LC_MESSAGES/kmedia.mo -share/locale/da/LC_MESSAGES/kmid.mo -share/locale/da/LC_MESSAGES/kmidi.mo -share/locale/da/LC_MESSAGES/kmix.mo -share/locale/da/LC_MESSAGES/kscd.mo -share/locale/de/LC_MESSAGES/kmedia.mo -share/locale/de/LC_MESSAGES/kmid.mo -share/locale/de/LC_MESSAGES/kmidi.mo -share/locale/de/LC_MESSAGES/kmix.mo -share/locale/de/LC_MESSAGES/kscd.mo -share/locale/el/LC_MESSAGES/kmedia.mo -share/locale/el/LC_MESSAGES/kmix.mo -share/locale/el/LC_MESSAGES/kscd.mo -share/locale/eo/LC_MESSAGES/kmedia.mo -share/locale/eo/LC_MESSAGES/kmid.mo -share/locale/eo/LC_MESSAGES/kmix.mo -share/locale/eo/LC_MESSAGES/kscd.mo -share/locale/es/LC_MESSAGES/kmedia.mo -share/locale/es/LC_MESSAGES/kmid.mo -share/locale/es/LC_MESSAGES/kmix.mo -share/locale/es/LC_MESSAGES/kscd.mo -share/locale/fi/LC_MESSAGES/kmedia.mo -share/locale/fi/LC_MESSAGES/kmid.mo -share/locale/fi/LC_MESSAGES/kmix.mo -share/locale/fi/LC_MESSAGES/kscd.mo -share/locale/fr/LC_MESSAGES/kmedia.mo -share/locale/fr/LC_MESSAGES/kmid.mo -share/locale/fr/LC_MESSAGES/kmidi.mo -share/locale/fr/LC_MESSAGES/kmix.mo -share/locale/fr/LC_MESSAGES/kscd.mo -share/locale/hr/LC_MESSAGES/kmedia.mo -share/locale/hr/LC_MESSAGES/kmid.mo -share/locale/hr/LC_MESSAGES/kmix.mo -share/locale/hr/LC_MESSAGES/kscd.mo -share/locale/hu/LC_MESSAGES/kmid.mo -share/locale/hu/LC_MESSAGES/kmidi.mo -share/locale/hu/LC_MESSAGES/kmix.mo -share/locale/hu/LC_MESSAGES/kscd.mo -share/locale/is/LC_MESSAGES/kmedia.mo -share/locale/is/LC_MESSAGES/kmid.mo -share/locale/is/LC_MESSAGES/kmix.mo -share/locale/is/LC_MESSAGES/kscd.mo -share/locale/it/LC_MESSAGES/kmedia.mo -share/locale/it/LC_MESSAGES/kmix.mo -share/locale/ko/LC_MESSAGES/kmedia.mo -share/locale/ko/LC_MESSAGES/kmid.mo -share/locale/ko/LC_MESSAGES/kmix.mo -share/locale/ko/LC_MESSAGES/kscd.mo -share/locale/nl/LC_MESSAGES/kmedia.mo -share/locale/nl/LC_MESSAGES/kscd.mo -share/locale/no/LC_MESSAGES/kmedia.mo -share/locale/no/LC_MESSAGES/kmid.mo -share/locale/no/LC_MESSAGES/kmidi.mo -share/locale/no/LC_MESSAGES/kmix.mo -share/locale/no/LC_MESSAGES/kscd.mo -share/locale/pl/LC_MESSAGES/kmedia.mo -share/locale/pl/LC_MESSAGES/kmid.mo -share/locale/pl/LC_MESSAGES/kmix.mo -share/locale/pl/LC_MESSAGES/kscd.mo -share/locale/pt/LC_MESSAGES/kmedia.mo -share/locale/pt/LC_MESSAGES/kmid.mo -share/locale/pt/LC_MESSAGES/kmix.mo -share/locale/pt/LC_MESSAGES/kscd.mo -share/locale/pt_BR/LC_MESSAGES/kmedia.mo -share/locale/pt_BR/LC_MESSAGES/kmid.mo -share/locale/pt_BR/LC_MESSAGES/kmidi.mo -share/locale/pt_BR/LC_MESSAGES/kmix.mo -share/locale/pt_BR/LC_MESSAGES/kscd.mo -share/locale/ro/LC_MESSAGES/kmedia.mo -share/locale/ro/LC_MESSAGES/kmix.mo -share/locale/sk/LC_MESSAGES/kmedia.mo -share/locale/sk/LC_MESSAGES/kmid.mo -share/locale/sk/LC_MESSAGES/kmidi.mo -share/locale/sk/LC_MESSAGES/kmix.mo -share/locale/sk/LC_MESSAGES/kscd.mo -share/locale/sv/LC_MESSAGES/kmedia.mo -share/locale/sv/LC_MESSAGES/kmid.mo -share/locale/sv/LC_MESSAGES/kmix.mo -share/locale/sv/LC_MESSAGES/kscd.mo -share/locale/tr/LC_MESSAGES/kmedia.mo -share/locale/tr/LC_MESSAGES/kmid.mo -share/locale/tr/LC_MESSAGES/kmix.mo -share/locale/tr/LC_MESSAGES/kscd.mo -share/locale/zh_CN.GB2312/LC_MESSAGES/kmedia.mo -share/locale/zh_CN.GB2312/LC_MESSAGES/kmid.mo -share/locale/zh_CN.GB2312/LC_MESSAGES/kmix.mo -share/locale/zh_CN.GB2312/LC_MESSAGES/kscd.mo -share/locale/zh_TW.Big5/LC_MESSAGES/kmedia.mo -share/locale/zh_TW.Big5/LC_MESSAGES/kmid.mo -share/locale/zh_TW.Big5/LC_MESSAGES/kmix.mo -share/locale/zh_TW.Big5/LC_MESSAGES/kscd.mo -share/mimelnk/audio/x-karaoke.kdelnk -share/mimelnk/text/xmcd.kdelnk -@dirrm share/doc/HTML/es/kmid -@dirrm share/doc/HTML/en/kscd -@dirrm share/doc/HTML/en/kmix -@dirrm share/doc/HTML/en/kmidi -@dirrm share/doc/HTML/en/kmid -@dirrm share/doc/HTML/en/kmedia -@dirrm share/doc/HTML/de/kmidi -@dirrm share/apps/kscd/pics -@dirrm share/apps/kscd/cddb/soundtrack -@dirrm share/apps/kscd/cddb/rock -@dirrm share/apps/kscd/cddb/reggae -@dirrm share/apps/kscd/cddb/newage -@dirrm share/apps/kscd/cddb/misc -@dirrm share/apps/kscd/cddb/jazz -@dirrm share/apps/kscd/cddb/folk -@dirrm share/apps/kscd/cddb/data -@dirrm share/apps/kscd/cddb/country -@dirrm share/apps/kscd/cddb/classical -@dirrm share/apps/kscd/cddb/blues -@dirrm share/apps/kscd/cddb -@dirrm share/apps/kscd -@dirrm share/apps/kmix/pics -@dirrm share/apps/kmix -@dirrm share/apps/kmidi/pics -@dirrm share/apps/kmidi/config/patch -@dirrm share/apps/kmidi/config -@dirrm share/apps/kmidi -@dirrm share/apps/kmid/toolbar -@dirrm share/apps/kmid/pics -@dirrm share/apps/kmid/maps -@dirrm share/apps/kmid/fm -@dirrm share/apps/kmid -@dirrm share/apps/kmedia/pics -@dirrm share/apps/kmedia diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile deleted file mode 100644 index d7c6222e1b5d..000000000000 --- a/multimedia/kdemultimedia4/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# New ports collection makefile for: kdemultimedia -# Version required: Beta1 -# Date created: 28 October 1997 -# Whom: Stefan Eßer <se@freebsd.org> -# -# $FreeBSD$ -# - -DISTNAME= kdemultimedia-1.1.1 -CATEGORIES= audio kde -MASTER_SITES= $(MASTER_SITE_KDE) -MASTER_SITE_SUBDIR= stable/1.1.1/distribution/tar/generic/source/bz2 - -MAINTAINER= se@freebsd.org - -LIB_DEPENDS= gif.3:${PORTSDIR}/graphics/giflib \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ - kdecore.2:${PORTSDIR}/x11/kdelibs11 - -USE_BZIP2= yes -USE_QT= yes -HAS_CONFIGURE= yes -CONFIGURE_ARGS= "--prefix=$(PREFIX)" -CONFIGURE_ENV= CXXFLAGS="$(CFLAGS)" \ - INSTALL_SCRIPT="install -c -m 555" -USE_GMAKE= yes - -.include <bsd.port.mk> diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo deleted file mode 100644 index f05b71f08d07..000000000000 --- a/multimedia/kdemultimedia4/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (kdemultimedia-1.1.1.tar.bz2) = 499871e7920bc8bbecc90574f74c8387 diff --git a/multimedia/kdemultimedia4/pkg-comment b/multimedia/kdemultimedia4/pkg-comment deleted file mode 100644 index 6f31b51504cc..000000000000 --- a/multimedia/kdemultimedia4/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -KDE audio tools diff --git a/multimedia/kdemultimedia4/pkg-descr b/multimedia/kdemultimedia4/pkg-descr deleted file mode 100644 index 90ae45773bea..000000000000 --- a/multimedia/kdemultimedia4/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -KDE provides an integrated X11 based environment, much like CDE. diff --git a/multimedia/kdemultimedia4/pkg-plist b/multimedia/kdemultimedia4/pkg-plist deleted file mode 100644 index 05bffa8a2889..000000000000 --- a/multimedia/kdemultimedia4/pkg-plist +++ /dev/null @@ -1,313 +0,0 @@ -bin/cddaslave -bin/kmedia -bin/kmid -bin/kmidi -bin/kmix -bin/kscd -bin/kscdmagic -bin/workman2cddb.pl -share/applnk/Multimedia/KMedia.kdelnk -share/applnk/Multimedia/KMidi.kdelnk -share/applnk/Multimedia/KMix.kdelnk -share/applnk/Multimedia/kmid.kdelnk -share/applnk/Multimedia/kscd.kdelnk -share/apps/kmedia/pics/eject.xbm -share/apps/kmedia/pics/ff.xbm -share/apps/kmedia/pics/kmedia.xpm -share/apps/kmedia/pics/kmedia_mini.xpm -share/apps/kmedia/pics/lock.xbm -share/apps/kmedia/pics/logo.xbm -share/apps/kmedia/pics/nexttrk.xbm -share/apps/kmedia/pics/playpause.xbm -share/apps/kmedia/pics/playpause_both.xpm -share/apps/kmedia/pics/playpause_play.xpm -share/apps/kmedia/pics/poweroff.xbm -share/apps/kmedia/pics/prevtrk.xbm -share/apps/kmedia/pics/rew.xbm -share/apps/kmedia/pics/stop.xbm -share/apps/kmid/AnotherGlitchInTheCall.kar -share/apps/kmid/OFortuna.kar -share/apps/kmid/StopInTheNameOfLove.kar -share/apps/kmid/TheGirlFromIpanema.kar -share/apps/kmid/fm/drums.o3 -share/apps/kmid/fm/drums.sb -share/apps/kmid/fm/std.o3 -share/apps/kmid/fm/std.sb -share/apps/kmid/maps/YamahaPSR500.map -share/apps/kmid/maps/YamahaPSS790.map -share/apps/kmid/maps/gm.map -share/apps/kmid/pics/button1.xpm -share/apps/kmid/pics/button2.xpm -share/apps/kmid/pics/keyboard.xpm -share/apps/kmid/toolbar/kmid_chn.xpm -share/apps/kmid/toolbar/kmid_fforward.xpm -share/apps/kmid/toolbar/kmid_frewind.xpm -share/apps/kmid/toolbar/kmid_next.xpm -share/apps/kmid/toolbar/kmid_pause.xpm -share/apps/kmid/toolbar/kmid_play.xpm -share/apps/kmid/toolbar/kmid_prev.xpm -share/apps/kmid/toolbar/kmid_stop.xpm -share/apps/kmid/toolbar/kmid_volume.xpm -share/apps/kmidi/config/chaos12-voices -share/apps/kmidi/config/chaos8-voices -share/apps/kmidi/config/gravis.cfg -share/apps/kmidi/config/gsdrum.cfg -share/apps/kmidi/config/megadrum -share/apps/kmidi/config/megainst -share/apps/kmidi/config/midia.cfg -share/apps/kmidi/config/mt32.cfg -share/apps/kmidi/config/patch/acpiano.pat -share/apps/kmidi/config/patch/nylongt2.pat -share/apps/kmidi/config/pila-voices -share/apps/kmidi/config/sndfont.cfg -share/apps/kmidi/config/sound-canvas-drums -share/apps/kmidi/config/timidity.cfg -share/apps/kmidi/config/wowpats.cfg -share/apps/kmidi/pics/kmidilogo.xpm -share/apps/kmix/pics/kmixdocked.xpm -share/apps/kmix/pics/mix_audio.xpm -share/apps/kmix/pics/mix_bass.xpm -share/apps/kmix/pics/mix_cd.xpm -share/apps/kmix/pics/mix_ext.xpm -share/apps/kmix/pics/mix_microphone.xpm -share/apps/kmix/pics/mix_midi.xpm -share/apps/kmix/pics/mix_recmon.xpm -share/apps/kmix/pics/mix_treble.xpm -share/apps/kmix/pics/mix_unknown.xpm -share/apps/kmix/pics/mix_volume.xpm -share/apps/kscd/pics/cdsmall.xpm -share/apps/kscd/pics/kscdlogo.xpm -share/doc/HTML/de/kmidi/kmidi-1.html -share/doc/HTML/de/kmidi/kmidi-2.html -share/doc/HTML/de/kmidi/kmidi-3.html -share/doc/HTML/de/kmidi/kmidi-4.html -share/doc/HTML/de/kmidi/kmidi-5.html -share/doc/HTML/de/kmidi/kmidi.html -share/doc/HTML/de/kmidi/kmidi.sgml -share/doc/HTML/de/kmidi/logotp3.gif -share/doc/HTML/en/kmedia/index-1.html -share/doc/HTML/en/kmedia/index-2.html -share/doc/HTML/en/kmedia/index-3.html -share/doc/HTML/en/kmedia/index-4.html -share/doc/HTML/en/kmedia/index-5.html -share/doc/HTML/en/kmedia/index.html -share/doc/HTML/en/kmedia/logotp3.gif -share/doc/HTML/en/kmid/index-1.html -share/doc/HTML/en/kmid/index-2.html -share/doc/HTML/en/kmid/index-3.html -share/doc/HTML/en/kmid/index-4.html -share/doc/HTML/en/kmid/index-5.html -share/doc/HTML/en/kmid/index-6.html -share/doc/HTML/en/kmid/index-7.html -share/doc/HTML/en/kmid/index-8.html -share/doc/HTML/en/kmid/index-9.html -share/doc/HTML/en/kmid/index.html -share/doc/HTML/en/kmid/logotp3.gif -share/doc/HTML/en/kmidi/kmidi-1.html -share/doc/HTML/en/kmidi/kmidi-2.html -share/doc/HTML/en/kmidi/kmidi-3.html -share/doc/HTML/en/kmidi/kmidi-4.html -share/doc/HTML/en/kmidi/kmidi-5.html -share/doc/HTML/en/kmidi/kmidi.html -share/doc/HTML/en/kmidi/kmidi.nif -share/doc/HTML/en/kmidi/kmidi.sgml -share/doc/HTML/en/kmidi/logotp3.gif -share/doc/HTML/en/kmix/index-1.html -share/doc/HTML/en/kmix/index-2.html -share/doc/HTML/en/kmix/index-3.html -share/doc/HTML/en/kmix/index-4.html -share/doc/HTML/en/kmix/index-5.html -share/doc/HTML/en/kmix/index-6.html -share/doc/HTML/en/kmix/index.html -share/doc/HTML/en/kmix/logotp3.gif -share/doc/HTML/en/kscd/kscd-1.html -share/doc/HTML/en/kscd/kscd-2.html -share/doc/HTML/en/kscd/kscd-3.html -share/doc/HTML/en/kscd/kscd-4.html -share/doc/HTML/en/kscd/kscd-5.html -share/doc/HTML/en/kscd/kscd-6.html -share/doc/HTML/en/kscd/kscd-7.html -share/doc/HTML/en/kscd/kscd-8.html -share/doc/HTML/en/kscd/kscd.html -share/doc/HTML/en/kscd/kscd1.gif -share/doc/HTML/en/kscd/kscd10.gif -share/doc/HTML/en/kscd/kscd11.gif -share/doc/HTML/en/kscd/kscd12.gif -share/doc/HTML/en/kscd/kscd13.gif -share/doc/HTML/en/kscd/kscd14.gif -share/doc/HTML/en/kscd/kscd15.gif -share/doc/HTML/en/kscd/kscd16.gif -share/doc/HTML/en/kscd/kscd2.gif -share/doc/HTML/en/kscd/kscd2a.gif -share/doc/HTML/en/kscd/kscd3.gif -share/doc/HTML/en/kscd/kscd4.gif -share/doc/HTML/en/kscd/kscd5.gif -share/doc/HTML/en/kscd/kscd6.gif -share/doc/HTML/en/kscd/kscd7.gif -share/doc/HTML/en/kscd/kscd8.gif -share/doc/HTML/en/kscd/kscd9.gif -share/doc/HTML/en/kscd/logotp3.gif -share/doc/HTML/es/kmid/index-1.html -share/doc/HTML/es/kmid/index-2.html -share/doc/HTML/es/kmid/index-3.html -share/doc/HTML/es/kmid/index-4.html -share/doc/HTML/es/kmid/index-5.html -share/doc/HTML/es/kmid/index-6.html -share/doc/HTML/es/kmid/index-7.html -share/doc/HTML/es/kmid/index-8.html -share/doc/HTML/es/kmid/index-9.html -share/doc/HTML/es/kmid/index.html -share/doc/HTML/es/kmid/logotp3.gif -share/icons/cd.xpm -share/icons/kmedia.xpm -share/icons/kmid.xpm -share/icons/kmidi.xpm -share/icons/kmix.xpm -share/icons/kscd.xpm -share/icons/mini/kmedia.xpm -share/icons/mini/kmid.xpm -share/icons/mini/kmidi.xpm -share/icons/mini/kmix.xpm -share/icons/mini/kscd.xpm -share/locale/br/LC_MESSAGES/kmedia.mo -share/locale/br/LC_MESSAGES/kmid.mo -share/locale/br/LC_MESSAGES/kmidi.mo -share/locale/br/LC_MESSAGES/kmix.mo -share/locale/br/LC_MESSAGES/kscd.mo -share/locale/ca/LC_MESSAGES/kmedia.mo -share/locale/ca/LC_MESSAGES/kmid.mo -share/locale/ca/LC_MESSAGES/kmidi.mo -share/locale/ca/LC_MESSAGES/kmix.mo -share/locale/ca/LC_MESSAGES/kscd.mo -share/locale/cs/LC_MESSAGES/kmedia.mo -share/locale/cs/LC_MESSAGES/kmid.mo -share/locale/cs/LC_MESSAGES/kmidi.mo -share/locale/cs/LC_MESSAGES/kmix.mo -share/locale/cs/LC_MESSAGES/kscd.mo -share/locale/da/LC_MESSAGES/kmedia.mo -share/locale/da/LC_MESSAGES/kmid.mo -share/locale/da/LC_MESSAGES/kmidi.mo -share/locale/da/LC_MESSAGES/kmix.mo -share/locale/da/LC_MESSAGES/kscd.mo -share/locale/de/LC_MESSAGES/kmedia.mo -share/locale/de/LC_MESSAGES/kmid.mo -share/locale/de/LC_MESSAGES/kmidi.mo -share/locale/de/LC_MESSAGES/kmix.mo -share/locale/de/LC_MESSAGES/kscd.mo -share/locale/el/LC_MESSAGES/kmedia.mo -share/locale/el/LC_MESSAGES/kmix.mo -share/locale/el/LC_MESSAGES/kscd.mo -share/locale/eo/LC_MESSAGES/kmedia.mo -share/locale/eo/LC_MESSAGES/kmid.mo -share/locale/eo/LC_MESSAGES/kmix.mo -share/locale/eo/LC_MESSAGES/kscd.mo -share/locale/es/LC_MESSAGES/kmedia.mo -share/locale/es/LC_MESSAGES/kmid.mo -share/locale/es/LC_MESSAGES/kmix.mo -share/locale/es/LC_MESSAGES/kscd.mo -share/locale/fi/LC_MESSAGES/kmedia.mo -share/locale/fi/LC_MESSAGES/kmid.mo -share/locale/fi/LC_MESSAGES/kmix.mo -share/locale/fi/LC_MESSAGES/kscd.mo -share/locale/fr/LC_MESSAGES/kmedia.mo -share/locale/fr/LC_MESSAGES/kmid.mo -share/locale/fr/LC_MESSAGES/kmidi.mo -share/locale/fr/LC_MESSAGES/kmix.mo -share/locale/fr/LC_MESSAGES/kscd.mo -share/locale/hr/LC_MESSAGES/kmedia.mo -share/locale/hr/LC_MESSAGES/kmid.mo -share/locale/hr/LC_MESSAGES/kmix.mo -share/locale/hr/LC_MESSAGES/kscd.mo -share/locale/hu/LC_MESSAGES/kmid.mo -share/locale/hu/LC_MESSAGES/kmidi.mo -share/locale/hu/LC_MESSAGES/kmix.mo -share/locale/hu/LC_MESSAGES/kscd.mo -share/locale/is/LC_MESSAGES/kmedia.mo -share/locale/is/LC_MESSAGES/kmid.mo -share/locale/is/LC_MESSAGES/kmix.mo -share/locale/is/LC_MESSAGES/kscd.mo -share/locale/it/LC_MESSAGES/kmedia.mo -share/locale/it/LC_MESSAGES/kmix.mo -share/locale/ko/LC_MESSAGES/kmedia.mo -share/locale/ko/LC_MESSAGES/kmid.mo -share/locale/ko/LC_MESSAGES/kmix.mo -share/locale/ko/LC_MESSAGES/kscd.mo -share/locale/nl/LC_MESSAGES/kmedia.mo -share/locale/nl/LC_MESSAGES/kscd.mo -share/locale/no/LC_MESSAGES/kmedia.mo -share/locale/no/LC_MESSAGES/kmid.mo -share/locale/no/LC_MESSAGES/kmidi.mo -share/locale/no/LC_MESSAGES/kmix.mo -share/locale/no/LC_MESSAGES/kscd.mo -share/locale/pl/LC_MESSAGES/kmedia.mo -share/locale/pl/LC_MESSAGES/kmid.mo -share/locale/pl/LC_MESSAGES/kmix.mo -share/locale/pl/LC_MESSAGES/kscd.mo -share/locale/pt/LC_MESSAGES/kmedia.mo -share/locale/pt/LC_MESSAGES/kmid.mo -share/locale/pt/LC_MESSAGES/kmix.mo -share/locale/pt/LC_MESSAGES/kscd.mo -share/locale/pt_BR/LC_MESSAGES/kmedia.mo -share/locale/pt_BR/LC_MESSAGES/kmid.mo -share/locale/pt_BR/LC_MESSAGES/kmidi.mo -share/locale/pt_BR/LC_MESSAGES/kmix.mo -share/locale/pt_BR/LC_MESSAGES/kscd.mo -share/locale/ro/LC_MESSAGES/kmedia.mo -share/locale/ro/LC_MESSAGES/kmix.mo -share/locale/sk/LC_MESSAGES/kmedia.mo -share/locale/sk/LC_MESSAGES/kmid.mo -share/locale/sk/LC_MESSAGES/kmidi.mo -share/locale/sk/LC_MESSAGES/kmix.mo -share/locale/sk/LC_MESSAGES/kscd.mo -share/locale/sv/LC_MESSAGES/kmedia.mo -share/locale/sv/LC_MESSAGES/kmid.mo -share/locale/sv/LC_MESSAGES/kmix.mo -share/locale/sv/LC_MESSAGES/kscd.mo -share/locale/tr/LC_MESSAGES/kmedia.mo -share/locale/tr/LC_MESSAGES/kmid.mo -share/locale/tr/LC_MESSAGES/kmix.mo -share/locale/tr/LC_MESSAGES/kscd.mo -share/locale/zh_CN.GB2312/LC_MESSAGES/kmedia.mo -share/locale/zh_CN.GB2312/LC_MESSAGES/kmid.mo -share/locale/zh_CN.GB2312/LC_MESSAGES/kmix.mo -share/locale/zh_CN.GB2312/LC_MESSAGES/kscd.mo -share/locale/zh_TW.Big5/LC_MESSAGES/kmedia.mo -share/locale/zh_TW.Big5/LC_MESSAGES/kmid.mo -share/locale/zh_TW.Big5/LC_MESSAGES/kmix.mo -share/locale/zh_TW.Big5/LC_MESSAGES/kscd.mo -share/mimelnk/audio/x-karaoke.kdelnk -share/mimelnk/text/xmcd.kdelnk -@dirrm share/doc/HTML/es/kmid -@dirrm share/doc/HTML/en/kscd -@dirrm share/doc/HTML/en/kmix -@dirrm share/doc/HTML/en/kmidi -@dirrm share/doc/HTML/en/kmid -@dirrm share/doc/HTML/en/kmedia -@dirrm share/doc/HTML/de/kmidi -@dirrm share/apps/kscd/pics -@dirrm share/apps/kscd/cddb/soundtrack -@dirrm share/apps/kscd/cddb/rock -@dirrm share/apps/kscd/cddb/reggae -@dirrm share/apps/kscd/cddb/newage -@dirrm share/apps/kscd/cddb/misc -@dirrm share/apps/kscd/cddb/jazz -@dirrm share/apps/kscd/cddb/folk -@dirrm share/apps/kscd/cddb/data -@dirrm share/apps/kscd/cddb/country -@dirrm share/apps/kscd/cddb/classical -@dirrm share/apps/kscd/cddb/blues -@dirrm share/apps/kscd/cddb -@dirrm share/apps/kscd -@dirrm share/apps/kmix/pics -@dirrm share/apps/kmix -@dirrm share/apps/kmidi/pics -@dirrm share/apps/kmidi/config/patch -@dirrm share/apps/kmidi/config -@dirrm share/apps/kmidi -@dirrm share/apps/kmid/toolbar -@dirrm share/apps/kmid/pics -@dirrm share/apps/kmid/maps -@dirrm share/apps/kmid/fm -@dirrm share/apps/kmid -@dirrm share/apps/kmedia/pics -@dirrm share/apps/kmedia diff --git a/multimedia/linux-realplayer/Makefile b/multimedia/linux-realplayer/Makefile deleted file mode 100644 index 78f5006dd2e8..000000000000 --- a/multimedia/linux-realplayer/Makefile +++ /dev/null @@ -1,78 +0,0 @@ -# New ports collection makefile for: linux-realplayer -# Version required: 5.0 -# Date created: 31 January 1999 -# Whom: Kris Kennaway <kkennawa@physics.adelaide.edu.au> -# -# $FreeBSD$ -# - -DISTNAME= rv50_linux20 -PKGNAME= linux-realplayer-5.0 -CATEGORIES= audio -MASTER_SITES= - -MAINTAINER= kris@FreeBSD.org - -RUN_DEPENDS= /compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base - -ONLY_FOR_ARCHS= i386 -NO_CDROM= "Redistribution not allowed" -NO_BUILD= yes -WRKSRC= ${WRKDIR}/rvplayer5.0/ - -LIBFILES= libdecdnet.so libra14_4.so libra28_8.so libradnet.so \ - librarv10.so librasipr.so librv10dec.so librvcore.so \ - librvplayer.so - -DATAFILES= License.txt Mailcap Mime.types RAObserver.class \ - RAPlayer.class rvplayer.ad - -.include <bsd.port.pre.mk> - -.if !exists(${DISTDIR}/${DISTNAME}.tar.gz) -IGNORE= may not be automatically fetched due to licensing\ - restrictions. You MUST manually fetch the Linux ELF version after\ - reading and agreeing to the license at:\ - http://www.real.com/products/player/50player/downloadrealplayer.html?wp=dl1198&src=download\ - - once ${DISTFILES} has been downloaded, move it to\ - ${DISTDIR} and then restart this build. -.endif - -do-install: - - ${MKDIR} ${PREFIX}/lib/rvplayer5.0/ - ${MKDIR} ${PREFIX}/share/rvplayer5.0/ - -.for i in ${DATAFILES} - ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/lib/rvplayer5.0/ -.endfor - -.if !defined(NOPORTSDOCS) - ${MKDIR} ${PREFIX}/share/doc/rvplayer5.0/ - ${CP} -rp ${WRKSRC}/README ${WRKSRC}/index.htm ${WRKSRC}/doc/ \ - ${PREFIX}/share/doc/rvplayer5.0/ -.endif - -.for i in ${LIBFILES} - ${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/lib/rvplayer5.0/ -.endfor - - ${INSTALL_PROGRAM} ${WRKSRC}/rvplayer ${PREFIX}/bin/ - /usr/bin/brandelf -t Linux ${PREFIX}/bin/rvplayer - - ${INSTALL_DATA} ${WRKSRC}/welcome.rm ${PREFIX}/share/rvplayer5.0/ - - @${ECHO_MSG} --------------------------------------------------------------- - @${ECHO_MSG} You must add ${PREFIX}/lib/rvplayer5.0 to your - @${ECHO_MSG} LD_LIBRARY_PATH environment variable to use RealPlayer 5.0. - @${ECHO_MSG} - @${ECHO_MSG} To use the Netscape plugin, you must have a Linux version of - @${ECHO_MSG} netscape \(e.g., ${PORTSDIR}/www/linux-netscape4/\) - see - @${ECHO_MSG} ${PREFIX}/share/doc/rvplayer5.0/plugin.html for instructions. - @${ECHO_MSG} - @${ECHO_MSG} To use rvplayer as an external helper app for Netscape \(any - @${ECHO_MSG} version\), follow the instructions in - @${ECHO_MSG} ${PREFIX}/share/doc/rvplayer5.0/browser.htm. - @${ECHO_MSG} --------------------------------------------------------------- - -.include <bsd.port.post.mk> diff --git a/multimedia/linux-realplayer/distinfo b/multimedia/linux-realplayer/distinfo deleted file mode 100644 index 93ee8e32d556..000000000000 --- a/multimedia/linux-realplayer/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (rv50_linux20.tar.gz) = 631018a5eeb530dbc8e441fd1236f625 diff --git a/multimedia/linux-realplayer/pkg-comment b/multimedia/linux-realplayer/pkg-comment deleted file mode 100644 index 3179c2614782..000000000000 --- a/multimedia/linux-realplayer/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Linux RealPlayer 5.0 from RealNetworks diff --git a/multimedia/linux-realplayer/pkg-descr b/multimedia/linux-realplayer/pkg-descr deleted file mode 100644 index f9a9ba85e346..000000000000 --- a/multimedia/linux-realplayer/pkg-descr +++ /dev/null @@ -1,17 +0,0 @@ -This is the Linux version of RealPlayer 5.0 from RealNetworks, the player -for RealAudio and RealVideo streaming broadcasts from the net. It can be -used as a standalone application, an external "helper" app from Netscape, -or a plugin in the Linux version of netscape. - -Playing back video streams such as /usr/local/share/rvplayer5.0/welcome.rm -doesn't seem to work too well on my 4.0-CURRENT machine. - -Due to license restrictions, this package must be manually downloaded -from: - -http://www.real.com/products/player/50player/downloadrealplayer.html?wp=dl1198&src=download - -WWW: http://www.real.com/products/player/50player/ - -- Kris Kennaway -<kkennawa@physics.adelaide.edu.au> diff --git a/multimedia/linux-realplayer/pkg-plist b/multimedia/linux-realplayer/pkg-plist deleted file mode 100644 index f347b316dfcf..000000000000 --- a/multimedia/linux-realplayer/pkg-plist +++ /dev/null @@ -1,56 +0,0 @@ -bin/rvplayer -lib/rvplayer5.0/License.txt -lib/rvplayer5.0/Mailcap -lib/rvplayer5.0/Mime.types -lib/rvplayer5.0/RAObserver.class -lib/rvplayer5.0/RAPlayer.class -lib/rvplayer5.0/rvplayer.ad -lib/rvplayer5.0/libdecdnet.so -lib/rvplayer5.0/libra14_4.so -lib/rvplayer5.0/libra28_8.so -lib/rvplayer5.0/libradnet.so -lib/rvplayer5.0/librarv10.so -lib/rvplayer5.0/librasipr.so -lib/rvplayer5.0/librv10dec.so -lib/rvplayer5.0/librvcore.so -lib/rvplayer5.0/librvplayer.so -share/doc/rvplayer5.0/gifs/webhelp.gif -share/doc/rvplayer5.0/gifs/config4_1.jpg -share/doc/rvplayer5.0/gifs/config4_2.jpg -share/doc/rvplayer5.0/gifs/download.gif -share/doc/rvplayer5.0/gifs/emhelp.gif -share/doc/rvplayer5.0/gifs/plugin.jpg -share/doc/rvplayer5.0/gifs/prefs.jpg -share/doc/rvplayer5.0/gifs/ra-logo.gif -share/doc/rvplayer5.0/gifs/ra-logo2.gif -share/doc/rvplayer5.0/gifs/realplayer4.jpg -share/doc/rvplayer5.0/gifs/rnlogo.gif -share/doc/rvplayer5.0/gifs/config3.jpg -share/doc/rvplayer5.0/browser.htm -share/doc/rvplayer5.0/configure.htm -share/doc/rvplayer5.0/contents.htm -share/doc/rvplayer5.0/embed.htm -share/doc/rvplayer5.0/freebsd.htm -share/doc/rvplayer5.0/general.htm -share/doc/rvplayer5.0/install.htm -share/doc/rvplayer5.0/intro.htm -share/doc/rvplayer5.0/irix.htm -share/doc/rvplayer5.0/license.htm -share/doc/rvplayer5.0/linux.htm -share/doc/rvplayer5.0/notes.htm -share/doc/rvplayer5.0/notice.html -share/doc/rvplayer5.0/path.htm -share/doc/rvplayer5.0/plugin.htm -share/doc/rvplayer5.0/setup.htm -share/doc/rvplayer5.0/shared.htm -share/doc/rvplayer5.0/solaris.htm -share/doc/rvplayer5.0/sysreq.htm -share/doc/rvplayer5.0/title.html -share/doc/rvplayer5.0/toc.html -share/doc/rvplayer5.0/index.htm -share/doc/rvplayer5.0/README -share/rvplayer5.0/welcome.rm -@dirrm share/rvplayer5.0 -@dirrm share/doc/rvplayer5.0/gifs -@dirrm share/doc/rvplayer5.0 -@dirrm lib/rvplayer5.0 diff --git a/multimedia/mpeg2codec/Makefile b/multimedia/mpeg2codec/Makefile deleted file mode 100644 index 30cac58df698..000000000000 --- a/multimedia/mpeg2codec/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# New ports collection makefile for: mpeg2codec -# Version required: 1.2 -# Date created: November 25, 1996 -# Whom: "Philippe Charnier" <charnier@lirmm.fr> -# -# $FreeBSD$ -# - -DISTNAME= mpeg2codec-1.2 -CATEGORIES= graphics -MASTER_SITES= ftp://ftp.mpeg.org/pub/mpeg/mssg/ -DISTFILES= mpeg2vidcodec_v12.tar.gz - -MAINTAINER= charnier@lirmm.fr - -USE_X_PREFIX= yes -WRKSRC= ${WRKDIR}/mpeg2 - -do-install: -.for i in dec enc - ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${WRKSRC}/src/mpeg2${i}/mpeg2${i}ode ${PREFIX}/bin -.endfor - ${MKDIR} ${PREFIX}/share/mpeg2 - ${CP} ${WRKSRC}/doc/mpeg2enc.doc ${PREFIX}/share/mpeg2 - ${CP} ${WRKSRC}/par/* ${PREFIX}/share/mpeg2 - -.include <bsd.port.mk> diff --git a/multimedia/mpeg2codec/distinfo b/multimedia/mpeg2codec/distinfo deleted file mode 100644 index 158edc394e9e..000000000000 --- a/multimedia/mpeg2codec/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (mpeg2vidcodec_v12.tar.gz) = 4a66565979be0818bd8a41d948943451 diff --git a/multimedia/mpeg2codec/files/patch-aa b/multimedia/mpeg2codec/files/patch-aa deleted file mode 100644 index 4dab9efa9c97..000000000000 --- a/multimedia/mpeg2codec/files/patch-aa +++ /dev/null @@ -1,40 +0,0 @@ ---- Makefile.orig Sat Jul 20 03:35:46 1996 -+++ Makefile Tue Jan 5 16:34:35 1999 -@@ -30,31 +30,30 @@ - # uncomment the following two lines if you want to include X11 support - # (mpeg2decode) - --#USE_DISP = -DDISPLAY -+USE_DISP = -DDISPLAY - #LIBS = -lX11 - - # uncomment the following two lines if you want to use shared memory - # (faster display if server and client run on the same machine) - # (mpeg2decode) - --#USE_SHMEM = -DSH_MEM --#LIBS = -lXext -lX11 -+USE_SHMEM = -DSH_MEM -+LIBS = -lXext -lX11 - - # if your X11 include files / libraries are in a non standard location: - # set INCLUDEDIR to -I followed by the appropriate include file path and - # set LIBRARYDIR to -L followed by the appropriate library path - # (mpeg2decode) - --#INCLUDEDIR = -I/usr/openwin/include --#LIBRARYDIR = -L/usr/openwin/lib -+INCLUDEDIR = -I${X11BASE}/include -+LIBRARYDIR = -L${X11BASE}/lib - - # select one of the following CC CFLAGS settings - - # - # GNU gcc - # --CC = gcc --CFLAGS = -O2 -+CC = cc - - all: mpeg2decode mpeg2encode - diff --git a/multimedia/mpeg2codec/files/patch-ab b/multimedia/mpeg2codec/files/patch-ab deleted file mode 100644 index b0f6df0ce9fb..000000000000 --- a/multimedia/mpeg2codec/files/patch-ab +++ /dev/null @@ -1,23 +0,0 @@ ---- ./src/mpeg2enc/mpeg2enc.c 1996/11/25 21:18:23 1.1 -+++ ./src/mpeg2enc/mpeg2enc.c 1996/11/25 21:22:40 -@@ -29,6 +29,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <floatingpoint.h> - - #define GLOBAL /* used by global.h */ - #include "config.h" -@@ -50,6 +51,12 @@ - printf("Usage: mpeg2encode in.par out.m2v\n"); - exit(0); - } -+ -+ /* -+ * this prevents a floating point exception in calcSNR (stats.c) when -+ * working on black and white images (charnier@lirmm.fr) -+ */ -+ fpsetmask(0); - - /* read parameter file */ - readparmfile(argv[1]); diff --git a/multimedia/mpeg2codec/pkg-comment b/multimedia/mpeg2codec/pkg-comment deleted file mode 100644 index 82c613e1f0a8..000000000000 --- a/multimedia/mpeg2codec/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -An MPEG-2 Encoder and Decoder diff --git a/multimedia/mpeg2codec/pkg-descr b/multimedia/mpeg2codec/pkg-descr deleted file mode 100644 index 32fb990677b9..000000000000 --- a/multimedia/mpeg2codec/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -It converts uncompressed video frames into MPEG-1 and MPEG-2 video -coded bitstream sequences, and vice versa. diff --git a/multimedia/mpeg2codec/pkg-plist b/multimedia/mpeg2codec/pkg-plist deleted file mode 100644 index 622abe1180a5..000000000000 --- a/multimedia/mpeg2codec/pkg-plist +++ /dev/null @@ -1,9 +0,0 @@ -bin/mpeg2encode -bin/mpeg2decode -share/mpeg2/mpeg2enc.doc -share/mpeg2/MPEG-1.par -share/mpeg2/NTSC.par -share/mpeg2/PAL.par -share/mpeg2/inter.mat -share/mpeg2/intra.mat -@dirrm share/mpeg2 diff --git a/multimedia/mpeg2play/Makefile b/multimedia/mpeg2play/Makefile deleted file mode 100644 index b4f6156edb19..000000000000 --- a/multimedia/mpeg2play/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# New ports collection makefile for: mpeg2play -# Version required: 1.1b -# Date created: June 21, 1996 -# Whom: "Philippe Charnier" <charnier@lirmm.fr> -# -# $FreeBSD$ -# - -DISTNAME= mpeg2play-1.1b -CATEGORIES= graphics -MASTER_SITES= ftp://ftp.funet.fi/pub/graphics/packages/mpeg/mpeg2play/ -DISTFILES= mpeg2play-1.1b.tar.gz - -MAINTAINER= charnier@lirmm.fr - -USE_X_PREFIX= yes -USE_IMAKE= yes -REQUIRES_MOTIF= yes -ALL_TARGET= mpeg2play - -do-install: - ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${WRKSRC}/mpeg2play ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/Mpeg2play ${PREFIX}/lib/X11/app-defaults - - -.include <bsd.port.mk> diff --git a/multimedia/mpeg2play/distinfo b/multimedia/mpeg2play/distinfo deleted file mode 100644 index 1a2c55bb970d..000000000000 --- a/multimedia/mpeg2play/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (mpeg2play-1.1b.tar.gz) = a93dcca1c04ed308382d1a3eb621f248 diff --git a/multimedia/mpeg2play/files/patch-aa b/multimedia/mpeg2play/files/patch-aa deleted file mode 100644 index 8b1efae8a44e..000000000000 --- a/multimedia/mpeg2play/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- mpeg2play.c 1997/08/11 18:58:37 1.1 -+++ mpeg2play.c 1997/08/11 19:07:22 -@@ -335,7 +335,7 @@ - XmStringGetLtoR(((XmFileSelectionBoxCallbackStruct *)call_data)->value, - XmSTRING_DEFAULT_CHARSET, &filename); - -- position = tell(base.infile); -+ position = lseek(base.infile, 0L, SEEK_CUR); - fprintf(stderr, "pos: %d\n", position); - fprintf(stderr, "output: %s\n", filename); - diff --git a/multimedia/mpeg2play/files/patch-ab b/multimedia/mpeg2play/files/patch-ab deleted file mode 100644 index 9bb8e0ee0dd6..000000000000 --- a/multimedia/mpeg2play/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- Imakefile.orig Fri Oct 28 12:39:48 1994 -+++ Imakefile Sat Nov 14 16:29:42 1998 -@@ -15,7 +15,7 @@ - - EXTRA_DEFINES = $(USE_SHMEM) $(USE_TIME) - EXTRA_INCLUDES = -I. -Ibitmaps --LOCAL_LIBRARIES = $(SHM_LIB) -lXm -lXt -lX11 -lm -+LOCAL_LIBRARIES = $(SHM_LIB) ${MOTIFLIB} -lXt -lX11 -lm - - PROGRAM = mpeg2play - SRCS = mpeg2play.c getpic.c motion.c getvlc.c gethdr.c getblk.c \ diff --git a/multimedia/mpeg2play/pkg-comment b/multimedia/mpeg2play/pkg-comment deleted file mode 100644 index d8d0c92db7fb..000000000000 --- a/multimedia/mpeg2play/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -A program to play mpeg-2 movies on X displays diff --git a/multimedia/mpeg2play/pkg-descr b/multimedia/mpeg2play/pkg-descr deleted file mode 100644 index c3fb1c5ac2be..000000000000 --- a/multimedia/mpeg2play/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -mpeg2play is a player for MPEG-1 and MPEG-2 video bitstreams. It is based on -mpeg2decode by the MPEG Software Simulation Group. diff --git a/multimedia/mpeg2play/pkg-plist b/multimedia/mpeg2play/pkg-plist deleted file mode 100644 index 18c6e7a21a98..000000000000 --- a/multimedia/mpeg2play/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/mpeg2play -lib/X11/app-defaults/Mpeg2play diff --git a/multimedia/mpeg_encode/Makefile b/multimedia/mpeg_encode/Makefile deleted file mode 100644 index 66003add3ee9..000000000000 --- a/multimedia/mpeg_encode/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# New ports collection makefile for: mpeg_encode -# Version required: 1.5b -# Date created: -# Whom: erich@FreeBSD.org -# -# $FreeBSD$ -# - -DISTNAME= mpeg_encode-1.5b-src -PKGNAME= mpeg_encode-1.5b -CATEGORIES= graphics -MASTER_SITES= ftp://mm-ftp.CS.Berkeley.EDU/pub/multimedia/mpeg/encode/ - -MAINTAINER= erich@FreeBSD.org - -USE_GMAKE= yes - -MAN1= mpeg_encode.1 -MANCOMPRESSED= yes - -WRKSRC= ${WRKDIR}/mpeg_encode - -.include <bsd.port.mk> diff --git a/multimedia/mpeg_encode/distinfo b/multimedia/mpeg_encode/distinfo deleted file mode 100644 index 0e6a1b2d972c..000000000000 --- a/multimedia/mpeg_encode/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (mpeg_encode-1.5b-src.tar.gz) = ff125fb82118efc7c852f0d26d5552c6 diff --git a/multimedia/mpeg_encode/files/patch-aa b/multimedia/mpeg_encode/files/patch-aa deleted file mode 100644 index b626b85d037c..000000000000 --- a/multimedia/mpeg_encode/files/patch-aa +++ /dev/null @@ -1,43 +0,0 @@ ---- ./headers/libpnmrw.h~ Thu Aug 1 08:52:25 1996 -+++ ./headers/libpnmrw.h Thu Aug 1 08:51:16 1996 -@@ -19,7 +19,12 @@ - ** malloc.h at all. A sad situation. If you have compilation problems - ** that point here, feel free to tweak or remove these declarations. - */ -+#ifdef __FreeBSD__ -+#include <stdlib.h> -+#else - #include <malloc.h> -+#endif -+ - #if !defined(sco) && !defined(sgi) && !defined(IRIX) - extern char* malloc(); - #endif ---- ./libpnmrw.c~ Thu Aug 1 08:52:14 1996 -+++ ./libpnmrw.c Thu Aug 1 08:51:26 1996 -@@ -126,7 +126,9 @@ - pm_perror( reason ) - char* reason; - { -+#ifndef __FreeBSD__ - extern char* sys_errlist[]; -+#endif - extern int errno; - char* e; - ---- Makefile~ Wed Aug 16 17:16:56 1995 -+++ Makefile Thu Aug 1 09:00:04 1996 -@@ -182,6 +182,13 @@ - - all: mpeg_encode - -+install: -+ install -c mpeg_encode ${PREFIX}/bin -+ install -c -m 644 mpeg_encode.1 ${PREFIX}/man/man1 -+ gzip -9nf ${PREFIX}/man/man1/mpeg_encode.1 -+ mkdir -p ${PREFIX}/share/doc/mpeg_encode -+ install -c docs/users-guide.ps docs/template.param ${PREFIX}/share/doc/mpeg_encode -+ - ######### - # TESTS # - ######### diff --git a/multimedia/mpeg_encode/pkg-comment b/multimedia/mpeg_encode/pkg-comment deleted file mode 100644 index ef6837ab779f..000000000000 --- a/multimedia/mpeg_encode/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -UCB's MPEG-I video stream encoder diff --git a/multimedia/mpeg_encode/pkg-descr b/multimedia/mpeg_encode/pkg-descr deleted file mode 100644 index 16f182aa4b1f..000000000000 --- a/multimedia/mpeg_encode/pkg-descr +++ /dev/null @@ -1,24 +0,0 @@ -From the README: - - MPEG-1 Video Software Encoder - (Version 1.5; February 1, 1995) - - Lawrence A. Rowe, Kevin Gong, Eugene Hung, Ketan Patel, Steve Smoot - and Dan Wallach - Computer Science Division-EECS, Univ. of Calif. at Berkeley - - This directory contains the freely distributed Berkeley MPEG-1 Video - Encoder. The encoder implements the standard described in the ISO/IEC - International Standard 11172-2. The code has been compiled and tested - on the following platforms: - - DECstation 5000 and Alpha - HP PA-RISC (HP/UX 9.X) (i.e., HP 9000/7XX and 9000/3XX) - SGI Indigo running IRIX 5.0.1 - Sun Sparc (SunOS 4.X) - -This is *not* bug-free software. In particular, I've had problems using -odd-sized input frames. Other than that, it works OK. - -eric. -erich@FreeBSD.org diff --git a/multimedia/mpeg_encode/pkg-plist b/multimedia/mpeg_encode/pkg-plist deleted file mode 100644 index c0d6d4f5e886..000000000000 --- a/multimedia/mpeg_encode/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -bin/mpeg_encode -share/doc/mpeg_encode/users-guide.ps -share/doc/mpeg_encode/template.param -@dirrm share/doc/mpeg_encode diff --git a/multimedia/mpeg_play/Makefile b/multimedia/mpeg_play/Makefile deleted file mode 100644 index 63f37bd33759..000000000000 --- a/multimedia/mpeg_play/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# New ports collection makefile for: mpeg_play -# Version required: 2.4 -# Date created: 17 December 1994 -# Whom: asami -# -# $FreeBSD$ -# - -DISTNAME= mpeg_play-2.4 -CATEGORIES= graphics -MASTER_SITES= ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/play/ -EXTRACT_SUFX= -patched-src.tar.gz - -MAINTAINER= ports@FreeBSD.org - -WRKSRC= ${WRKDIR}/mpeg_play -USE_IMAKE= yes -MAN1= mpeg_play.1 - -pre-patch: - ${CP} ${WRKSRC}/Imakefile.proto ${WRKSRC}/Imakefile - ${CP} ${WRKSRC}/mpeg_play.1 ${WRKSRC}/mpeg_play.man - -.include <bsd.port.mk> diff --git a/multimedia/mpeg_play/distinfo b/multimedia/mpeg_play/distinfo deleted file mode 100644 index 65876bfc7d1a..000000000000 --- a/multimedia/mpeg_play/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (mpeg_play-2.4-patched-src.tar.gz) = 8fd5d8c2137b14234da4dfc898900166 diff --git a/multimedia/mpeg_play/files/patch-aa b/multimedia/mpeg_play/files/patch-aa deleted file mode 100644 index 46a447230e06..000000000000 --- a/multimedia/mpeg_play/files/patch-aa +++ /dev/null @@ -1,9 +0,0 @@ ---- ./Imakefile.org Tue Feb 6 23:37:51 1996 -+++ ./Imakefile Wed Feb 7 00:05:59 1996 -@@ -1,5 +1,5 @@ - /* See Makefile.proto for flags to define */ -- DESTDIR = /usr/pkg/video -+ /* DESTDIR = /usr/pkg/video */ - NDEBUG = /* -DNDEBUG */ - /*ANALYSIS = -DANALYSIS */ - SHMEM = -DSH_MEM diff --git a/multimedia/mpeg_play/pkg-comment b/multimedia/mpeg_play/pkg-comment deleted file mode 100644 index 3a67e110d5c8..000000000000 --- a/multimedia/mpeg_play/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -A program to play mpeg movies on X displays diff --git a/multimedia/mpeg_play/pkg-descr b/multimedia/mpeg_play/pkg-descr deleted file mode 100644 index a9f6131b99cc..000000000000 --- a/multimedia/mpeg_play/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -This is mpeg_play, which will let you view mpeg movies on X window -displays. - -- Satoshi -asami@cs.berkeley.edu diff --git a/multimedia/mpeg_play/pkg-plist b/multimedia/mpeg_play/pkg-plist deleted file mode 100644 index 8fdacec89a81..000000000000 --- a/multimedia/mpeg_play/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -bin/mpeg_play diff --git a/multimedia/mpeg_stat/Makefile b/multimedia/mpeg_stat/Makefile deleted file mode 100644 index e3fb74270e2b..000000000000 --- a/multimedia/mpeg_stat/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# New ports collection makefile for: mpeg_stat -# Version required: 2.2b -# Date created: Thu Aug 1 21:52:06 CDT 1996 -# Whom: erich@FreeBSD.org -# -# $FreeBSD$ -# - -DISTNAME= mpeg_stat-2.2b-src -PKGNAME= mpeg_stat-2.2b -CATEGORIES= graphics -MASTER_SITES= ftp://mm-ftp.CS.Berkeley.EDU/pub/multimedia/mpeg/stat/ - -MAINTAINER= erich@FreeBSD.org - -MAN1= mpeg_stat.1 -MANCOMPRESSED= yes - -WRKSRC= ${WRKDIR}/mpeg_stat - -.include <bsd.port.mk> diff --git a/multimedia/mpeg_stat/distinfo b/multimedia/mpeg_stat/distinfo deleted file mode 100644 index 98a7efef7f7c..000000000000 --- a/multimedia/mpeg_stat/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (mpeg_stat-2.2b-src.tar.gz) = d0eca3833b76855c4e348b39deaf667d diff --git a/multimedia/mpeg_stat/files/patch-aa b/multimedia/mpeg_stat/files/patch-aa deleted file mode 100644 index 845072865023..000000000000 --- a/multimedia/mpeg_stat/files/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile~ Fri Aug 2 11:59:50 1996 -+++ Makefile Fri Aug 2 12:02:45 1996 -@@ -40,6 +40,12 @@ - all: $(PROGRAM) - strip $(PROGRAM) - -+install: -+ install -cs ${PROGRAM} ${PREFIX}/bin -+ install -c block2spec ${PREFIX}/bin -+ install -c -m 644 mpeg_stat.1 ${PREFIX}/man/man1 -+ gzip -9nf ${PREFIX}/man/man1/mpeg_stat.1 -+ - $(PROGRAM): $(OBJS) - $(LD) -g $(OBJS) $(LIBS) -lm -o $(PROGRAM) - diff --git a/multimedia/mpeg_stat/pkg-comment b/multimedia/mpeg_stat/pkg-comment deleted file mode 100644 index 7e5a19f05cab..000000000000 --- a/multimedia/mpeg_stat/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -An MPEG-I statistics gatherer diff --git a/multimedia/mpeg_stat/pkg-descr b/multimedia/mpeg_stat/pkg-descr deleted file mode 100644 index 6574340eadc6..000000000000 --- a/multimedia/mpeg_stat/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -From the README: - MPEG Video Software Statistics Gatherer - (Version 2.2; Feb 1, 1995) - - Lawrence A. Rowe, Steve Smoot, Ketan Patel, and Brian Smith - Computer Science Division-EECS, Univ. of Calif. at Berkeley - - This directory contains a public domain MPEG video statistics gatherer. - The decoder implements the standard described in the Committee - Draft ISO/IEC CD 11172 dated December 6, 1991 which is - sometimes referred to as "Paris Format." - -eric. -erich@FreeBSD.org diff --git a/multimedia/mpeg_stat/pkg-plist b/multimedia/mpeg_stat/pkg-plist deleted file mode 100644 index 906f188961d2..000000000000 --- a/multimedia/mpeg_stat/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/mpeg_stat -bin/block2spec diff --git a/multimedia/mpegedit/Makefile b/multimedia/mpegedit/Makefile deleted file mode 100644 index 6c225d888e37..000000000000 --- a/multimedia/mpegedit/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# New ports collection makefile for: mpegedit -# Version required: 2.2 -# Date created: Thu Aug 1 10:50:57 CDT 1996 -# Whom: erich@FreeBSD.org -# -# $FreeBSD$ -# - -DISTNAME= mpegedit_v2.2 -PKGNAME= mpegedit-2.2 -CATEGORIES= graphics -MASTER_SITES= ftp://ftp.demon.co.uk/pub/unix/tools/ - -MAINTAINER= erich@FreeBSD.org - -BUILD_DEPENDS= ${PREFIX}/include/pbmplus.h:${PORTSDIR}/graphics/netpbm - -.include <bsd.port.pre.mk> -.if ${OSVERSION} > 400002 -BROKEN= won\'t build with egcs compiler -.endif - -USE_X_PREFIX= yes -USE_GMAKE= yes - -.include <bsd.port.post.mk> diff --git a/multimedia/mpegedit/distinfo b/multimedia/mpegedit/distinfo deleted file mode 100644 index 7d1307bf1c7c..000000000000 --- a/multimedia/mpegedit/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (mpegedit_v2.2.tar.gz) = 00f7dd986f4bcdccf20f6f4cf59d7f4c diff --git a/multimedia/mpegedit/pkg-comment b/multimedia/mpegedit/pkg-comment deleted file mode 100644 index b9670c907ae0..000000000000 --- a/multimedia/mpegedit/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -A program to edit encoded mpeg streams diff --git a/multimedia/mpegedit/pkg-descr b/multimedia/mpegedit/pkg-descr deleted file mode 100644 index f25cbbf23e67..000000000000 --- a/multimedia/mpegedit/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -mpeg_edit will edit and apply some effects to an already -encoded mpeg video stream. - -The program has several bugs, but I've been able to use it. Expect -core-dumps. It has problems with displays >8 bits too. - -eric. -erich@FreeBSD.org diff --git a/multimedia/mpegedit/pkg-plist b/multimedia/mpegedit/pkg-plist deleted file mode 100644 index a1c913e5594b..000000000000 --- a/multimedia/mpegedit/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -bin/mpeg_edit -share/doc/mpeg_edit/README -share/doc/mpeg_edit/manual.ps -@dirrm share/doc/mpeg_edit diff --git a/multimedia/mplex/Makefile b/multimedia/mplex/Makefile deleted file mode 100644 index 3326c4e2accd..000000000000 --- a/multimedia/mplex/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# New ports collection makefile for: mplex -# Version required: 1.1 -# Date created: Wed Jul 31 20:54:54 CDT 1996 -# Whom: erich@FreeBSD.org -# -# $FreeBSD$ -# - -DISTNAME= mplex-1.1 - -CATEGORIES= graphics -MASTER_SITES= ftp://ftp.informatik.tu-muenchen.de/pub/comp/graphics/mpeg/mplex/ - -MAINTAINER= erich@FreeBSD.org - -MAN1= mplex.1 - -do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/mplex ${PREFIX}/bin - @${INSTALL_MAN} ${FILESDIR}/mplex.1 ${PREFIX}/man/man1 - -.include <bsd.port.mk> diff --git a/multimedia/mplex/distinfo b/multimedia/mplex/distinfo deleted file mode 100644 index e54c3a1bdaba..000000000000 --- a/multimedia/mplex/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (mplex-1.1.tar.gz) = 3da8bd9ba199aa439a0bdd2ab2d93230 diff --git a/multimedia/mplex/files/mplex.1 b/multimedia/mplex/files/mplex.1 deleted file mode 100644 index 0d7b0c0be1a5..000000000000 --- a/multimedia/mplex/files/mplex.1 +++ /dev/null @@ -1,18 +0,0 @@ -.\" The following requests are required for all man pages. -.Dd Thu Aug 1 09:36:57 CDT 1996 -.Os -.Dt mplex 1 -.Sh NAME -.Nm mplex -.Sh SYNOPSIS -.Nm mplex -.Ar file1 -.Op file2 -.Ar file3 -.Sh DESCRIPTION -.Nm mplex -multiplexes MPEG audio and video streams into system layers. - -.Sh AUTHORS -mplex was written by Christoph Moar <moar@informatik.tu-muenchen.de>. -This man page was written by Eric L. Hernes <erich@FreeBSD.org> diff --git a/multimedia/mplex/pkg-comment b/multimedia/mplex/pkg-comment deleted file mode 100644 index efa9e7d542b0..000000000000 --- a/multimedia/mplex/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Multiplexes MPEG component streams into system layers diff --git a/multimedia/mplex/pkg-descr b/multimedia/mplex/pkg-descr deleted file mode 100644 index 5713d3a5e08a..000000000000 --- a/multimedia/mplex/pkg-descr +++ /dev/null @@ -1,20 +0,0 @@ -The mplex multiplexes MPEG audio and video streams into system layers. - -From INSTRUCT (in the mplex source): -> -> Please note that I do not have a comprehensive instruction manual for this -> release. I suggest you try the program out with some default values and -> learn something more about ISO/IEC 11172-1 (aka MPEG1/Systems). -> -> -> Christoph. -> moar@heaven.zfe.siemens.de -> +---------------------------------------+--------------------------------+ -> | http://www.informatik.tu-muenchen.de/ | Christoph Moar | -> | cgi-bin/nph-gateway/hphalle6/~moar/ | Kaulbachstr.29a | -> | index.html | 80539 Munich | -> | email:moar@informatik.tu-muenchen.de | voice: ++49 - 89 - 23862874 | -> +---------------------------------------+--------------------------------+ - -eric. -erich@FreeBSD.org diff --git a/multimedia/mplex/pkg-plist b/multimedia/mplex/pkg-plist deleted file mode 100644 index ce53129766dd..000000000000 --- a/multimedia/mplex/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -bin/mplex diff --git a/multimedia/netshow/Makefile b/multimedia/netshow/Makefile deleted file mode 100644 index 5244ac07e177..000000000000 --- a/multimedia/netshow/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# New ports collection makefile for: netshow -# Version required: 2.00.251 -# Date created: Thu Jun 11 22:38:52 PDT 1998 -# Whom: dburr@FreeBSD.org -# -# $FreeBSD$ -# - -DISTNAME= netshow_linux -PKGNAME= netshow-2.00.251 -CATEGORIES= graphics net -MASTER_SITES= http://microsoft.com/netshow/download/en/beta/ -EXTRACT_SUFX= .gz - -MAINTAINER= dburr@FreeBSD.org - -RUN_DEPENDS= /compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base - -ONLY_FOR_ARCHS= i386 -RESTRICTED= "Commercial software" -NO_CDROM= ${RESTRICTED} -NO_PACKAGE= ${RESTRICTED} - -NO_BUILD= yes - -USE_X_PREFIX= yes - -pre-extract: - @${MKDIR} ${WRKDIR} - -do-extract: - ${GUNZIP_CMD} < ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKDIR}/netshow - -do-patch: - brandelf -t Linux ${WRKDIR}/netshow - -do-install: - ${INSTALL} -c -o bin -g bin -m 555 ${WRKDIR}/netshow ${PREFIX}/bin/netshow - -post-install: - @${CAT} ${PKGDIR}/MESSAGE - -.include <bsd.port.mk> diff --git a/multimedia/netshow/distinfo b/multimedia/netshow/distinfo deleted file mode 100644 index a0d83967b2bb..000000000000 --- a/multimedia/netshow/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (netshow_linux.gz) = e5434c3b7841c4cd0047c576de12d482 diff --git a/multimedia/netshow/pkg-comment b/multimedia/netshow/pkg-comment deleted file mode 100644 index 03cbea42c178..000000000000 --- a/multimedia/netshow/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Microsoft NetShow video stream player diff --git a/multimedia/netshow/pkg-descr b/multimedia/netshow/pkg-descr deleted file mode 100644 index a984e6f8a0da..000000000000 --- a/multimedia/netshow/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -This is the Microsoft NetShow video stream player for Linux. -It will run under FreeBSD's linux emulation libraries, provided -that you have built and installed the linux_lib port. (If you -haven't, this port will do it for you automatically.) - -For additional documentation, please see Microsoft's NetShow -web page at: - -WWW: http://microsoft.com/netshow/download/unix.htm - -Donald Burr <dburr@FreeBSD.ORG> diff --git a/multimedia/netshow/pkg-message b/multimedia/netshow/pkg-message deleted file mode 100644 index fc6d6e5b30f2..000000000000 --- a/multimedia/netshow/pkg-message +++ /dev/null @@ -1,4 +0,0 @@ -For additional documentation, please see Microsoft's NetShow -web page at: - -http://microsoft.com/netshow/download/unix.htm diff --git a/multimedia/netshow/pkg-plist b/multimedia/netshow/pkg-plist deleted file mode 100644 index d19a9629b564..000000000000 --- a/multimedia/netshow/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -bin/netshow diff --git a/multimedia/ppm2fli/Makefile b/multimedia/ppm2fli/Makefile deleted file mode 100644 index 0fb11192fb65..000000000000 --- a/multimedia/ppm2fli/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# New ports collection makefile for: ppm2fli -# Version required: b1.92 -# Date created: 7 Jan 1998 -# Whom: giffunip@asme.org -# -# $FreeBSD$ -# - -DISTNAME= ppm2fli_b1.92 -PKGNAME= ppm2fli-b1 -CATEGORIES= graphics -MASTER_SITES= ftp://crusty.er.usgs.gov/pub/animation/fli/ -EXTRACT_SUFX= .tar.Z - -MAINTAINER= giffunip@asme.org - -MAN1= ppm2fli.1 unflick.1 -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ppm2fli ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/unflick ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/ppm2fli.man ${PREFIX}/man/man1/ppm2fli.1 - ${INSTALL_MAN} ${WRKSRC}/unflick.man ${PREFIX}/man/man1/unflick.1 - -.include <bsd.port.mk> diff --git a/multimedia/ppm2fli/distinfo b/multimedia/ppm2fli/distinfo deleted file mode 100644 index abd08aeafb36..000000000000 --- a/multimedia/ppm2fli/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (ppm2fli_b1.92.tar.Z) = 259c85a90f12e2332c56ca75560bfbd2 diff --git a/multimedia/ppm2fli/files/patch-aa b/multimedia/ppm2fli/files/patch-aa deleted file mode 100644 index ab8fcfd06a68..000000000000 --- a/multimedia/ppm2fli/files/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ -*** Makefile.orig Fri Feb 13 01:15:45 1998 ---- Makefile Fri Feb 13 01:16:02 1998 -*************** -*** 9,15 **** - # - # Cflags - # -! CFLAGS=-O2 -Wall - # ------------------------------------------------------------------ - - .c.o: ---- 9,15 ---- - # - # Cflags - # -! CFLAGS+=-O2 -Wall - # ------------------------------------------------------------------ - - .c.o: diff --git a/multimedia/ppm2fli/pkg-comment b/multimedia/ppm2fli/pkg-comment deleted file mode 100644 index 29ba9e21a0d3..000000000000 --- a/multimedia/ppm2fli/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Utilities to merge PPM files into animated FLI and backwards diff --git a/multimedia/ppm2fli/pkg-descr b/multimedia/ppm2fli/pkg-descr deleted file mode 100644 index 13e9cd78d5a9..000000000000 --- a/multimedia/ppm2fli/pkg-descr +++ /dev/null @@ -1,19 +0,0 @@ -PPM2FLI can read directly PPM,PGM,PBM and FBM files. If necessary it -performs a quantization. The filters of the NETPBM, PBMPLUS and FBM package -can be used as read filters. Together with one of this packages -a large number of image formats can be handled. - -UNFLICK writes images in PPM or FBM format. - -In contrast to FBM2FLI no additional package is required to build -PPM2FLI and UNFLICK. So it can be used without any of the above mentioned -packages, if another source of PPM,PGM,PBM or FBM images is available. -For example, PS images can be animated using ghostscript. - -The current version is call `beta' because some parts are relative new -and not totally tested. I made tests on SUN sparc-stations (various versions -of SUN-OS), on PC running LINUX and under MSDOS using the DJGPP DOS-extender. -In all cases the GCC compiler was used. Under MSDOS I used a modified -makefile. Anyway, in some environments changes in the makefile are necessary. - --- Klaus Ehrenfried (klaus@es.go.dlr.de) diff --git a/multimedia/ppm2fli/pkg-plist b/multimedia/ppm2fli/pkg-plist deleted file mode 100644 index e364583e6c69..000000000000 --- a/multimedia/ppm2fli/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/ppm2fli -bin/unflick diff --git a/multimedia/spigot/Makefile b/multimedia/spigot/Makefile deleted file mode 100644 index f6258a01830f..000000000000 --- a/multimedia/spigot/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# New ports collection makefile for: libspigot.a -# Version required: 1.7 -# Date Created: Fri Sep 15 10:04:46 CDT 1995 -# Whom: james@cs.uwm.edu -# -# $FreeBSD$ -# - -DISTNAME= spigot-1.7 -CATEGORIES= graphics -MASTER_SITES= ftp://ftp.cs.uwm.edu/pub/FreeBSD-UWM/spigot/ -DISTFILES= spigot.1.7.tar.gz - -MAINTAINER= james@cs.uwm.edu - -# binary package -NO_BUILD= yes -NO_WRKSUBDIR= yes - -.include <bsd.port.mk> diff --git a/multimedia/spigot/distinfo b/multimedia/spigot/distinfo deleted file mode 100644 index 5be8938966c0..000000000000 --- a/multimedia/spigot/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (spigot.1.7.tar.gz) = 764caa2b3842b00bc74fada0cbf5100d diff --git a/multimedia/spigot/files/patch-aa b/multimedia/spigot/files/patch-aa deleted file mode 100644 index b4a95d9a33cf..000000000000 --- a/multimedia/spigot/files/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ ---- Makefile.orig Wed Nov 29 03:48:20 1995 -+++ Makefile Sat Dec 20 14:36:25 1997 -@@ -1,9 +1,9 @@ --DESTDIR?=/usr/local -+PREFIX?=/usr/local - - all: - echo "Nothing to make." - - install: -- cp libspigot.a ${DESTDIR}/lib/libspigot.a -+ cp libspigot.a ${PREFIX}/lib/libspigot.a - ranlib libspigot.a -- cp spigot_saa7191.h /usr/local/include -+ cp spigot_saa7191.h ${PREFIX}/include diff --git a/multimedia/spigot/pkg-comment b/multimedia/spigot/pkg-comment deleted file mode 100644 index edd8171e3b4f..000000000000 --- a/multimedia/spigot/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Video spigot for Windows library diff --git a/multimedia/spigot/pkg-descr b/multimedia/spigot/pkg-descr deleted file mode 100644 index 365ef10841a2..000000000000 --- a/multimedia/spigot/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -The package contains a library to use the Video Spigot for Windows -video aquistion board. diff --git a/multimedia/spigot/pkg-plist b/multimedia/spigot/pkg-plist deleted file mode 100644 index 01d57a9aa21a..000000000000 --- a/multimedia/spigot/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/libspigot.a -include/spigot_saa7191.h diff --git a/multimedia/splitmpg/Makefile b/multimedia/splitmpg/Makefile deleted file mode 100644 index b0e6d531f94c..000000000000 --- a/multimedia/splitmpg/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# New ports collection makefile for: splitmpg -# Version required: -# Date created: Wed Jul 31 21:59:42 CDT 1996 -# Whom: erich@FreeBSD.org -# -# $FreeBSD$ -# - -DISTNAME= splitmpg -PKGNAME= splitmpg-1.0 -CATEGORIES= graphics -MASTER_SITES= ftp://ftp.ecel.uwa.edu.au/users/michael/ -EXTRACT_SUFX= .tgz - -MAINTAINER= erich@FreeBSD.org - -MAN1= splitmpeg.1 -MANCOMPRESSED= yes - -NO_WRKSUBDIR= yes - -.include <bsd.port.mk> diff --git a/multimedia/splitmpg/distinfo b/multimedia/splitmpg/distinfo deleted file mode 100644 index 4c73cb3c2107..000000000000 --- a/multimedia/splitmpg/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (splitmpg.tgz) = 223af42151864efdb6e113a026b53185 diff --git a/multimedia/splitmpg/pkg-comment b/multimedia/splitmpg/pkg-comment deleted file mode 100644 index 9d9dd93face0..000000000000 --- a/multimedia/splitmpg/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Splits an ISO 11172-1 into its componets diff --git a/multimedia/splitmpg/pkg-descr b/multimedia/splitmpg/pkg-descr deleted file mode 100644 index 0eda5d3487a2..000000000000 --- a/multimedia/splitmpg/pkg-descr +++ /dev/null @@ -1,16 +0,0 @@ -From readme.txt: - This program splits an ISO 11172-1 System layer stream into its - component elemental streams. - - Comments and suggestions are welcome. - For the present (22 of June 1994) I can be contacted via - Email: michael@ecel.uwa.edu.au - Post: P.O. Box 506, NEDLANDS WA 6009, AUSTRALIA - - Updates to this source will first appear on - decel.ecel.uwa.edu.au in the /users/michael directory - This machine may change name within the next 6 months. - -eric. -erich@FreeBSD.org - diff --git a/multimedia/splitmpg/pkg-plist b/multimedia/splitmpg/pkg-plist deleted file mode 100644 index 037ae85dc976..000000000000 --- a/multimedia/splitmpg/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -bin/splitmpeg diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile deleted file mode 100644 index db0ffffa4101..000000000000 --- a/multimedia/vic/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# New ports collection makefile for: vic -# Version required: 2.6 -# Date created: 14 December 1994 -# Whom: wollman -# -# $FreeBSD$ -# - -DISTNAME= vic-2.8 -CATEGORIES= mbone tk80 -MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vic/ -DISTFILES= vicsrc-2.8.tar.gz - -MAINTAINER= fenner@FreeBSD.org - -LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80 - -USE_AUTOCONF= yes -USE_X_PREFIX= yes -MAN1= vic.1 - -post-install: - strip ${PREFIX}/bin/vic - strip ${PREFIX}/bin/histtolut - -.include <bsd.port.mk> diff --git a/multimedia/vic/distinfo b/multimedia/vic/distinfo deleted file mode 100644 index af6125f522aa..000000000000 --- a/multimedia/vic/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (vicsrc-2.8.tar.gz) = 1f9ae3fbf8e9e47e6539c0621964542d diff --git a/multimedia/vic/files/patch-aa b/multimedia/vic/files/patch-aa deleted file mode 100644 index 567da523ab66..000000000000 --- a/multimedia/vic/files/patch-aa +++ /dev/null @@ -1,236 +0,0 @@ ---- configure.in.orig Fri Jun 21 01:36:47 1996 -+++ configure.in Mon Oct 12 23:20:51 1998 -@@ -34,7 +34,7 @@ - - V_LIB_GRABBER="" - V_INCLUDE_GRABBER="" --V_OBJ_GRABBER="" -+V_OBJ_GRABBER="grabber-x11.cc" - V_LIB_XIL="" - V_OBJ_XIL="" - -@@ -69,7 +69,7 @@ - if test -r /usr/include/machine/ioctl_meteor.h ; then - V_OBJ_GRABBER="$V_OBJ_GRABBER grabber-meteor.o" - fi --if test -r /usr/local/lib/libspigot.a ; then -+if test -r /usr/local/lib/libspigot.a -a ${PORTOBJFORMAT} != elf; then - V_OBJ_GRABBER="$V_OBJ_GRABBER grabber-spigot.o" - V_LIB_GRABBER="$V_LIB_GRABBER -lspigot" - V_INCLUDE_GRABBER="$V_INCLUDE_GRABBER -I/usr/local/include" -@@ -87,9 +87,6 @@ - V_OBJ_GRABBER="$V_OBJ_GRABBER grabber-qcam.o" - V_DEFINE="$V_DEFINE -DQCAMDEV" - fi --if test -r /usr/include/linux/scc.h -o -r /usr/include/machine/scc.h ; then -- V_OBJ_GRABBER="$V_OBJ_GRABBER grabber-scc.o" --fi - vpix_dir=/usr/src/local/vfc-1.0 - vpix_lib=$vpix_dir/vfc_lib - if test -d /import/VideoPix ; then -@@ -227,6 +224,9 @@ - *-*-netbsd*) - V_TARCMD="tar -h -c -f" - V_LIB="$V_LIB -L/usr/local/lib" -+ ;; -+*-*-freebsd*) -+ V_STATIC="" - ;; - *-*-hpux*) - V_CCOPT="-O" ---- configure.in.tk.orig Thu May 16 01:06:05 1996 -+++ configure.in.tk Tue Sep 9 11:01:36 1997 -@@ -12,8 +12,8 @@ - echo "can't find tcl.h in $d/include" - exit 1 - fi -- places="$d/lib/libtcl7.5.so \ -- $d/lib/libtcl7.5.a \ -+ places="$d/lib/libtcl8.0.so \ -+ $d/lib/libtcl8.0.a \ - $d/lib/libtcl.so \ - $d/lib/libtcl.a" - V_LIB_TCL=FAIL -@@ -27,7 +27,7 @@ - echo "can't find libtcl.a in $d/lib" - exit 1 - fi -- places="$d/lib/tcl7.5 \ -+ places="$d/lib/tcl8.0 \ - $d/lib/tcl" - V_LIBRARY_TCL=FAIL - for dir in $places; do -@@ -44,13 +44,14 @@ - AC_TEST_CPP([#include <tcl.h>], V_INCLUDE_TCL="", V_INCLUDE_TCL=FAIL) - if test "$V_INCLUDE_TCL" = FAIL; then - echo "checking for tcl.h" -- places="$PWD/../tcl7.5 \ -- /usr/src/local/tcl7.5 \ -- /import/tcl/include/tcl7.5 \ -+ places="$PWD/../tcl8.0 \ -+ /usr/src/local/tcl8.0 \ -+ /import/tcl/include/tcl8.0 \ - $prefix/include \ - $x_includes/tk \ - $x_includes \ - /usr/local/include \ -+ /usr/local/include/tcl8.0 \ - /usr/contrib/include \ - /usr/include" - for dir in $places; do -@@ -64,7 +65,7 @@ - exit 1 - fi - fi -- AC_CHECK_LIB(tcl7.5, main, V_LIB_TCL="-ltcl7.5", V_LIB_TCL="FAIL") -+ AC_CHECK_LIB(tcl8.0, main, V_LIB_TCL="-ltcl8.0", V_LIB_TCL="FAIL") - if test "$V_LIB_TCL" = FAIL; then - echo "checking for libtcl.a" - places="\ -@@ -73,13 +74,13 @@ - /usr/contrib/lib \ - /usr/local/lib \ - /usr/lib \ -- $PWD/../tcl7.5 \ -- /usr/src/local/tcl7.5 \ -- /import/tcl/lib/tcl7.5 \ -+ $PWD/../tcl8.0 \ -+ /usr/src/local/tcl8.0 \ -+ /import/tcl/lib/tcl8.0 \ - " - for dir in $places; do -- if test -r $dir/libtcl7.5.so -o -r $dir/libtcl7.5.a; then -- V_LIB_TCL="-L$dir -ltcl7.5" -+ if test -r $dir/libtcl80.so -o -r $dir/libtcl80.a; then -+ V_LIB_TCL="-L$dir -ltcl80" - break - fi - if test -r $dir/libtcl.so -o -r $dir/libtcl.a; then -@@ -98,13 +99,13 @@ - fi - echo "checking for tcl/init.tcl" - V_LIBRARY_TCL=FAIL -- places="/usr/local/lib/tcl7.5 \ -- /usr/contrib/lib/tcl7.5 \ -- /usr/lib/tcl7.5 \ -- /usr/lib/tk/tcl7.5 \ -- /import/tcl/lib/tcl7.5 \ -- $prefix/lib/tcl7.5 \ -- $x_libraries/tcl7.5 \ -+ places="/usr/local/lib/tcl8.0 \ -+ /usr/contrib/lib/tcl8.0 \ -+ /usr/lib/tcl8.0 \ -+ /usr/lib/tk/tcl8.0 \ -+ /import/tcl/lib/tcl8.0 \ -+ $prefix/lib/tcl8.0 \ -+ $x_libraries/tcl8.0 \ - /usr/local/lib/tcl \ - /usr/lib/tcl \ - /usr/lib/tk/tcl \ -@@ -138,8 +139,8 @@ - echo "can't find tk.h in $d/include" - exit 1 - fi -- places="$d/lib/libtk4.1.so \ -- $d/lib/libtk4.1.a \ -+ places="$d/lib/libtk8.0.so \ -+ $d/lib/libtk8.0.a \ - $d/lib/libtk.so \ - $d/lib/libtk.a" - V_LIB_TK=FAIL -@@ -153,7 +154,7 @@ - echo "can't find libtk.a in $d/lib" - exit 1 - fi -- places="$d/lib/tk4.1 \ -+ places="$d/lib/tk8.0 \ - $d/lib/tk" - V_LIBRARY_TK=FAIL - for dir in $places; do -@@ -170,18 +171,19 @@ - AC_TEST_CPP([#include <tk.h>], V_INCLUDE_TK="", V_INCLUDE_TK=FAIL) - if test "$V_INCLUDE_TK" = FAIL; then - echo "checking for tk.h" -- V_INCLUDE_TK="" -+ V_INCLUDE_TK="FAIL" - places="\ - $prefix/include \ - /usr/local/include \ -+ /usr/local/include/tk8.0 \ - /usr/contrib/include \ - /usr/include/tcl \ - /usr/include\ - $x_includes/tk \ - $x_includes \ -- $PWD/../tk4.1 \ -- /usr/src/local/tk4.1 \ -- /import/tcl/include/tk4.1 \ -+ $PWD/../tk8.0 \ -+ /usr/src/local/tk8.0 \ -+ /import/tcl/include/tk8.0 \ - " - for dir in $places; do - if test -r $dir/tk.h ; then -@@ -194,7 +196,7 @@ - exit 1 - fi - fi -- AC_CHECK_LIB(tk4.1, main, V_LIB_TK="-ltk4.1", V_LIB_TK="FAIL") -+ AC_CHECK_LIB(tk8.0, main, V_LIB_TK="-ltk8.0", V_LIB_TK="FAIL") - if test "$V_LIB_TK" = FAIL; then - echo "checking for libtk.a" - places="/usr/local/lib \ -@@ -202,13 +204,13 @@ - /usr/lib \ - /usr/lib/tk \ - /import/tcl/lib \ -- $PWD/../tk4.1 \ -- /usr/src/local/tk4.1 \ -+ $PWD/../tk8.0 \ -+ /usr/src/local/tk8.0 \ - $prefix/lib \ - $x_libraries" - for dir in $places; do -- if test -r $dir/libtk4.1.so -o -r $dir/libtk4.1.a; then -- V_LIB_TK="-L$dir -ltk4.1" -+ if test -r $dir/libtk80.so -o -r $dir/libtk80.a; then -+ V_LIB_TK="-L$dir -ltk80" - break - fi - if test -r $dir/libtk.so -o -r $dir/libtk.a; then -@@ -227,15 +229,15 @@ - fi - echo "checking for tk/tk.tcl" - V_LIBRARY_TK=FAIL -- places="/usr/local/lib/tk4.1 \ -- /usr/contrib/lib/tk4.1 \ -- /usr/lib/tk4.1 \ -- /usr/lib/tk/tk4.1 \ -- /import/tcl/lib/tk4.1 \ -- $prefix/lib/tk4.1 \ -- $x_libraries/tk4.1 \ -- $PWD/../tk4.1/library \ -- /usr/src/local/tk4.1/library \ -+ places="/usr/local/lib/tk8.0 \ -+ /usr/contrib/lib/tk8.0 \ -+ /usr/lib/tk8.0 \ -+ /usr/lib/tk/tk8.0 \ -+ /import/tcl/lib/tk8.0 \ -+ $prefix/lib/tk8.0 \ -+ $x_libraries/tk8.0 \ -+ $PWD/../tk8.0/library \ -+ /usr/src/local/tk8.0/library \ - /usr/local/lib/tk \ - /usr/lib/tk \ - /usr/lib/tk/tk \ ---- Makefile.in.orig Mon Jul 22 09:32:53 1996 -+++ Makefile.in Tue Sep 9 11:01:36 1997 -@@ -303,7 +303,7 @@ - chown bin @prefix@/bin/vic - chgrp bin @prefix@/bin/vic - chmod 555 @prefix@/bin/vic -- cp vic.1 @prefix@/man/vic.1 -+ cp vic.1 @prefix@/man/man1/vic.1 - cp histtolut @prefix@/bin/histtolut - chown bin @prefix@/bin/histtolut - chgrp bin @prefix@/bin/histtolut diff --git a/multimedia/vic/files/patch-ab b/multimedia/vic/files/patch-ab deleted file mode 100644 index fc83412a4b48..000000000000 --- a/multimedia/vic/files/patch-ab +++ /dev/null @@ -1,30 +0,0 @@ -*** grabber-spigot.cc.orig Fri Nov 1 16:11:59 1996 ---- grabber-spigot.cc Fri Nov 1 16:17:36 1996 -*************** -*** 202,212 **** - hstart_ = 1; - hstop_ = blkw_ - 1; - - int voff = (outh_ - inh_) / 2; -- hwrap_ = outw_ - inw_ ; - int hoff = hwrap_ / 2; - loff_ = outw_ * voff + hoff; - coff_ = (outw_ >> 1) * (voff >> 1) + (hoff >> 1); - hskip_ = 0; - break; - case f_411: ---- 202,215 ---- - hstart_ = 1; - hstop_ = blkw_ - 1; - -+ { - int voff = (outh_ - inh_) / 2; - int hoff = hwrap_ / 2; -+ -+ hwrap_ = outw_ - inw_ ; - loff_ = outw_ * voff + hoff; - coff_ = (outw_ >> 1) * (voff >> 1) + (hoff >> 1); -+ } - hskip_ = 0; - break; - case f_411: diff --git a/multimedia/vic/files/patch-ac b/multimedia/vic/files/patch-ac deleted file mode 100644 index 3b4c4da44cac..000000000000 --- a/multimedia/vic/files/patch-ac +++ /dev/null @@ -1,14 +0,0 @@ ---- grabber-qcam.cc.orig Sat Nov 2 23:22:46 1996 -+++ grabber-qcam.cc Sat Nov 2 23:23:34 1996 -@@ -84,6 +84,11 @@ - #define CIF_HEIGHT 288 - - /*XXX*/ -+#ifndef QC_MAX_CONTRAST -+#define QC_MAX_CONTRAST 255 -+#endif -+ -+/*XXX*/ - #define VOLATILE volatile - - class QcamGrabber : public Grabber { diff --git a/multimedia/vic/files/patch-ad b/multimedia/vic/files/patch-ad deleted file mode 100644 index b05eaed5d11a..000000000000 --- a/multimedia/vic/files/patch-ad +++ /dev/null @@ -1,21 +0,0 @@ ---- main.cc.orig Mon Jul 22 13:12:22 1996 -+++ main.cc Tue Sep 9 10:25:36 1997 -@@ -177,7 +177,7 @@ - else { - Tk_Window tk = t.tkmain(); - Tk_Uid uid = Tk_GetUid((char*)argv[1]); -- XFontStruct* p = Tk_GetFontStruct(t.interp(), tk, uid); -+ Tk_Font p = Tk_GetFont(t.interp(), tk, uid); - t.result(p != 0 ? "1" : "0"); - } - return (TCL_OK); -@@ -425,6 +425,9 @@ - #endif - signal(SIGINT, ciao); - signal(SIGTERM, ciao); -+#ifdef __FreeBSD__ -+ signal(SIGSYS, (sig_t)noXShm); -+#endif - - #ifdef WIN32 - TkSetPlatformInit(TkPlatformInit); diff --git a/multimedia/vic/files/patch-ae b/multimedia/vic/files/patch-ae deleted file mode 100644 index 8424b66fc784..000000000000 --- a/multimedia/vic/files/patch-ae +++ /dev/null @@ -1,136 +0,0 @@ ---- tkStripchart.c.orig Tue Sep 9 11:00:42 1997 -+++ tkStripchart.c Tue Sep 9 10:52:30 1997 -@@ -148,7 +148,7 @@ - int scrollrequired; - int guarantee_draw; - int grow_up; -- XFontStruct *fontPtr; /* Information about text font, or NULL. */ -+ Tk_Font tkfont; /* Information about text font, or NULL. */ - XColor *textColorPtr; /* Color for drawing text. */ - GC textGC; /* GC for drawing text. */ - XColor *tickColorPtr; /* Color for drawing ticks. */ -@@ -257,7 +257,7 @@ - {TK_CONFIG_SYNONYM, "-fg", "stripcolor", 0, - 0, 0, 0}, - {TK_CONFIG_FONT, "-font", "font", "Font", -- DEF_STRIPCHART_FONT, Tk_Offset(Stripchart, fontPtr), -+ DEF_STRIPCHART_FONT, Tk_Offset(Stripchart, tkfont), - 0}, - {TK_CONFIG_BOOLEAN, "-guaranteedrawing", "guaranteedrawing", - "Guaranteedrawing", DEF_GUARANTEE_DRAW, -@@ -570,8 +570,8 @@ - if (StripchartPtr->value != NULL) - free(StripchartPtr->value); - -- if (StripchartPtr->fontPtr != NULL) -- Tk_FreeFontStruct(StripchartPtr->fontPtr); -+ if (StripchartPtr->tkfont != NULL) -+ Tk_FreeFont(StripchartPtr->tkfont); - - if (StripchartPtr->textColorPtr != NULL) - Tk_FreeColor(StripchartPtr->textColorPtr); -@@ -631,7 +631,7 @@ - - Tk_SetBackgroundFromBorder(StripchartPtr->tkwin, StripchartPtr->border); - -- gcValues.font = StripchartPtr->fontPtr->fid; -+ gcValues.font = Tk_FontId(StripchartPtr->tkfont); - gcValues.foreground = StripchartPtr->textColorPtr->pixel; - newGC = Tk_GetGC(StripchartPtr->tkwin, GCForeground|GCFont, &gcValues); - if (StripchartPtr->textGC != None && StripchartPtr->tkwin) { -@@ -692,8 +692,11 @@ - { - int tt = hasatitle(StripchartPtr); - int bd = StripchartPtr->borderWidth; -- int lineHeight = StripchartPtr->fontPtr->ascent + -- StripchartPtr->fontPtr->descent; -+ Tk_FontMetrics fm; -+ int lineHeight; -+ -+ Tk_GetFontMetrics(StripchartPtr->tkfont, &fm); -+ lineHeight = fm.ascent + fm.descent; - - Tk_GeometryRequest(StripchartPtr->tkwin, - 2 * (bd + PADDING) + StripchartPtr->num_strips * -@@ -726,11 +729,13 @@ - /* - * Variable declarations used in the title drawing routines - */ -- XFontStruct *fp = StripchartPtr->fontPtr; -- XCharStruct bbox; -- int x, dummy; -- int lineHeight = StripchartPtr->fontPtr->ascent + -- StripchartPtr->fontPtr->descent; -+ Tk_Font tkf = StripchartPtr->tkfont; -+ int x; -+ Tk_FontMetrics fm; -+ int lineHeight; -+ -+ Tk_GetFontMetrics(tkf, &fm); -+ lineHeight = fm.ascent + fm.descent; - - StripchartPtr->displaybits &= ~REDRAW_PENDING; - if ((StripchartPtr->tkwin == NULL) || !Tk_IsMapped(tkwin)) -@@ -747,18 +752,17 @@ - * space. Otherwise left justified and clipped on the right. - */ - if (tt && StripchartPtr->displaybits & DISPLAY_TITLE) { -- XTextExtents(fp, StripchartPtr->title, -- strlen(StripchartPtr->title), -- &dummy, &dummy, &dummy, &bbox); -- if (bbox.lbearing + bbox.rbearing < Tk_Width(tkwin) - 2 * bd) -- x = (Tk_Width(tkwin) - bbox.lbearing - bbox.rbearing)/2; -+ int width = Tk_TextWidth(tkf, StripchartPtr->title, -+ strlen(StripchartPtr->title)); -+ if (width < Tk_Width(tkwin) - 2 * bd) -+ x = (Tk_Width(tkwin) - width)/2; - else - x = bd + PADDING; - - XClearArea(Tk_Display(tkwin), Tk_WindowId(tkwin), bd, bd, - Tk_Width(tkwin) - 2 * bd, lineHeight + PADDING, False); - XDrawString(Tk_Display(tkwin), Tk_WindowId(tkwin), -- StripchartPtr->textGC, x, fp->max_bounds.ascent + bd, -+ StripchartPtr->textGC, x, fm.ascent + bd, /*XXX no max_bounds */ - StripchartPtr->title, strlen(StripchartPtr->title)); - } - /* -@@ -1057,7 +1061,8 @@ - DrawStripi(Stripchart* SPtr, int i) - { - Tk_Window tkwin = SPtr->tkwin; -- int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent; -+ Tk_FontMetrics fm; -+ int lineHeight; - int x = SPtr->borderWidth + PADDING + (i - 1) * SPtr->strip_width; - int y = SPtr->borderWidth + PADDING + - hasatitle(SPtr) * (lineHeight + PADDING); -@@ -1066,6 +1071,9 @@ - double maxv = SPtr->max_value; - double minv = SPtr->min_value; - -+ Tk_GetFontMetrics(SPtr->tkfont, &fm); -+ lineHeight = fm.ascent + fm.descent; -+ - if (i < 1 || i > SPtr->num_strips) - return; - -@@ -1136,7 +1144,8 @@ - ScrollStrips(Stripchart* SPtr) - { - Tk_Window tkwin = SPtr->tkwin; -- int lineHeight = SPtr->fontPtr->ascent + SPtr->fontPtr->descent; -+ Tk_FontMetrics fm; -+ int lineHeight; - int src_x = SPtr->borderWidth + PADDING + SPtr->strip_width; - int src_y = SPtr->borderWidth + PADDING + - hasatitle(SPtr) * (lineHeight + PADDING); -@@ -1144,6 +1153,8 @@ - int dest_y = src_y; - int w = (SPtr->num_strips - 1) * SPtr->strip_width; - int h = SPtr->max_height; -+ -+ Tk_GetFontMetrics(SPtr->tkfont, &fm); - - XCopyArea(Tk_Display(tkwin), Tk_WindowId(tkwin), Tk_WindowId(tkwin), - Tk_GetGC(tkwin, 0, NULL), src_x, src_y, w, h, dest_x, dest_y); diff --git a/multimedia/vic/files/patch-af b/multimedia/vic/files/patch-af deleted file mode 100644 index cd4e0bcfa2ba..000000000000 --- a/multimedia/vic/files/patch-af +++ /dev/null @@ -1,757 +0,0 @@ ---- grabber-meteor.cc.orig Fri Jun 26 11:25:55 1998 -+++ grabber-meteor.cc Fri Jun 26 11:18:53 1998 -@@ -43,7 +43,6 @@ - * - */ - --/*#define FRAME_CNTS /* print frame counts and fps when device stops -- debug */ - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> -@@ -51,16 +50,16 @@ - #include <sys/types.h> - #include <sys/ioctl.h> - #include <sys/mman.h> --#ifdef FRAME_CNTS --#include <sys/time.h> --#endif - - #include "grabber.h" -+#include "crdef.h" - #include "Tcl.h" - #include "device-input.h" - #include "module.h" -+#include "bsd-endian.h" - - #include <machine/ioctl_meteor.h> -+#include <machine/ioctl_bt848.h> - - /*XXX*/ - #define NTSC_WIDTH 320 -@@ -72,62 +71,78 @@ - - - class MeteorGrabber : public Grabber { -- public: -- MeteorGrabber(const char* name, const char* format); -+ public: -+ MeteorGrabber(const char* name); - virtual ~MeteorGrabber(); -+ virtual int command(int argc, const char*const* argv); -+ virtual void fps(int); - virtual void start(); - virtual void stop(); -- virtual void fps(int); -- protected: -- virtual int command(int argc, const char*const* argv); -- virtual int capture(); - virtual int grab(); -+ protected: - void format(); -- void setsize(); -+ virtual void setsize() = 0; -+ void suppress(const u_char* in, int istride); -+ virtual void saveblks(const u_char* in, int istride) = 0; -+ void set_size_meteor(int w, int h); - - int video_format_; /* video input format: NTSC or PAL */ - int dev_; /* device fd */ - int port_; /* video input port */ -- int coder_format_; /* 411, 422, or cif */ - u_int basewidth_; /* Height of frame to be captured */ - u_int baseheight_; /* Width of frame to be captured */ - u_int decimate_; /* division of base sizes */ - volatile u_int* pyuv_; /* pointer to yuv data */ --#ifdef FRAME_CNTS -- struct meteor_counts cnts_; /* pointer to counters */ -- double start_time_; --#endif -+ int tuner_ ; /* tuner device... */ - }; - --static const int f_411 = 0; /* coder_format_s */ --static const int f_422 = 1; --static const int f_cif = 2; -+class Meteor422Grabber : public MeteorGrabber { -+ public: -+ Meteor422Grabber(const char* name); -+ protected: -+ void setsize(); -+ void saveblk(const u_char* in, u_char* yp, u_char* up, u_char* vp, -+ int stride, int istride); -+ void saveblks(const u_char* in, int istride); -+}; -+ -+class MeteorCIFGrabber : public MeteorGrabber { -+ public: -+ MeteorCIFGrabber(const char* name); -+ protected: -+ void setsize(); -+ void saveblk(const u_char* in, u_char* yp, u_char* up, u_char* vp, -+ int stride, int istride); -+ void saveblks(const u_char* in, int istride); -+}; - - class MeteorDevice : public InputDevice { -- public: -+ public: - MeteorDevice(const char* nickname, const char* devname, int free); - virtual int command(int argc, const char*const* argv); -- protected: -+ protected: - const char* name_; - }; - - class MeteorScanner { -- public: -+ public: - MeteorScanner(const int n); - }; -+ - static MeteorScanner find_meteor_devices(4); - - MeteorScanner::MeteorScanner(const int n) - { -- char* devname_template = "/dev/meteor%d"; -- char* nickname_template = "Matrox Meteor %d"; -+ static char *d[] = { "/dev/bktr%d", "/dev/meteor%d", NULL }; -+ char *nickname_template = "meteor-%d"; - - for(int i = 0; i < n; i++) { -- char *devname = new char[strlen(devname_template) + 3]; -+ for (int j = 0 ; d[j] != NULL ; j++) { -+ char *devname = new char[strlen(d[j]) + 3]; - char *nickname = new char[strlen(nickname_template) + 3]; - -+ sprintf(devname, d[j], i); - sprintf(nickname, nickname_template, i + 1); -- sprintf(devname, devname_template, i); - if(access(devname, R_OK) == 0) { - int fd = open(devname, O_RDONLY); - if(fd < 0) { -@@ -140,8 +155,9 @@ - delete nickname; - delete devname; - } -+ } -+ } - } --} - - MeteorDevice::MeteorDevice(const char* nickname, const char *devname, int free): - InputDevice(nickname), name_(devname) -@@ -149,6 +165,7 @@ - if(free) - attributes_ = "\ - format {422 411} \ -+type {pal ntsc secam auto} \ - size {large normal small cif} \ - port {RCA Port-1 Port-2 Port-3 S-Video RGB}"; - else -@@ -160,7 +177,10 @@ - Tcl& tcl = Tcl::instance(); - if ((argc == 3) && (strcmp(argv[1], "open") == 0)) { - TclObject* o = 0; -- o = new MeteorGrabber(name_, argv[2]); -+ if (strcmp(argv[2], "422") == 0) -+ o = new Meteor422Grabber(name_); -+ else if (strcmp(argv[2], "cif") == 0) -+ o = new MeteorCIFGrabber(name_); - if (o != 0) - tcl.result(o->name()); - return (TCL_OK); -@@ -168,19 +188,15 @@ - return (InputDevice::command(argc, argv)); - } - --MeteorGrabber::MeteorGrabber(const char* name, const char* format) -+MeteorGrabber::MeteorGrabber(const char* name) - { -- coder_format_ = -1; -- if(!strcmp(format, "411")) coder_format_ = f_411; -- if(!strcmp(format, "422")) coder_format_ = f_422; -- if(!strcmp(format, "cif")) coder_format_ = f_cif; -- if(coder_format_ == -1) { -- fprintf(stderr, -- "vic: MeteorGrabber: unsupported format: %s\n", -- format); -- abort(); -- } -- -+ int devnum; -+ if (sscanf(name, "/dev/bktr%d", &devnum) == 1) { -+ char *tunerdev = new char[strlen(name) + 3]; -+ sprintf(tunerdev, "/dev/tuner%d", devnum); -+ tuner_ = open(tunerdev, O_RDONLY); -+ } else -+ tuner_ = -1; - dev_ = open(name, O_RDONLY); - if (dev_ == -1) { - status_ = -1; -@@ -203,52 +219,33 @@ - if (dev_ != -1) { - close(dev_); - } -+ if (tuner_ != -1) -+ close(tuner_); - } - --void MeteorGrabber::setsize() -+void MeteorGrabber::set_size_meteor(int w, int h) - { - struct meteor_geomet geom; - -- geom.rows = (baseheight_ / decimate_) &~0xf; /* 0xf, ugh! */ -- geom.columns = (basewidth_ / decimate_) &~0xf; -+ geom.rows = h &~0xf; /* 0xf, ugh! */ -+ geom.columns = w &~0xf; - geom.frames = 1; -- geom.oformat = METEOR_GEO_UNSIGNED; -- geom.oformat |= METEOR_GEO_YUV_422; -+ geom.oformat = METEOR_GEO_UNSIGNED | METEOR_GEO_YUV_PACKED; - /* - * If we can get by with only reading even fields, then by all - * means do so. - */ - unsigned short status; -- ioctl(dev_, METEORSTATUS, &status); -- if(status & METEOR_STATUS_HCLK) { /* do we have a source? */ -- /* No source, assume ntsc*/ -+ // ioctl(dev_, METEORSTATUS, &status); -+ if ( video_format_ == METEOR_FMT_NTSC ) { - if(geom.rows <= NTSC_HEIGHT && geom.columns <= NTSC_WIDTH) - geom.oformat |= METEOR_GEO_EVEN_ONLY; - } else { -- if(status & METEOR_STATUS_FIDT) { /* is it pal or ntsc? */ -- /* 60 hz */ -- if(geom.rows<=NTSC_HEIGHT && geom.columns<=NTSC_WIDTH) -- geom.oformat |= METEOR_GEO_EVEN_ONLY; -- } else { /* 50 hz */ - if(geom.rows<=PAL_HEIGHT && geom.columns<=PAL_WIDTH) - geom.oformat |= METEOR_GEO_EVEN_ONLY; - } -- } -- - if(ioctl(dev_, METEORSETGEO, &geom) < 0) - perror("vic: METERSETGEO: "); -- -- switch(coder_format_) { -- case f_422: -- set_size_422(geom.columns, geom.rows); -- break; -- case f_cif: -- case f_411: -- set_size_411(geom.columns, geom.rows); -- break; -- } -- -- allocref(); /* allocate reference frame */ - } - - void MeteorGrabber::format() -@@ -285,11 +282,6 @@ - baseheight_ = PAL_HEIGHT * 2; - basewidth_ = PAL_WIDTH * 2; - } -- -- if(coder_format_ == f_cif) { -- baseheight_ = CIF_HEIGHT * 2; -- basewidth_ = CIF_WIDTH * 2; -- } - setsize(); - } - -@@ -299,15 +291,6 @@ - format(); - int cmd = METEOR_CAP_SINGLE; - ioctl(dev_, METEORCAPTUR, (char*)&cmd); --#ifdef FRAME_CNTS -- cnts_.fifo_errors = 0; -- cnts_.dma_errors = 0; -- cnts_.frames_captured = 0; -- cnts_.even_fields_captured = 0; -- cnts_.odd_fields_captured = 0; -- ioctl(dev_, METEORSCOUNT, &cnts_); -- start_time_ = gettimeofday(); --#endif - - cmd = METEOR_CAP_CONTINOUS; - ioctl(dev_, METEORCAPTUR, (char*)&cmd); -@@ -319,19 +302,6 @@ - - int cmd = METEOR_CAP_STOP_CONT; - ioctl(dev_, METEORCAPTUR, (char*)&cmd); --#ifdef FRAME_CNTS -- double endtime = gettimeofday() ; -- ioctl(dev_, METEORGCOUNT, &cnts_); -- int diff = (int)((endtime-start_time_) * 1e-6 + 0.5); -- printf("frames = %d, even fields = %d, odd fields = %d,\n\ --fifo errors = %d, dma errors = %d, seconds = %d", -- cnts_.frames_captured, cnts_.even_fields_captured, -- cnts_.odd_fields_captured, cnts_.fifo_errors, cnts_.dma_errors, -- diff); -- if(diff) -- printf(",fps = %d", cnts_.frames_captured/diff); -- printf("\n"); --#endif - Grabber::stop(); - } - -@@ -345,15 +315,15 @@ - - int MeteorGrabber::command(int argc, const char*const* argv) - { -+ Tcl& tcl = Tcl::instance(); - if (argc == 3) { - if (strcmp(argv[1], "decimate") == 0) { - int dec = atoi(argv[2]); -- Tcl& tcl = Tcl::instance(); - if (dec <= 0) { - tcl.resultf("%s: divide by zero", argv[0]); - return (TCL_ERROR); - } -- if (dec != decimate_) { -+ if ((u_int)dec != decimate_) { - decimate_ = dec; - if(running_) { - stop(); -@@ -362,7 +332,8 @@ - } - } - return (TCL_OK); -- } else if (strcmp(argv[1], "port") == 0) { -+ } -+ if (strcmp(argv[1], "port") == 0) { - int p = port_; - if(!strcmp(argv[2], "RCA")) p = METEOR_INPUT_DEV0; - if(!strcmp(argv[2], "Port-1")) p = METEOR_INPUT_DEV1; -@@ -377,7 +348,30 @@ - ioctl(dev_, METEORSINPUT, &port_); - } - return (TCL_OK); -- } else if (strcmp(argv[1], "format") == 0 || -+ } -+ if (strcmp(argv[1], "freeze") == 0) { -+ int cmd = METEOR_CAP_CONTINOUS ; -+ if ( atoi(argv[2]) != 0 ) -+ cmd = METEOR_CAP_STOP_CONT; -+ ioctl(dev_, METEORCAPTUR, (char*)&cmd); -+ return (TCL_OK); -+ } -+ if (strcmp(argv[1], "chan") == 0) { -+ int p = port_; -+ int c = atoi(argv[2]); -+ if (c > 0 && c < 199) -+ p = METEOR_INPUT_DEV1 ; -+ else -+ p = METEOR_INPUT_DEV0 ; -+ if (p != port_) { -+ port_ = p; -+ ioctl(dev_, METEORSINPUT, &port_); -+ } -+ if (p == METEOR_INPUT_DEV1) -+ ioctl(tuner_, TVTUNER_SETCHNL, &c); -+ return (TCL_OK); -+ } -+ if (strcmp(argv[1], "format") == 0 || - strcmp(argv[1], "type") == 0) { - if (strcmp(argv[2], "auto") == 0) - video_format_ = METEOR_FMT_AUTOMODE; -@@ -390,14 +384,35 @@ - if (running_) - format(); - return (TCL_OK); -- } else if (strcmp(argv[1], "contrast") == 0) { -- contrast(atof(argv[2])); -- return (TCL_OK); -+ } -+ if (strcmp(argv[1], "brightness") == 0) { -+ u_char val = atoi(argv[2]); -+ ioctl(dev_, METEORSBRIG, &val); -+ return (TCL_OK); -+ } -+ if (strcmp(argv[1], "contrast") == 0) { -+ u_char val = atoi(argv[2]); -+ ioctl(dev_, METEORSCONT, &val); -+ return (TCL_OK); -+ } -+ if (strcmp(argv[1], "hue") == 0) { -+ char val = atoi(argv[2]); -+ ioctl(dev_, METEORSHUE, &val); -+ return (TCL_OK); -+ } -+ if (strcmp(argv[1], "saturation") == 0) { -+ u_char val = atoi(argv[2]); -+ ioctl(dev_, METEORSCSAT, &val); -+ return (TCL_OK); -+ } -+ if (strcmp(argv[1], "uvgain") == 0) { -+ u_char val = atoi(argv[2]); -+ ioctl(dev_, METEORSCHCV, &val); -+ return (TCL_OK); - } - } else if (argc == 2) { - if (strcmp(argv[1], "format") == 0 || - strcmp(argv[1], "type") == 0) { -- Tcl& tcl = Tcl::instance(); - switch (video_format_) { - - case METEOR_FMT_AUTOMODE: -@@ -423,54 +438,316 @@ - return (TCL_OK); - - } -+ if (strcmp(argv[1], "brightness") == 0) { -+ u_char val; -+ ioctl(dev_, METEORGBRIG, &val); -+ tcl.resultf("%d", (unsigned int)val); -+ return (TCL_OK); -+ } -+ if (strcmp(argv[1], "contrast") == 0) { -+ u_char val; -+ ioctl(dev_, METEORGCONT, &val); -+ tcl.resultf("%d", (int)val); -+ return (TCL_OK); -+ } -+ if (strcmp(argv[1], "hue") == 0) { -+ char val; -+ ioctl(dev_, METEORGHUE, &val); -+ tcl.resultf("%d", (int)val); -+ return (TCL_OK); -+ } -+ if (strcmp(argv[1], "saturation") == 0) { -+ u_char val; -+ ioctl(dev_, METEORGCSAT, &val); -+ tcl.resultf("%d", (int)val); -+ return (TCL_OK); -+ } -+ if (strcmp(argv[1], "uvgain") == 0) { -+ u_char val; -+ ioctl(dev_, METEORGCHCV, &val); -+ tcl.resultf("%d", (int)val); -+ return (TCL_OK); -+ } - } - return (Grabber::command(argc, argv)); - } - --int MeteorGrabber::capture() --{ -- if(pyuv_ == 0) return 0; -- -- volatile u_int* py = pyuv_; -- volatile u_int* pu = (u_int *)((u_int)py + (u_int)framesize_); -- volatile u_int* pv = (u_int *)((u_int)pu + (framesize_ >> 1)); -- u_int* lum = (u_int *)frame_; -- u_int* uoff = (u_int *)((u_int)lum + (u_int)framesize_); -- int f422 = coder_format_ == f_422; -- u_int* voff = (u_int *)((u_int)uoff + -- (u_int)(framesize_>>(f422?1:2))); -- int numc = ((basewidth_/decimate_) &~0xf) >> 3; -- -- for (int row = 0; row < (((baseheight_/decimate_)&~0xf) >> 1); row++) { -- for(int col = 0; col < numc; col++) { -- *lum++ = *py++; -- *lum++ = *py++; -- *uoff++ = *pu++; -- *voff++ = *pv++; -- } -- for(col = 0; col < numc; col++) { -- *lum++ = *py++; -- *lum++ = *py++; -- if(f422) { /* only copy odd in 4:2:2 format */ -- *uoff++ = *pu++; -- *voff++ = *pv++; -- -- } -- } -- if(!f422) { /* skip odd if 4:1:1 or cif format */ -- pu += numc; -- pv += numc; -- } -- } -- return 1; -+#define U 0 -+#define Y0 1 -+#define V 2 -+#define Y1 3 -+ -+/* -+ * define these for REPLENISH macro used below -+ */ -+#define DIFF4(in, frm, v) \ -+ v += (in)[Y0] - (frm)[0]; \ -+ v += (in)[Y1] - (frm)[1]; \ -+ v += (in)[Y0+4] - (frm)[2]; \ -+ v += (in)[Y1+4] - (frm)[3]; -+ -+#define DIFFLINE(in, frm, left, center, right) \ -+ DIFF4(in + 0*8, frm + 0*4, left); \ -+ DIFF4(in + 1*8, frm + 1*4, center); \ -+ DIFF4(in + 2*8, frm + 2*4, center); \ -+ DIFF4(in + 3*8, frm + 3*4, right); \ -+ if (right < 0) \ -+ right = -right; \ -+ if (left < 0) \ -+ left = -left; \ -+ if (center < 0) \ -+ center = -center; -+ -+void MeteorGrabber::suppress(const u_char* devbuf, int is) -+{ -+ const u_char* start = frame_ + 16 * vstart_ * outw_ + 16 * hstart_; -+ REPLENISH(devbuf, start, is, 2, -+ hstart_, hstop_, vstart_, vstop_); - } - - int MeteorGrabber::grab() - { -- if (capture() == 0) -- return (0); -- suppress(frame_); -- saveblks(frame_); -- YuvFrame f(media_ts(), frame_, crvec_, outw_, outh_); -+ if (pyuv_ == 0) -+ return 0; -+ -+ int istride = inw_ * 2; -+ suppress((u_char*)pyuv_, istride); -+ saveblks((u_char*)pyuv_, istride); -+ u_int32_t ts = media_ts(); -+ YuvFrame f(ts, frame_, crvec_, outw_, outh_); - return (target_->consume(&f)); -+} -+ -+Meteor422Grabber::Meteor422Grabber(const char* name) -+ : MeteorGrabber(name) -+{ -+} -+ -+MeteorCIFGrabber::MeteorCIFGrabber(const char* name) -+ : MeteorGrabber(name) -+{ -+} -+ -+void Meteor422Grabber::setsize() -+{ -+ int w = basewidth_ / decimate_; -+ int h = baseheight_ / decimate_; -+ set_size_meteor(w, h); -+ set_size_422(w, h); -+} -+ -+inline void -+Meteor422Grabber::saveblk(const u_char* in, -+ u_char* yp, u_char* up, u_char* vp, int stride, int istride) -+{ -+ for (int i = 16; --i >= 0; ) { -+ /* -+ * Each iteration of this loop grabs 16 Ys & 8 U/Vs. -+ */ -+ register u_int y0, y1, u, v; -+ -+ u = in[U + 0*4] << SHIFT(24) | -+ in[U + 1*4] << SHIFT(16) | -+ in[U + 2*4] << SHIFT(8) | -+ in[U + 3*4] << SHIFT(0); -+ v = in[V + 0*4] << SHIFT(24) | -+ in[V + 1*4] << SHIFT(16) | -+ in[V + 2*4] << SHIFT(8) | -+ in[V + 3*4] << SHIFT(0); -+ y0 = in[Y0 + 0*4] << SHIFT(24) | -+ in[Y1 + 0*4] << SHIFT(16) | -+ in[Y0 + 1*4] << SHIFT(8) | -+ in[Y1 + 1*4] << SHIFT(0); -+ y1 = in[Y0 + 2*4] << SHIFT(24) | -+ in[Y1 + 2*4] << SHIFT(16) | -+ in[Y0 + 3*4] << SHIFT(8) | -+ in[Y1 + 3*4] << SHIFT(0); -+ -+ ((u_int*)yp)[0] = y0; -+ ((u_int*)yp)[1] = y1; -+ ((u_int*)up)[0] = u; -+ ((u_int*)vp)[0] = v; -+ -+ u = in[U + 4*4] << SHIFT(24) | -+ in[U + 5*4] << SHIFT(16) | -+ in[U + 6*4] << SHIFT(8) | -+ in[U + 7*4] << SHIFT(0); -+ v = in[V + 4*4] << SHIFT(24) | -+ in[V + 5*4] << SHIFT(16) | -+ in[V + 6*4] << SHIFT(8) | -+ in[V + 7*4] << SHIFT(0); -+ y0 = in[Y0 + 4*4] << SHIFT(24) | -+ in[Y1 + 4*4] << SHIFT(16) | -+ in[Y0 + 5*4] << SHIFT(8) | -+ in[Y1 + 5*4] << SHIFT(0); -+ y1 = in[Y0 + 6*4] << SHIFT(24) | -+ in[Y1 + 6*4] << SHIFT(16) | -+ in[Y0 + 7*4] << SHIFT(8) | -+ in[Y1 + 7*4] << SHIFT(0); -+ -+ ((u_int*)yp)[2] = y0; -+ ((u_int*)yp)[3] = y1; -+ ((u_int*)up)[1] = u; -+ ((u_int*)vp)[1] = v; -+ -+ in += istride; -+ yp += stride; -+ up += stride >> 1; -+ vp += stride >> 1; -+ } -+} -+ -+void Meteor422Grabber::saveblks(const u_char* devbuf, int is) -+{ -+ u_char* crv = crvec_; -+ int off = framesize_; -+ u_char* lum = frame_; -+ u_char* chm = lum + off; -+ off >>= 1; -+ int stride = 15 * outw_; -+ int istride = is * 15; -+ for (int y = 0; y < blkh_; ++y) { -+ for (int x = 0; x < blkw_; ++x) { -+ int s = *crv++; -+ if ((s & CR_SEND) != 0) -+ saveblk(devbuf, lum, chm, chm + off, outw_, is); -+ -+ devbuf += 32; -+ lum += 16; -+ chm += 8; -+ } -+ lum += stride; -+ chm += stride >> 1; -+ devbuf += istride; -+ } -+} -+ -+void MeteorCIFGrabber::setsize() -+{ -+ int w = basewidth_ / decimate_; -+ int h = baseheight_ / decimate_; -+ set_size_meteor(w, h); -+ set_size_cif(w, h); -+} -+ -+inline void -+MeteorCIFGrabber::saveblk(const u_char* in, -+ u_char* yp, u_char* up, u_char* vp, int stride, int istride) -+{ -+ for (int i = 8; --i >= 0; ) { -+ /* -+ * Each iteration of this loop grabs 32 Ys & 16 U/Vs. -+ */ -+ register u_int y0, y1, u, v; -+ -+ u = in[U + 0*4] << SHIFT(24) | -+ in[U + 1*4] << SHIFT(16) | -+ in[U + 2*4] << SHIFT(8) | -+ in[U + 3*4] << SHIFT(0); -+ v = in[V + 0*4] << SHIFT(24) | -+ in[V + 1*4] << SHIFT(16) | -+ in[V + 2*4] << SHIFT(8) | -+ in[V + 3*4] << SHIFT(0); -+ y0 = in[Y0 + 0*4] << SHIFT(24) | -+ in[Y1 + 0*4] << SHIFT(16) | -+ in[Y0 + 1*4] << SHIFT(8) | -+ in[Y1 + 1*4] << SHIFT(0); -+ y1 = in[Y0 + 2*4] << SHIFT(24) | -+ in[Y1 + 2*4] << SHIFT(16) | -+ in[Y0 + 3*4] << SHIFT(8) | -+ in[Y1 + 3*4] << SHIFT(0); -+ -+ ((u_int*)yp)[0] = y0; -+ ((u_int*)yp)[1] = y1; -+ ((u_int*)up)[0] = u; -+ ((u_int*)vp)[0] = v; -+ -+ u = in[U + 4*4] << SHIFT(24) | -+ in[U + 5*4] << SHIFT(16) | -+ in[U + 6*4] << SHIFT(8) | -+ in[U + 7*4] << SHIFT(0); -+ v = in[V + 4*4] << SHIFT(24) | -+ in[V + 5*4] << SHIFT(16) | -+ in[V + 6*4] << SHIFT(8) | -+ in[V + 7*4] << SHIFT(0); -+ y0 = in[Y0 + 4*4] << SHIFT(24) | -+ in[Y1 + 4*4] << SHIFT(16) | -+ in[Y0 + 5*4] << SHIFT(8) | -+ in[Y1 + 5*4] << SHIFT(0); -+ y1 = in[Y0 + 6*4] << SHIFT(24) | -+ in[Y1 + 6*4] << SHIFT(16) | -+ in[Y0 + 7*4] << SHIFT(8) | -+ in[Y1 + 7*4] << SHIFT(0); -+ -+ ((u_int*)yp)[2] = y0; -+ ((u_int*)yp)[3] = y1; -+ ((u_int*)up)[1] = u; -+ ((u_int*)vp)[1] = v; -+ -+ in += istride; -+ yp += stride; -+ up += stride >> 1; -+ vp += stride >> 1; -+ -+ /* do the 2nd (y only instead of yuv) line */ -+ -+ y0 = in[Y0 + 0*4] << SHIFT(24) | -+ in[Y1 + 0*4] << SHIFT(16) | -+ in[Y0 + 1*4] << SHIFT(8) | -+ in[Y1 + 1*4] << SHIFT(0); -+ y1 = in[Y0 + 2*4] << SHIFT(24) | -+ in[Y1 + 2*4] << SHIFT(16) | -+ in[Y0 + 3*4] << SHIFT(8) | -+ in[Y1 + 3*4] << SHIFT(0); -+ -+ ((u_int*)yp)[0] = y0; -+ ((u_int*)yp)[1] = y1; -+ -+ y0 = in[Y0 + 4*4] << SHIFT(24) | -+ in[Y1 + 4*4] << SHIFT(16) | -+ in[Y0 + 5*4] << SHIFT(8) | -+ in[Y1 + 5*4] << SHIFT(0); -+ y1 = in[Y0 + 6*4] << SHIFT(24) | -+ in[Y1 + 6*4] << SHIFT(16) | -+ in[Y0 + 7*4] << SHIFT(8) | -+ in[Y1 + 7*4] << SHIFT(0); -+ -+ ((u_int*)yp)[2] = y0; -+ ((u_int*)yp)[3] = y1; -+ -+ in += istride; -+ yp += stride; -+ } -+} -+ -+void MeteorCIFGrabber::saveblks(const u_char* in, int is) -+{ -+ u_char* crv = crvec_; -+ int off = framesize_; -+ u_char* lum = frame_; -+ u_char* chm = lum + off; -+ off >>= 2; -+ -+ crv += vstart_ * blkw_ + hstart_; -+ lum += vstart_ * outw_ * 16 + hstart_ * 16; -+ chm += vstart_ * (outw_ >> 1) * 8 + hstart_ * 8; -+ -+ int skip = hstart_ + (blkw_ - hstop_); -+ -+ for (int y = vstart_; y < vstop_; ++y) { -+ const u_char* nin = in; -+ for (int x = hstart_; x < hstop_; ++x) { -+ int s = *crv++; -+ if ((s & CR_SEND) != 0) -+ saveblk(in, lum, chm, chm + off, outw_, is); -+ -+ in += 32; -+ lum += 16; -+ chm += 8; -+ } -+ crv += skip; -+ lum += 15 * outw_ + skip * 16; -+ chm += 7 * (outw_ >> 1) + skip * 8; -+ in = nin + 16 * is; -+ } - } diff --git a/multimedia/vic/files/patch-ag b/multimedia/vic/files/patch-ag deleted file mode 100644 index 17380d8c165e..000000000000 --- a/multimedia/vic/files/patch-ag +++ /dev/null @@ -1,104 +0,0 @@ ---- vw.cc.orig Mon Jul 22 13:12:31 1996 -+++ vw.cc Tue Dec 17 16:35:57 1996 -@@ -248,8 +248,6 @@ - /* - * Wrap segment in an ximage - */ -- image_ = XCreateImage(dpy_, Tk_Visual(tk), Tk_Depth(tk), ZPixmap, -- 0, (char*)0, width_, height_, 8, 0); - image_->obdata = (char*)&shminfo_; - image_->data = shminfo_.shmaddr; - } ---- Tcl.h.orig Sat Mar 16 13:14:34 1996 -+++ Tcl.h Tue Dec 17 14:39:45 1996 -@@ -53,7 +53,8 @@ - inline int dark() const { return (tcl_ == 0); } - inline Tcl_Interp* interp() const { return (tcl_); } - inline char* result() const { return (tcl_->result); } -- inline void result(const char* p) { tcl_->result = (char*)p; } -+ inline void result(const char* p, Tcl_FreeProc* freeProc = TCL_STATIC) -+ { Tcl_SetResult(tcl_, (char *)p, freeProc); } - void resultf(const char* fmt, ...); - inline void CreateCommand(const char* cmd, Tcl_CmdProc* cproc, - ClientData cd = 0, ---- source.cc.orig Thu Apr 4 07:05:45 1996 -+++ source.cc Tue Dec 17 14:38:44 1996 -@@ -251,8 +251,7 @@ - return (TCL_OK); - } - if (strcmp(argv[1], "addr") == 0) { -- strcpy(wrk, InetNtoa(addr_)); -- tcl.result(wrk); -+ tcl.result(InetNtoa(addr_), TCL_DYNAMIC); - return (TCL_OK); - } - if (strcmp(argv[1], "srcid") == 0) { ---- Tcl.cc.orig Tue Apr 2 20:53:27 1996 -+++ Tcl.cc Tue Dec 17 15:45:30 1996 -@@ -65,6 +65,7 @@ - { - instance_.tcl_ = tcl; - instance_.application_ = application; -+ Tcl_Init(tcl); - } - - void Tcl::evalc(const char* s) -@@ -162,6 +163,8 @@ - Tcl& tcl = Tcl::instance(); - if (!tcl.dark()) - tcl.DeleteCommand(name_); -+ if (name_ != 0) -+ delete name_; - TclObject** p; - for (p = &all_; *p != this; p = &(*p)->next_) - ; -@@ -197,8 +200,9 @@ - void TclObject::setproc(const char* s) - { - Tcl& tcl = Tcl::instance(); -- if (name_ != 0 && !tcl.dark()) { -- tcl.DeleteCommand(name_); -+ if (name_ != 0) { -+ if (!tcl.dark()) -+ tcl.DeleteCommand(name_); - delete name_; - } - int n = strlen(s); ---- decoder.cc.orig Wed Jun 26 17:28:40 1996 -+++ decoder.cc Tue Dec 17 15:55:42 1996 -@@ -74,6 +74,8 @@ - - Decoder::~Decoder() - { -+ if (rvts_) -+ delete rvts_; - } - - int Decoder::command(int argc, const char*const* argv) ---- encoder-h261.cc.orig Mon Jul 22 13:12:53 1996 -+++ encoder-h261.cc Tue Dec 17 16:01:47 1996 -@@ -118,6 +118,7 @@ - void setq(int q); - protected: - H261Encoder(int ft); -+ ~H261Encoder(); - int encode(const VideoFrame*, const u_int8_t *crvec); - int command(int argc, const char*const* argv); - void encode_blk(const short* blk, const char* lm); -@@ -208,6 +209,16 @@ - for (int q = 0; q < 32; ++q) { - llm_[q] = 0; - clm_[q] = 0; -+ } -+} -+ -+H261Encoder::~H261Encoder() -+{ -+ for (int q = 0; q < 32; ++q) { -+ if (llm_[q] != 0) -+ delete llm_[q]; -+ if (clm_[q] != 0) -+ delete clm_[q]; - } - } - diff --git a/multimedia/vic/files/patch-ah b/multimedia/vic/files/patch-ah deleted file mode 100644 index 6b73cca9f5c8..000000000000 --- a/multimedia/vic/files/patch-ah +++ /dev/null @@ -1,117 +0,0 @@ ---- net.cc.orig 1997/10/07 19:07:01 -+++ net.cc 1998/01/26 22:21:41 -@@ -163,46 +163,48 @@ - { - int cc = ::send(fd, (char*)buf, len, 0); - if (cc < 0) { -- switch (errno) { -+ /* -+ * Due to a bug in kern/uipc_socket.c, on several -+ * systems, datagram sockets incorrectly persist -+ * in an error state on receipt of any ICMP -+ * error. This causes unicast connection -+ * rendezvous problems, and worse, multicast -+ * transmission problems because several systems -+ * incorrectly send port unreachables for -+ * multicast destinations. Our work around -+ * is to call getsockopt(..., SO_ERROR, ...) -+ * which resets so->so_error. -+ * -+ * This bug originated at CSRG in Berkeley -+ * and was present in the BSD Reno networking -+ * code release. It has since been fixed -+ * in OSF-3.x. It is know to remain -+ * in 4.4BSD and AIX-4.1.3. -+ * -+ * A fix is to change the following lines from -+ * kern/uipc_socket.c: -+ * -+ * if (so_serror) -+ * snderr(so->so_error); -+ * -+ * to: -+ * -+ * if (so->so_error) { -+ * error = so->so_error; -+ * so->so_error = 0; -+ * splx(s); -+ * goto release; -+ * } -+ * -+ */ -+ int err, errlen = sizeof(err), savederrno; -+ -+ savederrno = errno; -+ getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, -+ &errlen); -+ switch (savederrno) { - case ECONNREFUSED: - /* no one listening at some site - ignore */ --#if defined(__osf__) || defined(_AIX) -- /* -- * Due to a bug in kern/uipc_socket.c, on several -- * systems, datagram sockets incorrectly persist -- * in an error state on receipt of an ICMP -- * port-unreachable. This causes unicast connection -- * rendezvous problems, and worse, multicast -- * transmission problems because several systems -- * incorrectly send port unreachables for -- * multicast destinations. Our work around -- * is to simply close and reopen the socket -- * (by calling reset() below). -- * -- * This bug originated at CSRG in Berkeley -- * and was present in the BSD Reno networking -- * code release. It has since been fixed -- * in 4.4BSD and OSF-3.x. It is know to remain -- * in AIX-4.1.3. -- * -- * A fix is to change the following lines from -- * kern/uipc_socket.c: -- * -- * if (so_serror) -- * snderr(so->so_error); -- * -- * to: -- * -- * if (so->so_error) { -- * error = so->so_error; -- * so->so_error = 0; -- * splx(s); -- * goto release; -- * } -- * -- */ -- reset(); --#endif - break; - - case ENETUNREACH: -@@ -217,7 +219,7 @@ - * icmp unreachable, so we should be able to - * send now. - */ -- (void)::send(ssock_, (char*)buf, len, 0); -+ (void)::send(fd, (char*)buf, len, 0); - break; - - default: -@@ -264,12 +266,14 @@ - } - int cc = ::sendmsg(ssock_, (msghdr*)&mh, 0); - if (cc < 0) { -- switch (errno) { -+ int err, errlen = sizeof(err), savederrno; -+ -+ savederrno = errno; -+ getsockopt(ssock_, SOL_SOCKET, SO_ERROR, &err, -+ &errlen); -+ switch (savederrno) { - case ECONNREFUSED: - /* no one listening at some site - ignore */ --#if defined(__osf__) || defined(_AIX) -- reset(); --#endif - break; - - case ENETUNREACH: diff --git a/multimedia/vic/files/patch-al b/multimedia/vic/files/patch-al deleted file mode 100644 index 6aa16586f2d7..000000000000 --- a/multimedia/vic/files/patch-al +++ /dev/null @@ -1,421 +0,0 @@ -diff -ubwr ./grabber.cc /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/grabber.cc ---- grabber.cc Tue Feb 6 00:02:00 1996 -+++ /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/grabber.cc Fri Apr 10 15:36:42 1998 -@@ -69,6 +69,7 @@ - hstart_(0), hstop_(0), - framebase_(0), frame_(0), - inw_(0), inh_(0), outw_(0), outh_(0), -+ threshold_(48), - target_(0), tx_(0) - { - bps(128); -@@ -122,6 +123,10 @@ - } - return (TCL_OK); - } -+ if (strcmp(argv[1], "threshold") == 0) { -+ threshold_ = 8*atoi(argv[2]); -+ return (TCL_OK); -+ } - if (strcmp(argv[1], "fps") == 0) { - /*XXX assume value in range */ - fps(atoi(argv[2])); -diff -ubwr ./grabber.h /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/grabber.h ---- grabber.h Tue Feb 6 00:02:00 1996 -+++ /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/grabber.h Fri Apr 10 15:37:28 1998 -@@ -87,6 +87,7 @@ - int vstop_; - int hstart_; - int hstop_; -+ int threshold_ ; // when a block is changed ? (was constant 48) - - u_int framesize_; - u_char* framebase_; -@@ -160,19 +161,19 @@ - rb -= _rs << 3; \ - \ - int center = 0; \ -- if (left >= 48 && x > 0) { \ -+ if (left >= threshold_ && x > 0) { \ - crv[-1] = CR_MOTION|CR_SEND; \ - center = 1; \ - } \ -- if (right >= 48 && x < w - 1) { \ -+ if (right >= threshold_ && x < w - 1) { \ - crv[1] = CR_MOTION|CR_SEND; \ - center = 1; \ - } \ -- if (bottom >= 48 && y < blkh_ - 1) { \ -+ if (bottom >= threshold_ && y < blkh_ - 1) { \ - crv[w] = CR_MOTION|CR_SEND; \ - center = 1; \ - } \ -- if (top >= 48 && y > 0) { \ -+ if (top >= threshold_ && y > 0) { \ - crv[-w] = CR_MOTION|CR_SEND; \ - center = 1; \ - } \ -diff -ubwr ./ui-ctrlmenu.tcl /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/ui-ctrlmenu.tcl ---- ui-ctrlmenu.tcl Thu Jun 27 01:27:48 1996 -+++ /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/ui-ctrlmenu.tcl Fri Apr 10 16:39:04 1998 -@@ -390,11 +394,15 @@ - -relief raised -command transmit \ - -anchor w -variable transmitButtonState -font $f \ - -state disabled -highlightthickness 0 -+ checkbutton $w.freeze -text "Freeze" \ -+ -relief raised -command "grabber freeze \$freeze" \ -+ -anchor w -variable freeze -font $f \ -+ -highlightthickness 0 - button $w.release -text "Release" \ - -relief raised -command release_device \ - -font $f -highlightthickness 0 - -- pack $w.send $w.release -fill both -+ pack $w.send $w.release $w.freeze -fill both - } - - proc doNothing { args } { -@@ -434,8 +442,9 @@ - - frame $w.bps - scale $w.bps.scale -orient horizontal -font $f \ -- -showvalue 0 -from 10 -to [option get . maxbw Vic] \ -+ -showvalue 0 -from 1 -to [option get . maxbw Vic] \ - -command "set_bps $w.bps.value" -width 12 \ -+ -sliderlength 20 \ - -relief groove - label $w.bps.value -font $f -width 8 -anchor w - -@@ -443,6 +452,7 @@ - scale $w.fps.scale -font $f -orient horizontal \ - -showvalue 0 -from 1 -to 30 \ - -command "set_fps $w.fps.value" -width 12 \ -+ -sliderlength 20 \ - -relief groove - label $w.fps.value -font $f -width 8 -anchor w - -@@ -564,7 +574,7 @@ - proc select_device device { - global transmitButton sizeButtons portButton formatButtons \ - videoFormat defaultFormat lastDevice defaultPort inputPort \ -- transmitButtonState -+ transmitButtonState typeButton - - # - # Remember settings of various controls for previous device -@@ -607,6 +617,11 @@ - } else { - $portButton configure -state disabled - } -+ if [device_supports $device type *] { -+ $typeButton configure -state normal -+ } else { -+ $typeButton configure -state disabled -+ } - - insert_grabber_panel [$device nickname] - -@@ -774,7 +789,8 @@ - build.encoder_options $w.options - build.device $w.device - build.port $w.port -- pack $w.device $w.port $w.options -fill x -+ build.type $w.type -+ pack $w.device $w.port $w.type $w.options -fill x - } - - proc build.encoder_options w { -@@ -1172,6 +1188,9 @@ - global inputPort inputType portButton typeButton - if { [$portButton cget -state] == "normal" } { - $grabber port $inputPort -+ } -+ if { [$typeButton cget -state] == "normal" } { -+ $grabber type $inputType - } - setFillRate - update -diff -ubwr ./ui-grabber.tcl /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/ui-grabber.tcl ---- ui-grabber.tcl Fri Jun 21 04:39:35 1996 -+++ /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/ui-grabber.tcl Fri Apr 10 13:54:42 1998 -@@ -39,65 +39,93 @@ - # called foo-1, foo-2, etc. and you'll only need build.foo - # - -+proc build.meteor w { -+# -+# The meteor has the same controls as the slicvideo, so just call that -+# routine to build the controls. -+ -+ build.slicvideo $w -+} -+ -+proc build.bktr w { -+ build.slicvideo $w -+} -+ - proc build.slicvideo w { - set f [smallfont] -+# set f "-*-helvetica-medium-r-normal--*-100-75-75-*-*-*-*" - label $w.title -text "Grabber" - frame $w.f -relief sunken -borderwidth 2 - - frame $w.f.h -relief flat - -- label $w.f.h.label -font $f -anchor e -text "Hue" -- -- scale $w.f.h.scale -orient horizontal -width 12 -length 20 \ -- -relief groove -showvalue 0 -from -128 -to 127 \ -- -command "grabber set HUE" -- pack $w.f.h.label $w.f.h.scale -side left -fill x -expand 1 -- -- frame $w.f.ll -relief flat -- -- label $w.f.ll.label -font $f -text "Luma" -anchor s -- -- label $w.f.ll.clabel -font $f -text "Contrast" -anchor s -- -- label $w.f.ll.blabel -font $f -text "Brightness" -anchor s -- pack $w.f.ll.clabel $w.f.ll.label $w.f.ll.blabel \ -+ frame $w.f.h.c -+ label $w.f.h.c.l1 -font $f -anchor e -text "Chan:" -+ mk.entry $w.f.h.c do_chan "20" -+ $w.f.h.c.entry configure -relief sunken -width 5 -+ bind $w.f.h.c.entry <Return> "grabber chan \[$w.f.h.c.entry get\]" -+ pack $w.f.h.c.l1 $w.f.h.c.entry -side top -+ -+ global ths -+ scale $w.f.h.ths \ -+-orient horizontal -width 12 -length 60 -relief groove -sliderlength 6 \ -+ -showvalue 0 -from 1 -to 10 \ -+ -command "grabber threshold" -label Thre -+ $w.f.h.ths set 6 -+ # the actual scale is multiplied by 8 -+ scale $w.f.h.scale \ -+-orient horizontal -width 12 -length 100 -relief groove \ -+ -showvalue 0 -from -128 -to 127 \ -+ -command "grabber hue" -label Hue -+ pack $w.f.h.c \ -+ $w.f.h.ths \ -+ $w.f.h.scale \ - -side left -fill x -expand 1 - -+# frame $w.f.ll -relief flat -+# label $w.f.ll.label -font $f -text "Luma" -anchor s -+# label $w.f.ll.clabel -font $f -text "Contrast" -anchor s -+# label $w.f.ll.blabel -font $f -text "Brightness" -anchor s -+# pack $w.f.ll.clabel $w.f.ll.label $w.f.ll.blabel \ -+# -side left -fill x -expand 1 -+ - frame $w.f.l -relief flat - -- scale $w.f.l.cscale -orient horizontal -width 12 -relief groove \ -+ scale $w.f.l.cscale \ -+-orient horizontal -width 12 -length 100 -relief groove \ - -showvalue 0 -from 0 -to 127 \ -- -command "grabber set LUMA_CONTRAST" -+ -label "Contrast" \ -+ -command "grabber contrast" - -- scale $w.f.l.bscale -orient horizontal -width 12 -relief groove \ -+ scale $w.f.l.bscale \ -+-orient horizontal -width 12 -length 100 -relief groove \ - -showvalue 0 -from 0 -to 255 \ -- -command "grabber set LUMA_BRIGHTNESS" -+ -command "grabber brightness" -label "Brightness" - pack $w.f.l.cscale $w.f.l.bscale -side left -fill x -expand 1 - -- frame $w.f.cl -relief flat -- -- label $w.f.cl.label -font $f -text "Chroma" -anchor n -- -- label $w.f.cl.glabel -font $f -text "Gain" -anchor n -- -- label $w.f.cl.slabel -font $f -text "Saturation" -anchor n -- pack $w.f.cl.glabel $w.f.cl.label $w.f.cl.slabel \ -- -side left -fill x -expand 1 -+# frame $w.f.cl -relief flat -+# label $w.f.cl.label -font $f -text "Chroma" -anchor n -+# label $w.f.cl.glabel -font $f -text "Gain" -anchor n -+# label $w.f.cl.slabel -font $f -text "Saturation" -anchor n -+# pack $w.f.cl.glabel $w.f.cl.label $w.f.cl.slabel \ -+# -side left -fill x -expand 1 - - frame $w.f.c -relief flat - -- scale $w.f.c.gscale -orient horizontal -width 12 -relief groove \ -+ scale $w.f.c.gscale \ -+-orient horizontal -width 12 -length 100 -relief groove \ - -showvalue 0 -from 0 -to 255 \ -- -command "grabber set CHROMA_GAIN" -+ -command "grabber uvgain" -label "Chr. Gain" - -- scale $w.f.c.sscale -orient horizontal -width 12 -relief groove \ -+ scale $w.f.c.sscale \ -+-orient horizontal -width 12 -length 100 -relief groove \ - -showvalue 0 -from 0 -to 127 \ -- -command "grabber set CHROMA_SATURATION" -+ -command "grabber saturation" -label "Saturation" - pack $w.f.c.gscale $w.f.c.sscale -side left -fill x -expand 1 - - -- pack $w.f.h $w.f.ll $w.f.l $w.f.c $w.f.cl \ -- -fill x -expand 1 -padx 1m -+ # pack $w.f.h $w.f.ll $w.f.l $w.f.c $w.f.cl -+ pack $w.f.h $w.f.l $w.f.c -fill x -expand 1 -padx 1m - - - pack $w.title $w.f -fill x -expand 1 -@@ -109,6 +137,10 @@ - $w.f.c.sscale set 64 - } - -+# -+# STILL image-grabber (?) -+# -+ - proc build.still w { - - set f [smallfont] -@@ -131,6 +163,10 @@ - $lastDevice file $s - } - -+# -+# quickcam grabber -+# -+ - proc build.qcam {w} { - global qcamwindow - -@@ -190,3 +226,118 @@ - set qcamwindow(setwbal) "$w.f.s.s.wbal.scale set" - set qcamwindow(setbpp) "set qcambpp" - } -+ -+# -+# X11 Grabber controls -+# -+proc x11grabUpdatePos {x y w h} { -+ -+ global x11grabcontrols -+ set w $x11grabcontrols -+ -+ if {[string compare $x [$w.x11grab.row1.pos.x.e get]] != 0} { -+ $w.x11grab.row1.pos.x.e delete 0 end -+ $w.x11grab.row1.pos.x.e insert 0 $x -+ } -+ if {[string compare $y [$w.x11grab.row1.pos.y.e get]] != 0} { -+ $w.x11grab.row1.pos.y.e delete 0 end -+ $w.x11grab.row1.pos.y.e insert 0 $y -+ } -+ if {[string compare $w [$w.x11grab.row1.pos.w.e get]] != 0} { -+ $w.x11grab.row1.pos.w.e delete 0 end -+ $w.x11grab.row1.pos.w.e insert 0 $w -+ } -+ if {[string compare $h [$w.x11grab.row1.pos.h.e get]] != 0} { -+ $w.x11grab.row1.pos.h.e delete 0 end -+ $w.x11grab.row1.pos.h.e insert 0 $h -+ } -+} -+ -+proc x11cmd.update.geo w { -+ grabber fixed [$w.row.x get] [$w.row.y get] -+} -+ -+proc x11cmd.fixed {} { -+ global x11Source x11grabcontrols -+ set w $x11grabcontrols -+ $w.label configure -text "$x11Source" -+ if [winfo exists $w.row] { -+ destroy $w.row -+ } -+ frame $w.row -+ pack append $w.row \ -+ [label $w.row.xl -text "X:" -width 2 -anchor e] {left filly} \ -+ [entry $w.row.x -relief flat -width 4] {left filly} \ -+ [label $w.row.yl -text "Y:" -width 2 -anchor e] {left filly} \ -+ [entry $w.row.y -relief flat -width 4] {left filly} -+ bind $w.row.x <Return> "x11cmd.update.geo $w" -+ bind $w.row.y <Return> "x11cmd.update.geo $w" -+ -+ pack $w.row -after $w.label -+} -+ -+proc x11cmd.pointer {} { -+ global x11Source x11grabcontrols -+ set w $x11grabcontrols -+ $w.label configure -text "$x11Source" -+ if [winfo exists $w.row] { -+ destroy $w.row -+ } -+ frame $w.row -+ pack append $w.row \ -+ [button $w.row.s -text "Follow pointer" ] { left filly } -+ pack $w.row -after $w.label -+} -+ -+proc x11cmd.window {} { -+ global x11Source x11grabcontrols -+ puts "x11cmd -- x11Source $x11Source" -+ set w $x11grabcontrols -+ $w.label configure -text "$x11Source" -+ if [winfo exists $w.row] { -+ destroy $w.row -+ } -+ frame $w.row -+ pack append $w.row \ -+ [button $w.row.s -text "Select window" ] { left filly } -+ pack $w.row -after $w.label -+} -+ -+proc build.x11 w { -+ global x11grabcontrols x11Source -+ set f [smallfont] -+ -+ label $w.title -text "X11 Grabber controls" -+ frame $w.x11grab -relief sunken -borderwidth 2 -+ set x11grabcontrols $w.x11grab -+ set x11Source "Fixed" -+ set w1 $w.x11grab -+ -+ -+ # luigi -+ set m $w1.menu -+ set m1 $m.m1 -+ menubutton $w1.menu -menu $m1 -text "Source:" \ -+ -relief raised -width 7 -font $f -+ label $w1.label -width 6 -font $f -+ frame $w1.row -+ menu $m1 -+ $m1 add radiobutton -label Fixed \ -+ -state active \ -+ -command "x11cmd.fixed" -font $f -variable x11Source -+# $m1 add radiobutton -label Pointer \ -+# -command "x11cmd.pointer" -font $f -variable x11Source -+# $m1 add radiobutton -label Window \ -+# -command "x11cmd.window" -font $f -variable x11Source -+ -+ pack append $w1 \ -+ $w1.menu {left} \ -+ $w1.label {left} \ -+ $w1.row {left} -+ -+ pack $w $w.title $w1 -fill x -expand 1 -+ -+ x11cmd.fixed -+} -+ -+### end of file ### -diff -ubwr ./ui-resource.tcl /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/ui-resource.tcl ---- ui-resource.tcl Wed Apr 3 02:33:56 1996 -+++ /home/old_wd0f/ports/mbone/vic/work.luigi/vic-2.8-luigi/ui-resource.tcl Fri Apr 10 21:11:56 1998 -@@ -140,7 +140,7 @@ - option add Vic.useHardwareDecode false startupFile - option add Vic.infoHighlightColor LightYellow2 startupFile - option add Vic.useJPEGforH261 false startupFile -- option add Vic.stillGrabber false startupFile -+ option add Vic.stillGrabber true startupFile ; # XXX was false - option add Vic.siteDropTime "300" startupFile - - # diff --git a/multimedia/vic/files/patch-am b/multimedia/vic/files/patch-am deleted file mode 100644 index e270b5c42e78..000000000000 --- a/multimedia/vic/files/patch-am +++ /dev/null @@ -1,1401 +0,0 @@ ---- grabber-x11.cc.orig Thu Sep 9 06:57:14 1999 -+++ grabber-x11.cc Wed Sep 8 21:31:27 1999 -@@ -0,0 +1,1398 @@ -+/* -+ * Copyright (c) 1998 Luigi Rizzo -+ * grabber-x11.cc for vic -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. All advertising materials mentioning features or use of this software -+ * must display the following acknowledgement: -+ * This product includes software developed by Jim Lowe -+ * 4. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, -+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include <stdio.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <fcntl.h> -+#include <sys/types.h> -+#include <sys/ioctl.h> -+#include <sys/mman.h> -+ -+#include "grabber.h" -+#include "Tcl.h" -+#include "device-input.h" -+#include "module.h" -+ -+#include <X11/Xlib.h> -+#include <X11/Xutil.h> -+#include <X11/Xatom.h> -+#include <X11/cursorfont.h> -+#include <tk.h> -+/*** #include "sized_types.h" ***/ -+ -+/* -+ Netvideo version 3.3 -+ Written by Ron Frederick <frederick@parc.xerox.com> -+ -+ Machine-specific sized integer type definitions -+ Video utility definitions -+*/ -+ -+/* -+ * Copyright (c) Xerox Corporation 1992. All rights reserved. -+ * -+ * License is granted to copy, to use, and to make and to use derivative -+ * works for research and evaluation purposes, provided that Xerox is -+ * acknowledged in all documentation pertaining to any such copy or derivative -+ * work. Xerox grants no other licenses expressed or implied. The Xerox trade -+ * name should not be used in any advertising without its written permission. -+ * -+ * XEROX CORPORATION MAKES NO REPRESENTATIONS CONCERNING EITHER THE -+ * MERCHANTABILITY OF THIS SOFTWARE OR THE SUITABILITY OF THIS SOFTWARE -+ * FOR ANY PARTICULAR PURPOSE. The software is provided "as is" without -+ * express or implied warranty of any kind. -+ * -+ * These notices must be retained in any copies of any part of this software. -+ */ -+ -+typedef signed char int8; /* 8 bit signed int */ -+typedef short int16; /* 16 bit signed int */ -+typedef int int32; /* 32 bit signed int */ -+#if defined(__alpha) -+typedef long int64; /* 64 bit signed int */ -+#endif -+ -+typedef unsigned char uint8; /* 8 bit unsigned int */ -+typedef unsigned short uint16; /* 16 bit unsigned int */ -+typedef unsigned int uint32; /* 32 bit unsigned int */ -+#if defined(__alpha) -+typedef unsigned long uint64; /* 64 bit unsigned int */ -+#endif -+ -+/* Mildly gross but moderately portable test for littleendian machines */ -+#define LITTLEENDIAN (ntohl(0x12345678) != 0x12345678) -+ -+typedef struct { -+ XImage *image; -+ void *shminfo; -+} ximage_t; -+ -+/*************************/ -+ -+#define VID_SMALL 0x01 -+#define VID_MEDIUM 0x02 -+#define VID_LARGE 0x04 -+#define VID_SIZEMASK 0x07 -+ -+#define VID_GREYSCALE 0x08 -+#define VID_COLOR 0x10 -+ -+#define X11GRAB_FIXED 0 -+#define X11GRAB_POINTER 1 -+#define X11GRAB_WINDOW 2 -+ -+ -+/*XXX*/ -+#define NTSC_WIDTH 320 -+#define NTSC_HEIGHT 240 -+#define PAL_WIDTH 384 -+#define PAL_HEIGHT 288 -+#define CIF_WIDTH 352 -+#define CIF_HEIGHT 288 -+ -+ -+class X11Grabber : public Grabber { -+ public: -+ X11Grabber(const char* name, const char* format); -+ virtual ~X11Grabber(); -+ virtual void start(); -+ virtual void stop(); -+ protected: -+ virtual int command(int argc, const char*const* argv); -+ virtual int capture(); -+ virtual int grab(); -+ void format(); -+ void setsize(); -+ -+ void X11Grab_ComputeYUVTable(void) ; -+ int X11Grab_MSBWhite1(void); -+ int X11Grab_LSBWhite1(void); -+ int X11Grab_MSBBlack1(void); -+ int X11Grab_LSBBlack1(void); -+ int X11Grab_Pseudo8(void); -+ int X11Grab_RGB16(void); -+ int X11Grab_TrueXBGR24(void); -+ int X11Grab_TrueXRGB24(void); -+ -+ int X11Grab_Initialize(Window rw, int w, int h); -+ typedef enum { -+ grab_none, -+ grab_X11Grab_LSBWhite1, -+ grab_X11Grab_MSBWhite1, -+ grab_X11Grab_LSBBlack1, -+ grab_X11Grab_MSBBlack1, -+ grab_X11Grab_Pseudo8, -+ grab_X11Grab_RGB16, -+ grab_X11Grab_TrueXBGR24, -+ grab_X11Grab_TrueXRGB24 -+ } c_grab_type; -+ c_grab_type c_grab; -+ -+ -+ uint8 *rgb2y_ ; -+ int8 *rgb2u_ ; -+ int8 *rgb2v_ ; -+ -+ ximage_t *ximage_ ; -+ -+ Display *dpy_ ; -+ int mode_; /* input mode */ -+ Window theroot_ ; -+ -+// Tcl_Interp *interp_=NULL; -+ -+ int screen, xerror ; -+ Window vRoot_ ; -+ Window rootwin_ ; -+ Colormap colormap; -+ Visual *root_vis; -+ XVisualInfo root_visinfo; -+ -+ int ncolors_ ; -+ int black, white; -+ XColor *color ; -+ uint8 *col2y_ ; -+ uint16 *col2rgb16_ ; -+ -+ u_int basewidth_; /* Height of frame to be captured */ -+ u_int baseheight_; /* Width of frame to be captured */ -+ u_int decimate_; /* division of base sizes */ -+ -+ int x_origin_, y_origin_, width_, height_; -+ int root_depth_, root_width, root_height; -+}; -+ -+class X11Device : public InputDevice { -+ public: -+ X11Device(const char* nickname); -+ virtual int command(int argc, const char*const* argv); -+ protected: -+ const char* name_; -+}; -+ -+static X11Device find_x11_devices("x11"); -+ -+X11Device::X11Device(const char* nickname): -+ InputDevice(nickname), name_(nickname) -+{ -+ if (free) -+ attributes_ = "\ -+size {large normal small cif} \ -+format {422}" ; -+ else -+ attributes_ = "disabled"; -+} -+ -+extern "C" { -+/*** most of this taken from nv:x11-grab.c ***/ -+extern ximage_t *VidUtil_AllocXImage(Display *dpy, Visual *vis, int depth, -+ int width, int height, int readonly); -+ -+#if 0 /* debugging stuff */ -+static int my_Tcl_Eval(Tcl_Interp *interp, char *cmd) -+{ -+ fprintf(stderr,"Tcl_Eval <%s>\n", cmd); -+ Tcl_Eval(interp, cmd); -+} -+#define Tcl_Eval my_Tcl_Eval -+#endif -+ -+static Window -+VirtualRootWindow(Display *dpy, int screen) -+{ -+ static Display *last_dpy=(Display *)NULL; -+ static int last_screen = -1; -+ static Window vRoot=None; -+ -+ Atom __SWM_VROOT=None; -+ Window rw, p, *child; -+ unsigned int i, nChildren; -+ -+ if ((dpy != last_dpy) || (screen != last_screen)) { -+ vRoot = RootWindow(dpy, screen); -+ -+ /* go look for a virtual root */ -+ __SWM_VROOT = XInternAtom(dpy, "__SWM_VROOT", False); -+ XQueryTree(dpy, vRoot, &rw, &p, &child, &nChildren); -+ for (i=0; i<nChildren; i++) { -+ Atom actual_type; -+ int actual_format; -+ unsigned long nitems, bytesafter; -+ Window *newRoot=NULL; -+ -+ if ((XGetWindowProperty(dpy, child[i], __SWM_VROOT, 0, 1, False, -+ XA_WINDOW, &actual_type, &actual_format, -+ &nitems, &bytesafter, -+ (unsigned char **)&newRoot) == Success) -+ && (newRoot != NULL)) { -+ vRoot = *newRoot; -+ XFree((void *)newRoot); -+ break; -+ } -+ } -+ XFree((void *)child); -+ -+ last_dpy = dpy; -+ last_screen = screen; -+ } -+ -+ return vRoot; -+} -+ -+} /* end extern C */ -+ -+void -+X11Grabber::X11Grab_ComputeYUVTable(void) -+{ -+ int i; -+ -+ switch (root_visinfo.c_class) { -+ case StaticColor: -+ case PseudoColor: -+ case StaticGray: -+ case GrayScale: -+ for (i=0; i<ncolors_; i++) color[i].pixel = i; -+ XQueryColors(dpy_, colormap, color, ncolors_); -+ for (i=0; i<ncolors_; i++) { -+ color[i].red = (color[i].red & 0xf800) ; -+ color[i].green = (color[i].green & 0xfc00) >> 5 ; -+ color[i].blue = (color[i].blue & 0xf800) >> 11 ; -+ col2rgb16_[i] = color[i].red + color[i].green + color[i].blue; -+ col2y_[i] = rgb2y_[col2rgb16_[i]]; -+ } -+ break; -+ case TrueColor: -+ fprintf(stderr, "TrueColor...\n"); -+ break; -+ case DirectColor: -+ fprintf(stderr, "DirectColor...\n"); -+ break; -+ } -+} -+ -+/* -+ * these are the grabbing functions for the various video formats -+ */ -+ -+int -+X11Grabber::X11Grab_MSBWhite1() -+{ -+ int x, y, row; -+ uint8 *data=(uint8 *)ximage_->image->data, *yp= frame_; -+ -+ for (y=0; y<height_; y++) { -+ for (x=0; x<width_; x+=8) { -+ row = *data++; -+ -+ yp[0] = 255 * ((row & 0x80)>>7); -+ yp[1] = 255 * ((row & 0x40)>>6); -+ yp[2] = 255 * ((row & 0x20)>>5); -+ yp[3] = 255 * ((row & 0x10)>>4); -+ yp[4] = 255 * ((row & 0x08)>>3); -+ yp[5] = 255 * ((row & 0x04)>>2); -+ yp[6] = 255 * ((row & 0x02)>>1); -+ yp[7] = 255 * (row & 0x01); -+ yp += 8; -+ } -+ } -+ -+ return 1; -+} -+ -+int -+X11Grabber::X11Grab_MSBBlack1() -+{ -+ int x, y, row; -+ uint8 *data=(uint8 *)ximage_->image->data, *yp= frame_; -+ -+ for (y=0; y<height_; y++) { -+ for (x=0; x<width_; x+=8) { -+ row = *data++; -+ -+ yp[0] = 255 - 255 * ((row & 0x80)>>7); -+ yp[1] = 255 - 255 * ((row & 0x40)>>6); -+ yp[2] = 255 - 255 * ((row & 0x20)>>5); -+ yp[3] = 255 - 255 * ((row & 0x10)>>4); -+ yp[4] = 255 - 255 * ((row & 0x08)>>3); -+ yp[5] = 255 - 255 * ((row & 0x04)>>2); -+ yp[6] = 255 - 255 * ((row & 0x02)>>1); -+ yp[7] = 255 - 255 * (row & 0x01); -+ yp += 8; -+ } -+ } -+ -+ return 1; -+} -+ -+int -+X11Grabber::X11Grab_LSBWhite1() -+{ -+ int x, y, row; -+ uint8 *data=(uint8 *)ximage_->image->data, *yp= frame_ ; -+ -+ for (y=0; y<height_; y++) { -+ for (x=0; x<width_; x+=8) { -+ row = *data++; -+ -+ yp[7] = 255 * ((row & 0x80)>>7); -+ yp[6] = 255 * ((row & 0x40)>>6); -+ yp[5] = 255 * ((row & 0x20)>>5); -+ yp[4] = 255 * ((row & 0x10)>>4); -+ yp[3] = 255 * ((row & 0x08)>>3); -+ yp[2] = 255 * ((row & 0x04)>>2); -+ yp[1] = 255 * ((row & 0x02)>>1); -+ yp[0] = 255 * (row & 0x01); -+ yp += 8; -+ } -+ } -+ -+ return 1; -+} -+ -+int -+X11Grabber::X11Grab_LSBBlack1() -+{ -+ int x, y, row; -+ uint8 *data=(uint8 *)ximage_->image->data, *yp= frame_; -+ -+ for (y=0; y<height_; y++) { -+ for (x=0; x<width_; x+=8) { -+ row = *data++; -+ -+ yp[7] = 255 - 255 * ((row & 0x80)>>7); -+ yp[6] = 255 - 255 * ((row & 0x40)>>6); -+ yp[5] = 255 - 255 * ((row & 0x20)>>5); -+ yp[4] = 255 - 255 * ((row & 0x10)>>4); -+ yp[3] = 255 - 255 * ((row & 0x08)>>3); -+ yp[2] = 255 - 255 * ((row & 0x04)>>2); -+ yp[1] = 255 - 255 * ((row & 0x02)>>1); -+ yp[0] = 255 - 255 * (row & 0x01); -+ yp += 8; -+ } -+ } -+ -+ return 1; -+} -+ -+int -+X11Grabber::X11Grab_Pseudo8() -+{ -+ int x, y, p0, p1, p2, p3 ; -+ uint8 *data=(uint8 *)ximage_->image->data, *yp=frame_ ; -+ uint8 *up= (uint8 *)yp + framesize_ ; -+ uint8 *vp= up + (framesize_ >> 2) ; -+ -+ X11Grab_ComputeYUVTable(); -+ -+ for (y=0; y<height_; y += 2) { -+ for (x=0; x<width_ ; x += 2) { -+ yp[0] = col2y_[data[0]]; -+ p0 = col2rgb16_[data[0]]; -+ yp[1] = col2y_[data[1]]; -+ p1 = col2rgb16_[data[1]]; -+ -+ p2 = col2rgb16_[data[width_]]; -+ p3 = col2rgb16_[data[width_ + 1]]; -+#if 0 /* average */ -+ p0 = ( (p0 >> 1) & 0x7bef ) + ( (p1 >> 1) & 0x7bef ) ; -+ p2 = ( (p2 >> 1) & 0x7bef ) + ( (p3 >> 1) & 0x7bef ) ; -+ p0 = ( (p0 >> 1) & 0x7bef ) + ( (p2 >> 1) & 0x7bef ) ; -+#else /* take the darkest... */ -+ if (yp[1] < yp[0]) p0 = p1 ; -+ if (rgb2y_[p2] < rgb2y_[p0]) p0 = p2 ; -+ if (rgb2y_[p3] < rgb2y_[p0]) p0 = p3 ; -+#endif -+ *up++ = rgb2u_[ p0 ]; -+ *vp++ = rgb2v_[ p0 ]; -+ -+ data += 2; -+ yp += 2 ; -+ } -+ for (x=0; x<width_; x += 8) { -+ yp[0] = col2y_[data[0]]; -+ yp[1] = col2y_[data[1]]; -+ yp[2] = col2y_[data[2]]; -+ yp[3] = col2y_[data[3]]; -+ yp[4] = col2y_[data[4]]; -+ yp[5] = col2y_[data[5]]; -+ yp[6] = col2y_[data[6]]; -+ yp[7] = col2y_[data[7]]; -+ data += 8; -+ yp += 8 ; -+ } -+ } -+ -+ return 1; -+} -+ -+int -+X11Grabber::X11Grab_RGB16(void) -+{ -+ int x, y; -+ uint8 *yp= (uint8 *)frame_ ; -+ uint8 *up= (uint8 *)yp + framesize_ ; -+ uint8 *vp= up + (framesize_ >> 2) ; -+ uint16 *data=(uint16 *)ximage_->image->data, p0, p1, p2, p3; -+ -+ for (y=0; y<height_; y+=2) { -+ for (x=0; x<width_; x += 2) { -+ p0 = data[0] ; -+ p1 = data[1] ; -+ p2 = data[ width_] ; -+ p3 = data[ width_ + 1] ; -+ data += 2 ; -+ yp[0] = rgb2y_[ p0 ] ; /* in 565 format */ -+ yp[1] = rgb2y_[ p1 ] ; /* in 565 format */ -+#if 0 -+ /* average the four pixels... */ -+ p0 = ( (p0 >> 1) & 0x7bef ) + ( (p1 >> 1) & 0x7bef ) ; -+ p2 = ( (p2 >> 1) & 0x7bef ) + ( (p3 >> 1) & 0x7bef ) ; -+ p0 = ( (p0 >> 1) & 0x7bef ) + ( (p2 >> 1) & 0x7bef ) ; -+#else /* take the darkest... */ -+ if (yp[1] < yp[0]) p0 = p1 ; -+ if (rgb2y_[p2] < rgb2y_[p0]) p0 = p2 ; -+ if (rgb2y_[p3] < rgb2y_[p0]) p0 = p3 ; -+#endif -+ *up++ = rgb2u_[ p0 ]; -+ *vp++ = rgb2v_[ p0 ]; -+ yp += 2 ; -+ } -+ for (x=0; x<width_; x += 8) { -+ yp[0] = rgb2y_[data[0] ]; -+ yp[1] = rgb2y_[data[1] ]; -+ yp[2] = rgb2y_[data[2] ]; -+ yp[3] = rgb2y_[data[3] ]; -+ yp[4] = rgb2y_[data[4] ]; -+ yp[5] = rgb2y_[data[5] ]; -+ yp[6] = rgb2y_[data[6] ]; -+ yp[7] = rgb2y_[data[7] ]; -+ yp += 8 ; -+ data += 8 ; -+ } -+ } -+ -+ return 1; -+} -+ -+int -+X11Grabber::X11Grab_TrueXBGR24() -+{ -+ int x, y; -+ uint8 *yp= (uint8 *)frame_ ; -+ uint8 *up= (uint8 *)yp + framesize_ ; -+ uint8 *vp= up + (framesize_ >> 2) ; -+ uint16 p0, p1 ; -+ uint32 *data=(uint32 *)ximage_->image->data, d ; -+ -+ for (y=0; y<height_; y += 2) { -+ for (x=0; x<width_; x+=2) { -+ d = *data++ ; -+ p0 = ((d<<8) & 0xf100) | ((d>>5) & 0x7e0) | ((d>>19) & 0x1f); -+ *yp++ = rgb2y_[ p0 ]; -+ -+ d = *data++ ; -+ p1 = ((d<<8) & 0xf100) | ((d>>5) & 0x7e0) | ((d>>19) & 0x1f); -+ *yp++ = rgb2y_[ p1 ]; -+ -+ /* average the two pixels... */ -+ p0 = ( (p0 >> 1) & 0x7bef ) + ( (p1 >> 1) & 0x7bef ) ; -+ *up++ = rgb2u_[ p0 ]; -+ } -+ for (x=0; x<width_; x+=2) { -+ d = *data++ ; -+ p0 = ((d<<8) & 0xf100) | ((d>>5) & 0x7e0) | ((d>>19) & 0x1f); -+ *yp++ = rgb2y_[ p0 ]; -+ -+ d = *data++ ; -+ p1 = ((d<<8) & 0xf100) | ((d>>5) & 0x7e0) | ((d>>19) & 0x1f); -+ *yp++ = rgb2y_[ p1 ]; -+ -+ /* average the two pixels... */ -+ p0 = ( (p0 >> 1) & 0x7bef ) + ( (p1 >> 1) & 0x7bef ) ; -+ *vp++ = rgb2v_[ p0 ]; -+ } -+ } -+ -+ return 1; -+} -+ -+int -+X11Grabber::X11Grab_TrueXRGB24() -+{ -+ int x, y; -+ uint8 *yp= (uint8 *)frame_ ; -+ uint8 *up= (uint8 *)yp + framesize_ ; -+ uint8 *vp= up + (framesize_ >> 2) ; -+ uint16 p0, p1 ; -+ uint32 *data=(uint32 *)ximage_->image->data, d ; -+ -+ for (y=0; y<height_; y += 2) { -+ for (x=0; x<width_; x+=2) { -+ d = *data++ ; -+ /* -- RED -- -- GREEN -- -- BLUE -- */ -+ p0 = ((d>>8) & 0xf100) | ((d>>5) & 0x7e0) | ((d>>3) & 0x1f); -+ *yp++ = rgb2y_[ p0 ]; -+ -+ d = *data++ ; -+ p1 = ((d>>8) & 0xf100) | ((d>>5) & 0x7e0) | ((d>>3) & 0x1f); -+ *yp++ = rgb2y_[ p1 ]; -+ -+ /* average the two pixels... */ -+ p0 = ( (p0 >> 1) & 0x7bef ) + ( (p1 >> 1) & 0x7bef ) ; -+ *up++ = rgb2u_[ p0 ]; -+ } -+ for (x=0; x<width_; x+=2) { -+ d = *data++ ; -+ p0 = ((d>>8) & 0xf100) | ((d>>5) & 0x7e0) | ((d>>3) & 0x1f); -+ *yp++ = rgb2y_[ p0 ]; -+ -+ d = *data++ ; -+ p1 = ((d>>8) & 0xf100) | ((d>>5) & 0x7e0) | ((d>>3) & 0x1f); -+ *yp++ = rgb2y_[ p1 ]; -+ -+ /* average the two pixels... */ -+ p0 = ( (p0 >> 1) & 0x7bef ) + ( (p1 >> 1) & 0x7bef ) ; -+ *vp++ = rgb2v_[ p0 ]; -+ } -+ } -+ -+ return 1; -+} -+ -+/* -+ * initialization of frame grabber... -+ */ -+int -+X11Grabber::X11Grab_Initialize(Window rw, int w, int h) -+{ -+ int config = 0 ; -+ XWindowAttributes wattr; -+ -+ if (theroot_ != rw) { -+ theroot_ = rw; -+ XGetWindowAttributes(dpy_, theroot_, &wattr); -+ screen = XScreenNumberOfScreen(wattr.screen); -+ colormap = DefaultColormapOfScreen(wattr.screen); -+ ncolors_ = CellsOfScreen(wattr.screen); -+ black = BlackPixelOfScreen(wattr.screen); -+ white = WhitePixelOfScreen(wattr.screen); -+ root_depth_ = wattr.depth; -+ root_width = wattr.width; -+ root_height = wattr.height; -+ root_vis = wattr.visual; -+ vRoot_ = VirtualRootWindow(dpy_, screen); -+ -+ if (color != NULL) { -+ free(color); -+ free(col2y_); -+ free(col2rgb16_); -+ } -+ color = (XColor *) malloc(ncolors_*sizeof(XColor)); -+ col2y_ = (uint8 *) malloc(ncolors_*sizeof(uint8)); -+ col2rgb16_ = (uint16 *) malloc(ncolors_*sizeof(uint16)); -+ -+ XMatchVisualInfo(dpy_, screen, root_depth_, root_vis->c_class, -+ &root_visinfo); -+ switch (root_depth_) { -+ case 1: -+ if (white == 1) { -+ c_grab = (LITTLEENDIAN) ? grab_X11Grab_LSBWhite1 : grab_X11Grab_MSBWhite1; -+ } else { -+ c_grab = (LITTLEENDIAN) ? grab_X11Grab_LSBBlack1 : grab_X11Grab_MSBBlack1; -+ } -+ config = VID_GREYSCALE; -+ break; -+ -+ case 8: -+ switch (root_visinfo.c_class) { -+ case PseudoColor: -+ case GrayScale: -+ case StaticColor: -+ case StaticGray: -+ c_grab = grab_X11Grab_Pseudo8; -+ break; -+ default: -+ c_grab = grab_none; -+ break; -+ } -+ config = VID_GREYSCALE|VID_COLOR; -+ break; -+ -+ case 16: -+ c_grab = grab_X11Grab_RGB16; -+ break ; -+ -+ case 24: -+ if ((root_visinfo.c_class == TrueColor) && -+ (root_visinfo.green_mask = 0xff00) && -+ (root_visinfo.red_mask == 0xff) && -+ (root_visinfo.blue_mask == 0xff0000)) { -+ c_grab = grab_X11Grab_TrueXBGR24; -+ -+ } else if ((root_visinfo.c_class == TrueColor) && -+ (root_visinfo.green_mask = 0xff00) && -+ (root_visinfo.red_mask == 0xff0000) && -+ (root_visinfo.blue_mask == 0xff)) { -+ c_grab = grab_X11Grab_TrueXRGB24; -+ } else -+ c_grab = grab_none; -+ config = VID_GREYSCALE|VID_COLOR; -+ break; -+ -+ default: -+ fprintf(stderr, "don't know how to grab %d bits\n", -+ root_depth_); -+ c_grab = grab_none; -+ break; -+ } -+ } -+ -+ if ((ximage_ == NULL) || (width_ != w) || (height_ != h)) { -+ width_ = w; -+ height_ = h; -+ if (ximage_ != NULL) -+ VidUtil_DestroyXImage(dpy_, ximage_); -+ ximage_ = VidUtil_AllocXImage(dpy_, root_vis, root_depth_, w, h, False); -+ } -+ return (c_grab == grab_none) ? 0 : config|VID_SMALL|VID_MEDIUM|VID_LARGE; -+} -+ -+extern "C" { -+extern void VidUtil_Init(Display *dpy); -+extern void VidUtil_DestroyXImage(Display *dpy, ximage_t *ximage); -+ -+#ifdef UNUSED /* not yet... */ -+static int -+ErrHandler1(ClientData clientData, XErrorEvent *errevp) -+{ -+ xerror = 1; -+ return 0; -+} -+ -+static int -+X11Grab_MakeBox(unsigned int x1, unsigned int y1, -+ unsigned int x2, unsigned int y2, -+ int *xp, int *yp, int *wp, int *hp) -+{ -+ int w, h; -+ -+ w = x2-x1; -+ if (w < 0) { -+ *xp = x2; -+ *wp = -w; -+ } else { -+ *xp = x1; -+ *wp = w; -+ } -+ -+ h = y2-y1; -+ if (h < 0) { -+ *yp = y2; -+ *hp = -h; -+ } else { -+ *yp = y1; -+ *hp = h; -+ } -+} -+ -+static int -+X11Grab_UpdatePos(Window rw, int x, int y, int w, int h) -+{ -+ static char cmd[256]; -+ -+ if (w < 8) w = 8; -+ if (h < 8) h = 8; -+ -+ if (w > root_width/8*8) w = root_width/8*8; -+ if (h > root_height/8*8) h = root_height/8*8; -+ -+ w = (w+7)/8*8; -+ h = (h+7)/8*8; -+ -+ if (x < 0) x = 0; -+ if (y < 0) y = 0; -+ -+ if (x > root_width-w) x = root_width-w; -+ if (y > root_height-h) y = root_height-h; -+ -+ sprintf(cmd, "x11grabUpdatePos %d %d %d %d", x, y, w, h); -+ (void) Tcl_Eval(interp, cmd); -+ -+ x_origin = x; -+ y_origin = y; -+ -+ if ((root != rw) || (width != w) || (height != h)) { -+ X11Grab_Initialize(rw, w, h); -+ return 0; -+ } else -+ return 1; -+} -+ -+static int -+X11Grab_FollowPointer(void) -+{ -+ Window rw, cw; -+ int x, y, wx, wy; -+ unsigned int mask; -+ -+ XQueryPointer(dpy, root, &rw, &cw, &x, &y, &wx, &wy, &mask); -+ -+ if (x < x_origin+width/4) -+ x = x-width/4; -+ else if (x >= x_origin+3*width/4) -+ x = x-3*width/4; -+ else -+ x = x_origin; -+ -+ if (y < y_origin+height/4) -+ y = y-height/4; -+ else if (y >= y_origin+3*height/4) -+ y = y-3*height/4; -+ else -+ y = y_origin; -+ -+ return X11Grab_UpdatePos(rw, x, y, width, height); -+} -+ -+static int -+X11Grab_FollowWindow(void) -+{ -+ int x, y, w, h; -+ XWindowAttributes wattr, vRoot_wattr; -+ Tk_ErrorHandler handler; -+ -+ handler = Tk_CreateErrorHandler(dpy, -1, -1, -1, ErrHandler1, NULL); -+ xerror = 0; -+ XGetWindowAttributes(dpy, target, &wattr); -+ XSync(dpy, False); -+ Tk_DeleteErrorHandler(handler); -+ if ((target == None) || xerror) { -+ target = None; -+ (void) Tcl_Eval(interp, -+ ".grabControls.x11grab.row1.mode.window config -state disabled"); -+ (void) Tcl_Eval(interp, "set x11grabMode fixed"); -+ return 1; -+ } else { -+ XGetWindowAttributes(dpy, vRoot, &vRoot_wattr); -+ x = wattr.x+vRoot_wattr.x; -+ y = wattr.y+vRoot_wattr.y; -+ w = wattr.width+2*wattr.border_width; -+ h = wattr.height+2*wattr.border_width; -+ -+ return X11Grab_UpdatePos(root, x, y, w, h); -+ } -+} -+#endif /* UNUSED ... */ -+ -+ -+#ifdef UNUSED -+/*ARGSUSED*/ -+static int -+X11Grab_SetXCmd(ClientData clientData, Tcl_Interp *interp, -+ int argc, char *argv[]) -+{ -+ int x; -+ -+ if (argc != 2) { -+ Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], -+ " x\"", NULL); -+ return TCL_ERROR; -+ } -+ -+ x = atoi(argv[1]); -+ (void) X11Grab_UpdatePos(root, x, y_origin, width, height); -+ -+ return TCL_OK; -+} -+ -+/*ARGSUSED*/ -+static int -+X11Grab_SetYCmd(ClientData clientData, Tcl_Interp *interp, -+ int argc, char *argv[]) -+{ -+ int y; -+ -+ if (argc != 2) { -+ Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], -+ " y\"", NULL); -+ return TCL_ERROR; -+ } -+ -+ y = atoi(argv[1]); -+ (void) X11Grab_UpdatePos(root, x_origin, y, width, height); -+ -+ return TCL_OK; -+} -+ -+/*ARGSUSED*/ -+static int X11Grab_SetWCmd(ClientData clientData, Tcl_Interp *interp, -+ int argc, char *argv[]) -+{ -+ int w; -+ -+ if (argc != 2) { -+ Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], -+ " width\"", NULL); -+ return TCL_ERROR; -+ } -+ -+ w = atoi(argv[1]); -+ (void) X11Grab_UpdatePos(root, x_origin, y_origin, w, height); -+ -+ return TCL_OK; -+} -+ -+/*ARGSUSED*/ -+static int -+X11Grab_SetHCmd(ClientData clientData, Tcl_Interp *interp, -+ int argc, char *argv[]) -+{ -+ int h; -+ -+ if (argc != 2) { -+ Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], -+ " height\"", NULL); -+ return TCL_ERROR; -+ } -+ -+ h = atoi(argv[1]); -+ (void) X11Grab_UpdatePos(root, x_origin, y_origin, width, h); -+ -+ return TCL_OK; -+} -+ -+/*ARGSUSED*/ -+static int -+X11Grab_SetRegionCmd(ClientData clientData, Tcl_Interp *interp, -+ int argc, char *argv[]) -+{ -+ unsigned int rootx, rooty; -+ int x, y, w, h, boxDrawn=0; -+ GC xorGC; -+ Cursor cursor; -+ XEvent event; -+ -+ cursor = XCreateFontCursor(dpy, XC_cross); -+ -+ if (XGrabPointer(dpy, root, False, ButtonPressMask, GrabModeAsync, -+ GrabModeAsync, root, cursor, CurrentTime)!=GrabSuccess) { -+ Tcl_AppendResult(interp, argv[0], ": can't grab mouse", NULL); -+ return TCL_ERROR; -+ } -+ -+ xorGC = XCreateGC(dpy, root, 0, NULL); -+ XSetSubwindowMode(dpy, xorGC, IncludeInferiors); -+ XSetForeground(dpy, xorGC, -1); -+ XSetFunction(dpy, xorGC, GXxor); -+ -+ XMaskEvent(dpy, ButtonPressMask, &event); -+ rootx = event.xbutton.x_root; -+ rooty = event.xbutton.y_root; -+ -+ XChangeActivePointerGrab(dpy, ButtonMotionMask|ButtonReleaseMask, cursor, -+ CurrentTime); -+ -+ while (1) { -+ XNextEvent(dpy, &event); -+ switch (event.type) { -+ case MotionNotify: -+ if (boxDrawn) { -+ XDrawRectangle(dpy, root, xorGC, x, y, w, h); -+ boxDrawn = 0; -+ } -+ while (XCheckTypedEvent(dpy, MotionNotify, &event)) ; -+ X11Grab_MakeBox(rootx, rooty, event.xbutton.x_root, -+ event.xbutton.y_root, &x, &y, &w, &h); -+ XDrawRectangle(dpy, root, xorGC, x, y, w, h); -+ boxDrawn = 1; -+ break; -+ case ButtonRelease: -+ if (boxDrawn) { -+ XDrawRectangle(dpy, root, xorGC, x, y, w, h); -+ boxDrawn = 0; -+ } -+ XFlush(dpy); -+ X11Grab_MakeBox(rootx, rooty, event.xmotion.x_root, -+ event.xmotion.y_root, &x, &y, &w, &h); -+ XUngrabPointer(dpy, CurrentTime); -+ XFreeGC(dpy, xorGC); -+ XFreeCursor(dpy, cursor); -+ (void) Tcl_Eval(interp, "set x11grabMode fixed"); -+ (void) X11Grab_UpdatePos(root, x, y, w, h); -+ return TCL_OK; -+ } -+ } -+} -+ -+/*ARGSUSED*/ -+static int X11Grab_SetWindowCmd(ClientData clientData, Tcl_Interp *interp, -+ int argc, char *argv[]) -+{ -+ int buttons=0; -+ Cursor cursor; -+ XEvent event; -+ -+ cursor = XCreateFontCursor(dpy, XC_crosshair); -+ target = None; -+ -+ if (XGrabPointer(dpy, vRoot, False, ButtonPressMask|ButtonReleaseMask, -+ GrabModeSync, GrabModeAsync, root, cursor, -+ CurrentTime) != GrabSuccess) { -+ Tcl_AppendResult(interp, argv[0], ": can't grab mouse", NULL); -+ return TCL_ERROR; -+ } -+ -+ while ((target == None) || (buttons != 0)) { -+ XAllowEvents(dpy, SyncPointer, CurrentTime); -+ XWindowEvent(dpy, vRoot, ButtonPressMask|ButtonReleaseMask, &event); -+ switch (event.type) { -+ case ButtonPress: -+ if (target == None) target = event.xbutton.subwindow; -+ buttons++; -+ break; -+ case ButtonRelease: -+ if (buttons > 0) buttons--; -+ break; -+ } -+ } -+ -+ XUngrabPointer(dpy, CurrentTime); -+ XFreeCursor(dpy, cursor); -+ -+ (void) Tcl_Eval(interp, -+ ".grabControls.x11grab.row1.mode.window config -state normal"); -+ (void) Tcl_Eval(interp, "set x11grabMode window"); -+ (void) X11Grab_FollowWindow(); -+ return TCL_OK; -+} -+ -+int -+X11Grab_Probe(Tk_Window tkMainWin) -+{ -+ Window rw; -+ interp = Tcl_CreateInterp(); -+ -+ if (tkMainWin == NULL) return 0; -+ -+ Tcl_TraceVar(interp, "x11grabMode", TCL_TRACE_WRITES, X11Grab_TraceMode, -+ NULL); -+ Tcl_CreateCommand(interp, "x11grabSetX", X11Grab_SetXCmd, 0, NULL); -+ Tcl_CreateCommand(interp, "x11grabSetY", X11Grab_SetYCmd, 0, NULL); -+ Tcl_CreateCommand(interp, "x11grabSetW", X11Grab_SetWCmd, 0, NULL); -+ Tcl_CreateCommand(interp, "x11grabSetH", X11Grab_SetHCmd, 0, NULL); -+ Tcl_CreateCommand(interp, "x11grabSetRegion", X11Grab_SetRegionCmd, 0, -+ NULL); -+ Tcl_CreateCommand(interp, "x11grabSetWindow", X11Grab_SetWindowCmd, 0, -+ NULL); -+ dpy = Tk_Display(tkMainWin); -+ rootwin = rw = RootWindow(dpy, Tk_ScreenNumber(tkMainWin)); -+ VidUtil_Init(dpy); -+ return X11Grab_Initialize(rw, width, height); -+} -+#endif /* UNUSED */ -+ -+} /* end extern "C" block */ -+ -+ -+int -+X11Device::command(int argc, const char*const* argv) -+{ -+ Tcl& tcl = Tcl::instance(); -+ -+ if ((argc == 3) && (strcmp(argv[1], "open") == 0)) { -+ TclObject* o = new X11Grabber(name_, argv[2]); -+ if (o != 0) -+ tcl.result(o->name()); -+ return (TCL_OK); -+ } -+ return (InputDevice::command(argc, argv)); -+} -+ -+X11Grabber::X11Grabber(const char* name, const char* format) -+{ -+ c_grab = grab_none ; /* XXX */ -+ theroot_ = None ; /* XXX */ -+ ximage_ = NULL ; -+ color = NULL ; -+ col2y_ = NULL ; -+ col2rgb16_ = NULL ; -+ -+ width_ = 320 ; -+ height_ = 240 ; -+ x_origin_ = y_origin_ = 0 ; /* XXX */ -+ -+ if (strcmp(format, "422") && strcmp(format, "cif")) { -+ fprintf(stderr, -+ "vic: x11Grabber: unsupported format: %s\n", -+ format); -+ abort(); -+ } -+ -+ Tk_Window tkMainWin = Tcl::instance().tkmain() ; -+ Window rw ; -+ -+ dpy_ = Tk_Display(tkMainWin); -+ rootwin_ = rw = RootWindow(dpy_, Tk_ScreenNumber(tkMainWin)); -+ -+ /* Initialize the RGB565 to YUV tables */ -+ int i, r, g, b, y, u, v; -+ -+ rgb2y_ = new uint8[65536] ; -+ rgb2u_ = new uint8[65536] ; -+ rgb2v_ = new uint8[65536] ; -+ -+ i = 0; -+ for (r=4; r<256; r+=8) { -+ for (g=3; g<256; g+=4) { /* XXX */ -+ for (b=4; b<256; b+=8) { -+ y = (38*r+75*g+15*b+64)/128; -+ u = 74*(b-y)/128; -+ if (u > 127) u = 127 ; -+ else if (u< -128) u = -128 ; -+ v = (93*(r-y)/128); -+ if (v > 127) v = 127 ; -+ else if (v< -128) v = -128 ; -+ rgb2y_[i] = y ; -+ rgb2u_[i] = u ^ 0x80 ; /* was u */ -+ rgb2v_[i] = v ^ 0x80 ; -+ i++; -+ } -+ } -+ } -+ -+ X11Grab_Initialize(rw, width_, height_); -+ -+ mode_ = X11GRAB_FIXED; /* XXX */ -+ decimate_ = 1; /* XXX */ -+ basewidth_ = PAL_WIDTH * 2; -+ baseheight_ = PAL_HEIGHT * 2; -+ -+} -+ -+X11Grabber::~X11Grabber() -+{ -+ if (ximage_ != NULL) -+ VidUtil_DestroyXImage(dpy_, ximage_); -+ free(rgb2y_); -+ free(rgb2u_); -+ free(rgb2v_); -+} -+ -+void -+X11Grabber::setsize() -+{ -+ int rows, columns; -+ -+ rows = (baseheight_ / decimate_) &~0xf; /* 0xf, ugh! */ -+ columns = (basewidth_ / decimate_) &~0xf; -+ -+ /* XXX set size of captured window ? */ -+ -+ set_size_422(columns, rows); /* was 422... */ -+ X11Grab_Initialize(rootwin_, columns, rows); /* XXX */ -+ -+ allocref(); /* allocate reference frame */ -+} -+ -+void -+X11Grabber::format() -+{ -+ -+ baseheight_ = CIF_HEIGHT * 2; -+ basewidth_ = CIF_WIDTH * 2; -+ -+ setsize(); -+} -+ -+ -+void -+X11Grabber::start() -+{ -+ format(); -+ /* XXX prepare for continuous capture */ -+ Grabber::start(); -+} -+ -+void -+X11Grabber::stop() -+{ -+ /* XXX stop capture */ -+ VidUtil_DestroyXImage(dpy_, ximage_); -+ ximage_ = NULL ; -+ Grabber::stop(); -+} -+ -+int -+X11Grabber::command(int argc, const char*const* argv) -+{ -+ if (argc >= 3) { -+ if (strcmp(argv[1], "decimate") == 0) { -+ int dec = atoi(argv[2]); -+ Tcl& tcl = Tcl::instance(); -+ if (dec <= 0) { -+ tcl.resultf("%s: divide by zero", argv[0]); -+ return (TCL_ERROR); -+ } -+ if (dec != decimate_) { -+ decimate_ = dec; -+ if(running_) { -+ stop(); -+ setsize(); -+ start(); -+ } -+ } -+ return (TCL_OK); -+ } else if (strcmp(argv[1], "fixed") == 0) { -+ mode_ = X11GRAB_FIXED; -+ -+ int x = atoi(argv[2]); -+ int y = atoi(argv[3]); -+ if (x >= 0 && *argv[2] != '-' && x + width_ <= root_width) -+ x_origin_ = x ; -+ else if ( x <= 0 && -x + width_ <= root_width ) -+ x_origin_ = root_width + x - width_ ; -+ if (y >= 0 && *argv[3] != '-' && y + height_ <= root_height) -+ y_origin_ = y ; -+ else if (y <= 0 && -y + height_ <= root_height ) -+ y_origin_ = root_height + y - height_ ; -+ fprintf(stderr, "x11 fixed %d %d (root %dx%d)\n", -+ x_origin_, y_origin_, root_width, root_height); -+ return (TCL_OK); -+ } else if (!strcmp(argv[2], "pointer")) { -+ mode_ = X11GRAB_POINTER; -+ return (TCL_OK); -+ } else if (!strcmp(argv[2], "window")) { -+ mode_ = X11GRAB_WINDOW; -+ return (TCL_OK); -+ } else if (strcmp(argv[1], "format") == 0 || -+ strcmp(argv[1], "type") == 0) { -+ if (running_) -+ format(); -+ return (TCL_OK); -+ } else if (strcmp(argv[1], "contrast") == 0) { -+ contrast(atof(argv[2])); -+ return (TCL_OK); -+ } -+ } else if (argc == 2) { -+ if (strcmp(argv[1], "format") == 0 || -+ strcmp(argv[1], "type") == 0) { -+ return (TCL_OK); -+ } -+ } -+ return (Grabber::command(argc, argv)); -+} -+ -+/* -+ * captures in CIF or 411 -- color info is half the luma info. -+ */ -+int -+X11Grabber::capture() -+{ -+ int dograb = 0 ; -+ -+#define MY_T uint8 -+ -+ -+ switch (mode_) { -+ case X11GRAB_FIXED: -+ dograb = 1; -+ break; -+#if 0 /* not yet... */ -+ case X11GRAB_POINTER: -+ dograb = X11Grab_FollowPointer(); -+ break; -+ case X11GRAB_WINDOW: -+ dograb = X11Grab_FollowWindow(); -+ break; -+#endif -+ } -+ -+ if (1 || dograb) { -+ XImage *image=ximage_->image; -+ -+#ifdef USE_SHM -+ if (ximage_->shminfo != NULL) -+ XShmGetImage(dpy_, theroot_, image, x_origin_, y_origin_,AllPlanes); -+ else -+#endif -+ XGetSubImage(dpy_, theroot_, x_origin_, y_origin_, -+ image->width, image->height, AllPlanes, -+ ZPixmap, image, 0, 0); -+ switch (c_grab) { -+ case grab_none: break; -+ case grab_X11Grab_LSBWhite1: X11Grab_LSBWhite1(); break; -+ case grab_X11Grab_MSBWhite1: X11Grab_MSBWhite1(); break; -+ case grab_X11Grab_LSBBlack1: X11Grab_LSBBlack1(); break; -+ case grab_X11Grab_MSBBlack1: X11Grab_MSBBlack1(); break; -+ case grab_X11Grab_Pseudo8: X11Grab_Pseudo8(); break; -+ case grab_X11Grab_RGB16: X11Grab_RGB16(); break; -+ case grab_X11Grab_TrueXBGR24: X11Grab_TrueXBGR24(); break; -+ case grab_X11Grab_TrueXRGB24: X11Grab_TrueXRGB24(); break; -+ } -+ return 1 ; -+ } else -+ return 0; -+} -+ -+int X11Grabber::grab() -+{ -+ if (capture() == 0) -+ return (0); -+ suppress(frame_); -+ saveblks(frame_); -+ YuvFrame f(media_ts(), frame_, crvec_, outw_, outh_); -+ return (target_->consume(&f)); -+} -+ -+extern "C" { -+ -+#include <sys/ipc.h> -+#ifdef USE_SHM -+#include <sys/shm.h> -+#if defined(sun) && !defined(__svr4__) -+int shmget(key_t, int, int); -+char *shmat(int, char*, int); -+int shmdt(char*); -+int shmctl(int, int, struct shmid_ds*); -+#endif -+#ifdef __osf__ -+int XShmGetEventBase(struct _XDisplay *); -+#else -+int XShmGetEventBase(Display *); -+#endif -+#ifdef sgi -+#define XShmAttach __XShmAttach__ -+#define XShmDetach __XShmDetach__ -+#define XShmPutImage __XShmPutImage__ -+#endif -+#include <X11/extensions/XShm.h> -+#ifdef sgi -+#undef XShmAttach -+#undef XShmDetach -+#undef XShmPutImage -+int XShmAttach(Display*, XShmSegmentInfo*); -+int XShmDetach(Display*, XShmSegmentInfo*); -+int XShmPutImage(Display*, Drawable, GC, XImage*, int, int, int, int, -+ int, int, int); -+#endif -+#endif -+ -+ -+/*ARGSUSED*/ -+static int -+ErrHandler(ClientData clientData, XErrorEvent *errevp) -+{ -+ return 0; -+} -+ -+ximage_t * -+VidUtil_AllocXImage(Display *dpy, Visual *vis, int depth, int width, -+ int height, int readonly) -+{ -+ ximage_t *ximage; -+ int ximage_size; -+ Tk_ErrorHandler handler; -+ -+ ximage = (ximage_t *) malloc(sizeof(ximage_t)); -+ if (ximage == NULL) -+ return NULL; -+ -+#ifdef USE_SHM -+ if (1) { -+ XShmSegmentInfo *shminfo; -+ -+ ximage->shminfo = shminfo = -+ (XShmSegmentInfo *) malloc(sizeof(XShmSegmentInfo)); -+ -+ ximage->image = XShmCreateImage(dpy, vis, depth, ZPixmap, 0, shminfo, -+ width, height); -+ ximage_size = ximage->image->bytes_per_line * ximage->image->height; -+ -+ shminfo->shmid = shmget(IPC_PRIVATE, ximage_size, IPC_CREAT|0777); -+ if (shminfo->shmid != -1) { -+ shminfo->shmaddr = ximage->image->data = -+ (char *) shmat(shminfo->shmid, 0, 0); -+ shminfo->readOnly = readonly; -+ -+ handler = Tk_CreateErrorHandler(dpy, -1, -1, -1, ErrHandler, NULL); -+ XShmAttach(dpy, shminfo); -+ XSync(dpy, False); -+ shmctl(shminfo->shmid, IPC_RMID, 0); /* so it goes away on exit */ -+ Tk_DeleteErrorHandler(handler); -+ if (0) { /* so it goes away on exit... */ -+ shmdt(shminfo->shmaddr); -+ shmctl(shminfo->shmid, IPC_RMID, 0); -+ XDestroyImage(ximage->image); -+ free(shminfo); -+ } -+ return ximage; -+ } else { -+ XDestroyImage(ximage->image); -+ free(shminfo); -+ ximage->shminfo = NULL ; -+ /* XXX hmmm... something more ? */ -+ } -+ } -+#endif -+ { -+ ximage->image = XCreateImage(dpy, vis, depth, ZPixmap, 0, NULL, width, -+ height, (depth == 24) ? 32 : depth, 0); -+ ximage_size = ximage->image->bytes_per_line * ximage->image->height; -+ ximage->image->data = (char *) malloc(ximage_size); -+ -+ ximage->shminfo = NULL; -+ } -+ -+ return ximage; -+} -+ -+void -+VidUtil_DestroyXImage(Display *dpy, ximage_t *ximage) -+{ -+#ifdef USE_SHM -+ if (ximage->shminfo != NULL) { -+ XShmSegmentInfo *shminfo=(XShmSegmentInfo *)ximage->shminfo; -+ -+ XShmDetach(dpy, shminfo); -+ shmdt(shminfo->shmaddr); -+ shmctl(shminfo->shmid, IPC_RMID, 0); -+ free(shminfo); -+ } -+ ximage->shminfo = NULL ; -+#endif -+ -+ XDestroyImage(ximage->image); -+ free(ximage); -+} -+ -+ -+} /* end extern "C" block */ diff --git a/multimedia/vic/pkg-comment b/multimedia/vic/pkg-comment deleted file mode 100644 index d02447964f50..000000000000 --- a/multimedia/vic/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -MBONE video tool diff --git a/multimedia/vic/pkg-descr b/multimedia/vic/pkg-descr deleted file mode 100644 index 457adff21faf..000000000000 --- a/multimedia/vic/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This package contains the binary release of LBL's `vic' network video -conferencing tool. - -NOTE: This kit requires XFree86 3.1, Tk, and Tcl shared libraries. diff --git a/multimedia/vic/pkg-plist b/multimedia/vic/pkg-plist deleted file mode 100644 index 3ae0decf49cb..000000000000 --- a/multimedia/vic/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/vic -bin/histtolut diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile deleted file mode 100644 index cc5b539d81ef..000000000000 --- a/multimedia/xanim/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# New ports collection makefile for: xanim -# Version required: 2.80.1 -# Date created: Sat Nov 5 11:43:03 PST 1994 -# Whom: piero -# -# $FreeBSD$ -# - -DISTNAME= xanim2801 -PKGNAME= xanim-2.80.1 -CATEGORIES= graphics -MASTER_SITES= ftp://xanim.va.pubnix.com/ \ - ftp://xanim.va.pubnix.com/dlls/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${EXTRA_FILES} - -MAINTAINER= ports@FreeBSD.org - -EXTRA_FILES= vid_cvid_2.1_freebsdELFx86.tgz \ - vid_cyuv_1.0_freebsdELFx86.tgz \ - vid_h261_1.0_freebsdELFx86.tgz \ - vid_h263_1.0_freebsdELFx86.tgz \ - vid_iv32_2.1_freebsdELFx86.tgz \ - vid_iv41_1.1_freebsdELFx86.tgz \ - vid_iv50_1.0_freebsdELFx86.tgz -USE_IMAKE= yes -MAN1= xanim.1 - -DLLDIR= ${PREFIX}/lib/X11/xanim - -post-extract: - ${CP} ${WRKSRC}/docs/xanim.man ${WRKSRC} - -post-install: - @${MKDIR} ${DLLDIR} - ${INSTALL_DATA} ${WRKDIR}/*.readme ${DLLDIR} - ${INSTALL_DATA} ${WRKDIR}/*.xa ${DLLDIR} - -.include <bsd.port.mk> diff --git a/multimedia/xanim/distinfo b/multimedia/xanim/distinfo deleted file mode 100644 index c738feb85dd1..000000000000 --- a/multimedia/xanim/distinfo +++ /dev/null @@ -1,8 +0,0 @@ -MD5 (xanim2801.tar.gz) = e2ecd086c160f18dd7cc3cac438758c2 -MD5 (vid_cvid_2.1_freebsdELFx86.tgz) = 964ac87b45c85c97d4c86a5f98fbbf71 -MD5 (vid_cyuv_1.0_freebsdELFx86.tgz) = ccdf14f08c9e989f18e25eb06a5053b7 -MD5 (vid_h261_1.0_freebsdELFx86.tgz) = 7b5ee2ea93e365fd12efcb29321720bd -MD5 (vid_h263_1.0_freebsdELFx86.tgz) = 8c9b389944ee853b7b3469bde714729b -MD5 (vid_iv32_2.1_freebsdELFx86.tgz) = 04ae2a4e86f28927e9d4adc1bf143861 -MD5 (vid_iv41_1.1_freebsdELFx86.tgz) = f2b3f2bc8e6763581a2c8aceba632930 -MD5 (vid_iv50_1.0_freebsdELFx86.tgz) = 47b8ec7a998386807b564666c6b0ea34 diff --git a/multimedia/xanim/files/patch-ab b/multimedia/xanim/files/patch-ab deleted file mode 100644 index 48a6abd19637..000000000000 --- a/multimedia/xanim/files/patch-ab +++ /dev/null @@ -1,68 +0,0 @@ ---- Imakefile.orig Sun Mar 21 16:36:26 1999 -+++ Imakefile Sat Jun 19 19:23:26 1999 -@@ -116,12 +116,12 @@ - XCOMM XA_DLL_DEF = -DXA_DLL - XCOMM - XCOMM ### You may need this library. --XA_DLL_LIB = -ldl -+XCOMM XA_DLL_LIB = -ldl - 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 = $(LIBDIR)/xanim - - - -@@ -190,7 +190,7 @@ - XCOMM XA_CVID_DEF = -DXA_CVID - XCOMM XA_CYUV_DEF = -DXA_CYUV - XCOMM --XCOMM XA_IV32_LIB = mods/xa2.1_iv32_linuxELF.o -+XCOMM XA_IV32_LIB = mods/xa2.0_iv32_linuxELF.o - XCOMM XA_CVID_LIB = mods/xa2.0_cvid_linuxELF.o - XCOMM XA_CYUV_LIB = mods/xa1.0_cyuv_linuxELF.o - XCOMM -@@ -267,8 +267,8 @@ - XCOMM XA_AUDIO_DEFS = - XCOMM - XCOMM ## -- Linux PCs --------------------------------------------------------- --XA_AUDIO_DEFS = -DXA_LINUX_AUDIO --XA_AUDIO_LIBS = -lc -+XCOMM XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -+XCOMM XA_AUDIO_LIBS = -lc - XCOMM - XCOMM -- Linux PC's with OLD Rev sound drivers ------------------------------- - XCOMM XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_OLDER_SND -@@ -314,8 +314,10 @@ - XCOMM XA_AUDIO_LIBS = -lc - XCOMM - XCOMM -- Also FreeBSD, and BSDI with SBlast-BSD-1.5 (development stages)------ --XCOMM XA_AUDIO_DEFS = -DXA_LINUX_AUDIO --XCOMM XA_AUDIO_LIBS = -lc -+#ifdef i386Architecture -+XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -+XA_AUDIO_LIBS = -lc -+#endif - XCOMM - XCOMM -- TOWNS Linux 16 bit PCM ---------------------------------------------- - XCOMM XA_AUDIO_DEFS = -DXA_TOWNS_AUDIO -@@ -442,7 +444,7 @@ - XCOMM -- following symbols(XmbufDisplayBuffers, XmbufQueryExtension, - XCOMM -- XmbufCreateBuffers). - XCOMM -- NOTE_8: HP-UX machines need to comment this out. --XCOMM XA_MULTIBUF = -DXMBUF -+XA_MULTIBUF = -DXMBUF - XCOMM - XCOMM ########### - XCOMM -@@ -465,7 +467,7 @@ - - PROGRAMS = $(XANIM) - --INCLUDES = -I$(INCDIR) $(XA_INCS) -+INCLUDES = -I$(INCDIR)/X11 $(XA_INCS) - - LIBS1 = $(XA_LIBS) $(EXTENSIONLIB) $(XTOOLLIB) $(XLIB) -lm - DEPLIBS1 = $(DEPEXTENSIONLIB) $(DEPXTOOLLIB) $(DEPXLIB) diff --git a/multimedia/xanim/pkg-comment b/multimedia/xanim/pkg-comment deleted file mode 100644 index 87aeb554eb0e..000000000000 --- a/multimedia/xanim/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -Play most popular animation formats and show pictures diff --git a/multimedia/xanim/pkg-descr b/multimedia/xanim/pkg-descr deleted file mode 100644 index 5af9fc67aa40..000000000000 --- a/multimedia/xanim/pkg-descr +++ /dev/null @@ -1,47 +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. The following features are sup- - ported: - -> Compressions 3,5,7,J(movies) and l(small - L). - -> Color cycling during single images and - anims. - -> Display Modes: depth 1-8, EHB, HAM and - HAM8. - + GIF87a and GIF89a files. - -> single and multiple images supported. - -> GIF89a animation extensions supported. - + 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 PFX(PageFlipper Plus F/X) animations. TEMP - DISABLED - + Amiga MovieSetter animations(For those Eric - Schwartz fans). - + Utah Raster Toolkit RLE images and anims. - + AVI animations. Currently supported are - -> IBM Ultimotion (ULTI) depth 16. - -> JPEG (JPEG) depth 24. - images. - + MPEG animations. Currently only Type I Frames - are displayed. Type B and Type P frames are cur- - rently ignored, but will be added in future - revs. - + 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. - -XAnim also provides various options that allow the user to -alter colormaps, playback speeds, looping modes and can -provide on-the-fly scaling of animations with the mouse. - -WWW: http://xanim.va.pubnix.com/home.html diff --git a/multimedia/xanim/pkg-plist b/multimedia/xanim/pkg-plist deleted file mode 100644 index cf26d8c7ab7e..000000000000 --- a/multimedia/xanim/pkg-plist +++ /dev/null @@ -1,16 +0,0 @@ -bin/xanim -lib/X11/xanim/cvid.readme -lib/X11/xanim/cyuv.readme -lib/X11/xanim/h261.readme -lib/X11/xanim/h263.readme -lib/X11/xanim/iv32.readme -lib/X11/xanim/iv41.readme -lib/X11/xanim/iv50.readme -lib/X11/xanim/vid_cvid_2.1_freebsdELFx86.xa -lib/X11/xanim/vid_cyuv_1.0_freebsdELFx86.xa -lib/X11/xanim/vid_h261_1.0_freebsdELFx86.xa -lib/X11/xanim/vid_h263_1.0_freebsdELFx86.xa -lib/X11/xanim/vid_iv32_2.1_freebsdELFx86.xa -lib/X11/xanim/vid_iv41_1.1_freebsdELFx86.xa -lib/X11/xanim/vid_iv50_1.0_freebsdELFx86.xa -@dirrm lib/X11/xanim diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile deleted file mode 100644 index 684d77698df2..000000000000 --- a/multimedia/xmms/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# New ports collection makefile for: xmms -# Version required: 0.9.1 -# Date created: 3 July 1999 -# Whom: Espen Skoglund <espensk@stud.cs.uit.no> -# -# $FreeBSD$ -# - -DISTNAME= xmms-0.9.1 -CATEGORIES= audio -MASTER_SITES= ftp://ftp.xmms.org/xmms/0.9/ - -MAINTAINER= espensk@stud.cs.uit.no - -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - glib12.2:${PORTSDIR}/devel/glib12 - -USE_LIBTOOL= yes -CONFIGURE_ENV= GTK_CONFIG=${X11BASE}/bin/gtk12-config \ - GLIB_CONFIG=${LOCALBASE}/bin/glib12-config - -.include <bsd.port.mk> diff --git a/multimedia/xmms/distinfo b/multimedia/xmms/distinfo deleted file mode 100644 index 7ea4683dea8d..000000000000 --- a/multimedia/xmms/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (xmms-0.9.1.tar.gz) = 57a3ff0102ece7583c4ed2af876404fb diff --git a/multimedia/xmms/files/patch-ab b/multimedia/xmms/files/patch-ab deleted file mode 100644 index 50f43a52a8ab..000000000000 --- a/multimedia/xmms/files/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -*** configure.orig Sat Jul 3 19:47:22 1999 ---- configure Sat Jul 3 19:46:47 1999 -*************** -*** 637,642 **** ---- 637,643 ---- - fi - fi - echo "$ac_t""$INSTALL" 1>&6 -+ ac_cv_path_install="$INSTALL" - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. diff --git a/multimedia/xmms/pkg-comment b/multimedia/xmms/pkg-comment deleted file mode 100644 index 3ba3e0d407c6..000000000000 --- a/multimedia/xmms/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -X Multimedia System --- An audio player with a Winamp GUI diff --git a/multimedia/xmms/pkg-descr b/multimedia/xmms/pkg-descr deleted file mode 100644 index 60b5491e9d7b..000000000000 --- a/multimedia/xmms/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -XMMS --- X Multimedia System. XMMS is a multimedia player based on -the look of Winamp. Currently it plays mpeg layer 1/2/3, wav, au, and -all formats supported by libmikmod. It also plays CD audio. - -WWW: http://www.xmms.org/ - - eSk diff --git a/multimedia/xmms/pkg-plist b/multimedia/xmms/pkg-plist deleted file mode 100644 index 008e7f76f354..000000000000 --- a/multimedia/xmms/pkg-plist +++ /dev/null @@ -1,30 +0,0 @@ -bin/wmxmms -bin/xmms -include/xmms/configfile.h -include/xmms/dirbrowser.h -include/xmms/plugin.h -include/xmms/xmmsctrl.h -lib/libxmms.a -lib/libxmms.la -lib/libxmms.so.9 -@exec ln -fs %D/%F %B/libxmms.so -@unexec rm -f %B/libxmms.so -lib/xmms/Effect/libecho.so -lib/xmms/Effect/libsrndecho.so -lib/xmms/Effect/libstereo.so -lib/xmms/Effect/libvoice.so -lib/xmms/General/libir.so -lib/xmms/General/libsong_change.so -lib/xmms/Input/libcdaudio.so -lib/xmms/Input/libmpg123.so -lib/xmms/Input/libwav.so -lib/xmms/Output/libOSS.so -lib/xmms/Output/libdisk_writer.so -share/xmms/wmxmms.xpm -@dirrm include/xmms -@dirrm lib/xmms/Effect -@dirrm lib/xmms/General -@dirrm lib/xmms/Input -@dirrm lib/xmms/Output -@dirrm lib/xmms -@dirrm share/xmms |