From owner-svn-ports-all@FreeBSD.ORG Fri Jun 19 13:12:22 2015 Return-Path: Delivered-To: svn-ports-all@hub.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 BD0B195B; Fri, 19 Jun 2015 13:12:22 +0000 (UTC) (envelope-from kwm@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 91E09779; Fri, 19 Jun 2015 13:12:22 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5JDCM0R025567; Fri, 19 Jun 2015 13:12:22 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5JDCMgQ025565; Fri, 19 Jun 2015 13:12:22 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201506191312.t5JDCMgQ025565@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Fri, 19 Jun 2015 13:12:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390114 - in head/multimedia/libx264: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jun 2015 13:12:22 -0000 Author: kwm Date: Fri Jun 19 13:12:21 2015 New Revision: 390114 URL: https://svnweb.freebsd.org/changeset/ports/390114 Log: Our stdint.h is a symlink to sys/stdint.h so we need to teach x264 the header guard of the sys/stdint.h file. Otherwise compiling software with the x264.h header will generate a warning about the mismatch header guard. Approved by: maintainer (koobs@) Differential Revision: https://reviews.freebsd.org/D2863 Added: head/multimedia/libx264/files/patch-x264.h (contents, props changed) Modified: head/multimedia/libx264/Makefile Modified: head/multimedia/libx264/Makefile ============================================================================== --- head/multimedia/libx264/Makefile Fri Jun 19 11:55:36 2015 (r390113) +++ head/multimedia/libx264/Makefile Fri Jun 19 13:12:21 2015 (r390114) @@ -5,7 +5,7 @@ PORTNAME= libx264 PORTVERSION= 0.${X264_BUILD}.${X264_REV} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \ http://samples.mplayerhq.hu/yuv4mpeg2/:pgo Added: head/multimedia/libx264/files/patch-x264.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/libx264/files/patch-x264.h Fri Jun 19 13:12:21 2015 (r390114) @@ -0,0 +1,15 @@ +Our stdint.h is a symlink to sys/stdint.h so we need to teach x264 +the header guard of the sys/stdint.h file. + +Accepted upstream, see https://reviews.freebsd.org/D2863 for details. +--- x264.h.orig 2015-06-19 08:05:22.728325000 +0200 ++++ x264.h 2015-06-19 08:05:39.433879000 +0200 +@@ -29,7 +29,7 @@ + #define X264_X264_H + + #if !defined(_STDINT_H) && !defined(_STDINT_H_) && !defined(_STDINT_H_INCLUDED) && !defined(_STDINT) &&\ +- !defined(_INTTYPES_H) && !defined(_INTTYPES_H_) && !defined(_INTTYPES) ++ !defined(_SYS_STDINT_H_) && !defined(_INTTYPES_H) && !defined(_INTTYPES_H_) && !defined(_INTTYPES) + # ifdef _MSC_VER + # pragma message("You must include stdint.h or inttypes.h before x264.h") + # else