upgrade to sox 12.15
This commit is contained in:
brad
parent
eee0a6bf6c
commit
18ec82a14d
@ -1,15 +1,13 @@
|
||||
# $OpenBSD: Makefile,v 1.2 1998/10/07 00:17:39 marc Exp $
|
||||
#
|
||||
# $OpenBSD: Makefile,v 1.3 1999/03/22 01:27:06 brad Exp $
|
||||
|
||||
DISTNAME= soxgamma
|
||||
PKGNAME= sox-12.12
|
||||
DISTNAME= sox-12.15
|
||||
CATEGORIES= audio
|
||||
|
||||
MAINTAINER= angelos@openbsd.org
|
||||
|
||||
MASTER_SITES= http://www.spies.com/Sox/Archive/
|
||||
MASTER_SITES= http://metalab.unc.edu/pub/Linux/apps/sound/convert/ \
|
||||
http://home.sprynet.com/~cbagwell/
|
||||
|
||||
NO_WRKSUBDIR= yes
|
||||
MAKEFILE= Makefile.unx
|
||||
MAN1= sox.1
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (soxgamma.tar.gz) = ed5586a59ee9fed5e7cea90e46a6c51b
|
||||
RMD160 (soxgamma.tar.gz) = f3e05a85ffab07c5f6163d8df6acb50ba70ef135
|
||||
SHA1 (soxgamma.tar.gz) = 28016f00b814462e82fd13be7734d051c0355567
|
||||
MD5 (sox-12.15.tar.gz) = da913f0eedd73c8eccdb8a2d85649ccd
|
||||
RMD160 (sox-12.15.tar.gz) = e29b30a837425319e09af7a76876afc93e47a31b
|
||||
SHA1 (sox-12.15.tar.gz) = aa2dbc7ea7127058c884b338c745e4e56d4b93d9
|
||||
|
||||
@ -1,28 +1,10 @@
|
||||
*** sbdsp.c.orig Wed Aug 17 17:11:01 1994
|
||||
--- sbdsp.c Sat May 16 21:03:19 1998
|
||||
***************
|
||||
*** 17,27 ****
|
||||
*/
|
||||
--- sbdsp.c.orig Sun Mar 21 19:32:05 1999
|
||||
+++ sbdsp.c Sun Mar 21 19:32:48 1999
|
||||
@@ -17,6 +17,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
#ifdef SBLAST
|
||||
#include <i386/isa/sblast.h>
|
||||
#else
|
||||
#ifdef LINUXSOUND
|
||||
! #include <linux/soundcard.h>
|
||||
#else
|
||||
#include <sys/sb.h>
|
||||
#endif
|
||||
--- 17,28 ----
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
+ #include <sys/ioctl.h>
|
||||
#ifdef SBLAST
|
||||
#include <i386/isa/sblast.h>
|
||||
#else
|
||||
#ifdef LINUXSOUND
|
||||
! #include <soundcard.h>
|
||||
#else
|
||||
#include <sys/sb.h>
|
||||
#endif
|
||||
#include <sys/types.h>
|
||||
+#include <sys/ioctl.h>
|
||||
#ifdef SBLAST
|
||||
#include <i386/isa/sblast.h>
|
||||
#else
|
||||
|
||||
@ -1,32 +1,29 @@
|
||||
*** Makefile.unx.orig Fri Oct 7 20:14:48 1994
|
||||
--- Makefile.unx Sat May 16 21:02:55 1998
|
||||
***************
|
||||
*** 153,162 ****
|
||||
# RM = del /q
|
||||
--- Makefile.unx.orig Wed Sep 30 23:06:13 1998
|
||||
+++ Makefile.unx Sun Mar 21 20:17:35 1999
|
||||
@@ -95,7 +95,7 @@
|
||||
# Chose the best compiler you got from the following:
|
||||
#
|
||||
# GCC with all warnings and debug info
|
||||
-CC = gcc -g -Wall
|
||||
+CC = cc
|
||||
#
|
||||
# GCC with no special options
|
||||
# CC = gcc
|
||||
@@ -124,7 +124,7 @@
|
||||
# If your system has the more advanced version of getopt() that
|
||||
# also has its own getopt.h file (Such as the case with GNU libc 2.0)
|
||||
# then uncomment the following line:
|
||||
-GETOPT_DEFINES = -DHAS_GETOPT_H
|
||||
+# GETOPT_DEFINES = -DHAS_GETOPT_H
|
||||
|
||||
# Uncomment the following if your system does not have a built in
|
||||
# strerror(). This includes SunOS.
|
||||
@@ -217,7 +217,7 @@
|
||||
##############################################################################
|
||||
|
||||
all: sox
|
||||
|
||||
sox: sox.o $(SOUNDLIB)
|
||||
! $(CC) $(CFLAGS) -o sox sox.o $(SOUNDLIB) -lm
|
||||
|
||||
$(SOUNDLIB): $(LIBOBJS)
|
||||
$(RM) $(SOUNDLIB)
|
||||
--- 153,169 ----
|
||||
# RM = del /q
|
||||
|
||||
|
||||
+
|
||||
+ # FreeBSD 1.x / 2.x / 3.x
|
||||
+ CFLAGS = -O -DLINUXSOUND -D_HAVE_PARAM_H
|
||||
+ CC = cc
|
||||
+ AR = ar r
|
||||
+ RANLIB = ranlib
|
||||
+
|
||||
all: sox
|
||||
|
||||
sox: sox.o $(SOUNDLIB)
|
||||
! $(CC) $(CFLAGS) -o sox sox.o $(SOUNDLIB) -lm -lossaudio
|
||||
|
||||
$(SOUNDLIB): $(LIBOBJS)
|
||||
$(RM) $(SOUNDLIB)
|
||||
SOX_PRE_LIBS = $(GSM_PRE_LIBS)
|
||||
-SOX_POST_LIBS = $(GSM_POST_LIBS) -lm
|
||||
+SOX_POST_LIBS = $(GSM_POST_LIBS) -lm -lossaudio
|
||||
SOX_INCLUDES = $(GSM_INCLUDES)
|
||||
SOX_DEFINES = $(GSM_DEFINES) $(OSS_DEFINES) $(SUNAUDIO_DEFINES) \
|
||||
$(BLASTER) $(GETOPT_DEFINES) $(STRERR_DEFINES) $(MEMMOVE_DEFINES) \
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
--- au.c.orig Wed Aug 3 22:13:29 1994
|
||||
+++ au.c Thu Apr 24 13:37:59 1997
|
||||
@@ -299,6 +299,8 @@
|
||||
--- au.c.orig Sun Mar 21 19:40:43 1999
|
||||
+++ au.c Sun Mar 21 19:41:56 1999
|
||||
@@ -302,6 +302,8 @@
|
||||
wblong(ft, magic);
|
||||
|
||||
/* hdr_size = SUN_HDRSIZE; /* + strlen(ft->comment); */
|
||||
/* hdr_size = SUN_HDRSIZE; + strlen(ft->comment); */
|
||||
+ if (ft->comment == NULL)
|
||||
+ ft->comment = "";
|
||||
hdr_size = SUN_HDRSIZE + strlen(ft->comment);
|
||||
|
||||
16
audio/sox/patches/patch-ad
Normal file
16
audio/sox/patches/patch-ad
Normal file
@ -0,0 +1,16 @@
|
||||
--- oss.c.orig Sun Mar 21 20:11:24 1999
|
||||
+++ oss.c Sun Mar 21 20:11:37 1999
|
||||
@@ -20,12 +20,11 @@
|
||||
* SBLAST patches by John T. Kohl.
|
||||
*/
|
||||
|
||||
-#include <malloc.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
-#include <sys/soundcard.h>
|
||||
+#include <soundcard.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <signal.h>
|
||||
#include "st.h"
|
||||
Loading…
Reference in New Issue
Block a user