Skip to content
Snippets Groups Projects
Commit 19c67be4 authored by achill (fossdd)'s avatar achill (fossdd) :gay_pride_flag: Committed by Patrycja Rosa
Browse files
parent 9c496089
No related branches found
No related tags found
1 merge request!78666[3.21] community/kodi: upgrade to 21.2
Pipeline #291817 passed
Pipeline: aports

#291818

    ......@@ -2,9 +2,9 @@
    # Contributor: Natanael Copa <ncopa@alpinelinux.org>
    # Maintainer: fossdd <fossdd@pwned.life>
    pkgname=kodi
    pkgver=21.1
    pkgver=21.2
    _realname=Omega
    pkgrel=3
    pkgrel=0
    _libdvdcss="1.4.3-Next-Nexus-Alpha2-2"
    _libdvdnav="6.1.1-Next-Nexus-Alpha2-2"
    _libdvdread="6.1.3-Next-Nexus-Alpha2-2"
    ......@@ -129,7 +129,7 @@ subpackages="
    # py3-$pkgname:py3
    replaces="xbmc"
    options="ldpath-recursive !check" # No testsuite
    source="https://github.com/xbmc/xbmc/archive/$pkgver-$_realname.tar.gz
    source="https://github.com/xbmc/xbmc/archive/v$pkgver-$_realname.tar.gz
    crossguid-$_crossguid.tar.gz::https://mirrors.kodi.tv/build-deps/sources/crossguid-$_crossguid.tar.gz
    libdvdcss-$_libdvdcss.tar.gz::https://github.com/xbmc/libdvdcss/archive/$_libdvdcss.tar.gz
    libdvdnav-$_libdvdnav.tar.gz::https://github.com/xbmc/libdvdnav/archive/$_libdvdnav.tar.gz
    ......@@ -138,7 +138,6 @@ source="https://github.com/xbmc/xbmc/archive/$pkgver-$_realname.tar.gz
    gcc13.patch
    lfs64.patch
    sse-build.patch
    no-xmllang.patch
    kodi.initd
    60-kodi.rules
    "
    ......@@ -286,7 +285,7 @@ polkit() {
    }
    sha512sums="
    8458447c2a6d7ce0fdcfc7ec9b4ff1f8be0abf18a16804d245c3cef99408fcfb4b13aa18fca16c87e560316c97d281e214cf37fd7e17e243c1206c5575195dc8 21.1-Omega.tar.gz
    d49d74240b9c0aded3437dd81bc3324c03bea36834bca3920d5d26b4780275e3fea46efe1f3b33bb3e910d1ffe211ee17928bd8a441326a49713ac1120f083ea v21.2-Omega.tar.gz
    f0a80d8e99b10473bcfdfde3d1c5fd7b766959819f0d1c0595ac84ce46db9007a5fbfde9a55aca60530c46cb7f8ef4c7e472c6191559ded92f868589c141ccaf crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
    d3be3bfc13c5ea56d8db745c2aab090c99760684fe4c8f62a13d266feb319e9180ceeecf8116bfd2ed90d9accba2c11dbbf93b61ad00f69a40812ebf4eabcdda libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz
    51e6fc033121241354a5f0b3fc9a430577ae3ff6bb7f31445aa548ef4893037fb80eea3b2c6774c81e9ebaf9c45e9b490c98c2c65eb38f9f7daba84b236f7e1d libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz
    ......@@ -295,7 +294,6 @@ d3be3bfc13c5ea56d8db745c2aab090c99760684fe4c8f62a13d266feb319e9180ceeecf8116bfd2
    f2cd6ec55e44f3a413e2eebeba8b1d591d9ee64b9099578466d19033b620deba8012134aab9017ccb23912518219f725f33b682abf681994c34e160ea07cfa6c gcc13.patch
    2aa75f17ecf65e59770746e436a807f2697ba43278158e5123761c543cba40c2b596c5f5c51cc7ca3a7c79bab81213f81017afa6c1228e51546fe14a8cff13de lfs64.patch
    82c73147c4f4cd369b413eb503e22b5ac0e4c6dc4c5558efb0b093bf9338da74510bf45141cf7a7b2b30c817eaaa0c7dab7d44960de58bfdcdff51b6e1e7652d sse-build.patch
    62546f4e2fd2c7f8ff25b473a1b89730a5855b73da09daa8118afac12e4d0ab26b1eef4a22b98f84022085f02a6e81166f4fd5865fb00065d41f67500dceff20 no-xmllang.patch
    c47e90b6bb011092c033705195c8f1e4fcb56be412f12133514f46f5cb52acda7075c8350d78c98b86e0808f3d373ac3735f0fae10e907610b5405ba623cebac kodi.initd
    465a2079d598bf909a458d8e9d0ddd2b2a41dff83ba736542cffec7811c044295d5af092928f20aaa6cd3bc8b13bb03ede5c7ded1783680f890464e103392787 60-kodi.rules
    "
    fix building with swig 4.3.0;
    > 2024-10-09: wsfulton Remove -xmllang option used with -xml, which had no effect on the output.
    diff --git a/xbmc/interfaces/swig/CMakeLists.txt b/xbmc/interfaces/swig/CMakeLists.txt
    index 0d0cadc..ac61016 100644
    --- a/xbmc/interfaces/swig/CMakeLists.txt
    +++ b/xbmc/interfaces/swig/CMakeLists.txt
    @@ -22,7 +22,7 @@ function(generate_file file)
    add_custom_command(OUTPUT ${CPP_FILE}
    COMMAND ${SWIG_EXECUTABLE}
    - ARGS -w401 -c++ -o ${file}.xml -xml -I${CMAKE_SOURCE_DIR}/xbmc -xmllang python ${CMAKE_CURRENT_SOURCE_DIR}/../swig/${file}
    + ARGS -w401 -c++ -o ${file}.xml -xml -I${CMAKE_SOURCE_DIR}/xbmc ${CMAKE_CURRENT_SOURCE_DIR}/../swig/${file}
    COMMAND ${Java_JAVA_EXECUTABLE}
    ARGS ${JAVA_OPEN_OPTS} -cp "${classpath}" groovy.ui.GroovyMain ${CMAKE_SOURCE_DIR}/tools/codegenerator/Generator.groovy ${file}.xml ${CMAKE_CURRENT_SOURCE_DIR}/../python/PythonSwig.cpp.template ${file}.cpp > ${devnull}
    ${CLANG_FORMAT_COMMAND}
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment