network/youtube-dl: Updated for version 2015.02.28.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Dimitris Zlatanidis 2015-03-02 00:23:49 +07:00 committed by Willy Sudiarto Raharjo
parent e18f3c62b1
commit 24286119a0
4 changed files with 92 additions and 95 deletions

View file

@ -1,84 +0,0 @@
--- youtube-dl-2015.02.21/Makefile.orig 2015-02-23 12:47:34.694603534 +0200
+++ youtube-dl-2015.02.21/Makefile 2015-02-23 13:10:17.344568065 +0200
@@ -1,24 +1,25 @@
-all: youtube-dl README.md CONTRIBUTING.md README.txt youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish supportedsites
+all: youtube-dl README.md CONTRIBUTING.md youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish supportedsites
clean:
- rm -rf youtube-dl.1.temp.md youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dl.tar.gz youtube-dl.zsh youtube-dl.fish *.dump *.part *.info.json *.mp4 *.flv *.mp3 *.avi CONTRIBUTING.md.tmp youtube-dl youtube-dl.exe
+ rm -rf youtube-dl.1.temp.md youtube-dl.1 youtube-dl.bash-completion MANIFEST build/ dist/ .coverage cover/ youtube-dl.tar.gz youtube-dl.zsh youtube-dl.fish *.dump *.part *.info.json *.mp4 *.flv *.mp3 *.avi CONTRIBUTING.md.tmp youtube-dl youtube-dl.exe
-PREFIX ?= /usr/local
+PREFIX ?=
BINDIR ?= $(PREFIX)/bin
MANDIR ?= $(PREFIX)/man
SHAREDIR ?= $(PREFIX)/share
-PYTHON ?= /usr/bin/env python
+PYTHON ?= /usr/bin/python
+SYSCONFDIR=/etc
# set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
-ifeq ($(PREFIX),/usr)
- SYSCONFDIR=/etc
-else
- ifeq ($(PREFIX),/usr/local)
- SYSCONFDIR=/etc
- else
- SYSCONFDIR=$(PREFIX)/etc
- endif
-endif
+# ifeq ($(PREFIX),/usr)
+# SYSCONFDIR=/etc
+# else
+# ifeq ($(PREFIX),/usr/local)
+# SYSCONFDIR=/etc
+# else
+# SYSCONFDIR=$(PREFIX)/etc
+# endif
+# endif
install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
install -d $(DESTDIR)$(BINDIR)
@@ -49,7 +50,7 @@
.PHONY: all clean install test tar bash-completion pypi-files zsh-completion fish-completion ot offlinetest codetest supportedsites
-pypi-files: youtube-dl.bash-completion README.txt youtube-dl.1 youtube-dl.fish
+pypi-files: youtube-dl.bash-completion youtube-dl.1 youtube-dl.fish
youtube-dl: youtube_dl/*.py youtube_dl/*/*.py
zip --quiet youtube-dl youtube_dl/*.py youtube_dl/*/*.py
@@ -69,11 +70,13 @@
python devscripts/make_supportedsites.py docs/supportedsites.md
README.txt: README.md
- pandoc -f markdown -t plain README.md -o README.txt
+ # disable pandoc
+ # pandoc -f markdown -t plain README.md -o README.txt
youtube-dl.1: README.md
python devscripts/prepare_manpage.py >youtube-dl.1.temp.md
- pandoc -s -f markdown -t man youtube-dl.1.temp.md -o youtube-dl.1
+ # disable pandoc
+ # pandoc -s -f markdown -t man youtube-dl.1.temp.md -o youtube-dl.1
rm -f youtube-dl.1.temp.md
youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in
@@ -91,7 +94,7 @@
fish-completion: youtube-dl.fish
-youtube-dl.tar.gz: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
+youtube-dl.tar.gz: youtube-dl README.md youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
@tar -czf youtube-dl.tar.gz --transform "s|^|youtube-dl/|" --owner 0 --group 0 \
--exclude '*.DS_Store' \
--exclude '*.kate-swp' \
@@ -104,7 +107,7 @@
--exclude 'docs/_build' \
-- \
bin devscripts test youtube_dl docs \
- LICENSE README.md README.txt \
+ LICENSE README.md \
Makefile MANIFEST.in youtube-dl.1 youtube-dl.bash-completion \
youtube-dl.zsh youtube-dl.fish setup.py \
youtube-dl

View file

@ -1,5 +1,83 @@
--- youtube-dl-2015.02.21/setup.orig.py 2015-02-23 13:12:26.419954401 +0200
+++ youtube-dl-2015.02.21/setup.py 2015-02-23 13:13:23.668238699 +0200
--- youtube-dl-2015.02.26.2/Makefile.orig 2015-02-28 11:04:48.582638405 +0200
+++ youtube-dl-2015.02.26.2/Makefile 2015-02-28 11:11:36.383540192 +0200
@@ -4,22 +4,23 @@
rm -rf youtube-dl.1.temp.md youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/ .coverage cover/ youtube-dl.tar.gz youtube-dl.zsh youtube-dl.fish *.dump *.part *.info.json *.mp4 *.flv *.mp3 *.avi CONTRIBUTING.md.tmp youtube-dl youtube-dl.exe
find -name "*.pyc" -delete
-PREFIX ?= /usr/local
+PREFIX ?=
BINDIR ?= $(PREFIX)/bin
MANDIR ?= $(PREFIX)/man
SHAREDIR ?= $(PREFIX)/share
-PYTHON ?= /usr/bin/env python
+PYTHON ?= /usr/bin/python
+SYSCONFDIR=/etc
# set SYSCONFDIR to /etc if PREFIX=/usr or PREFIX=/usr/local
-ifeq ($(PREFIX),/usr)
- SYSCONFDIR=/etc
-else
- ifeq ($(PREFIX),/usr/local)
- SYSCONFDIR=/etc
- else
- SYSCONFDIR=$(PREFIX)/etc
- endif
-endif
+# ifeq ($(PREFIX),/usr)
+# SYSCONFDIR=/etc
+# else
+# ifeq ($(PREFIX),/usr/local)
+# SYSCONFDIR=/etc
+# else
+# SYSCONFDIR=$(PREFIX)/etc
+# endif
+# endif
install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
install -d $(DESTDIR)$(BINDIR)
@@ -50,7 +51,7 @@
.PHONY: all clean install test tar bash-completion pypi-files zsh-completion fish-completion ot offlinetest codetest supportedsites
-pypi-files: youtube-dl.bash-completion README.txt youtube-dl.1 youtube-dl.fish
+pypi-files: youtube-dl.bash-completion youtube-dl.1 youtube-dl.fish
youtube-dl: youtube_dl/*.py youtube_dl/*/*.py
zip --quiet youtube-dl youtube_dl/*.py youtube_dl/*/*.py
@@ -70,11 +71,11 @@
python devscripts/make_supportedsites.py docs/supportedsites.md
README.txt: README.md
- pandoc -f markdown -t plain README.md -o README.txt
+ # pandoc -f markdown -t plain README.md -o README.txt
youtube-dl.1: README.md
python devscripts/prepare_manpage.py >youtube-dl.1.temp.md
- pandoc -s -f markdown -t man youtube-dl.1.temp.md -o youtube-dl.1
+ # pandoc -s -f markdown -t man youtube-dl.1.temp.md -o youtube-dl.1
rm -f youtube-dl.1.temp.md
youtube-dl.bash-completion: youtube_dl/*.py youtube_dl/*/*.py devscripts/bash-completion.in
@@ -92,7 +93,7 @@
fish-completion: youtube-dl.fish
-youtube-dl.tar.gz: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
+youtube-dl.tar.gz: youtube-dl README.md youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtube-dl.fish
@tar -czf youtube-dl.tar.gz --transform "s|^|youtube-dl/|" --owner 0 --group 0 \
--exclude '*.DS_Store' \
--exclude '*.kate-swp' \
@@ -105,7 +106,7 @@
--exclude 'docs/_build' \
-- \
bin devscripts test youtube_dl docs \
- LICENSE README.md README.txt \
+ LICENSE README.md \
Makefile MANIFEST.in youtube-dl.1 youtube-dl.bash-completion \
youtube-dl.zsh youtube-dl.fish setup.py \
youtube-dl
--- youtube-dl-2015.02.26.2/setup.orig.py 2015-02-28 11:05:15.387303300 +0200
+++ youtube-dl-2015.02.26.2/setup.py 2015-02-28 11:13:17.893271146 +0200
@@ -46,10 +46,10 @@
params = py2exe_params
else:
@ -10,8 +88,8 @@
- ('share/man/man1', ['youtube-dl.1'])
+ ('/etc/bash_completion.d', ['youtube-dl.bash-completion']),
+ ('/etc/fish/completions', ['youtube-dl.fish']),
+ ('/usr/doc/youtube_dl', ['README.txt']),
+ ('/usr/man/man1', ['youtube-dl.1'])
+ ('/share/doc/youtube_dl', ['README.txt']),
+ ('/share/man/man1', ['youtube-dl.1'])
]
root = os.path.dirname(os.path.abspath(__file__))
data_files = []

View file

@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=youtube-dl
VERSION=${VERSION:-2015.02.21}
VERSION=${VERSION:-2015.02.28}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@ -71,20 +71,23 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Makefile patch
patch -p1 < $CWD/Makefile.patch
# setup.py patch
patch -p1 < $CWD/setup.patch
make
python setup.py install --root=$PKG
# enable bash and fish completion file
chmod +x $PKG/etc/bash_completion.d/${PRGNAM}.bash-completion
chmod +x $PKG/etc/fish/completions/${PRGNAM}.fish
# install man page
mkdir -p $PKG/usr/man/man1
install -D -m0644 $CWD/$PRGNAM.1 $PKG/usr/man/man1/$PRGNAM.1
gzip -9 $PKG/usr/man/man1/$PRGNAM.1
rm -rf $PKG/share
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true

View file

@ -1,8 +1,8 @@
PRGNAM="youtube-dl"
VERSION="2015.02.21"
VERSION="2015.02.28"
HOMEPAGE="https://rg3.github.io/youtube-dl"
DOWNLOAD="https://github.com/rg3/youtube-dl/archive/2015.02.21.tar.gz"
MD5SUM="f502ad80b15f13b0dcd06704f9992b32"
DOWNLOAD="https://github.com/rg3/youtube-dl/archive/2015.02.28.tar.gz"
MD5SUM="a8c2b7ee4e04a7ed4797734b4314115c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""