Date: Thu, 25 Mar 2004 18:10:29 +0100 (CET) From: Koop Mast <kwm@rainbow-runner.nl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/64721: Update mjpegtools to 1.6.2 Message-ID: <20040325171029.F351220AE@rainbow-runner.nl> Resent-Message-ID: <200403251720.i2PHKBJZ057889@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 64721 >Category: ports >Synopsis: Update mjpegtools 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 25 09:20:10 PST 2004 >Closed-Date: >Last-Modified: >Originator: Koop Mast >Release: FreeBSD 5.2.1-RELEASE-p3 i386 >Organization: >Environment: System: FreeBSD prisma.rainbow-runner.nl 5.2.1-RELEASE-p3 FreeBSD 5.2.1-RELEASE-p3 #21: Thu Mar 18 10:47:31 CET 2004 root@prisma.rainbow-runner.nl:/usr/obj/usr/src/sys/UnderTheRainbow i386 >Description: Upgrade to 1.6.2. Use libtool 1.5 because 1.4 & 1.3 don't know "--tag=CC". Modify CONFIGURE_ENV so jpeg is detected, don't know why it isn't found correctly with the old CONFIGURE_ENV. I'm not sure what to do with the .info-1 .info-2 .info-3 files .. >How-To-Repeat: >Fix: --- mjpegtools.1.6.2.diff begins here --- diff -ruN mjpegtools.orig/Makefile mjpegtools/Makefile --- mjpegtools.orig/Makefile Tue Mar 16 15:07:45 2004 +++ mjpegtools/Makefile Mon Mar 22 20:10:48 2004 @@ -6,8 +6,7 @@ # PORTNAME= mjpegtools -PORTVERSION= 1.6.1 -PORTREVISION= 2 +PORTVERSION= 1.6.2 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mjpeg @@ -21,22 +20,24 @@ USE_GNOME= glib12 USE_GMAKE= yes -USE_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_REINPLACE= yes USE_XLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \ - LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS:S/"//g}" \ - PTHREAD_LIBS="${PTHREAD_LIBS:S/"//g}" +CONFIGURE_ARGS+= --program-transform-name="" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ + PTHREAD_LIB="${PTHREAD_LIBS}" WANT_GNOME= yes WANT_SDL= yes -MAN1= divxdec.1 jpeg2yuv.1 lav2divx.1 lav2mpeg.1 lav2wav.1 lav2yuv.1 \ +MAN1= jpeg2yuv.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 + mpeg2enc.1 mplex.1 pgmtoy4m.1 ppmtoy4m.1 y4mcolorbars.1 y4mtoppm.1 \ + yuv2lav.1 yuvdenoise.1 yuvfps.1 yuvinactive.1 yuvkineco.1 \ + yuvmedianfilter.1 yuvplay.1 yuvscaler.1 yuvycsnoise.1 MAN5= yuv4mpeg.5 +INFO= mjpeg-howto.info mjpeg-howto.info-1 mjpeg-howto.info-2 mjpeg-howto.info-3 DOC_FILES= AUTHORS BUGS CHANGES COPYING ChangeLog HINTS NEWS \ PLANS README README.DV README.avilib README.glav \ @@ -136,10 +137,6 @@ 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 |; \ diff -ruN mjpegtools.orig/distinfo mjpegtools/distinfo --- mjpegtools.orig/distinfo Sun Feb 8 22:45:39 2004 +++ mjpegtools/distinfo Fri Mar 19 13:19:48 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-gcc3-yuvdenoise::motion.c mjpegtools/files/patch-gcc3-yuvdenoise::motion.c --- mjpegtools.orig/files/patch-gcc3-yuvdenoise::motion.c Sat Mar 6 11:55:07 2004 +++ mjpegtools/files/patch-gcc3-yuvdenoise::motion.c Thu Jan 1 01:00:00 1970 @@ -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 20:19:48 2002 +++ mjpegtools/files/patch-lavtools::divxdec.cpp Thu Jan 1 01:00:00 1970 @@ -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 11:55:07 2004 +++ mjpegtools/files/patch-mplex::systems.hh Thu Jan 1 01:00:00 1970 @@ -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/pkg-plist mjpegtools/pkg-plist --- mjpegtools.orig/pkg-plist Sun May 11 05:55:35 2003 +++ mjpegtools/pkg-plist Fri Mar 19 19:38:36 2004 @@ -1,7 +1,6 @@ -%%DIVX%%bin/divxdec %%GTK%%bin/glav bin/jpeg2yuv -%%DIVX%%bin/lav2divx +bin/lav2avi.sh bin/lav2mpeg bin/lav2wav bin/lav2yuv @@ -17,21 +16,32 @@ 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 -%%DIVX%%bin/yuv2divx 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 @@ -39,22 +49,65 @@ 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 -lib/liblavfile-1.6.so.1 +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.2 lib/liblavfile.a -lib/liblavfile.la lib/liblavfile.so -lib/liblavjpeg-1.6.so.1 +lib/liblavjpeg-1.6.so +lib/liblavjpeg-1.6.so.2 lib/liblavjpeg.a -lib/liblavjpeg.la lib/liblavjpeg.so -lib/liblavplay-1.6.so.1 +lib/liblavplay-1.6.so +lib/liblavplay-1.6.so.2 lib/liblavplay.a -lib/liblavplay.la lib/liblavplay.so lib/libmjpegutils.a +lib/libmpeg2encpp-1.6.so +lib/libmpeg2encpp-1.6.so.2 +lib/libmpeg2encpp.a +lib/libmpeg2encpp.so +lib/libmplex2-1.6.so +lib/libmplex2-1.6.so.2 +lib/libmplex2.a +lib/libmplex2.so libdata/pkgconfig/mjpegtools.pc %%PORTDOCS%%share/doc/mjpegtools/AUTHORS %%PORTDOCS%%share/doc/mjpegtools/BUGS @@ -73,4 +126,6 @@ %%PORTDOCS%%share/doc/mjpegtools/TODO %%PORTDOCS%%@dirrm share/doc/mjpegtools @unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true +@dirrm include/mjpegtools/mplex +@dirrm include/mjpegtools/mpeg2enc @dirrm include/mjpegtools --- mjpegtools.1.6.2.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040325171029.F351220AE>