From patchwork Wed May 1 13:18:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 163209 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp4512635ill; Wed, 1 May 2019 06:18:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqy0syVXTYGvtNom7JiH3r1tub7SIJYJMobH4sGBkU/3rrx5hs2gzwZsOumi8VAHZP1GTWf4 X-Received: by 2002:a65:4343:: with SMTP id k3mr42507204pgq.384.1556716725250; Wed, 01 May 2019 06:18:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556716725; cv=none; d=google.com; s=arc-20160816; b=Q+u936uKNsP1OgXtkdvQBrko1S4Fz2E2e7N8Urw6JGP0+usPygzG3JAmST9kcAwN0+ 8EzOEGwTxLju/Db08xBRa690fIVeBJt1FloVFTsExm5kOYw7ULEw0rEd+TGb9SfRGKdA t4CfWaDJ7olH4R6hjxDSLaTfZk9Hor5CsyawSFDYSN8PsR5GXmoe0HC5vPNXjNl+P2fc VZCfoRgkcmmdk+c/hB4Fn5kNlK2hh3pqXhBKBw18pIkaKfBIKDMfrPItDlAwl3btuHoF V9A2id6ePc26Gc6KajdXFp0HlTSdOOSKfY9YeBtn4nBmaEIY4Okd6V3nyslMkq23gcsF I31Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=aoBp3efQaEGXlFHx9iUeUFJ/gtaVjpJ4OAbvzJqAwkg=; b=X9jNQhJLKxV5Fm5f+b0qKhgb8ILsH8/v/ZLXReg781b1upnyGfTnZNeeTXGL6l8huk uguQ9B7PFqmoKyFMeXkYhJooWpwVWmNwW4weIq9TrSmgQzZcEp1OnYok+eg2XmdUEYD8 tW2GR1OpQ8kGHJw6Fb7Ic246bZbgiHugHoj1U1J8m8h7qrGcLAXhBVsd8TkXlBS0Kz5B +9w99hSfPE5seAN1J/K56VGYcc2kLzjmw4EoPtlCJj2IN7Lamto/qHKeMZHSaigTJRoo GXxOTuzcPw/qphYgxRuY1WRqvub+b0O8k9VPIEOWPGZJrnfIez4c17N3vygYKNjnzmut FO/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=KmwG8BjI; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id w67si44821415pfb.20.2019.05.01.06.18.44; Wed, 01 May 2019 06:18:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=KmwG8BjI; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A7F427DAC4; Wed, 1 May 2019 13:18:40 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mail.openembedded.org (Postfix) with ESMTP id B4F617D72F for ; Wed, 1 May 2019 13:18:38 +0000 (UTC) Received: by mail-wr1-f54.google.com with SMTP id k16so24590230wrn.5 for ; Wed, 01 May 2019 06:18:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=kdOLY3QZOqgZ0YWpTMInDQ1qQs0O3ck26kaoMJ9+RhA=; b=KmwG8BjIDdNfgMfOLEZFiRr0IcqFLFV+IReGXPRYECKaBivo/TensRpjkQl5jmzLHN FqajO1ol2sYbNdq684xzqrLRzXDXbsLu0W08QbQzZVZV2niPKUZE/r8J9CUPdw8GaD3b CpTqSvP3sHm//lROhBIvvjb+P76/0I8QynUYpwcPXrW0NShdaODfMOo+WL+7QmUr7d7k CCZ/1PGNLbo+DPY1CoFtViISwGRSWi4W/MCug4ur3aAZDMEN6F+8t/6FPqdJZg/2N3Yq /Hf+X1DsBtcHDR+6vSTAeNHNVC0XvnOFjLC25EYbk8DpHUlYdmcom2rT3+YrljURNyf+ C5pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=kdOLY3QZOqgZ0YWpTMInDQ1qQs0O3ck26kaoMJ9+RhA=; b=ONpH26gJQkC9UHptqx1wv3T505cuXFNfEbgS2O4f/2AUzNgd5yO5M2PMFJIFQqEoYq WHRSddPI+ZB/6bpqXOoqFloTR62S6RzMVEIc0u5VZpfQ2YWMP2LtY+yWlpiNlOvUsmcT wRfZnkYr62Nl4aMx1lSETLemGvhCH30y33NQAasKJEr3z20LlKaMOnKiga3VG15tYbBx iJ7QnKhfn/GrPNGCtlnH9Un411hgZyHYynEHz31MttH/eXy3FLvzGBaLN9zWhjJHEvKm +VRHgXNRA4Cpb0apu9eSAsZlhhsGPBz+lof6huBkZplhPgd4IhrE9khDuIyXdeVaR0Bn hrOw== X-Gm-Message-State: APjAAAUXk+Ssd+PcuLe3eZz6VczA9q9k3IUOhbhJB+AQpAjfU6grUpJF 43/ipWiTdWI7xAS3fnz8kEFaW2UUTRU= X-Received: by 2002:adf:f88f:: with SMTP id u15mr28603692wrp.155.1556716718930; Wed, 01 May 2019 06:18:38 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id w10sm5495186wrv.90.2019.05.01.06.18.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 May 2019 06:18:37 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 1 May 2019 14:18:35 +0100 Message-Id: <20190501131835.1517-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] mpg123: port to use libsdl2 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org libsdl 1.2 is dead upstream, so change mpg123 to use libsdl2. Luckily the APIs that mpg123 use haven't changed, so this is just a matter of changing the pkg-config name. Signed-off-by: Ross Burton --- meta/recipes-multimedia/mpg123/mpg123/sdl2.patch | 14 ++++++++++++++ meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb | 5 +++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-multimedia/mpg123/mpg123/sdl2.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-multimedia/mpg123/mpg123/sdl2.patch b/meta/recipes-multimedia/mpg123/mpg123/sdl2.patch new file mode 100644 index 00000000000..9dc9b923df2 --- /dev/null +++ b/meta/recipes-multimedia/mpg123/mpg123/sdl2.patch @@ -0,0 +1,14 @@ +Use libsdl2 instead of libsdl 1.2, which is dead upstream. + +Luckily the API that mpg123 use didn't change so this is a trivial change. + +Upstream-Status: Submitted [https://sourceforge.net/p/mpg123/bugs/268/] +Signed-off-by: Ross Burton + +diff --git a/configure.ac b/configure.ac +index 6216d4f..b8d3344 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1694 +1694 @@ do +- PKG_CHECK_MODULES(SDL, sdl, output_modules="$output_modules sdl" HAVE_SDL="yes", HAVE_SDL="no" check_failed=yes) ++ PKG_CHECK_MODULES(SDL, sdl2, output_modules="$output_modules sdl" HAVE_SDL="yes", HAVE_SDL="no" check_failed=yes) diff --git a/meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb b/meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb index ff2b7d893ba..dfb10bb1cd0 100644 --- a/meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb +++ b/meta/recipes-multimedia/mpg123/mpg123_1.25.10.bb @@ -9,7 +9,8 @@ SECTION = "multimedia" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3" -SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2" +SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2 \ + file://sdl2.patch" SRC_URI[md5sum] = "ea32caa61d41d8be797f0b04a1b43ad9" SRC_URI[sha256sum] = "6c1337aee2e4bf993299851c70b7db11faec785303cfca3a5c3eb5f329ba7023" @@ -27,7 +28,7 @@ PACKAGECONFIG[jack] = ",,jack" PACKAGECONFIG[openal] = ",,openal-soft" PACKAGECONFIG[portaudio] = ",,portaudio-v19" PACKAGECONFIG[pulseaudio] = "--with-default-audio=pulse,,pulseaudio" -PACKAGECONFIG[sdl] = ",,libsdl" +PACKAGECONFIG[sdl] = ",,libsdl2" # Following are possible sound output modules: # alsa arts coreaudio dummy esd jack nas openal os2 oss portaudio pulse sdl sndio sun tinyalsa win32 win32_wasapi