From 7d3c0ea4bb4cb08dc1b397406492af88f2e12649 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 15 Sep 2018 16:33:19 +1000 Subject: [PATCH] audiofile: fix build, remove .la files --- media-libs/audiofile/audiofile-0.3.6.recipe | 17 +-- .../audiofile/patches/audiofile-0.3.6.patch | 127 ++++++++++++++++++ 2 files changed, 132 insertions(+), 12 deletions(-) create mode 100644 media-libs/audiofile/patches/audiofile-0.3.6.patch diff --git a/media-libs/audiofile/audiofile-0.3.6.recipe b/media-libs/audiofile/audiofile-0.3.6.recipe index 190f6e904..28f65e9da 100644 --- a/media-libs/audiofile/audiofile-0.3.6.recipe +++ b/media-libs/audiofile/audiofile-0.3.6.recipe @@ -30,13 +30,10 @@ Supported compression formats: HOMEPAGE="https://audiofile.68k.org/" COPYRIGHT="1998-2013 Michael Pruett, Chris Pirazzi, Scott Porter, Doug Scott" LICENSE="GNU LGPL v2.1" -REVISION="5" -SOURCE_URI="https://audiofile.68k.org/audiofile-0.3.6.tar.gz" +REVISION="6" +SOURCE_URI="https://audiofile.68k.org/audiofile-$portVersion.tar.gz" CHECKSUM_SHA256="cdc60df19ab08bfe55344395739bb08f50fc15c92da3962fac334d3bff116965" -srcGitRev_2="1709d2d431a493deea7765902011730e04fab466" -SOURCE_URI_2="https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/audiofile/files/$SOURCE_FILENAME_2?id=$srcGitRev_2#noarchive" -CHECKSUM_SHA256_2="c088e405ae54bc560e7d203cc5a18edb829b555e675c363d789b0f3f2b4d5d0c" -SOURCE_FILENAME_2="audiofile-0.3.6-gcc6-build-fixes.patch" +PATCHES="audiofile-$portVersion.patch" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" @@ -56,6 +53,7 @@ PROVIDES_devel=" devel:libaudiofile$secondaryArchSuffix " REQUIRES_devel=" + audiofile$secondaryArchSuffix == $portVersion base " BUILD_REQUIRES=" @@ -71,11 +69,6 @@ BUILD_PREREQUIRES=" defineDebugInfoPackage audiofile$secondaryArchSuffix \ "$libDir"/libaudiofile.so.1.0.0 -PATCH() -{ - patch -p1 -i "$sourceDir2"/$SOURCE_FILENAME_2 -} - BUILD() { runConfigure ./configure @@ -85,7 +78,7 @@ BUILD() INSTALL() { make install - + rm $libDir/*.la prepareInstalledDevelLib libaudiofile fixPkgconfig packageEntries devel $developDir diff --git a/media-libs/audiofile/patches/audiofile-0.3.6.patch b/media-libs/audiofile/patches/audiofile-0.3.6.patch new file mode 100644 index 000000000..02d96f198 --- /dev/null +++ b/media-libs/audiofile/patches/audiofile-0.3.6.patch @@ -0,0 +1,127 @@ +From 308571e254ad30101be8c1247d2b0b64cf488386 Mon Sep 17 00:00:00 2001 +From: Michael Schwendt +Date: Wed, 3 Feb 2016 21:56:11 +0100 +Subject: [PATCH] left shifting a negative int is undefined behaviour / + narrowing conversion issues / for GCC 6 + +fix left shifts for 32-bit to avoid int overflow + +avoid int overflow too + +char on ARM is unsigned by default +--- + libaudiofile/modules/SimpleModule.h | 2 +- + test/FloatToInt.cpp | 2 +- + test/IntToFloat.cpp | 2 +- + test/NeXT.cpp | 14 +++++++------- + test/Sign.cpp | 2 +- + 5 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/libaudiofile/modules/SimpleModule.h b/libaudiofile/modules/SimpleModule.h +index 03c6c69..e4cc138 100644 +--- a/libaudiofile/modules/SimpleModule.h ++++ b/libaudiofile/modules/SimpleModule.h +@@ -123,7 +123,7 @@ struct signConverter + typedef typename IntTypes::UnsignedType UnsignedType; + + static const int kScaleBits = (Format + 1) * CHAR_BIT - 1; +- static const int kMinSignedValue = -1 << kScaleBits; ++ static const int kMinSignedValue = 0-(1U< + { +diff --git a/test/FloatToInt.cpp b/test/FloatToInt.cpp +index 0d179a8..bf491b2 100644 +--- a/test/FloatToInt.cpp ++++ b/test/FloatToInt.cpp +@@ -115,7 +115,7 @@ TEST_F(FloatToIntTest, Int16) + EXPECT_EQ(readData[i], expectedData[i]); + } + +-static const int32_t kMinInt24 = -1<<23; ++static const int32_t kMinInt24 = 0-(1U<<23); + static const int32_t kMaxInt24 = (1<<23) - 1; + + TEST_F(FloatToIntTest, Int24) +diff --git a/test/IntToFloat.cpp b/test/IntToFloat.cpp +index b716635..1d91b58 100644 +--- a/test/IntToFloat.cpp ++++ b/test/IntToFloat.cpp +@@ -117,7 +117,7 @@ TEST_F(IntToFloatTest, Int16) + EXPECT_EQ(readData[i], expectedData[i]); + } + +-static const int32_t kMinInt24 = -1<<23; ++static const int32_t kMinInt24 = 0-(1U<<23); + static const int32_t kMaxInt24 = (1<<23) - 1; + + TEST_F(IntToFloatTest, Int24) +diff --git a/test/NeXT.cpp b/test/NeXT.cpp +index 7e39850..a37cea1 100644 +--- a/test/NeXT.cpp ++++ b/test/NeXT.cpp +@@ -37,13 +37,13 @@ + + #include "TestUtilities.h" + +-const char kDataUnspecifiedLength[] = ++const signed char kDataUnspecifiedLength[] = + { + '.', 's', 'n', 'd', + 0, 0, 0, 24, // offset of 24 bytes +- 0xff, 0xff, 0xff, 0xff, // unspecified length ++ -1, -1, -1, -1, // unspecified length + 0, 0, 0, 3, // 16-bit linear +- 0, 0, 172, 68, // 44100 Hz ++ 0, 0, -84, 68, // 44100 Hz (0xAC44) + 0, 0, 0, 1, // 1 channel + 0, 1, + 0, 1, +@@ -57,13 +57,13 @@ const char kDataUnspecifiedLength[] = + 0, 55 + }; + +-const char kDataTruncated[] = ++const signed char kDataTruncated[] = + { + '.', 's', 'n', 'd', + 0, 0, 0, 24, // offset of 24 bytes + 0, 0, 0, 20, // length of 20 bytes + 0, 0, 0, 3, // 16-bit linear +- 0, 0, 172, 68, // 44100 Hz ++ 0, 0, -84, 68, // 44100 Hz (0xAC44) + 0, 0, 0, 1, // 1 channel + 0, 1, + 0, 1, +@@ -152,13 +152,13 @@ TEST(NeXT, Truncated) + ASSERT_EQ(::unlink(testFileName.c_str()), 0); + } + +-const char kDataZeroChannels[] = ++const signed char kDataZeroChannels[] = + { + '.', 's', 'n', 'd', + 0, 0, 0, 24, // offset of 24 bytes + 0, 0, 0, 2, // 2 bytes + 0, 0, 0, 3, // 16-bit linear +- 0, 0, 172, 68, // 44100 Hz ++ 0, 0, -84, 68, // 44100 Hz (0xAC44) + 0, 0, 0, 0, // 0 channels + 0, 1 + }; +diff --git a/test/Sign.cpp b/test/Sign.cpp +index 7275399..c339514 100644 +--- a/test/Sign.cpp ++++ b/test/Sign.cpp +@@ -116,7 +116,7 @@ TEST_F(SignConversionTest, Int16) + EXPECT_EQ(readData[i], expectedData[i]); + } + +-static const int32_t kMinInt24 = -1<<23; ++static const int32_t kMinInt24 = 0-(1U<<23); + static const int32_t kMaxInt24 = (1<<23) - 1; + static const uint32_t kMaxUInt24 = (1<<24) - 1; + +-- +2.10.1 +