diff options
| author | tonio <tonio> | 2005-11-10 09:04:25 +0000 |
|---|---|---|
| committer | tonio <tonio> | 2005-11-10 09:04:25 +0000 |
| commit | 88186357c2b241b4fa821242bb408850074c6f98 (patch) | |
| tree | 78e51b7e55ad37da5391d0cd0a02b8a3b85c3b99 /audio/cplay | |
| parent | 76beeb3fd23fc37dff64ea622cdfb28a250198a5 (diff) | |
| download | pkgsrc-88186357c2b241b4fa821242bb408850074c6f98.tar.gz | |
Change patch-aa to match the solution adopted upstream to share file
descriptors
Bump PKGREVISION
Diffstat (limited to 'audio/cplay')
| -rw-r--r-- | audio/cplay/Makefile | 3 | ||||
| -rw-r--r-- | audio/cplay/distinfo | 4 | ||||
| -rw-r--r-- | audio/cplay/patches/patch-aa | 22 |
3 files changed, 15 insertions, 14 deletions
diff --git a/audio/cplay/Makefile b/audio/cplay/Makefile index 60cacec6531..221dc631ff8 100644 --- a/audio/cplay/Makefile +++ b/audio/cplay/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/11/08 15:56:40 tonio Exp $ +# $NetBSD: Makefile,v 1.2 2005/11/10 09:04:25 tonio Exp $ DISTNAME= cplay-1.49 +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= ${HOMEPAGE} diff --git a/audio/cplay/distinfo b/audio/cplay/distinfo index 70f59222d8c..9dee0e0ca12 100644 --- a/audio/cplay/distinfo +++ b/audio/cplay/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2005/11/08 15:56:40 tonio Exp $ +$NetBSD: distinfo,v 1.2 2005/11/10 09:04:25 tonio Exp $ SHA1 (cplay-1.49.tar.gz) = 5dc77ad0046419f6657249fa95829b3714beb1d6 RMD160 (cplay-1.49.tar.gz) = e370ca609f8a17f428cf67ef85d55ee55cd5738b Size (cplay-1.49.tar.gz) = 36400 bytes -SHA1 (patch-aa) = 80e00196730c5ef811dbd4dbde88947f868c7a70 +SHA1 (patch-aa) = e7a1f3b34a5557e637d34b778b8a8cf796c9c8a9 diff --git a/audio/cplay/patches/patch-aa b/audio/cplay/patches/patch-aa index 883ea4f2468..64cd47ef5e2 100644 --- a/audio/cplay/patches/patch-aa +++ b/audio/cplay/patches/patch-aa @@ -1,23 +1,23 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/11/08 15:56:40 tonio Exp $ +$NetBSD: patch-aa,v 1.2 2005/11/10 09:04:25 tonio Exp $ ---- cplay.orig 2003-12-05 09:20:56.000000000 +0100 +--- cplay.orig 2005-11-10 09:50:37.000000000 +0100 +++ cplay -@@ -46,6 +46,7 @@ except: pass - # ------------------------------------------ - _locale_domain = "cplay" - _locale_dir = "/usr/local/share/locale" -+pipes = os.pipe(), os.pipe(), os.pipe() +@@ -1165,13 +1165,15 @@ def get_tag(pathname): - try: - import gettext # python 2.0 -@@ -1169,9 +1170,7 @@ class Player: + # ------------------------------------------ + class Player: ++ ++ stdin_r, stdin_w = os.pipe() ++ stdout_r, stdout_w = os.pipe() ++ stderr_r, stderr_w = os.pipe() ++ + def __init__(self, commandline, files, fps=1): self.commandline = commandline self.re_files = re.compile(files, re.I) self.fps = fps - self.stdin_r, self.stdin_w = os.pipe() - self.stdout_r, self.stdout_w = os.pipe() - self.stderr_r, self.stderr_w = os.pipe() -+ (self.stdin_r, self.stdin_w), (self.stdout_r, self.stdout_w), (self.stderr_r, self.stderr_w) = pipes self.entry = None self.stopped = 0 self.paused = 0 |