From d60962381c3f612f97aac9652a00621906a2b92b Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Fri, 1 Sep 2017 11:38:59 +0200 Subject: [PATCH] Improve README and USMR --- README.md | 17 +++++++++++++++++ planetblupi | 2 +- planetblupi-www | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 27925f7..c42d60d 100644 --- a/README.md +++ b/README.md @@ -114,6 +114,23 @@ directory according to the platform. - **Darwin**: look at `Release/src/planetblupi_Project/planetblupi-X.Y.Z.dmg` - **Windows**: look at `Release/src/planetblupi_Project/planetblupi-X.Y.Z.exe` +# Licenses + +_Planet Blupi_ and all resource files are licensed to the GPLv3+ license. + +| Project | License | Description | +| --- | --- | --- | +| argagg | MIT | simple C++11 command line arg ument parser | +| FFmpeg | LGPLv2.1 | complete, cross-platform solution to record, convert and stream audio and video | +| GNU/gettext | GPLv3 | an i18n and l10n system commonly used for writing multilingual programs | +| libcurl | MIT/X derivate | a free and easy-to-use client-side URL transfer library | +| GNU/libiconv | GPLv3 | a standardized API used to convert between different character encodings | +| libpng | own license | the official PNG reference library | +| SDL_kitchensink | MIT | Simple SDL2 / FFmpeg library for audio/video playback written in C99 | +| SDL2 | zlib license | a cross-platform software library designed to provide a HAL to computer multimedia hardware | +| SDL2_image | zlib license | an image loading library that is used with the SDL library | +| SDL2_mixer | zlib license | a sound mixing library that is used with the SDL library | +| zlib | own license | a Massively Spiffy Yet Delicately Unobtrusive Compression Library | [1]: http://appimage.org [2]: http://nsis.sourceforge.net diff --git a/planetblupi b/planetblupi index a17bbce..04b4d24 160000 --- a/planetblupi +++ b/planetblupi @@ -1 +1 @@ -Subproject commit a17bbcefba9f9bf59808ce13093c1507ce38acca +Subproject commit 04b4d242ef579770a83a8af0c0b0cef3c6cd12e7 diff --git a/planetblupi-www b/planetblupi-www index fbbc5db..1255330 160000 --- a/planetblupi-www +++ b/planetblupi-www @@ -1 +1 @@ -Subproject commit fbbc5db435a973955414f9ecf8922739f09b7dfa +Subproject commit 1255330724a53a2c8568dc3144da372ffbaadc8a