From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 07 Feb 2022 09:31:06 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nGzQQ-00855h-EZ for lore@lore.pengutronix.de; Mon, 07 Feb 2022 09:31:06 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nGzQP-00087j-BJ; Mon, 07 Feb 2022 09:31:05 +0100 Received: from mail-eopbgr140081.outbound.protection.outlook.com ([40.107.14.81] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nGzQ8-000875-4O for ptxdist@pengutronix.de; Mon, 07 Feb 2022 09:30:49 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IMZZQFhXeFB2Sr4G9i2+fiDqdusAC1yu1mwz4lByZJMe0Foe8JpwhW1lUy1bRAqUmk/oBaWQT7r0l0Sd8oMKeUsWsNEEyrx47ZPzHdecF1cihKBOEhDwO/CZVD7Fex7QD91gXKQlz8dgXFyE7/3Dml1RhBi+y/b7t2wLvLc23K3tuUS+ljkK6hQ8JA5hOHM/pUTeIj0qe0bAiUoTa5YCxjvtc1L4MxqaTxhBmpKStvWglyfBMcjFkHQx96lNbQx0UF7nVKVHD72uYUL1+1FGVuIyQVSDgrCoRgF4TCE5toHpplCEBplkJWaFIF45oNc353YhgVZRMH6q+MuPFeJ+Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OhGnQbZUsDp19vv7Z3oZ66t6viFeJS4/CwnEa2JVNTw=; b=CC9Z9XrLxyO7aG0HWxs6RFm5REd9oTXoL0kdAiWisBcDIQwStTmyjACqToFEnGqHmeY94AYAUAngEkCbCYkcL718MAf7txFDHT1tSH0s5pmb36R6ktAjJ5NnAkAuPZrXKG8l0XsvC9zVtdmWz/TnkvnrMCLPMH9JCe8IyuhFGsewA/+XJ51hMDjTnA8+flGGSz5d2aLzb84VooPc0A2DFE8VbXL82p29C8rFgRa5CXGC/HidgoIDkB76ThMm2rjz6eRmDxwUqY/TK2R3vkIJL7WR9TVsPfTO6RyL8c2uH5B2ugyByQs19HVKnxH4zOVcht+bqXy7hlcIU0BODvS1hg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OhGnQbZUsDp19vv7Z3oZ66t6viFeJS4/CwnEa2JVNTw=; b=mYuQ8ch0jSW1krOcwO8jxqBmq0PCoubaMwfjqL/NE9NrmMw+30+LUNU5ppisqrmhajxJUDcAMdC82qugTSEy9X9Sy88BGxf+eq3HxTV3LGYOWdsG8PB5dbblJ60drBjGSHeNY694yYRNCyqXEtlqpr/g8G245MVu1onUTVN2lus= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by AS8P251MB0339.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:404::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.18; Mon, 7 Feb 2022 08:30:45 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::10ab:30da:9dfb:56fe]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::10ab:30da:9dfb:56fe%4]) with mapi id 15.20.4951.018; Mon, 7 Feb 2022 08:30:45 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Mon, 7 Feb 2022 09:30:39 +0100 Message-Id: <20220207083039.1009657-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: GV3P280CA0008.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:b::9) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 624b84b9-364c-4147-a713-08d9ea1422eb X-MS-TrafficTypeDiagnostic: AS8P251MB0339:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OPHM8Yd12YPwBpq6rCxF+70XsOehR6o23daERPqtm2wAS9VNW+Ru+AW6BaQmkq8ujYJTq8fE1ZptepHtdvaeEvF09ToRmHCyLa9VrfI8X50fErFgIrSvL1CEEAC42WrqA+y//cHnVWoe/9+2uCng9iGB1wGMo+9VJzFFZxrgsTeowp75o0wLo5fnRiaQ/qG+UkA4FeJmI1MRRkoEFUWnSbyNydpAm7tdo3PopUkuE5g23MrIOCrAWGK/EFdQB2tMCAqsEn99Fsgn73I6g/fkTxtK8j9MxyoBS+7Gm38Xj8CDGoLtlwUHoGd7fUzgITSLZACm0D3GiZUOVK9+xIoDSzc2j0sQ86wVHHXKa5Blp2SOaZLpKUG3QrHF1Myy7b9linMe/ubyhAWdTs68lppuKDwWnM+IvMOnYIkd+hE7s+i4laGAKFVXjN7rQL/YQwTEUIkUPM7Zjh25D7/am4DfNOLGdA5zYDLbzxYj2X7rTcGcenBeCSEAwLC81Ag2P3G49mzDqYQsGGj3UTyTLWexwZF1DP7sy7N0iPYGBM1iXYlBdj7eczwm3TVaEiSx8ewAzcB2xVi9Pr/sEdV16OvN1mmxU9vmuZfIbqAzisDS4rMPnKUNX8s5cBwGNptu4diAzxA+C/HwmnbD723IMFH7p1ArXe99DvbuuG4EWk6XEjUpjiqkJK6rZcBVU3RtxWEQP8PjQnmKUinrqKngOSUjx/ouAmXBZAGQHOgHxcLbRbVAqLmAxS/cE/T7cAciRAPnT12xXG/Ur7m/qLZ/I6OFaQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230001)(376002)(346002)(39830400003)(136003)(396003)(366004)(36756003)(26005)(186003)(6506007)(316002)(6512007)(6666004)(6916009)(38100700002)(2906002)(1076003)(52116002)(38350700002)(2616005)(86362001)(66946007)(44832011)(5660300002)(508600001)(66476007)(8676002)(8936002)(83380400001)(6486002)(966005)(66556008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?55KfJeADzxW0avOTJKx2DWqXSlNHSuBy4Ru75GzJa+1lGZEFNJ142IrtLYiq?= =?us-ascii?Q?qpXXzAQ8YQxrHc7XONiEJU8kGZ0Xb5Ie1mxZ9BGK1Q1CGG108311YJMBWsN2?= =?us-ascii?Q?ee762WSUKuVaZVAddr0YcF2WGCZlgeARDRKVsuoNj6lhaZZopVbp5Yks/ADb?= =?us-ascii?Q?qGHztDRaKB8tgsTZ71aYYR6LqWi0a0TJNj5wcQIEm0UY3yvPnyVVFKD9JdBa?= =?us-ascii?Q?nIBZZGzqYastzFPaAfhw5RhYlBdhGPNHPUECypiMFgIpUIgi7pyW0WffGOnC?= =?us-ascii?Q?FbcG17eSZFLPVgZnYpLTeUzcIQZblrn8c5yaSPQ0CzqFypn/Ra18O9sfzZL4?= =?us-ascii?Q?z4NXleL/bugctkRxXVVz5brvVsjVWFORhRqxk3QUWSRZn1wnxdemCnZhsTJ0?= =?us-ascii?Q?Kbu9GTaWxboCCkYy+8B9t4ELqhoF+5UBdlRW9PFe5GRpsbWvAXGmJNa6JtD8?= =?us-ascii?Q?6cZPUbwzV5CgRlHsagbncMOp/oL5Y+hBcut/ufL+Lu4Gw+psLZIH4J1NfmKT?= =?us-ascii?Q?q8W9VX1riQNnKxAJ5z1XwGHaO9XEGcY27YFM3QZow76dgOL/xNl9t/ffZ42o?= =?us-ascii?Q?1fB+d8rmqQkJEPm4xUd3gL76Oji/9s8jHN4OqDLZgtkwvEIRAWAHC3RhGNVS?= =?us-ascii?Q?dfvKJ9+NiObqBUe9WjHEcP9KO9OT+zhqpXk0RVzEjJVKJRahpiEEtriXWvn0?= =?us-ascii?Q?OBfc0PJfY8znGilI1YgujygSHYFXTd4JnSa+34J6kAsUkZSSe/Z64fZiBb9g?= =?us-ascii?Q?CXhkXfDEjqEutLiwtDo3DY7kxicZVav43fDQQvX3Zk93qqbGzCod/WPDbkFL?= =?us-ascii?Q?TbzMWcwst5MzYOYKDwad9bypXcMGLAENVt58XJRXhRFYyeWwjHQHyedW/fG1?= =?us-ascii?Q?u0VUUZNZPgoV3R7YHLsv4m0YXWu3BXUUReDqPa4HCeLIMUr42siguR/BZ4vb?= =?us-ascii?Q?wuHEoKE+61rN0xCcaSfJ3Ntd/lcm57KyqSuxTQxlJXtMXUJpjPhA41LO64EQ?= =?us-ascii?Q?TC6kGhKk1qDnsSx2LZkS+Z0kxqwiLle+Jdd5Eb6p7XB9fxt4i2y+Nw0au8Gj?= =?us-ascii?Q?nnpmXgARfLp1v2hPDTj1MzhIQXcyUCiPCnl62+4ZluZNhkdh/H4uiuGQJLY+?= =?us-ascii?Q?tKtA5uSiWAOKyMZVrzkigNs+O9qwG9gbyWRTc9ujpEl/z2Qhsf+IPL4fw5No?= =?us-ascii?Q?hBpRmCRz0tmcuo1b0paVNkys4Fgb9NSkWWzcmCVbirY72Dll520NRFVxCMZa?= =?us-ascii?Q?RrjsZbxKDmFbx67xmEnb0PpEZqsVJA42YslvlrHQcTIcUQUCCKZ1ObBc7e4E?= =?us-ascii?Q?7GwDMtBfiGYov3qj3F5FtaOkyFn3SVv43pmYhhSqX6LCtXdxMtErxmYEv/Jm?= =?us-ascii?Q?LtyNRysixg1gBPI1ErPRfvFjqSHJhY5o0kY4FUOltmaNC841URWqk+/QG39S?= =?us-ascii?Q?IZAWy3iXZH05jZzAAT/wEEu8A5UB5leyyBTjObhW74BOcJf21nV/x7BwERfa?= =?us-ascii?Q?xvlpPd9wVTsyPVdivaL8+mF/xlzSkXpuQGmk9vw85cLk0zhCl3ue9j27rCjU?= =?us-ascii?Q?qHv7n80bx6ehiDsKqaLU1/l0P1QLsRv4DLuPemYaKidHPd1wrO13tCHBrZZx?= =?us-ascii?Q?UtX7O/ZgiPC5nWA2JkT6ZBBUom6hgQKQ3ZMg/M15mF0z29K+H42LPPl5jZpS?= =?us-ascii?Q?H6xx/KlBCiEswAGMgunQATcF9DA=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 624b84b9-364c-4147-a713-08d9ea1422eb X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2022 08:30:45.6687 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2+BOWEVHBSorK7ZO0fe9CRizVsyC3SRsWWTHry2cOHNJhsaHiVmdLMv/prBffvWA0GF3SAIE/H3ncmocpW2nbbSYZQ2+KxDHOPCw5tHmwDM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P251MB0339 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2] qemu: Version bump. 6.1.0 -> 6.2.0 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false https://wiki.qemu.org/ChangeLog/6.2 * Add options to enable/disable audio support for alsa/pa. * Malloc option changed from --enable/disable to --enable=. * Malloc variants default to disabled. * Add pulseaudio rpath-link path to pulseaudio libraries. Pulseaudio has hardcoded absolute rpaths in the libpulse.so library. * Move patchset, applies cleanly. Signed-off-by: Christian Melki --- ...symlinks-for-security_model-mapped-f.patch | 0 .../0002-let-ninja-use-the-jobserver.patch | 4 ++-- patches/{qemu-6.1.0 => qemu-6.2.0}/series | 0 rules/qemu.in | 22 +++++++++++++++---- rules/qemu.make | 14 +++++++----- 5 files changed, 29 insertions(+), 11 deletions(-) rename patches/{qemu-6.1.0 => qemu-6.2.0}/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch (100%) rename patches/{qemu-6.1.0 => qemu-6.2.0}/0002-let-ninja-use-the-jobserver.patch (89%) rename patches/{qemu-6.1.0 => qemu-6.2.0}/series (100%) diff --git a/patches/qemu-6.1.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch b/patches/qemu-6.2.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch similarity index 100% rename from patches/qemu-6.1.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch rename to patches/qemu-6.2.0/0001-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch diff --git a/patches/qemu-6.1.0/0002-let-ninja-use-the-jobserver.patch b/patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch similarity index 89% rename from patches/qemu-6.1.0/0002-let-ninja-use-the-jobserver.patch rename to patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch index 0de2e99f3..5df864c39 100644 --- a/patches/qemu-6.1.0/0002-let-ninja-use-the-jobserver.patch +++ b/patches/qemu-6.2.0/0002-let-ninja-use-the-jobserver.patch @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 401c623a65f8..36a0557d2aa8 100644 +index 74c5b46d38b5..4b3e390e8947 100644 --- a/Makefile +++ b/Makefile -@@ -136,7 +136,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out --%,$(MAKEFLAGS)))) +@@ -142,7 +142,7 @@ MAKE.k = $(findstring k,$(firstword $(filter-out --%,$(MAKEFLAGS)))) MAKE.q = $(findstring q,$(firstword $(filter-out --%,$(MAKEFLAGS)))) MAKE.nq = $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq) NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \ diff --git a/patches/qemu-6.1.0/series b/patches/qemu-6.2.0/series similarity index 100% rename from patches/qemu-6.1.0/series rename to patches/qemu-6.2.0/series diff --git a/rules/qemu.in b/rules/qemu.in index b14dd53d4..eb689a188 100644 --- a/rules/qemu.in +++ b/rules/qemu.in @@ -10,10 +10,12 @@ menuconfig QEMU select GLIB select LIBCAP_NG select ZLIB - select SDL2 if QEMU_SDL - select GTK if QEMU_GTK - select LIBUSB if QEMU_SYS - select PIXMAN if QEMU_SYS + select SDL2 if QEMU_SDL + select GTK if QEMU_GTK + select LIBUSB if QEMU_SYS + select PIXMAN if QEMU_SYS + select PULSEAUDIO if QEMU_PULSEAUDIO + select ALSA_LIB if QEMU_ALSA help QEMU is a generic and open source machine emulator and virtualizer. @@ -41,6 +43,18 @@ config QEMU_GTK help Say y to build with GTK support. +config QEMU_PULSEAUDIO + bool + prompt "Enable pulseaudio output support." + help + Say y to build with pa support. + +config QEMU_ALSA + bool + prompt "Enable alsa audio output support." + help + Say y to build with alsa support. + config QEMU_TOOLS bool prompt "Enable tools" diff --git a/rules/qemu.make b/rules/qemu.make index 756633a0b..2c06204f8 100644 --- a/rules/qemu.make +++ b/rules/qemu.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QEMU) += qemu # # Paths and names # -QEMU_VERSION := 6.1.0 -QEMU_MD5 := 47f776c276a24f42108ba512a2aa3013 +QEMU_VERSION := 6.2.0 +QEMU_MD5 := a077669ce58b6ee07ec355e54aad25be QEMU := qemu-$(QEMU_VERSION) QEMU_SUFFIX := tar.xz QEMU_URL := https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX) @@ -52,7 +52,8 @@ QEMU_CONF_OPT := \ --disable-strip \ --disable-werror \ --enable-stack-protector \ - --audio-drv-list= \ + --$(call ptx/endis, PTXCONF_QEMU_ALSA)-alsa \ + --$(call ptx/endis, PTXCONF_QEMU_PULSEAUDIO)-pa \ --block-drv-rw-whitelist= \ --block-drv-ro-whitelist= \ --enable-trace-backends=nop \ @@ -143,8 +144,6 @@ QEMU_CONF_OPT := \ --disable-libssh \ --disable-numa \ --disable-libxml2 \ - --disable-tcmalloc \ - --disable-jemalloc \ --enable-replication \ --disable-opengl \ --disable-virglrenderer \ @@ -173,6 +172,11 @@ QEMU_CONF_OPT := \ --disable-fuzzing \ --disable-keyring +ifdef PTXCONF_QEMU_PULSEAUDIO +QEMU_LDFLAGS := \ + -Wl,-rpath-link,$(SYSROOT)/usr/lib/pulseaudio +endif + # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de