Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-arcade/performous/files: performous-1.0-include.patch performous-1.0-linguas.patch performous-1.0-gentoo.patch performous-1.0-libav.patch
Date: Tue, 31 Mar 2015 18:34:49
Message-Id: 20150331183446.B08FB14EF5@oystercatcher.gentoo.org
1 mr_bones_ 15/03/31 18:34:46
2
3 Added: performous-1.0-include.patch
4 performous-1.0-linguas.patch
5 performous-1.0-gentoo.patch
6 performous-1.0-libav.patch
7 Log:
8 version bump
9
10 (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
11
12 Revision Changes Path
13 1.1 games-arcade/performous/files/performous-1.0-include.patch
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/performous/files/performous-1.0-include.patch?rev=1.1&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/performous/files/performous-1.0-include.patch?rev=1.1&content-type=text/plain
17
18 Index: performous-1.0-include.patch
19 ===================================================================
20 --- performous-1.0/game/song.hh.orig 2015-03-31 13:56:13.546360617 -0400
21 +++ performous-1.0/game/song.hh 2015-03-31 13:56:23.609025021 -0400
22 @@ -3,6 +3,7 @@
23 #include "i18n.hh"
24 #include "notes.hh"
25 #include "util.hh"
26 +#include "fs.hh"
27 #include <boost/foreach.hpp>
28 #include <boost/noncopyable.hpp>
29 #include <stdexcept>
30
31
32
33 1.1 games-arcade/performous/files/performous-1.0-linguas.patch
34
35 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/performous/files/performous-1.0-linguas.patch?rev=1.1&view=markup
36 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/performous/files/performous-1.0-linguas.patch?rev=1.1&content-type=text/plain
37
38 Index: performous-1.0-linguas.patch
39 ===================================================================
40 diff -ru performous-1.0.orig/lang/CMakeLists.txt performous-1.0/lang/CMakeLists.txt
41 --- performous-1.0.orig/lang/CMakeLists.txt 2014-10-28 19:11:45.000000000 -0400
42 +++ performous-1.0/lang/CMakeLists.txt 2015-02-22 04:25:40.502252942 -0500
43 @@ -9,5 +9,13 @@
44 file(MAKE_DIRECTORY "${mobuild}")
45 add_custom_command(OUTPUT "${mofile}" COMMAND "${Msgfmt_BIN}" -v "${pofile}" -o "${mofile}" MAIN_DEPENDENCY "${pofile}" COMMENT "Building ${language} locale" VERBATIM)
46 add_custom_target("locale_${language}" ALL DEPENDS "${mofile}") # Make sure the mofiles are always built
47 - install(FILES "${mofile}" DESTINATION "${LOCALE_DIR}/${language}/LC_MESSAGES")
48 endforeach(language)
49 +foreach(language $ENV{LINGUAS})
50 + set(pofile ${CMAKE_CURRENT_SOURCE_DIR}/${language}.po)
51 + if (EXISTS ${pofile})
52 + set(mofile ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo)
53 + install(FILES ${mofile} DESTINATION
54 +{LOCALE_DIR}/${language}/LC_MESSAGES RENAME ${CMAKE_PROJECT_NAME}.mo)
55 + endif()
56 +endforeach(language)
57 +
58
59
60
61 1.1 games-arcade/performous/files/performous-1.0-gentoo.patch
62
63 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/performous/files/performous-1.0-gentoo.patch?rev=1.1&view=markup
64 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/performous/files/performous-1.0-gentoo.patch?rev=1.1&content-type=text/plain
65
66 Index: performous-1.0-gentoo.patch
67 ===================================================================
68 diff -ru performous-1.0.orig/game/CMakeLists.txt performous-1.0/game/CMakeLists.txt
69 --- performous-1.0.orig/game/CMakeLists.txt 2014-10-28 19:11:45.000000000 -0400
70 +++ performous-1.0/game/CMakeLists.txt 2015-03-31 03:01:30.806061643 -0400
71 @@ -141,7 +141,7 @@
72 set(BIN_INSTALL .) # Straight to Program Files/Performous with no bin subfolder.
73 set(SUBSYSTEM_WIN32 WIN32)
74 else()
75 - set(BIN_INSTALL bin)
76 + set(BIN_INSTALL @GENTOO_BINDIR@)
77 endif()
78
79 # Build main executable
80
81
82
83 1.1 games-arcade/performous/files/performous-1.0-libav.patch
84
85 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/performous/files/performous-1.0-libav.patch?rev=1.1&view=markup
86 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/performous/files/performous-1.0-libav.patch?rev=1.1&content-type=text/plain
87
88 Index: performous-1.0-libav.patch
89 ===================================================================
90 diff -urN Performous-0.6.1-Source.old/cmake/Modules/FindAVUtil.cmake Performous-0.6.1-Source/cmake/Modules/FindAVUtil.cmake
91 --- Performous-0.6.1-Source.old/cmake/Modules/FindAVUtil.cmake 2012-05-16 13:44:26.112930173 +0200
92 +++ Performous-0.6.1-Source/cmake/Modules/FindAVUtil.cmake 2012-05-16 13:56:10.229914635 +0200
93 @@ -25,9 +25,15 @@
94 if(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}avutil.h")
95 set(AVUtil_INCLUDE "${suffix}avutil.h")
96 endif(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}avutil.h")
97 + if(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}mathematics.h")
98 + set(AVUtilMath_INCLUDE "${suffix}mathematics.h")
99 + endif(EXISTS "${AVUtil_INCLUDE_DIR}/${suffix}mathematics.h")
100 endif(NOT AVUtil_INCLUDE)
101 endforeach(suffix)
102
103 + if(NOT AVUtilMath_INCLUDE)
104 + message(FATAL_ERROR "Found mathematics.h include dir, but not the header file. Perhaps you need to clear CMake cache?")
105 + endif(NOT AVUtilMath_INCLUDE)
106 if(NOT AVUtil_INCLUDE)
107 message(FATAL_ERROR "Found avutil.h include dir, but not the header file. Perhaps you need to clear CMake cache?")
108 endif(NOT AVUtil_INCLUDE)