Date: Thu, 23 Jul 2015 09:21:45 +0000 (UTC) From: Kubilay Kocak <koobs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392718 - in head/multimedia: libx264/files x264 x264/files Message-ID: <201507230921.t6N9Ljrr058272@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Thu Jul 23 09:21:44 2015 New Revision: 392718 URL: https://svnweb.freebsd.org/changeset/ports/392718 Log: multimedia/libx264: Move libx264 stdin.h patch to x264 port Move the libx264 patch for stdint.h handling on FreeBSD to the multimedia/x264 port, as FILESDIR is inherited from there, thus causing the patch not to be applied. Reported by: kwm Reviewed by: kwm Tested by: kwm Differential Revision: https://reviews.freebsd.org/D3168 Added: head/multimedia/x264/files/patch-x264.h - copied unchanged from r392717, head/multimedia/libx264/files/patch-x264.h Deleted: head/multimedia/libx264/files/ Modified: head/multimedia/x264/Makefile Modified: head/multimedia/x264/Makefile ============================================================================== --- head/multimedia/x264/Makefile Thu Jul 23 09:09:44 2015 (r392717) +++ head/multimedia/x264/Makefile Thu Jul 23 09:21:44 2015 (r392718) @@ -19,6 +19,7 @@ PORTNAME= x264 PORTVERSION= 0.${X264_BUILD}.${X264_REV} +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \ http://samples.mplayerhq.hu/yuv4mpeg2/:pgo Copied: head/multimedia/x264/files/patch-x264.h (from r392717, head/multimedia/libx264/files/patch-x264.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/x264/files/patch-x264.h Thu Jul 23 09:21:44 2015 (r392718, copy of r392717, head/multimedia/libx264/files/patch-x264.h) @@ -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?201507230921.t6N9Ljrr058272>