zepto-forks/meta-qt5-extra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

polyphone: update 1.8 -> 1.9 / get sources from github

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2018-03-10 20:16:56 +01:00
parent 66548544ca
commit 544b930b13
3 changed files with 25 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
recipes-misc/recipes-multimedia/polyphone/files/0001-align-compiler-switches-constants-for-cross-compilin.patch
View File

@@ -96,10 +96,10 @@ index 0a6739f..d9b44fb 100644
#else
#define FIX_ENDIAN16(w) (w)
diff --git a/polyphone.pro b/polyphone.pro
index ffa65d9..9139209 100644
index 9aef72c..d10ccfa 100644
--- a/polyphone.pro
+++ b/polyphone.pro
@@ -366,7 +366,6 @@ RESOURCES += ressources.qrc \
@@ -385,7 +385,6 @@ RESOURCES += ressources.qrc \
# SfArk extraction (what a mess!)
@@ -107,15 +107,22 @@ index ffa65d9..9139209 100644
INCLUDEPATH += lib/sfarklib
HEADERS += lib/sfarklib/sfArkLib.h \
lib/sfarklib/wcc.h \
@@ -399,7 +398,7 @@ win32 {
ExtraCompiler.commands = $${QMAKE_CXX} -D__LITTLE_ENDIAN__ -MD -arch:IA32 -D_CRT_SECURE_NO_WARNINGS $(INCPATH) -c ${QMAKE_FILE_IN} -Fo${QMAKE_FILE_OUT}
}
unix:!macx {
@@ -414,13 +413,6 @@ macx {
ExtraCompiler.input = SPECIAL_SOURCE
ExtraCompiler.variable_out = OBJECTS
ExtraCompiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_IN_BASE}$${QMAKE_EXT_OBJ}
-win32 {
- ExtraCompiler.commands = $${QMAKE_CXX} -D__LITTLE_ENDIAN__ -MD -arch:IA32 -D_CRT_SECURE_NO_WARNINGS $(INCPATH) -c ${QMAKE_FILE_IN} -Fo${QMAKE_FILE_OUT}
-}
-equals(QMAKE_CXX, g++) {
- ExtraCompiler.commands = $${QMAKE_CXX} -fPIC -D__LITTLE_ENDIAN__ -mfpmath=387 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+ ExtraCompiler.commands = $${QMAKE_CXX} -fPIC $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
}
macx {
ExtraCompiler.commands = $${QMAKE_CXX} $(CXXFLAGS) -D__LITTLE_ENDIAN__ -mno-sse -mfpmath=387 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
-}
-equals(QMAKE_CXX, clang++) {
- ExtraCompiler.commands = $${QMAKE_CXX} $(CXXFLAGS) -D__LITTLE_ENDIAN__ -mno-sse -mfpmath=387 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
-}
+ExtraCompiler.commands = $${QMAKE_CXX} $(CXXFLAGS) -fPIC $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+
QMAKE_EXTRA_COMPILERS += ExtraCompiler
--
2.5.5
2.14.3

32
recipes-misc/recipes-multimedia/polyphone/files/0001-do-not-compile-with-mfpmath-387-it-does-not-work-on-.patch
View File

@@ -1,32 +0,0 @@
From 07213ce53a26032d5ac8b67c92dcc59fcfda537b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 8 Jan 2017 02:45:16 +0100
Subject: [PATCH] remove some cross unsafe compiler switches
machines
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>
---
polyphone.pro | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/polyphone.pro b/polyphone.pro
index ffa65d9..1d9a221 100644
--- a/polyphone.pro
+++ b/polyphone.pro
@@ -399,7 +399,7 @@ win32 {
ExtraCompiler.commands = $${QMAKE_CXX} -D__LITTLE_ENDIAN__ -MD -arch:IA32 -D_CRT_SECURE_NO_WARNINGS $(INCPATH) -c ${QMAKE_FILE_IN} -Fo${QMAKE_FILE_OUT}
}
unix:!macx {
- ExtraCompiler.commands = $${QMAKE_CXX} -fPIC -D__LITTLE_ENDIAN__ -mfpmath=387 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+ ExtraCompiler.commands = $${QMAKE_CXX} -fPIC $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
}
macx {
ExtraCompiler.commands = $${QMAKE_CXX} $(CXXFLAGS) -D__LITTLE_ENDIAN__ -mno-sse -mfpmath=387 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
--
2.5.5

16
recipes-misc/recipes-multimedia/polyphone/polyphone_1.8.bb → recipes-misc/recipes-multimedia/polyphone/polyphone_1.9.bb
View File

@@ -19,21 +19,19 @@ DEPENDS += " \
"
SRC_URI = " \
http://polyphone-soundfonts.com/en/download/file/76-polyphone-1-8-src-zip/latest/download;downloadfilename=polyphone-1-8-src.zip \
git://github.com/davy7125/polyphone.git \
file://polyphone.desktop \
file://polyphone.mime \
file://0001-align-compiler-switches-constants-for-cross-compilin.patch \
"
SRC_URI[md5sum] = "75ec14ab98bcf80f360debd80c553733"
SRC_URI[sha256sum] = "2b0ba2887646208ae9953a336adfebe460133cd403e76f7fe795d3071827dfdd"
S = "${WORKDIR}/trunk"
# Have no idea why this is necessary
do_unpack[depends] += "unzip-native:do_populate_sysroot"
SRCREV = "13beb7119bc573af3f5e595ae2989034c226e355"
S = "${WORKDIR}/git/trunk"
do_configure_prepend() {
sed -i 's:= /usr/include:= ${STAGING_INCDIR}:g' ${S}/polyphone.pro
sed -i \
-e 's:= /usr/include:= ${STAGING_INCDIR}:g' \
-e 's:^DEFINES += USE_LOCAL_:#DEFINES += USE_LOCAL_:g' \
${S}/polyphone.pro
}
do_install() {