Date: Fri, 19 Jun 2015 13:12:22 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390114 - in head/multimedia/libx264: . files Message-ID: <201506191312.t5JDCMgQ025565@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506191312.t5JDCMgQ025565>