shithub: sox

Download patch

ref: 012ae34cae3f152370a7c58602d8cbb841cd8aad
parent: dc539f6b987c104113eeb2902b294bb0f7a78a55
author: rrt <rrt>
date: Tue Apr 10 12:38:29 EDT 2007

Remove sox-config, which is more of a hindrance than a help. Closes
#1666609. If we must have something similar, let's use pkg-config.

Add my recent changes to the ChangeLog.

--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,7 @@
 
   o Show (with -S) if clipping is occurring.  (robs)
   o Added internet input file support (needs wget).  (robs)
+  o Made it possible to build without sound drivers.  (Reuben Thomas)
 
   Bug fixes:
 
@@ -35,14 +36,14 @@
   o Fix crash with pan effect.  (robs)
   o Add missing RM define to Makefiles so installs work.
    (Bug# 1666599) (cbagwell)
+  o Fix I/O performance regression in 13.0.0.  (Reuben Thomas)
 
   Internal improvements:
 
   o Renamed libst to libsox for name recongition and to avoid
-    duplications with other existing libst libraries. (Rueben)
-  o Renamed libst-config to more standard sox-config. (cbagwell)
-  o Removed library information from sox-config --cflags. (cbagwell)
+    duplications with other existing libst libraries. (Reuben Thomas)
   o Got rid of several hundred compiler warnings.  (robs)
+  o Added basic performance testing of I/O.  (Reuben Thomas)
 
 sox-13.0.0
 ----------
--- a/configure.ac
+++ b/configure.ac
@@ -204,8 +204,7 @@
 
 dnl Generate output files.
 AX_CREATE_STDINT_H(src/soxstdint.h)
-AC_CONFIG_FILES(Makefile src/Makefile src/libgsm/Makefile
-		amr-wb/Makefile src/sox-config)
+AC_CONFIG_FILES(Makefile src/Makefile src/libgsm/Makefile amr-wb/Makefile)
 AC_OUTPUT
 
 if test "$found_libgsm" = "yes"; then
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,6 @@
 LIBTOOL = @LIBTOOL@ @LIBTOOLFLAGS@
 
 bin_PROGRAMS = sox
-bin_SCRIPTS = sox-config
 lib_LTLIBRARIES = libsox.la
 include_HEADERS = sox.h soxstdint.h
 
--- a/src/sox-config.in
+++ /dev/null
@@ -1,34 +1,0 @@
-#! /bin/sh
-#
-# src/sox-config.  Generated from sox-config.in by configure.
-#
-
-# FIXME: libsox version (from sox.h) should be here.
-#version=x.x.x
-prefix="/usr/local"
-exec_prefix="${prefix}"
-includedir="${prefix}/include"
-libdir="${exec_prefix}/lib"
-libs='-lmp3lame -lmad -lFLAC -lvorbisenc -lvorbisfile -logg -lasound -lm '
-
-case "$1" in
---prefix)
-        echo $prefix;;
---exec-prefix)
-        echo $exec_prefix;;
---includedir)
-        echo $includedir;;
---libdir)
-        echo $libdir;;
---libs)
-        echo $libs;;
---cflags)
-        echo "-I'$includedir'";;
-#--version)
-#        echo "$version";;
-*)
-        echo "Usage: $0 [--prefix|--exec-prefix|--includedir|--libdir|--libs|--cflags]"
-        exit 1;;
-esac
-
-exit 0