Date: Sun, 13 Jan 2013 10:13:36 +0000 (UTC) From: Alberto Villa <avilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310311 - in head/multimedia: mlt mlt/files py-mlt Message-ID: <201301131013.r0DADaJu003061@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avilla Date: Sun Jan 13 10:13:36 2013 New Revision: 310311 URL: http://svnweb.freebsd.org/changeset/ports/310311 Log: - Update MLT to 0.8.6. - Depend on ffmpeg1 instead of ffmpeg-011. - Remove patches committed upstream. - Remove soversion from LIB_DEPENDS. - Make py-mlt a SLAVE_PORT. Deleted: head/multimedia/mlt/files/ head/multimedia/py-mlt/pkg-descr Modified: head/multimedia/mlt/Makefile head/multimedia/mlt/distinfo head/multimedia/mlt/pkg-plist head/multimedia/py-mlt/Makefile Modified: head/multimedia/mlt/Makefile ============================================================================== --- head/multimedia/mlt/Makefile Sun Jan 13 10:12:28 2013 (r310310) +++ head/multimedia/mlt/Makefile Sun Jan 13 10:13:36 2013 (r310311) @@ -1,16 +1,20 @@ # $FreeBSD$ PORTNAME= mlt -PORTVERSION= 0.8.2 -PORTREVISION= 1 -CATEGORIES= multimedia +PORTVERSION= 0.8.6 +PORTREVISION?= 0 +CATEGORIES?= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME} -MAINTAINER= avilla@FreeBSD.org -COMMENT= Multimedia framework for TV broadcasting +MAINTAINER?= avilla@FreeBSD.org +COMMENT?= Multimedia framework for TV broadcasting -LICENSE= GPLv2 GPLv3 LGPL21 -LICENSE_COMB= multi +LICENSE?= GPLv2 GPLv3 LGPL21 +LICENSE_COMB?= multi + +SLAVE_PORT?= no + +.if ${SLAVE_PORT} == "no" # They both install bin/melt. CONFLICTS_INSTALL= freeze-[0-9]* @@ -25,9 +29,9 @@ MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes .ifndef(WITH_DEBUG) -CONFIGURE_ARGS+= --disable-debug +CONFIGURE_ARGS+=--disable-debug .else -CONFIGURE_ARGS+= --enable-debug +CONFIGURE_ARGS+=--enable-debug .endif PLIST_SUB+= PORTVERSION="${PORTVERSION}" @@ -53,137 +57,137 @@ BROKEN= does not compile on sparc64 (in .endif .if ${PORT_OPTIONS:MDV} -LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv -CONFIGURE_ARGS+= --enable-dv +LIB_DEPENDS+= dv:${PORTSDIR}/multimedia/libdv +CONFIGURE_ARGS+=--enable-dv PLIST_SUB+= DV="" .else -CONFIGURE_ARGS+= --disable-dv +CONFIGURE_ARGS+=--disable-dv PLIST_SUB+= DV="@comment " .endif .if ${PORT_OPTIONS:MFFMPEG} || ${PORT_OPTIONS:MVDPAU} -FFMPEG_SUFFIX= -011 -LIB_DEPENDS+= avformat${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} -CONFIGURE_ARGS+= --enable-avformat --avformat-swscale \ - --avformat-suffix="${FFMPEG_SUFFIX}" +FFMPEG_SUFX= 1 +LIB_DEPENDS+= avformat${FFMPEG_SUFX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFX} +CONFIGURE_ARGS+=--enable-avformat --avformat-swscale \ + --avformat-suffix="${FFMPEG_SUFX}" PLIST_SUB+= FFMPEG="" .else -CONFIGURE_ARGS+= --disable-avformat +CONFIGURE_ARGS+=--disable-avformat PLIST_SUB+= FFMPEG="@comment " .endif .if ${PORT_OPTIONS:MFREI0R} BUILD_DEPENDS+= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r -CONFIGURE_ARGS+= --enable-frei0r +CONFIGURE_ARGS+=--enable-frei0r PLIST_SUB+= FREI0R="" .else -CONFIGURE_ARGS+= --disable-frei0r +CONFIGURE_ARGS+=--disable-frei0r PLIST_SUB+= FREI0R="@comment " .endif .if ${PORT_OPTIONS:MGTK2} -LIB_DEPENDS+= exif.12:${PORTSDIR}/graphics/libexif +LIB_DEPENDS+= exif:${PORTSDIR}/graphics/libexif USE_GNOME+= gdkpixbuf2 gtk20 pango -CONFIGURE_ARGS+= --enable-gtk2 +CONFIGURE_ARGS+=--enable-gtk2 PLIST_SUB+= GTK2="" .else -CONFIGURE_ARGS+= --disable-gtk2 +CONFIGURE_ARGS+=--disable-gtk2 PLIST_SUB+= GTK2="@comment " .endif .if ${PORT_OPTIONS:MJACK} -LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack +LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack BUILD_DEPENDS+= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa -CONFIGURE_ARGS+= --enable-jackrack +CONFIGURE_ARGS+=--enable-jackrack PLIST_SUB+= JACK="" .else -CONFIGURE_ARGS+= --disable-jackrack +CONFIGURE_ARGS+=--disable-jackrack PLIST_SUB+= JACK="@comment " .endif .if ${PORT_OPTIONS:MQT4} -LIB_DEPENDS+= exif.12:${PORTSDIR}/graphics/libexif +LIB_DEPENDS+= exif:${PORTSDIR}/graphics/libexif USE_QT4+= gui svg xml -CONFIGURE_ARGS+= --enable-qimage \ - --qimage-includedir="${QT_INCDIR}" \ - --qimage-libdir="${QT_LIBDIR}" +CONFIGURE_ARGS+=--enable-qimage \ + --qimage-includedir="${QT_INCDIR}" \ + --qimage-libdir="${QT_LIBDIR}" PLIST_SUB+= QT4="" .else -CONFIGURE_ARGS+= --disable-qimage +CONFIGURE_ARGS+=--disable-qimage PLIST_SUB+= QT4="@comment " .endif .if ${PORT_OPTIONS:MQUICKTIME} -LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv \ - quicktime.0:${PORTSDIR}/multimedia/libquicktime -CONFIGURE_ARGS+= --enable-kino -PLIST_SUB+= KINO="" +LIB_DEPENDS+= dv:${PORTSDIR}/multimedia/libdv \ + quicktime:${PORTSDIR}/multimedia/libquicktime +CONFIGURE_ARGS+=--enable-kino +PLIST_SUB+= QUICKTIME="" .else -CONFIGURE_ARGS+= --disable-kino -PLIST_SUB+= KINO="@comment " +CONFIGURE_ARGS+=--disable-kino +PLIST_SUB+= QUICKTIME="@comment " .endif .if ${PORT_OPTIONS:MSAMPLERATE} -LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate -CONFIGURE_ARGS+= --enable-resample +LIB_DEPENDS+= samplerate:${PORTSDIR}/audio/libsamplerate +CONFIGURE_ARGS+=--enable-resample PLIST_SUB+= SAMPLERATE="" .else -CONFIGURE_ARGS+= --disable-resample +CONFIGURE_ARGS+=--disable-resample PLIST_SUB+= SAMPLERATE="@comment " .endif .if ${PORT_OPTIONS:MSOX} -LIB_DEPENDS+= sox.1:${PORTSDIR}/audio/sox -CONFIGURE_ARGS+= --enable-sox +LIB_DEPENDS+= sox:${PORTSDIR}/audio/sox +CONFIGURE_ARGS+=--enable-sox PLIST_SUB+= SOX="" .else -CONFIGURE_ARGS+= --disable-sox +CONFIGURE_ARGS+=--disable-sox PLIST_SUB+= SOX="@comment " .endif .if ${PORT_OPTIONS:MSWFDEC} -LIB_DEPENDS+= swfdec-0.8.0:${PORTSDIR}/graphics/swfdec -CONFIGURE_ARGS+= --enable-swfdec +LIB_DEPENDS+= swfdec-0.8:${PORTSDIR}/graphics/swfdec +CONFIGURE_ARGS+=--enable-swfdec PLIST_SUB+= SWFDEC="" .else -CONFIGURE_ARGS+= --disable-swfdec +CONFIGURE_ARGS+=--disable-swfdec PLIST_SUB+= SWFDEC="@comment " .endif .if ${PORT_OPTIONS:MVDPAU} USE_XORG+= x11 -CONFIGURE_ARGS+= --avformat-vdpau +CONFIGURE_ARGS+=--avformat-vdpau .else -CONFIGURE_ARGS+= --avformat--no-vdpau +CONFIGURE_ARGS+=--avformat-no-vdpau .endif .if ${PORT_OPTIONS:MVORBIS} -LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis -CONFIGURE_ARGS+= --enable-vorbis +LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis +CONFIGURE_ARGS+=--enable-vorbis PLIST_SUB+= VORBIS="" .else -CONFIGURE_ARGS+= --disable-vorbis +CONFIGURE_ARGS+=--disable-vorbis PLIST_SUB+= VORBIS="@comment " .endif pre-configure: - ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \ + @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \ ${WRKSRC}/src/modules/avformat/vdpau.c \ ${WRKSRC}/src/modules/frei0r/factory.c \ ${WRKSRC}/src/modules/jackrack/plugin_mgr.c \ ${WRKSRC}/src/modules/linsys/Makefile - ${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},' \ + @${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},' \ ${WRKSRC}/configure - ${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},' \ + @${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},' \ ${WRKSRC}/src/framework/Makefile \ ${WRKSRC}/src/melt/Makefile \ ${WRKSRC}/src/modules/*/Makefile - ${REINPLACE_CMD} -e 's,$$(libdir)/pkgconfig,${PREFIX}/libdata/pkgconfig,' \ + @${REINPLACE_CMD} -e 's,$$(libdir)/pkgconfig,${PREFIX}/libdata/pkgconfig,' \ ${WRKSRC}/Makefile post-install: ${INSTALL_MAN} ${WRKSRC}/docs/melt.1 ${MANPREFIX}/man/man1/melt.1 - ${RM} -f ${WRKSRC}/docs/melt.1 + @${RM} -f ${WRKSRC}/docs/melt.1 .if ${PORT_OPTIONS:MDOCS} . for f in ${PORTDOCS} cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${DOCSDIR} @@ -195,4 +199,6 @@ post-install: . endfor .endif +.endif # ${SLAVE_PORT} == "no" + .include <bsd.port.mk> Modified: head/multimedia/mlt/distinfo ============================================================================== --- head/multimedia/mlt/distinfo Sun Jan 13 10:12:28 2013 (r310310) +++ head/multimedia/mlt/distinfo Sun Jan 13 10:13:36 2013 (r310311) @@ -1,2 +1,2 @@ -SHA256 (mlt-0.8.2.tar.gz) = 36c743d2abc68ce737ac526507fc2caf71b3d6a53a2bf31d22e8193a8b899577 -SIZE (mlt-0.8.2.tar.gz) = 1161293 +SHA256 (mlt-0.8.6.tar.gz) = 8323e546a661942c5bb880886a949e8243f9b53082cb3464a54009280c5bbb3f +SIZE (mlt-0.8.6.tar.gz) = 1104163 Modified: head/multimedia/mlt/pkg-plist ============================================================================== --- head/multimedia/mlt/pkg-plist Sun Jan 13 10:12:28 2013 (r310310) +++ head/multimedia/mlt/pkg-plist Sun Jan 13 10:13:36 2013 (r310311) @@ -65,7 +65,7 @@ lib/mlt/libmlteffectv.so %%GTK2%%lib/mlt/libmltgtk2.so %%JACK%%lib/mlt/libmltjackrack.so lib/mlt/libmltkdenlive.so -%%KINO%%lib/mlt/libmltkino.so +%%QUICKTIME%%lib/mlt/libmltkino.so lib/mlt/libmltlinsys.so lib/mlt/libmltmotion_est.so lib/mlt/libmltnormalize.so @@ -196,6 +196,7 @@ libdata/pkgconfig/mlt-framework.pc %%DATADIR%%/motion_est/filter_motion_est.yml %%DATADIR%%/motion_est/filter_vismv.yml %%DATADIR%%/motion_est/producer_slowmotion.yml +%%DATADIR%%/normalize/filter_audiolevel.yml %%DATADIR%%/normalize/filter_volume.yml %%DATADIR%%/oldfilm/dust1.svg %%DATADIR%%/oldfilm/dust2.svg Modified: head/multimedia/py-mlt/Makefile ============================================================================== --- head/multimedia/py-mlt/Makefile Sun Jan 13 10:12:28 2013 (r310310) +++ head/multimedia/py-mlt/Makefile Sun Jan 13 10:13:36 2013 (r310311) @@ -1,30 +1,24 @@ -# ex:ts=8 -# Ports collection makefile for: mlt -# Date created: 2011-02-06 -# Whom: Charlie Kester <corky1951@comcast.net> -# +# Created by: Charlie Kester <corky1951@comcast.net> # $FreeBSD$ -# -PORTNAME= mlt -PORTVERSION= 0.8.2 +PORTREVISION= 0 CATEGORIES= multimedia python -MASTER_SITES= SF/${PORTNAME}/${PORTNAME} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -MAINTAINER= avilla@FreeBSD.org COMMENT= Python bindings for the MLT multimedia framework LICENSE= GPLv2 +LICENSE_COMB= single -LIB_DEPENDS= mlt:${PORTSDIR}/multimedia/mlt +LIB_DEPENDS= mlt:${PORTSDIR}/${MASTER_PORT} BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 USE_PYTHON= yes -DISTINFO_FILE= ${.CURDIR}/../mlt/distinfo +MASTERDIR= ${.CURDIR:H:H}/multimedia/mlt PORTEXAMPLES= python +PLIST= # empty PLIST_FILES= %%PYTHON_SITELIBDIR%%/_mlt.so \ %%PYTHON_SITELIBDIR%%/mlt.py \ %%PYTHON_SITELIBDIR%%/mlt.pyc \ @@ -36,11 +30,11 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} .include <bsd.port.options.mk> do-build: - ${REINPLACE_CMD} -e 's|-L../../mlt++|-L${LOCALBASE}/lib|' \ + @${REINPLACE_CMD} -e 's|-L../../mlt++|-L${LOCALBASE}/lib|' \ -e 's|g++|${CXX} ${CXXFLAGS}|' \ -e 's|-pthread|${PTHREAD_LIBS}|' \ ${BUILD_WRKSRC}/build - cd ${BUILD_WRKSRC} && ${SH} build + @cd ${BUILD_WRKSRC} && ${SH} build do-install: ${INSTALL_LIB} ${INSTALL_WRKSRC}/_mlt.so ${PYTHONPREFIX_SITELIBDIR} @@ -56,4 +50,4 @@ post-install: . endfor .endif -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301131013.r0DADaJu003061>