Merge pull request #2824 from suvari/master

audiofile: patched
This commit is contained in:
Alihan Öztürk
2017-02-16 20:03:56 +02:00
committed by GitHub
2 changed files with 34 additions and 3 deletions
@@ -0,0 +1,28 @@
From 28cfdbbcb96a69087c3d21faf69b5eae7bcf6d69 Mon Sep 17 00:00:00 2001
From: Hodorgasm <nsane457@gmail.com>
Date: Wed, 11 May 2016 21:42:07 -0400
Subject: [PATCH] Cast to unsigned while left bit-shifting
GCC-6 now treats the left bitwise-shift of a negative integer as nonconformant so explicitly cast to an unsigned int while bit-shifting.
Downloaded from upstream PR:
https://github.com/mpruett/audiofile/pull/28
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
libaudiofile/modules/SimpleModule.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libaudiofile/modules/SimpleModule.h b/libaudiofile/modules/SimpleModule.h
index 03c6c69..4014fb2 100644
--- a/libaudiofile/modules/SimpleModule.h
+++ b/libaudiofile/modules/SimpleModule.h
@@ -123,7 +123,7 @@ struct signConverter
typedef typename IntTypes<Format>::UnsignedType UnsignedType;
static const int kScaleBits = (Format + 1) * CHAR_BIT - 1;
- static const int kMinSignedValue = -1 << kScaleBits;
+ static const int kMinSignedValue = static_cast<signed>(static_cast<unsigned>(-1) << kScaleBits);;
struct signedToUnsigned : public std::unary_function<SignedType, UnsignedType>
{
+6 -3
View File
@@ -17,7 +17,10 @@
<BuildDependencies>
<Dependency>alsa-lib-devel</Dependency>
<Dependency>flac-devel</Dependency>
</BuildDependencies>
</BuildDependencies>
<Patches>
<Patch>unsigned-gcc6.patch</Patch>
</Patches>
</Source>
<Package>
@@ -25,6 +28,7 @@
<RuntimeDependencies>
<Dependency>alsa-lib</Dependency>
<Dependency>flac</Dependency>
<Dependency>libgcc</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
@@ -57,7 +61,6 @@
<BuildDependencies>
<Dependency>alsa-lib-32bit</Dependency>
<Dependency>flac-32bit</Dependency>
</BuildDependencies>
<RuntimeDependencies>
<Dependency>alsa-lib-32bit</Dependency>
@@ -92,4 +95,4 @@
<Email>kaptan@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>