Skip to content

Commit 4959b25

Browse files
revmischarevmischa
committed
merge
2 parents 3a2ebf2 + c636376 commit 4959b25

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+35191
-4
lines changed

‎configure.ac‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
AC_INIT([projectM], [3.1.5], [mischa@mvstg.biz], [projectM], [https://github.com/projectM-visualizer/projectm/])
1+
AC_INIT([projectM], [3.1.6], [me@mish.dev], [projectM], [https://github.com/projectM-visualizer/projectm/])
22
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects tar-pax])
33

44
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
@@ -232,6 +232,7 @@ my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wpointer-arith -Wshadow -W
232232
#my_CFLAGS+="-fsanitize=address -fno-omit-frame-pointer "
233233
my_CFLAGS="${my_CFLAGS} -DDATADIR_PATH=\\\"\"\$(pkgdatadir)\\\"\""
234234
my_CFLAGS="${my_CFLAGS} -I\$(top_srcdir)/vendor"
235+
my_CFLAGS="${my_CFLAGS} -DGL_SILENCE_DEPRECATION"
235236
AC_SUBST([my_CFLAGS])
236237

237238

‎src/libprojectM/wipemalloc.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void *wipe_aligned_alloc( size_t align, size_t size )
5555
{
5656
void *mem = NULL;
5757

58-
#if HAVE_ALIGNED_ALLOC==1
58+
#if HAVE_ALIGNED_ALLOC==1 && !__APPLE__
5959

6060
mem = aligned_alloc( align, size );
6161

‎src/projectM-sdl/SDL2.framework/Headers‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Versions/Current/Headers

‎src/projectM-sdl/SDL2.framework/Resources‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Versions/Current/Resources

‎src/projectM-sdl/SDL2.framework/SDL2‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Versions/Current/SDL2

‎src/projectM-sdl/SDL2.framework/Versions/A/Frameworks/hidapi.framework/Resources‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Versions/Current/Resources

‎src/projectM-sdl/SDL2.framework/Versions/A/Frameworks/hidapi.framework/Versions/A/Resources/AUTHORS.txt‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
2+
HIDAPI Authors:
3+
4+
Alan Ott <alan@signal11.us>:
5+
Original Author and Maintainer
6+
Linux, Windows, and Mac implementations
7+
8+
Ludovic Rousseau <rousseau@debian.org>:
9+
Formatting for Doxygen documentation
10+
Bug fixes
11+
Correctness fixes
12+
13+
14+
For a comprehensive list of contributions, see the commit list at github:
15+
https://github.com/libusb/hidapi/commits/master
16+

‎src/projectM-sdl/SDL2.framework/Versions/A/Frameworks/hidapi.framework/Versions/A/Resources/Info.plist‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>BuildMachineOSBuild</key>
6+
<string>18G87</string>
7+
<key>CFBundleDevelopmentRegion</key>
8+
<string>English</string>
9+
<key>CFBundleExecutable</key>
10+
<string>hidapi</string>
11+
<key>CFBundleIdentifier</key>
12+
<string>org.libsdl.hidapi</string>
13+
<key>CFBundleInfoDictionaryVersion</key>
14+
<string>6.0</string>
15+
<key>CFBundleName</key>
16+
<string>hidapi</string>
17+
<key>CFBundlePackageType</key>
18+
<string>FMWK</string>
19+
<key>CFBundleShortVersionString</key>
20+
<string>1.0</string>
21+
<key>CFBundleSupportedPlatforms</key>
22+
<array>
23+
<string>MacOSX</string>
24+
</array>
25+
<key>CFBundleVersion</key>
26+
<string>1.0</string>
27+
<key>DTCompiler</key>
28+
<string>com.apple.compilers.llvm.clang.1_0</string>
29+
<key>DTPlatformBuild</key>
30+
<string>11C504</string>
31+
<key>DTPlatformVersion</key>
32+
<string>GM</string>
33+
<key>DTSDKBuild</key>
34+
<string>19B90</string>
35+
<key>DTSDKName</key>
36+
<string>macosx10.15</string>
37+
<key>DTXcode</key>
38+
<string>1130</string>
39+
<key>DTXcodeBuild</key>
40+
<string>11C504</string>
41+
<key>LSMinimumSystemVersion</key>
42+
<string>10.6</string>
43+
</dict>
44+
</plist>

‎src/projectM-sdl/SDL2.framework/Versions/A/Frameworks/hidapi.framework/Versions/A/Resources/LICENSE-bsd.txt‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
Copyright (c) 2010, Alan Ott, Signal 11 Software
2+
All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are met:
6+
7+
* Redistributions of source code must retain the above copyright notice,
8+
this list of conditions and the following disclaimer.
9+
* Redistributions in binary form must reproduce the above copyright
10+
notice, this list of conditions and the following disclaimer in the
11+
documentation and/or other materials provided with the distribution.
12+
* Neither the name of Signal 11 Software nor the names of its
13+
contributors may be used to endorse or promote products derived from
14+
this software without specific prior written permission.
15+
16+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
17+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
20+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
23+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
24+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
25+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26+
POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)