kodi-17.3-4.parabola1: updating version

4 files changed, 153 insertions, 14 deletions

diff --git a/libre/kodi/PKGBUILD b/libre/kodi/PKGBUILD
index 6253ae554..133c14c05 100644
--- a/libre/kodi/PKGBUILD
+++ b/libre/kodi/PKGBUILD
@@ -14,7 +14,8 @@
 # Contributor (Arch): Zeqadious <zeqadious.at.gmail.dot.com>
 # Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor (Arch): Maxime Gauduin <alucryd@gmail.com>
-# Maintainer: André Silva <emulatorman@parabola.nu>
+# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: Isaac David <isacdaavid () isacdaavid!info>
 #
 # Original credits go to Edgar Hucek <gimli at dark-green dot com>
@@ -23,9 +24,12 @@
 _pkgbase=kodi-libre
 pkgbase=kodi
 pkgname=kodi
-pkgver=17.1
+pkgver=17.3
 _codename=Krypton
-pkgrel=1.parabola1
+_libdvdcss=2f12236bc1c92f73c21e973363f79eb300de603f
+_libdvdread=17d99db97e7b8f23077b342369d3c22a6250affd
+_libdvdnav=43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac
+pkgrel=4.parabola1
 arch=('i686' 'x86_64' 'armv7h')
 url="http://kodi.tv"
 license=('GPL2')
@@ -42,18 +46,26 @@ 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'
+  'mesa' 'libcrossguid' '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"
-  'libre.patch'
-)
-mksha512sums=('5093fe7dcdf22e2604ea93696c909028c00a8b0c858e7b25f55dade6c3423b4a68f5a49a8a0dd5238b10f4a7dd5e815a82251949ce7adb8a8f8cf5d58fc7bd41')
-sha512sums=('3f1e1b9be746915a84d37845a946e61c864d0918c21882350d2aad288d3480fe31901c726a880e7073ffbf09a826f5562be81386a68357e388653a9d3553d05b'
-            '46c712104621d3432ffa07785e7c885394b04e21ddc5cc526520810787e8879878c8e59bb6e6e4c39ddb1097e020864a2d573d0bccce30d546a0c39490299896')
+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"
+        'fix-python-lib-path.patch'
+        'fix-ftpparse.patch'
+        'kodi-use-external-libraries.patch'
+        'libre.patch')
+mksha512sums=('832071c3e9f332281a767f29168f6d6d003a86b42df849e81d907c2280f81f959ae42a850eddc889ae2280bba6106de3355e701ff2d71c88ee14cb20c84e7987')
+sha512sums=('066e26af238dc0d15e480295a203bfd87dc1de6d1a616be057fab6f4a9de620f1bb073516d3d240d4eb76b8b6bd91b7242343b55e6335ee67d3479b344a67ee9'
+            '12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9'
+            'e59ae0bfdc62698e407e3d70503c6a7c5e308545c9dae7843e25db3b5b62d9b26256be77ef4e884263add6b4abec3438c324bfd5715f6ca2ce7fa5962d43a6c2'
+            '901c6f24afa1d78b6ed78d1ee30daf634ca0bbc0467ef9cc3416bcab4fbc4fda6869ffa051791d85c0b510de748805328627681ef044668a7857299f0035232e'
+            '0f41604e38648969572a66d1124d6e090c3bfca4f9d8ccabcd1806254c38b178ee08df35e1bbbd1228f820729df52353321b3257122af601c3233dbc6405c6d2'
+            '20ed1d87eec133d079c0e58858d24b4c79480e31e35296f82c7c33f5aa48d6ce163ce40784aa50d4ffe2021758c949c84319eb17fadc0040e2aa2be8f2130d2c'
+            '8185721fb8a067861291ea1c96188af095fadb8ea66fd8452fc8fd50f94bb753c980fc962e9c476dfed5eb84c2a0fb8129cb49baec274a439716214fe011c5dc'
+            'e6397b3925b67f1c17699057feea3d258f7735829d87a2049a1f54026bfeb21b10a67750c667dc591f1dee342aa3381f0af70ceb98174b42488528101e251fa3')
 
 mksource() {
   cd "$srcdir/xbmc-$pkgver-$_codename"
@@ -68,6 +80,9 @@ prepare() {
 
   cd "$srcdir/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}
   patch -Np1 -i ../libre.patch
@@ -80,6 +95,10 @@ build() {
     -DCMAKE_INSTALL_LIBDIR=/usr/lib
     -DENABLE_EVENTCLIENTS=ON
     -DLIRC_DEVICE=/run/lirc/lircd
+    -DENABLE_INTERNAL_CROSSGUID=OFF
+    -Dlibdvdcss_URL="$srcdir/libdvdcss-${_libdvdcss}.tar.gz"
+    -Dlibdvdread_URL="$srcdir/libdvdread-${_libdvdread}.tar.gz"
+    -Dlibdvdnav_URL="$srcdir/libdvdnav-${_libdvdnav}.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
new file mode 100644
index 000000000..feec94922
--- /dev/null
+++ b/libre/kodi/fix-ftpparse.patch
@@ -0,0 +1,71 @@
+--- 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
diff --git a/libre/kodi/fix-python-lib-path.patch b/libre/kodi/fix-python-lib-path.patch
new file mode 100644
index 000000000..395658008
--- /dev/null
+++ b/libre/kodi/fix-python-lib-path.patch
@@ -0,0 +1,29 @@
+--- a/project/cmake/scripts/linux/Install.cmake	2017-03-20 17:17:49.000000000 +0100
++++ b/project/cmake/scripts/linux/Install.cmake	2017-05-20 15:42:09.608550173 +0200
+@@ -199,7 +199,7 @@
+   install(PROGRAMS ${CORE_SOURCE_DIR}/tools/EventClients/lib/python/bt/__init__.py
+                    ${CORE_SOURCE_DIR}/tools/EventClients/lib/python/bt/bt.py
+                    ${CORE_SOURCE_DIR}/tools/EventClients/lib/python/bt/hid.py
+-          DESTINATION lib/python2.7/dist-packages/${APP_NAME_LC}/bt
++          DESTINATION lib/python2.7/site-packages/${APP_NAME_LC}/bt
+           COMPONENT kodi-eventclients-common)
+ 
+   # Install kodi-eventclients-common PS3 python files
+@@ -208,7 +208,7 @@
+                    ${CORE_SOURCE_DIR}/tools/EventClients/lib/python/ps3/sixaxis.py
+                    ${CORE_SOURCE_DIR}/tools/EventClients/lib/python/ps3/sixpair.py
+                    ${CORE_SOURCE_DIR}/tools/EventClients/lib/python/ps3/sixwatch.py
+-          DESTINATION lib/python2.7/dist-packages/${APP_NAME_LC}/ps3
++          DESTINATION lib/python2.7/site-packages/${APP_NAME_LC}/ps3
+           COMPONENT kodi-eventclients-common)
+ 
+   # Install kodi-eventclients-common python files
+@@ -218,7 +218,7 @@
+                    "${CORE_SOURCE_DIR}/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py"
+                    ${CORE_SOURCE_DIR}/tools/EventClients/lib/python/xbmcclient.py
+                    ${CORE_SOURCE_DIR}/tools/EventClients/lib/python/zeroconf.py
+-          DESTINATION lib/python2.7/dist-packages/${APP_NAME_LC}
++          DESTINATION lib/python2.7/site-packages/${APP_NAME_LC}
+           COMPONENT kodi-eventclients-common)
+ 
+   # Install kodi-eventclients-common icons
diff --git a/libre/kodi/kodi-use-external-libraries.patch b/libre/kodi/kodi-use-external-libraries.patch
new file mode 100644
index 000000000..c1bfbb2c2
--- /dev/null
+++ b/libre/kodi/kodi-use-external-libraries.patch
@@ -0,0 +1,20 @@
+--- xbmc-17.3-Krypton.orig/lib/libdvd/Makefile.in	2017-05-24 15:49:32.000000000 -0500
++++ xbmc-17.3-Krypton/lib/libdvd/Makefile.in	2017-08-03 14:48:13.650801985 -0500
+@@ -12,7 +12,7 @@
+ else
+   DVDNAV_A = @abs_top_srcdir@/tools/depends/target/libdvdnav/dvdnav-install/lib/libdvdnav.a
+   DVDREAD_A = @abs_top_srcdir@/tools/depends/target/libdvdread/dvdread-install/lib/libdvdread.a
+-  DVDCSS_A = @abs_top_srcdir@/tools/depends/target/libdvdcss/dvdcss-install/lib/libdvdcss.a
++  DVDCSS_A =
+ endif
+ 
+ SYSDIR = @abs_top_srcdir@/system/players/VideoPlayer
+@@ -36,7 +36,7 @@
+ ifeq ($(ARCH),arm-osx)
+   BUILD_DVDCSS = 0
+ else
+-  BUILD_DVDCSS = 1
++  BUILD_DVDCSS = 0
+ endif
+ ifeq ($(BUILD_DVDCSS),1)
+   SOS += libdvdcss-$(ARCH).so