[pkgsrc/trunk]: pkgsrc/multimedia/mjpegtools Build libmjpegutil as a shared l...

[sekiya <sekiya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4dc7d52ada1a
branches:  trunk
changeset: 473183:4dc7d52ada1a
user:      sekiya <sekiya%pkgsrc.org@localhost>
date:      Sat Apr 17 05:50:50 2004 +0000

description:
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.

diffstat:

 multimedia/mjpegtools/Makefile         |    3 +-
 multimedia/mjpegtools/PLIST            |    7 +-
 multimedia/mjpegtools/distinfo         |   17 +-
 multimedia/mjpegtools/patches/patch-aa |   28 +-
 multimedia/mjpegtools/patches/patch-ab |  346 ++++++++++++++++++++++++++++++++-
 multimedia/mjpegtools/patches/patch-af |    8 +
 multimedia/mjpegtools/patches/patch-ag |   20 +
 multimedia/mjpegtools/patches/patch-ah |  148 ++++++++++++++
 multimedia/mjpegtools/patches/patch-ai |   31 ++
 multimedia/mjpegtools/patches/patch-aj |   34 +++
 multimedia/mjpegtools/patches/patch-ak |   11 +
 multimedia/mjpegtools/patches/patch-al |   27 ++
 multimedia/mjpegtools/patches/patch-am |  244 +++++++++++++++++++++++
 multimedia/mjpegtools/patches/patch-an |    9 +
 multimedia/mjpegtools/patches/patch-ao |   20 +
 multimedia/mjpegtools/patches/patch-ap |   26 ++
 16 files changed, 957 insertions(+), 22 deletions(-)

diffs (truncated from 1073 to 300 lines):

diff -r dfb124dcc61e -r 4dc7d52ada1a multimedia/mjpegtools/Makefile
--- a/multimedia/mjpegtools/Makefile    Sat Apr 17 04:49:07 2004 +0000
+++ b/multimedia/mjpegtools/Makefile    Sat Apr 17 05:50:50 2004 +0000
@@ -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 -r dfb124dcc61e -r 4dc7d52ada1a multimedia/mjpegtools/PLIST
--- a/multimedia/mjpegtools/PLIST       Sat Apr 17 04:49:07 2004 +0000
+++ b/multimedia/mjpegtools/PLIST       Sat Apr 17 05:50:50 2004 +0000
@@ -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.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 -r dfb124dcc61e -r 4dc7d52ada1a multimedia/mjpegtools/distinfo
--- a/multimedia/mjpegtools/distinfo    Sat Apr 17 04:49:07 2004 +0000
+++ b/multimedia/mjpegtools/distinfo    Sat Apr 17 05:50:50 2004 +0000
@@ -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 -r dfb124dcc61e -r 4dc7d52ada1a multimedia/mjpegtools/patches/patch-aa
--- a/multimedia/mjpegtools/patches/patch-aa    Sat Apr 17 04:49:07 2004 +0000
+++ b/multimedia/mjpegtools/patches/patch-aa    Sat Apr 17 05:50:50 2004 +0000
@@ -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/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
+ 
  
- mplex_LDADD = \
-       $(top_builddir)/mplex/libmplex2.la \
-+      $(top_builddir)/utils/libmjpegutils.a \
-       @LIBGETOPT_LIB@ $(LIBM_LIBS) 
+ libmplex2_la_CXXFLAGS = $(ZALPHA_FLAGS)
+@@ -285,7 +285,7 @@
+ CONFIG_CLEAN_FILES =
+ LTLIBRARIES = $(lib_LTLIBRARIES)
  
- subdir = mplex
+-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 -r dfb124dcc61e -r 4dc7d52ada1a multimedia/mjpegtools/patches/patch-ab
--- a/multimedia/mjpegtools/patches/patch-ab    Sat Apr 17 04:49:07 2004 +0000
+++ b/multimedia/mjpegtools/patches/patch-ab    Sat Apr 17 05:50:50 2004 +0000
@@ -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)