From e09ecc273809b13398a5c5130db1acf73b53f34d Mon Sep 17 00:00:00 2001 From: jmmv Date: Mon, 26 Jan 2004 12:45:50 +0000 Subject: mjpegtools moved to the multimedia category. --- graphics/mjpegtools/DESCR | 2 - graphics/mjpegtools/Makefile | 38 --------- graphics/mjpegtools/PLIST | 145 ----------------------------------- graphics/mjpegtools/buildlink2.mk | 35 --------- graphics/mjpegtools/distinfo | 7 -- graphics/mjpegtools/patches/patch-aa | 12 --- graphics/mjpegtools/patches/patch-ab | 13 ---- graphics/mjpegtools/patches/patch-ac | 24 ------ 8 files changed, 276 deletions(-) delete mode 100644 graphics/mjpegtools/DESCR delete mode 100644 graphics/mjpegtools/Makefile delete mode 100644 graphics/mjpegtools/PLIST delete mode 100644 graphics/mjpegtools/buildlink2.mk delete mode 100644 graphics/mjpegtools/distinfo delete mode 100644 graphics/mjpegtools/patches/patch-aa delete mode 100644 graphics/mjpegtools/patches/patch-ab delete mode 100644 graphics/mjpegtools/patches/patch-ac (limited to 'graphics') diff --git a/graphics/mjpegtools/DESCR b/graphics/mjpegtools/DESCR deleted file mode 100644 index e070ebc501e..00000000000 --- a/graphics/mjpegtools/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -Programs for MJPEG recording and playback and simple cut-and-paste -editting and MPEG compression of audio and video. diff --git a/graphics/mjpegtools/Makefile b/graphics/mjpegtools/Makefile deleted file mode 100644 index 0ca02ba90ea..00000000000 --- a/graphics/mjpegtools/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# $NetBSD: Makefile,v 1.14 2004/01/24 15:46:44 grant Exp $ - -DISTNAME= mjpegtools-1.6.1.93 -CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mjpeg/} - -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://mjpeg.sourceforge.net/ -COMMENT= Programs for compressing video streams - -DEPENDS+= toolame>=02l:../../audio/toolame -BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm - -USE_BUILDLINK2= yes -USE_GNU_TOOLS+= make - -USE_LIBTOOL= yes -SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool -PKGCONFIG_OVERRIDE= mjpegtools.pc.in - -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-large-file -CONFIGURE_ARGS+= --with-lame-includes=${BUILDLINK_PREFIX.lame} -# XXX fix me -CONFIGURE_ARGS+= --without-avifile - -.include "../../audio/lame/buildlink2.mk" -.include "../../devel/SDL/buildlink2.mk" -#.include "../../graphics/avifile/buildlink2.mk" -.include "../../graphics/ImageMagick/buildlink2.mk" -.include "../../graphics/jpeg/buildlink2.mk" -# GTK+ support is disabled to avoid a dependancy on GTK+ when building GNOME2. -# This only disables the "glav" program. If you really need it, please add an -# external package for it. -#.include "../../x11/gtk/buildlink2.mk" -.include "../../mk/ossaudio.buildlink2.mk" -.include "../../mk/pthread.buildlink2.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/graphics/mjpegtools/PLIST b/graphics/mjpegtools/PLIST deleted file mode 100644 index 4b0974149ec..00000000000 --- a/graphics/mjpegtools/PLIST +++ /dev/null @@ -1,145 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2004/01/24 10:54:08 jmmv Exp $ -bin/jpeg2yuv -bin/lav2avi.sh -bin/lav2mpeg -bin/lav2wav -bin/lav2yuv -bin/lavaddwav -bin/lavinfo -bin/lavpipe -bin/lavplay -bin/lavtrans -bin/matteblend.flt -bin/mjpegtools-config -bin/mp2enc -bin/mpeg2enc -bin/mpegtranscode -bin/mplex -bin/multiblend.flt -bin/pgmtoy4m -bin/png2yuv -bin/ppmtoy4m -bin/transist.flt -bin/y4mblack -bin/y4mcolorbars -bin/y4mshift -bin/y4mtoppm -bin/y4mtoyuv -bin/ypipe -bin/yuv2lav -bin/yuv4mpeg -bin/yuvcorrect -bin/yuvcorrect_tune -bin/yuvdenoise -bin/yuvfps -bin/yuvinactive -bin/yuvkineco -bin/yuvmedianfilter -bin/yuvplay -bin/yuvscaler -bin/yuvycsnoise -include/mjpegtools/audiolib.h -include/mjpegtools/avilib.h -include/mjpegtools/editlist.h -include/mjpegtools/format_codes.h -include/mjpegtools/frequencies.h -include/mjpegtools/jpegutils.h -include/mjpegtools/lav_io.h -include/mjpegtools/liblavplay.h -include/mjpegtools/liblavrec.h -include/mjpegtools/mjpeg_logging.h -include/mjpegtools/mjpeg_types.h -include/mjpegtools/mpeg2enc/elemstrmwriter.hh -include/mjpegtools/mpeg2enc/encoderparams.hh -include/mjpegtools/mpeg2enc/macroblock.hh -include/mjpegtools/mpeg2enc/mpeg2coder.hh -include/mjpegtools/mpeg2enc/mpeg2encoder.hh -include/mjpegtools/mpeg2enc/mpeg2encoptions.hh -include/mjpegtools/mpeg2enc/mpeg2encparams.h -include/mjpegtools/mpeg2enc/picture.hh -include/mjpegtools/mpeg2enc/picturereader.hh -include/mjpegtools/mpeg2enc/predict_ref.h -include/mjpegtools/mpeg2enc/quantize.hh -include/mjpegtools/mpeg2enc/quantize_ref.h -include/mjpegtools/mpeg2enc/ratectl.hh -include/mjpegtools/mpeg2enc/seqencoder.hh -include/mjpegtools/mpeg2enc/synchrolib.h -include/mjpegtools/mpeg2enc/syntaxconsts.h -include/mjpegtools/mpegconsts.h -include/mjpegtools/mpegtimecode.h -include/mjpegtools/mplex/audiostrm.hpp -include/mjpegtools/mplex/aunit.hpp -include/mjpegtools/mplex/bits.hpp -include/mjpegtools/mplex/buffer.hpp -include/mjpegtools/mplex/inputstrm.hpp -include/mjpegtools/mplex/interact.hpp -include/mjpegtools/mplex/mplexconsts.hpp -include/mjpegtools/mplex/multiplexor.hpp -include/mjpegtools/mplex/outputstrm.hpp -include/mjpegtools/mplex/padstrm.hpp -include/mjpegtools/mplex/stillsstream.hpp -include/mjpegtools/mplex/stream_params.hpp -include/mjpegtools/mplex/systems.hpp -include/mjpegtools/mplex/vector.hpp -include/mjpegtools/mplex/videostrm.hpp -include/mjpegtools/yuv4mpeg.h -info/mjpeg-howto.info -info/mjpeg-howto.info-1 -info/mjpeg-howto.info-2 -info/mjpeg-howto.info-3 -lib/liblavfile-1.6.so -lib/liblavfile-1.6.so.1 -lib/liblavfile-1.6.so.1.1 -lib/liblavfile.la -lib/liblavfile.so -lib/liblavjpeg-1.6.so -lib/liblavjpeg-1.6.so.1 -lib/liblavjpeg-1.6.so.1.1 -lib/liblavjpeg.la -lib/liblavjpeg.so -lib/liblavplay-1.6.so -lib/liblavplay-1.6.so.1 -lib/liblavplay-1.6.so.1.1 -lib/liblavplay.la -lib/liblavplay.so -lib/libmjpegutils.a -lib/libmpeg2encpp-1.6.so -lib/libmpeg2encpp-1.6.so.1 -lib/libmpeg2encpp-1.6.so.1.1 -lib/libmpeg2encpp.la -lib/libmpeg2encpp.so -lib/libmplex2-1.6.so -lib/libmplex2-1.6.so.1 -lib/libmplex2-1.6.so.1.1 -lib/libmplex2.la -lib/libmplex2.so -lib/pkgconfig/mjpegtools.pc -man/man1/jpeg2yuv.1 -man/man1/lav2mpeg.1 -man/man1/lav2wav.1 -man/man1/lav2yuv.1 -man/man1/lavpipe.1 -man/man1/lavplay.1 -man/man1/lavrec.1 -man/man1/lavtrans.1 -man/man1/mjpegtools.1 -man/man1/mp2enc.1 -man/man1/mpeg2enc.1 -man/man1/mplex.1 -man/man1/pgmtoy4m.1 -man/man1/ppmtoy4m.1 -man/man1/y4mcolorbars.1 -man/man1/y4mtoppm.1 -man/man1/yuv2lav.1 -man/man1/yuvdenoise.1 -man/man1/yuvfps.1 -man/man1/yuvinactive.1 -man/man1/yuvkineco.1 -man/man1/yuvmedianfilter.1 -man/man1/yuvplay.1 -man/man1/yuvscaler.1 -man/man1/yuvycsnoise.1 -man/man5/yuv4mpeg.5 -@dirrm include/mjpegtools/mplex -@dirrm include/mjpegtools/mpeg2enc -@dirrm include/mjpegtools diff --git a/graphics/mjpegtools/buildlink2.mk b/graphics/mjpegtools/buildlink2.mk deleted file mode 100644 index 5ff53403e20..00000000000 --- a/graphics/mjpegtools/buildlink2.mk +++ /dev/null @@ -1,35 +0,0 @@ -# $NetBSD: buildlink2.mk,v 1.5 2004/01/24 10:54:08 jmmv Exp $ -# -# This Makefile fragment is included by packages that use mjpegtools. -# -# This file was created automatically using createbuildlink 2.6. -# - -.if !defined(MJPEGTOOLS_BUILDLINK2_MK) -MJPEGTOOLS_BUILDLINK2_MK= # defined - -BUILDLINK_PACKAGES+= mjpegtools -BUILDLINK_DEPENDS.mjpegtools?= mjpegtools>=1.6.1.90nb3 -BUILDLINK_PKGSRCDIR.mjpegtools?= ../../graphics/mjpegtools - -EVAL_PREFIX+= BUILDLINK_PREFIX.mjpegtools=mjpegtools -BUILDLINK_PREFIX.mjpegtools_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.mjpegtools+= include/mjpegtools/* -BUILDLINK_FILES.mjpegtools+= include/mjpegtools/mpeg2enc/* -BUILDLINK_FILES.mjpegtools+= include/mjpegtools/mplex/* -BUILDLINK_FILES.mjpegtools+= lib/liblavfile-1.6.* -BUILDLINK_FILES.mjpegtools+= lib/liblavfile.* -BUILDLINK_FILES.mjpegtools+= lib/liblavjpeg-1.6.* -BUILDLINK_FILES.mjpegtools+= lib/liblavjpeg.* -BUILDLINK_FILES.mjpegtools+= lib/liblavplay-1.6.* -BUILDLINK_FILES.mjpegtools+= lib/liblavplay.* -BUILDLINK_FILES.mjpegtools+= lib/libmjpegutils.* -BUILDLINK_FILES.mjpegtools+= lib/pkgconfig/mjpegtools.pc - -.include "../../graphics/jpeg/buildlink2.mk" - -BUILDLINK_TARGETS+= mjpegtools-buildlink - -mjpegtools-buildlink: _BUILDLINK_USE - -.endif # MJPEGTOOLS_BUILDLINK2_MK diff --git a/graphics/mjpegtools/distinfo b/graphics/mjpegtools/distinfo deleted file mode 100644 index 3ea9ea1691a..00000000000 --- a/graphics/mjpegtools/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.7 2004/01/25 14:50:34 tron Exp $ - -SHA1 (mjpegtools-1.6.1.93.tar.gz) = f8d327c43139a5b21a64aa265b9e6511683e76f2 -Size (mjpegtools-1.6.1.93.tar.gz) = 1253561 bytes -SHA1 (patch-aa) = b47aaacdbe02a3254c1ff58213448d63b39e5a34 -SHA1 (patch-ab) = 392bc09ca0142fb1e435b219e598a70ae4bf258f -SHA1 (patch-ac) = 0297beecec5947ae153b60a43891c9d373255af5 diff --git a/graphics/mjpegtools/patches/patch-aa b/graphics/mjpegtools/patches/patch-aa deleted file mode 100644 index 01632112a01..00000000000 --- a/graphics/mjpegtools/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2004/01/24 10:54:45 jmmv Exp $ - ---- mplex/Makefile.in.orig 2004-01-16 12:22:11.000000000 +0100 -+++ mplex/Makefile.in -@@ -276,6 +276,7 @@ mplex_SOURCES = main.cpp - - mplex_LDADD = \ - $(top_builddir)/mplex/libmplex2.la \ -+ $(top_builddir)/utils/libmjpegutils.a \ - @LIBGETOPT_LIB@ $(LIBM_LIBS) - - subdir = mplex diff --git a/graphics/mjpegtools/patches/patch-ab b/graphics/mjpegtools/patches/patch-ab deleted file mode 100644 index 65c441f7f6a..00000000000 --- a/graphics/mjpegtools/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2004/01/24 10:54:08 jmmv Exp $ - ---- lavtools/Makefile.in.orig 2004-01-16 12:22:10.000000000 +0100 -+++ lavtools/Makefile.in -@@ -340,7 +340,7 @@ multiblend_flt_LDADD = $(top_builddir)/u - lavplay_SOURCES = lavplay.c - lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.a \ - liblavplay.la liblavjpeg.la liblavfile.la \ -- @LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} $(LAVPLAY_X_LIBS) -+ @LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} $(LAVPLAY_X_LIBS) $(LIBOSSAUDIO) - - - lavrec_SOURCES = lavrec.c diff --git a/graphics/mjpegtools/patches/patch-ac b/graphics/mjpegtools/patches/patch-ac deleted file mode 100644 index d8d023e1728..00000000000 --- a/graphics/mjpegtools/patches/patch-ac +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2004/01/25 14:50:34 tron Exp $ - ---- lavtools/audiolib.c.orig Mon Dec 8 13:28:32 2003 -+++ lavtools/audiolib.c Sun Jan 25 15:47:33 2004 -@@ -665,7 +665,9 @@ - const char *audio_dev_name; - - #ifndef FORK_NOT_THREAD -+#if !defined(__NetBSD__) || __NetBSD_Version__ >= 106130000 /* 1.6M */ - struct sched_param schedparam; -+#endif - sigset_t blocked_signals; - - /* Set the capture thread in a reasonable state - cancellation enabled -@@ -862,7 +864,8 @@ - memset(buf+nbset*info.fragsize,0,info.fragsize); - } - --#ifndef FORK_NOT_THREAD -+#if !defined(FORK_NOT_THREAD) && \ -+ (!defined(__NetBSD__) || __NetBSD_Version__ >= 106130000) /* 1.6M */ - /* Now we're ready to go move to Real-time scheduling... */ - schedparam.sched_priority = 1; - -- cgit v1.2.3