From owner-svn-ports-head@FreeBSD.ORG Sun Dec 28 04:59:37 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A88E0496; Sun, 28 Dec 2014 04:59:37 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7AF6B66F63; Sun, 28 Dec 2014 04:59:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBS4xbAQ021198; Sun, 28 Dec 2014 04:59:37 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBS4xbU9021196; Sun, 28 Dec 2014 04:59:37 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201412280459.sBS4xbU9021196@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Sun, 28 Dec 2014 04:59:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375696 - head/multimedia/libx264 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.18-1 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: Sun, 28 Dec 2014 04:59:37 -0000 Author: koobs Date: Sun Dec 28 04:59:36 2014 New Revision: 375696 URL: https://svnweb.freebsd.org/changeset/ports/375696 QAT: https://qat.redports.org/buildarchive/r375696/ Log: multimedia/libx264: Fix PGO/GCC options - Revert options helpers for PGO and GCC .. *shakes fist*. We end up setting USE_GCC=yes yes otherwise, and that's not valid. - libx264 and x264 share the same distfiles, use the same DIST_SUBDIR Modified: head/multimedia/libx264/Makefile head/multimedia/libx264/distinfo Modified: head/multimedia/libx264/Makefile ============================================================================== --- head/multimedia/libx264/Makefile Sun Dec 28 04:54:55 2014 (r375695) +++ head/multimedia/libx264/Makefile Sun Dec 28 04:59:36 2014 (r375696) @@ -11,7 +11,7 @@ MASTER_SITES= ftp://ftp.videolan.org/pub http://samples.mplayerhq.hu/yuv4mpeg2/:pgo DISTNAME= x264-snapshot-${X264_SNAPSHOT}-2245-stable DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -DIST_SUBDIR= libx264 +DIST_SUBDIR= x264 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= koobs@FreeBSD.org @@ -43,10 +43,7 @@ HI10P_DESC= Enable High 10 Profile 10-bi ASM_CONFIGURE_OFF= --disable-asm DEBUG_CONFIGURE_ON= --enable-debug -GCC_USE= GCC=yes HI10P_CONFIGURE_ON= --bit-depth=10 -PGO_USE= GCC=yes - CONFIGURE_ARGS+= --extra-cflags="-I${LOCALBASE}/include" \ --extra-ldflags="-L${LOCALBASE}/lib" \ --enable-static --enable-shared \ @@ -57,6 +54,12 @@ PLIST_SUB+= X264_BUILD=${X264_BUILD} .include +.if ${PORT_OPTIONS:MGCC} +USE_GCC= yes +.elif ${PORT_OPTIONS:MPGO} +USE_GCC= any +.endif + .if ${PORT_OPTIONS:MPGO} # y4m sample video Y4M_VIDEO=example.y4m Modified: head/multimedia/libx264/distinfo ============================================================================== --- head/multimedia/libx264/distinfo Sun Dec 28 04:54:55 2014 (r375695) +++ head/multimedia/libx264/distinfo Sun Dec 28 04:59:36 2014 (r375696) @@ -1,4 +1,4 @@ -SHA256 (libx264/x264-snapshot-20140827-2245-stable.tar.bz2) = fb1de3f802a83778527d45e69b552efa73b677ebb3ac633a8720923e71ffc5e3 -SIZE (libx264/x264-snapshot-20140827-2245-stable.tar.bz2) = 624939 -SHA256 (libx264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7 -SIZE (libx264/example.y4m.bz2) = 4910029 +SHA256 (x264/x264-snapshot-20140827-2245-stable.tar.bz2) = fb1de3f802a83778527d45e69b552efa73b677ebb3ac633a8720923e71ffc5e3 +SIZE (x264/x264-snapshot-20140827-2245-stable.tar.bz2) = 624939 +SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7 +SIZE (x264/example.y4m.bz2) = 4910029