Build with libav and thus depend on virtual/ffmpeg.

Package-Manager: portage-2.2.0_alpha105/cvs/Linux x86_64

4 files changed, 72 insertions, 5 deletions

diff --git a/games-arcade/performous/ChangeLog b/games-arcade/performous/ChangeLog
index 4adf1fad39e4..396ed7169966 100644
--- a/games-arcade/performous/ChangeLog
+++ b/games-arcade/performous/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/performous
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/ChangeLog,v 1.7 2012/03/15 03:54:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/ChangeLog,v 1.8 2012/05/16 12:02:51 scarabeus Exp $
+
+  16 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/performous-0.6.1-libav.patch, performous-0.6.1.ebuild:
+  Build with libav and thus depend on virtual/ffmpeg.
 
   15 Mar 2012; Michael Sterrett <mr_bones_@gentoo.org> performous-0.6.1.ebuild:
   games-arcade/ultrastar-ng is gone
diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest
index fa6e1fee2305..1cf31dcf7bff 100644
--- a/games-arcade/performous/Manifest
+++ b/games-arcade/performous/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX performous-0.6.1-ffmpeg.patch 795 RMD160 3ee572e484d960632c954e461e8131c0b69a703a SHA1 b78c3cbcd16b83581f75e86740e2d3cef8dd9599 SHA256 5d3eb46478096b15f982af3ed12bb6d00cb46011a5eb6435a333da4d2bb29399
 AUX performous-0.6.1-gentoo.patch 1445 RMD160 02b13db8ea0581d8d499e2f6e1a6b65fee6a914f SHA1 5bbc0fd310a7d0c42ae52ccb73ae4495b30e0ddd SHA256 82d8bfcf56a0c495e51130817dbe3d327a2fc86ca3d1a5887ee890dcf543897f
+AUX performous-0.6.1-libav.patch 2038 RMD160 1d01fb1758af188d939dca3b04daf012db8c5dea SHA1 08d549a388d705fafc489848a70393d2556fda07 SHA256 f0aa4df47ddd2e7f0725f06cc345a84787b6b1b0ee9c607bd3e80c71f04bdad1
 AUX performous-0.6.1-libpng.patch 678 RMD160 190b21b91c1875f140c02aa6be47b13909578d7e SHA1 bfecb26b58a600d8e8ad3abc0547456cc8b6abce SHA256 0c60e3d3ce1b05d5a64642f697dc81489f9f22eb7f55c15fe509d61d0d155d22
 AUX performous-0.6.1-linguas.patch 833 RMD160 f1ad8751081ab6874c6c40f53789ac4d8358bfab SHA1 9d9da6d0d1e5dcb8fa9e4ab5dc84916e9f3c919a SHA256 52efe542b46c6b6f436d97d7ae567c8f6012586dc20d9ea5840e37561fa3811d
 DIST Performous-0.6.1-Source.tar.bz2 3745265 RMD160 5d3a95ae2ed4cbe8e874a328d086522823df4b55 SHA1 6dafb83568d34c66435fa626e73f07ebf82bffc8 SHA256 d210988f8d86797dc9ba5fbde2ffa237c5596eaa1daf9ddcd62bde7d1ab30c85
@@ -7,6 +11,23 @@ DIST ultrastar-songs-jc-1.zip 242698201 RMD160 b541ad7df65a9280d1f5eb8b9891083ff
 DIST ultrastar-songs-libre-3.zip 5289866 RMD160 98e9c4ab2364c1c26cb0f51e61c4026f43199868 SHA1 10add8daf1767671eb8b7d10927e93ea5ab73d5f SHA256 739d1c678bb7c786499f5216faee420b9b56633142928aff60a7282dae755489
 DIST ultrastar-songs-restricted-3.zip 10242651 RMD160 7eb59b4db7968097db8f850f475e32a9ecbab889 SHA1 fd4e373104df543e44e273d294c39bd7baf6923b SHA256 e05d81333f85e2c6c271a67f90beac453d64eac78cd95eec7214721182257a82
 DIST ultrastar-songs-shearer-1.zip 50411551 RMD160 20ea920aa05c489903988bf31edff467012d4921 SHA1 49d64f914cfd77cc39dcaa14b00a5b4c5df3f112 SHA256 967c3dfae2da2915a66fd9dfee14da7191e13bb95e8b0820049d109c21f25628
-EBUILD performous-0.6.1.ebuild 2586 RMD160 82bf653238633a60a9d18aba26359ff9c435d827 SHA1 296dfeb056acbef1122042dadb4cb06758628374 SHA256 b19a65828af8d44cf8c304db5315052cf68ede474c2f6fb1d5dbe19592315ddf
-MISC ChangeLog 1324 RMD160 d1bc520c8f0e3768bf0eb9815a980a89be97f542 SHA1 a45896bfdac7f7f6d5b84d9aa9ea25a08df22be1 SHA256 86a74917f9cf19a1b9b5763fde4e32feca83ea720e7e8fea64888ec016b2714a
+EBUILD performous-0.6.1.ebuild 2614 RMD160 c301dc5ba3415a222fcd90c3ad32dfc7e1d097da SHA1 c86abe0327f8eedc249a651a433a3d3fd5e0e13a SHA256 41637cf6ad03086e2f51eebde11e818f6aae52e1781ef12b2a55a6316a7c5b58
+MISC ChangeLog 1498 RMD160 9d7f944d3d77f19f21cc5360ce7b118b3568db71 SHA1 29e8c0b5bf26a69db3e8ca52e420e09639e7afd5 SHA256 bb4f734bdccb072a4789119eebeac9ec5fece5869ef82bc876e7f622ddc75db8
 MISC metadata.xml 536 RMD160 bcab16517c7f86266852d25efc7c79d527d54a48 SHA1 67ea3ae7852fca041a3ac5c9504224eb6a08d74a SHA256 316340057c29f5114bca4fef85389999055165713cd5ee32c957f5804d65e063
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPs5eDAAoJEOSiRoyO7jvoH6oP/1H6ukSYIDLn0rfjWXrxSp56
+2GW+rMaZZ4GKpAy1OHaZZiHRoTwo7OwCoLZCg7XwPBa8ae3zeLgkpD9VtTivzcJK
+YH38ToiUT4dzWZIZtmgjOkd5MbjTwWsdoOui/Ia7x6VboLGBiqbePCR5cirNTuLl
+YVt/1XF8Jc9lYUoerIn6VGd9AxZ769GEAsDNuo7DgIBMznqnobTiRYlXFbL4rOvO
+6XmKQYnTX/HEU72crMJlBwDY/sry09rP7o4Jp2FIOGjfcgZQ0l0eByWA6Ld5fzr2
+ZSAJC/c7NoOPZH/xxfjt6ASFcrfWSGw78Jv2iAG1sdiU0yvdcyDqb5J+2WoyoKYh
+nCmBdnrksc2u4TeVyTm0TSs6i466kWEcwQ3KwE9au9XKo0CVZ2mEo5rfq2mqwvPV
+8PILHHjsCB24AHVJCyUNxmGLvlGZjhjNXzlP+e4T5IcLkLX+67fovEFgd8Dkk4+L
+odsi60oLwnsgKw/WPaVQej3y9sd8rqV+wR4IwEKa9TRbpwMoQXDjY0kBJ2xMDhux
+mLLL6nbSswNi8I6CMRn4XFR7hJtBbSACuQluYfl+yVfxLfxSt25xueAie1VBrrBF
+uhUlaaX+L9vDd7/ItmECvuCwwwasdjWPOzLVE1ubcVTKRNy2Ws9VnxjThMZYynVm
+6pLVK3FDk5ljucb6m81K
+=7+oV
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/performous/files/performous-0.6.1-libav.patch b/games-arcade/performous/files/performous-0.6.1-libav.patch
new file mode 100644
index 000000000000..b598dc0a488a
--- /dev/null
+++ b/games-arcade/performous/files/performous-0.6.1-libav.patch
@@ -0,0 +1,41 @@
+diff -urN Performous-0.6.1-Source.old/cmake/Modules/FindAVUtil.cmake Performous-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)
+ 
++  if(NOT AVUtilMath_INCLUDE)
++    message(FATAL_ERROR "Found mathematics.h include dir, but not the header file. Perhaps you need to clear CMake cache?")
++  endif(NOT AVUtilMath_INCLUDE) 
+   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.552910345 +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@>
+ 
+ #endif
+ 
+diff -urN Performous-0.6.1-Source.old/game/ffmpeg.cc Performous-0.6.1-Source/game/ffmpeg.cc
+--- Performous-0.6.1-Source.old/game/ffmpeg.cc	2012-05-16 13:44:26.101930173 +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
+ }
+ 
+ // #define USE_FFMPEG_CRASH_RECOVERY
diff --git a/games-arcade/performous/performous-0.6.1.ebuild b/games-arcade/performous/performous-0.6.1.ebuild
index cb6251219458..c4c24225677f 100644
--- a/games-arcade/performous/performous-0.6.1.ebuild
+++ b/games-arcade/performous/performous-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/performous-0.6.1.ebuild,v 1.7 2012/03/15 03:54:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/performous-0.6.1.ebuild,v 1.8 2012/05/16 12:02:51 scarabeus Exp $
 
 EAPI="3"
 
@@ -40,9 +40,9 @@ RDEPEND="dev-cpp/glibmm
 	virtual/jpeg
 	media-libs/libpng
 	media-libs/libsdl
+	virtual/ffmpeg
 	virtual/opengl
 	virtual/glu
-	media-video/ffmpeg
 	sys-libs/zlib
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
@@ -55,6 +55,7 @@ S=${WORKDIR}/${MY_P}-Source
 
 PATCHES=(
 	"${FILESDIR}"/${P}-ffmpeg.patch
+	"${FILESDIR}"/${P}-libav.patch
 	"${FILESDIR}"/${P}-libpng.patch
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-linguas.patch