Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 11 Mar 2004 23:33:08 -0800 (PST)
From:      michael jonson <ahze@ahze.net>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/64145: [Patch] multimedia/mjpegtools -- update to 1.6.2
Message-ID:  <200403120733.i2C7X8G3088697@www.freebsd.org>
Resent-Message-ID: <200403120740.i2C7eGpE015580@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         64145
>Category:       ports
>Synopsis:       [Patch] multimedia/mjpegtools -- update to 1.6.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 11 23:40:16 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     michael jonson
>Release:        5.2-CURRENT && 4.9-STABLE
>Organization:
>Environment:
>Description:
update mjpegtools to 1.6.2 and bump PORTREVISION  on transcode

add WITH_LIBDV_PAL knob for "libDV PAL YV12 read-support"

-- 

I found some error durring pkg_delete
root@ahze:/usr/ports/multimedia/mjpegtools$ pkg_delete -fv /var/db/pkg/mjpegtools-1.6.2/>out
install-info: warning: no entries found for `/usr/test//info/mjpeg-howto.info'; nothing deleted

I'm not sure how to fix that, everything installs and deinstalls correctly and nothing is left 
when I run /usr/ports/Tools/scripts/plist PREFIX
>How-To-Repeat:
      
>Fix:
diff -ruN mjpegtools.orig/Makefile mjpegtools/Makefile
--- mjpegtools.orig/Makefile	Sun Mar  7 20:01:30 2004
+++ mjpegtools/Makefile	Fri Mar 12 01:53:27 2004
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mjpegtools
-PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTVERSION=	1.6.2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mjpeg
@@ -15,7 +14,6 @@
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Set of tools to record/playback/edit videos in MPEG format
 
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 LIB_DEPENDS=	aviplay.0:${PORTSDIR}/multimedia/avifile \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
@@ -25,37 +23,34 @@
 USE_REINPLACE=	yes
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \
-		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS:S/"//g}" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${CPPFLAGS} ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS} ${PTHREAD_LIBS:S/"//g}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS:S/"//g}"
+CONFIGURE_ARGS=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
+		--program-transform-name=""
 WANT_GNOME=	yes
 WANT_SDL=	yes
 
-MAN1=	divxdec.1 jpeg2yuv.1 lav2divx.1 lav2mpeg.1 lav2wav.1 lav2yuv.1 \
-	lavpipe.1 lavplay.1 lavrec.1 lavtrans.1 mjpegtools.1 mp2enc.1 \
-	mpeg2enc.1 mplex.1 ppmtoy4m.1 y4mcolorbars.1 y4mtoppm.1 \
-	yuv2divx.1 yuv2lav.1 yuvdenoise.1 yuvkineco.1 yuvmedianfilter.1 \
-	yuvplay.1 yuvscaler.1 yuvycsnoise.1
-MAN5=	yuv4mpeg.5
+MAN1_EXTRA=	lavplay.1 lavrec.1 mjpegtools.1 mpeg2enc.1 mplex.1 \
+		yuvplay.1 lav2wav.1 lav2yuv.1 lavtrans.1 mp2enc.1 \
+		yuvscaler.1 lavpipe.1 yuv2lav.1 yuvdenoise.1 jpeg2yuv.1 \
+		pgmtoy4m.1 ppmtoy4m.1 y4mtoppm.1 y4mcolorbars.1 \
+		yuvkineco.1 yuvycsnoise.1 yuvmedianfilter.1 lav2mpeg.1 yuvfps.1
 
-DOC_FILES=	AUTHORS BUGS CHANGES COPYING ChangeLog HINTS NEWS \
+MAN1=	${MAN1_EXTRA} yuvinactive.1
+
+MAN5=		yuv4mpeg.5
+
+PORTDOCS=	AUTHORS BUGS CHANGES COPYING ChangeLog HINTS NEWS \
 		PLANS README README.DV README.avilib README.glav \
 		README.lavpipe README.transist TODO
 
-post-install:
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
+INFO=		mjpeg-howto
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
-PLIST_SUB+=	DIVX='@comment '
-.else
-PLIST_SUB+=	DIVX=''
+.if ${ARCH} == "i386"
+BUILD_DEPEND+=  nasm:${PORTSDIR}/devel/nasm
 .endif
 
 # pre-detection
@@ -84,62 +79,64 @@
 # option activation
 .if ${HAVE_GNOME:Mgtk12}!=""
 USE_GNOME+=	gtk12
-PLIST_SUB+=	GTK=""
-.else
-PLIST_SUB+=	GTK="@comment "
+PLIST_FILES+=	bin/glav
+.endif
+#
+.if defined(WITH_LIBDV_PAL)
+CONFIGURE_ARGS+=	--with-dv-yv12
+WITH_LIBDV=		yes
 .endif
 #
-.ifdef(WITH_LIBDV)
+.if defined(WITH_LIBDV)
 LIB_DEPENDS+=	dv.3:${PORTSDIR}/multimedia/libdv
 
 CONFIGURE_ARGS+=	--with-dv=${LOCALBASE}
 .endif
 #
-.ifdef(WITH_LIBGNUGETOPT)
+.if defined(WITH_LIBGNUGETOPT)
 USE_GETOPT_LONG=	yes
 .endif
 #
-.ifdef(WITH_LIBMOVTAR)
+.if defined(WITH_LIBMOVTAR)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libmovtar.a:${PORTSDIR}/multimedia/libmovtar
 
 CONFIGURE_ARGS+=	--with-movtar-prefix=${LOCALBASE}
 .endif
 #
-.ifdef(WITH_SDL)
+.if defined(WITH_SDL)
 USE_SDL=	sdl
 CONFIGURE_ARGS+=	--with-sdl
 .endif
 #
-.ifdef(WITH_QUICKTIME)
+.if defined(WITH_QUICKTIME)
 LIB_DEPENDS+=	openquicktime.0:${PORTSDIR}/multimedia/openquicktime
 
-CONFIGURE_ARGS+=	--with-quicktime=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-quicktime
 .endif
 
 pre-everything::
 .if ${HAVE_GNOME:Mgtk12}==""
 	@${ECHO_MSG} "====> You can enable GTK support by defining WITH_GNOME"
 .endif
-.ifndef(WITH_LIBDV)
+.if !defined(WITH_LIBDV)
 	@${ECHO_MSG} "====> You can enable DV support by defining WITH_LIBDV"
 .endif
-.ifndef(WITH_LIBMOVTAR)
+.if !defined(WITH_LIBDV_PAL)
+	@${ECHO_MSG} "====> You can enable DV PAL support by defining WITH_LIBDV_PAL"
+.endif
+.if !defined(WITH_LIBMOVTAR)
 	@${ECHO_MSG} "====> You can enable movtar support by defining WITH_LIBMOVTAR"
 .endif
-.ifndef(WITH_QUICKTIME)
+.if !defined(WITH_QUICKTIME)
 	@${ECHO_MSG} "====> You can enable quicktime support by defining WITH_QUICKTIME"
 .endif
-.ifndef(WITH_SDL)
+.if !defined(WITH_SDL)
 	@${ECHO_MSG} "====> You can enable SDL support by defining WITH_SDL"
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -E -e 's|^(pkgconfigdir = )\$$\(libdir\)/(pkgconfig)|\1${PREFIX}/libdata/\2|' \
 		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|stdint.h|sys/types.h|' \
-		${WRKSRC}/lavtools/lav2divx.cpp \
-		${WRKSRC}/lavtools/yuv2divx.cpp \
-		${WRKSRC}/lavtools/divxdec.cpp
 	@${REINPLACE_CMD} -E -e 's@(-l(jpeg|openquicktime|png))@-L${LOCALBASE}/lib \1@; \
 		s|(-I) (\$$with_quicktime)|\1\2/include/openquicktime|; \
 		s|(-L\$$with_quicktime) |\1/lib |; \
@@ -153,8 +150,9 @@
 		${WRKSRC}/lavtools/liblavplay.c \
 		${WRKSRC}/lavtools/yuvplay.c
 	@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
-		${WRKSRC}/scripts/lav2mpeg ${WRKSRC}/scripts/mpegtranscode
-.ifdef(WITH_QUICKTIME)
+		${WRKSRC}/scripts/lav2mpeg ${WRKSRC}/scripts/mpegtranscode \
+		${WRKSRC}/scripts/lav2avi.sh
+.if defined(WITH_QUICKTIME)
 	@${REINPLACE_CMD} -E -e 's|^(have_openquicktime=).+$$|\1true|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -E \
@@ -170,7 +168,7 @@
 	@${REINPLACE_CMD} -E -e 's|^(have_pthread=).+$$|\1true|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
-.ifdef(WITH_LIBGNUGETOPT)
+.if defined(WITH_LIBGNUGETOPT)
 	@${REINPLACE_CMD} -E -e 's|(AVIPLAY_LIBS \=.*)|\1 -lgnugetopt|' \
 		${WRKSRC}/lavtools/Makefile.in
 .endif
@@ -178,12 +176,16 @@
 	@${REINPLACE_CMD} -E -e 's|(AVIPLAY_LIBS \=.*)|\1 ${PTHREAD_LIBS}|' \
 		${WRKSRC}/lavtools/Makefile.in
 
-post-configure:
-	@${CP} -f ${LIBTOOL} ${WRKSRC}
-
-pre-build:
-.ifdef(WITH_QUICKTIME)
-	@${ECHO_CMD} "#define HAVE_OPENQUICKTIME 1" >> ${WRKSRC}/config.h
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
+.for man in ${MAN1_EXTRA}
+	@${INSTALL_MAN} ${WRKSRC}/docs/${man} ${MANPREFIX}/man/man1
+.endfor
+	@${INSTALL_MAN} ${WRKSRC}/docs/yuv4mpeg.5 ${MANPREFIX}/man/man5
 
 .include <bsd.port.post.mk>
diff -ruN mjpegtools.orig/distinfo mjpegtools/distinfo
--- mjpegtools.orig/distinfo	Sat Feb  7 20:13:56 2004
+++ mjpegtools/distinfo	Fri Mar 12 01:53:27 2004
@@ -1,2 +1,2 @@
-MD5 (mjpegtools-1.6.1.tar.gz) = fa2aeec19deafe86d22b34eda329f9f4
-SIZE (mjpegtools-1.6.1.tar.gz) = 976241
+MD5 (mjpegtools-1.6.2.tar.gz) = 01c0120b0182de67f182ef99ad855daa
+SIZE (mjpegtools-1.6.2.tar.gz) = 1256280
diff -ruN mjpegtools.orig/files/patch-configure mjpegtools/files/patch-configure
--- mjpegtools.orig/files/patch-configure	Fri Sep 20 10:53:15 2002
+++ mjpegtools/files/patch-configure	Fri Mar 12 01:53:27 2004
@@ -1,10 +1,58 @@
---- configure.orig	Wed Jul 17 00:34:59 2002
-+++ configure	Wed Jul 17 00:35:47 2002
-@@ -7297,6 +7297,7 @@
+--- configure.bak	Thu Mar 11 22:52:03 2004
++++ configure	Thu Mar 11 22:52:46 2004
+@@ -25610,16 +25610,6 @@
+ have_x86cpu=false
+ echo "$as_me:$LINENO: checking for Intel Pentium architecture (IA32)" >&5
+ echo $ECHO_N "checking for Intel Pentium architecture (IA32)... $ECHO_C" >&6
+-if test "$host_cpu" = "i386" -o "$host_cpu" = "i486" \
+-   -o "$host_cpu" = "i586" -o "$host_cpu" = "i686" \
+-   -o "$host_cpu" = "i786" ; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-  have_x86cpu=true
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
  
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ echo "$as_me:$LINENO: checking for PowerPC architecture" >&5
+ echo $ECHO_N "checking for PowerPC architecture... $ECHO_C" >&6
+@@ -25845,38 +25835,6 @@
+   fi
+ fi
  
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-
+-
+-if test x$have_x86cpu = xtrue ; then
+-echo "$as_me:$LINENO: checking x86 sub-architecture settings" >&5
+-echo $ECHO_N "checking x86 sub-architecture settings... $ECHO_C" >&6
+-
+-  if test "$enable_cmov_extension" != "no" ; then
+-    arch=`uname -m`
+-  else
+-    arch=i586
+-  fi
+-  have_cmov=false
+-  case $arch in
+-  i786) ARCHFLAGS="-mcpu=i786 -march=$arch"
+-  have_cmov=true
+-  ;;
+-  i686) ARCHFLAGS="-mcpu=i686 -march=$arch"
+-  have_cmov=true
+-  ;;
+-  i586) ARCHFLAGS="-mcpu=i586 -march=$arch"
+-  have_cmov=false
+-  ;;
+-  *) ARCHFLAGS="-mcpu=i686 -march=$arch"
+-  have_cmov=true
+-  ;;
+-  esac
+-echo "$as_me:$LINENO: result: $ARCHFLAGS" >&5
+-echo "${ECHO_T}$ARCHFLAGS" >&6
+-
+-else
+-  have_cmov=false
+-fi
+ 
+ 
+ use_zalpha=false
diff -ruN mjpegtools.orig/files/patch-gcc3-yuvdenoise::motion.c mjpegtools/files/patch-gcc3-yuvdenoise::motion.c
--- mjpegtools.orig/files/patch-gcc3-yuvdenoise::motion.c	Sat Mar  6 05:55:07 2004
+++ mjpegtools/files/patch-gcc3-yuvdenoise::motion.c	Wed Dec 31 19:00:00 1969
@@ -1,60 +0,0 @@
-diff -uNr yuvdenoise/motion.c yuvdenoise/motion.c.orig
---- yuvdenoise/motion.c	2002-05-06 04:13:37.000000000 -0400
-+++ yuvdenoise/motion.c.orig	2003-07-25 01:52:38.339744992 -0400
-@@ -251,6 +251,9 @@
-     " movl         %1    , %%eax;          /* load frameadress into eax                          */\n"
-     " movl         %2    , %%ebx;          /* load frameadress into ebx                          */\n"
-     " movl         %3    , %%ecx;          /* load width       into ecx                          */\n"
-+	" shrl         $1    , %%ecx;          /* shift width to scale it in the asm.                */\n"
-+	"                                      /* why? we need an lvalue as input... gcc33...        */\n"
-+	"                                      /* (carrbc1@wfu.edu)                                  */\n"
-     "                                      /*                                                    */\n"
-     ".rept 4                    ;          /* Loop for 4 lines                                   */\n"
-     " movd        (%%eax), %%mm1;          /* 4 Pixels from filtered frame to mm1                */\n"
-@@ -270,7 +273,7 @@
-     "                                      /*                                                    */\n"
-     " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */\n"
-     :"=m" (a)     
--    :"m" (frm), "m" (ref), "m" (denoiser.frame.w/2)
-+    :"m" (frm), "m" (ref), "m" (denoiser.frame.w)
-     :"%eax", "%ebx", "%ecx"
-     );
- #endif
-@@ -295,7 +298,10 @@
-     " movl         %1    , %%eax;          /* load frameadress into eax                          */\n"
-     " movl         %2    , %%ebx;          /* load frameadress into ebx                          */\n"
-     " movl         %3    , %%ecx;          /* load width       into ecx                          */\n"
--    "                           ;          /*                                                    */\n"
-+	" shrl         $1    , %%ecx;          /* shift width to scale it in the asm.                */\n"
-+	"                                      /* why? we need an lvalue as input... gcc33...        */\n"
-+	"                                      /* (carrbc1@wfu.edu)                                  */\n"
-+    "                                      /*                                                    */\n"
-     " .rept 4                   ;          /*                                                    */\n"
-     " movd        (%%eax), %%mm1;          /* 4 Pixels from filtered frame to mm1                */\n"
-     " movd        (%%ebx), %%mm2;          /* 4 Pixels from filtered frame to mm2                */\n"
-@@ -307,7 +313,7 @@
-     "                                      /*                                                    */\n"
-     " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */\n"
-     :"=m" (a)     
--    :"m" (frm), "m" (ref), "m" (denoiser.frame.w/2)
-+    :"m" (frm), "m" (ref), "m" (denoiser.frame.w)
-     :"%eax", "%ebx", "%ecx"
-     );
- #endif
-@@ -349,6 +355,7 @@
-   static uint32_t a;
- #ifdef HAVE_ASM_MMX
-   static uint32_t bit_mask[2] = {0x7f7f7f7f,0x7f7f7f7f};
-+  static uint32_t* bit_mask_addr = bit_mask;
- 
-   __asm__ __volatile__
-       (
-@@ -380,7 +387,7 @@
- 	  "                                      /*                                                    */"
- 	  " movq         %%mm0 , %0   ;          /* make mm0 available to gcc ...                      */"
- 	  :"=m" (a)     
--	  :"m" (frm1),"m" (frm2), "m" (ref), "m" (denoiser.frame.w), "m" (bit_mask)
-+	  :"m" (frm1),"m" (frm2), "m" (ref), "m" (denoiser.frame.w), "m" (bit_mask_addr)
- 	  :"%eax", "%ebx", "%ecx", "%edx"
- 	  );
- #endif
diff -ruN mjpegtools.orig/files/patch-lavtools::divxdec.cpp mjpegtools/files/patch-lavtools::divxdec.cpp
--- mjpegtools.orig/files/patch-lavtools::divxdec.cpp	Fri May 31 14:19:48 2002
+++ mjpegtools/files/patch-lavtools::divxdec.cpp	Wed Dec 31 19:00:00 1969
@@ -1,40 +0,0 @@
---- lavtools/divxdec.cpp.orig	Wed May 29 19:02:12 2002
-+++ lavtools/divxdec.cpp	Wed May 29 20:08:34 2002
-@@ -1284,7 +1284,7 @@
- 	exit (1);
- }
- 
--FILE* real_stdout;
-+FILE real_stdout;
- 
- int
- main (int argc, char **argv)
-@@ -1309,8 +1309,8 @@
- 	std::cout.rdbuf ( std::cerr.rdbuf () );
- 	//
- 	// 4. keep old stdout FILE, and use stderr in its place (for printf ("...") ; )
--	real_stdout = stdout ;
--	stdout = stderr;
-+	real_stdout = *stdout ;
-+	*stdout = *stderr;
- 
- 	displayGreeting();
- 
-@@ -1733,7 +1733,7 @@
- 		if ( 0 == strcmp ( "-", filenameYUV ) )
- 		{
- 			//output.fdYUV = FD_STDOUT;
--			output.fdYUV = fileno ( real_stdout );
-+			output.fdYUV = fileno ( &real_stdout );
- 		}
- 		else
- 		{
-@@ -2042,7 +2042,7 @@
- 	freeAll ();
- 	// reassign cout, stdout to their original values.
- 	std::cout.rdbuf ( real_cout );
--	stdout = real_stdout;
-+	*stdout = real_stdout;
- 
- 	mjpeg_info ( " " );
- 	mjpeg_info ( "Done. %i frames", output.processedFrames );
diff -ruN mjpegtools.orig/files/patch-mplex::systems.hh mjpegtools/files/patch-mplex::systems.hh
--- mjpegtools.orig/files/patch-mplex::systems.hh	Sat Mar  6 05:55:07 2004
+++ mjpegtools/files/patch-mplex::systems.hh	Wed Dec 31 19:00:00 1969
@@ -1,11 +0,0 @@
---- mplex/systems.hh.orig	Thu Mar  4 01:45:50 2004
-+++ mplex/systems.hh	Thu Mar  4 01:46:04 2004
-@@ -4,6 +4,8 @@
- #include <sys/param.h>
- #include "inputstrm.hh"
- 
-+#include <cassert>
-+
- #include <vector>
- 
- using std::vector;
diff -ruN mjpegtools.orig/files/patch-utils::Makefile.in-fpic mjpegtools/files/patch-utils::Makefile.in-fpic
--- mjpegtools.orig/files/patch-utils::Makefile.in-fpic	Wed Dec 31 19:00:00 1969
+++ mjpegtools/files/patch-utils::Makefile.in-fpic	Fri Mar 12 01:53:27 2004
@@ -0,0 +1,11 @@
+--- utils/Makefile.in	2004-01-02 20:41:53.687970979 +0000
++++ utils/Makefile.in	2004-01-02 20:42:03.468500179 +0000
+@@ -289,7 +289,7 @@
+ @AMDEP_TRUE@	./$(DEPDIR)/mpegtimecode.Po ./$(DEPDIR)/yuv4mpeg.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/yuv4mpeg_ratio.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIC
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
diff -ruN mjpegtools.orig/pkg-plist mjpegtools/pkg-plist
--- mjpegtools.orig/pkg-plist	Sat May 10 23:55:35 2003
+++ mjpegtools/pkg-plist	Fri Mar 12 01:53:27 2004
@@ -1,7 +1,5 @@
-%%DIVX%%bin/divxdec
-%%GTK%%bin/glav
 bin/jpeg2yuv
-%%DIVX%%bin/lav2divx
+bin/lav2avi.sh
 bin/lav2mpeg
 bin/lav2wav
 bin/lav2yuv
@@ -17,12 +15,16 @@
 bin/mpegtranscode
 bin/mplex
 bin/multiblend.flt
+bin/pgmtoy4m
+bin/png2yuv
 bin/ppmtoy4m
 bin/transist.flt
 bin/y4mcolorbars
 bin/y4mtoppm
+bin/y4mblack
+bin/y4mshift
+bin/y4mtoyuv
 bin/ypipe
-%%DIVX%%bin/yuv2divx
 bin/yuv2lav
 bin/yuvdenoise
 bin/yuvkineco
@@ -30,9 +32,16 @@
 bin/yuvplay
 bin/yuvscaler
 bin/yuvycsnoise
+bin/yuv4mpeg
+bin/yuvcorrect
+bin/yuvcorrect_tune
+bin/yuvfps
+bin/yuvinactive
 include/mjpegtools/audiolib.h
+include/mjpegtools/avilib.h
 include/mjpegtools/editlist.h
 include/mjpegtools/frequencies.h
+include/mjpegtools/format_codes.h
 include/mjpegtools/jpegutils.h
 include/mjpegtools/lav_io.h
 include/mjpegtools/liblavplay.h
@@ -42,35 +51,65 @@
 include/mjpegtools/mpegconsts.h
 include/mjpegtools/mpegtimecode.h
 include/mjpegtools/yuv4mpeg.h
-lib/liblavfile-1.6.so.1
+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/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
 lib/liblavfile.a
 lib/liblavfile.la
 lib/liblavfile.so
-lib/liblavjpeg-1.6.so.1
+lib/liblavfile-1.6.so
+lib/liblavfile-1.6.so.2
 lib/liblavjpeg.a
 lib/liblavjpeg.la
 lib/liblavjpeg.so
-lib/liblavplay-1.6.so.1
+lib/liblavjpeg-1.6.so
+lib/liblavjpeg-1.6.so.2
 lib/liblavplay.a
 lib/liblavplay.la
 lib/liblavplay.so
+lib/liblavplay-1.6.so
+lib/liblavplay-1.6.so.2
 lib/libmjpegutils.a
+lib/libmpeg2encpp-1.6.so.2
+lib/libmpeg2encpp.a
+lib/libmpeg2encpp.la
+lib/libmpeg2encpp.so
+lib/libmplex2-1.6.so.2
+lib/libmplex2.a
+lib/libmplex2.la
+lib/libmplex2.so
+lib/libmplex2-1.6.so
+lib/libmpeg2encpp-1.6.so
 libdata/pkgconfig/mjpegtools.pc
-%%PORTDOCS%%share/doc/mjpegtools/AUTHORS
-%%PORTDOCS%%share/doc/mjpegtools/BUGS
-%%PORTDOCS%%share/doc/mjpegtools/CHANGES
-%%PORTDOCS%%share/doc/mjpegtools/COPYING
-%%PORTDOCS%%share/doc/mjpegtools/ChangeLog
-%%PORTDOCS%%share/doc/mjpegtools/HINTS
-%%PORTDOCS%%share/doc/mjpegtools/NEWS
-%%PORTDOCS%%share/doc/mjpegtools/PLANS
-%%PORTDOCS%%share/doc/mjpegtools/README
-%%PORTDOCS%%share/doc/mjpegtools/README.DV
-%%PORTDOCS%%share/doc/mjpegtools/README.avilib
-%%PORTDOCS%%share/doc/mjpegtools/README.glav
-%%PORTDOCS%%share/doc/mjpegtools/README.lavpipe
-%%PORTDOCS%%share/doc/mjpegtools/README.transist
-%%PORTDOCS%%share/doc/mjpegtools/TODO
-%%PORTDOCS%%@dirrm share/doc/mjpegtools
 @unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
+@dirrm include/mjpegtools/mpeg2enc
+@dirrm include/mjpegtools/mplex
 @dirrm include/mjpegtools



diff -ruN multimedia/transcode.orig/Makefile multimedia/transcode/Makefile
--- multimedia/transcode.orig/Makefile	Fri Mar 12 01:30:27 2004
+++ multimedia/transcode/Makefile	Fri Mar 12 01:31:49 2004
@@ -7,6 +7,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	0.6.12
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.zebra.fh-weingarten.de/~transcode/pre/
 
@@ -218,7 +219,7 @@
 .endif
 
 .if defined(WITH_MJPEG)
-LIB_DEPENDS+=	lavplay-1.6.1:${PORTSDIR}/multimedia/mjpegtools
+LIB_DEPENDS+=	lavplay-1.6.2:${PORTSDIR}/multimedia/mjpegtools
 PLIST_SUB+=	WITH_MJPEG=""
 .else
 PLIST_SUB+=	WITH_MJPEG="@comment "
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403120733.i2C7X8G3088697>