FS-UAE and launcher version bump (#5959)

* pyqt5: re-enable PyQt5.QtOpenGL needed for FS-UAE launcher

Appears to build without problem and once installed FS-UAE launcher works fine.

Signed-off-by: Chris Moore <chris@mooreonline.org>

* fs-uae-launcher: bump to version 3.0.5

Signed-off-by: Chris Moore <chris@mooreonline.org>

* fs-uae: bump to version 3.0.5

Signed-off-by: Chris Moore <chris@mooreonline.org>
This commit is contained in:
Chris Moore
2021-06-05 20:39:29 +01:00
committed by GitHub
parent aaa1e71f90
commit d0cde6f613
5 changed files with 13 additions and 13 deletions

View File

@@ -5,7 +5,7 @@ simplicity of Python."
HOMEPAGE="http://www.riverbankcomputing.com/software/pyqt/"
COPYRIGHT="2015-2019 Riverbank Computing Limited"
LICENSE="GNU GPL v3"
REVISION="1"
REVISION="2"
SOURCE_URI="https://pypi.python.org/packages/source/P/PyQt5/PyQt5-$portVersion.tar.gz"
CHECKSUM_SHA256="372b08dc9321d1201e4690182697c5e7ffb2e0770e6b4a45519025134b12e4fc"
SOURCE_DIR="PyQt5-$portVersion"
@@ -40,7 +40,7 @@ REQUIRES="
lib:libQt5MultimediaWidgets$secondaryArchSuffix
lib:libQt5Network$secondaryArchSuffix
lib:libQt5Nfc$secondaryArchSuffix
# lib:libQt5OpenGL$secondaryArchSuffix
lib:libQt5OpenGL$secondaryArchSuffix
lib:libQt5PrintSupport$secondaryArchSuffix
lib:libQt5Positioning$secondaryArchSuffix
lib:libQt5Qml$secondaryArchSuffix
@@ -58,7 +58,7 @@ REQUIRES="
lib:libQt5Widgets$secondaryArchSuffix
lib:libQt5Xml$secondaryArchSuffix
lib:libQt5XmlPatterns$secondaryArchSuffix
# lib:libGL${secondaryArchSuffix}
lib:libGL${secondaryArchSuffix}
"
REPLACES="
pyqt$secondaryArchSuffix
@@ -102,7 +102,7 @@ BUILD_REQUIRES="
devel:libQt5MultimediaWidgets$secondaryArchSuffix >= $qtVersion
devel:libQt5Network$secondaryArchSuffix >= $qtVersion
devel:libQt5Nfc$secondaryArchSuffix >= $qtVersion
# devel:libQt5OpenGL$secondaryArchSuffix >= $qtVersion
devel:libQt5OpenGL$secondaryArchSuffix >= $qtVersion
devel:libQt5PrintSupport$secondaryArchSuffix >= $qtVersion
devel:libQt5Positioning$secondaryArchSuffix >= $qtVersion
devel:libQt5Qml$secondaryArchSuffix >= $qtVersion
@@ -120,7 +120,7 @@ BUILD_REQUIRES="
devel:libQt5Widgets$secondaryArchSuffix >= $qtVersion
devel:libQt5Xml$secondaryArchSuffix >= $qtVersion
devel:libQt5XmlPatterns$secondaryArchSuffix >= $qtVersion
# devel:libGL${secondaryArchSuffix}
devel:libGL${secondaryArchSuffix}
"
BUILD_PREREQUIRES="
cmd:python$PYTHON3_VERSION
@@ -157,11 +157,8 @@ BUILD()
--no-qml-plugin \
--no-make \
--target-dir=$installLocation \
--api-dir=$dataDir/sip/PyQt5 \
--disable=QtOpenGL \
--disable=_QOpenGLFunctions_2_0 \
--disable=_QOpenGLFunctions_2_1 \
--disable=_QOpenGLFunctions_4_1_Core
--api-dir=$dataDir/sip/PyQt5
cd build
make $jobArgs
}
@@ -182,7 +179,7 @@ INSTALL()
mkdir -p $installLocation
cd build
make install INSTALL_ROOT="$prefix"
$python -m compileall -d / $prefix/lib/python$pythonVersion
$python -O -m compileall -d / $prefix/lib/python$pythonVersion