diff --git a/multimedia/misc/mbedtls/actions.py b/multimedia/misc/mbedtls/actions.py index 5cafecb78c..2d93d19601 100644 --- a/multimedia/misc/mbedtls/actions.py +++ b/multimedia/misc/mbedtls/actions.py @@ -1,28 +1,27 @@ -#!/usr/bin/env python +#!/usr/bin/python # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt +# See the file https://www.gnu.org/licenses/gpl-3.0.txt -from pisi.actionsapi import cmaketools -from pisi.actionsapi import pisitools -from pisi.actionsapi import shelltools -from pisi.actionsapi import get +from pisi.actionsapi import cmaketools, mesontools, pisitools + +i = ''.join([ + ' -DCMAKE_INSTALL_PREFIX=/usr', + ' -DCMAKE_BUILD_TYPE=Release', + ' -DUSE_SHARED_MBEDTLS_LIBRARY=ON', + ' -DUSE_STATIC_MBEDTLS_LIBRARY=OFF', + ' -DLINK_WITH_PTHREAD=ON', + ' -Bbuild -G Ninja -L ' + ]) def setup(): - #pisitools.dosed('CMakeLists.txt', '"cmake"', '"lib/cmake"') - - shelltools.system("mkdir build") - shelltools.cd("build") - cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ - -DUSE_SHARED_MBEDTLS_LIBRARY=ON \ - -DMBEDTLS_FATAL_WARNINGS=OFF \ - -DINSTALL_MBEDTLS_HEADERS=ON", sourceDir="..") + cmaketools.configure(i) def build(): - cmaketools.make("-C build") + mesontools.build() def install(): - cmaketools.rawInstall("DESTDIR=%s -C build" % get.installDIR()) + mesontools.install() - pisitools.dodoc("ChangeLog", "LICENSE", "README*") + pisitools.dodoc("LICENSE") diff --git a/multimedia/misc/mbedtls/pspec.xml b/multimedia/misc/mbedtls/pspec.xml index 152b9fdb2d..55c232727a 100644 --- a/multimedia/misc/mbedtls/pspec.xml +++ b/multimedia/misc/mbedtls/pspec.xml @@ -1,28 +1,26 @@ - + mbedtls - https://github.com/ARMmbed/mbedtls + https://github.com/Mbed-TLS/mbedtls PisiLinux Community admins@pisilinux.org - Apache + Apache-2.0 library - Cryptographic library for embedded systems - Gömülü sistemler için kriptografik kitaplık - https://github.com/ARMmbed/mbedtls/archive/refs/tags/v2.27.0.tar.gz + Cryptographic library for embedded systems. + A C library that implements cryptographic primitives, X.509 certificate manipulation and the SSL/TLS and DTLS protocols. + https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-3.6.2/mbedtls-3.6.2.tar.bz2 cmake + ninja python3 - - --> @@ -30,7 +28,7 @@ /usr/bin /usr/lib - /usr/share/doc + /usr/share @@ -43,10 +41,18 @@ /usr/include /usr/lib/cmake + /usr/lib/pkgconfig + + 2025-01-30 + 3.6.2 + Version bump. + PisiLinux Community + admins@pisilinux.org + 2021-11-09 2.27.0 diff --git a/multimedia/sound/yarock/files/phonon.patch b/multimedia/sound/yarock/files/phonon.patch deleted file mode 100644 index 839cfb9eda..0000000000 --- a/multimedia/sound/yarock/files/phonon.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN Yarock_1.1.5_source-orig/src/core/player/phonon/CMakeLists.txt Yarock_1.1.5_source/src/core/player/phonon/CMakeLists.txt ---- Yarock_1.1.5_source-orig/src/core/player/phonon/CMakeLists.txt 2015-05-21 00:42:46.627611703 +0300 -+++ Yarock_1.1.5_source/src/core/player/phonon/CMakeLists.txt 2015-05-21 00:43:25.852867232 +0300 -@@ -34,7 +34,7 @@ - - - if (ENABLE_QT5) -- INCLUDE_DIRECTORIES( ${PHONON_INCLUDE_DIR}/phonon4qt5 ) -+ INCLUDE_DIRECTORIES( /usr/include/phonon4qt5 ) - else (ENABLE_QT5) - INCLUDE_DIRECTORIES( ${PHONON_INCLUDES} ) - endif (ENABLE_QT5)