projectm: update sources and fix build with latest gcc

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
2017-09-04 19:55:44 +02:00
parent bcdf367a59
commit d22d806bed
2 changed files with 32 additions and 1 deletions

View File

@@ -0,0 +1,30 @@
From a22285143063b99f9a6890e3b6c59366bc71f071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Mon, 4 Sep 2017 19:50:44 +0200
Subject: [PATCH] remove assertion which breaks build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
src/libprojectM/MilkdropPresetFactory/Parser.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/libprojectM/MilkdropPresetFactory/Parser.cpp b/src/libprojectM/MilkdropPresetFactory/Parser.cpp
index bf7c0f9..06943e1 100755
--- a/src/libprojectM/MilkdropPresetFactory/Parser.cpp
+++ b/src/libprojectM/MilkdropPresetFactory/Parser.cpp
@@ -1776,7 +1776,6 @@ int Parser::parse_wavecode(char * token, std::istream & fs, MilkdropPreset * pr
Param * param;
assert(preset);
- assert(fs);
assert(token);
/* token should be in the form wavecode_N_var, such as wavecode_1_samples */
--
2.9.4

View File

@@ -19,8 +19,9 @@ SRC_URI = " \
http://spiegelmc.com.s3.amazonaws.com/pub/projectm_presets.zip;name=presets \
file://0001-Fix-sdl2-build.patch \
file://0002-workaround-link-failures.patch \
file://0003-remove-assertion-which-breaks-build.patch \
"
SRCREV_projectm = "eafa3251c3af3a801950d588c3b531fbc7cba317"
SRCREV_projectm = "04001c2b12de848962b74a3938d0ca877ca611be"
SRC_URI[presets.md5sum] = "8976d72c05e3f4ddee996c6f2e98fc63"
SRC_URI[presets.sha256sum] = "e323515f0ee5920ec45e4f9efdb55890f028dabb5ae9468fdc97c43d55040614"