...And to 2013.02.02, so my local patch goes away.

This commit is contained in:
dcoppa 2013-02-02 15:56:33 +00:00
parent 0c67732a61
commit 8745a11ce6
4 changed files with 12 additions and 36 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.34 2013/02/02 15:41:17 dcoppa Exp $
# $OpenBSD: Makefile,v 1.35 2013/02/02 15:56:33 dcoppa Exp $
COMMENT = command-line program to download videos from YouTube.com
MODPY_EGG_VERSION = 2013.02.01
MODPY_EGG_VERSION = 2013.02.02
DISTNAME = youtube-dl-${MODPY_EGG_VERSION}
CATEGORIES = www

View File

@ -1,2 +1,2 @@
SHA256 (youtube-dl-2013.02.01.tar.gz) = vy6DSuC6Y8gvfsiiG6jzD/nXQnJeoEqWF8XRy9uoIIw=
SIZE (youtube-dl-2013.02.01.tar.gz) = 136714
SHA256 (youtube-dl-2013.02.02.tar.gz) = wGKrVjb0Q8d21hfdmqPJBFkm8WlU/DM2YLWq5F8VaG8=
SIZE (youtube-dl-2013.02.02.tar.gz) = 137547

View File

@ -1,31 +1,7 @@
$OpenBSD: patch-setup_py,v 1.1 2013/02/02 15:41:17 dcoppa Exp $
commit a32b573ccb71de6d50cdb4dcf8e44928c70f92a6
Author: David Coppa <dcoppa@gmail.com>
Date: Wed Jan 30 15:31:38 2013 +0100
Try setuptools first, then fallback to distutils.core
--- setup.py.orig Tue Jan 22 13:39:07 2013
+++ setup.py Tue Jan 22 13:44:11 2013
@@ -2,11 +2,15 @@
# -*- coding: utf-8 -*-
from __future__ import print_function
-from distutils.core import setup
import pkg_resources
import sys
try:
+ from setuptools import setup
+except ImportError:
+ from distutils.core import setup
+
+try:
import py2exe
"""This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""
except ImportError:
@@ -36,9 +40,8 @@ if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
$OpenBSD: patch-setup_py,v 1.2 2013/02/02 15:56:33 dcoppa Exp $
--- setup.py.orig Fri Feb 1 18:05:42 2013
+++ setup.py Sat Feb 2 16:48:52 2013
@@ -40,9 +40,8 @@ if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
else:
params = {
'scripts': ['bin/youtube-dl'],

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-youtube_dl_FileDownloader_py,v 1.5 2013/02/02 15:41:17 dcoppa Exp $
--- youtube_dl/FileDownloader.py.orig Tue Jan 22 13:37:23 2013
+++ youtube_dl/FileDownloader.py Tue Jan 22 13:37:44 2013
@@ -567,7 +567,7 @@ class FileDownloader(object):
$OpenBSD: patch-youtube_dl_FileDownloader_py,v 1.6 2013/02/02 15:56:33 dcoppa Exp $
--- youtube_dl/FileDownloader.py.orig Fri Feb 1 18:09:34 2013
+++ youtube_dl/FileDownloader.py Sat Feb 2 16:46:20 2013
@@ -569,7 +569,7 @@ class FileDownloader(object):
# Download using rtmpdump. rtmpdump returns exit code 2 when
# the connection was interrumpted and resuming appears to be
# possible. This is part of rtmpdump's normal usage, AFAIK.