svn commit: r375696 - head/multimedia/libx264

[Kubilay Kocak]

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 at 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 <bsd.port.options.mk>
 
+.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