From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SUcwe-0000AO-60 for garchives@archives.gentoo.org; Wed, 16 May 2012 12:03:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0165AE0A99; Wed, 16 May 2012 12:02:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CB215E0B32 for ; Wed, 16 May 2012 12:02:53 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 677791B4053 for ; Wed, 16 May 2012 12:02:52 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2230) id 237242004B; Wed, 16 May 2012 12:02:51 +0000 (UTC) From: "Tomas Chvatal (scarabeus)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, scarabeus@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in games-arcade/performous/files: performous-0.6.1-libav.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: performous-0.6.1-libav.patch X-VCS-Directories: games-arcade/performous/files X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Message-Id: <20120516120251.237242004B@flycatcher.gentoo.org> Date: Wed, 16 May 2012 12:02:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4bdffe24-2f88-4638-849f-3b3c54204a58 X-Archives-Hash: cdca24d0e07bde84346ac1e75710ecb1 scarabeus 12/05/16 12:02:51 Added: performous-0.6.1-libav.patch Log: Build with libav and thus depend on virtual/ffmpeg. =20 (Portage version: 2.2.0_alpha105/cvs/Linux x86_64) Revision Changes Path 1.1 games-arcade/performous/files/performous-0.6.1-libav= .patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/perfo= rmous/files/performous-0.6.1-libav.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/perfo= rmous/files/performous-0.6.1-libav.patch?rev=3D1.1&content-type=3Dtext/pl= ain Index: performous-0.6.1-libav.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff -urN Performous-0.6.1-Source.old/cmake/Modules/FindAVUtil.cmake Perf= ormous-0.6.1-Source/cmake/Modules/FindAVUtil.cmake --- Performous-0.6.1-Source.old/cmake/Modules/FindAVUtil.cmake 2012-05-16= 13:44:26.112930173 +0200 +++ Performous-0.6.1-Source/cmake/Modules/FindAVUtil.cmake 2012-05-16 13:= 56:10.229914635 +0200 @@ -25,9 +25,15 @@ if(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}avutil.h") set(AVUtil_INCLUDE "${suffix}avutil.h") endif(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}avutil.h") + if(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}mathematics.h") + set(AVUtilMath_INCLUDE "${suffix}mathematics.h") + endif(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}mathematics.h") endif(NOT AVUtil_INCLUDE) endforeach(suffix) =20 + if(NOT AVUtilMath_INCLUDE) + message(FATAL_ERROR "Found mathematics.h include dir, but not the he= ader file. Perhaps you need to clear CMake cache?") + endif(NOT AVUtilMath_INCLUDE)=20 if(NOT AVUtil_INCLUDE) message(FATAL_ERROR "Found avutil.h include dir, but not the header = file. Perhaps you need to clear CMake cache?") endif(NOT AVUtil_INCLUDE) diff -urN Performous-0.6.1-Source.old/game/config.cmake.hh Performous-0.6= .1-Source/game/config.cmake.hh --- Performous-0.6.1-Source.old/game/config.cmake.hh 2012-05-16 13:44:26.= 103930173 +0200 +++ Performous-0.6.1-Source/game/config.cmake.hh 2012-05-16 13:59:24.5529= 10345 +0200 @@ -15,6 +15,7 @@ #define AVCODEC_INCLUDE <@AVCodec_INCLUDE@> #define AVFORMAT_INCLUDE <@AVFormat_INCLUDE@> #define SWSCALE_INCLUDE <@SWScale_INCLUDE@> +#define AVUTILMATH_INCLUDE <@AVUtilMath_INCLUDE@> =20 #endif =20 diff -urN Performous-0.6.1-Source.old/game/ffmpeg.cc Performous-0.6.1-Sou= rce/game/ffmpeg.cc --- Performous-0.6.1-Source.old/game/ffmpeg.cc 2012-05-16 13:44:26.101930= 173 +0200 +++ Performous-0.6.1-Source/game/ffmpeg.cc 2012-05-16 14:00:38.278908717 = +0200 @@ -10,6 +10,7 @@ #include AVCODEC_INCLUDE #include AVFORMAT_INCLUDE #include SWSCALE_INCLUDE +#include AVUTILMATH_INCLUDE } =20 // #define USE_FFMPEG_CRASH_RECOVERY