Attachment #125392 for bug #169005





PORTNAME=	mjpegtools
PORTVERSION=	2.0.0
PORTREVISION=	4
CATEGORIES=	multimedia
MASTER_SITES=	SF/${PORTNAME:S/tools//}/${PORTNAME}/${PORTVERSION}

MAINTAINER=	multimedia@FreeBSD.org
COMMENT=	Set of tools to record/playback/edit videos in MPEG format

LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg

OPTIONS_DEFINE=	GTK2 SDL PNG DV QUICKTIME SIMD DOCS
OPTIONS_DEFAULT=GTK2 SDL PNG
QUICKTIME_DESC=		Enable libQuickTime support

CONFLICTS=	mplex-[0-9]*

USE_GNOME=	pkgconfig
WANT_GNOME=	yes
WANT_SDL=	yes
USE_GMAKE=	yes
USE_AUTOTOOLS=	libtoolize aclocal autoheader automake autoconf
LIBTOOLIZE_ARGS=--force
ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
AUTOMAKEL_ARGS=	--add-missing --foreign
CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
		PTHREAD_LIBS="${PTHREAD_LIBS}" \
		ac_cv_lib_Xxf86dga_XF86DGAQueryExtension=no
CONFIGURE_ARGS=	--without-x
USE_LDCONFIG=	yes
MAKE_JOBS_SAFE=	yes

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 \

CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}

.include <bsd.port.options.mk>

.if ${ARCH} == "i386"
CFLAGS=	-O0
.endif
.if ${ARCH} == "powerpc" && ${OSVERSION} > 900000
BROKEN=		Does not build on powerpc-9
.endif

.if ${PORT_OPTIONS:MGTK2}

BROKEN=		glav is not built

.if empty(PORT_OPTIONS:MSDL)
IGNORE=		GTK+2 player needs SDL
.endif # GTK2/SDL

PLIST_SUB+=	GTK2:=""
.else
PLIST_SUB+=	GTK2:="@comment "
CONFIGURE_ARGS+=--without-gtk
.endif # GTK2

.if ${PORT_OPTIONS:MSDL}

.else
CONFIGURE_ENV+=	ac_cv_path_SDL_CONFIG=no
PLIST_SUB+=	SDL:="@comment "
CONFIGURE_ARGS+=--without-libsdl
.endif # SDL

.if ${PORT_OPTIONS:MPNG}

.endif # PNG

.if ${PORT_OPTIONS:MDV}
LIB_DEPENDS+=	dv:${PORTSDIR}/multimedia/libdv
CONFIGURE_ARGS+=--with-libdv
.else
CONFIGURE_ARGS+=--without-libdv


.if ${PORT_OPTIONS:MQUICKTIME}
PLIST_SUB+=	QUICKTIME=""
LIB_DEPENDS+=	quicktime:${PORTSDIR}/multimedia/libquicktime
CONFIGURE_ARGS+=--with-libquicktime
.else
PLIST_SUB+=	QUICKTIME="@comment "

CONFIGURE_ARGS+=--disable-simd-accel
.endif # SIMD

.include <bsd.port.pre.mk>

.if ${ARCH} == "powerpc" && ${OSVERSION} > 900000
BROKEN=		Does not build on powerpc-9
.endif

post-patch:
	@${REINPLACE_CMD} -e \
		'/ARCHFLAGS=/s|^|#|g' ${WRKSRC}/configure.ac
	@${REINPLACE_CMD} -e \
		'/^pkgconfigdir/s|$$(libdir)|$$(prefix)/libdata|g' ${WRKSRC}/Makefile.am

post-install:
.if ${PORT_OPTIONS:MDOCS}

Lines 1-11 Link Here

(-)multimedia/mjpegtools/files/patch-utils-Makefile.in (-11 lines)
1	--- utils/Makefile.in.orig Tue Nov 9 22:37:34 2004
2	+++ utils/Makefile.in Tue Nov 9 22:37:44 2004
3	@@ -56,7 +56,7 @@
4	CCAS = @CCAS@
5	CCASFLAGS = @CCASFLAGS@
6	CCDEPMODE = @CCDEPMODE@
7	-CFLAGS = @CFLAGS@
8	+CFLAGS = @CFLAGS@ -fPIC
9	CPP = @CPP@
10	CPPFLAGS = @CPPFLAGS@
11	CXX = @CXX@

Line 0 Link Here

(-)multimedia/mjpegtools/files/patch-y4mdenoise__MotionSercher.hh (+11 lines)
	1	--- y4mdenoise/MotionSearcher.hh.orig 2010-07-26 05:06:56.000000000 +0900
	2	+++ y4mdenoise/MotionSearcher.hh 2012-06-12 19:23:18.000000000 +0900
	3	@@ -2196,7 +2196,7 @@
	4	{
	5	// This region is too small to be bothered with.
	6	// Just get rid of it.
	7	- DeleteRegion (a_pRegion);
	8	+ this->DeleteRegion (a_pRegion);
	9	}
	10	else
	11	{

Return to bug 169005

Lines 7-37 Link Here

(-)multimedia/mjpegtools/Makefile (-24 / +24 lines)
7		7
8	PORTNAME= mjpegtools	8	PORTNAME= mjpegtools
9	PORTVERSION= 2.0.0	9	PORTVERSION= 2.0.0
10	PORTREVISION= 3	10	PORTREVISION= 4
11	CATEGORIES= multimedia	11	CATEGORIES= multimedia
12	MASTER_SITES= SF/${PORTNAME:S/tools//}/${PORTNAME}/${PORTVERSION}	12	MASTER_SITES= SF/${PORTNAME:S/tools//}/${PORTNAME}/${PORTVERSION}
13		13
14	MAINTAINER= multimedia@FreeBSD.org	14	MAINTAINER= multimedia@FreeBSD.org
15	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
16		16
17	LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg	17	LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg
18		18
19	OPTIONS_DEFINE= GTK2 SDL PNG DV QUICKTIME SIMD DOCS	19	OPTIONS_DEFINE= GTK2 SDL PNG DV QUICKTIME SIMD DOCS
20	OPTIONS_DEFAULT= SDL PNG	20	OPTIONS_DEFAULT=GTK2 SDL PNG
21	QUICKTIME_DESC= Enable libQuickTime support	21	QUICKTIME_DESC= Enable libQuickTime support
22		22
23	CONFLICTS= mplex-[0-9]*	23	CONFLICTS= mplex-[0-9]*
24		24
25	USE_GNOME= gnomehack	25	USE_GNOME= pkgconfig
26	WANT_GNOME= yes
27	WANT_SDL= yes
28	USE_GMAKE= yes	26	USE_GMAKE= yes
29	USE_AUTOTOOLS= libtool	27	USE_AUTOTOOLS= libtoolize aclocal autoheader automake autoconf
		28	LIBTOOLIZE_ARGS=--force
		29	ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
		30	AUTOMAKEL_ARGS= --add-missing --foreign
30	CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \	31	CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
31	PTHREAD_LIBS="${PTHREAD_LIBS}" \	32	PTHREAD_LIBS="${PTHREAD_LIBS}" \
32	ac_cv_lib_Xxf86dga_XF86DGAQueryExtension=no	33	ac_cv_lib_Xxf86dga_XF86DGAQueryExtension=no
33	CONFIGURE_ARGS= --without-x	34	CONFIGURE_ARGS= --without-x
34	USE_LDCONFIG= yes	35	USE_LDCONFIG= yes
		36	MAKE_JOBS_SAFE= yes
35		37
36	MAN1= jpeg2yuv.1 lav2mpeg.1 lav2wav.1 lav2yuv.1 lavpipe.1 lavplay.1 \	38	MAN1= jpeg2yuv.1 lav2mpeg.1 lav2wav.1 lav2yuv.1 lavpipe.1 lavplay.1 \
37	lavrec.1 lavtrans.1 mjpegtools.1 mp2enc.1 mpeg2enc.1 mplex.1 \	39	lavrec.1 lavtrans.1 mjpegtools.1 mp2enc.1 mpeg2enc.1 mplex.1 \
Lines 49-67 Link Here
49	CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}	51	CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
50	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}	52	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
51		53
52	.include <bsd.port.pre.mk>	54	.include <bsd.port.options.mk>
53
54	.if ${ARCH} == "i386"
55	CFLAGS= -O0
56	.endif
57	.if ${ARCH} == "powerpc" && ${OSVERSION} > 900000
58	BROKEN= Does not build on powerpc-9
59	.endif
60		55
61	.if ${PORT_OPTIONS:MGTK2}	56	.if ${PORT_OPTIONS:MGTK2}
62		57
63	BROKEN= glav is not built
64
65	.if empty(PORT_OPTIONS:MSDL)	58	.if empty(PORT_OPTIONS:MSDL)
66	IGNORE= GTK+2 player needs SDL	59	IGNORE= GTK+2 player needs SDL
67	.endif # GTK2/SDL	60	.endif # GTK2/SDL
Lines 70-76 Link Here
70	PLIST_SUB+= GTK2:=""	63	PLIST_SUB+= GTK2:=""
71	.else	64	.else
72	PLIST_SUB+= GTK2:="@comment "	65	PLIST_SUB+= GTK2:="@comment "
73	_HAVE_GTK= false	66	CONFIGURE_ARGS+=--without-gtk
74	.endif # GTK2	67	.endif # GTK2
75		68
76	.if ${PORT_OPTIONS:MSDL}	69	.if ${PORT_OPTIONS:MSDL}
Lines 79-85 Link Here
79	.else	72	.else
80	CONFIGURE_ENV+= ac_cv_path_SDL_CONFIG=no	73	CONFIGURE_ENV+= ac_cv_path_SDL_CONFIG=no
81	PLIST_SUB+= SDL:="@comment "	74	PLIST_SUB+= SDL:="@comment "
82	CONFIGURE_ARGS+= --without-libsdl	75	CONFIGURE_ARGS+=--without-libsdl
83	.endif # SDL	76	.endif # SDL
84		77
85	.if ${PORT_OPTIONS:MPNG}	78	.if ${PORT_OPTIONS:MPNG}
Lines 92-98 Link Here
92	.endif # PNG	85	.endif # PNG
93		86
94	.if ${PORT_OPTIONS:MDV}	87	.if ${PORT_OPTIONS:MDV}
95	LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv	88	LIB_DEPENDS+= dv:${PORTSDIR}/multimedia/libdv
96	CONFIGURE_ARGS+=--with-libdv	89	CONFIGURE_ARGS+=--with-libdv
97	.else	90	.else
98	CONFIGURE_ARGS+=--without-libdv	91	CONFIGURE_ARGS+=--without-libdv
Lines 100-106 Link Here
100		93
101	.if ${PORT_OPTIONS:MQUICKTIME}	94	.if ${PORT_OPTIONS:MQUICKTIME}
102	PLIST_SUB+= QUICKTIME=""	95	PLIST_SUB+= QUICKTIME=""
103	LIB_DEPENDS+= quicktime.0:${PORTSDIR}/multimedia/libquicktime	96	LIB_DEPENDS+= quicktime:${PORTSDIR}/multimedia/libquicktime
104	CONFIGURE_ARGS+=--with-libquicktime	97	CONFIGURE_ARGS+=--with-libquicktime
105	.else	98	.else
106	PLIST_SUB+= QUICKTIME="@comment "	99	PLIST_SUB+= QUICKTIME="@comment "
Lines 113-122 Link Here
113	CONFIGURE_ARGS+=--disable-simd-accel	106	CONFIGURE_ARGS+=--disable-simd-accel
114	.endif # SIMD	107	.endif # SIMD
115		108
		109	.include <bsd.port.pre.mk>
		110
		111	.if ${ARCH} == "powerpc" && ${OSVERSION} > 900000
		112	BROKEN= Does not build on powerpc-9
		113	.endif
		114
116	post-patch:	115	post-patch:
117	@${REINPLACE_CMD} -e 's\|have_gtk="true"\|have_gtk="${_HAVE_GTK}"\|g ; \	116	@${REINPLACE_CMD} -e \
118	/^CFLAGS=/s\|$$ARCHFLAGS\|\|g ; \	117	'/ARCHFLAGS=/s\|^\|#\|g' ${WRKSRC}/configure.ac
119	/^CXXFLAGS=/s\|$$ARCHFLAGS\|\|g' ${WRKSRC}/configure	118	@${REINPLACE_CMD} -e \
		119	'/^pkgconfigdir/s\|$$(libdir)\|$$(prefix)/libdata\|g' ${WRKSRC}/Makefile.am
120		120
121	post-install:	121	post-install:
122	.if ${PORT_OPTIONS:MDOCS}	122	.if ${PORT_OPTIONS:MDOCS}