Merge branch 'master' of github.com:pisilinux/main
This commit is contained in:
@@ -15,6 +15,7 @@
|
|||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency>cups-devel</Dependency><!--It was disabled to avoid circle-->
|
<Dependency>cups-devel</Dependency><!--It was disabled to avoid circle-->
|
||||||
<Dependency>libXi-devel</Dependency>
|
<Dependency>libXi-devel</Dependency>
|
||||||
|
<Dependency>docbook-xsl</Dependency>
|
||||||
<Dependency>cairo-devel</Dependency>
|
<Dependency>cairo-devel</Dependency>
|
||||||
<Dependency>libXext-devel</Dependency>
|
<Dependency>libXext-devel</Dependency>
|
||||||
<Dependency>libXrandr-devel</Dependency>
|
<Dependency>libXrandr-devel</Dependency>
|
||||||
@@ -182,7 +183,7 @@
|
|||||||
|
|
||||||
<History>
|
<History>
|
||||||
<Update release="4">
|
<Update release="4">
|
||||||
<Date>2017-02-06</Date>
|
<Date>2017-02-16</Date>
|
||||||
<Version>2.24.31</Version>
|
<Version>2.24.31</Version>
|
||||||
<Comment>Version Bump</Comment>
|
<Comment>Version Bump</Comment>
|
||||||
<Name>Pisi Linux Community</Name>
|
<Name>Pisi Linux Community</Name>
|
||||||
|
|||||||
@@ -77,6 +77,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="3">
|
||||||
|
<Date>2017-02-16</Date>
|
||||||
|
<Version>2.6.4</Version>
|
||||||
|
<Comment>Rebuild.</Comment>
|
||||||
|
<Name>Pisi Linux Community</Name>
|
||||||
|
<Email>admin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
<Update release="2">
|
<Update release="2">
|
||||||
<Date>2016-06-09</Date>
|
<Date>2016-06-09</Date>
|
||||||
<Version>2.6.4</Version>
|
<Version>2.6.4</Version>
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
--- taglib-extras-1.0.1/cmake/modules/FindTaglib.cmake 2009-03-13 22:40:24.000000000 +0100
|
||||||
|
+++ taglib-extras-1.0.1/cmake/modules/FindTaglib.cmake.fix 2015-12-06 21:26:46.873893311 +0100
|
||||||
|
@@ -29,10 +29,10 @@
|
||||||
|
|
||||||
|
exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
|
||||||
|
|
||||||
|
- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
|
||||||
|
+ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
|
||||||
|
message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
|
||||||
|
set(TAGLIB_FOUND FALSE)
|
||||||
|
- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
|
||||||
|
+ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
|
||||||
|
|
||||||
|
exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
|
||||||
|
|
||||||
|
@@ -42,7 +42,7 @@
|
||||||
|
set(TAGLIB_FOUND TRUE)
|
||||||
|
endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
|
||||||
|
string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
|
||||||
|
- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
|
||||||
|
+ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
|
||||||
|
mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
|
||||||
|
|
||||||
|
else(TAGLIBCONFIG_EXECUTABLE)
|
||||||
@@ -18,6 +18,9 @@
|
|||||||
<Dependency>cmake</Dependency>
|
<Dependency>cmake</Dependency>
|
||||||
<Dependency>taglib-devel</Dependency>
|
<Dependency>taglib-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
|
<Patches>
|
||||||
|
<Patch level="1">taglib-1.10.patch</Patch>
|
||||||
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
<Package>
|
<Package>
|
||||||
<Name>taglib-extras</Name>
|
<Name>taglib-extras</Name>
|
||||||
@@ -45,7 +48,7 @@
|
|||||||
|
|
||||||
<History>
|
<History>
|
||||||
<Update release="3">
|
<Update release="3">
|
||||||
<Date>2017-01-25</Date>
|
<Date>2017-02-16</Date>
|
||||||
<Version>1.0.1</Version>
|
<Version>1.0.1</Version>
|
||||||
<Comment>Rebuild for new toolchain.</Comment>
|
<Comment>Rebuild for new toolchain.</Comment>
|
||||||
<Name>Pisi Linux Community</Name>
|
<Name>Pisi Linux Community</Name>
|
||||||
|
|||||||
@@ -46,9 +46,9 @@
|
|||||||
|
|
||||||
<History>
|
<History>
|
||||||
<Update release="3">
|
<Update release="3">
|
||||||
<Date>2017-01-25</Date>
|
<Date>2017-02-16</Date>
|
||||||
<Version>1.11.1</Version>
|
<Version>1.11.1</Version>
|
||||||
<Comment>Version Bump</Comment>
|
<Comment>Version Bump.</Comment>
|
||||||
<Name>Pisi Linux Community</Name>
|
<Name>Pisi Linux Community</Name>
|
||||||
<Email>admin@pisilinux.org</Email>
|
<Email>admin@pisilinux.org</Email>
|
||||||
</Update>
|
</Update>
|
||||||
|
|||||||
@@ -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>
|
||||||
|
{
|
||||||
@@ -17,7 +17,10 @@
|
|||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency>alsa-lib-devel</Dependency>
|
<Dependency>alsa-lib-devel</Dependency>
|
||||||
<Dependency>flac-devel</Dependency>
|
<Dependency>flac-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
|
<Patches>
|
||||||
|
<Patch>unsigned-gcc6.patch</Patch>
|
||||||
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
<Package>
|
<Package>
|
||||||
@@ -25,9 +28,10 @@
|
|||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency>alsa-lib</Dependency>
|
<Dependency>alsa-lib</Dependency>
|
||||||
<Dependency>flac</Dependency>
|
<Dependency>flac</Dependency>
|
||||||
|
<Dependency>libgcc</Dependency>
|
||||||
</RuntimeDependencies>
|
</RuntimeDependencies>
|
||||||
<Files>
|
<Files>
|
||||||
<Path fileType=4"executable">/usr/bin</Path>
|
<Path fileType="executable">/usr/bin</Path>
|
||||||
<Path fileType="library">/usr/lib</Path>
|
<Path fileType="library">/usr/lib</Path>
|
||||||
<Path fileType="doc">/usr/share/doc</Path>
|
<Path fileType="doc">/usr/share/doc</Path>
|
||||||
<Path fileType="doc">/usr/share/man</Path>
|
<Path fileType="doc">/usr/share/man</Path>
|
||||||
@@ -49,7 +53,7 @@
|
|||||||
</Files>
|
</Files>
|
||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<Package>4
|
<Package>
|
||||||
<Name>audiofile-32bit</Name>
|
<Name>audiofile-32bit</Name>
|
||||||
<PartOf>emul32</PartOf>
|
<PartOf>emul32</PartOf>
|
||||||
<Summary>32-bit shared libraries for audiofile</Summary>
|
<Summary>32-bit shared libraries for audiofile</Summary>
|
||||||
@@ -57,7 +61,6 @@
|
|||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency>alsa-lib-32bit</Dependency>
|
<Dependency>alsa-lib-32bit</Dependency>
|
||||||
<Dependency>flac-32bit</Dependency>
|
<Dependency>flac-32bit</Dependency>
|
||||||
|
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
<RuntimeDependencies>
|
<RuntimeDependencies>
|
||||||
<Dependency>alsa-lib-32bit</Dependency>
|
<Dependency>alsa-lib-32bit</Dependency>
|
||||||
@@ -92,4 +95,4 @@
|
|||||||
<Email>kaptan@pisilinux.org</Email>
|
<Email>kaptan@pisilinux.org</Email>
|
||||||
</Update>
|
</Update>
|
||||||
</History>
|
</History>
|
||||||
</PISI>
|
</PISI>
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
<IsA>library</IsA>
|
<IsA>library</IsA>
|
||||||
<Summary>Lossy speech compression library and tool</Summary>
|
<Summary>Lossy speech compression library and tool</Summary>
|
||||||
<Description>Gsm is an implementation of the final draft GSM 06.10 standard for full-rate speech transcoding</Description>
|
<Description>Gsm is an implementation of the final draft GSM 06.10 standard for full-rate speech transcoding</Description>
|
||||||
<Archive sha1sum="668b0a180039a50d379b3d5a22e78da4b1d90afc" type="targz">http://osxwinebuilder.googlecode.com/files/gsm-1.0.13.tar.gz</Archive>
|
<Archive sha1sum="668b0a180039a50d379b3d5a22e78da4b1d90afc" type="targz">https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/osxwinebuilder/gsm-1.0.13.tar.gz</Archive>
|
||||||
<Patches>
|
<Patches>
|
||||||
<Patch level="1">gsm-1.0.10-dyn.patch</Patch>
|
<Patch level="1">gsm-1.0.10-dyn.patch</Patch>
|
||||||
<Patch level="1">gsm-1.0-pl10-includes.patch</Patch>
|
<Patch level="1">gsm-1.0-pl10-includes.patch</Patch>
|
||||||
|
|||||||
Reference in New Issue
Block a user