ossplay: remove patches, fixed in netbsd-current

3 files changed, 1 insertions, 122 deletions

diff --git a/audio/ossplay/distinfo b/audio/ossplay/distinfo
index 478b8f48e3c..a0c7495c886 100644
--- a/audio/ossplay/distinfo
+++ b/audio/ossplay/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.1 2021/05/09 09:06:58 nia Exp $
+$NetBSD: distinfo,v 1.2 2021/05/13 09:21:54 nia Exp $
 
 SHA1 (oss-v4.2-build2019-src-bsd.tar.bz2) = f6e03cbb5b5010aa48dd6d963b7e68c991c7d7dc
 RMD160 (oss-v4.2-build2019-src-bsd.tar.bz2) = be04756160843acdaacbb610d5e8ebd9f7acf572
 SHA512 (oss-v4.2-build2019-src-bsd.tar.bz2) = 9d43fa3e3abe4cf006cabfedf2c9fc51372f8cbe499c2e4bee6ba489291c31eb93b66b312054bcf92fc26df329bc3c7ef14a633fece8af38256bc7198d0c1556
 Size (oss-v4.2-build2019-src-bsd.tar.bz2) = 1723557 bytes
-SHA1 (patch-cmd_ossplay_ossplay.c) = 021c3e80e2fa75b5761e15914011b57be86b538e
-SHA1 (patch-cmd_ossplay_ossplay.h) = f955e7468c1f1fc7eacb2fe13b2e0c8f38e362d4
diff --git a/audio/ossplay/patches/patch-cmd_ossplay_ossplay.c b/audio/ossplay/patches/patch-cmd_ossplay_ossplay.c
deleted file mode 100644
index 73d6c758faa..00000000000
--- a/audio/ossplay/patches/patch-cmd_ossplay_ossplay.c
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-cmd_ossplay_ossplay.c,v 1.1 2021/05/09 09:06:59 nia Exp $
-
-Missing features in libossaudio...
-
---- cmd/ossplay/ossplay.c.orig	2021-05-09 08:59:30.843013379 +0000
-+++ cmd/ossplay/ossplay.c
-@@ -448,6 +448,7 @@ select_playtgt (dspdev_t * dsp)
-   int i, src;
-   oss_mixer_enuminfo ei;
- 
-+#ifdef SNDCTL_DSP_GET_PLAYTGT_NAMES
-   if (ioctl (dsp->fd, SNDCTL_DSP_GET_PLAYTGT_NAMES, &ei) == -1)
-     {
-       perror_msg ("SNDCTL_DSP_GET_PLAYTGT_NAMES");
-@@ -491,6 +492,7 @@ select_playtgt (dspdev_t * dsp)
- 	  return;
- 	}
-     }
-+#endif
- 
-   print_msg (ERRORM,
- 	     "Unknown playback target name '%s' - use -o? to get the list\n",
-@@ -509,6 +511,7 @@ select_recsrc (dspdev_t * dsp)
-   int i, src;
-   oss_mixer_enuminfo ei;
- 
-+#ifdef SNDCTL_DSP_GET_RECSRC_NAMES
-   if (ioctl (dsp->fd, SNDCTL_DSP_GET_RECSRC_NAMES, &ei) == -1)
-     {
-       perror_msg ("SNDCTL_DSP_GET_RECSRC_NAMES");
-@@ -551,6 +554,7 @@ select_recsrc (dspdev_t * dsp)
- 	  return;
- 	}
-     }
-+#endif
- 
-   print_msg (ERRORM,
- 	     "Unknown recording source name '%s' - use -i? to get the list\n",
-@@ -1048,6 +1052,7 @@ int
- play (dspdev_t * dsp, int fd, big_t * datamark, big_t bsize, double total_time,
-       double constant, readfunc_t * readf, decoders_queue_t * dec, seekfunc_t * seekf)
- {
-+#ifdef SNDCTL_DSP_HALT_OUTPUT
- #define EXITPLAY(code) \
-   do { \
-     ossplay_free (buf); \
-@@ -1057,6 +1062,16 @@ play (dspdev_t * dsp, int fd, big_t * da
-     errno = 0; \
-     return (code); \
-   } while (0)
-+#else
-+#define EXITPLAY(code) \
-+  do { \
-+    ossplay_free (buf); \
-+    ossplay_free (verbose_meta); \
-+    clear_update (); \
-+    errno = 0; \
-+    return (code); \
-+  } while (0)
-+#endif
- 
-   big_t rsize = bsize;
-   big_t filesize = *datamark;
-@@ -1151,6 +1166,7 @@ int
- record (dspdev_t * dsp, FILE * wave_fp, const char * filename, double constant,
-         double datatime, big_t * data_size, decoders_queue_t * dec)
- {
-+#ifdef SNDCTL_DSP_HALT_INPUT
- #define EXITREC(code) \
-   do { \
-     ossplay_free (buf); \
-@@ -1161,6 +1177,17 @@ record (dspdev_t * dsp, FILE * wave_fp, 
-     ioctl (dsp->fd, SNDCTL_DSP_HALT_INPUT, NULL); \
-     return (code); \
-   } while(0)
-+#else
-+#define EXITREC(code) \
-+  do { \
-+    ossplay_free (buf); \
-+    ossplay_free (verbose_meta); \
-+    clear_update (); \
-+    if ((eflag) && (verbose)) \
-+      print_msg (VERBOSEM, "\nStopped (%d).\n", eflag-128); \
-+    return (code); \
-+  } while(0)
-+#endif
- 
-   unsigned char * buf, * obuf;
-   ssize_t l, outl;
diff --git a/audio/ossplay/patches/patch-cmd_ossplay_ossplay.h b/audio/ossplay/patches/patch-cmd_ossplay_ossplay.h
deleted file mode 100644
index bb853fea6b8..00000000000
--- a/audio/ossplay/patches/patch-cmd_ossplay_ossplay.h
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-cmd_ossplay_ossplay.h,v 1.1 2021/05/09 09:06:59 nia Exp $
-
-Missing features in libossaudio...
-
---- cmd/ossplay/ossplay.h.orig	2014-02-14 22:59:55.000000000 +0000
-+++ cmd/ossplay/ossplay.h
-@@ -105,6 +105,23 @@ enum {
-  AFMT_DOUBLE64_BE,
-  AFMT_DOUBLE64_LE
- };
-+
-+#ifndef AFMT_S24_PACKED
-+#define AFMT_S24_PACKED	(-300)
-+#endif
-+
-+#ifndef AFMT_FLOAT
-+#define AFMT_FLOAT	(-301)
-+#endif
-+
-+#ifndef AFMT_VORBIS
-+#define AFMT_VORBIS	(-302)
-+#endif
-+
-+#ifndef AFMT_SPDIF_RAW
-+#define AFMT_SPDIF_RAW	(-303)
-+#endif
-+
- #define AFMT_S24_PACKED_LE	AFMT_S24_PACKED
- 
- typedef struct {