File sox-12.18.1-external_gsm.patch of Package sox

Overview Repositories Revisions Requests Users Attributes Meta

File sox-12.18.1-external_gsm.patch of Package sox (Revision e225df75e4c3a7712bf2484d489abd26)

Currently displaying revision e225df75e4c3a7712bf2484d489abd26 , Show latest

--- configure.in
+++ configure.in
@@ -24,9 +24,13 @@
 	enable_fast_alaw=$enableval, enable_fast_alaw=yes)
 
 AC_ARG_ENABLE(gsm,
-	[  --disable-gsm           Disable internal GSM support],
+	[  --disable-gsm           Disable GSM support],
 	enable_gsm=$enableval, enable_gsm=yes)
 
+AC_ARG_ENABLE(gsm,
+	[  --disable-external-gsm  Disable external GSM support via libgsm],
+	enable_external_gsm=$enableval, enable_external_gsm=yes)
+
 AC_ARG_ENABLE(alsa_dsp,
 	[  --disable-alsa-dsp      Disable detection of ALSA],
 	[enable_alsa_dsp=$enableval],
@@ -226,9 +230,29 @@
 
 if test "$enable_gsm" = yes
 then
+	if test "$enable_external_gsm" = yes
+	then
+	    AC_CHECK_HEADERS(gsm/gsm.h, found_libgsm=yes)
+
+	    if test "$found_libgsm" = yes
+	    then
+    		AC_CHECK_LIB(gsm, gsm_create,
+    		    LIBS="$LIBS -lgsm"
+                    GSM_SUPPORT=ext
+                    AC_DEFINE([EXTERNAL_GSM], 1, 
+		                [Define if you have libgsm library installed])
+		    )
+	    fi
+	fi
+
+	if test "$GSM_SUPPORT" = 0
+	then
+	    dnl use internal libgsm
+	    GSM_SUPPORT=1
+	fi
+
         AC_DEFINE([ENABLE_GSM], 1, 
                   [Define if you want to use internal GSM library])
-	GSM_SUPPORT=1
 fi
 
 AC_SUBST(NEED_OSS)
@@ -241,7 +265,7 @@
 
 AC_CONFIG_HEADER(src/stconfig.h)
 
-AC_CONFIG_FILES([Makefile src/libst-config src/Makefile src/gsm/Makefile])
+AC_CONFIG_FILES([Makefile src/libst-config src/Makefile src/gsm_internal/Makefile])
 AC_CONFIG_FILES([src/play], [chmod +x src/play])
 
 AC_OUTPUT()
--- src/Makefile.in
+++ src/Makefile.in
@@ -26,7 +26,7 @@
 LN_S    = @LN_S@
 
 # Build macros.
-CFLAGS	= @CFLAGS@ -I$(srcdir) -I$(builddir)
+CFLAGS	= @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS	= -L. @LDFLAGS@
 LIBS	= -lst @LIBS@
@@ -57,10 +57,11 @@
 
 
 GSMOBJ_0 =
-GSMOBJ_1 =  gsm/add.o gsm/code.o gsm/decode.o gsm/long_term.o gsm/lpc.o \
-	    gsm/preprocess.o gsm/rpe.o gsm/gsm_destroy.o \
-	    gsm/gsm_decode.o gsm/gsm_encode.o gsm/gsm_create.o \
-	    gsm/gsm_option.o gsm/short_term.o gsm/table.o
+GSMOBJ_1 =  gsm_internal/add.o gsm_internal/code.o gsm_internal/decode.o gsm_internal/long_term.o gsm_internal/lpc.o \
+	    gsm_internal/preprocess.o gsm_internal/rpe.o gsm_internal/gsm_destroy.o \
+	    gsm_internal/gsm_decode.o gsm_internal/gsm_encode.o gsm_internal/gsm_create.o \
+	    gsm_internal/gsm_option.o gsm_internal/short_term.o gsm_internal/table.o
+GSMOBJ_ext =
 
 OSSOBJ_0    =
 OSSOBJ_1    = oss.o
@@ -79,7 +80,8 @@
 # target is just an easy way to make sure that makefile builds
 # the objects instead of this makefile.
 GSM_0     =
-GSM_1     = gsm/libgsm.a
+GSM_1     = gsm_internal/libgsm.a
+GSM_ext   =
 PLAY_0    =
 PLAY_1    = play
 
@@ -98,8 +100,8 @@
 	$(AR) libst.a $(LIBOBJS) 
 	$(RANLIB) libst.a
 
-gsm/libgsm.a:
-	cd gsm && $(MAKE)
+gsm_internal/libgsm.a:
+	cd gsm_internal && $(MAKE)
 
 PLAY_INSTALL_0    =
 PLAY_INSTALL_1    = install-play
@@ -142,11 +144,11 @@
 
 clean:
 	$(RM) *.o libst.a
-	cd gsm && $(RM) *.o libgsm.a
+	cd gsm_internal && $(RM) *.o libgsm.a
 
 distclean:
 	$(RM) *~ *.o *.raw *.sf core sox soxmix libst.a play libst-config
-	cd gsm && $(RM) *~ *.o core libgsm.a Makefile
+	cd gsm_internal && $(RM) *~ *.o core libgsm.a Makefile
 	$(RM) stconfig.h ststdint.h Makefile
 
 # Not all platforms use CPPFLAGS concept by default so define custom
--- src/gsm.c
+++ src/gsm.c
@@ -30,7 +30,12 @@
 
 #if defined(ENABLE_GSM)
 
-#include "gsm/gsm.h"
+#if defined(EXTERNAL_GSM)
+#include <gsm/gsm.h>
+#else
+#include "gsm_internal/gsm.h"
+#endif
+
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
--- src/wav.c
+++ src/wav.c
@@ -72,7 +72,11 @@
 #include "ima_rw.h"
 #include "adpcm.h"
 #ifdef ENABLE_GSM
-#include "gsm/gsm.h"
+#if defined(EXTERNAL_GSM)
+#include <gsm/gsm.h>
+#else
+#include "gsm_internal/gsm.h"
+#endif
 #endif
 
 #undef PAD_NSAMPS

Places

File sox-12.18.1-external_gsm.patch of Package sox (Revision e225df75e4c3a7712bf2484d489abd26)

Places