diff options
| -rw-r--r-- | games-arcade/performous/ChangeLog | 9 | ||||
| -rw-r--r-- | games-arcade/performous/Manifest | 20 | ||||
| -rw-r--r-- | games-arcade/performous/files/performous-0.7.0-cmake.patch | 155 | ||||
| -rw-r--r-- | games-arcade/performous/metadata.xml | 2 | ||||
| -rw-r--r-- | games-arcade/performous/performous-0.7.0-r1.ebuild | 101 |
5 files changed, 284 insertions, 3 deletions
diff --git a/games-arcade/performous/ChangeLog b/games-arcade/performous/ChangeLog index 1ae46a058b80..230730c4346d 100644 --- a/games-arcade/performous/ChangeLog +++ b/games-arcade/performous/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for games-arcade/performous # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/ChangeLog,v 1.14 2013/01/13 11:22:47 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/ChangeLog,v 1.15 2013/01/24 17:04:10 hasufell Exp $ + +*performous-0.7.0-r1 (24 Jan 2013) + + 24 Jan 2013; Julian Ospald <hasufell@gentoo.org> +performous-0.7.0-r1.ebuild, + +files/performous-0.7.0-cmake.patch, metadata.xml: + add missing deps, add midi and webcam useflag, fix build time issues wrt + #452476, bump EAPI 13 Jan 2013; Agostino Sarubbo <ago@gentoo.org> performous-0.7.0.ebuild: Stable for x86, wrt bug #449932 diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest index b72ec7fb3ddd..b6b54d08da38 100644 --- a/games-arcade/performous/Manifest +++ b/games-arcade/performous/Manifest @@ -1,3 +1,7 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX performous-0.7.0-cmake.patch 6132 SHA256 a4f6a109fc74f899753476e32d4dffdfc75b0b9ab065a86b21c629b444cbabf5 SHA512 b188e1107afc489cdd26004e8c66c65cf88ab2613974195ca33dbdb2a757f402496d906e1720d6f889db9873fa02d24f20f2b58b3169b91ff025faeefc5e3a8d WHIRLPOOL 786327cf426154c9d8cfc6e61325f8c4abea52a682d507ad1bd44f737422c450d4538f5352545e86c45146c2d476e274c64f0599c067ac3897b31a6159ffd060 AUX performous-0.7.0-desktop.patch 499 SHA256 d8ec0ea0bf824048dc38d831db13fe818cb51da1463407696323d1db839c1a9f SHA512 c4e92d1f6c0ebb5a438c51d17ef926924872112f9f0e5ca55b70c566f30bcd4f53a13ba25472af9de0a1e0686caaf0772e237ecab52db5fce816b4866f91ba49 WHIRLPOOL 45916a92e485d0ca7d00d19d2e08b4748fba3cc8d1b9d1b21534350579238c37364373530df0c3382533b5e233bfb7863eb9f6243578321ad912ee100ff61519 AUX performous-0.7.0-gentoo.patch 1445 SHA256 82d8bfcf56a0c495e51130817dbe3d327a2fc86ca3d1a5887ee890dcf543897f SHA512 576759fe71143480fbeee0abef4a147d5bc627d3a04d8207bdefcf41dd3276bbae26a614b3b865d7a1a3c5ae6b332f8b136afacfdec7f9d68fdae8e24b97939c WHIRLPOOL b6328a66155248360de74b5770c344cdde43239e310b5c865724138a53eb0c60c37955d7a8ca51fb86595a613fc90e4320e2f1d32bdde75689ca69ab5fdce49a AUX performous-0.7.0-libav.patch 2038 SHA256 f0aa4df47ddd2e7f0725f06cc345a84787b6b1b0ee9c607bd3e80c71f04bdad1 SHA512 8460b2f8e054183e82130c01761499949a39cc67a33a42745b58d0e16e4a29293489a8fb2b3b63873daebb17a87a655e019e02474ae66981e3af632d3889a237 WHIRLPOOL 0506ded66223cb35026c14a874f50c2db7398bf455e33398a8aeded12a3aebc47c19e36f6a9d74975a52b1beebaa29b345c8aaaf21057e1ef5bb2b0fe3feb259 @@ -7,6 +11,18 @@ DIST ultrastar-songs-jc-1.zip 242698201 SHA256 b3a6f980926c4f1ce40bc763a40604085 DIST ultrastar-songs-libre-3.zip 5289866 SHA256 739d1c678bb7c786499f5216faee420b9b56633142928aff60a7282dae755489 SHA512 820e3637a7b778c92ed1a8b925802134fa2146879b3e03e88cd412de5414635c90fe256dfaf984cfa3e8b07b7da8531dc3061b7c4e1bb4422127b469b2345e66 WHIRLPOOL 48d48e82ec8bd02376b3def5a3f215331c49853cf00439686cd577ebd51321e4a4e8b213d40356a46e2a2bd2a1bf6c1cb07b09195209833f4eb004166937bfe5 DIST ultrastar-songs-restricted-3.zip 10242651 SHA256 e05d81333f85e2c6c271a67f90beac453d64eac78cd95eec7214721182257a82 SHA512 70b987fec3705d6610625c1f30a7ff683a51bb6b7ee3174609c80dc31c1bccdb23dcb2c6ae8154e1b1d9ef115b914e27e73925878a3c5460b997fdde813456b8 WHIRLPOOL cb83550395bbbadb45ad982fd4586a4dca49ae96bbe7adfab1b925301fa69eb5581c24f0c5c8d3593851a80b3e86137eea7658753f720ad76bae6e5809c2feba DIST ultrastar-songs-shearer-1.zip 50411551 SHA256 967c3dfae2da2915a66fd9dfee14da7191e13bb95e8b0820049d109c21f25628 SHA512 add9df22b78967fd6f19699e8569f976423e931a32ea7a62cfec2f94470b9120f05832560215a000ecec8dd65508b057fac8ac90efd3a768ed74ddced186a73b WHIRLPOOL 868974ba4e68482dde0a25b338f0c8afd64435ddb872cd4a2ac7d5e8a984d16ebfdca530501779c24d1b2e4feb8151ee71f5db3052032fd706f42a88d31a46ab +EBUILD performous-0.7.0-r1.ebuild 2388 SHA256 c5c70cbf1d213734b0f20d4ff92b064d40fa70c390ac09087b8bf3a009f16d78 SHA512 8a8d71d1d8b55fc6451afcc8dd35545b4a1e1f325bb5b327150dd5535c3380a26b1bb4022aef5a97baa0f2ddd07b6151828d06fe499cd444c515b8ee675f1e69 WHIRLPOOL 6fe2b78c2c605d9ac1e60ab1015282a502c99f0300c75323a7be71329025fa1da6c0912a3a5e3d64bcff5bbf3fe83b30dbb18b842a28608c8745adaa8d71b2c5 EBUILD performous-0.7.0.ebuild 2536 SHA256 e12dee5fcd85b3084c2926e02254e4e3949ce08dcfb5d1c191b963c328a61dfc SHA512 5a3e1aeabccd8d7f367935a7d02f1ab6f0cef4b724865efa7ce302ad113cff0d318ea91f85628164274c94b6914c2cd2839c869a4b3557d9261af67a179ab966 WHIRLPOOL 300bc2b0aac90662c5f25d406f2ab888da8ffdfcc4b1d4d12f662b7a210422e0ea5e0e2c09e2b8c6f3838c0c3b101fb39117d5e075c49898f5bef7fa1fb55b36 -MISC ChangeLog 2770 SHA256 8f29321e749dedab4358d678a476f79aa9ec8bba23e7fc3611d1b2a76321ecbd SHA512 12560e0a4ed070afd5f61906f505ac6ebbcf322d815a734a768a6b2d771ddfe8d977fc0ef03f8dfef609c4bc92efecd8ada27179222d3900225858b37f31d681 WHIRLPOOL 752d2c1e1d7e29747f93bb7b116def5a047efbb99dad61a77593495343c23558d2a20b528cd37ccf9c2f83224a8a7f8bf0de25efa5a7671fb36fad1b570ec731 -MISC metadata.xml 462 SHA256 58703292296a89760bd19edb9d2e020dd6a1428fa555111372b446f0fdd1691f SHA512 fc60b67a82dee2ba6239ed99f9c217d4d3ae51d71c75f6b94dd62e335565979ae905dbf3bde8b5dfed8bc1c8164b4b6b59132a51c294e1ad1ca333c881b1a124 WHIRLPOOL 2ce0968588111cb4174b79d084fdb2c7e5c5d3a8a7b6ec47dcad2b83dc4ef89e53978e58697263703f072de45784cf9f1bdc8110f4ed2b4c8e8e8061ede0d7da +MISC ChangeLog 3041 SHA256 80af0c3dae8fce56b72db4578d9160af8389db06530425dc46a4a8d66ecb55c4 SHA512 466e4f37f4cef9f91c675985cccb96c64fffcdac1cf36dacb3507c0d8b4dbe5a9a1403c3ff362927110562196e672cbb8d4278ad18ebe9ac1f14a1ca8fed41d1 WHIRLPOOL 55401388909da338157b69f75c90743be3813790fa08f70d2297f7b62ff57849cc50e64758989dc6abfaf214bdafcd6952436a0e64f31cd183b767349a2cc2cb +MISC metadata.xml 564 SHA256 c3c42c109f862bbd1e4757c2e6ebef0df2661aea10c418b9fa7fb13e79c6c688 SHA512 b9c42a4984a4ea8379c47d775258abd540322a325a18511c485a6869663fb904e1625c2ac64d484d953c82e00486ba0f4e557ee567677b6b99bec3b6d721c56f WHIRLPOOL bfb866e2fc0ec502820b9dc5abb8226d088a52a57db7bf7a0534c43df28cc7bc6c8bd5e10bcbe74ac512ba35e58ab8bb6758b988097795ec316da6e75f9c9b49 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBCAAGBQJRAWmOAAoJEFpvPKfnPDWztZkH/0gNrM93rjWJIGEyCh8oatjr +EnmIJwigz6o3YsNCESBu+yRDgAtK0xa0v1bQuqok2tsOCAZSOyomHjU5J2x4fZj7 +6m+EMkcYQ4ibES2FhDwg7Ei1x3P+0lKW2gVpv507gmBGbyEVIotpNlHAvTPkXsKh +5mysVkOg8ZF48QG43WH42OUoWyFbkAipPxdRPe8MkAYwXwe1E6YWQGxCsUSvxBsn +YhiCD89qZspGdWkI7etwl9rjsZ0cN2fUcm6xsP8ZqBGlZv+q0FHA4LdqRuVCpqk+ +tJ8EvWpe7IaWpUOgYZ+spc7NvZX8YpmqqBRxAiOowYEkwqfqZSWlP8/4MvoYRVI= +=35qR +-----END PGP SIGNATURE----- diff --git a/games-arcade/performous/files/performous-0.7.0-cmake.patch b/games-arcade/performous/files/performous-0.7.0-cmake.patch new file mode 100644 index 000000000000..4c6f47b634af --- /dev/null +++ b/games-arcade/performous/files/performous-0.7.0-cmake.patch @@ -0,0 +1,155 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Thu Jan 24 13:13:50 UTC 2013 +Subject: build system + + - fix opencv module to prefer pkg-config results + - fix some module and macro names and try to use + system modules as much as possible (ALSA Boost Gettext Jpeg Png Tiff Z) + +--- cmake/Modules/FindOpenCV.cmake ++++ cmake/Modules/FindOpenCV.cmake +@@ -57,13 +57,21 @@ + include(FindPkgConfig) + if(PKG_CONFIG_FOUND) + pkg_check_modules(OPENCV_PKGCONF opencv) +- set(OpenCV_DIR ${OPENCV_PKGCONF_PREFIX}) +- if(EXISTS "${OpenCV_DIR}") +- set(OpenCV_configScript_DIR "${OpenCV_DIR}/share/opencv") +- if(EXISTS "${OpenCV_configScript_DIR}") +- set(OpenCV_configScript "${OpenCV_configScript_DIR}/OpenCVConfig.cmake") +- endif(EXISTS "${OpenCV_configScript_DIR}") +- endif(EXISTS "${OpenCV_DIR}") ++ # prefer pkg-config values ++ if(OPENCV_PKGCONF_FOUND) ++ set(OpenCV_LIBS ${OPENCV_PKGCONF_LDFLAGS}) ++ set(OpenCV_FOUND true) ++ set(OpenCV_INCLUDE_DIR ${OPENCV_PKGCONF_INCLUDE_DIRS}) ++ set(OpenCV_VERSION ${OPENCV_PKGCONF_VERSION}) ++ else(OPENCV_PKGCONF_FOUND) ++ set(OpenCV_DIR ${OPENCV_PKGCONF_PREFIX}) ++ if(EXISTS "${OpenCV_DIR}") ++ set(OpenCV_configScript_DIR "${OpenCV_DIR}/share/opencv") ++ if(EXISTS "${OpenCV_configScript_DIR}") ++ set(OpenCV_configScript "${OpenCV_configScript_DIR}/OpenCVConfig.cmake") ++ endif(EXISTS "${OpenCV_configScript_DIR}") ++ endif(EXISTS "${OpenCV_DIR}") ++ endif(OPENCV_PKGCONF_FOUND) + endif(PKG_CONFIG_FOUND) + endif(NOT WIN32) + endif(NOT EXISTS "${OpenCV_DIR}") +@@ -72,7 +80,7 @@ + ##==================================================== + ## Find OpenCV libraries + ##---------------------------------------------------- +-if(EXISTS "${OpenCV_DIR}") ++if(EXISTS "${OpenCV_DIR}" AND NOT OpenCV_FOUND) + + #When its possible to use the Config script use it. + if(EXISTS "${OpenCV_configScript}") +@@ -257,9 +265,9 @@ + endif(${OpenCV_VERSION} VERSION_GREATER 2.1.0) + + +-else(EXISTS "${OpenCV_DIR}") ++else(EXISTS "${OpenCV_DIR}" AND NOT OpenCV_FOUND) + set(ERR_MSG "Please specify OpenCV directory using OpenCV_DIR env. variable") +-endif(EXISTS "${OpenCV_DIR}") ++endif(EXISTS "${OpenCV_DIR}" AND NOT OpenCV_FOUND) + ##==================================================== + + ##==================================================== +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -33,7 +33,7 @@ + + #need to put here do setting LOCALE_DIR variable + find_package(Gettext) +-if(Gettext_FOUND) ++if(GETTEXT_FOUND) + if(NOT LOCALE_DIR) + if(WIN32) + SET(LOCALE_DIR "bin/locale") +@@ -55,7 +55,7 @@ + message(STATUS "Cannot find msgfmt to convert language file. Translation won't be enabled") + endif() + endif(NOT LOCALE_DIR) +-endif(Gettext_FOUND) ++endif(GETTEXT_FOUND) + add_subdirectory(themes) + add_subdirectory(data) + add_subdirectory(game) +--- game/CMakeLists.txt ++++ game/CMakeLists.txt +@@ -71,7 +71,7 @@ + list(APPEND LIBS ${Boost_LIBRARIES}) + + # Find all the libs that don't require extra parameters +-foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ GLEW AVFormat SWScale OpenGL Z Jpeg Png PortAudio) ++foreach(lib ${OUR_LIBS} SDL PangoCairo LibRSVG LibXML++ GLEW AVFormat SWScale OpenGL ZLIB JPEG PNG PortAudio) + find_package(${lib} REQUIRED) + include_directories(${${lib}_INCLUDE_DIRS}) + list(APPEND LIBS ${${lib}_LIBRARIES}) +@@ -79,7 +79,7 @@ + endforeach(lib) + + find_package(Gettext) +-if(Gettext_FOUND) ++if(GETTEXT_FOUND) + include_directories(${Gettext_INCLUDE_DIRS}) + list(APPEND LIBS ${Gettext_LIBRARIES}) + add_definitions("-DUSE_GETTEXT") +--- tools/CMakeLists.txt ++++ tools/CMakeLists.txt +@@ -6,7 +6,7 @@ + include_directories(${Boost_INCLUDE_DIRS}) + + # Find all the libs that don't require extra parameters +-foreach(lib LibXML++ Magick++ Z Jpeg Tiff Png Freetype Z) ++foreach(lib LibXML++ Magick++ ZLIB JPEG TIFF PNG Freetype ZLIB) + find_package(${lib}) + if (${lib}_FOUND) + include_directories(${${lib}_INCLUDE_DIRS}) +@@ -24,13 +24,13 @@ + if (LibXML++_FOUND) + if (Boost_FOUND) + if (Magick++_FOUND) +- if (Z_FOUND) ++ if (ZLIB_FOUND) + add_executable(ss_extract ss_extract.cpp pak.cpp ipu_conv.cpp ss_cover.cpp) +- target_link_libraries(ss_extract ${LibXML++_LIBRARIES} ${Boost_LIBRARIES} ${Magick++_LIBRARIES} ${Z_LIBRARIES} ${Jpeg_LIBRARIES} ${Tiff_LIBRARIES} ${Png_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES}) ++ target_link_libraries(ss_extract ${LibXML++_LIBRARIES} ${Boost_LIBRARIES} ${Magick++_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${PNG_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES}) + set(targets ${targets} ss_extract) +- else (Z_FOUND) ++ else (ZLIB_FOUND) + message("No zlib found, not building ss_extract") +- endif (Z_FOUND) ++ endif (ZLIB_FOUND) + else (Magick++_FOUND) + message("No Magick++ found, not building ss_extract") + endif (Magick++_FOUND) +@@ -40,7 +40,7 @@ + + if (Magick++_FOUND) + add_executable(ss_cover_conv cover_conv.cpp pak.cpp ss_cover.cpp) +- target_link_libraries(ss_cover_conv ${Magick++_LIBRARIES} ${LibXML++_LIBRARIES} ${Z_LIBRARIES} ${Jpeg_LIBRARIES} ${Tiff_LIBRARIES} ${Png_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES}) ++ target_link_libraries(ss_cover_conv ${Magick++_LIBRARIES} ${LibXML++_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${PNG_LIBRARIES} ${Freetype_LIBRARY} ${Magick++_LIBRARIES}) + set(targets ${targets} ss_cover_conv) + else (Magick++_FOUND) + message("No Magick++ found, not building ss_cover_conv") +@@ -58,13 +58,13 @@ + target_link_libraries(ss_archive_extract ${Boost_LIBRARIES}) + set(targets ${targets} ss_archive_extract) + +- if (Z_FOUND) ++ if (ZLIB_FOUND) + add_executable(itg_pck itg_pck.cc) +- target_link_libraries(itg_pck ${Boost_LIBRARIES} ${Z_LIBRARIES}) ++ target_link_libraries(itg_pck ${Boost_LIBRARIES} ${ZLIB_LIBRARIES}) + set(targets ${targets} itg_pck) + + add_executable(ss_chc_decode ss_chc_decode.cpp) +- target_link_libraries(ss_chc_decode ${Boost_LIBRARIES} ${Z_LIBRARIES}) ++ target_link_libraries(ss_chc_decode ${Boost_LIBRARIES} ${ZLIB_LIBRARIES}) + set(targets ${targets} ss_chc_decode) + endif() + endif (Boost_FOUND) diff --git a/games-arcade/performous/metadata.xml b/games-arcade/performous/metadata.xml index 06363fb36f77..7462fa1dd68a 100644 --- a/games-arcade/performous/metadata.xml +++ b/games-arcade/performous/metadata.xml @@ -6,7 +6,9 @@ Performous is an open-source rhythm/performance platform that contains singing, guitar/bass playing, drumming and dancing all in one game. </longdescription> <use> + <flag name="midi">Enable MIDI I/O support</flag> <flag name="songs">Install a few demo songs</flag> <flag name="tools">Install tools</flag> + <flag name="webcam">Enable Webcam support</flag> </use> </pkgmetadata> diff --git a/games-arcade/performous/performous-0.7.0-r1.ebuild b/games-arcade/performous/performous-0.7.0-r1.ebuild new file mode 100644 index 000000000000..8625ece8d71b --- /dev/null +++ b/games-arcade/performous/performous-0.7.0-r1.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-arcade/performous/performous-0.7.0-r1.ebuild,v 1.1 2013/01/24 17:04:10 hasufell Exp $ + +EAPI=5 + +CMAKE_REMOVE_MODULES="yes" +CMAKE_REMOVE_MODULES_LIST="FindALSA FindBoost FindGettext FindJpeg FindPng FindTiff FindZ" +inherit eutils base cmake-utils games + +MY_PN=Performous +MY_P=${MY_PN}-${PV} +SONGS_PN=ultrastar-songs + +DESCRIPTION="SingStar GPL clone" +HOMEPAGE="http://sourceforge.net/projects/performous/" +SRC_URI="mirror://sourceforge/performous/${P}.tar.bz2 + songs? ( + mirror://sourceforge/performous/${SONGS_PN}-restricted-3.zip + mirror://sourceforge/performous/${SONGS_PN}-jc-1.zip + mirror://sourceforge/performous/${SONGS_PN}-libre-3.zip + mirror://sourceforge/performous/${SONGS_PN}-shearer-1.zip + )" + +LICENSE="GPL-2 + songs? ( + CCPL-Attribution-ShareAlike-NonCommercial-2.5 + CCPL-Attribution-NonCommercial-NoDerivs-2.5 + )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="midi songs tools webcam" + +RDEPEND="dev-cpp/glibmm + dev-cpp/libxmlpp + media-libs/portaudio + dev-libs/boost[threads(+)] + dev-libs/glib + dev-libs/libxml2 + gnome-base/librsvg + media-gfx/imagemagick + virtual/jpeg + media-libs/libpng:0 + media-libs/libsdl[joystick,video] + virtual/ffmpeg + virtual/opengl + virtual/glu + sys-libs/zlib + virtual/libintl + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/pango + midi? ( media-libs/portmidi ) + webcam? ( media-libs/opencv )" +DEPEND="${RDEPEND} + media-libs/glew + sys-apps/help2man + sys-devel/gettext" + +PATCHES=( + "${FILESDIR}"/${P}-libav.patch + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-linguas.patch + "${FILESDIR}"/${P}-desktop.patch + "${FILESDIR}"/${P}-cmake.patch +) + +src_prepare() { + base_src_prepare + sed -i \ + -e "s:@GENTOO_BINDIR@:${GAMES_BINDIR}:" \ + game/CMakeLists.txt \ + || die + + strip-linguas -u lang +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_enable tools TOOLS) + $(usex midi "" "-DNO_PORTMIDI=ON") + $(usex webcam "" "-DNO_WEBCAM=ON") + -DCMAKE_VERBOSE_MAKEFILE=TRUE + -DSHARE_INSTALL="${GAMES_DATADIR}"/${PN} + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install() { + cmake-utils_src_install + if use songs ; then + insinto "${GAMES_DATADIR}"/${PN} + doins -r "${WORKDIR}/songs" + fi + dodoc docs/{Authors,DeveloperReadme,instruments,TODO}.txt + prepgamesdirs +} |