On Wed, Sep 25, 2019 at 03:07:21PM +0000, Mark Pearson wrote: > > > > This is not a Debian specific bug. It should be handled by the ALSA project > > itself to provide it for all linux distributions using ALSA. > > > Hi Elimar, > > The ALSA team have done an initial import of the new alsa-ucm-conf repository > (https://github.com/alsa-project/alsa-ucm-conf/tree/import) which has the > support for the sof-skl_hda_card which I was looking for with this bug. > > How does it work for this making its way into Debian? I appreciate that it's > still all new and an exercise in progress on the ALSA side but was curious as > to how the process worked from there with regards to Debian.
I have backported patches from upstream project into current SID package. Find attached patches that apply on top of alsa-lib in salsa.debian.org. @Mark, could you please verify those patches are fine and build&test them? Regards
From 945fa07aa6c078e72402ff8f76f0828220dcb05d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Or=C3=B3n=20Mart=C3=ADnez?= <zu...@debian.org> Date: Wed, 9 Oct 2019 17:33:59 +0200 Subject: [PATCH 1/2] conf/ucm: sof-skl_hda_card: backport MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes audio on Lenovo X1 Carbon Gen 7 using the whiskeylake processor. (Closes: #940730) Signed-off-by: Héctor Orón Martínez <zu...@debian.org> --- .../patches/backport-sof-skl_hda_card.patch | 681 ++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 682 insertions(+) create mode 100644 debian/patches/backport-sof-skl_hda_card.patch diff --git a/debian/patches/backport-sof-skl_hda_card.patch b/debian/patches/backport-sof-skl_hda_card.patch new file mode 100644 index 00000000..e172b3b9 --- /dev/null +++ b/debian/patches/backport-sof-skl_hda_card.patch @@ -0,0 +1,681 @@ +Description: Add support for sof-skl_hda_card +Fixes support for Lenovo X1 Carbon Gen 7 using the whiskeylake processor +. +Author: Héctor Orón Martínez <zu...@debian.org> +Bug-Debian: https://bugs.debian.org/940730 +Origin: upstream +Forwarded: not-needed +Reviewed-By: Mark Pearson <mpear...@lenovo.com> +Last-Update: 2019-10-09 + +--- alsa-lib-1.1.8.orig/src/conf/ucm/Makefile.am ++++ alsa-lib-1.1.8/src/conf/ucm/Makefile.am +@@ -44,6 +44,7 @@ PAZ00 \ + PIPO-W2S-Defaultstring-CherryTrailCR \ + SDP4430 \ + skylake-rt286 \ ++sof-skl_hda_card \ + TECLAST-X80Pro-Defaultstring-CherryTrailCR \ + tegraalc5632 \ + VEYRON-I2S +--- /dev/null ++++ alsa-lib-1.1.8/src/conf/ucm/sof-skl_hda_card/HiFi.conf +@@ -0,0 +1,166 @@ ++# Use case Configuration for skl-hda-card ++ ++SectionVerb { ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Master Playback Switch' on" ++ cset "name='Capture Switch' on" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++} ++ ++SectionDevice."Headphone" { ++ Comment "Headphone" ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Headphone Playback Switch' on" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Headphone Playback Switch' off" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:sofsklhdacard,0" ++ PlaybackChannels "2" ++ JackName "sof-skl_hda_card Headphone" ++ JackType "gpio" ++ JackSwitch "12" ++ JackControl "Headphone Jack" ++ } ++} ++ ++SectionDevice."Speaker" { ++ Comment "Speaker" ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Speaker Playback Switch' on" ++ ] ++ ++ DisableSequence [ ++ cset "name='Speaker Playback Switch' off" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:sofsklhdacard,0" ++ JackHWMute "Headphone" ++ PlaybackChannels "2" ++ } ++} ++ ++SectionDevice."Headset" { ++ Comment "Headset Mic" ++ ++ ConflictingDevice [ ++ "DMIC Stereo" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ Value { ++ CapturePCM "hw:0,0" ++ CaptureChannels "2" ++ JackControl "Mic Jack" ++ } ++} ++ ++SectionDevice."Dmic" { ++ Comment "DMIC Stereo" ++ ++ ConflictingDevice [ ++ "Headset Mic" ++ ] ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ ] ++ ++ Value { ++ CapturePCM "hw:0,6" ++ CaptureChannels "2" ++ } ++} ++ ++SectionDevice."HDMI1" { ++ Comment "HDMI1/DP1 Output" ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='hif5-0 Jack Switch' on" ++ cset "name='Pin5-Port0 Mux' 1" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Pin5-Port0 Mux' 0" ++ cset "name='hif5-0 Jack Switch' off" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:0,3" ++ PlaybackChannels "2" ++ JackControl "HDMI/DP, pcm=11 Jack" ++ } ++} ++ ++SectionDevice."HDMI2" { ++ Comment "HDMI2/DP2 Output" ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='hif6-0 Jack Switch' on" ++ cset "name='Pin6-Port0 Mux' 2" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Pin6-Port0 Mux' 0" ++ cset "name='hif6-0 Jack Switch' off" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:0,4" ++ PlaybackChannels "2" ++ JackControl "HDMI/DP, pcm=12 Jack" ++ } ++} ++ ++SectionDevice."HDMI3" { ++ Comment "HDMI3/DP3 Output" ++ ++ EnableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='hif7-0 Jack Switch' on" ++ cset "name='Pin7-Port0 Mux' 3" ++ ] ++ ++ DisableSequence [ ++ cdev "hw:sofsklhdacard" ++ cset "name='Pin7-Port0 Mux' 0" ++ cset "name='hif7-0 Jack Switch' off" ++ ] ++ ++ Value { ++ PlaybackPCM "hw:0,5" ++ PlaybackChannels "2" ++ JackControl "HDMI/DP, pcm=13 Jack" ++ } ++} ++ +--- /dev/null ++++ alsa-lib-1.1.8/src/conf/ucm/sof-skl_hda_card/sof-skl_hda_card.conf +@@ -0,0 +1,5 @@ ++SectionUseCase."HiFi" { ++ File "HiFi.conf" ++ Comment "Play HiFi quality Music" ++} ++ +--- /dev/null ++++ alsa-lib-1.1.8/src/conf/ucm/sof-skl_hda_card/Makefile.am +@@ -0,0 +1,4 @@ ++alsaconfigdir = @ALSA_CONFIG_DIR@ ++ucmdir = $(alsaconfigdir)/ucm/sof-skl_hda_card ++ucm_DATA = sof-skl_hda_card.conf HiFi.conf ++EXTRA_DIST = $(ucm_DATA) +--- /dev/null ++++ alsa-lib-1.1.8/src/conf/ucm/sof-skl_hda_card/Makefile.in +@@ -0,0 +1,464 @@ ++# Makefile.in generated by automake 1.12.2 from Makefile.am. ++# @configure_input@ ++ ++# Copyright (C) 1994-2012 Free Software Foundation, Inc. ++ ++# This Makefile.in is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without ++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A ++# PARTICULAR PURPOSE. ++ ++@SET_MAKE@ ++ ++VPATH = @srcdir@ ++am__make_dryrun = \ ++ { \ ++ am__dry=no; \ ++ case $$MAKEFLAGS in \ ++ *\\[\ \ ]*) \ ++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ ++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ ++ *) \ ++ for am__flg in $$MAKEFLAGS; do \ ++ case $$am__flg in \ ++ *=*|--*) ;; \ ++ *n*) am__dry=yes; break;; \ ++ esac; \ ++ done;; \ ++ esac; \ ++ test $$am__dry = yes; \ ++ } ++pkgdatadir = $(datadir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ ++pkglibdir = $(libdir)/@PACKAGE@ ++pkglibexecdir = $(libexecdir)/@PACKAGE@ ++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd ++install_sh_DATA = $(install_sh) -c -m 644 ++install_sh_PROGRAM = $(install_sh) -c ++install_sh_SCRIPT = $(install_sh) -c ++INSTALL_HEADER = $(INSTALL_DATA) ++transform = $(program_transform_name) ++NORMAL_INSTALL = : ++PRE_INSTALL = : ++POST_INSTALL = : ++NORMAL_UNINSTALL = : ++PRE_UNINSTALL = : ++POST_UNINSTALL = : ++build_triplet = @build@ ++host_triplet = @host@ ++subdir = src/conf/ucm/sof-skl_hda_card ++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ ++ $(top_srcdir)/configure.ac ++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ ++ $(ACLOCAL_M4) ++mkinstalldirs = $(install_sh) -d ++CONFIG_HEADER = $(top_builddir)/include/config.h ++CONFIG_CLEAN_FILES = ++CONFIG_CLEAN_VPATH_FILES = ++AM_V_P = $(am__v_P_@AM_V@) ++am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) ++am__v_P_0 = false ++am__v_P_1 = : ++AM_V_GEN = $(am__v_GEN_@AM_V@) ++am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) ++am__v_GEN_0 = @echo " GEN " $@; ++am__v_GEN_1 = ++AM_V_at = $(am__v_at_@AM_V@) ++am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) ++am__v_at_0 = @ ++am__v_at_1 = ++SOURCES = ++DIST_SOURCES = ++am__can_run_installinfo = \ ++ case $$AM_UPDATE_INFO_DIR in \ ++ n|no|NO) false;; \ ++ *) (install-info --version) >/dev/null 2>&1;; \ ++ esac ++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; ++am__vpath_adj = case $$p in \ ++ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ ++ *) f=$$p;; \ ++ esac; ++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; ++am__install_max = 40 ++am__nobase_strip_setup = \ ++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` ++am__nobase_strip = \ ++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" ++am__nobase_list = $(am__nobase_strip_setup); \ ++ for p in $$list; do echo "$$p $$p"; done | \ ++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ ++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ ++ if (++n[$$2] == $(am__install_max)) \ ++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ ++ END { for (dir in files) print dir, files[dir] }' ++am__base_list = \ ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++am__uninstall_files_from_dir = { \ ++ test -z "$$files" \ ++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ ++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ ++ $(am__cd) "$$dir" && rm -f $$files; }; \ ++ } ++am__installdirs = "$(DESTDIR)$(ucmdir)" ++DATA = $(ucm_DATA) ++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ++ACLOCAL = @ACLOCAL@ ++ALSA_CONFIG_DIR = @ALSA_CONFIG_DIR@ ++ALSA_DEPLIBS = @ALSA_DEPLIBS@ ++ALSA_PKGCONF_DIR = @ALSA_PKGCONF_DIR@ ++ALSA_PLUGIN_DIR = @ALSA_PLUGIN_DIR@ ++AMTAR = @AMTAR@ ++AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++AR = @AR@ ++AUTOCONF = @AUTOCONF@ ++AUTOHEADER = @AUTOHEADER@ ++AUTOMAKE = @AUTOMAKE@ ++AWK = @AWK@ ++CC = @CC@ ++CCDEPMODE = @CCDEPMODE@ ++CFLAGS = @CFLAGS@ ++CPP = @CPP@ ++CPPFLAGS = @CPPFLAGS@ ++CYGPATH_W = @CYGPATH_W@ ++DEFS = @DEFS@ ++DEPDIR = @DEPDIR@ ++DLLTOOL = @DLLTOOL@ ++DSYMUTIL = @DSYMUTIL@ ++DUMPBIN = @DUMPBIN@ ++ECHO_C = @ECHO_C@ ++ECHO_N = @ECHO_N@ ++ECHO_T = @ECHO_T@ ++EGREP = @EGREP@ ++EXEEXT = @EXEEXT@ ++FGREP = @FGREP@ ++GREP = @GREP@ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_PROGRAM = @INSTALL_PROGRAM@ ++INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ ++LD = @LD@ ++LDFLAGS = @LDFLAGS@ ++LIBOBJS = @LIBOBJS@ ++LIBS = @LIBS@ ++LIBTOOL = @LIBTOOL@ ++LIBTOOL_VERSION_INFO = @LIBTOOL_VERSION_INFO@ ++LIPO = @LIPO@ ++LN_S = @LN_S@ ++LTLIBOBJS = @LTLIBOBJS@ ++MAINT = @MAINT@ ++MAKEINFO = @MAKEINFO@ ++MANIFEST_TOOL = @MANIFEST_TOOL@ ++MKDIR_P = @MKDIR_P@ ++NM = @NM@ ++NMEDIT = @NMEDIT@ ++OBJDUMP = @OBJDUMP@ ++OBJEXT = @OBJEXT@ ++OTOOL = @OTOOL@ ++OTOOL64 = @OTOOL64@ ++PACKAGE = @PACKAGE@ ++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_STRING = @PACKAGE_STRING@ ++PACKAGE_TARNAME = @PACKAGE_TARNAME@ ++PACKAGE_URL = @PACKAGE_URL@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ ++PATH_SEPARATOR = @PATH_SEPARATOR@ ++PYTHON_INCLUDES = @PYTHON_INCLUDES@ ++PYTHON_LIBS = @PYTHON_LIBS@ ++RANLIB = @RANLIB@ ++SED = @SED@ ++SET_MAKE = @SET_MAKE@ ++SHELL = @SHELL@ ++SND_LIB_EXTRAVER = @SND_LIB_EXTRAVER@ ++SND_LIB_MAJOR = @SND_LIB_MAJOR@ ++SND_LIB_MINOR = @SND_LIB_MINOR@ ++SND_LIB_SUBMINOR = @SND_LIB_SUBMINOR@ ++SND_LIB_VERSION = @SND_LIB_VERSION@ ++STRIP = @STRIP@ ++SYMBOL_PREFIX = @SYMBOL_PREFIX@ ++VERSION = @VERSION@ ++abs_builddir = @abs_builddir@ ++abs_srcdir = @abs_srcdir@ ++abs_top_builddir = @abs_top_builddir@ ++abs_top_srcdir = @abs_top_srcdir@ ++ac_ct_AR = @ac_ct_AR@ ++ac_ct_CC = @ac_ct_CC@ ++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ++am__include = @am__include@ ++am__leading_dot = @am__leading_dot@ ++am__quote = @am__quote@ ++am__tar = @am__tar@ ++am__untar = @am__untar@ ++bindir = @bindir@ ++build = @build@ ++build_alias = @build_alias@ ++build_cpu = @build_cpu@ ++build_os = @build_os@ ++build_vendor = @build_vendor@ ++builddir = @builddir@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++docdir = @docdir@ ++dvidir = @dvidir@ ++exec_prefix = @exec_prefix@ ++host = @host@ ++host_alias = @host_alias@ ++host_cpu = @host_cpu@ ++host_os = @host_os@ ++host_vendor = @host_vendor@ ++htmldir = @htmldir@ ++includedir = @includedir@ ++infodir = @infodir@ ++install_sh = @install_sh@ ++libdir = @libdir@ ++libexecdir = @libexecdir@ ++localedir = @localedir@ ++localstatedir = @localstatedir@ ++mandir = @mandir@ ++mkdir_p = @mkdir_p@ ++oldincludedir = @oldincludedir@ ++pdfdir = @pdfdir@ ++prefix = @prefix@ ++program_transform_name = @program_transform_name@ ++psdir = @psdir@ ++sbindir = @sbindir@ ++sharedstatedir = @sharedstatedir@ ++srcdir = @srcdir@ ++sysconfdir = @sysconfdir@ ++target_alias = @target_alias@ ++top_build_prefix = @top_build_prefix@ ++top_builddir = @top_builddir@ ++top_srcdir = @top_srcdir@ ++alsaconfigdir = @ALSA_CONFIG_DIR@ ++ucmdir = $(alsaconfigdir)/ucm/sof-skl_hda_card ++ucm_DATA = sof-skl_hda_card.conf HiFi.conf ++EXTRA_DIST = $(ucm_DATA) ++all: all-am ++ ++.SUFFIXES: ++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) ++ @for dep in $?; do \ ++ case '$(am__configure_deps)' in \ ++ *$$dep*) \ ++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ ++ && { if test -f $@; then exit 0; else break; fi; }; \ ++ exit 1;; \ ++ esac; \ ++ done; \ ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/conf/ucm/sof-skl_hda_card/Makefile'; \ ++ $(am__cd) $(top_srcdir) && \ ++ $(AUTOMAKE) --foreign src/conf/ucm/sof-skl_hda_card/Makefile ++.PRECIOUS: Makefile ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++ @case '$?' in \ ++ *config.status*) \ ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ ++ *) \ ++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ ++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ ++ esac; ++ ++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++ ++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) ++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ++$(am__aclocal_m4_deps): ++ ++mostlyclean-libtool: ++ -rm -f *.lo ++ ++clean-libtool: ++ -rm -rf .libs _libs ++install-ucmDATA: $(ucm_DATA) ++ @$(NORMAL_INSTALL) ++ @list='$(ucm_DATA)'; test -n "$(ucmdir)" || list=; \ ++ if test -n "$$list"; then \ ++ echo " $(MKDIR_P) '$(DESTDIR)$(ucmdir)'"; \ ++ $(MKDIR_P) "$(DESTDIR)$(ucmdir)" || exit 1; \ ++ fi; \ ++ for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$$d$$p"; \ ++ done | $(am__base_list) | \ ++ while read files; do \ ++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(ucmdir)'"; \ ++ $(INSTALL_DATA) $$files "$(DESTDIR)$(ucmdir)" || exit $$?; \ ++ done ++ ++uninstall-ucmDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(ucm_DATA)'; test -n "$(ucmdir)" || list=; \ ++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ ++ dir='$(DESTDIR)$(ucmdir)'; $(am__uninstall_files_from_dir) ++tags: TAGS ++TAGS: ++ ++ctags: CTAGS ++CTAGS: ++ ++cscope cscopelist: ++ ++ ++distdir: $(DISTFILES) ++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ ++ list='$(DISTFILES)'; \ ++ dist_files=`for file in $$list; do echo $$file; done | \ ++ sed -e "s|^$$srcdirstrip/||;t" \ ++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ ++ case $$dist_files in \ ++ */*) $(MKDIR_P) `echo "$$dist_files" | \ ++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ ++ sort -u` ;; \ ++ esac; \ ++ for file in $$dist_files; do \ ++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ ++ if test -d $$d/$$file; then \ ++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ ++ if test -d "$(distdir)/$$file"; then \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ ++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ ++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ fi; \ ++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ else \ ++ test -f "$(distdir)/$$file" \ ++ || cp -p $$d/$$file "$(distdir)/$$file" \ ++ || exit 1; \ ++ fi; \ ++ done ++check-am: all-am ++check: check-am ++all-am: Makefile $(DATA) ++installdirs: ++ for dir in "$(DESTDIR)$(ucmdir)"; do \ ++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ ++ done ++install: install-am ++install-exec: install-exec-am ++install-data: install-data-am ++uninstall: uninstall-am ++ ++install-am: all-am ++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ++ ++installcheck: installcheck-am ++install-strip: ++ if test -z '$(STRIP)'; then \ ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ install; \ ++ else \ ++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ ++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ ++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ ++ fi ++mostlyclean-generic: ++ ++clean-generic: ++ ++distclean-generic: ++ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) ++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) ++ ++maintainer-clean-generic: ++ @echo "This command is intended for maintainers to use" ++ @echo "it deletes files that may require special tools to rebuild." ++clean: clean-am ++ ++clean-am: clean-generic clean-libtool mostlyclean-am ++ ++distclean: distclean-am ++ -rm -f Makefile ++distclean-am: clean-am distclean-generic ++ ++dvi: dvi-am ++ ++dvi-am: ++ ++html: html-am ++ ++html-am: ++ ++info: info-am ++ ++info-am: ++ ++install-data-am: install-ucmDATA ++ ++install-dvi: install-dvi-am ++ ++install-dvi-am: ++ ++install-exec-am: ++ ++install-html: install-html-am ++ ++install-html-am: ++ ++install-info: install-info-am ++ ++install-info-am: ++ ++install-man: ++ ++install-pdf: install-pdf-am ++ ++install-pdf-am: ++ ++install-ps: install-ps-am ++ ++install-ps-am: ++ ++installcheck-am: ++ ++maintainer-clean: maintainer-clean-am ++ -rm -f Makefile ++maintainer-clean-am: distclean-am maintainer-clean-generic ++ ++mostlyclean: mostlyclean-am ++ ++mostlyclean-am: mostlyclean-generic mostlyclean-libtool ++ ++pdf: pdf-am ++ ++pdf-am: ++ ++ps: ps-am ++ ++ps-am: ++ ++uninstall-am: uninstall-ucmDATA ++ ++.MAKE: install-am install-strip ++ ++.PHONY: all all-am check check-am clean clean-generic clean-libtool \ ++ distclean distclean-generic distclean-libtool distdir dvi \ ++ dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-dvi install-dvi-am \ ++ install-exec install-exec-am install-html install-html-am \ ++ install-info install-info-am install-man install-pdf \ ++ install-pdf-am install-ps install-ps-am install-strip \ ++ install-ucmDATA installcheck installcheck-am installdirs \ ++ maintainer-clean maintainer-clean-generic mostlyclean \ ++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ ++ uninstall uninstall-am uninstall-ucmDATA ++ ++ ++# Tell versions [3.59,3.63) of GNU make to not export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +--- alsa-lib-1.1.8.orig/configure.ac ++++ alsa-lib-1.1.8/configure.ac +@@ -760,6 +760,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pict + src/conf/ucm/PIPO-W2S-Defaultstring-CherryTrailCR/Makefile \ + src/conf/ucm/SDP4430/Makefile \ + src/conf/ucm/skylake-rt286/Makefile \ ++ src/conf/ucm/sof-skl_hda_card/Makefile \ + src/conf/ucm/TECLAST-X80Pro-Defaultstring-CherryTrailCR/Makefile \ + src/conf/ucm/tegraalc5632/Makefile \ + src/conf/ucm/VEYRON-I2S/Makefile \ diff --git a/debian/patches/series b/debian/patches/series index bede7d11..73c37aee 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ #0005-Add-UCM-config-files-for-Nexus-5.patch 0006-Enabled-extended-namehints-in-alsa.conf.patch 0007-Add-a-configuration-for-tegra-alc5632-based-cards.patch +backport-sof-skl_hda_card.patch -- 2.23.0
From 0d58332fa13c66b23a4b6466507e280677315703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Or=C3=B3n=20Mart=C3=ADnez?= <zu...@debian.org> Date: Wed, 9 Oct 2019 16:58:46 +0200 Subject: [PATCH 2/2] prepare next release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Héctor Orón Martínez <zu...@debian.org> --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 247f7401..1a957560 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +alsa-lib (1.1.8-2) UNRELEASED; urgency=medium + + * conf/ucm: sof-skl_hda_card: backport (Closes: #940730) + + -- Héctor Orón Martínez <zu...@debian.org> Wed, 09 Oct 2019 16:56:28 +0200 + alsa-lib (1.1.8-1) unstable; urgency=medium * New upstream release. -- 2.23.0
signature.asc
Description: PGP signature
