Date: Thu, 15 May 2014 18:53:47 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354166 - head/multimedia/x264 Message-ID: <201405151853.s4FIrld9045936@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Thu May 15 18:53:46 2014 New Revision: 354166 URL: http://svnweb.freebsd.org/changeset/ports/354166 QAT: https://qat.redports.org/buildarchive/r354166/ Log: Prevent x264 to link to ffmpeg if ffmpeg is already installed on the system which will lead to a circular dependencies which is revealed by pkg autodeps functionnality Reported by: kwm Modified: head/multimedia/x264/Makefile Modified: head/multimedia/x264/Makefile ============================================================================== --- head/multimedia/x264/Makefile Thu May 15 18:41:24 2014 (r354165) +++ head/multimedia/x264/Makefile Thu May 15 18:53:46 2014 (r354166) @@ -3,7 +3,7 @@ PORTNAME= x264 PORTVERSION= 0.${X264_BUILD}.${X264_REV} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \ http://samples.mplayerhq.hu/yuv4mpeg2/:pgo @@ -26,8 +26,7 @@ X264_COMMIT= 3361d59a0a83dcb8b321cc0eb8e X264_GITVER= ${X264_COMMIT:C/^(.......).*$/\1/g} X264_SNAPSHOT= 20130827 -USES= gmake -USE_BZIP2= yes +USES= gmake tar:bzip2 WRKSRC= ${WRKDIR}/${DISTNAME} USE_LDCONFIG= yes HAS_CONFIGURE= yes @@ -43,7 +42,8 @@ X11_OUTPUT_DESC= Enable X11 Output CONFIGURE_ARGS+= --extra-cflags="-I${LOCALBASE}/include" \ --extra-ldflags="-L${LOCALBASE}/lib" \ --enable-static --enable-shared \ - --disable-opencl + --disable-opencl \ + --disable-swscale PLIST_SUB+= X264_BUILD=${X264_BUILD}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405151853.s4FIrld9045936>