From 10b21de937ef586b9d27d0b9bbfad7a142a38cb2 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Mon, 18 Sep 2017 11:13:37 -0500 Subject: kodi-17.4-1.parabola1: updating version --- libre/kodi/PKGBUILD | 25 +++++++-------- libre/kodi/fix-ftpparse.patch | 71 ------------------------------------------- 2 files changed, 13 insertions(+), 83 deletions(-) delete mode 100644 libre/kodi/fix-ftpparse.patch (limited to 'libre') diff --git a/libre/kodi/PKGBUILD b/libre/kodi/PKGBUILD index 133c14c05..d3538197d 100644 --- a/libre/kodi/PKGBUILD +++ b/libre/kodi/PKGBUILD @@ -24,12 +24,13 @@ _pkgbase=kodi-libre pkgbase=kodi pkgname=kodi -pkgver=17.3 +pkgver=17.4 _codename=Krypton _libdvdcss=2f12236bc1c92f73c21e973363f79eb300de603f _libdvdread=17d99db97e7b8f23077b342369d3c22a6250affd -_libdvdnav=43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac -pkgrel=4.parabola1 +_libdvdnav=981488f7f27554b103cca10c1fbeba027396c94a +_crossguid=8f399e8bd4 +pkgrel=1.parabola1 arch=('i686' 'x86_64' 'armv7h') url="http://kodi.tv" license=('GPL2') @@ -46,24 +47,24 @@ makedepends=( 'libxrandr' 'libxslt' 'lzo' 'nasm' 'nss-mdns' 'python2-pillow' 'python2-pybluez' 'python2-simplejson' 'rtmpdump' 'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower' 'yajl' 'zip' - 'mesa' 'libcrossguid' 'ffmpeg' + 'mesa' 'ffmpeg' ) mksource=("$pkgname-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz") source=("https://repo.parabola.nu/other/$_pkgbase/$_pkgbase-$pkgver-$_codename.tar.gz" "libdvdcss-${_libdvdcss}.tar.gz::https://github.com/xbmc/libdvdcss/archive/${_libdvdcss}.tar.gz" "libdvdread-${_libdvdread}.tar.gz::https://github.com/xbmc/libdvdread/archive/${_libdvdread}.tar.gz" "libdvdnav-${_libdvdnav}.tar.gz::https://github.com/xbmc/libdvdnav/archive/${_libdvdnav}.tar.gz" + "crossguid-${_crossguid}.tar.gz::http://mirrors.kodi.tv/build-deps/sources/crossguid-${_crossguid}.tar.gz" 'fix-python-lib-path.patch' - 'fix-ftpparse.patch' 'kodi-use-external-libraries.patch' 'libre.patch') -mksha512sums=('832071c3e9f332281a767f29168f6d6d003a86b42df849e81d907c2280f81f959ae42a850eddc889ae2280bba6106de3355e701ff2d71c88ee14cb20c84e7987') -sha512sums=('066e26af238dc0d15e480295a203bfd87dc1de6d1a616be057fab6f4a9de620f1bb073516d3d240d4eb76b8b6bd91b7242343b55e6335ee67d3479b344a67ee9' +mksha512sums=('5cc5707b84a566d5a130c10e1d03ec0dfcf4349d1f4671ad31f088a867407ab1eb1bcc22277ec8c07da867551130356e8d0c4bfe32cb359aa05c617fe0ecb5ef') +sha512sums=('20e5298484ffda65d6952a04cd4ad69454cccc1ca263ac83282394fea0a462ec9782d005528487d7676fc6f63bc957f2ccc848e3cb7227bd81388fb7625ad83b' '12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9' 'e59ae0bfdc62698e407e3d70503c6a7c5e308545c9dae7843e25db3b5b62d9b26256be77ef4e884263add6b4abec3438c324bfd5715f6ca2ce7fa5962d43a6c2' - '901c6f24afa1d78b6ed78d1ee30daf634ca0bbc0467ef9cc3416bcab4fbc4fda6869ffa051791d85c0b510de748805328627681ef044668a7857299f0035232e' + '005355da5e3d34f69737f7c3fe7884e82ffdc8f654f337e97d4a4d1e486c9f346f63b4dee74de2765e7a8d94925de5d25c3c82da732d2e8d4f58fcfeb9dd2586' + '2682d63609d3dcdfcd8136be632e45df26ad88ce93b9c49745cf728bbd2e6254a7b05c8b059ab581d532372e504206a525a52564b64d076dfdae9c965a09fd16' '0f41604e38648969572a66d1124d6e090c3bfca4f9d8ccabcd1806254c38b178ee08df35e1bbbd1228f820729df52353321b3257122af601c3233dbc6405c6d2' - '20ed1d87eec133d079c0e58858d24b4c79480e31e35296f82c7c33f5aa48d6ce163ce40784aa50d4ffe2021758c949c84319eb17fadc0040e2aa2be8f2130d2c' '8185721fb8a067861291ea1c96188af095fadb8ea66fd8452fc8fd50f94bb753c980fc962e9c476dfed5eb84c2a0fb8129cb49baec274a439716214fe011c5dc' 'e6397b3925b67f1c17699057feea3d258f7735829d87a2049a1f54026bfeb21b10a67750c667dc591f1dee342aa3381f0af70ceb98174b42488528101e251fa3') @@ -78,10 +79,9 @@ prepare() { [[ -d kodi-build ]] && rm -rf kodi-build mkdir kodi-build - cd "$srcdir/xbmc-$pkgver-$_codename" + cd "xbmc-$pkgver-$_codename" # patches patch -p1 -i "$srcdir/fix-python-lib-path.patch" - patch -p1 -i "$srcdir/fix-ftpparse.patch" patch -p1 -i "$srcdir/kodi-use-external-libraries.patch" msg2 "Use addons.xml from Parabola server (without nonfree addons support) and remove nonfree stuff references" rm -v xbmc/filesystem/{Rar{Directory,File,Manager}.{cpp,h},test/TestRarFile.cpp} @@ -95,10 +95,11 @@ build() { -DCMAKE_INSTALL_LIBDIR=/usr/lib -DENABLE_EVENTCLIENTS=ON -DLIRC_DEVICE=/run/lirc/lircd - -DENABLE_INTERNAL_CROSSGUID=OFF + -DWITH_FFMPEG="yes" -Dlibdvdcss_URL="$srcdir/libdvdcss-${_libdvdcss}.tar.gz" -Dlibdvdread_URL="$srcdir/libdvdread-${_libdvdread}.tar.gz" -Dlibdvdnav_URL="$srcdir/libdvdnav-${_libdvdnav}.tar.gz" + -DCROSSGUID_URL="$srcdir/crossguid-${_crossguid}.tar.gz" ) if [ "$CARCH" = "armv7h" ]; then configure_options+=(-DENABLE_VAAPI=OFF) diff --git a/libre/kodi/fix-ftpparse.patch b/libre/kodi/fix-ftpparse.patch deleted file mode 100644 index feec94922..000000000 --- a/libre/kodi/fix-ftpparse.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- a/xbmc/filesystem/FTPParse.cpp 2017-05-24 22:49:32.000000000 +0200 -+++ b/xbmc/filesystem/FTPParse.cpp 2017-07-15 14:15:54.908823456 +0200 -@@ -34,7 +34,7 @@ - m_time = 0; - } - --string CFTPParse::getName() -+std::string CFTPParse::getName() - { - return m_name; - } -@@ -59,16 +59,16 @@ - return m_time; - } - --void CFTPParse::setTime(string str) -+void CFTPParse::setTime(std::string str) - { - /* Variables used to capture patterns via the regexes */ -- string month; -- string day; -- string year; -- string hour; -- string minute; -- string second; -- string am_or_pm; -+ std::string month; -+ std::string day; -+ std::string year; -+ std::string hour; -+ std::string minute; -+ std::string second; -+ std::string am_or_pm; - - /* time struct used to set the time_t variable */ - struct tm time_struct = {}; -@@ -338,21 +338,21 @@ - return day_of_week; - } - --int CFTPParse::FTPParse(string str) -+int CFTPParse::FTPParse(std::string str) - { - /* Various variable to capture patterns via the regexes */ -- string permissions; -- string link_count; -- string owner; -- string group; -- string size; -- string date; -- string name; -- string type; -- string stuff; -- string facts; -- string version; -- string file_id; -+ std::string permissions; -+ std::string link_count; -+ std::string owner; -+ std::string group; -+ std::string size; -+ std::string date; -+ std::string name; -+ std::string type; -+ std::string stuff; -+ std::string facts; -+ std::string version; -+ std::string file_id; - - /* Regex for standard Unix listing formats */ - pcrecpp::RE unix_re("^([-bcdlps])" // type -- cgit v1.2.3