svn commit: r330543 - in head/audio/play: . files

[Guido Falsi]

Author: madpilot
Date: Wed Oct 16 21:18:48 2013
New Revision: 330543
URL: http://svnweb.freebsd.org/changeset/ports/330543

Log:
  - Convert to staging
  - Rename patch files according to standard

Added:
     - copied unchanged from r330461, head/audio/play/files/patch-ac
     - copied unchanged from r330461, head/audio/play/files/patch-aa
Directory Properties:
  head/audio/play/files/patch-encode_riff.c   (props changed)
  head/audio/play/files/patch-play.c   (props changed)
Deleted:
  head/audio/play/files/patch-aa
  head/audio/play/files/patch-ac
Modified:
  head/audio/play/Makefile   (contents, props changed)

Modified: head/audio/play/Makefile
==============================================================================
--- head/audio/play/Makefile	Wed Oct 16 21:17:44 2013	(r330542)
+++ head/audio/play/Makefile	Wed Oct 16 21:18:48 2013	(r330543)
@@ -12,13 +12,9 @@ COMMENT=	Simple audio file player
 
 CONFLICTS=	sox-[0-9]*
 
-MAKE_ARGS=	CFLAGS="${CFLAGS}" DESTDIR="${PREFIX}" MANDIR="/man/ja/man"
+MAKE_ARGS=	CFLAGS="${CFLAGS}" MANDIR="${PREFIX}/man/ja/man" BINDIR="${PREFIX}/bin"
 
-MANLANG=	ja
-NO_STAGE=	yes
-MAN1=		play.1
-MANCOMPRESSED=	yes
-PLIST_FILES=	bin/play
+PLIST_FILES=	bin/play man/ja/man1/play.1.gz
 
 post-patch:
 .for file in play_audio.c mixer_ctl.c encode_sun.c encode_riff.c speed.c

Copied: head/audio/play/files/patch-encode_riff.c (from r330461, head/audio/play/files/patch-ac)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/play/files/patch-encode_riff.c	Wed Oct 16 21:18:48 2013	(r330543, copy of r330461, head/audio/play/files/patch-ac)
@@ -0,0 +1,54 @@
+--- encode_riff.c.orig	Tue Mar 25 16:25:07 1997
++++ encode_riff.c	Thu Aug 19 14:37:52 2004
+@@ -11,7 +11,7 @@
+ #include <signal.h>
+ #include <err.h>
+ 
+-#include <machine/soundcard.h>
++#include <sys/soundcard.h>
+ 
+ #include "play.h"
+ #include "encode_riff.h"
+@@ -74,7 +74,7 @@
+     char *bufp;
+     char *device;
+     int devfd, filefd;
+-    int stat, len, buf_size, format, data_length;
++    int stat, len, buf_size, format = 0, data_length;
+ 
+     if (!f_hasdsp) {
+ 	fprintf(stderr, "%s: %s: needs DSP for play\n", myname, audio_file);
+@@ -109,7 +109,12 @@
+ 	warn("%s", device);
+ 	stat = FAIL; goto failplay0;
+     }
++#if 0
++    /* this (at least under fbsd) means that you want to set play format
++     * to headerp->sample_size which is a nonsense */
+     if (ioctl(devfd, SNDCTL_DSP_SAMPLESIZE, &headerp->sample_size) < 0) {
++#endif
++    if (ioctl(devfd, SNDCTL_DSP_SAMPLESIZE, &format) < 0) {
+ 	warn("%s", device);
+ 	stat = FAIL; goto failplay0;
+     }
+@@ -121,11 +126,6 @@
+ 	warn("%s", device);
+ 	stat = FAIL; goto failplay0;
+     }
+-    /* XXX */
+-    if (ioctl(devfd, SNDCTL_DSP_SETFMT, &format) < 0) {
+-	warn("%s", device);
+-	stat = FAIL; goto failplay0;
+-    }
+     if (headerp->channels > 1) {
+ 	int ch = headerp->channels;
+ 	if (ioctl(devfd, SNDCTL_DSP_STEREO, &ch) < 0) {
+@@ -163,6 +163,8 @@
+ 	    warn("read");
+ 	    stat = FAIL; goto failplay2;
+ 	}
++/*	printf("len = %10d, len = %10d\n", stat, len); */
++	stat = (len < stat)? len : stat;
+ 	if (write(devfd, bufp, stat) < 0) {
+ 	    warn("write");
+ 	    stat = FAIL; goto failplay2;

Copied: head/audio/play/files/patch-play.c (from r330461, head/audio/play/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/play/files/patch-play.c	Wed Oct 16 21:18:48 2013	(r330543, copy of r330461, head/audio/play/files/patch-aa)
@@ -0,0 +1,12 @@
+*** play.c.orig	Wed May 20 11:42:42 1998
+--- play.c	Wed May 20 13:21:15 1998
+***************
+*** 4,9 ****
+--- 4,10 ----
+  
+  #include <stdio.h>
+  #include <stdlib.h>
++ #include <unistd.h>
+  #include <fcntl.h>
+  #include <err.h>
+  #include <signal.h>