head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.36 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.34 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.32 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.30 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.28 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.26 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.24 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.22 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.20 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.18 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.16 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.14 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.12 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.10 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.8 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.6 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.4 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.2 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.2.0.14 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.12 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.10 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.8 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2; locks; strict; comment @# @; 1.3 date 2006.01.25.08.09.12; author xtraeme; state dead; branches; next 1.2; 1.2 date 2004.05.07.12.06.47; author cjep; state Exp; branches; next 1.1; 1.1 date 2004.04.17.05.50.50; author sekiya; state Exp; branches; next ; desc @@ 1.3 log @Update mjpegtools/mplex to 1.8.0. Some changes: * Modularised input handling for MPEG compression tools. * movtar read/write support * MJPEG playback in software, and experimental MJPEG hardware overlay playback (see mjpeg/) * mpeg2enc _much_ improved! @ text @$NetBSD: patch-ah,v 1.2 2004/05/07 12:06:47 cjep Exp $ --- ./lavtools/Makefile.am.orig 2004-01-02 04:59:55.000000000 +0900 +++ ./lavtools/Makefile.am 2004-04-17 10:57:01.000000000 +0900 @@@@ -133,113 +133,113 @@@@ yuvcorrect.h ypipe_SOURCES = ypipe.c -ypipe_LDADD = $(top_builddir)/utils/libmjpegutils.a +ypipe_LDADD = $(top_builddir)/utils/libmjpegutils.la yuv2lav_SOURCES = yuv2lav.c -yuv2lav_LDADD = $(top_builddir)/utils/libmjpegutils.a \ +yuv2lav_LDADD = $(top_builddir)/utils/libmjpegutils.la \ liblavfile.la liblavjpeg.la ${LIBM_LIBS} transist_flt_SOURCES = transist.flt.c -transist_flt_LDADD = $(top_builddir)/utils/libmjpegutils.a +transist_flt_LDADD = $(top_builddir)/utils/libmjpegutils.la matteblend_flt_SOURCES = matteblend.flt.c -matteblend_flt_LDADD = $(top_builddir)/utils/libmjpegutils.a +matteblend_flt_LDADD = $(top_builddir)/utils/libmjpegutils.la multiblend_flt_SOURCES = multiblend.flt.c -multiblend_flt_LDADD = $(top_builddir)/utils/libmjpegutils.a +multiblend_flt_LDADD = $(top_builddir)/utils/libmjpegutils.la if HAVE_X LAVPLAY_X_LIBS = $(X_LIBS) -lX11 endif lavplay_SOURCES = lavplay.c -lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.a \ +lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.la \ liblavplay.la liblavjpeg.la liblavfile.la \ @@LIBGETOPT_LIB@@ ${PTHREAD_LIBS} ${SDL_LIBS} $(LAVPLAY_X_LIBS) lavrec_SOURCES = lavrec.c -lavrec_LDADD = $(top_builddir)/utils/libmjpegutils.a \ +lavrec_LDADD = $(top_builddir)/utils/libmjpegutils.la \ liblavrec.la liblavfile.la liblavjpeg.la \ @@LIBGETOPT_LIB@@ $(PTHREAD_LIBS) testrec_SOURCES = testrec.c audiolib.c -testrec_LDADD = $(PTHREAD_LIBS) $(top_builddir)/utils/libmjpegutils.a +testrec_LDADD = $(PTHREAD_LIBS) $(top_builddir)/utils/libmjpegutils.la lav2yuv_SOURCES = lav2yuv.c lav_common.c -lav2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.a \ +lav2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.la \ liblavfile.la liblavjpeg.la $(DV_LIBS) jpeg2yuv_SOURCES = jpeg2yuv.c -jpeg2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.a liblavjpeg.la +jpeg2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.la liblavjpeg.la png2yuv_SOURCES = png2yuv.c colorspace.c subsample.c -png2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.a -lpng -lz -lm +png2yuv_LDADD = $(top_builddir)/utils/libmjpegutils.la -lpng -lz -lm lavpipe_SOURCES = lavpipe.c pipelist.c -lavpipe_LDADD = $(top_builddir)/utils/libmjpegutils.a +lavpipe_LDADD = $(top_builddir)/utils/libmjpegutils.la yuvmedianfilter_SOURCES = yuvmedianfilter.c -yuvmedianfilter_LDADD = $(top_builddir)/utils/libmjpegutils.a +yuvmedianfilter_LDADD = $(top_builddir)/utils/libmjpegutils.la lav2wav_SOURCES = lav2wav.c -lav2wav_LDADD = $(top_builddir)/utils/libmjpegutils.a \ +lav2wav_LDADD = $(top_builddir)/utils/libmjpegutils.la \ liblavfile.la lavtrans_SOURCES = lavtrans.c -lavtrans_LDADD = $(top_builddir)/utils/libmjpegutils.a \ +lavtrans_LDADD = $(top_builddir)/utils/libmjpegutils.la \ liblavfile.la lavaddwav_SOURCES = lavaddwav.c -lavaddwav_LDADD = $(top_builddir)/utils/libmjpegutils.a \ +lavaddwav_LDADD = $(top_builddir)/utils/libmjpegutils.la \ liblavfile.la glav_SOURCES = glav.c glav_main.c -glav_LDADD = $(top_builddir)/utils/libmjpegutils.a ${GTK_LIBS} +glav_LDADD = $(top_builddir)/utils/libmjpegutils.la ${GTK_LIBS} lavvideo_SOURCES = lavvideo.c frequencies.c yuvscaler_SOURCES = yuvscaler.c yuvscaler_resample.c yuvscaler_bicubic.c -yuvscaler_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS) +yuvscaler_LDADD = $(top_builddir)/utils/libmjpegutils.la $(LIBM_LIBS) yuvcorrect_SOURCES = yuvcorrect.c yuvcorrect_functions.c -yuvcorrect_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS) +yuvcorrect_LDADD = $(top_builddir)/utils/libmjpegutils.la $(LIBM_LIBS) yuvcorrect_tune_SOURCES = yuvcorrect_tune.c yuvcorrect_functions.c -yuvcorrect_tune_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS) +yuvcorrect_tune_LDADD = $(top_builddir)/utils/libmjpegutils.la $(LIBM_LIBS) yuvplay_SOURCES = yuvplay.c -yuvplay_LDADD = $(SDL_LIBS) $(PTHREAD_LIBS) $(top_builddir)/utils/libmjpegutils.a +yuvplay_LDADD = $(SDL_LIBS) $(PTHREAD_LIBS) $(top_builddir)/utils/libmjpegutils.la ppmtoy4m_SOURCES = ppmtoy4m.c colorspace.c subsample.c -ppmtoy4m_LDADD = $(top_builddir)/utils/libmjpegutils.a +ppmtoy4m_LDADD = $(top_builddir)/utils/libmjpegutils.la pgmtoy4m_SOURCES = pgmtoy4m.c -pgmtoy4m_LDADD = $(top_builddir)/utils/libmjpegutils.a +pgmtoy4m_LDADD = $(top_builddir)/utils/libmjpegutils.la y4mtoppm_SOURCES = y4mtoppm.c colorspace.c subsample.c -y4mtoppm_LDADD = $(top_builddir)/utils/libmjpegutils.a +y4mtoppm_LDADD = $(top_builddir)/utils/libmjpegutils.la y4mcolorbars_SOURCES = y4mcolorbars.c colorspace.c subsample.c -y4mcolorbars_LDADD = $(top_builddir)/utils/libmjpegutils.a +y4mcolorbars_LDADD = $(top_builddir)/utils/libmjpegutils.la lavinfo_SOURCES = lavinfo.c -lavinfo_LDADD = $(top_builddir)/utils/libmjpegutils.a \ +lavinfo_LDADD = $(top_builddir)/utils/libmjpegutils.la \ liblavfile.la y4mshift_SOURCES = y4mshift.c -y4mshift_LDADD = $(top_builddir)/utils/libmjpegutils.a +y4mshift_LDADD = $(top_builddir)/utils/libmjpegutils.la y4mblack_SOURCES = y4mblack.c -y4mblack_LDADD = $(top_builddir)/utils/libmjpegutils.a +y4mblack_LDADD = $(top_builddir)/utils/libmjpegutils.la y4mtoyuv_SOURCES = y4mtoyuv.c -y4mtoyuv_LDADD = $(top_builddir)/utils/libmjpegutils.a +y4mtoyuv_LDADD = $(top_builddir)/utils/libmjpegutils.la yuv4mpeg_SOURCES = yuv4mpeg.c -yuv4mpeg_LDADD = $(top_builddir)/utils/libmjpegutils.a +yuv4mpeg_LDADD = $(top_builddir)/utils/libmjpegutils.la yuvfps_SOURCES = yuvfps.c -yuvfps_LDADD = ${top_builddir}/utils/libmjpegutils.a +yuvfps_LDADD = ${top_builddir}/utils/libmjpegutils.la yuvinactive_SOURCES = yuvinactive.c -yuvinactive_LDADD = ${top_builddir}/utils/libmjpegutils.a +yuvinactive_LDADD = ${top_builddir}/utils/libmjpegutils.la @ 1.2 log @Add RCS tags @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Build libmjpegutil as a shared library, which in turn allows transcode to use the mjpegutil modules. This commit incorporates changes suggested by wiz@@. Bump package revision, as well. @ text @d1 1 @