Merge remote-tracking branch 'origin/master' into dunfell
This commit is contained in:
Andreas Müller
46
appends/meta-qt5/python3-pyqt5_%.bbappend
Normal file
46
appends/meta-qt5/python3-pyqt5_%.bbappend
Normal file
@@ -0,0 +1,46 @@
|
||||
BBCLASSEXTEND = "native"
|
||||
|
||||
DEPENDS_class-native = "qtbase-native sip3-native python3-native"
|
||||
|
||||
PYQT_MODULES_class-native = "QtCore"
|
||||
|
||||
# This is a copy from meta-qt5 adjusted to native staging
|
||||
do_configure_prepend_class-native() {
|
||||
cd ${S}
|
||||
echo "py_platform = linux" > pyqt.cfg
|
||||
echo "py_inc_dir = %(sysroot)/$includedir/python%(py_major).%(py_minor)${PYTHON_ABI}" >> pyqt.cfg
|
||||
echo "py_pylib_dir = %(sysroot)/${libdir}/python%(py_major).%(py_minor)" >> pyqt.cfg
|
||||
echo "py_pylib_lib = python$%(py_major).%(py_minor)" >> pyqt.cfg
|
||||
echo "pyqt_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> pyqt.cfg
|
||||
echo "pyqt_bin_dir = ${D}/${bindir}" >> pyqt.cfg
|
||||
echo "pyqt_sip_dir = ${D}/${datadir}/sip/PyQt5" >> pyqt.cfg
|
||||
echo "pyuic_interpreter = ${D}/${bindir}/python%(py_major).%(py_minor)" >> pyqt.cfg
|
||||
echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg
|
||||
echo "qt_shared = True" >> pyqt.cfg
|
||||
QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION`
|
||||
echo "[Qt $QT_VERSION]" >> pyqt.cfg
|
||||
echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg
|
||||
echo yes | ${PYTHON} configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_NATIVE}
|
||||
|
||||
qmake5_base_do_configure
|
||||
|
||||
# avoid running code prepended by recipe
|
||||
return 0
|
||||
}
|
||||
|
||||
CFLAGS_append_class-native = " -I${STAGING_INCDIR_NATIVE}/${PYTHON_DIR}"
|
||||
CXXFLAGS_append_class-native = " -I${STAGING_INCDIR_NATIVE}/${PYTHON_DIR}"
|
||||
|
||||
do_install_class-native() {
|
||||
cd ${S}
|
||||
oe_runmake MAKEFLAGS='-j 1' install
|
||||
|
||||
# should be done for target either...
|
||||
for file in `find ${D}${bindir} -name 'py*5'`; do
|
||||
echo "Remove abs path in $file..."
|
||||
sed -i 's:exec.*${PYTHON_DIR}:exec ${PYTHON_PN}:g' "$file"
|
||||
done
|
||||
}
|
||||
|
||||
RDEPENDS_${PN}_class-native = ""
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From f583921012ed1f4e853f41d4fd3d95d1a819ac03 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 4 Aug 2018 02:48:14 +0200
|
||||
Subject: [PATCH] Make sure to find python3 sip code generator
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
configure.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.py b/configure.py
|
||||
index a263efb..daefc0e 100644
|
||||
--- a/configure.py
|
||||
+++ b/configure.py
|
||||
@@ -522,7 +522,7 @@ class TargetConfiguration:
|
||||
self.qtconf_prefix = ''
|
||||
self.qt_shared = False
|
||||
self.qt_version = 0
|
||||
- self.sip = self._find_exe('sip5', 'sip')
|
||||
+ self.sip = self._find_exe('sip3')
|
||||
self.sip_h_version = None
|
||||
self.sip_inc_dir = self.py_venv_inc_dir
|
||||
self.static = False
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
SUMMARY = "Python Qt5 Bindings"
|
||||
AUTHOR = "Phil Thomson @ riverbank.co.uk"
|
||||
HOMEPAGE = "http://riverbankcomputing.co.uk"
|
||||
SECTION = "devel/python"
|
||||
LICENSE = "GPLv3"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
|
||||
|
||||
SRC_URI = "\
|
||||
https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-${PV}/PyQt5_gpl-${PV}.tar.gz \
|
||||
file://0001-Make-sure-to-find-python3-sip-code-generator.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "33d6d2ab8183da17ac18b8132a4b278e"
|
||||
SRC_URI[sha256sum] = "c190dac598c97b0113ca5e7a37c71c623f02d1d713088addfacac4acfa4b8394"
|
||||
|
||||
PE = "1"
|
||||
|
||||
inherit qmake5 python3native
|
||||
|
||||
DEPENDS += "sip3-native sip3 qtbase python3"
|
||||
DEPENDS_append_class-target = "qtsvg"
|
||||
|
||||
S = "${WORKDIR}/PyQt5_gpl-${PV}"
|
||||
B = "${S}"
|
||||
|
||||
DISABLED_FEATURES = "PyQt_Desktop_OpenGL"
|
||||
|
||||
DISABLED_FEATURES_append_arm = " PyQt_qreal_double"
|
||||
|
||||
PYQT_MODULES = "QtCore QtGui QtNetwork QtWidgets QtSvg"
|
||||
PYQT_MODULES_class-native = "QtCore"
|
||||
PYQT_MODULES_aarch64 = "QtCore QtGui QtNetwork QtWidgets QtSvg"
|
||||
|
||||
# full paths
|
||||
SYSROOTDIR = "${STAGING_DIR_HOST}"
|
||||
SYSROOTDIR_class-native = "${STAGING_DIR_NATIVE}"
|
||||
INCLUDEDIR = "${STAGING_INCDIR}"
|
||||
INCLUDEDIR_class-native = "${STAGING_INCDIR_NATIVE}"
|
||||
LIBDIR = "${STAGING_LIBDIR}"
|
||||
LIBDIR_class-native = "${STAGING_LIBDIR_NATIVE}"
|
||||
PYTHONEXEC="${bindir}/${PYTHON_PN}"
|
||||
PYTHONEXEC_class-native="${PYTHON}"
|
||||
|
||||
do_configure() {
|
||||
echo "py_platform = linux" > pyqt.cfg
|
||||
echo "py_inc_dir = ${INCLUDEDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg
|
||||
echo "py_pylib_dir = ${LIBDIR}/python${PYTHON_BASEVERSION}" >> pyqt.cfg
|
||||
echo "py_pylib_lib = python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> pyqt.cfg
|
||||
echo "pyqt_module_dir = ${D}/${PYTHON_SITEPACKAGES_DIR}" >> pyqt.cfg
|
||||
echo "pyqt_bin_dir = ${D}/${bindir}" >> pyqt.cfg
|
||||
echo "pyqt_sip_dir = ${D}/${datadir}/sip/PyQt5" >> pyqt.cfg
|
||||
echo "pyuic_interpreter = ${PYTHONEXEC}" >> pyqt.cfg
|
||||
echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg
|
||||
echo "qt_shared = True" >> pyqt.cfg
|
||||
QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION`
|
||||
echo "[Qt $QT_VERSION]" >> pyqt.cfg
|
||||
echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg
|
||||
echo yes | python3 configure.py --verbose --qmake ${OE_QMAKE_QMAKE} --configuration pyqt.cfg --sysroot ${SYSROOTDIR}
|
||||
}
|
||||
|
||||
do_install() {
|
||||
oe_runmake install
|
||||
}
|
||||
|
||||
do_install_class-native() {
|
||||
oe_runmake install
|
||||
}
|
||||
|
||||
RDEPENDS_${PN}_append_class-target = " python3-core python3-sip"
|
||||
|
||||
FILES_${PN} += " \
|
||||
${libdir}/${PYTHON_DIR}/site-packages \
|
||||
${datadir}/sip/PyQt5 \
|
||||
"
|
||||
|
||||
BBCLASSEXTEND += "native nativesdk"
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
SUMMARY = "SIP is a C++/Python Wrapper Generator"
|
||||
HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
|
||||
SECTION = "devel"
|
||||
LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303"
|
||||
|
||||
inherit python3-dir
|
||||
|
||||
DEPENDS = "python3"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz"
|
||||
SRC_URI[md5sum] = "0625fb20347d4ff1b5da551539be0727"
|
||||
SRC_URI[sha256sum] = "7eaf7a2ea7d4d38a56dd6d2506574464bddf7cf284c960801679942377c297bc"
|
||||
BPN = "sip"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
|
||||
PACKAGES += "python3-sip"
|
||||
|
||||
do_configure_prepend_class-target() {
|
||||
echo "py_platform = linux" > sip.cfg
|
||||
echo "py_inc_dir = %(sysroot)/${includedir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> sip.cfg
|
||||
echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg
|
||||
echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg
|
||||
echo "sip_module_dir = ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages" >> sip.cfg
|
||||
echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg
|
||||
python3 configure.py --configuration sip.cfg --sysroot ${STAGING_DIR_HOST} CC="${CC}" CXX="${CXX}" LINK="${CXX}" STRIP="" LINK_SHLIB="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LFLAGS="${LDFLAGS}"
|
||||
}
|
||||
do_configure_prepend_class-native() {
|
||||
echo "py_platform = linux" > sip.cfg
|
||||
echo "py_inc_dir = ${includedir}/python${PYTHON_BASEVERSION}${PYTHON_ABI}" >> sip.cfg
|
||||
echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg
|
||||
echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg
|
||||
echo "sip_module_dir = ${D}/${libdir}/python${PYTHON_BASEVERSION}/site-packages" >> sip.cfg
|
||||
echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg
|
||||
python3 configure.py --configuration sip.cfg --sysroot ${STAGING_DIR_NATIVE}
|
||||
}
|
||||
do_install() {
|
||||
oe_runmake install
|
||||
# avoid conflicts with sip for python2
|
||||
mv ${D}/${bindir}/sip ${D}/${bindir}/sip3
|
||||
}
|
||||
|
||||
FILES_python3-sip = "${libdir}/${PYTHON_DIR}/site-packages/"
|
||||
@@ -1,5 +1,5 @@
|
||||
From 88c61efce068b4cfe6d4c175bd9d1b85def23708 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 15 Jul 2017 00:03:36 +0200
|
||||
Subject: [PATCH] do not try to cross-run carla-lv2-export
|
||||
MIME-Version: 1.0
|
||||
@@ -8,24 +8,25 @@ Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [cross specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
source/plugin/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
source/plugin/Makefile | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/source/plugin/Makefile b/source/plugin/Makefile
|
||||
index 59b5c5d..3bcb368 100644
|
||||
index 2ec4eb305..726ec32c0 100644
|
||||
--- a/source/plugin/Makefile
|
||||
+++ b/source/plugin/Makefile
|
||||
@@ -206,7 +206,7 @@ $(BINDIR)/carla.lv2/manifest.ttl: $(OBJDIR)/carla-lv2-export.cpp.o $(LIBS)
|
||||
ifeq ($(BUILDING_FOR_WINDOWS),true)
|
||||
@cd $(BINDIR) && wine ./carla-lv2-export$(APP_EXT)
|
||||
else
|
||||
- @cd $(BINDIR) && ./carla-lv2-export$(APP_EXT)
|
||||
+ @cd $(BINDIR)
|
||||
endif
|
||||
@@ -478,8 +478,7 @@ $(BINDIR)/carla.lv2/manifest.ttl: $(OBJDIR)/carla-lv2-export.cpp.o $(BINDIR)/car
|
||||
@echo "Linking carla-lv2-export$(APP_EXT)"
|
||||
@$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(NATIVE_LINK_FLAGS) -o $(BINDIR)/carla-lv2-export$(APP_EXT)
|
||||
|
||||
- @echo "Generating LV2 ttl data"
|
||||
- @cd $(BINDIR) && $(EXE_WRAPPER) ./carla-lv2-export$(APP_EXT)
|
||||
+ @echo "LV2 ttl data creation is postponed"
|
||||
@cd $(BINDIR)/carla.lv2 && ln -sf ../*bridge-* ../carla-discovery-* .
|
||||
|
||||
$(BINDIR)/carla-lv2-export$(APP_EXT): $(OBJDIR)/carla-lv2-export.cpp.o
|
||||
--
|
||||
2.9.4
|
||||
2.30.2
|
||||
|
||||
|
||||
@@ -7,17 +7,17 @@ LIC_FILES_CHKSUM = " \
|
||||
"
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/falkTX/Carla.git;nobranch=1 \
|
||||
git://github.com/falkTX/Carla.git;branch=main \
|
||||
file://0001-do-not-try-to-cross-run-carla-lv2-export.patch \
|
||||
file://0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch \
|
||||
"
|
||||
SRCREV = "1b5080dff02b1e751e32f0582e4aee7bc2c74a67"
|
||||
SRCREV = "74ee581a3c68cb4b3c13c83bb3f215a8d114b5a7"
|
||||
S = "${WORKDIR}/git"
|
||||
PV = "2.1.1"
|
||||
PV = "2.3.0"
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
inherit qmake5_base pkgconfig qemu-ext-musicians features_check mime mime-xdg gtk-icon-cache
|
||||
inherit qmake5_base python3native qemu-ext-musicians features_check mime mime-xdg gtk-icon-cache
|
||||
|
||||
B = "${S}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user