From 15dadb5bc01bfbf9c5e4819dc1d33b11ccc7dc89 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 5 Mar 2016 10:45:40 +0100 Subject: Missed a few files (nw) --- artwork/LICENSE | 116 +++++++++++++++++++++ artwork/README.md | 5 + .../opengl/shader/glsl_bilinear_idx16_lut.fsh | 3 +- .../opengl/shader/glsl_bilinear_rgb32_dir.fsh | 3 +- .../opengl/shader/glsl_bilinear_rgb32_lut.fsh | 3 +- .../modules/opengl/shader/glsl_plain_idx16_lut.fsh | 3 +- .../modules/opengl/shader/glsl_plain_rgb32_dir.fsh | 3 +- .../modules/opengl/shader/glsl_plain_rgb32_lut.fsh | 3 +- src/osd/sdl/aueffectutil.mm | 2 + src/osd/sdl/keymaps/km-be.txt | 23 ---- src/osd/sdl/keymaps/km-ch.txt | 14 --- src/osd/sdl/keymaps/km-de.txt | 26 ----- src/osd/sdl/keymaps/km-fr-OSX.txt | 13 --- src/osd/sdl/keymaps/km-fr.txt | 23 ---- src/osd/sdl/keymaps/km_it.txt | 12 --- src/osd/sdl/ledutil.sh | 3 +- src/osd/sdl/taputil.sh | 3 +- 17 files changed, 139 insertions(+), 119 deletions(-) create mode 100644 artwork/LICENSE create mode 100644 artwork/README.md delete mode 100644 src/osd/sdl/keymaps/km-be.txt delete mode 100644 src/osd/sdl/keymaps/km-ch.txt delete mode 100644 src/osd/sdl/keymaps/km-de.txt delete mode 100644 src/osd/sdl/keymaps/km-fr-OSX.txt delete mode 100644 src/osd/sdl/keymaps/km-fr.txt delete mode 100644 src/osd/sdl/keymaps/km_it.txt diff --git a/artwork/LICENSE b/artwork/LICENSE new file mode 100644 index 00000000000..670154e3538 --- /dev/null +++ b/artwork/LICENSE @@ -0,0 +1,116 @@ +CC0 1.0 Universal + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator and +subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for the +purpose of contributing to a commons of creative, cultural and scientific +works ("Commons") that the public can reliably and without fear of later +claims of infringement build upon, modify, incorporate in other works, reuse +and redistribute as freely as possible in any form whatsoever and for any +purposes, including without limitation commercial purposes. These owners may +contribute to the Commons to promote the ideal of a free culture and the +further production of creative, cultural and scientific works, or to gain +reputation or greater distribution for their Work in part through the use and +efforts of others. + +For these and/or other purposes and motivations, and without any expectation +of additional consideration or compensation, the person associating CC0 with a +Work (the "Affirmer"), to the extent that he or she is an owner of Copyright +and Related Rights in the Work, voluntarily elects to apply CC0 to the Work +and publicly distribute the Work under its terms, with knowledge of his or her +Copyright and Related Rights in the Work and the meaning and intended legal +effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not limited +to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, communicate, + and translate a Work; + + ii. moral rights retained by the original author(s) and/or performer(s); + + iii. publicity and privacy rights pertaining to a person's image or likeness + depicted in a Work; + + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + + v. rights protecting the extraction, dissemination, use and reuse of data in + a Work; + + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation thereof, + including any amended or successor version of such directive); and + + vii. other similar, equivalent or corresponding rights throughout the world + based on applicable law or treaty, and any national implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention of, +applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and +unconditionally waives, abandons, and surrenders all of Affirmer's Copyright +and Related Rights and associated claims and causes of action, whether now +known or unknown (including existing as well as future claims and causes of +action), in the Work (i) in all territories worldwide, (ii) for the maximum +duration provided by applicable law or treaty (including future time +extensions), (iii) in any current or future medium and for any number of +copies, and (iv) for any purpose whatsoever, including without limitation +commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes +the Waiver for the benefit of each member of the public at large and to the +detriment of Affirmer's heirs and successors, fully intending that such Waiver +shall not be subject to revocation, rescission, cancellation, termination, or +any other legal or equitable action to disrupt the quiet enjoyment of the Work +by the public as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason be +judged legally invalid or ineffective under applicable law, then the Waiver +shall be preserved to the maximum extent permitted taking into account +Affirmer's express Statement of Purpose. In addition, to the extent the Waiver +is so judged Affirmer hereby grants to each affected person a royalty-free, +non transferable, non sublicensable, non exclusive, irrevocable and +unconditional license to exercise Affirmer's Copyright and Related Rights in +the Work (i) in all territories worldwide, (ii) for the maximum duration +provided by applicable law or treaty (including future time extensions), (iii) +in any current or future medium and for any number of copies, and (iv) for any +purpose whatsoever, including without limitation commercial, advertising or +promotional purposes (the "License"). The License shall be deemed effective as +of the date CC0 was applied by Affirmer to the Work. Should any part of the +License for any reason be judged legally invalid or ineffective under +applicable law, such partial invalidity or ineffectiveness shall not +invalidate the remainder of the License, and in such case Affirmer hereby +affirms that he or she will not (i) exercise any of his or her remaining +Copyright and Related Rights in the Work or (ii) assert any associated claims +and causes of action with respect to the Work, in either case contrary to +Affirmer's express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + + b. Affirmer offers the Work as-is and makes no representations or warranties + of any kind concerning the Work, express, implied, statutory or otherwise, + including without limitation warranties of title, merchantability, fitness + for a particular purpose, non infringement, or the absence of latent or + other defects, accuracy, or the present or absence of errors, whether or not + discoverable, all to the greatest extent permissible under applicable law. + + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without limitation + any person's Copyright and Related Rights in the Work. Further, Affirmer + disclaims responsibility for obtaining any necessary consents, permissions + or other rights required for any use of the Work. + + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to this + CC0 or use of the Work. + +For more information, please see + diff --git a/artwork/README.md b/artwork/README.md new file mode 100644 index 00000000000..4505ae5c1e5 --- /dev/null +++ b/artwork/README.md @@ -0,0 +1,5 @@ +# **Artwork** # + +Artwork files are representing work of multiple people and are used by layout manager and shaders. + +Licensed under [CC0 1.0 Universal (CC0 1.0)](https://creativecommons.org/publicdomain/zero/1.0/) \ No newline at end of file diff --git a/src/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh b/src/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh index ef0030b7519..c2fba95bdc6 100644 --- a/src/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh +++ b/src/osd/modules/opengl/shader/glsl_bilinear_idx16_lut.fsh @@ -1,4 +1,5 @@ - +// license:BSD-3-Clause +// copyright-holders:Sven Gothel #pragma optimize (on) #pragma debug (off) diff --git a/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh b/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh index c739c16934e..97278c65df5 100644 --- a/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh +++ b/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_dir.fsh @@ -1,4 +1,5 @@ - +// license:BSD-3-Clause +// copyright-holders:Sven Gothel #pragma optimize (on) #pragma debug (off) diff --git a/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh b/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh index d6c9f5e7f59..93cd172e0b1 100644 --- a/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh +++ b/src/osd/modules/opengl/shader/glsl_bilinear_rgb32_lut.fsh @@ -1,4 +1,5 @@ - +// license:BSD-3-Clause +// copyright-holders:Sven Gothel #pragma optimize (on) #pragma debug (off) diff --git a/src/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh b/src/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh index 465aa610d59..9c8728d90b9 100644 --- a/src/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh +++ b/src/osd/modules/opengl/shader/glsl_plain_idx16_lut.fsh @@ -1,4 +1,5 @@ - +// license:BSD-3-Clause +// copyright-holders:Sven Gothel #pragma optimize (on) #pragma debug (off) diff --git a/src/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh b/src/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh index 0e5a4605ac8..eb3f902f93b 100644 --- a/src/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh +++ b/src/osd/modules/opengl/shader/glsl_plain_rgb32_dir.fsh @@ -1,4 +1,5 @@ - +// license:BSD-3-Clause +// copyright-holders:Sven Gothel #pragma optimize (on) #pragma debug (off) diff --git a/src/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh b/src/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh index 14c05aaa844..3bc16870166 100644 --- a/src/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh +++ b/src/osd/modules/opengl/shader/glsl_plain_rgb32_lut.fsh @@ -1,4 +1,5 @@ - +// license:BSD-3-Clause +// copyright-holders:Sven Gothel #pragma optimize (on) #pragma debug (off) diff --git a/src/osd/sdl/aueffectutil.mm b/src/osd/sdl/aueffectutil.mm index 45ca18d178e..531d814e987 100644 --- a/src/osd/sdl/aueffectutil.mm +++ b/src/osd/sdl/aueffectutil.mm @@ -1,3 +1,5 @@ +// license:BSD-3-Clause +// copyright-holders:Vas Crabb #import #import #import diff --git a/src/osd/sdl/keymaps/km-be.txt b/src/osd/sdl/keymaps/km-be.txt deleted file mode 100644 index 014f3f02fac..00000000000 --- a/src/osd/sdl/keymaps/km-be.txt +++ /dev/null @@ -1,23 +0,0 @@ -# Keymap for Belgian AZERTY keyboard (Linux) -ITEM_ID_TILDE SDLK_WORLD_18 0x31 0xb2 ² -ITEM_ID_1 SDLK_AMPERSAND 0xa 0x26 & -ITEM_ID_2 SDLK_WORLD_73 0xb 0xe9 é -ITEM_ID_3 SDLK_QUOTEDBL 0xc 0x22 " -ITEM_ID_4 SDLK_QUOTE 0xd 0x27 ' -ITEM_ID_5 SDLK_LEFTPAREN 0xe 0x28 ( -ITEM_ID_6 SDLK_WORLD_39 0xf 0xa7 § -ITEM_ID_7 SDLK_WORLD_72 0x10 0xe8 è -ITEM_ID_8 SDLK_EXCLAIM 0x11 0x21 ! -ITEM_ID_9 SDLK_WORLD_71 0x12 0xe7 ç -ITEM_ID_0 SDLK_WORLD_64 0x13 0xe0 à -ITEM_ID_MINUS SDLK_RIGHTPAREN 0x14 0x29 ) -ITEM_ID_EQUALS SDLK_MINUS 0x15 0x2d - -ITEM_ID_OPENBRACE SDLK_CARET 0x22 0x5e ^ -ITEM_ID_CLOSEBRACE SDLK_DOLLAR 0x23 0x24 $ -ITEM_ID_COMMA SDLK_COMMA 0x3a 0x2c , -ITEM_ID_STOP SDLK_SEMICOLON 0x3b 0x3b ; -ITEM_ID_SLASH SDLK_COLON 0x3c 0x3a : -ITEM_ID_COLON SDLK_WORLD_89 0x30 0xf9 ù -ITEM_ID_QUOTE SDLK_WORLD_53 0x33 0xb5 µ -ITEM_ID_BACKSLASH SDLK_EQUALS 0x3d 0x3d = -ITEM_ID_BACKSLASH2 SDLK_LESS 0x5e 0x3c < diff --git a/src/osd/sdl/keymaps/km-ch.txt b/src/osd/sdl/keymaps/km-ch.txt deleted file mode 100644 index a23545bf5c8..00000000000 --- a/src/osd/sdl/keymaps/km-ch.txt +++ /dev/null @@ -1,14 +0,0 @@ -# Keymap file for a swiss keyboard (Linux) -# -# -ITEM_ID_MINUS SDLK_QUOTE 0x14 0x27 ' -ITEM_ID_EQUALS SDLK_CARET 0x15 0x0 ^ -ITEM_ID_Y SDLK_z 0x1d 0x7a z -ITEM_ID_OPENBRACE SDLK_WORLD_92 0x22 0xfc ü -ITEM_ID_CLOSEBRACE SDLK_COMPOSE 0x23 0x0 " -ITEM_ID_COLON SDLK_WORLD_86 0x2f 0xf6 ö -ITEM_ID_QUOTE SDLK_WORLD_68 0x30 0xe4 ä -ITEM_ID_TILDE SDLK_WORLD_7 0x31 0xa7 § -ITEM_ID_BACKSLASH SDLK_LESS 0x5e 0x3c < -ITEM_ID_Z SDLK_y 0x34 0x79 y -ITEM_ID_SLASH SDLK_MINUS 0x3d 0x2d - diff --git a/src/osd/sdl/keymaps/km-de.txt b/src/osd/sdl/keymaps/km-de.txt deleted file mode 100644 index 5e5b75fa7e9..00000000000 --- a/src/osd/sdl/keymaps/km-de.txt +++ /dev/null @@ -1,26 +0,0 @@ -# Keymap file for a german keyboard (Linux) -# -# -ITEM_ID_TILDE SDLK_CARET 0x31 0x0 ^ -ITEM_ID_MINUS SDLK_WORLD_63 0x14 0xdf ß -ITEM_ID_EQUALS SDLK_COMPOSE 0x15 0x0 ' -ITEM_ID_OPENBRACE SDLK_WORLD_92 0x22 0xfc Ãœ -ITEM_ID_CLOSEBRACE SDLK_PLUS 0x23 0x2b + -ITEM_ID_COLON SDLK_WORLD_86 0x2f 0xf6 Ö -ITEM_ID_QUOTE SDLK_WORLD_68 0x30 0xe4 Ä -ITEM_ID_BACKSLASH SDLK_LESS 0x5e 0x3c < -ITEM_ID_SLASH SDLK_MINUS 0x3d 0x2d - -ITEM_ID_Z SDLK_y 0x34 0x79 Y -ITEM_ID_Y SDLK_z 0x1d 0x7a Z -[SDL2] -ITEM_ID_TILDE SDL_SCANCODE_GRAVE 0x35 0x0 ^ -ITEM_ID_MINUS SDL_SCANCODE_MINUS 0x2d 0x0 ß -ITEM_ID_EQUALS SDL_SCANCODE_EQUALS 0x2e 0x0 ' -ITEM_ID_OPENBRACE SDL_SCANCODE_LEFTBRACKET 0x2f 0x0 Ãœ -ITEM_ID_CLOSEBRACE SDL_SCANCODE_RIGHTBRACKET 0x30 0x0 + -ITEM_ID_COLON SDL_SCANCODE_SEMICOLON 0x33 0x0 Ö -ITEM_ID_QUOTE SDL_SCANCODE_APOSTROPHE 0x34 0x0 Ä -ITEM_ID_BACKSLASH SDL_SCANCODE_BACKSLASH 0x31 0x0 # -ITEM_ID_SLASH SDL_SCANCODE_SLASH 0x38 0x0 - -ITEM_ID_Z SDL_SCANCODE_Y 0x34 0x79 Y -ITEM_ID_Y SDL_SCANCODE_Z 0x1d 0x7a Z diff --git a/src/osd/sdl/keymaps/km-fr-OSX.txt b/src/osd/sdl/keymaps/km-fr-OSX.txt deleted file mode 100644 index fc9bbef9f7c..00000000000 --- a/src/osd/sdl/keymaps/km-fr-OSX.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Keymap for French AZERTY keyboard (OSX) -ITEM_ID_1 SDLK_AMPERSAND 0x12 0x26 & -ITEM_ID_2 SDLK_WORLD_0 0x13 0xe9 é -ITEM_ID_3 SDLK_QUOTEDBL 0x14 0x22 " -ITEM_ID_4 SDLK_QUOTE 0x15 0x27 ' -ITEM_ID_5 SDLK_LEFTPAREN 0x17 0x28 ( -ITEM_ID_6 SDLK_WORLD_1 0x16 0xa7 § -ITEM_ID_7 SDLK_WORLD_3 0x1a 0xe8 è -ITEM_ID_8 SDLK_EXCLAIM 0x1c 0x21 ! -ITEM_ID_9 SDLK_WORLD_2 0x19 0xe7 ç -ITEM_ID_0 SDLK_WORLD_4 0x1d 0xe0 à -ITEM_ID_MINUS SDLK_RIGHTPAREN 0x1b 0x29 ) -ITEM_ID_EQUALS SDLK_MINUS 0x18 0x2d - diff --git a/src/osd/sdl/keymaps/km-fr.txt b/src/osd/sdl/keymaps/km-fr.txt deleted file mode 100644 index f68948295da..00000000000 --- a/src/osd/sdl/keymaps/km-fr.txt +++ /dev/null @@ -1,23 +0,0 @@ -# Keymap for French AZERTY keyboard (Linux) -ITEM_ID_TILDE SDLK_WORLD_18 0x31 0xb2 ² -ITEM_ID_1 SDLK_AMPERSAND 0xa 0x26 & -ITEM_ID_2 SDLK_WORLD_73 0xb 0xe9 é -ITEM_ID_3 SDLK_QUOTEDBL 0xc 0x22 " -ITEM_ID_4 SDLK_QUOTE 0xd 0x27 ' -ITEM_ID_5 SDLK_LEFTPAREN 0xe 0x28 ( -ITEM_ID_6 SDLK_MINUS 0xf 0x2d - -ITEM_ID_7 SDLK_WORLD_72 0x10 0xe8 è -ITEM_ID_8 SDLK_UNDERSCORE 0x11 0x5f _ -ITEM_ID_9 SDLK_WORLD_71 0x12 0xe7 ç -ITEM_ID_0 SDLK_WORLD_64 0x13 0xe0 à -ITEM_ID_MINUS SDLK_RIGHTPAREN 0x14 0x29 ) -ITEM_ID_EQUALS SDLK_EQUALS 0x15 0x3d = -ITEM_ID_OPENBRACE SDLK_CARET 0x22 0x0 -ITEM_ID_CLOSEBRACE SDLK_DOLLAR 0x23 0x0 -ITEM_ID_COMMA SDLK_COMMA 0x3a 0x2c , -ITEM_ID_STOP SDLK_SEMICOLON 0x3b 0x3b ; -ITEM_ID_SLASH SDLK_COLON 0x3c 0x3a : -ITEM_ID_COLON SDLK_WORLD_89 0x30 0xf9 ù -ITEM_ID_QUOTE SDLK_ASTERISK 0x33 0x2a * -ITEM_ID_BACKSLASH SDLK_EXCLAIM 0x3d 0x21 ! -ITEM_ID_BACKSLASH2 SDLK_LESS 0x5e 0x3c < diff --git a/src/osd/sdl/keymaps/km_it.txt b/src/osd/sdl/keymaps/km_it.txt deleted file mode 100644 index aae0a121356..00000000000 --- a/src/osd/sdl/keymaps/km_it.txt +++ /dev/null @@ -1,12 +0,0 @@ -# MAME/MESS keymap for an italian PC 105-keys keyboard - -ITEM_ID_TILDE SDLK_BACKSLASH 0x31 0x5c \ -ITEM_ID_MINUS SDLK_QUOTE 0x14 0x27 ' -ITEM_ID_EQUALS SDLK_WORLD_76 0x15 0xec ì -ITEM_ID_OPENBRACE SDLK_WORLD_72 0x22 0xe8 è -ITEM_ID_CLOSEBRACE SDLK_PLUS 0x23 0x2b + -ITEM_ID_COLON SDLK_WORLD_82 0x2f 0xf2 ò -ITEM_ID_QUOTE SDLK_WORLD_64 0x30 0xe0 à -ITEM_ID_BACKSLASH SDLK_WORLD_89 0x33 0xf9 ù -ITEM_ID_BACKSLASH2 SDLK_LESS 0x5e 0x3c < -ITEM_ID_SLASH SDLK_MINUS 0x3d 0x2d - \ No newline at end of file diff --git a/src/osd/sdl/ledutil.sh b/src/osd/sdl/ledutil.sh index ef9ac93d353..e91e44200de 100644 --- a/src/osd/sdl/ledutil.sh +++ b/src/osd/sdl/ledutil.sh @@ -1,5 +1,6 @@ #!/bin/sh - +# license:BSD-3-Clause +# copyright-holders:Olivier Galibert, R. Belmont # ============================================================ # # ledutil.sh - Example script for output notifiers diff --git a/src/osd/sdl/taputil.sh b/src/osd/sdl/taputil.sh index 669d652436e..1a22048b9ca 100644 --- a/src/osd/sdl/taputil.sh +++ b/src/osd/sdl/taputil.sh @@ -1,5 +1,6 @@ #!/bin/sh - +# license:BSD-3-Clause +# copyright-holders:Carl NAME=$2 OURUID=`id -u $NAME` HOSTIP=$4 -- cgit v1.2.3