summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsumt2018-02-02 18:39:38 +0200
committersumt2018-02-02 18:39:38 +0200
commitda5d9b30f991ce06f85a6afd879f233af41139e2 (patch)
tree2b75a11cc0eaa9db8a3ab674cc29662ae3dfc3dd
parent1e248601d6d11c3c7f03054c91b45d52bfc2bea6 (diff)
downloadaur-da5d9b30f991ce06f85a6afd879f233af41139e2.tar.gz
Update to 2.30
-rw-r--r--.SRCINFO32
-rw-r--r--PKGBUILD47
-rwxr-xr-xyle-dl7
-rw-r--r--yle-dl.install9
4 files changed, 34 insertions, 61 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1f1b124f410..daf224aa152 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,25 @@
-# Generated by mksrcinfo v8
-# Tue Jun 6 16:40:30 UTC 2017
pkgbase = yle-dl
pkgdesc = Download video and audio from YLE Areena.
- pkgver = 2.16
+ pkgver = 2.30
pkgrel = 1
url = http://aajanki.github.io/yle-dl/
- install = yle-dl.install
arch = any
- license = GPL2
- depends = python2-crypto
- depends = python2-youtube-dl
- optdepends = php-mcrypt: old PHP backend
- optdepends = rtmpdump: old rtmpdump backend
- source = yle-dl
- source = yle-dl-2.16.tar.gz::https://github.com/aajanki/yle-dl/tarball/2.16
- source = AdobeHDS-2016.05.28.php::https://raw.githubusercontent.com/K-S-V/Scripts/3a9b748f957a921c5f846b3ebc7c99bb8255d2e0/AdobeHDS.php
- md5sums = 1138f597102f6fb4bc43f7dc9a003a3c
- md5sums = 90afd517302c2ee6feeee497de2de46b
- md5sums = 81751f2c5184f33a539b5e0bdfdf7adc
+ license = GPL3
+ makedepends = python-setuptools
+ depends = ffmpeg
+ depends = python-crypto
+ depends = python-future
+ depends = python-lxml
+ depends = python-pyamf
+ depends = python-requests
+ depends = youtube-dl
+ depends = wget
+ optdepends = php-mcrypt: for AdobeHDS.php based downloader backend
+ optdepends = rtmpdump: for downloading Areena audio streams
+ provides = yle-dl=2.30
+ conflicts = yle-dl
+ source = yle-dl-2.30.tar.gz::https://github.com/aajanki/yle-dl/archive/2.30.tar.gz
+ md5sums = f632381c47aa09d8601912286e10d406
pkgname = yle-dl
diff --git a/PKGBUILD b/PKGBUILD
index 94dd1bbe3e0..247fe300f78 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,25 @@
-#Maintainer: Jesse Jaara <gmail.com: jesse.jaara>
+# Maintainer: sumt <sumt at sci dot fi>
+# Contributor: Jesse Jaara <gmail.com: jesse.jaara>
pkgname=yle-dl
-pkgver=2.16
+pkgver=2.30
pkgrel=1
-_gitid=bc104d2
pkgdesc="Download video and audio from YLE Areena."
-arch=("any")
+arch=('any')
url="http://aajanki.github.io/yle-dl/"
-license=("GPL2")
-depends=('python2-crypto' 'python2-youtube-dl')
-optdepends=('php-mcrypt: old PHP backend'
- 'rtmpdump: old rtmpdump backend')
-install=yle-dl.install
-_adobehdsversion=2016.05.28
-source=("yle-dl"
- "yle-dl-${pkgver}.tar.gz::https://github.com/aajanki/yle-dl/tarball/${pkgver}"
- "AdobeHDS-${_adobehdsversion}.php::https://raw.githubusercontent.com/K-S-V/Scripts/3a9b748f957a921c5f846b3ebc7c99bb8255d2e0/AdobeHDS.php")
-md5sums=('1138f597102f6fb4bc43f7dc9a003a3c'
- '90afd517302c2ee6feeee497de2de46b'
- '81751f2c5184f33a539b5e0bdfdf7adc')
-
-prepare() {
- cd "${srcdir}/aajanki-${pkgname}-${_gitid}"
-
- sed 's|/usr/local|/usr|' -i yle-dl
- sed "s|'php'|'php', '-d extension=bcmath.so', '-d extension=curl.so', '-d extension=mcrypt.so'|" -i yle-dl
-}
+license=('GPL3')
+depends=('ffmpeg' 'python-crypto' 'python-future' 'python-lxml'
+ 'python-pyamf' 'python-requests' 'youtube-dl' 'wget')
+optdepends=('php-mcrypt: for AdobeHDS.php based downloader backend'
+ 'rtmpdump: for downloading Areena audio streams')
+makedepends=('python-setuptools')
+provides=(${pkgname}=$pkgver)
+conflicts=(${pkgname})
+source=("$pkgname-$pkgver.tar.gz::https://github.com/aajanki/yle-dl/archive/${pkgver}.tar.gz")
+md5sums=('f632381c47aa09d8601912286e10d406')
package() {
- cd "${srcdir}/aajanki-${pkgname}-${_gitid}"
-
- make prefix=/usr DESTDIR="${pkgdir}" install
-
- install -D -m644 "${srcdir}/AdobeHDS-${_adobehdsversion}.php" "${pkgdir}/usr/share/yle-dl/AdobeHDS.php"
- install -D -m644 "${srcdir}/aajanki-${pkgname}-${_gitid}/yle-dl" "${pkgdir}/usr/share/yle-dl/yle-dl.py"
- install -D -m755 "${srcdir}/yle-dl" "${pkgdir}/usr/bin/yle-dl"
+ cd "$pkgname-$pkgver"
+ python setup.py install --root="$pkgdir/" --optimize=1
}
+
diff --git a/yle-dl b/yle-dl
deleted file mode 100755
index 1a1fdce745a..00000000000
--- a/yle-dl
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ -z "$YLE_DL_BACKEND" ]; then
- YLE_DL_BACKEND="youtubedl"
-fi
-
-python2 /usr/share/yle-dl/yle-dl.py --backend $YLE_DL_BACKEND $@
diff --git a/yle-dl.install b/yle-dl.install
deleted file mode 100644
index e25fb68216b..00000000000
--- a/yle-dl.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
- echo "Youtube-dl is now used as the default backend."
- echo "To change back to the PHP one you need to define"
- echo 'environment variable `YLE_DL_BACKEND=adobehdsphp`.'
-}
-
-post_upgrade() {
- post_install
-}