Browse Source

Merge pull request #6043 from diizzyy/alsautils-libsamplerate

alsa-utils: Don't pull in libsamplerate
lilik-openwrt-22.03
Ted Hess 7 years ago
committed by GitHub
parent
commit
a267fb2ff9
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 1 deletions
  1. +1
    -1
      sound/alsa-utils/Makefile
  2. +45
    -0
      sound/alsa-utils/patches/101-disable-libsamplerate.patch

+ 1
- 1
sound/alsa-utils/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=alsa-utils PKG_NAME:=alsa-utils
PKG_VERSION:=1.1.6 PKG_VERSION:=1.1.6
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/utils/ \ PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/utils/ \


+ 45
- 0
sound/alsa-utils/patches/101-disable-libsamplerate.patch View File

@ -0,0 +1,45 @@
diff --git a/alsaloop/Makefile.am b/alsaloop/Makefile.am
index 4cdf20b..0715b02 100644
--- a/alsaloop/Makefile.am
+++ b/alsaloop/Makefile.am
@@ -1,9 +1,9 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
LDADD = -lm
AM_CFLAGS = -D_GNU_SOURCE
-if HAVE_SAMPLERATE
-LDADD += -lsamplerate
-endif
+# if HAVE_SAMPLERATE
+# LDADD += -lsamplerate
+# endif
# LDFLAGS = -static
# CFLAGS += -g -Wall
diff --git a/alsaloop/Makefile.in b/alsaloop/Makefile.in
index 374cbcc..25dbae3 100644
--- a/alsaloop/Makefile.in
+++ b/alsaloop/Makefile.in
@@ -51,7 +51,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-@HAVE_SAMPLERATE_TRUE@am__append_1 = -lsamplerate
+# @HAVE_SAMPLERATE_TRUE@am__append_1 = -lsamplerate
bin_PROGRAMS = alsaloop$(EXEEXT)
subdir = alsaloop
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
diff --git a/configure.ac b/configure.ac
index 3e8f1e8..487e5de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,8 +38,8 @@ AC_CHECK_HEADERS([alsa/use-case.h], [have_ucm="yes"], [have_ucm="no"],
[#include <alsa/asoundlib.h>])
AC_CHECK_HEADERS([alsa/topology.h], [have_topology="yes"], [have_topology="no"],
[#include <alsa/asoundlib.h>])
-AC_CHECK_HEADERS([samplerate.h], [have_samplerate="yes"], [have_samplerate="no"],
- [#include <samplerate.h>])
+dnl AC_CHECK_HEADERS([samplerate.h], [have_samplerate="no"], [have_samplerate="no"],
+dnl [#include <samplerate.h>])
AC_CHECK_LIB([asound], [snd_seq_client_info_get_card], [HAVE_SEQ_CLIENT_INFO_GET_CARD="yes"])
if test "$HAVE_SEQ_CLIENT_INFO_GET_CARD" = "yes" ; then

Loading…
Cancel
Save