From patchwork Mon Jul 23 09:49:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 172612 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 8ADD42C0336 for ; Mon, 23 Jul 2012 19:49:35 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A9F70101A40; Mon, 23 Jul 2012 09:49:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tACd2QIzIROh; Mon, 23 Jul 2012 09:49:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4E86AFFE6B; Mon, 23 Jul 2012 09:49:29 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 1D4EB8F753 for ; Mon, 23 Jul 2012 09:49:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 10BB9FFE6B for ; Mon, 23 Jul 2012 09:49:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OSiHDzFKF4Rc for ; Mon, 23 Jul 2012 09:49:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-bk0-f46.google.com (mail-bk0-f46.google.com [209.85.214.46]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 5D982FFD5C for ; Mon, 23 Jul 2012 09:49:26 +0000 (UTC) Received: by bkwj10 with SMTP id j10so5031495bkw.33 for ; Mon, 23 Jul 2012 02:49:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=N3majBCQsV1s8B5kgB+HLdvvFNHPQCn9BL6nCYlKctY=; b=kSvKEKUG8z5iQ/FDttrQiowiUe3CWNwTp2gn1dotMibbSmLi1iCsju7pgHiD2HLqL8 k0i17dzeXbO3b+qnQ1i7ldCnxlyMMXQiTihsD0QYo/VxX2JSfM92/16Q9wEEWToLKsIM 8s6EokIrv7YY+5iVaOcyFP8tq4Fq7mJNPzvfyw8wqNHW4PLBm1/YvI4WdDMJHut/5GAE ud4J/wjHnI9Mv6rAwqcK/cbaXgWbJeGteOLlEtpy7NcDcE6w6SiUA7s+PI7rmyR40Y+o 0gLHGNQWq9n+noLaKidiRDZbD64jbIETvPi5uuksttPX049oPqYW1jpnBiUBp2scA2Y8 b7Uw== Received: by 10.204.156.73 with SMTP id v9mr7128251bkw.116.1343036964284; Mon, 23 Jul 2012 02:49:24 -0700 (PDT) Received: from macbook.be.48ers.dk (178-117-125-45.access.telenet.be. [178.117.125.45]) by mx.google.com with ESMTPS id n5sm6686667bkv.14.2012.07.23.02.49.22 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 Jul 2012 02:49:23 -0700 (PDT) Received: by macbook.be.48ers.dk (Postfix, from userid 1000) id 47B5CC3B46; Mon, 23 Jul 2012 11:49:21 +0200 (CEST) From: Peter Korsgaard To: buildroot@uclibc.org Date: Mon, 23 Jul 2012 11:49:19 +0200 Message-Id: <1343036959-7639-1-git-send-email-jacmet@sunsite.dk> X-Mailer: git-send-email 1.7.10 Cc: Peter Korsgaard Subject: [Buildroot] [PATCH] mediastreamer: fix build with libX11 and sdl without x11 support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Fixes http://autobuild.buildroot.net/results/a8f2db4a40c0f53c0d25b2632fe87c2ce136f770 Mediastreamer assumes SDL has X11 support if SDL and libX11 are found, which is not necessarily true in BR. Signed-off-by: Peter Korsgaard --- package/mediastreamer/mediastreamer.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/mediastreamer/mediastreamer.mk b/package/mediastreamer/mediastreamer.mk index 9e67ed4..1f4e1d4 100644 --- a/package/mediastreamer/mediastreamer.mk +++ b/package/mediastreamer/mediastreamer.mk @@ -48,9 +48,10 @@ else MEDIASTREAMER_CONF_OPT += --disable-sdl endif -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) +# mediastreamer assumes SDL has X11 support if --enable-x11 (and X11 support +# is only used for SDL output) +ifeq ($(BR2_PACKAGE_SDL_X11),y) MEDIASTREAMER_CONF_OPT += --enable-x11 -MEDIASTREAMER_DEPENDENCIES += xlib_libX11 else MEDIASTREAMER_CONF_OPT += --disable-x11 endif