Date: Wed, 20 Jun 2007 16:42:43 +1000 (EST) From: Edwin Groothuis <edwin@mavetju.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/113878: [patch] multimedia/mjpegtools - update to 1.9rc1 Message-ID: <20070620064243.B1FA7EF@k7.mavetju> Resent-Message-ID: <200706200650.l5K6o2l0049276@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 113878
>Category: ports
>Synopsis: [patch] multimedia/mjpegtools - update to 1.9rc1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Jun 20 06:50:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Edwin Groothuis
>Release: FreeBSD 6.2-RELEASE-p4 i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 6.2-RELEASE-p4 FreeBSD 6.2-RELEASE-p4 #0: Thu Apr 26 17:55:55 UTC 2007 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/SMP i386
>Description:
The current mjpegtools (mpeg2enc for example) is dumping core way
too often to be able to do useful media conversions.
This version has been running on my system for two weeks now and
it works much better.
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/mjpegtools/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- Makefile 19 May 2007 20:17:44 -0000 1.58
+++ Makefile 20 Jun 2007 06:38:59 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= mjpegtools
-DISTVERSION= 1.8.0
-PORTREVISION= 6
+DISTVERSION= 1.9.0rc1
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= mjpeg
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/multimedia/mjpegtools/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 9 Nov 2005 07:09:42 -0000 1.7
+++ distinfo 20 Jun 2007 06:38:59 -0000
@@ -1,3 +1,3 @@
-MD5 (mjpegtools-1.8.0.tar.gz) = 6fd98362310480bdaf7171e9659f165f
-SHA256 (mjpegtools-1.8.0.tar.gz) = d841575c72cd0e587c1bab703d0906e3d23bf428424000557739cf5d6097209a
-SIZE (mjpegtools-1.8.0.tar.gz) = 1475998
+MD5 (mjpegtools-1.9.0rc1.tar.gz) = 35359d4e0947602f2851e7351f574ac9
+SHA256 (mjpegtools-1.9.0rc1.tar.gz) = 50439edf61e58da8ef7143529bce86ed1f5a4711497bd5ea0f026ec9ec77ee81
+SIZE (mjpegtools-1.9.0rc1.tar.gz) = 2339752
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/multimedia/mjpegtools/pkg-plist,v
retrieving revision 1.16
diff -u -r1.16 pkg-plist
--- pkg-plist 22 Dec 2006 23:09:45 -0000 1.16
+++ pkg-plist 20 Jun 2007 06:38:59 -0000
@@ -10,6 +10,7 @@
bin/lavpipe
%%SDL:%%bin/lavplay
bin/lavtrans
+bin/lavtc.sh
bin/matteblend.flt
bin/mjpeg_simd_helper
bin/mp2enc
@@ -23,6 +24,7 @@
bin/ppmtoy4m
bin/transist.flt
bin/y4mblack
+bin/y4mivtc
bin/y4mcolorbars
bin/y4mdenoise
bin/y4mhist
@@ -69,6 +71,9 @@
include/mjpegtools/mpeg2enc/mpeg2encoptions.hh
include/mjpegtools/mpeg2enc/mpeg2encparams.h
include/mjpegtools/mpeg2enc/mpeg2syntaxcodes.h
+include/mjpegtools/mpeg2enc/ontheflyratectl.hh
+include/mjpegtools/mpeg2enc/pass1ratectl.hh
+include/mjpegtools/mpeg2enc/pass2ratectl.hh
include/mjpegtools/mpeg2enc/picture.hh
include/mjpegtools/mpeg2enc/picturereader.hh
include/mjpegtools/mpeg2enc/predict_ref.h
@@ -97,33 +102,33 @@
include/mjpegtools/mplex/systems.hpp
include/mjpegtools/mplex/videostrm.hpp
include/mjpegtools/yuv4mpeg.h
-lib/liblavfile-1.8.so
-lib/liblavfile-1.8.so.0
+lib/liblavfile-1.9.so
+lib/liblavfile-1.9.so.1
lib/liblavfile.a
lib/liblavfile.la
lib/liblavfile.so
-lib/liblavjpeg-1.8.so
-lib/liblavjpeg-1.8.so.0
+lib/liblavjpeg-1.9.so
+lib/liblavjpeg-1.9.so.1
lib/liblavjpeg.a
lib/liblavjpeg.la
lib/liblavjpeg.so
-%%SDL:%%lib/liblavplay-1.8.so
-%%SDL:%%lib/liblavplay-1.8.so.0
+%%SDL:%%lib/liblavplay-1.9.so
+%%SDL:%%lib/liblavplay-1.9.so.1
%%SDL:%%lib/liblavplay.a
%%SDL:%%lib/liblavplay.la
%%SDL:%%lib/liblavplay.so
-lib/libmjpegutils-1.8.so
-lib/libmjpegutils-1.8.so.0
+lib/libmjpegutils-1.9.so
+lib/libmjpegutils-1.9.so.1
lib/libmjpegutils.a
lib/libmjpegutils.la
lib/libmjpegutils.so
-lib/libmpeg2encpp-1.8.so
-lib/libmpeg2encpp-1.8.so.0
+lib/libmpeg2encpp-1.9.so
+lib/libmpeg2encpp-1.9.so.1
lib/libmpeg2encpp.a
lib/libmpeg2encpp.la
lib/libmpeg2encpp.so
-lib/libmplex2-1.8.so
-lib/libmplex2-1.8.so.0
+lib/libmplex2-1.9.so
+lib/libmplex2-1.9.so.1
lib/libmplex2.a
lib/libmplex2.la
lib/libmplex2.so
Index: files/patch-gcc41
===================================================================
RCS file: files/patch-gcc41
diff -N files/patch-gcc41
--- files/patch-gcc41 30 Jan 2007 22:31:09 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- y4mdenoise/Region2D.hh.orig Tue Jan 30 16:27:22 2007
-+++ y4mdenoise/Region2D.hh Tue Jan 30 16:27:36 2007
-@@ -16,7 +16,7 @@
-
- #include "Status_t.h"
- #include <iostream>
--
-+#include <cassert>
-
-
- // The 2-dimensional region class. Parameterized by the numeric type
Index: files/patch-lavtools_lav_io.c
===================================================================
RCS file: files/patch-lavtools_lav_io.c
diff -N files/patch-lavtools_lav_io.c
--- files/patch-lavtools_lav_io.c 11 Feb 2006 18:57:15 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-===================================================================
-RCS file: /cvsroot/mjpeg/mjpeg_play/lavtools/lav_io.c,v
-retrieving revision 1.74
-retrieving revision 1.78
-diff -u -r1.74 -r1.78
---- lavtools/lav_io.c 2005/10/24 03:17:56 1.74
-+++ lavtools/lav_io.c 2005/12/04 19:59:47 1.78
-@@ -1395,8 +1395,8 @@
- break;
- #ifdef HAVE_LIBQUICKTIME
- case 'q':
-- res = fileno(((quicktime_t *)lav_file->qt_fd)->stream);
-- break;
-+ res = lqt_fileno((quicktime_t *)lav_file->qt_fd);
-+ break;
- #endif
- default:
- res = -1;
Index: files/patch-mplex_main.cpp
===================================================================
RCS file: /home/pcvs/ports/multimedia/mjpegtools/files/patch-mplex_main.cpp,v
retrieving revision 1.1
diff -u -r1.1 patch-mplex_main.cpp
--- files/patch-mplex_main.cpp 20 Jul 2005 08:16:54 -0000 1.1
+++ files/patch-mplex_main.cpp 20 Jun 2007 06:38:59 -0000
@@ -1,5 +1,5 @@
---- mplex/main.cpp.orig Thu Dec 9 21:13:26 2004
-+++ mplex/main.cpp Mon Jul 18 21:11:07 2005
+--- mplex/main.cpp.orig Wed Jun 20 13:40:39 2007
++++ mplex/main.cpp Wed Jun 20 13:41:49 2007
@@ -38,6 +38,7 @@
#endif
#include <ctype.h>
@@ -8,43 +8,47 @@
#include "cpu_accel.h"
#include "mjpeg_types.h"
#include "mjpeg_logging.h"
-@@ -107,6 +108,13 @@
+@@ -107,6 +108,14 @@
+ {
mjpeg_error_exit1( "Could not open for writing: %s", cur_filename );
}
-
-+ {
-+ int flags;
++ {
++ int flags;
+
-+ (void)fcntl(fileno(strm), F_GETFL, &flags);
-+ (void)fcntl(fileno(strm), F_SETFL, flags & ~O_NONBLOCK);
-+ }
++ (void)fcntl(fileno(strm), F_GETFL, &flags);
++ (void)fcntl(fileno(strm), F_SETFL, flags & ~O_NONBLOCK);
++ }
+
++
+
return 0;
}
-
-@@ -144,6 +152,12 @@
- {
+@@ -143,6 +152,13 @@
mjpeg_error_exit1( "Could not open for writing: %s", cur_filename );
}
-+ {
-+ int flags;
+ segment_len = 0;
++ {
++ int flags;
++
++ (void)fcntl(fileno(strm), F_GETFL, &flags);
++ (void)fcntl(fileno(strm), F_SETFL, flags & ~O_NONBLOCK);
++ }
+
-+ (void)fcntl(fileno(strm), F_GETFL, &flags);
-+ (void)fcntl(fileno(strm), F_SETFL, flags & ~O_NONBLOCK);
-+ }
}
void
-@@ -200,6 +214,14 @@
+@@ -200,6 +216,14 @@
{
mjpeg_error_exit1( "Unable to open file %s for reading.", bs_filename);
}
+
-+ {
-+ int flags;
++ {
++ int flags;
+
-+ (void)fcntl(fileno(fileh), F_GETFL, &flags);
-+ (void)fcntl(fileno(fileh), F_SETFL, flags & ~O_NONBLOCK);
-+ }
++ (void)fcntl(fileno(fileh), F_GETFL, &flags);
++ (void)fcntl(fileno(fileh), F_SETFL, flags & ~O_NONBLOCK);
++ }
+
filename = strcpy( new char[strlen(bs_filename)+1], bs_filename );
+ streamname = filename;
+
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070620064243.B1FA7EF>