From 9b670c2cc9b078b0452dbc06e26c2cbb3c5e214d Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 15 Feb 2016 20:09:37 +0100 Subject: [PATCH] libmodplug: fix crash on x86_64 - Remove useless and crashy code. --- .../patches/libmodplug-0.8.8.5.patchset | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/media-libs/libmodplug/patches/libmodplug-0.8.8.5.patchset b/media-libs/libmodplug/patches/libmodplug-0.8.8.5.patchset index 347c282d7..1f304bf97 100644 --- a/media-libs/libmodplug/patches/libmodplug-0.8.8.5.patchset +++ b/media-libs/libmodplug/patches/libmodplug-0.8.8.5.patchset @@ -1,14 +1,14 @@ -From 48531f8341980cd59fc5e5e4bbe67e85c645efb4 Mon Sep 17 00:00:00 2001 +From a55dea832c9b70fc0d36b6a18791e3e37acb240d Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 2 Sep 2014 21:44:34 +0200 Subject: strings.h fix. diff --git a/src/libmodplug/stdafx.h b/src/libmodplug/stdafx.h -index 0330170..eb250dd 100644 +index 3eacf1d..871fb6d 100644 --- a/src/libmodplug/stdafx.h +++ b/src/libmodplug/stdafx.h -@@ -53,6 +53,7 @@ inline void ProcessPlugins(int n) {} +@@ -57,6 +57,7 @@ inline void ProcessPlugins(int n) {} #include #include #include @@ -17,5 +17,28 @@ index 0330170..eb250dd 100644 #include #endif -- -1.8.3.4 +2.2.2 + + +From b22ad9bd297a8279c979f0e0c9b931e353181348 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 15 Feb 2016 20:01:15 +0100 +Subject: Remove unused static variable with crashy constructor + + +diff --git a/src/fastmix.cpp b/src/fastmix.cpp +index a629bc6..8afb4de 100644 +--- a/src/fastmix.cpp ++++ b/src/fastmix.cpp +@@ -282,8 +282,6 @@ CzWINDOWEDFIR::~CzWINDOWEDFIR() + { // nothing todo + } + +-CzWINDOWEDFIR sfir; +- + // ---------------------------------------------------------------------------- + // MIXING MACROS + // ---------------------------------------------------------------------------- +-- +2.2.2