From 476e11bd05f9c6c26e7f4032dc2c3bf18f1cbd2e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 1 Dec 2023 12:31:57 +0100 Subject: [PATCH] libopenshot: switch to python 3.10 --- .../libopenshot/libopenshot-0.3.2.recipe | 43 +++++++++---------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/media-libs/libopenshot/libopenshot-0.3.2.recipe b/media-libs/libopenshot/libopenshot-0.3.2.recipe index a41c48932..4f9962c26 100644 --- a/media-libs/libopenshot/libopenshot-0.3.2.recipe +++ b/media-libs/libopenshot/libopenshot-0.3.2.recipe @@ -6,7 +6,7 @@ OpenShot Video Editor (version 2.0+). C++, Python are fully supported." HOMEPAGE="https://www.openshot.org/" COPYRIGHT="2008-2023 OpenShot Studios, LLC" LICENSE="GNU LGPL v3" -REVISION="2" +REVISION="3" SOURCE_URI="https://github.com/OpenShot/libopenshot/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="58765cfc8aec199814346e97ce31a5618a261260b380670a6fb2bf6f68733638" SOURCE_FILENAME="libopenshot-$portVersion.tar.gz" @@ -15,8 +15,8 @@ PATCHES="libopenshot-$portVersion.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -PYTHON_VERSION="3.9" -libVersion="24" +PYTHON_VERSION="3.10" +libVersion="25" PROVIDES=" libopenshot$secondaryArchSuffix = $portVersion @@ -52,11 +52,11 @@ REQUIRES_devel=" libopenshot$secondaryArchSuffix == $portVersion base " -SUMMARY_python39="$SUMMARY (python3 bindings)" -PROVIDES_python39=" - libopenshot${secondaryArchSuffix}_python39 = $portVersion +SUMMARY_python310="$SUMMARY (python3 bindings)" +PROVIDES_python310=" + libopenshot${secondaryArchSuffix}_python310 = $portVersion " -REQUIRES_python39=" +REQUIRES_python310=" libopenshot$secondaryArchSuffix == $portVersion base lib:libavutil$secondaryArchSuffix lib:libopenshot_audio$secondaryArchSuffix @@ -64,18 +64,18 @@ REQUIRES_python39=" " if [ "$targetArchitecture" = "x86_gcc2" ]; then - PROVIDES_python39+=" - libopenshot_python39 = $portVersion + PROVIDES_python310+=" + libopenshot_python310 = $portVersion " fi -SUMMARY_python39_debuginfo="$SUMMARY (python3 bindings debug info)" -PROVIDES_python39_debuginfo=" - libopenshot${secondaryArchSuffix}_python39_debuginfo = $portVersion - debuginfo:_openshot.so(libopenshot_python39) = $portVersion +SUMMARY_python310_debuginfo="$SUMMARY (python3 bindings debug info)" +PROVIDES_python310_debuginfo=" + libopenshot${secondaryArchSuffix}_python310_debuginfo = $portVersion + debuginfo:_openshot.so(libopenshot_python310) = $portVersion " -REQUIRES_python39_debuginfo=" - libopenshot${secondaryArchSuffix}_python39 == $portVersion base +REQUIRES_python310_debuginfo=" + libopenshot${secondaryArchSuffix}_python310 == $portVersion base " BUILD_REQUIRES=" @@ -117,8 +117,8 @@ defineDebugInfoPackage libopenshot$secondaryArchSuffix \ BUILD() { - python=$portPackageLinksDir/cmd~python${PYTHON_VERSION}/bin/python${PYTHON_VERSION}m - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) + python=$portPackageLinksDir/cmd~python${PYTHON_VERSION}/bin/python${PYTHON_VERSION} + pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c4) installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ export LDFLAGS="-Wl,--as-needed" # Trim unneeded links @@ -148,16 +148,15 @@ INSTALL() $developDir python=$portPackageLinksDir/cmd~python${PYTHON_VERSION}/bin/python${PYTHON_VERSION} - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) + pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c4) pythonLocation=$prefix/lib/python$pythonVersion installLocation=$pythonLocation/vendor-packages - pythonDebugInfoDir=$(getPackagePrefix python39_debuginfo)/$relativeDebugInfoDir + pythonDebugInfoDir=$(getPackagePrefix python310_debuginfo)/$relativeDebugInfoDir mkdir -p $pythonLocation - mv $prefix/lib/python/po/vendor-packages $pythonLocation extractDebugInfo $installLocation/_openshot.so \ - "$pythonDebugInfoDir/_openshot.so(libopenshot_python39-$portFullVersion).debuginfo" + "$pythonDebugInfoDir/_openshot.so(libopenshot_python310-$portFullVersion).debuginfo" # python package - packageEntries python39 \ + packageEntries python310 \ $pythonLocation }