From owner-svn-ports-all@FreeBSD.ORG Thu Jan 2 10:17:38 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C957C291; Thu, 2 Jan 2014 10:17:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A915C1872; Thu, 2 Jan 2014 10:17:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s02AHcCc035883; Thu, 2 Jan 2014 10:17:38 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s02AHc21035881; Thu, 2 Jan 2014 10:17:38 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201401021017.s02AHc21035881@svn.freebsd.org> From: Marcus von Appen Date: Thu, 2 Jan 2014 10:17:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338431 - in head/multimedia/libav: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2014 10:17:39 -0000 Author: mva Date: Thu Jan 2 10:17:37 2014 New Revision: 338431 URL: http://svnweb.freebsd.org/changeset/ports/338431 Log: - Unbreak build with the new freetype version - Add X11GRAB option - Rename V4L2 option to V4L Added: head/multimedia/libav/files/patch-libavfilter_vf_drawtext.c (contents, props changed) Modified: head/multimedia/libav/Makefile Modified: head/multimedia/libav/Makefile ============================================================================== --- head/multimedia/libav/Makefile Thu Jan 2 09:28:32 2014 (r338430) +++ head/multimedia/libav/Makefile Thu Jan 2 10:17:37 2014 (r338431) @@ -2,7 +2,7 @@ PORTNAME= libav PORTVERSION= 9.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://libav.org/releases/ @@ -33,8 +33,8 @@ CONFIGURE_ARGS+= --prefix="${PREFIX}" \ OPTIONS_DEFINE= ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC FREETYPE FREI0R \ GNUTLS GSM ILBC JACK LAME OPENCV OPENJPEG OPENSSL OPUS \ - PULSEAUDIO RTMP SCHROEDINGER SPEEX THEORA V4L2 VAAPI VDPAU \ - VO_AACENC VO_AMRWBENC VORBIS VPX X264 XVID ZLIB + PULSEAUDIO RTMP SCHROEDINGER SPEEX THEORA V4L VAAPI VDPAU \ + VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID ZLIB OPTIONS_DEFAULT= BZIP2 FREETYPE FREI0R GNUTLS OPENCV SCHROEDINGER \ THEORA VO_AACENC VORBIS VPX X264 XVID ZLIB @@ -42,6 +42,7 @@ OPTIONS_DEFAULT= BZIP2 FREETYPE FREI0R G FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK ILBC_DESC= iLBC en/decoding via libilbc OPUS_DESC= Opus decoding with libopus +X11GRAB_DESC= X11 grabbing ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib ALSA_CONFIGURE_ON= --enable-indev=alsa --enable-outdev=alsa @@ -115,8 +116,8 @@ SPEEX_CONFIGURE_ENABLE= libspeex THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora THEORA_CONFIGURE_ENABLE= libtheora -V4L2_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat -V4L2_CONFIGURE_ENABLE= indev=v4l2 +V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat +V4L_CONFIGURE_ENABLE= indev=v4l2 VAAPI_LIB_DEPENDS= libva.so:${PORTSDIR}/multimedia/libva VAAPI_CONFIGURE_ENABLE= vaapi @@ -136,6 +137,8 @@ VORBIS_CONFIGURE_ENABLE= libvorbis VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx VPX_CONFIGURE_ENABLE= libvpx +X11GRAB_USE= XORG=x11 xext xfixes + X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/x264 X264_CONFIGURE_ENABLE= libx264 @@ -202,6 +205,8 @@ LICENSE= LGPL21 .endif post-patch: + @${REINPLACE_CMD} -e 's|freetype/freetype.h|freetype2/freetype.h|' \ + ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \ ${WRKSRC}/configure \ ${WRKSRC}/libavcodec/libgsm.c Added: head/multimedia/libav/files/patch-libavfilter_vf_drawtext.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/libav/files/patch-libavfilter_vf_drawtext.c Thu Jan 2 10:17:37 2014 (r338431) @@ -0,0 +1,10 @@ +--- libavfilter/vf_drawtext.c.orig 2014-01-01 12:39:17.000000000 +0100 ++++ libavfilter/vf_drawtext.c 2014-01-01 12:39:32.000000000 +0100 +@@ -47,7 +47,6 @@ + #include "video.h" + + #include +-#include + #include FT_FREETYPE_H + #include FT_GLYPH_H +