Attachment #40885 for bug #64145




#

PORTNAME=	mjpegtools
PORTVERSION=	1.6.2
PORTREVISION=	1
CATEGORIES=	multimedia
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	mjpeg

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


USE_REINPLACE=	yes
USE_XLIB=	yes
GNU_CONFIGURE=	yes
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_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
MAN5=	yuv4mpeg.5

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

INFO=		mjpeg-howto
.ifndef(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
.for file in ${DOC_FILES}
	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif

.include <bsd.port.pre.mk>

.if ${ARCH} == "i386"
BUILD_DEPEND+=  nasm:${PORTSDIR}/devel/nasm
.else
PLIST_SUB+=	DIVX=''
.endif

# pre-detection

# option activation
.if ${HAVE_GNOME:Mgtk12}!=""
USE_GNOME+=	gtk12
PLIST_FILES+=	bin/glav
.endif
#
.if defined(WITH_LIBDV_PAL)
CONFIGURE_ARGS+=	--with-dv-yv12
WITH_LIBDV=		yes
.endif
#
.if defined(WITH_LIBDV)
LIB_DEPENDS+=	dv.3:${PORTSDIR}/multimedia/libdv

CONFIGURE_ARGS+=	--with-dv=${LOCALBASE}
.endif
#
.if defined(WITH_LIBGNUGETOPT)
USE_GETOPT_LONG=	yes
.endif
#
.if defined(WITH_LIBMOVTAR)
BUILD_DEPENDS+=	${LOCALBASE}/lib/libmovtar.a:${PORTSDIR}/multimedia/libmovtar

CONFIGURE_ARGS+=	--with-movtar-prefix=${LOCALBASE}
.endif
#
.if defined(WITH_SDL)
USE_SDL=	sdl
CONFIGURE_ARGS+=	--with-sdl
.endif
#
.if defined(WITH_QUICKTIME)
LIB_DEPENDS+=	openquicktime.0:${PORTSDIR}/multimedia/openquicktime

CONFIGURE_ARGS+=	--with-quicktime
.endif

pre-everything::
.if ${HAVE_GNOME:Mgtk12}==""
	@${ECHO_MSG} "====> You can enable GTK support by defining WITH_GNOME"
.endif
.if !defined(WITH_LIBDV)
	@${ECHO_MSG} "====> You can enable DV support by defining WITH_LIBDV"
.endif
.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
.if !defined(WITH_QUICKTIME)
	@${ECHO_MSG} "====> You can enable quicktime support by defining WITH_QUICKTIME"
.endif
.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 |; \

		${WRKSRC}/lavtools/liblavplay.c \
		${WRKSRC}/lavtools/yuvplay.c
	@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \
		${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 \

	@${REINPLACE_CMD} -E -e 's|^(have_pthread=).+$$|\1true|' \
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
.endif
.if defined(WITH_LIBGNUGETOPT)
	@${REINPLACE_CMD} -E -e 's|(AVIPLAY_LIBS \=.*)|\1 -lgnugetopt|' \
		${WRKSRC}/lavtools/Makefile.in
.endif

	@${REINPLACE_CMD} -E -e 's|(AVIPLAY_LIBS \=.*)|\1 ${PTHREAD_LIBS}|' \
		${WRKSRC}/lavtools/Makefile.in

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>

Lines 1-2 Link Here

(-)mjpegtools/distinfo (-2 / +2 lines)
1	MD5 (mjpegtools-1.6.1.tar.gz) = fa2aeec19deafe86d22b34eda329f9f4	1	MD5 (mjpegtools-1.6.2.tar.gz) = 01c0120b0182de67f182ef99ad855daa
2	SIZE (mjpegtools-1.6.1.tar.gz) = 976241	2	SIZE (mjpegtools-1.6.2.tar.gz) = 1256280

Lines 1-10 Link Here

(-)mjpegtools/files/patch-configure (-8 / +56 lines)
1	--- configure.orig Wed Jul 17 00:34:59 2002	1	--- configure.bak Thu Mar 11 22:52:03 2004
2	+++ configure Wed Jul 17 00:35:47 2002	2	+++ configure Thu Mar 11 22:52:46 2004
3	@@ -7297,6 +7297,7 @@	3	@@ -25610,16 +25610,6 @@
		4	have_x86cpu=false
		5	echo "$as_me:$LINENO: checking for Intel Pentium architecture (IA32)" >&5
		6	echo $ECHO_N "checking for Intel Pentium architecture (IA32)... $ECHO_C" >&6
		7	-if test "$host_cpu" = "i386" -o "$host_cpu" = "i486" \
		8	- -o "$host_cpu" = "i586" -o "$host_cpu" = "i686" \
		9	- -o "$host_cpu" = "i786" ; then
		10	- echo "$as_me:$LINENO: result: yes" >&5
		11	-echo "${ECHO_T}yes" >&6
		12	- have_x86cpu=true
		13	-else
		14	- echo "$as_me:$LINENO: result: no" >&5
		15	-echo "${ECHO_T}no" >&6
		16	-fi
4		17
5	# This can be used to rebuild libtool when needed	18	echo "$as_me:$LINENO: checking for PowerPC architecture" >&5
6	LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"	19	echo $ECHO_N "checking for PowerPC architecture... $ECHO_C" >&6
7	+$ac_aux_dir/ltconfig $LIBTOOL_DEPS	20	@@ -25845,38 +25835,6 @@
		21	fi
		22	fi
8		23
9	# Always use our own libtool.	24	-
10	LIBTOOL='$(SHELL) $(top_builddir)/libtool'	25	-
		26	-if test x$have_x86cpu = xtrue ; then
		27	-echo "$as_me:$LINENO: checking x86 sub-architecture settings" >&5
		28	-echo $ECHO_N "checking x86 sub-architecture settings... $ECHO_C" >&6
		29	-
		30	- if test "$enable_cmov_extension" != "no" ; then
		31	- arch=`uname -m`
		32	- else
		33	- arch=i586
		34	- fi
		35	- have_cmov=false
		36	- case $arch in
		37	- i786) ARCHFLAGS="-mcpu=i786 -march=$arch"
		38	- have_cmov=true
		39	- ;;
		40	- i686) ARCHFLAGS="-mcpu=i686 -march=$arch"
		41	- have_cmov=true
		42	- ;;
		43	- i586) ARCHFLAGS="-mcpu=i586 -march=$arch"
		44	- have_cmov=false
		45	- ;;
		46	- *) ARCHFLAGS="-mcpu=i686 -march=$arch"
		47	- have_cmov=true
		48	- ;;
		49	- esac
		50	-echo "$as_me:$LINENO: result: $ARCHFLAGS" >&5
		51	-echo "${ECHO_T}$ARCHFLAGS" >&6
		52	-
		53	-else
		54	- have_cmov=false
		55	-fi
		56
		57
		58	use_zalpha=false




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




--- 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 );

Lines 1-11 Link Here

(-)mjpegtools/files/patch-mplex::systems.hh (-11 lines)
1	--- mplex/systems.hh.orig Thu Mar 4 01:45:50 2004
2	+++ mplex/systems.hh Thu Mar 4 01:46:04 2004
3	@@ -4,6 +4,8 @@
4	#include <sys/param.h>
5	#include "inputstrm.hh"
6
7	+#include <cassert>
8	+
9	#include <vector>
10
11	using std::vector;

Line 0 Link Here

(-)mjpegtools/files/patch-utils::Makefile.in-fpic (+11 lines)
	1	--- utils/Makefile.in 2004-01-02 20:41:53.687970979 +0000
	2	+++ utils/Makefile.in 2004-01-02 20:42:03.468500179 +0000
	3	@@ -289,7 +289,7 @@
	4	@AMDEP_TRUE@ ./$(DEPDIR)/mpegtimecode.Po ./$(DEPDIR)/yuv4mpeg.Po \
	5	@AMDEP_TRUE@ ./$(DEPDIR)/yuv4mpeg_ratio.Po
	6	COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
	7	- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
	8	+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIC
	9	LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
	10	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
	11	CCLD = $(CC)

Lines 1-7 Link Here

(-)mjpegtools/pkg-plist (-23 / +62 lines)
1	%%DIVX%%bin/divxdec
2	%%GTK%%bin/glav
3	bin/jpeg2yuv	1	bin/jpeg2yuv
4	%%DIVX%%bin/lav2divx	2	bin/lav2avi.sh
5	bin/lav2mpeg	3	bin/lav2mpeg
6	bin/lav2wav	4	bin/lav2wav
7	bin/lav2yuv	5	bin/lav2yuv
Lines 17-28 Link Here
17	bin/mpegtranscode	15	bin/mpegtranscode
18	bin/mplex	16	bin/mplex
19	bin/multiblend.flt	17	bin/multiblend.flt
		18	bin/pgmtoy4m
		19	bin/png2yuv
20	bin/ppmtoy4m	20	bin/ppmtoy4m
21	bin/transist.flt	21	bin/transist.flt
22	bin/y4mcolorbars	22	bin/y4mcolorbars
23	bin/y4mtoppm	23	bin/y4mtoppm
		24	bin/y4mblack
		25	bin/y4mshift
		26	bin/y4mtoyuv
24	bin/ypipe	27	bin/ypipe
25	%%DIVX%%bin/yuv2divx
26	bin/yuv2lav	28	bin/yuv2lav
27	bin/yuvdenoise	29	bin/yuvdenoise
28	bin/yuvkineco	30	bin/yuvkineco
Lines 30-38 Link Here
30	bin/yuvplay	32	bin/yuvplay
31	bin/yuvscaler	33	bin/yuvscaler
32	bin/yuvycsnoise	34	bin/yuvycsnoise
		35	bin/yuv4mpeg
		36	bin/yuvcorrect
		37	bin/yuvcorrect_tune
		38	bin/yuvfps
		39	bin/yuvinactive
33	include/mjpegtools/audiolib.h	40	include/mjpegtools/audiolib.h
		41	include/mjpegtools/avilib.h
34	include/mjpegtools/editlist.h	42	include/mjpegtools/editlist.h
35	include/mjpegtools/frequencies.h	43	include/mjpegtools/frequencies.h
		44	include/mjpegtools/format_codes.h
36	include/mjpegtools/jpegutils.h	45	include/mjpegtools/jpegutils.h
37	include/mjpegtools/lav_io.h	46	include/mjpegtools/lav_io.h
38	include/mjpegtools/liblavplay.h	47	include/mjpegtools/liblavplay.h
Lines 42-76 Link Here
42	include/mjpegtools/mpegconsts.h	51	include/mjpegtools/mpegconsts.h
43	include/mjpegtools/mpegtimecode.h	52	include/mjpegtools/mpegtimecode.h
44	include/mjpegtools/yuv4mpeg.h	53	include/mjpegtools/yuv4mpeg.h
45	lib/liblavfile-1.6.so.1	54	include/mjpegtools/mpeg2enc/elemstrmwriter.hh
		55	include/mjpegtools/mpeg2enc/encoderparams.hh
		56	include/mjpegtools/mpeg2enc/macroblock.hh
		57	include/mjpegtools/mpeg2enc/mpeg2coder.hh
		58	include/mjpegtools/mpeg2enc/mpeg2encoder.hh
		59	include/mjpegtools/mpeg2enc/mpeg2encoptions.hh
		60	include/mjpegtools/mpeg2enc/mpeg2encparams.h
		61	include/mjpegtools/mpeg2enc/picture.hh
		62	include/mjpegtools/mpeg2enc/picturereader.hh
		63	include/mjpegtools/mpeg2enc/predict_ref.h
		64	include/mjpegtools/mpeg2enc/quantize.hh
		65	include/mjpegtools/mpeg2enc/quantize_ref.h
		66	include/mjpegtools/mpeg2enc/ratectl.hh
		67	include/mjpegtools/mpeg2enc/seqencoder.hh
		68	include/mjpegtools/mpeg2enc/synchrolib.h
		69	include/mjpegtools/mpeg2enc/syntaxconsts.h
		70	include/mjpegtools/mplex/audiostrm.hpp
		71	include/mjpegtools/mplex/aunit.hpp
		72	include/mjpegtools/mplex/bits.hpp
		73	include/mjpegtools/mplex/buffer.hpp
		74	include/mjpegtools/mplex/inputstrm.hpp
		75	include/mjpegtools/mplex/interact.hpp
		76	include/mjpegtools/mplex/mplexconsts.hpp
		77	include/mjpegtools/mplex/multiplexor.hpp
		78	include/mjpegtools/mplex/outputstrm.hpp
		79	include/mjpegtools/mplex/padstrm.hpp
		80	include/mjpegtools/mplex/stillsstream.hpp
		81	include/mjpegtools/mplex/stream_params.hpp
		82	include/mjpegtools/mplex/systems.hpp
		83	include/mjpegtools/mplex/vector.hpp
		84	include/mjpegtools/mplex/videostrm.hpp
46	lib/liblavfile.a	85	lib/liblavfile.a
47	lib/liblavfile.la	86	lib/liblavfile.la
48	lib/liblavfile.so	87	lib/liblavfile.so
49	lib/liblavjpeg-1.6.so.1	88	lib/liblavfile-1.6.so
		89	lib/liblavfile-1.6.so.2
50	lib/liblavjpeg.a	90	lib/liblavjpeg.a
51	lib/liblavjpeg.la	91	lib/liblavjpeg.la
52	lib/liblavjpeg.so	92	lib/liblavjpeg.so
53	lib/liblavplay-1.6.so.1	93	lib/liblavjpeg-1.6.so
		94	lib/liblavjpeg-1.6.so.2
54	lib/liblavplay.a	95	lib/liblavplay.a
55	lib/liblavplay.la	96	lib/liblavplay.la
56	lib/liblavplay.so	97	lib/liblavplay.so
		98	lib/liblavplay-1.6.so
		99	lib/liblavplay-1.6.so.2
57	lib/libmjpegutils.a	100	lib/libmjpegutils.a
		101	lib/libmpeg2encpp-1.6.so.2
		102	lib/libmpeg2encpp.a
		103	lib/libmpeg2encpp.la
		104	lib/libmpeg2encpp.so
		105	lib/libmplex2-1.6.so.2
		106	lib/libmplex2.a
		107	lib/libmplex2.la
		108	lib/libmplex2.so
		109	lib/libmplex2-1.6.so
		110	lib/libmpeg2encpp-1.6.so
58	libdata/pkgconfig/mjpegtools.pc	111	libdata/pkgconfig/mjpegtools.pc
59	%%PORTDOCS%%share/doc/mjpegtools/AUTHORS
60	%%PORTDOCS%%share/doc/mjpegtools/BUGS
61	%%PORTDOCS%%share/doc/mjpegtools/CHANGES
62	%%PORTDOCS%%share/doc/mjpegtools/COPYING
63	%%PORTDOCS%%share/doc/mjpegtools/ChangeLog
64	%%PORTDOCS%%share/doc/mjpegtools/HINTS
65	%%PORTDOCS%%share/doc/mjpegtools/NEWS
66	%%PORTDOCS%%share/doc/mjpegtools/PLANS
67	%%PORTDOCS%%share/doc/mjpegtools/README
68	%%PORTDOCS%%share/doc/mjpegtools/README.DV
69	%%PORTDOCS%%share/doc/mjpegtools/README.avilib
70	%%PORTDOCS%%share/doc/mjpegtools/README.glav
71	%%PORTDOCS%%share/doc/mjpegtools/README.lavpipe
72	%%PORTDOCS%%share/doc/mjpegtools/README.transist
73	%%PORTDOCS%%share/doc/mjpegtools/TODO
74	%%PORTDOCS%%@dirrm share/doc/mjpegtools
75	@unexec rmdir %D/libdata/pkgconfig 2>/dev/null \|\| true	112	@unexec rmdir %D/libdata/pkgconfig 2>/dev/null \|\| true
		113	@dirrm include/mjpegtools/mpeg2enc
		114	@dirrm include/mjpegtools/mplex
76	@dirrm include/mjpegtools	115	@dirrm include/mjpegtools

Return to bug 64145

Lines 6-13 Link Here

(-)mjpegtools/Makefile (-49 / +51 lines)
6	#	6	#
7		7
8	PORTNAME= mjpegtools	8	PORTNAME= mjpegtools
9	PORTVERSION= 1.6.1	9	PORTVERSION= 1.6.2
10	PORTREVISION= 1
11	CATEGORIES= multimedia	10	CATEGORIES= multimedia
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= mjpeg	12	MASTER_SITE_SUBDIR= mjpeg
Lines 15-21 Link Here
15	MAINTAINER= lioux@FreeBSD.org	14	MAINTAINER= lioux@FreeBSD.org
16	COMMENT= Set of tools to record/playback/edit videos in MPEG format	15	COMMENT= Set of tools to record/playback/edit videos in MPEG format
17		16
18	BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
19	LIB_DEPENDS= aviplay.0:${PORTSDIR}/multimedia/avifile \	17	LIB_DEPENDS= aviplay.0:${PORTSDIR}/multimedia/avifile \
20	jpeg.9:${PORTSDIR}/graphics/jpeg	18	jpeg.9:${PORTSDIR}/graphics/jpeg
21		19
Lines 25-61 Link Here
25	USE_REINPLACE= yes	23	USE_REINPLACE= yes
26	USE_XLIB= yes	24	USE_XLIB= yes
27	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
28	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" \	26	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${CPPFLAGS} ${PTHREAD_CFLAGS}" \
29	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS:S/"//g}" \	27	LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS} ${PTHREAD_LIBS:S/"//g}" \
30	PTHREAD_LIBS="${PTHREAD_LIBS:S/"//g}"	28	PTHREAD_LIBS="${PTHREAD_LIBS:S/"//g}"
		29	CONFIGURE_ARGS= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
		30	--program-transform-name=""
31	WANT_GNOME= yes	31	WANT_GNOME= yes
32	WANT_SDL= yes	32	WANT_SDL= yes
33		33
34	MAN1= divxdec.1 jpeg2yuv.1 lav2divx.1 lav2mpeg.1 lav2wav.1 lav2yuv.1 \	34	MAN1_EXTRA= lavplay.1 lavrec.1 mjpegtools.1 mpeg2enc.1 mplex.1 \
35	lavpipe.1 lavplay.1 lavrec.1 lavtrans.1 mjpegtools.1 mp2enc.1 \	35	yuvplay.1 lav2wav.1 lav2yuv.1 lavtrans.1 mp2enc.1 \
36	mpeg2enc.1 mplex.1 ppmtoy4m.1 y4mcolorbars.1 y4mtoppm.1 \	36	yuvscaler.1 lavpipe.1 yuv2lav.1 yuvdenoise.1 jpeg2yuv.1 \
37	yuv2divx.1 yuv2lav.1 yuvdenoise.1 yuvkineco.1 yuvmedianfilter.1 \	37	pgmtoy4m.1 ppmtoy4m.1 y4mtoppm.1 y4mcolorbars.1 \
38	yuvplay.1 yuvscaler.1 yuvycsnoise.1	38	yuvkineco.1 yuvycsnoise.1 yuvmedianfilter.1 lav2mpeg.1 yuvfps.1
39	MAN5= yuv4mpeg.5
40		39
41	DOC_FILES= AUTHORS BUGS CHANGES COPYING ChangeLog HINTS NEWS \	40	MAN1= ${MAN1_EXTRA} yuvinactive.1
		41
		42	MAN5= yuv4mpeg.5
		43
		44	PORTDOCS= AUTHORS BUGS CHANGES COPYING ChangeLog HINTS NEWS \
42	PLANS README README.DV README.avilib README.glav \	45	PLANS README README.DV README.avilib README.glav \
43	README.lavpipe README.transist TODO	46	README.lavpipe README.transist TODO
44		47
45	post-install:	48	INFO= mjpeg-howto
46	.ifndef(NOPORTDOCS)
47	@${MKDIR} ${DOCSDIR}
48	.for file in ${DOC_FILES}
49	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
50	.endfor
51	.endif
52		49
53	.include <bsd.port.pre.mk>	50	.include <bsd.port.pre.mk>
54		51
55	.if ${ARCH} != "i386"	52	.if ${ARCH} == "i386"
56	PLIST_SUB+= DIVX='@comment '	53	BUILD_DEPEND+= nasm:${PORTSDIR}/devel/nasm
57	.else
58	PLIST_SUB+= DIVX=''
59	.endif	54	.endif
60		55
61	# pre-detection	56	# pre-detection
Lines 84-145 Link Here
84	# option activation	79	# option activation
85	.if ${HAVE_GNOME:Mgtk12}!=""	80	.if ${HAVE_GNOME:Mgtk12}!=""
86	USE_GNOME+= gtk12	81	USE_GNOME+= gtk12
87	PLIST_SUB+= GTK=""	82	PLIST_FILES+= bin/glav
88	.else	83	.endif
89	PLIST_SUB+= GTK="@comment "	84	#
		85	.if defined(WITH_LIBDV_PAL)
		86	CONFIGURE_ARGS+= --with-dv-yv12
		87	WITH_LIBDV= yes
90	.endif	88	.endif
91	#	89	#
92	.ifdef(WITH_LIBDV)	90	.if defined(WITH_LIBDV)
93	LIB_DEPENDS+= dv.3:${PORTSDIR}/multimedia/libdv	91	LIB_DEPENDS+= dv.3:${PORTSDIR}/multimedia/libdv
94		92
95	CONFIGURE_ARGS+= --with-dv=${LOCALBASE}	93	CONFIGURE_ARGS+= --with-dv=${LOCALBASE}
96	.endif	94	.endif
97	#	95	#
98	.ifdef(WITH_LIBGNUGETOPT)	96	.if defined(WITH_LIBGNUGETOPT)
99	USE_GETOPT_LONG= yes	97	USE_GETOPT_LONG= yes
100	.endif	98	.endif
101	#	99	#
102	.ifdef(WITH_LIBMOVTAR)	100	.if defined(WITH_LIBMOVTAR)
103	BUILD_DEPENDS+= ${LOCALBASE}/lib/libmovtar.a:${PORTSDIR}/multimedia/libmovtar	101	BUILD_DEPENDS+= ${LOCALBASE}/lib/libmovtar.a:${PORTSDIR}/multimedia/libmovtar
104		102
105	CONFIGURE_ARGS+= --with-movtar-prefix=${LOCALBASE}	103	CONFIGURE_ARGS+= --with-movtar-prefix=${LOCALBASE}
106	.endif	104	.endif
107	#	105	#
108	.ifdef(WITH_SDL)	106	.if defined(WITH_SDL)
109	USE_SDL= sdl	107	USE_SDL= sdl
110	CONFIGURE_ARGS+= --with-sdl	108	CONFIGURE_ARGS+= --with-sdl
111	.endif	109	.endif
112	#	110	#
113	.ifdef(WITH_QUICKTIME)	111	.if defined(WITH_QUICKTIME)
114	LIB_DEPENDS+= openquicktime.0:${PORTSDIR}/multimedia/openquicktime	112	LIB_DEPENDS+= openquicktime.0:${PORTSDIR}/multimedia/openquicktime
115		113
116	CONFIGURE_ARGS+= --with-quicktime=${LOCALBASE}	114	CONFIGURE_ARGS+= --with-quicktime
117	.endif	115	.endif
118		116
119	pre-everything::	117	pre-everything::
120	.if ${HAVE_GNOME:Mgtk12}==""	118	.if ${HAVE_GNOME:Mgtk12}==""
121	@${ECHO_MSG} "====> You can enable GTK support by defining WITH_GNOME"	119	@${ECHO_MSG} "====> You can enable GTK support by defining WITH_GNOME"
122	.endif	120	.endif
123	.ifndef(WITH_LIBDV)	121	.if !defined(WITH_LIBDV)
124	@${ECHO_MSG} "====> You can enable DV support by defining WITH_LIBDV"	122	@${ECHO_MSG} "====> You can enable DV support by defining WITH_LIBDV"
125	.endif	123	.endif
126	.ifndef(WITH_LIBMOVTAR)	124	.if !defined(WITH_LIBDV_PAL)
		125	@${ECHO_MSG} "====> You can enable DV PAL support by defining WITH_LIBDV_PAL"
		126	.endif
		127	.if !defined(WITH_LIBMOVTAR)
127	@${ECHO_MSG} "====> You can enable movtar support by defining WITH_LIBMOVTAR"	128	@${ECHO_MSG} "====> You can enable movtar support by defining WITH_LIBMOVTAR"
128	.endif	129	.endif
129	.ifndef(WITH_QUICKTIME)	130	.if !defined(WITH_QUICKTIME)
130	@${ECHO_MSG} "====> You can enable quicktime support by defining WITH_QUICKTIME"	131	@${ECHO_MSG} "====> You can enable quicktime support by defining WITH_QUICKTIME"
131	.endif	132	.endif
132	.ifndef(WITH_SDL)	133	.if !defined(WITH_SDL)
133	@${ECHO_MSG} "====> You can enable SDL support by defining WITH_SDL"	134	@${ECHO_MSG} "====> You can enable SDL support by defining WITH_SDL"
134	.endif	135	.endif
135		136
136	post-patch:	137	post-patch:
137	@${REINPLACE_CMD} -E -e 's\|^(pkgconfigdir = )\$$\(libdir\)/(pkgconfig)\|\1${PREFIX}/libdata/\2\|' \	138	@${REINPLACE_CMD} -E -e 's\|^(pkgconfigdir = )\$$\(libdir\)/(pkgconfig)\|\1${PREFIX}/libdata/\2\|' \
138	${WRKSRC}/Makefile.in	139	${WRKSRC}/Makefile.in
139	@${REINPLACE_CMD} -e 's\|stdint.h\|sys/types.h\|' \
140	${WRKSRC}/lavtools/lav2divx.cpp \
141	${WRKSRC}/lavtools/yuv2divx.cpp \
142	${WRKSRC}/lavtools/divxdec.cpp
143	@${REINPLACE_CMD} -E -e 's@(-l(jpeg\|openquicktime\|png))@-L${LOCALBASE}/lib \1@; \	140	@${REINPLACE_CMD} -E -e 's@(-l(jpeg\|openquicktime\|png))@-L${LOCALBASE}/lib \1@; \
144	s\|(-I) (\$$with_quicktime)\|\1\2/include/openquicktime\|; \	141	s\|(-I) (\$$with_quicktime)\|\1\2/include/openquicktime\|; \
145	s\|(-L\$$with_quicktime) \|\1/lib \|; \	142	s\|(-L\$$with_quicktime) \|\1/lib \|; \
Lines 153-160 Link Here
153	${WRKSRC}/lavtools/liblavplay.c \	150	${WRKSRC}/lavtools/liblavplay.c \
154	${WRKSRC}/lavtools/yuvplay.c	151	${WRKSRC}/lavtools/yuvplay.c
155	@${REINPLACE_CMD} -e 's\|/bin/bash\|${LOCALBASE}/bin/bash\|' \	152	@${REINPLACE_CMD} -e 's\|/bin/bash\|${LOCALBASE}/bin/bash\|' \
156	${WRKSRC}/scripts/lav2mpeg ${WRKSRC}/scripts/mpegtranscode	153	${WRKSRC}/scripts/lav2mpeg ${WRKSRC}/scripts/mpegtranscode \
157	.ifdef(WITH_QUICKTIME)	154	${WRKSRC}/scripts/lav2avi.sh
		155	.if defined(WITH_QUICKTIME)
158	@${REINPLACE_CMD} -E -e 's\|^(have_openquicktime=).+$$\|\1true\|' \	156	@${REINPLACE_CMD} -E -e 's\|^(have_openquicktime=).+$$\|\1true\|' \
159	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	157	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
160	@${REINPLACE_CMD} -E \	158	@${REINPLACE_CMD} -E \
Lines 170-176 Link Here
170	@${REINPLACE_CMD} -E -e 's\|^(have_pthread=).+$$\|\1true\|' \	168	@${REINPLACE_CMD} -E -e 's\|^(have_pthread=).+$$\|\1true\|' \
171	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	169	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
172	.endif	170	.endif
173	.ifdef(WITH_LIBGNUGETOPT)	171	.if defined(WITH_LIBGNUGETOPT)
174	@${REINPLACE_CMD} -E -e 's\|(AVIPLAY_LIBS \=.*)\|\1 -lgnugetopt\|' \	172	@${REINPLACE_CMD} -E -e 's\|(AVIPLAY_LIBS \=.*)\|\1 -lgnugetopt\|' \
175	${WRKSRC}/lavtools/Makefile.in	173	${WRKSRC}/lavtools/Makefile.in
176	.endif	174	.endif
Lines 178-189 Link Here
178	@${REINPLACE_CMD} -E -e 's\|(AVIPLAY_LIBS \=.*)\|\1 ${PTHREAD_LIBS}\|' \	176	@${REINPLACE_CMD} -E -e 's\|(AVIPLAY_LIBS \=.*)\|\1 ${PTHREAD_LIBS}\|' \
179	${WRKSRC}/lavtools/Makefile.in	177	${WRKSRC}/lavtools/Makefile.in
180		178
181	post-configure:	179	post-install:
182	@${CP} -f ${LIBTOOL} ${WRKSRC}	180	.if !defined(NOPORTDOCS)
183		181	@${MKDIR} ${DOCSDIR}
184	pre-build:	182	.for file in ${PORTDOCS}
185	.ifdef(WITH_QUICKTIME)	183	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
186	@${ECHO_CMD} "#define HAVE_OPENQUICKTIME 1" >> ${WRKSRC}/config.h	184	.endfor
187	.endif	185	.endif
		186	.for man in ${MAN1_EXTRA}
		187	@${INSTALL_MAN} ${WRKSRC}/docs/${man} ${MANPREFIX}/man/man1
		188	.endfor
		189	@${INSTALL_MAN} ${WRKSRC}/docs/yuv4mpeg.5 ${MANPREFIX}/man/man5
188		190
189	.include <bsd.port.post.mk>	191	.include <bsd.port.post.mk>

Lines 1-60 Link Here

(-)mjpegtools/files/patch-gcc3-yuvdenoise::motion.c (-60 lines)
1	diff -uNr yuvdenoise/motion.c yuvdenoise/motion.c.orig
2	--- yuvdenoise/motion.c 2002-05-06 04:13:37.000000000 -0400
3	+++ yuvdenoise/motion.c.orig 2003-07-25 01:52:38.339744992 -0400
4	@@ -251,6 +251,9 @@
5	" movl %1 , %%eax; /* load frameadress into eax */\n"
6	" movl %2 , %%ebx; /* load frameadress into ebx */\n"
7	" movl %3 , %%ecx; /* load width into ecx */\n"
8	+ " shrl $1 , %%ecx; /* shift width to scale it in the asm. */\n"
9	+ " /* why? we need an lvalue as input... gcc33... */\n"
10	+ " /* (carrbc1@wfu.edu) */\n"
11	" /* */\n"
12	".rept 4 ; /* Loop for 4 lines */\n"
13	" movd (%%eax), %%mm1; /* 4 Pixels from filtered frame to mm1 */\n"
14	@@ -270,7 +273,7 @@
15	" /* */\n"
16	" movq %%mm0 , %0 ; /* make mm0 available to gcc ... */\n"
17	:"=m" (a)
18	- :"m" (frm), "m" (ref), "m" (denoiser.frame.w/2)
19	+ :"m" (frm), "m" (ref), "m" (denoiser.frame.w)
20	:"%eax", "%ebx", "%ecx"
21	);
22	#endif
23	@@ -295,7 +298,10 @@
24	" movl %1 , %%eax; /* load frameadress into eax */\n"
25	" movl %2 , %%ebx; /* load frameadress into ebx */\n"
26	" movl %3 , %%ecx; /* load width into ecx */\n"
27	- " ; /* */\n"
28	+ " shrl $1 , %%ecx; /* shift width to scale it in the asm. */\n"
29	+ " /* why? we need an lvalue as input... gcc33... */\n"
30	+ " /* (carrbc1@wfu.edu) */\n"
31	+ " /* */\n"
32	" .rept 4 ; /* */\n"
33	" movd (%%eax), %%mm1; /* 4 Pixels from filtered frame to mm1 */\n"
34	" movd (%%ebx), %%mm2; /* 4 Pixels from filtered frame to mm2 */\n"
35	@@ -307,7 +313,7 @@
36	" /* */\n"
37	" movq %%mm0 , %0 ; /* make mm0 available to gcc ... */\n"
38	:"=m" (a)
39	- :"m" (frm), "m" (ref), "m" (denoiser.frame.w/2)
40	+ :"m" (frm), "m" (ref), "m" (denoiser.frame.w)
41	:"%eax", "%ebx", "%ecx"
42	);
43	#endif
44	@@ -349,6 +355,7 @@
45	static uint32_t a;
46	#ifdef HAVE_ASM_MMX
47	static uint32_t bit_mask[2] = {0x7f7f7f7f,0x7f7f7f7f};
48	+ static uint32_t* bit_mask_addr = bit_mask;
49
50	__asm__ __volatile__
51	(
52	@@ -380,7 +387,7 @@
53	" /* */"
54	" movq %%mm0 , %0 ; /* make mm0 available to gcc ... */"
55	:"=m" (a)
56	- :"m" (frm1),"m" (frm2), "m" (ref), "m" (denoiser.frame.w), "m" (bit_mask)
57	+ :"m" (frm1),"m" (frm2), "m" (ref), "m" (denoiser.frame.w), "m" (bit_mask_addr)
58	:"%eax", "%ebx", "%ecx", "%edx"
59	);
60	#endif

Lines 1-40 Link Here

(-)mjpegtools/files/patch-lavtools::divxdec.cpp (-40 lines)
1	--- lavtools/divxdec.cpp.orig Wed May 29 19:02:12 2002
2	+++ lavtools/divxdec.cpp Wed May 29 20:08:34 2002
3	@@ -1284,7 +1284,7 @@
4	exit (1);
5	}
6
7	-FILE* real_stdout;
8	+FILE real_stdout;
9
10	int
11	main (int argc, char **argv)
12	@@ -1309,8 +1309,8 @@
13	std::cout.rdbuf ( std::cerr.rdbuf () );
14	//
15	// 4. keep old stdout FILE, and use stderr in its place (for printf ("...") ; )
16	- real_stdout = stdout ;
17	- stdout = stderr;
18	+ real_stdout = *stdout ;
19	+ stdout = stderr;
20
21	displayGreeting();
22
23	@@ -1733,7 +1733,7 @@
24	if ( 0 == strcmp ( "-", filenameYUV ) )
25	{
26	//output.fdYUV = FD_STDOUT;
27	- output.fdYUV = fileno ( real_stdout );
28	+ output.fdYUV = fileno ( &real_stdout );
29	}
30	else
31	{
32	@@ -2042,7 +2042,7 @@
33	freeAll ();
34	// reassign cout, stdout to their original values.
35	std::cout.rdbuf ( real_cout );
36	- stdout = real_stdout;
37	+ *stdout = real_stdout;
38
39	mjpeg_info ( " " );
40	mjpeg_info ( "Done. %i frames", output.processedFrames );