From patchwork Sun Jan 7 13:48:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Vinson X-Patchwork-Id: 13513703 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3EDB4C47079 for ; Mon, 8 Jan 2024 16:22:37 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id D1D43206; Mon, 8 Jan 2024 17:22:25 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D1D43206 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1704730955; bh=FSDlVm0rLhEYeDuV0E8E+AKyN9rpWnOJ0CT1flbEcqU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=S5PIaCWF3aXfYQ7eLQZuRwh0Y/3jqnKJbjXz44/EoDzpGP/jfAETdc8aJeuS6aYbX CSl6aZOI4Nh6TCESIcoHC4hWYSc6M6Vlu+8gPfGdznxHiuFMdJ0QRFQC8EoHk/tG4j 3omjpXjokT9Sk1IaGNh4OZxvPs4NlZL7Bo0zpsYw= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3F9D7F805C8; Mon, 8 Jan 2024 17:21:52 +0100 (CET) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 76168F805C8; Mon, 8 Jan 2024 17:21:52 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 8EF05F80246; Sun, 7 Jan 2024 14:49:21 +0100 (CET) Received: from mail-qk1-x729.google.com (mail-qk1-x729.google.com [IPv6:2607:f8b0:4864:20::729]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 65A1BF800F5 for ; Sun, 7 Jan 2024 14:49:17 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 65A1BF800F5 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=B5QwIo0M Received: by mail-qk1-x729.google.com with SMTP id af79cd13be357-78313f4d149so133494385a.1 for ; Sun, 07 Jan 2024 05:49:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704635355; x=1705240155; darn=alsa-project.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QnRcuzP8uUbut4x7l1LBBiVBM7MaTfbqnBg/jjmN/bo=; b=B5QwIo0MkuoIdfQVhqegBtluEZAVHyJp/NIyc0Zt30rEJx1db8ujMeEzYL4oD66ml4 wTReVAite3zRe3cqnir73N+lvZiyakLnztWfCt95T8QXYL1F2OrknPOhNdGeajqV2Nlr LgtdcnjFuqzX1cxOyBLRjA3pg2X31XDgzgIBVR2XzB35v2LHE3RR3YFr5z2YG3yoGdQ1 bTXQiHsndP0NQgroCcPv2yMKjlnAOgGqC+K7qDmwC77UPubahtjYfg+e0mh1CWWhuNHN AKqrBZCObd28IedE1oV6hNd6K2w1302EUGqAiZoVLg1Bvw1fVJKg6dcT8x8FpePBdql0 cqMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704635355; x=1705240155; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QnRcuzP8uUbut4x7l1LBBiVBM7MaTfbqnBg/jjmN/bo=; b=addMrA1laVRJpnpiItXuSaVdhJRWndKDZKqn//fhRw/SwKxrliHXafRrJnsaBMHc6F NPjbsaZZSp6IswFQu8MFh2Sdi3+YnIRy5+76rdfH2cPxRVh7ZasFhy7fc+q1WXmNKb6i E7GuuIqmxQT9O08tkhf0JrteUGCkVJfqrSu95tnJEr5aFJRw2nIop5Swrax/e0OTw0QX yEjjrboZS3sI++0eIDznW3kLJkHuNbnYZxsRzXXbQXvPKvlyC/wqrlRfNbrqHyY972Eq mnlQ/4NMitFQ7suQ7TumEfswsczYH6KLxp2ZBo/RyYRrjcEmALnDyfSlqy4HVQntE2HV v3/w== X-Gm-Message-State: AOJu0YzqYnjHJT6h8rKkniYtrC0Wyrz95D0F1OWLkTKpu8rm1P1IJEhj gPtacxKRwAKlc9HQxmkEhjvXlTngUHk= X-Google-Smtp-Source: AGHT+IHg3PKAwi35xhlUubi1aHDoDFlTKPBcrHj4s1F3JT8hEbIVaizWEQLX7QZkNaKmsVVnIfUWXg== X-Received: by 2002:a05:620a:3636:b0:783:137d:7b4c with SMTP id da54-20020a05620a363600b00783137d7b4cmr2422974qkb.120.1704635355484; Sun, 07 Jan 2024 05:49:15 -0800 (PST) Received: from localhost.localdomain ([2602:47:d950:3e00:64e5:89b4:ac:57eb]) by smtp.googlemail.com with ESMTPSA id os8-20020a05620a810800b0078310c390ffsm1120279qkn.9.2024.01.07.05.49.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jan 2024 05:49:15 -0800 (PST) From: Nicholas Vinson To: alsa-devel@alsa-project.org Cc: Nicholas Vinson Subject: [PATCH 1/4] configure.ac: Update AC_OUTPUT() function Date: Sun, 7 Jan 2024 08:48:53 -0500 Message-ID: <583278d4eaaa96c3de2b053c499ac09c2a911b9d.1704635150.git.nvinson234@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-MailFrom: nvinson234@gmail.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1 Message-ID-Hash: 2TVUZQM2G6TZZZV4LIBCBNRG4MXXTRWM X-Message-ID-Hash: 2TVUZQM2G6TZZZV4LIBCBNRG4MXXTRWM X-Mailman-Approved-At: Mon, 08 Jan 2024 16:21:48 +0000 X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Modern autoconf practice says AC_OUTPUT() should be called with no arguments and generated configuration files should be specified by calling AC_CONFIG_FILES() before AC_OUTPUT(). Update configure.ac to follow this practice. Signed-off-by: Nicholas Vinson --- configure.ac | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index f86011f1..9db527c3 100644 --- a/configure.ac +++ b/configure.ac @@ -747,22 +747,24 @@ if test ! -L "$srcdir"/include/alsa ; then ln -sf . "$srcdir"/include/alsa fi -AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ - include/Makefile include/sound/Makefile include/sound/uapi/Makefile \ - src/Versions src/Makefile \ - src/control/Makefile src/mixer/Makefile \ - src/pcm/Makefile src/pcm/scopes/Makefile \ - src/rawmidi/Makefile src/timer/Makefile \ - src/hwdep/Makefile src/seq/Makefile src/ucm/Makefile \ - src/alisp/Makefile src/topology/Makefile \ - src/conf/Makefile \ - src/conf/cards/Makefile \ - src/conf/ctl/Makefile \ - src/conf/pcm/Makefile \ - modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \ - alsalisp/Makefile aserver/Makefile \ - test/Makefile test/lsb/Makefile \ - utils/Makefile utils/alsa-lib.spec utils/alsa.pc utils/alsa-topology.pc) +AC_CONFIG_FILES(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ + include/Makefile include/sound/Makefile include/sound/uapi/Makefile \ + src/Versions src/Makefile \ + src/control/Makefile src/mixer/Makefile \ + src/pcm/Makefile src/pcm/scopes/Makefile \ + src/rawmidi/Makefile src/timer/Makefile \ + src/hwdep/Makefile src/seq/Makefile src/ucm/Makefile \ + src/alisp/Makefile src/topology/Makefile \ + src/conf/Makefile \ + src/conf/cards/Makefile \ + src/conf/ctl/Makefile \ + src/conf/pcm/Makefile \ + modules/Makefile modules/mixer/Makefile modules/mixer/simple/Makefile \ + alsalisp/Makefile aserver/Makefile \ + test/Makefile test/lsb/Makefile \ + utils/Makefile utils/alsa-lib.spec utils/alsa.pc utils/alsa-topology.pc) + +AC_OUTPUT() dnl Create asoundlib.h dynamically according to configure options echo "Creating asoundlib.h..." From patchwork Sun Jan 7 13:48:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Vinson X-Patchwork-Id: 13513704 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0AB00C3DA6E for ; Mon, 8 Jan 2024 16:22:56 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id EB29D20C; Mon, 8 Jan 2024 17:22:43 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz EB29D20C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1704730974; bh=pfc5gtvn4b4EVAxlXDU40ahe+qqsr/NuY7UWWPnRXk4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=sRpd4DJizTDzSbCgv1+UZXKOvdi2BWpJb3P2WV5VLoJGMEAmTqoTm/rJF71eD+2d/ +y1/72mqpRW6RPUcCqpz5O3HhJzMnQkLNmyIix35GZp0Cg0qwM9+Bog2SBmz25qKTm KRRPplxfs1/6pBwoEqDqw1H3N6TXDYXy+S6o/BoE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id C5900F805FA; Mon, 8 Jan 2024 17:21:56 +0100 (CET) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 42184F805EB; Mon, 8 Jan 2024 17:21:56 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 04EDBF802DB; Sun, 7 Jan 2024 14:49:34 +0100 (CET) Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id E6A34F800F5 for ; Sun, 7 Jan 2024 14:49:28 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E6A34F800F5 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=FcKI08p4 Received: by mail-qk1-x735.google.com with SMTP id af79cd13be357-7831be84f4eso53781185a.0 for ; Sun, 07 Jan 2024 05:49:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704635366; x=1705240166; darn=alsa-project.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Vo9zZ7GO4dydRr6xjEjRJpw5b3BLUzuSBST5lbeN9WQ=; b=FcKI08p4e+2iGKrB7Fq5MwwRP6WYrcMd1jnTLD1JzBJRIYfANQEH/6j6sq8jz5otKL 8a/s5L5sx9iqDPfLW5rTwpmwp+GR3VASaww+pfCN2jDO12ckuz3a5+1XaNobnrlO10+V RBLGY30V+k/jsPMhPLoZBYibgphsXk+oceDTLyH2b98no055GOdarNFu9gLbT32em7+F kgDjaRTwGIm1+crafXxzNzbZPPlpg+sFrfZ0+lRyQKdSnwq+fxnYwRmuo1Ml/sm9nu0Y WJiD261rFCsWNuyVyMd5T809dRTAWLFWgAAPm0IY/3p73BYY6ILkB/tjSu5/BxLqEdW5 miOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704635366; x=1705240166; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Vo9zZ7GO4dydRr6xjEjRJpw5b3BLUzuSBST5lbeN9WQ=; b=TdmxWgfCEoYKoZXJFr7CawBtASaf0NRo2Z277Km/sdbs6gEUzbxXVi/9FUZeNtrdVv vB6nvTVnd0Gyd8I26LZoblCsMcrpJFDtxGhKP0l579sZ7VoYetM1W3i8PilAxy6GJV8d kXbo7p1wvjnZdI2ShHLZwq/u5YEVMcdI3zwASbi5pDHDwzgb4fU45jj+WgqGHZ3TmdkX Yln77hLR/a6e47wd7U+TC3KvbjjC0m+6HHF+n1zHsZkZEcDKLspCf/HGXAG3VBQ1ZM5r jRQmPYpJLveYCaJqOJU6jwXo6GbIbrRTvkGJ5DTv5HvqKB5GQ/FQ+7NV9pImJUN0Wukh sv2A== X-Gm-Message-State: AOJu0YxLwfFqokfZmGP83zCxzZLaY7JmzKt6ktpYUk89giVswh9A6rNa cRdmxqawR0qZUQoRcYs5c520UjePVNU= X-Google-Smtp-Source: AGHT+IHTQjPG7dZ3gd0zZfFxszWgc+6ZRaoomoEwnk9Vm2JijVbMH0tkj4nsWLXJ5xZ3Lz+rtKwrMA== X-Received: by 2002:a05:620a:2415:b0:781:5b96:537f with SMTP id d21-20020a05620a241500b007815b96537fmr3396619qkn.114.1704635366455; Sun, 07 Jan 2024 05:49:26 -0800 (PST) Received: from localhost.localdomain ([2602:47:d950:3e00:64e5:89b4:ac:57eb]) by smtp.googlemail.com with ESMTPSA id os8-20020a05620a810800b0078310c390ffsm1120279qkn.9.2024.01.07.05.49.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jan 2024 05:49:26 -0800 (PST) From: Nicholas Vinson To: alsa-devel@alsa-project.org Cc: Nicholas Vinson Subject: [PATCH 2/4] src/Versions.in: Add guards for opt. alisp symbols Date: Sun, 7 Jan 2024 08:48:54 -0500 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-MailFrom: nvinson234@gmail.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1 Message-ID-Hash: 2VVYMQFO2PPCR2RCPR5ZACWKGVWLYSJD X-Message-ID-Hash: 2VVYMQFO2PPCR2RCPR5ZACWKGVWLYSJD X-Mailman-Approved-At: Mon, 08 Jan 2024 16:21:51 +0000 X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: <> List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Add guards for optional alisp symbols. This ensures that the Versions file does not contain undefined symbols when building alisp support is disabled. Fixes Gentoo bugs 914511 (https://bugs.gentoo.org/914511), 914643 (https://bugs.gentoo.org/914643), and 919417 (https://bugs.gentoo.org/919417). Fixes bug #305 Fixes alsa_lisp symbol error reported in bug #356 Signed-off-by: Nicholas Vinson --- configure.ac | 2 +- src/Makefile.am | 11 ++++++++++- src/{Versions.in => Versions.in.in} | 4 ++++ 3 files changed, 15 insertions(+), 2 deletions(-) rename src/{Versions.in => Versions.in.in} (99%) diff --git a/configure.ac b/configure.ac index 9db527c3..024e70b0 100644 --- a/configure.ac +++ b/configure.ac @@ -749,7 +749,7 @@ fi AC_CONFIG_FILES(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ include/Makefile include/sound/Makefile include/sound/uapi/Makefile \ - src/Versions src/Makefile \ + src/Versions.in src/Makefile \ src/control/Makefile src/mixer/Makefile \ src/pcm/Makefile src/pcm/scopes/Makefile \ src/rawmidi/Makefile src/timer/Makefile \ diff --git a/src/Makefile.am b/src/Makefile.am index df46dbc4..b4a0d5d9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,10 +1,11 @@ -EXTRA_DIST=Versions COMPATNUM=@LIBTOOL_VERSION_INFO@ if VERSIONED_SYMBOLS VSYMS = -Wl,--version-script=Versions +BUILT_SOURCES = $(top_builddir)/src/Versions else VSYMS = +BUILT_SOURCES = endif if SYMBOLIC_FUNCTIONS @@ -13,6 +14,8 @@ else SYMFUNCS = endif +VERSION_CPPFLAGS = + lib_LTLIBRARIES = libasound.la libasound_la_SOURCES = conf.c confeval.c confmisc.c input.c output.c async.c error.c dlmisc.c socket.c shmarea.c userfile.c names.c @@ -43,6 +46,9 @@ SUBDIRS += ucm libasound_la_LIBADD += ucm/libucm.la endif if BUILD_ALISP +if VERSIONED_SYMBOLS +VERSION_CPPFLAGS += -DHAVE_ALISP_SYMS +endif SUBDIRS += alisp libasound_la_LIBADD += alisp/libalisp.la endif @@ -51,6 +57,9 @@ libasound_la_LIBADD += @ALSA_DEPLIBS@ libasound_la_LDFLAGS = -version-info $(COMPATNUM) $(VSYMS) $(SYMFUNCS) $(LDFLAGS_NOUNDEFINED) +$(top_builddir)/src/Versions: $(top_builddir)/src/Versions.in + $(COMPILE) -E $(VERSION_CPPFLAGS) -x assembler-with-cpp -o $@ $< + control/libcontrol.la: $(MAKE) -C control libcontrol.la diff --git a/src/Versions.in b/src/Versions.in.in similarity index 99% rename from src/Versions.in rename to src/Versions.in.in index c53a99fa..041eff08 100644 --- a/src/Versions.in +++ b/src/Versions.in.in @@ -118,15 +118,19 @@ ALSA_0.9.3 { } ALSA_0.9.0; ALSA_0.9.5 { +#ifdef HAVE_ALISP_SYMS global: @SYMBOL_PREFIX@alsa_lisp; +#endif } ALSA_0.9.3; ALSA_0.9.7 { +#ifdef HAVE_ALISP_SYMS global: @SYMBOL_PREFIX@alsa_lisp_*; +#endif } ALSA_0.9.5; ALSA_1.1.6 { From patchwork Sun Jan 7 13:48:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Vinson X-Patchwork-Id: 13513706 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6C8BEC3DA6E for ; Mon, 8 Jan 2024 16:23:37 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 9BBCAB76; Mon, 8 Jan 2024 17:23:25 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9BBCAB76 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1704731015; bh=j33KwBE+ESJjy2ZwRNfG6TakLeb0ccaARxU4EAyKqQM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=tBmJDGyzW33p+6ymt2bPrJuJNLiJ8j7nL3bGGeHZNurcQ7wWjeXMlDSDBCS45gmUx xXC/d8sYf3bQRyD+NUPRbCM8NXN0ooqYrSOnX2BgPbJPmHNERtXTpYWMhsFoSDzdVu wbktVsfj/KQM27axVVXn8T00BLGE0GtogEcg3Gkc= Received: by alsa1.perex.cz (Postfix, from userid 50401) id AEF24F80676; Mon, 8 Jan 2024 17:22:02 +0100 (CET) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id D6847F8063C; Mon, 8 Jan 2024 17:22:01 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 12E48F804F1; Sun, 7 Jan 2024 14:49:38 +0100 (CET) Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id C7F13F80236 for ; Sun, 7 Jan 2024 14:49:30 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C7F13F80236 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=F84jCa02 Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-7831be84f4eso53782285a.0 for ; Sun, 07 Jan 2024 05:49:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704635368; x=1705240168; darn=alsa-project.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6Hqw57BmkdbaBbLNY/q+mzp+dqJI+Q3yMncezqofKS8=; b=F84jCa02R+9yfhLdBstErAyMpxIaac7AYoHPjmaaWLR3BT0GYO4XvEcWHW4iCLoXoI Hld2T+UFDAF9HL1kqI6zw/GFKhdHvTHRYiXkCj1hiezaHWzQF1IW08zrAqgZZOEXlN7x mkpQ/evWocuTMPBdhq74X3j7T3ZcGP+JK/zikMSD38/718M5b+Y3BN2qGIc4DXrO2NSk kMvMGiAoHCSiY4v/CaU/jiaQ2tjxSOZILtpTd5Yy5owEoxx/WtQtR3PygkAd0tipkd7c JKwcr67BShiWP7VcTYrwB9lSoBqY1DbnJvjczT00Ocb9GP1SqBizvO0GxwNOcWQ4OZdY D7nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704635368; x=1705240168; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6Hqw57BmkdbaBbLNY/q+mzp+dqJI+Q3yMncezqofKS8=; b=QrH2kNyFFkDm4AbMLbbeFNOYTTY0gh+NlHpuQnT+PN8i1H25l6z6gCvdNH1LDzs8s9 XA2uHcbqn06V4OF7fx3rQAiUTJ7KZlzQCCXvDKeSwUcac6RBNdnECA3HWTEUF35fWUTi 58L0gKrzXZFBddH78F68bCFGaWtfW/h7rcohycarqeowzWq8cKKa/AYjb4owjS0h91E0 70aYSQEkSDodXx2we8cPO5xFG10TKWWSLEys8qKXB+s9g+YGSOFE4oRP4BXBG5HtpTXK dmZziihgOm9WPLAx3XQYjqdUhyP39V1/F0FkLuNDw7wDVlgUbFAMZYhOfyEf/upm2vdg ecOA== X-Gm-Message-State: AOJu0YxaYVbBEPZnT1ZZYtGoaQhYIpqUCZR8VdjekL0WKUUkKaCaiwLG Sn7m6Xhg7hdF3ZWB9CmVoC48AmElHHE= X-Google-Smtp-Source: AGHT+IFpmEy81X6grJrTNVhk8om1w/FdiwnA2vdUl2Dqutlz0dTF6iryqo/osbDNwtmmIPeNymNYWA== X-Received: by 2002:ae9:f40d:0:b0:783:2092:412b with SMTP id y13-20020ae9f40d000000b007832092412bmr465856qkl.20.1704635368282; Sun, 07 Jan 2024 05:49:28 -0800 (PST) Received: from localhost.localdomain ([2602:47:d950:3e00:64e5:89b4:ac:57eb]) by smtp.googlemail.com with ESMTPSA id os8-20020a05620a810800b0078310c390ffsm1120279qkn.9.2024.01.07.05.49.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jan 2024 05:49:27 -0800 (PST) From: Nicholas Vinson To: alsa-devel@alsa-project.org Cc: Nicholas Vinson Subject: [PATCH 3/4] src/Versions.in: Add guards for pcm and timer syms Date: Sun, 7 Jan 2024 08:48:55 -0500 Message-ID: <40181a6d1a2ef02257899e6bd1a0609660501f48.1704635150.git.nvinson234@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-MailFrom: nvinson234@gmail.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1 Message-ID-Hash: MB5PGC76N7JJP6XEMMQM64J4SHVQQQBU X-Message-ID-Hash: MB5PGC76N7JJP6XEMMQM64J4SHVQQQBU X-Mailman-Approved-At: Mon, 08 Jan 2024 16:21:52 +0000 X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Configure script allows for the disabling of the pcm module. When disabled, the pcm symbols will not be available. Add guards to remove symbols from version map when not present. Signed-off-by: Nicholas Vinson --- src/Makefile.am | 3 +++ src/Versions.in.in | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index b4a0d5d9..ad5bf8ef 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,6 +26,9 @@ SUBDIRS += mixer libasound_la_LIBADD += mixer/libmixer.la endif if BUILD_PCM +if VERSIONED_SYMBOLS +VERSION_CPPFLAGS += -DHAVE_PCM_SYMS -DHAVE_TIMER_SYMS +endif SUBDIRS += pcm timer libasound_la_LIBADD += pcm/libpcm.la timer/libtimer.la endif diff --git a/src/Versions.in.in b/src/Versions.in.in index 041eff08..98f36ded 100644 --- a/src/Versions.in.in +++ b/src/Versions.in.in @@ -16,6 +16,7 @@ ALSA_0.9 { }; ALSA_0.9.0rc4 { +#ifdef HAVE_PCM_SYMS global: @SYMBOL_PREFIX@snd_pcm_hw_params_get_access; @@ -42,6 +43,7 @@ ALSA_0.9.0rc4 { @SYMBOL_PREFIX@snd_pcm_hw_params_get_rate_max; @SYMBOL_PREFIX@snd_pcm_hw_params_set_rate_near; @SYMBOL_PREFIX@snd_pcm_hw_params_set_rate_first; + @SYMBOL_PREFIX@snd_pcm_hw_params_set_rate_last; @SYMBOL_PREFIX@snd_pcm_hw_params_get_period_time; @@ -85,22 +87,29 @@ ALSA_0.9.0rc4 { @SYMBOL_PREFIX@snd_pcm_hw_params_set_tick_time_near; @SYMBOL_PREFIX@snd_pcm_hw_params_set_tick_time_first; @SYMBOL_PREFIX@snd_pcm_hw_params_set_tick_time_last; +#endif } ALSA_0.9; ALSA_0.9.0rc8 { +#ifdef HAVE_PCM_SYMS global: @SYMBOL_PREFIX@snd_pcm_forward; @SYMBOL_PREFIX@snd_pcm_status_get_trigger_htstamp; @SYMBOL_PREFIX@snd_pcm_status_get_htstamp; +#endif } ALSA_0.9.0rc4; ALSA_0.9.0 { +#if defined HAVE_PCM_SYMS || defined HAVE_TIMER_SYMS global: +#if defined HAVE_PCM_SYMS @SYMBOL_PREFIX@snd_pcm_type_name; +#endif +#ifdef HAVE_TIMER_SYMS @SYMBOL_PREFIX@snd_timer_query_info; @SYMBOL_PREFIX@snd_timer_query_params; @SYMBOL_PREFIX@snd_timer_query_status; @@ -108,6 +117,8 @@ ALSA_0.9.0 { @SYMBOL_PREFIX@snd_timer_params_get_exclusive; @SYMBOL_PREFIX@snd_timer_params_set_filter; @SYMBOL_PREFIX@snd_timer_params_get_filter; +#endif +#endif } ALSA_0.9.0rc8; ALSA_0.9.3 { @@ -146,11 +157,13 @@ ALSA_1.2.6 { } ALSA_1.1.6; ALSA_1.2.9 { +#ifdef HAVE_PCM_SYMS global: @SYMBOL_PREFIX@snd_pcm_hw_params_is_perfect_drain; @SYMBOL_PREFIX@snd_pcm_hw_params_set_drain_silence; @SYMBOL_PREFIX@snd_pcm_hw_params_get_drain_silence; +#endif } ALSA_1.2.6; ALSA_1.2.10 { From patchwork Sun Jan 7 13:48:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Vinson X-Patchwork-Id: 13513705 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C0C1FC3DA6E for ; Mon, 8 Jan 2024 16:23:25 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id A9DD8E7D; Mon, 8 Jan 2024 17:23:13 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A9DD8E7D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1704731003; bh=COIMYhmOeamnzBh9DzoVKj7taL2SyUsGtfhPKJDnnzQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=jHEE9tpA2MoFHBo5gHRyGTlLQjsUsYCegOD4pZJ0JD1M6M1Le0rtZ0Z2Ejj1w1cj8 RgK0pQ1U4SjuGG2T3MSJmjWOBGcub5My3rffnpOl1deOtBvVAt/oGeHmYuafUDDheW qfGbWkS0dL9ViMBy7CTRa2WFxXWownJ+2HtWpjU0= Received: by alsa1.perex.cz (Postfix, from userid 50401) id EF00EF80617; Mon, 8 Jan 2024 17:21:59 +0100 (CET) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 90E1EF80612; Mon, 8 Jan 2024 17:21:59 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3039EF80254; Sun, 7 Jan 2024 14:49:35 +0100 (CET) Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id BC003F80086 for ; Sun, 7 Jan 2024 14:49:31 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz BC003F80086 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=chC8TnuP Received: by mail-qk1-x72a.google.com with SMTP id af79cd13be357-7831be84f4eso53782985a.0 for ; Sun, 07 Jan 2024 05:49:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704635370; x=1705240170; darn=alsa-project.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GOF6sEqDIgSyAvb+prfjypAX6iR1Y4dGfmqj46BSgHA=; b=chC8TnuPSxwY59sIyXnKCg2yn6x0Ez8xjbBmaHG8Sb9sHfE1o+C4frh/no83xP/Qt6 QFD4kIEkrdWQ7IYI5di/9kiuJqHmu3Fk0kUv7/OPECReUFneX3rDizRQPg+EVx2bidlx 2YOyqqeQNThiPWuihDKwgt/YrQEWJE5k0RS2VzJ2IjulpV8xZFr9e+OqYCkSGApNyBRa NTpvtZ4ETluh/UYYLMwUEanDGKYujvi1xlOLoa3EYHD23Y3y3z4f3anit/BsZiiuXP52 DCqbM5Qt0wGXaJGFfad0upDk/If/BDojjoDbHxVuFr1qfy/mf6GX2jA65zdXtiUbrkzp Bpxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704635370; x=1705240170; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GOF6sEqDIgSyAvb+prfjypAX6iR1Y4dGfmqj46BSgHA=; b=ILafkZU2KtIozAD4nWZxXGObY214EQ+QxpKtiO9yArifGWLu2J/e2UvbqfVgFpNcph KE7Yv2nNIQo/FuKKTH0bbqjjbgjSc1KChApAWY2bkFk81sg1/9dZI0z/aO/gmEKZUl2h xqddIL+i9VceIAajXcJ77v/w1b49N9rAVjdyC7hpVubTKq1xUQn/XkTSJj375D0HmIqb SEbzEqYC4TMFAiU4EPdtP2oauGT5PjmGjhzlY/wl7Kqke1AWeC9wpfcT0T0IC+gqAUIA 5Iyso16baiP8YOLOX1/+M0d8Hl7gkUk9d0O3Mrl6GqQ0bhT/RTSEw1zYrmspzr5nUdRV va3w== X-Gm-Message-State: AOJu0Yykgk9Q9mjbQ6pc6bX9171Lb1pFUSJgxfpglwIy4nygFHE+vGKc 3L+fsglx8Q5QYRyQHs9eQgkJZms0poE= X-Google-Smtp-Source: AGHT+IFnb37vBjY66Nu2rSQ0/P/iq7LZuxpig0/R2LCHTpVEcPdVYio3qWgU+Ne/5nxgcww411b+Hg== X-Received: by 2002:a05:620a:1454:b0:77e:fba3:4f28 with SMTP id i20-20020a05620a145400b0077efba34f28mr2303236qkl.126.1704635369856; Sun, 07 Jan 2024 05:49:29 -0800 (PST) Received: from localhost.localdomain ([2602:47:d950:3e00:64e5:89b4:ac:57eb]) by smtp.googlemail.com with ESMTPSA id os8-20020a05620a810800b0078310c390ffsm1120279qkn.9.2024.01.07.05.49.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jan 2024 05:49:29 -0800 (PST) From: Nicholas Vinson To: alsa-devel@alsa-project.org Cc: Nicholas Vinson Subject: [PATCH 4/4] libatopology: Remove version-script flags Date: Sun, 7 Jan 2024 08:48:56 -0500 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-MailFrom: nvinson234@gmail.com X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1 Message-ID-Hash: R4OUPK7LM4YILZ7KJ5JDCKS7CJ33AE3N X-Message-ID-Hash: R4OUPK7LM4YILZ7KJ5JDCKS7CJ33AE3N X-Mailman-Approved-At: Mon, 08 Jan 2024 16:21:51 +0000 X-Mailman-Version: 3.3.9 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Review of Versions.in does not list any symbols defined in the libatopology library. Naming undefined symbols in a version script causes build failures with ld.lld when using default flags. Signed-off-by: Nicholas Vinson --- src/topology/Makefile.am | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am index 9f48891f..b1bc10f1 100644 --- a/src/topology/Makefile.am +++ b/src/topology/Makefile.am @@ -1,11 +1,5 @@ COMPATNUM=@LIBTOOL_VERSION_INFO@ -if VERSIONED_SYMBOLS -VSYMS = -Wl,--version-script=../Versions -else -VSYMS = -endif - if SYMBOLIC_FUNCTIONS SYMFUNCS = -Wl,-Bsymbolic-functions else @@ -15,7 +9,7 @@ endif lib_LTLIBRARIES = libatopology.la libatopology_la_LIBADD = ../libasound.la -libatopology_la_LDFLAGS = -version-info $(COMPATNUM) $(VSYMS) $(SYMFUNCS) $(LDFLAGS_NOUNDEFINED) +libatopology_la_LDFLAGS = -version-info $(COMPATNUM) $(SYMFUNCS) $(LDFLAGS_NOUNDEFINED) libatopology_la_SOURCES =\ parser.c \