[allegro5] 02/04: Merge tag 'upstream/5.2.2'
Tobias Hansen
thansen at moszumanska.debian.org
Mon Dec 19 02:49:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository allegro5.
commit f1c78fc5d4fa8769158d9791ba11291d786a0e09
Merge: 9ad6b12 cbdb5f5
Author: Tobias Hansen <thansen at debian.org>
Date: Mon Dec 19 02:41:56 2016 +0000
Merge tag 'upstream/5.2.2'
Upstream version 5.2.2
CHANGES-5.2.txt | 240 +++++++++++
CMakeLists.txt | 58 ++-
CONTRIBUTORS.txt | 1 +
README.txt | 3 +
README_android.txt | 11 +-
README_make.txt | 4 +-
README_releasing.txt | 34 +-
addons/acodec/CMakeLists.txt | 60 ++-
addons/acodec/acodec.c | 7 +
addons/acodec/acodec.h | 8 +
.../allegro5/internal/aintern_acodec_cfg.h.cmake | 2 +
addons/acodec/opus.c | 472 +++++++++++++++++++++
addons/audio/CMakeLists.txt | 2 +-
addons/audio/allegro5/internal/aintern_audio.h | 12 +-
addons/audio/kcm_dtor.c | 8 +-
addons/audio/kcm_instance.c | 5 +-
addons/audio/kcm_mixer.c | 4 +-
addons/audio/kcm_sample.c | 4 +-
addons/audio/kcm_stream.c | 30 +-
addons/audio/kcm_voice.c | 4 +-
addons/font/allegro5/allegro_font.h | 46 +-
addons/font/allegro5/internal/aintern_font.h | 41 ++
addons/font/font.c | 25 +-
addons/font/font.h | 2 +
addons/font/fontbmp.c | 2 +-
addons/font/text.c | 9 +-
addons/image/CMakeLists.txt | 2 +-
addons/image/allegro5/allegro_image.h | 2 +
addons/image/png.c | 4 +-
addons/native_dialog/CMakeLists.txt | 2 +-
.../allegro5/internal/aintern_native_dialog.h | 3 +
addons/native_dialog/dialog.c | 4 +-
addons/native_dialog/gtk_xgtk.c | 4 +
addons/native_dialog/osx_dialog.m | 16 +-
addons/native_dialog/textlog.c | 4 +-
addons/primitives/prim_opengl.c | 2 +
addons/ttf/CMakeLists.txt | 2 +-
addons/ttf/ttf.c | 124 ++++--
addons/video/CMakeLists.txt | 2 +-
allegro.mft | 24 ++
android/Activity.cmake | 17 +-
android/allegro_activity/src/AllegroActivity.java | 40 +-
android/allegro_activity/src/AllegroEGL.java | 7 +-
android/allegro_activity/src/AllegroJoystick.java | 86 ++++
android/allegro_activity/src/AllegroSurface.java | 81 +---
android/allegro_activity/src/Sensors.java | 2 +-
android/example/AndroidManifest.xml | 2 +-
cmake/Common.cmake | 23 +
cmake/FindENet.cmake | 29 ++
cmake/FindGDIPLUS.cmake | 26 +-
cmake/FindOpus.cmake | 38 ++
cmake/Toolchain-android.cmake | 69 ++-
cmake/Toolchain-raspberrypi.cmake | 4 +-
demos/cosmic_protector/CMakeLists.txt | 12 +-
demos/skater/CMakeLists.txt | 12 +-
demos/speed/CMakeLists.txt | 8 +-
docs/html/refman/acodec.html | 10 +-
docs/html/refman/audio.html | 288 ++++++-------
docs/html/refman/color.html | 70 +--
docs/html/refman/config.html | 46 +-
docs/html/refman/direct3d.html | 24 +-
docs/html/refman/display.html | 92 ++--
docs/html/refman/events.html | 60 +--
docs/html/refman/file.html | 84 ++--
docs/html/refman/fixed.html | 48 +--
docs/html/refman/font.html | 131 +++---
docs/html/refman/fshook.html | 60 +--
docs/html/refman/fullscreen_mode.html | 10 +-
docs/html/refman/getting_started.html | 6 +-
docs/html/refman/graphics.html | 292 ++++++++-----
docs/html/refman/haptic.html | 74 ++--
docs/html/refman/image.html | 10 +-
docs/html/refman/index.html | 5 +-
docs/html/refman/index_all.html | 17 +-
docs/html/refman/joystick.html | 46 +-
docs/html/refman/keyboard.html | 22 +-
docs/html/refman/main.html | 4 +-
docs/html/refman/memfile.html | 8 +-
docs/html/refman/memory.html | 24 +-
docs/html/refman/misc.html | 8 +-
docs/html/refman/monitor.html | 14 +-
docs/html/refman/mouse.html | 54 +--
docs/html/refman/native_dialog.html | 88 ++--
docs/html/refman/opengl.html | 31 +-
docs/html/refman/path.html | 50 +--
docs/html/refman/physfs.html | 8 +-
docs/html/refman/platform.html | 52 ++-
docs/html/refman/primitives.html | 122 +++---
docs/html/refman/search_index.js | 4 +-
docs/html/refman/shader.html | 48 +--
docs/html/refman/state.html | 22 +-
docs/html/refman/system.html | 36 +-
docs/html/refman/threads.html | 46 +-
docs/html/refman/time.html | 12 +-
docs/html/refman/timer.html | 38 +-
docs/html/refman/touch.html | 30 +-
docs/html/refman/transformations.html | 58 +--
docs/html/refman/utf8.html | 140 +++---
docs/html/refman/video.html | 42 +-
docs/man/ALLEGRO_GLYPH.3 | 54 +++
docs/man/al_android_get_activity.3 | 26 ++
docs/man/al_android_get_jni_env.3 | 40 ++
docs/man/al_backup_dirty_bitmap.3 | 36 ++
docs/man/al_backup_dirty_bitmaps.3 | 26 ++
docs/man/al_color_hsl.3 | 8 +
docs/man/al_color_hsl_to_rgb.3 | 8 +-
docs/man/al_color_hsv.3 | 8 +
docs/man/al_color_hsv_to_rgb.3 | 8 +-
docs/man/al_get_bitmap_depth.3 | 25 ++
docs/man/al_get_bitmap_samples.3 | 25 ++
docs/man/al_get_errno.3 | 1 +
docs/man/al_get_glyph.3 | 32 ++
docs/man/al_get_glyph_advance.3 | 6 +-
docs/man/al_get_new_bitmap_depth.3 | 26 ++
docs/man/al_get_new_bitmap_samples.3 | 26 ++
docs/man/al_get_opengl_extension_list.3 | 7 +
docs/man/al_init_acodec_addon.3 | 2 +-
docs/man/al_set_errno.3 | 1 +
docs/man/al_set_new_bitmap_depth.3 | 28 ++
docs/man/al_set_new_bitmap_samples.3 | 54 +++
docs/man/al_set_shader_float_vector.3 | 2 +-
docs/man/al_set_shader_int_vector.3 | 2 +-
docs/man/al_set_shader_matrix.3 | 2 +-
docs/man/al_set_target_bitmap.3 | 7 +
docs/scripts/make_doc.c | 2 +-
docs/src/changes-5.2.txt | 236 +++++++++++
docs/src/refman/acodec.txt | 2 +-
docs/src/refman/color.txt | 28 +-
docs/src/refman/font.txt | 55 ++-
docs/src/refman/getting_started.txt | 4 +-
docs/src/refman/graphics.txt | 118 ++++++
docs/src/refman/index.txt | 1 +
docs/src/refman/opengl.txt | 4 +
docs/src/refman/platform.txt | 33 ++
docs/src/refman/transformations.txt | 4 +-
examples/CMakeLists.txt | 17 +-
examples/Helper.cmake | 7 +-
examples/enet_common.h | 48 +++
examples/ex_audio_props.cpp | 24 +-
examples/ex_bitmap_flip.c | 26 +-
examples/ex_camera.c | 50 ++-
examples/ex_depth_target.c | 236 +++++++++++
examples/ex_enet_client.c | 259 +++++++++++
examples/ex_enet_server.c | 240 +++++++++++
examples/ex_glext.c | 2 +
examples/ex_multisample_target.c | 249 +++++++++++
examples/ex_opengl.c | 2 +
examples/ex_opengl_pixel_shader.c | 2 +
examples/ex_stream_seek.c | 22 +-
examples/ex_ttf.c | 96 +++--
include/allegro5/allegro_android.h | 6 +
include/allegro5/allegro_opengl.h | 8 +
include/allegro5/allegro_x.h | 3 +
include/allegro5/base.h | 6 +-
include/allegro5/bitmap.h | 15 +
include/allegro5/blender.h | 3 +
include/allegro5/display.h | 4 +
include/allegro5/fullscreen_mode.h | 2 +
include/allegro5/inline/fmaths.inl | 24 +-
include/allegro5/internal/aintern_bitmap.h | 10 +-
include/allegro5/internal/aintern_display.h | 1 -
include/allegro5/internal/aintern_dtor.h | 6 +-
include/allegro5/internal/aintern_opengl.h | 28 ++
include/allegro5/internal/aintern_pixels.h | 8 +-
include/allegro5/internal/aintern_raspberrypi.h | 3 +-
include/allegro5/internal/aintern_shader.h | 8 +-
include/allegro5/internal/alconfig.h | 45 +-
include/allegro5/memory.h | 2 +
include/allegro5/monitor.h | 2 +
include/allegro5/opengl/GLext/gl_ext_defs.h | 48 +++
include/allegro5/opengl/gl_ext.h | 5 +-
include/allegro5/platform/albcc32.h | 1 -
include/allegro5/platform/almsvc.h | 2 -
include/allegro5/platform/alosx.h | 1 -
include/allegro5/platform/alplatf.h.cmake | 1 +
include/allegro5/platform/alwatcom.h | 1 -
include/allegro5/render_state.h | 2 +
include/allegro5/shader.h | 6 +-
include/allegro5/timer.h | 1 +
.../Allegro5_iOS.xcodeproj/project.pbxproj | 37 +-
.../allegro5/internal/aintern_image_cfg.h | 6 +-
misc/install_test.c | 50 +++
misc/make_android_project.py | 2 +-
python/CMakeLists.txt | 16 +-
python/checkdocs.py | 7 +-
python/generate_python_ctypes.py | 2 +-
src/android/android_clipboard.c | 3 +-
src/android/android_display.c | 2 +-
src/android/android_system.c | 39 +-
src/bitmap.c | 44 +-
src/bitmap_io.c | 8 +-
src/bitmap_type.c | 8 +
src/display.c | 21 +-
src/dtor.c | 69 +--
src/events.c | 5 +-
src/file_stdio.c | 4 +
src/fshook_stdio.c | 4 +
src/iphone/iphone_clipboard.m | 3 +-
src/iphone/iphone_display.m | 7 -
src/linux/lmseev.c | 10 -
src/macosx/osx_app_delegate.m | 5 +-
src/macosx/osxgl.m | 106 ++---
src/macosx/qzmouse.m | 12 +-
src/memdraw.c | 11 +-
src/opengl/extensions.c | 44 +-
src/opengl/ogl_bitmap.c | 110 +++--
src/opengl/ogl_display.c | 20 +-
src/opengl/ogl_draw.c | 33 +-
src/opengl/ogl_fbo.c | 326 +++++++++++++-
src/opengl/ogl_helpers.h | 16 +
src/opengl/ogl_lock_es.c | 3 +-
src/opengl/ogl_shader.c | 8 +-
src/raspberrypi/picursor.h | 108 ++---
src/raspberrypi/pidisplay.c | 173 +++++---
src/raspberrypi/pisystem.c | 2 +-
src/sdl/sdl_display.c | 2 +-
src/shader.c | 10 +-
src/shader_source.inc | 2 +-
src/system.c | 9 +-
src/timernu.c | 84 ++--
src/tls.c | 71 ++--
src/unix/upath.c | 3 +
src/win/d3d.h | 1 -
src/win/d3d_bmp.cpp | 51 +--
src/win/d3d_disp.cpp | 8 +-
src/win/d3d_shader.cpp | 12 +-
src/win/wkeyboard.c | 7 +-
src/win/wmcursor.c | 2 +-
src/win/wwindow.c | 28 +-
src/x/xdisplay.c | 7 +-
src/x/xmousenu.c | 40 +-
tests/test_compressed.ini | 9 +
tests/test_convert.ini | 2 +
tests/test_driver.c | 20 +-
tests/test_prim2.ini | 16 +-
235 files changed, 6116 insertions(+), 2150 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/allegro5.git
More information about the Pkg-games-commits
mailing list