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.

16 files changed, 959 insertions, 24 deletions

diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index bb0b9912a7d..a40a0674038 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2004/03/11 13:17:03 recht Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/17 05:50:50 sekiya Exp $
 
 DISTNAME=	mjpegtools-1.6.2
+PKGREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mjpeg/}
 
diff --git a/multimedia/mjpegtools/PLIST b/multimedia/mjpegtools/PLIST
index 880970015b9..7ff878821cb 100644
--- a/multimedia/mjpegtools/PLIST
+++ b/multimedia/mjpegtools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/03/11 13:17:03 recht Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/04/17 05:50:50 sekiya Exp $
 bin/jpeg2yuv
 bin/lav2avi.sh
 bin/lav2mpeg
@@ -99,7 +99,10 @@ lib/liblavplay-1.6.so.2
 lib/liblavplay-1.6.so.2.2
 lib/liblavplay.la
 lib/liblavplay.so
-lib/libmjpegutils.a
+lib/libmjpegutils-1.6.so.2
+lib/libmjpegutils-1.6.so.2.2
+lib/libmjpegutils.la
+lib/libmjpegutils.so
 lib/libmpeg2encpp-1.6.so.2
 lib/libmpeg2encpp-1.6.so.2.2
 lib/libmpeg2encpp.la
diff --git a/multimedia/mjpegtools/distinfo b/multimedia/mjpegtools/distinfo
index ebfee4d51fc..068c43768ce 100644
--- a/multimedia/mjpegtools/distinfo
+++ b/multimedia/mjpegtools/distinfo
@@ -1,9 +1,20 @@
-$NetBSD: distinfo,v 1.4 2004/04/11 08:31:55 taca Exp $
+$NetBSD: distinfo,v 1.5 2004/04/17 05:50:50 sekiya Exp $
 
 SHA1 (mjpegtools-1.6.2.tar.gz) = c69ce6cd8a37c133c92d677f21650ae541c86575
 Size (mjpegtools-1.6.2.tar.gz) = 1256280 bytes
-SHA1 (patch-aa) = b47aaacdbe02a3254c1ff58213448d63b39e5a34
-SHA1 (patch-ab) = 392bc09ca0142fb1e435b219e598a70ae4bf258f
+SHA1 (patch-aa) = 503728c18cc066b78877a7fbe73e42976cea7530
+SHA1 (patch-ab) = 5a97e966ac42b85e4f81e7a278b6953249b5aa79
 SHA1 (patch-ac) = 0297beecec5947ae153b60a43891c9d373255af5
 SHA1 (patch-ad) = f5f0b017be1fdec1613f256487be1cbb5ba4bea8
 SHA1 (patch-ae) = 63594acbbf05b724183dfb9c25357faebea0b72a
+SHA1 (patch-af) = 2771056cc4d54dd22db6d04ef1ac62cd0a786171
+SHA1 (patch-ag) = ff2e38db476d48e14a97216c7c9816ef6066483f
+SHA1 (patch-ah) = 8941e4c28fe959614e5197813219121ba6b42b0e
+SHA1 (patch-ai) = cd2efe44271ecb8ef68107cb55b5be2697e5b985
+SHA1 (patch-aj) = b5021ec3a21e972b42f8625dbb49ac2eb5bb0b1d
+SHA1 (patch-ak) = 2f60a7f0fcdba89d1c796ef5a42c3f057c24eb02
+SHA1 (patch-al) = ce7412f0bf1b9028257767751cbbd63d4239a327
+SHA1 (patch-am) = e5d3813884036d3f26938bebd6e039c1ff532739
+SHA1 (patch-an) = 0f16df6a3e0ad870162ca394b9aa57dce2854230
+SHA1 (patch-ao) = 4fe99c5d321e8d41b9b2790c515da68e9b0bdf03
+SHA1 (patch-ap) = 0d57387658ddffef2cf69a4349570b1f2ef6b5b8
diff --git a/multimedia/mjpegtools/patches/patch-aa b/multimedia/mjpegtools/patches/patch-aa
index 0083dbf1bcf..08ad6ecd0ce 100644
--- a/multimedia/mjpegtools/patches/patch-aa
+++ b/multimedia/mjpegtools/patches/patch-aa
@@ -1,12 +1,20 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/26 12:44:06 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
+--- ./mplex/Makefile.in.orig	2004-02-04 07:58:31.000000000 +0900
++++ ./mplex/Makefile.in	2004-04-17 10:57:01.000000000 +0900
+@@ -267,7 +267,7 @@
+ 
+ 
+ libmplex2_la_LIBADD = \
+-	$(top_builddir)/utils/libmjpegutils.a
++	$(top_builddir)/utils/libmjpegutils.la
+ 
+ 
+ libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS)
+@@ -285,7 +285,7 @@
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ 
+-libmplex2_la_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++libmplex2_la_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ am__libmplex2_la_SOURCES_DIST = ac3strm_in.cpp audiostrm_out.cpp \
+ 	bits.cpp buffer.cpp dtsstrm_in.cpp inputstrm.cpp interact.cpp \
+ 	lpcmstrm_in.cpp mpastrm_in.cpp multiplexor.cpp padstrm.cpp \
diff --git a/multimedia/mjpegtools/patches/patch-ab b/multimedia/mjpegtools/patches/patch-ab
index e0beafd19fb..33be342fb44 100644
--- a/multimedia/mjpegtools/patches/patch-ab
+++ b/multimedia/mjpegtools/patches/patch-ab
@@ -1,13 +1,347 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 12:44:06 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
+--- ./lavtools/Makefile.in.orig	2004-04-17 11:15:14.000000000 +0900
++++ ./lavtools/Makefile.in	2004-04-17 11:11:41.000000000 +0900
+@@ -319,122 +319,122 @@
+ 
+ 
+ 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
+ 
+ @HAVE_X_TRUE@LAVPLAY_X_LIBS = $(X_LIBS) -lX11
+ 
  lavplay_SOURCES = lavplay.c
- lavplay_LDADD = $(top_builddir)/utils/libmjpegutils.a \
+-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)
 +	@LIBGETOPT_LIB@ ${PTHREAD_LIBS} ${SDL_LIBS} $(LAVPLAY_X_LIBS) $(LIBOSSAUDIO)
  
  
  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
+ subdir = lavtools
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -1436,54 +1436,54 @@
+ 
+ am_glav_OBJECTS = glav.$(OBJEXT) glav_main.$(OBJEXT)
+ glav_OBJECTS = $(am_glav_OBJECTS)
+-glav_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++glav_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ glav_LDFLAGS =
+ am_jpeg2yuv_OBJECTS = jpeg2yuv.$(OBJEXT)
+ jpeg2yuv_OBJECTS = $(am_jpeg2yuv_OBJECTS)
+-jpeg2yuv_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a \
++jpeg2yuv_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la \
+ 	liblavjpeg.la
+ jpeg2yuv_LDFLAGS =
+ am_lav2wav_OBJECTS = lav2wav.$(OBJEXT)
+ lav2wav_OBJECTS = $(am_lav2wav_OBJECTS)
+-lav2wav_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a \
++lav2wav_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la \
+ 	liblavfile.la
+ lav2wav_LDFLAGS =
+ am_lav2yuv_OBJECTS = lav2yuv.$(OBJEXT) lav_common.$(OBJEXT)
+ lav2yuv_OBJECTS = $(am_lav2yuv_OBJECTS)
+-lav2yuv_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a \
++lav2yuv_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la \
+ 	liblavfile.la liblavjpeg.la
+ lav2yuv_LDFLAGS =
+ am_lavaddwav_OBJECTS = lavaddwav.$(OBJEXT)
+ lavaddwav_OBJECTS = $(am_lavaddwav_OBJECTS)
+-lavaddwav_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a \
++lavaddwav_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la \
+ 	liblavfile.la
+ lavaddwav_LDFLAGS =
+ am_lavinfo_OBJECTS = lavinfo.$(OBJEXT)
+ lavinfo_OBJECTS = $(am_lavinfo_OBJECTS)
+-lavinfo_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a \
++lavinfo_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la \
+ 	liblavfile.la
+ lavinfo_LDFLAGS =
+ am_lavpipe_OBJECTS = lavpipe.$(OBJEXT) pipelist.$(OBJEXT)
+ lavpipe_OBJECTS = $(am_lavpipe_OBJECTS)
+-lavpipe_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++lavpipe_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ lavpipe_LDFLAGS =
+ am_lavplay_OBJECTS = lavplay.$(OBJEXT)
+ lavplay_OBJECTS = $(am_lavplay_OBJECTS)
+ @HAVE_X_TRUE@lavplay_DEPENDENCIES = \
+-@HAVE_X_TRUE@	$(top_builddir)/utils/libmjpegutils.a \
++@HAVE_X_TRUE@	$(top_builddir)/utils/libmjpegutils.la \
+ @HAVE_X_TRUE@	liblavplay.la liblavjpeg.la liblavfile.la
+ @HAVE_X_FALSE@lavplay_DEPENDENCIES = \
+-@HAVE_X_FALSE@	$(top_builddir)/utils/libmjpegutils.a \
++@HAVE_X_FALSE@	$(top_builddir)/utils/libmjpegutils.la \
+ @HAVE_X_FALSE@	liblavplay.la liblavjpeg.la liblavfile.la
+ lavplay_LDFLAGS =
+ am_lavrec_OBJECTS = lavrec.$(OBJEXT)
+ lavrec_OBJECTS = $(am_lavrec_OBJECTS)
+-lavrec_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a liblavrec.la \
+-	liblavfile.la liblavjpeg.la
++lavrec_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la \
++	liblavrec.la liblavfile.la liblavjpeg.la
+ lavrec_LDFLAGS =
+ am_lavtrans_OBJECTS = lavtrans.$(OBJEXT)
+ lavtrans_OBJECTS = $(am_lavtrans_OBJECTS)
+-lavtrans_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a \
++lavtrans_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la \
+ 	liblavfile.la
+ lavtrans_LDFLAGS =
+ am_lavvideo_OBJECTS = lavvideo.$(OBJEXT) frequencies.$(OBJEXT)
+@@ -1493,99 +1493,99 @@
+ lavvideo_LDFLAGS =
+ am_matteblend_flt_OBJECTS = matteblend.flt.$(OBJEXT)
+ matteblend_flt_OBJECTS = $(am_matteblend_flt_OBJECTS)
+-matteblend_flt_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++matteblend_flt_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ matteblend_flt_LDFLAGS =
+ am_multiblend_flt_OBJECTS = multiblend.flt.$(OBJEXT)
+ multiblend_flt_OBJECTS = $(am_multiblend_flt_OBJECTS)
+-multiblend_flt_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++multiblend_flt_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ multiblend_flt_LDFLAGS =
+ am_pgmtoy4m_OBJECTS = pgmtoy4m.$(OBJEXT)
+ pgmtoy4m_OBJECTS = $(am_pgmtoy4m_OBJECTS)
+-pgmtoy4m_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++pgmtoy4m_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ pgmtoy4m_LDFLAGS =
+ am_png2yuv_OBJECTS = png2yuv.$(OBJEXT) colorspace.$(OBJEXT) \
+ 	subsample.$(OBJEXT)
+ png2yuv_OBJECTS = $(am_png2yuv_OBJECTS)
+-png2yuv_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++png2yuv_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ png2yuv_LDFLAGS =
+ am_ppmtoy4m_OBJECTS = ppmtoy4m.$(OBJEXT) colorspace.$(OBJEXT) \
+ 	subsample.$(OBJEXT)
+ ppmtoy4m_OBJECTS = $(am_ppmtoy4m_OBJECTS)
+-ppmtoy4m_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++ppmtoy4m_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ ppmtoy4m_LDFLAGS =
+ am_testrec_OBJECTS = testrec.$(OBJEXT) audiolib.$(OBJEXT)
+ testrec_OBJECTS = $(am_testrec_OBJECTS)
+-testrec_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++testrec_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ testrec_LDFLAGS =
+ am_transist_flt_OBJECTS = transist.flt.$(OBJEXT)
+ transist_flt_OBJECTS = $(am_transist_flt_OBJECTS)
+-transist_flt_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++transist_flt_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ transist_flt_LDFLAGS =
+ am_y4mblack_OBJECTS = y4mblack.$(OBJEXT)
+ y4mblack_OBJECTS = $(am_y4mblack_OBJECTS)
+-y4mblack_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++y4mblack_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ y4mblack_LDFLAGS =
+ am_y4mcolorbars_OBJECTS = y4mcolorbars.$(OBJEXT) colorspace.$(OBJEXT) \
+ 	subsample.$(OBJEXT)
+ y4mcolorbars_OBJECTS = $(am_y4mcolorbars_OBJECTS)
+-y4mcolorbars_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++y4mcolorbars_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ y4mcolorbars_LDFLAGS =
+ am_y4mshift_OBJECTS = y4mshift.$(OBJEXT)
+ y4mshift_OBJECTS = $(am_y4mshift_OBJECTS)
+-y4mshift_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++y4mshift_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ y4mshift_LDFLAGS =
+ am_y4mtoppm_OBJECTS = y4mtoppm.$(OBJEXT) colorspace.$(OBJEXT) \
+ 	subsample.$(OBJEXT)
+ y4mtoppm_OBJECTS = $(am_y4mtoppm_OBJECTS)
+-y4mtoppm_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++y4mtoppm_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ y4mtoppm_LDFLAGS =
+ am_y4mtoyuv_OBJECTS = y4mtoyuv.$(OBJEXT)
+ y4mtoyuv_OBJECTS = $(am_y4mtoyuv_OBJECTS)
+-y4mtoyuv_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++y4mtoyuv_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ y4mtoyuv_LDFLAGS =
+ am_ypipe_OBJECTS = ypipe.$(OBJEXT)
+ ypipe_OBJECTS = $(am_ypipe_OBJECTS)
+-ypipe_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++ypipe_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ ypipe_LDFLAGS =
+ am_yuv2lav_OBJECTS = yuv2lav.$(OBJEXT)
+ yuv2lav_OBJECTS = $(am_yuv2lav_OBJECTS)
+-yuv2lav_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a \
++yuv2lav_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la \
+ 	liblavfile.la liblavjpeg.la
+ yuv2lav_LDFLAGS =
+ am_yuv4mpeg_OBJECTS = yuv4mpeg.$(OBJEXT)
+ yuv4mpeg_OBJECTS = $(am_yuv4mpeg_OBJECTS)
+-yuv4mpeg_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++yuv4mpeg_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ yuv4mpeg_LDFLAGS =
+ am_yuvcorrect_OBJECTS = yuvcorrect.$(OBJEXT) \
+ 	yuvcorrect_functions.$(OBJEXT)
+ yuvcorrect_OBJECTS = $(am_yuvcorrect_OBJECTS)
+-yuvcorrect_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++yuvcorrect_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ yuvcorrect_LDFLAGS =
+ am_yuvcorrect_tune_OBJECTS = yuvcorrect_tune.$(OBJEXT) \
+ 	yuvcorrect_functions.$(OBJEXT)
+ yuvcorrect_tune_OBJECTS = $(am_yuvcorrect_tune_OBJECTS)
+-yuvcorrect_tune_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++yuvcorrect_tune_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ yuvcorrect_tune_LDFLAGS =
+ am_yuvfps_OBJECTS = yuvfps.$(OBJEXT)
+ yuvfps_OBJECTS = $(am_yuvfps_OBJECTS)
+-yuvfps_DEPENDENCIES = ${top_builddir}/utils/libmjpegutils.a
++yuvfps_DEPENDENCIES = ${top_builddir}/utils/libmjpegutils.la
+ yuvfps_LDFLAGS =
+ am_yuvinactive_OBJECTS = yuvinactive.$(OBJEXT)
+ yuvinactive_OBJECTS = $(am_yuvinactive_OBJECTS)
+-yuvinactive_DEPENDENCIES = ${top_builddir}/utils/libmjpegutils.a
++yuvinactive_DEPENDENCIES = ${top_builddir}/utils/libmjpegutils.la
+ yuvinactive_LDFLAGS =
+ am_yuvmedianfilter_OBJECTS = yuvmedianfilter.$(OBJEXT)
+ yuvmedianfilter_OBJECTS = $(am_yuvmedianfilter_OBJECTS)
+-yuvmedianfilter_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++yuvmedianfilter_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ yuvmedianfilter_LDFLAGS =
+ am_yuvplay_OBJECTS = yuvplay.$(OBJEXT)
+ yuvplay_OBJECTS = $(am_yuvplay_OBJECTS)
+-yuvplay_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++yuvplay_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ yuvplay_LDFLAGS =
+ am_yuvscaler_OBJECTS = yuvscaler.$(OBJEXT) yuvscaler_resample.$(OBJEXT) \
+ 	yuvscaler_bicubic.$(OBJEXT)
+ yuvscaler_OBJECTS = $(am_yuvscaler_OBJECTS)
+-yuvscaler_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++yuvscaler_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ yuvscaler_LDFLAGS =
+ 
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
diff --git a/multimedia/mjpegtools/patches/patch-af b/multimedia/mjpegtools/patches/patch-af
new file mode 100644
index 00000000000..4567e6c9976
--- /dev/null
+++ b/multimedia/mjpegtools/patches/patch-af
@@ -0,0 +1,8 @@
+--- ./aenc/Makefile.am.orig	2003-11-25 19:36:30.000000000 +0900
++++ ./aenc/Makefile.am	2004-04-17 10:57:01.000000000 +0900
+@@ -27,4 +27,4 @@
+ 	table_th.h \
+ 	wav_io.h
+ 
+-mp2enc_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS)
++mp2enc_LDADD = $(top_builddir)/utils/libmjpegutils.la $(LIBM_LIBS)
diff --git a/multimedia/mjpegtools/patches/patch-ag b/multimedia/mjpegtools/patches/patch-ag
new file mode 100644
index 00000000000..41ffbc3aea7
--- /dev/null
+++ b/multimedia/mjpegtools/patches/patch-ag
@@ -0,0 +1,20 @@
+--- ./aenc/Makefile.in.orig	2004-02-04 07:58:28.000000000 +0900
++++ ./aenc/Makefile.in	2004-04-17 10:57:01.000000000 +0900
+@@ -229,7 +229,7 @@
+ 	wav_io.h
+ 
+ 
+-mp2enc_LDADD = $(top_builddir)/utils/libmjpegutils.a $(LIBM_LIBS)
++mp2enc_LDADD = $(top_builddir)/utils/libmjpegutils.la $(LIBM_LIBS)
+ subdir = aenc
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -242,7 +242,7 @@
+ 	musicin.$(OBJEXT) psy.$(OBJEXT) subs.$(OBJEXT) tables.$(OBJEXT) \
+ 	tonal.$(OBJEXT) wav_io.$(OBJEXT)
+ mp2enc_OBJECTS = $(am_mp2enc_OBJECTS)
+-mp2enc_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.a
++mp2enc_DEPENDENCIES = $(top_builddir)/utils/libmjpegutils.la
+ mp2enc_LDFLAGS =
+ 
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
diff --git a/multimedia/mjpegtools/patches/patch-ah b/multimedia/mjpegtools/patches/patch-ah
new file mode 100644
index 00000000000..d445af44ce1
--- /dev/null
+++ b/multimedia/mjpegtools/patches/patch-ah
@@ -0,0 +1,148 @@
+--- ./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
diff --git a/multimedia/mjpegtools/patches/patch-ai b/multimedia/mjpegtools/patches/patch-ai
new file mode 100644
index 00000000000..367abc60f16
--- /dev/null
+++ b/multimedia/mjpegtools/patches/patch-ai
@@ -0,0 +1,31 @@
+--- ./mpeg2enc/Makefile.am.orig	2003-12-21 02:33:38.000000000 +0900
++++ ./mpeg2enc/Makefile.am	2004-04-17 10:57:01.000000000 +0900
+@@ -113,24 +113,24 @@
+ 	-export-dynamic 
+ 
+ libmpeg2encpp_la_DEPENDENCIES = \
+-	$(top_builddir)/utils/libmjpegutils.a \
++	$(top_builddir)/utils/libmjpegutils.la \
+ 	$(top_builddir)/utils/libcpuaccel.la \
+ 	$(top_builddir)/utils/libmotion.la \
+ 	$(LIBSIMDASM_LIB)
+ 
+ libmpeg2encpp_la_LIBADD = \
+-	$(top_builddir)/utils/libmjpegutils.a \
++	$(top_builddir)/utils/libmjpegutils.la \
+ 	$(top_builddir)/utils/libcpuaccel.la \
+ 	$(top_builddir)/utils/libmotion.la \
+ 	$(LIBSIMDASM_LIB)
+ 
+ mpeg2enc_DEPENDENCIES = \
+-	$(top_builddir)/utils/libmjpegutils.a \
++	$(top_builddir)/utils/libmjpegutils.la \
+ 	$(top_builddir)/mpeg2enc/libmpeg2encpp.la
+ 
+ mpeg2enc_LDADD = \
+ 	$(top_builddir)/mpeg2enc/libmpeg2encpp.la \
+-	$(top_builddir)/utils/libmjpegutils.a \
++	$(top_builddir)/utils/libmjpegutils.la \
+ 	@PTHREAD_LIBS@ @LIBGETOPT_LIB@ $(LIBM_LIBS)
+ 
+ # VITAL: Override default compilation rules generated by automake...
diff --git a/multimedia/mjpegtools/patches/patch-aj b/multimedia/mjpegtools/patches/patch-aj
new file mode 100644
index 00000000000..94f2657009f
--- /dev/null
+++ b/multimedia/mjpegtools/patches/patch-aj
@@ -0,0 +1,34 @@
+--- ./mpeg2enc/Makefile.in.orig	2004-02-04 07:58:31.000000000 +0900
++++ ./mpeg2enc/Makefile.in	2004-04-17 10:57:01.000000000 +0900
+@@ -319,27 +319,27 @@
+ 
+ 
+ libmpeg2encpp_la_DEPENDENCIES = \
+-	$(top_builddir)/utils/libmjpegutils.a \
++	$(top_builddir)/utils/libmjpegutils.la \
+ 	$(top_builddir)/utils/libcpuaccel.la \
+ 	$(top_builddir)/utils/libmotion.la \
+ 	$(LIBSIMDASM_LIB)
+ 
+ 
+ libmpeg2encpp_la_LIBADD = \
+-	$(top_builddir)/utils/libmjpegutils.a \
++	$(top_builddir)/utils/libmjpegutils.la \
+ 	$(top_builddir)/utils/libcpuaccel.la \
+ 	$(top_builddir)/utils/libmotion.la \
+ 	$(LIBSIMDASM_LIB)
+ 
+ 
+ mpeg2enc_DEPENDENCIES = \
+-	$(top_builddir)/utils/libmjpegutils.a \
++	$(top_builddir)/utils/libmjpegutils.la \
+ 	$(top_builddir)/mpeg2enc/libmpeg2encpp.la
+ 
+ 
+ mpeg2enc_LDADD = \
+ 	$(top_builddir)/mpeg2enc/libmpeg2encpp.la \
+-	$(top_builddir)/utils/libmjpegutils.a \
++	$(top_builddir)/utils/libmjpegutils.la \
+ 	@PTHREAD_LIBS@ @LIBGETOPT_LIB@ $(LIBM_LIBS)
+ 
+ 
diff --git a/multimedia/mjpegtools/patches/patch-ak b/multimedia/mjpegtools/patches/patch-ak
new file mode 100644
index 00000000000..4933bfb5138
--- /dev/null
+++ b/multimedia/mjpegtools/patches/patch-ak
@@ -0,0 +1,11 @@
+--- ./mplex/Makefile.am.orig	2003-12-21 02:33:38.000000000 +0900
++++ ./mplex/Makefile.am	2004-04-17 10:57:01.000000000 +0900
+@@ -67,7 +67,7 @@
+ 	-export-dynamic 
+ 
+ libmplex2_la_LIBADD = \
+-	$(top_builddir)/utils/libmjpegutils.a
++	$(top_builddir)/utils/libmjpegutils.la
+ 
+ libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS)
+ 
diff --git a/multimedia/mjpegtools/patches/patch-al b/multimedia/mjpegtools/patches/patch-al
new file mode 100644
index 00000000000..56777281f89
--- /dev/null
+++ b/multimedia/mjpegtools/patches/patch-al
@@ -0,0 +1,27 @@
+--- ./utils/Makefile.am.orig	2003-12-21 02:33:38.000000000 +0900
++++ ./utils/Makefile.am	2004-04-17 10:57:01.000000000 +0900
+@@ -15,16 +15,21 @@
+ 
+ noinst_LTLIBRARIES = libmotion.la libcpuaccel.la
+ 
+-# FIXME: make this libtool (but static-only!) too
+-lib_LIBRARIES = libmjpegutils.a
++# transcode depends on a shared libmjpegutils
++lib_LTLIBRARIES = libmjpegutils.la
+ 
+-libmjpegutils_a_SOURCES = \
++libmjpegutils_la_SOURCES = \
+ 	mjpeg_logging.c \
+ 	mpegconsts.c \
+ 	mpegtimecode.c \
+ 	yuv4mpeg.c \
+ 	yuv4mpeg_ratio.c
+ 
++libmjpegutils_la_LDFLAGS = \
++	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
++	-release $(LT_RELEASE) \
++	-export-dynamic 
++
+ noinst_HEADERS = \
+ 	attributes.h \
+ 	cpu_accel.h \
diff --git a/multimedia/mjpegtools/patches/patch-am b/multimedia/mjpegtools/patches/patch-am
new file mode 100644
index 00000000000..1961f96b6f0
--- /dev/null
+++ b/multimedia/mjpegtools/patches/patch-am
@@ -0,0 +1,244 @@
+--- ./utils/Makefile.in.orig	2004-02-04 07:58:32.000000000 +0900
++++ ./utils/Makefile.in	2004-04-17 10:57:01.000000000 +0900
+@@ -209,10 +209,10 @@
+ 
+ noinst_LTLIBRARIES = libmotion.la libcpuaccel.la
+ 
+-# FIXME: make this libtool (but static-only!) too
+-lib_LIBRARIES = libmjpegutils.a
++# transcode depends on a shared libmjpegutils
++lib_LTLIBRARIES = libmjpegutils.la
+ 
+-libmjpegutils_a_SOURCES = \
++libmjpegutils_la_SOURCES = \
+ 	mjpeg_logging.c \
+ 	mpegconsts.c \
+ 	mpegtimecode.c \
+@@ -220,6 +220,12 @@
+ 	yuv4mpeg_ratio.c
+ 
+ 
++libmjpegutils_la_LDFLAGS = \
++	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
++	-release $(LT_RELEASE) \
++	-export-dynamic 
++
++
+ noinst_HEADERS = \
+ 	attributes.h \
+ 	cpu_accel.h \
+@@ -258,15 +264,7 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
+-LIBRARIES = $(lib_LIBRARIES)
+-
+-libmjpegutils_a_AR = $(AR) cru
+-libmjpegutils_a_LIBADD =
+-am_libmjpegutils_a_OBJECTS = mjpeg_logging.$(OBJEXT) \
+-	mpegconsts.$(OBJEXT) mpegtimecode.$(OBJEXT) yuv4mpeg.$(OBJEXT) \
+-	yuv4mpeg_ratio.$(OBJEXT)
+-libmjpegutils_a_OBJECTS = $(am_libmjpegutils_a_OBJECTS)
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
++LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+ 
+ libcpuaccel_la_LDFLAGS =
+ @HAVE_ALTIVEC_FALSE@@HAVE_ASM_MMX_FALSE@@HAVE_ASM_NASM_TRUE@libcpuaccel_la_DEPENDENCIES =
+@@ -285,6 +283,10 @@
+ @HAVE_ALTIVEC_TRUE@@HAVE_ASM_MMX_TRUE@@HAVE_ASM_NASM_FALSE@	$(top_builddir)/utils/altivec/libaltivec.la
+ am_libcpuaccel_la_OBJECTS = cpu_accel.lo
+ libcpuaccel_la_OBJECTS = $(am_libcpuaccel_la_OBJECTS)
++libmjpegutils_la_LIBADD =
++am_libmjpegutils_la_OBJECTS = mjpeg_logging.lo mpegconsts.lo \
++	mpegtimecode.lo yuv4mpeg.lo yuv4mpeg_ratio.lo
++libmjpegutils_la_OBJECTS = $(am_libmjpegutils_la_OBJECTS)
+ libmotion_la_LDFLAGS =
+ libmotion_la_LIBADD =
+ am_libmotion_la_OBJECTS = motionsearch.lo
+@@ -294,11 +296,12 @@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpu_accel.Plo \
+-@AMDEP_TRUE@	./$(DEPDIR)/mjpeg_logging.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/mjpeg_logging.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/motionsearch.Plo \
+-@AMDEP_TRUE@	./$(DEPDIR)/mpegconsts.Po \
+-@AMDEP_TRUE@	./$(DEPDIR)/mpegtimecode.Po ./$(DEPDIR)/yuv4mpeg.Po \
+-@AMDEP_TRUE@	./$(DEPDIR)/yuv4mpeg_ratio.Po
++@AMDEP_TRUE@	./$(DEPDIR)/mpegconsts.Plo \
++@AMDEP_TRUE@	./$(DEPDIR)/mpegtimecode.Plo \
++@AMDEP_TRUE@	./$(DEPDIR)/yuv4mpeg.Plo \
++@AMDEP_TRUE@	./$(DEPDIR)/yuv4mpeg_ratio.Plo
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+@@ -306,7 +309,7 @@
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(libmjpegutils_a_SOURCES) $(libcpuaccel_la_SOURCES) \
++DIST_SOURCES = $(libcpuaccel_la_SOURCES) $(libmjpegutils_la_SOURCES) \
+ 	$(libmotion_la_SOURCES)
+ HEADERS = $(noinst_HEADERS) $(pkginclude_HEADERS)
+ 
+@@ -318,7 +321,7 @@
+ 	check-recursive installcheck-recursive
+ DIST_COMMON = $(noinst_HEADERS) $(pkginclude_HEADERS) \
+ 	$(srcdir)/Makefile.in Makefile.am
+-SOURCES = $(libmjpegutils_a_SOURCES) $(libcpuaccel_la_SOURCES) $(libmotion_la_SOURCES)
++SOURCES = $(libcpuaccel_la_SOURCES) $(libmjpegutils_la_SOURCES) $(libmotion_la_SOURCES)
+ 
+ all: all-recursive
+ 
+@@ -329,40 +332,34 @@
+ 	  $(AUTOMAKE) --gnu  utils/Makefile
+ Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+-libLIBRARIES_INSTALL = $(INSTALL_DATA)
+-install-libLIBRARIES: $(lib_LIBRARIES)
++libLTLIBRARIES_INSTALL = $(INSTALL)
++install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)
+-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f"; \
+-	    $(libLIBRARIES_INSTALL) $$p $(DESTDIR)$(libdir)/$$f; \
+-	  else :; fi; \
+-	done
+-	@$(POST_INSTALL)
+-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+-	  if test -f $$p; then \
+-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	    echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
+-	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+-uninstall-libLIBRARIES:
++uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  p="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(libdir)/$$p"; \
+-	  rm -f $(DESTDIR)$(libdir)/$$p; \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
++	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ 	done
+ 
+-clean-libLIBRARIES:
+-	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
+-libmjpegutils.a: $(libmjpegutils_a_OBJECTS) $(libmjpegutils_a_DEPENDENCIES) 
+-	-rm -f libmjpegutils.a
+-	$(libmjpegutils_a_AR) libmjpegutils.a $(libmjpegutils_a_OBJECTS) $(libmjpegutils_a_LIBADD)
+-	$(RANLIB) libmjpegutils.a
++clean-libLTLIBRARIES:
++	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
++	  test "$$dir" = "$$p" && dir=.; \
++	  echo "rm -f \"$${dir}/so_locations\""; \
++	  rm -f "$${dir}/so_locations"; \
++	done
+ 
+ clean-noinstLTLIBRARIES:
+ 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+@@ -374,6 +371,8 @@
+ 	done
+ libcpuaccel.la: $(libcpuaccel_la_OBJECTS) $(libcpuaccel_la_DEPENDENCIES) 
+ 	$(LINK)  $(libcpuaccel_la_LDFLAGS) $(libcpuaccel_la_OBJECTS) $(libcpuaccel_la_LIBADD) $(LIBS)
++libmjpegutils.la: $(libmjpegutils_la_OBJECTS) $(libmjpegutils_la_DEPENDENCIES) 
++	$(LINK) -rpath $(libdir) $(libmjpegutils_la_LDFLAGS) $(libmjpegutils_la_OBJECTS) $(libmjpegutils_la_LIBADD) $(LIBS)
+ libmotion.la: $(libmotion_la_OBJECTS) $(libmotion_la_DEPENDENCIES) 
+ 	$(LINK)  $(libmotion_la_LDFLAGS) $(libmotion_la_OBJECTS) $(libmotion_la_LIBADD) $(LIBS)
+ 
+@@ -384,12 +383,12 @@
+ 	-rm -f *.tab.c
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu_accel.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mjpeg_logging.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mjpeg_logging.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/motionsearch.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegconsts.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegtimecode.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv4mpeg.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv4mpeg_ratio.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegconsts.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegtimecode.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv4mpeg.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yuv4mpeg_ratio.Plo@am__quote@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+@@ -622,7 +621,7 @@
+ 	done
+ check-am: all-am
+ check: check-recursive
+-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(HEADERS)
++all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(pkgincludedir)
+@@ -654,12 +653,11 @@
+ 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+ clean: clean-recursive
+ 
+-clean-am: clean-generic clean-libLIBRARIES clean-libtool \
++clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ 	clean-noinstLTLIBRARIES mostlyclean-am
+ 
+ distclean: distclean-recursive
+-	-rm -rf ./$(DEPDIR)
+-	-rm -f Makefile
++	-rm -rf ./$(DEPDIR)	-rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags
+ 
+@@ -673,7 +671,7 @@
+ 
+ install-data-am: install-pkgincludeHEADERS
+ 
+-install-exec-am: install-libLIBRARIES
++install-exec-am: install-libLTLIBRARIES
+ 
+ install-info: install-info-recursive
+ 
+@@ -699,13 +697,13 @@
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-libLIBRARIES \
++uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
+ 	uninstall-pkgincludeHEADERS
+ 
+ uninstall-info: uninstall-info-recursive
+ 
+ .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
+-	clean-generic clean-libLIBRARIES clean-libtool \
++	clean-generic clean-libLTLIBRARIES clean-libtool \
+ 	clean-noinstLTLIBRARIES clean-recursive ctags ctags-recursive \
+ 	distclean distclean-compile distclean-generic distclean-libtool \
+ 	distclean-recursive distclean-tags distdir dvi dvi-am \
+@@ -713,7 +711,7 @@
+ 	install-data install-data-am install-data-recursive \
+ 	install-exec install-exec-am install-exec-recursive \
+ 	install-info install-info-am install-info-recursive \
+-	install-libLIBRARIES install-man install-pkgincludeHEADERS \
++	install-libLTLIBRARIES install-man install-pkgincludeHEADERS \
+ 	install-recursive install-strip installcheck installcheck-am \
+ 	installdirs installdirs-am installdirs-recursive \
+ 	maintainer-clean maintainer-clean-generic \
+@@ -721,7 +719,7 @@
+ 	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+ 	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
+ 	tags-recursive uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-libLIBRARIES \
++	uninstall-info-recursive uninstall-libLTLIBRARIES \
+ 	uninstall-pkgincludeHEADERS uninstall-recursive
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/multimedia/mjpegtools/patches/patch-an b/multimedia/mjpegtools/patches/patch-an
new file mode 100644
index 00000000000..ebd8500bc4f
--- /dev/null
+++ b/multimedia/mjpegtools/patches/patch-an
@@ -0,0 +1,9 @@
+--- ./yuvdenoise/Makefile.am.orig	2003-12-21 02:33:39.000000000 +0900
++++ ./yuvdenoise/Makefile.am	2004-04-17 10:57:01.000000000 +0900
+@@ -25,5 +25,5 @@
+ 
+ yuvdenoise_LDADD = \
+ 	$(top_builddir)/utils/libcpuaccel.la \
+-	$(top_builddir)/utils/libmjpegutils.a \
++	$(top_builddir)/utils/libmjpegutils.la \
+ 	@LIBM_LIBS@
diff --git a/multimedia/mjpegtools/patches/patch-ao b/multimedia/mjpegtools/patches/patch-ao
new file mode 100644
index 00000000000..ac81915ea40
--- /dev/null
+++ b/multimedia/mjpegtools/patches/patch-ao
@@ -0,0 +1,20 @@
+--- ./yuvdenoise/Makefile.in.orig	2004-02-04 07:58:33.000000000 +0900
++++ ./yuvdenoise/Makefile.in	2004-04-17 10:57:01.000000000 +0900
+@@ -228,7 +228,7 @@
+ 
+ yuvdenoise_LDADD = \
+ 	$(top_builddir)/utils/libcpuaccel.la \
+-	$(top_builddir)/utils/libmjpegutils.a \
++	$(top_builddir)/utils/libmjpegutils.la \
+ 	@LIBM_LIBS@
+ 
+ subdir = yuvdenoise
+@@ -243,7 +243,7 @@
+ 	main.$(OBJEXT) motion.$(OBJEXT)
+ yuvdenoise_OBJECTS = $(am_yuvdenoise_OBJECTS)
+ yuvdenoise_DEPENDENCIES = $(top_builddir)/utils/libcpuaccel.la \
+-	$(top_builddir)/utils/libmjpegutils.a
++	$(top_builddir)/utils/libmjpegutils.la
+ yuvdenoise_LDFLAGS =
+ 
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
diff --git a/multimedia/mjpegtools/patches/patch-ap b/multimedia/mjpegtools/patches/patch-ap
new file mode 100644
index 00000000000..a65ce0e3b04
--- /dev/null
+++ b/multimedia/mjpegtools/patches/patch-ap
@@ -0,0 +1,26 @@
+--- ./yuvfilters/Makefile.in.orig	2004-02-04 07:58:34.000000000 +0900
++++ ./yuvfilters/Makefile.in	2004-04-17 10:57:01.000000000 +0900
+@@ -206,7 +206,7 @@
+ noinst_LTLIBRARIES = libyuvfilters.la
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/utils
+-MJPEGLIB = $(top_builddir)/utils/libmjpegutils.a
++MJPEGLIB = $(top_builddir)/utils/libmjpegutils.la
+ 
+ libyuvfilters_la_SOURCES = \
+ 	addtask.c \
+@@ -249,12 +249,12 @@
+ am_yuvkineco_OBJECTS = yuvkineco-main.$(OBJEXT)
+ yuvkineco_OBJECTS = $(am_yuvkineco_OBJECTS)
+ yuvkineco_DEPENDENCIES = libyuvfilters.la \
+-	$(top_builddir)/utils/libmjpegutils.a
++	$(top_builddir)/utils/libmjpegutils.la
+ yuvkineco_LDFLAGS =
+ am_yuvycsnoise_OBJECTS = yuvycsnoise-main.$(OBJEXT)
+ yuvycsnoise_OBJECTS = $(am_yuvycsnoise_OBJECTS)
+ yuvycsnoise_DEPENDENCIES = libyuvfilters.la \
+-	$(top_builddir)/utils/libmjpegutils.a
++	$(top_builddir)/utils/libmjpegutils.la
+ yuvycsnoise_LDFLAGS =
+ 
+ DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)