[performous] 06/10: Merge tag 'upstream/1.0+git150721'
Markus Koschany
apo-guest at moszumanska.debian.org
Sun Aug 9 12:31:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository performous.
commit a3461f7ebfa40ae595f5bcbecada444dd43b063c
Merge: 3c74f3a 4e6cf18
Author: Markus Koschany <apo at gambaru.de>
Date: Sun Aug 9 13:42:53 2015 +0200
Merge tag 'upstream/1.0+git150721'
Upstream version 1.0+git150721
# gpg: Signature made Sun 09 Aug 2015 13:42:11 CEST using RSA key ID 513B51E4
# gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
# gpg: aka "Markus Koschany <markus at koschany.net>" [ultimate]
CMakeLists.txt | 24 +-
cmake/Modules/FindAVCodec.cmake | 4 +-
cmake/Modules/FindAVFormat.cmake | 4 +-
cmake/Modules/FindAVResample.cmake | 4 +-
cmake/Modules/FindAVUtil.cmake | 4 +-
cmake/Modules/FindAtk.cmake | 4 +-
cmake/Modules/FindAtkmm.cmake | 4 +-
cmake/Modules/FindCairomm.cmake | 4 +-
cmake/Modules/FindClanLib.cmake | 4 +-
cmake/Modules/FindFontconfig.cmake | 4 +-
cmake/Modules/FindFreetype.cmake | 4 +-
cmake/Modules/FindGDK-PixBuf.cmake | 4 +-
cmake/Modules/FindGDK.cmake | 6 +-
cmake/Modules/FindGDKmm.cmake | 6 +-
cmake/Modules/FindGIO.cmake | 2 +-
cmake/Modules/FindGIOmm.cmake | 4 +-
cmake/Modules/FindGLEW.cmake | 4 +-
cmake/Modules/FindGLFW.cmake | 4 +-
cmake/Modules/FindGObject.cmake | 6 +-
cmake/Modules/FindGStreamer.cmake | 4 +-
cmake/Modules/FindGTK.cmake | 4 +-
cmake/Modules/FindGTKmm.cmake | 6 +-
cmake/Modules/FindGettext.cmake | 37 +-
cmake/Modules/FindGlib.cmake | 6 +-
cmake/Modules/FindGlibmm.cmake | 6 +-
cmake/Modules/FindJack.cmake | 4 +-
cmake/Modules/FindJpeg.cmake | 4 +-
cmake/Modules/FindLibEpoxy.cmake | 29 +
cmake/Modules/FindLibPulse.cmake | 4 +-
cmake/Modules/FindLibPulseSimple.cmake | 4 +-
cmake/Modules/FindLibXML++.cmake | 6 +-
cmake/Modules/FindLibXML2.cmake | 6 +-
cmake/Modules/FindMagick++.cmake | 4 +-
cmake/Modules/FindMagick.cmake | 6 +-
cmake/Modules/FindOpenGL.cmake | 6 +-
cmake/Modules/FindPThread.cmake | 2 +-
cmake/Modules/FindPango.cmake | 4 +-
cmake/Modules/FindPangoCairo.cmake | 4 +-
cmake/Modules/FindPangomm.cmake | 4 +-
cmake/Modules/FindPng.cmake | 4 +-
cmake/Modules/FindPortAudio.cmake | 4 +-
cmake/Modules/FindProjectM.cmake | 4 +-
cmake/Modules/FindSWScale.cmake | 4 +-
cmake/Modules/FindTiff.cmake | 4 +-
cmake/Modules/FindZ.cmake | 4 +-
cmake/Modules/GetGitRevisionDescription.cmake | 130 ++
cmake/Modules/GetGitRevisionDescription.cmake.in | 38 +
{game => common}/image.cc | 97 +-
common/image.hh | 54 +
data/config/schema.xml | 4 +
data/shaders/dancenote.vert | 3 +
docs/license/Apache-2.0-DroidSansMono.txt | 202 +++
docs/license/Boost-LICENSE_1_0.txt | 23 +
docs/man/performous.h2m | 2 +-
game/CMakeLists.txt | 75 +-
game/audio.cc | 19 +
game/audio.hh | 4 +-
game/color.cc | 12 +-
game/ffmpeg.cc | 4 +
game/fs.cc | 19 +-
game/fs.hh | 5 -
game/glmath.hh | 2 +-
game/glshader.cc | 12 +-
game/glshader.hh | 2 +-
game/glutil.hh | 2 +-
game/guitargraph.cc | 2 +-
game/guitargraph.hh | 8 +-
game/image.hh | 11 -
game/instrumentgraph.cc | 4 +-
game/layout_singer.cc | 4 +-
game/log.cc | 2 +
game/main.cc | 95 +-
game/menu.cc | 2 +-
game/menu.hh | 4 +-
game/opengl_text.cc | 53 +-
game/opengl_text.hh | 4 -
game/osx/SDLMain.h | 11 -
game/osx/SDLMain.m | 384 -----
game/players.cc | 2 +-
game/players.hh | 2 +-
game/screen.hh | 9 +-
game/screen_audiodevices.cc | 8 +-
game/screen_playlist.cc | 5 +-
game/screen_practice.cc | 2 +-
game/screen_sing.cc | 14 +-
game/screen_songs.cc | 7 +-
game/song.hh | 1 +
game/songitems.cc | 2 +-
game/songparser-txt.cc | 8 +-
game/songparser.hh | 2 +-
game/surface.cc | 8 +-
game/surface.hh | 40 +-
game/svg.cc | 55 +
game/svg.hh | 9 +
game/video_driver.cc | 28 +-
lang/nl.po | 1651 +++++++++++---------
lang/performous.pot | 1027 +++++++-----
lang/pl.po | 1447 ++++++++++-------
osx-utils/performous-app-build.sh | 14 +-
osx-utils/resources/Info.plist | 4 +-
.../performous/files/performous-0.7.0-libav.patch | 41 -
.../files/performous-20141104-cmake.patch | 123 ++
.../performous/files/performous-gentoopaths.patch | 51 -
.../performous/performous-0.4.0.ebuild | 100 --
.../performous/performous-0.5.1.ebuild | 102 --
.../performous/performous-0.6.0.ebuild | 111 --
.../performous/performous-0.7.0.ebuild | 107 --
...erformous-9999.ebuild => performous-1.0.ebuild} | 34 +-
.../games-arcade/performous/performous-9999.ebuild | 34 +-
tools/CMakeLists.txt | 85 +-
tools/cover_conv.cc | 8 +-
tools/gh_fsb/fsbext.c | 6 +-
tools/scripts/translation_wiki_helper.sh | 28 +-
tools/ss_cover.cc | 77 +-
tools/ss_cover.hh | 6 +-
tools/ss_extract.cc | 40 +-
win32/mxe/make-performous.sh | 20 +-
win32/mxe/settings.mk | 16 +-
win32/performous.cmake.rc | 6 +-
119 files changed, 3697 insertions(+), 3210 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/performous.git
More information about the Pkg-games-commits
mailing list