From owner-svn-ports-head@FreeBSD.ORG Mon Jun 22 20:32:34 2015 Return-Path: Delivered-To: svn-ports-head@nevdull.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 147F36E7; Mon, 22 Jun 2015 20:32:34 +0000 (UTC) (envelope-from riggs@FreeBSD.org) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 02AB6CF7; Mon, 22 Jun 2015 20:32:34 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5MKWXvX089271; Mon, 22 Jun 2015 20:32:33 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5MKWX1e089270; Mon, 22 Jun 2015 20:32:33 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201506222032.t5MKWX1e089270@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Mon, 22 Jun 2015 20:32:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390327 - head/multimedia/ffmpeg0 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jun 2015 20:32:34 -0000 Author: riggs Date: Mon Jun 22 20:32:33 2015 New Revision: 390327 URL: https://svnweb.freebsd.org/changeset/ports/390327 Log: - Use memalign hack only on supported systems that need it (FreeBSD on pre-10 systems) - Bump PORTREVISION Modified: head/multimedia/ffmpeg0/Makefile Modified: head/multimedia/ffmpeg0/Makefile ============================================================================== --- head/multimedia/ffmpeg0/Makefile Mon Jun 22 20:27:02 2015 (r390326) +++ head/multimedia/ffmpeg0/Makefile Mon Jun 22 20:32:33 2015 (r390327) @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 0.7.16 -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ @@ -41,20 +41,15 @@ DATADIR= ${PREFIX}/share/${PORTNAME}${PK DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \ - FFSERVER FREETYPE FREI0R GSM LAME MAH OPENCV OPENJPEG \ + FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \ OPTIMIZED_CFLAGS RTMP SCHROEDINGER SDL SPEEX THEORA VAAPI \ VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID DOCS -OPTIONS_DEFAULT= FFSERVER FREETYPE FREI0R MAH OPENCV SCHROEDINGER \ +OPTIONS_DEFAULT= FFSERVER FREETYPE FREI0R OPENCV SCHROEDINGER \ THEORA VORBIS VPX X264 XVID FFSERVER_DESC= Build and install ffserver X11GRAB_DESC= Enable x11 grabbing -MAH_DESC= Enable memalign hack - -MAH_CONFIGURE_ENABLE= memalign-hack - -OPTIONS_EXCLUDE_DragonFly= MAH COMPAT_HEADERS=libavcodec/avcodec.h \ libavcodec/opt.h \ @@ -98,6 +93,10 @@ CONFIGURE_ARGS+= --enable-x11grab .include +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000 +CONFIGURE_ARGS+= --enable-memalign-hack +.endif + .if ${ARCH} == armv6 CONFIGURE_ENV+= ASFLAGS=-no-integrated-as CFLAGS= -no-integrated-as