svn commit: r531878 - in head/multimedia: libx264 x264

[Piotr Kubaj]

Author: pkubaj
Date: Thu Apr 16 19:43:38 2020
New Revision: 531878
URL: https://svnweb.freebsd.org/changeset/ports/531878

Log:
  multimedia/{lib,}x264: return to building with clang on powerpc64 elfv2
  
  Head r359981 and r359994 reverted commits that caused clang to run in infinite loop, allocating all available memory and crashing the system.

Modified:
  head/multimedia/libx264/Makefile
  head/multimedia/x264/Makefile

Modified: head/multimedia/libx264/Makefile
==============================================================================
--- head/multimedia/libx264/Makefile	Thu Apr 16 19:36:13 2020	(r531877)
+++ head/multimedia/libx264/Makefile	Thu Apr 16 19:43:38 2020	(r531878)
@@ -3,7 +3,7 @@
 #
 # Updating notes: see multimedia/x264/Makefile.
 
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMEPREFIX=	lib
 COMMENT=	H.264/MPEG-4 AVC Video Encoding (Library)
 MASTERDIR=	${.CURDIR}/../x264

Modified: head/multimedia/x264/Makefile
==============================================================================
--- head/multimedia/x264/Makefile	Thu Apr 16 19:36:13 2020	(r531877)
+++ head/multimedia/x264/Makefile	Thu Apr 16 19:43:38 2020	(r531878)
@@ -18,7 +18,7 @@
 
 PORTNAME=	x264
 PORTVERSION=	0.${X264_BUILD}.${X264_REV}
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	https://samples.mplayerhq.hu/yuv4mpeg2/:pgo
 DIST_SUBDIR=	x264
@@ -98,12 +98,6 @@ CONFIGURE_ARGS+=	--prefix="${PREFIX}" \
 			--extra-cflags="${CPPFLAGS} ${CFLAGS}" \
 			--extra-ldflags="${LDFLAGS}"
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == powerpc64
-USE_GCC=	yes
-.endif
-
 post-extract-PGO-on:
 	@${BZIP2_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/${Y4M_VIDEO_DISTFILE} \
 		>${WRKDIR}/${Y4M_VIDEO}
@@ -123,4 +117,4 @@ pre-build:
 	@(${RM} ${WRKSRC}/x264_config.h)
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>