From patchwork Thu Jun 19 11:19:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Kooi X-Patchwork-Id: 32214 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f200.google.com (mail-ig0-f200.google.com [209.85.213.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 89A69203F4 for ; Thu, 19 Jun 2014 11:20:02 +0000 (UTC) Received: by mail-ig0-f200.google.com with SMTP id hn18sf7833417igb.11 for ; Thu, 19 Jun 2014 04:20:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:cc:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=CBmzOYN4q6Te/XpNqQfWHglKy2xnDbWHgIpT/ke3Nl0=; b=QyCWhzbFOP++fZOymkpcq0AdIXpiA4gEynfFrzYteF2+ue86m8s7MW1L3Adg8vqfev aM1AyB9M4QoZVmMbRVFUDe/iD8Ygm1FndjHnkc276skn4nH0CYLIOOCpcSeebgVsFs+D WOPcj2xBG4fohzZJ4phNip6IkR4MxP0499OgQY4Yri2+FHNiuhkrYT1N5VWv9fhskQb1 u3TGGTfDC/PHY5ZqsIpUCuSQ47Z9xHUER1ToRbZ4wMk2f4SlAKrRQvKHGsCFe+d/moq9 c2YCKLIyZz61i6UZw4TCKRWLbRk5B/iuPbcF6K1brdGcYS5r69OVYp4bVO6vQZgM812f POaA== X-Gm-Message-State: ALoCoQk9Sirb5tPmYJ07/uPdR1CC2gadbcMydQOk8p1eZ4UkEi2PTWucZOAZfMM5Ro6rFE/GBJo+ X-Received: by 10.50.73.35 with SMTP id i3mr4009995igv.2.1403176801799; Thu, 19 Jun 2014 04:20:01 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.21.85 with SMTP id 79ls504161qgk.41.gmail; Thu, 19 Jun 2014 04:20:01 -0700 (PDT) X-Received: by 10.52.88.17 with SMTP id bc17mr252486vdb.45.1403176801706; Thu, 19 Jun 2014 04:20:01 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id dr3si2215161vec.89.2014.06.19.04.20.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Jun 2014 04:20:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.175 as permitted sender) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id jx11so2135565veb.20 for ; Thu, 19 Jun 2014 04:20:01 -0700 (PDT) X-Received: by 10.58.68.129 with SMTP id w1mr209948vet.49.1403176801521; Thu, 19 Jun 2014 04:20:01 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp354003vcb; Thu, 19 Jun 2014 04:20:01 -0700 (PDT) X-Received: by 10.68.102.34 with SMTP id fl2mr4807801pbb.2.1403176800689; Thu, 19 Jun 2014 04:20:00 -0700 (PDT) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id wj5si5444731pbc.22.2014.06.19.04.19.59 for ; Thu, 19 Jun 2014 04:20:00 -0700 (PDT) Received-SPF: none (google.com: openembedded-devel-bounces@lists.openembedded.org does not designate permitted sender hosts) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 8D93A70197; Thu, 19 Jun 2014 11:19:49 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mail.openembedded.org (Postfix) with ESMTP id A8C8B70197 for ; Thu, 19 Jun 2014 11:19:44 +0000 (UTC) Received: by mail-wg0-f50.google.com with SMTP id x13so2103624wgg.21 for ; Thu, 19 Jun 2014 04:19:45 -0700 (PDT) X-Received: by 10.194.189.81 with SMTP id gg17mr4184480wjc.107.1403176785738; Thu, 19 Jun 2014 04:19:45 -0700 (PDT) Received: from localhost ([2001:610:612:0:2ad2:44ff:fe4b:bc17]) by mx.google.com with ESMTPSA id ub8sm10675699wib.0.2014.06.19.04.19.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jun 2014 04:19:45 -0700 (PDT) From: Koen Kooi To: openembedded-devel@lists.openembedded.org Date: Thu, 19 Jun 2014 13:19:42 +0200 Message-Id: <1403176782-30997-1-git-send-email-koen.kooi@linaro.org> X-Mailer: git-send-email 1.9.3 Cc: Koen Kooi Subject: [oe] [meta-oe][PATCH] libsdl-image: use pkg-config for libSDL detection X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: koen.kooi@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Signed-off-by: Koen Kooi --- ...igure-use-pkg-config-for-libSDL-detection.patch | 38 ++++++++++++++++++++++ .../libsdl-image/libsdl-image_1.2.12.bb | 6 ++-- 2 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-multimedia/libsdl-image/libsdl-image/0001-configure-use-pkg-config-for-libSDL-detection.patch diff --git a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/0001-configure-use-pkg-config-for-libSDL-detection.patch b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/0001-configure-use-pkg-config-for-libSDL-detection.patch new file mode 100644 index 0000000..192ee16 --- /dev/null +++ b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image/0001-configure-use-pkg-config-for-libSDL-detection.patch @@ -0,0 +1,38 @@ +From 644ec4d18eb83a0ca826001ebfb7f4782cb8db0f Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Thu, 19 Jun 2014 13:16:21 +0200 +Subject: [PATCH] configure: use pkg-config for libSDL detection + +Signed-off-by: Koen Kooi +--- + configure.in | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/configure.in b/configure.in +index e7010e9..cbb536d 100644 +--- a/configure.in ++++ b/configure.in +@@ -113,14 +113,12 @@ find_lib() + } + + dnl Check for SDL +-SDL_VERSION=1.2.10 +-AC_SUBST(SDL_VERSION) +-AM_PATH_SDL($SDL_VERSION, +- :, +- AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) +-) +-CFLAGS="$CFLAGS $SDL_CFLAGS" +-LIBS="$LIBS $SDL_LIBS" ++PKG_CHECK_MODULES([LIBSDL], [sdl > 1.2.10], [ ++ CFLAGS="$CFLAGS $LIBSDL_CFLAGS" ++ LIBS="$LIBS $LIBSDL_LIBS" ++], [ ++ AC_MSG_ERROR([$LIBXML_PKG_ERRORS]) ++]) + saved_LIBS="$LIBS" + + dnl Check command-line options +-- +1.9.3 + diff --git a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb index 4c5fe29..bc49ff8 100644 --- a/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb +++ b/meta-oe/recipes-multimedia/libsdl-image/libsdl-image_1.2.12.bb @@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=613734b7586e1580ef944961c6d62227" DEPENDS = "tiff zlib libpng jpeg virtual/libsdl" -SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz" +SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \ + file://0001-configure-use-pkg-config-for-libSDL-detection.patch \ + " SRC_URI[md5sum] = "a0f9098ebe5400f0bdc9b62e60797ecb" SRC_URI[sha256sum] = "0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699" @@ -14,8 +16,6 @@ S = "${WORKDIR}/SDL_image-${PV}" inherit autotools -export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" - # Disable the run-time loading of the libs and bring back the soname dependencies. EXTRA_OECONF += "--disable-jpg-shared --disable-png-shared -disable-tif-shared"