From patchwork Sun Jun 3 18:51:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 162587 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id E7F23B6FB6 for ; Mon, 4 Jun 2012 04:51:24 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B77E48FA6D; Sun, 3 Jun 2012 18:51:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nOnZYNNVu+S9; Sun, 3 Jun 2012 18:51:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 584D38FA75; Sun, 3 Jun 2012 18:51:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C1BF48F753 for ; Sun, 3 Jun 2012 18:51:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B75F88FA75 for ; Sun, 3 Jun 2012 18:51:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HWiesyV8BxBB for ; Sun, 3 Jun 2012 18:51:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) by whitealder.osuosl.org (Postfix) with ESMTPS id 675758FA6D for ; Sun, 3 Jun 2012 18:51:16 +0000 (UTC) Received: by wgbds1 with SMTP id ds1so1917118wgb.4 for ; Sun, 03 Jun 2012 11:51:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=zQJI1SXRYbXtGB+3otoCu8FrqYpf2cHImxKemJuzF1Q=; b=D/+ZR9Z3hGTGH2Qt0ktG9ndfmsSQZ1Pk89FzfwdLoo5v67HMiyGOrZQgRB1LNswOtu sIf4Z38a5luXAPqVidvEUnN8Pl4x6f9I2DXJm0I+lKnJigtHToG5qhSftdyD8MM1ipW0 cb3+OvlnrZ2IZdVFyMQD5GXrUO9mzTh26LHZ0tBIhvVgXxFoEMQNzWJruNY2u0dvdYvl nU0ydwfFiBFBfPI3Iq1oq0d1alrOKXSQJbodd3XDAUHkNPtIg5XN49K/nxq31VSfzQNL GUCSJ/6QzKQUkijXqQMydPcRC74RmGSjtGwo54dRQavl09ZFZs4fc5KTnynqdFi7/RDh gLZA== Received: by 10.216.198.14 with SMTP id u14mr2999515wen.12.1338749474488; Sun, 03 Jun 2012 11:51:14 -0700 (PDT) Received: from localhost.localdomain (host-78-150-204-81.as13285.net. [78.150.204.81]) by mx.google.com with ESMTPS id ez4sm14648621wid.3.2012.06.03.11.51.12 (version=SSLv3 cipher=OTHER); Sun, 03 Jun 2012 11:51:13 -0700 (PDT) From: spdawson@gmail.com To: buildroot@busybox.net Date: Sun, 3 Jun 2012 19:51:11 +0100 Message-Id: <1338749471-20828-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Buildroot] [PATCH] gstreamer: add xorg 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 From: Simon Dawson GStreamer requires xorg support in order for the ximagesink and xvimagesink plugins to be available. Signed-off-by: Simon Dawson --- .../gst-plugins-base/gst-plugins-base.mk | 16 +++++++++++++--- .../gst-plugins-good/gst-plugins-good.mk | 16 +++++++++++++--- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk index 848eaf2..e35a606 100644 --- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk +++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk @@ -17,15 +17,25 @@ GST_PLUGINS_BASE_CONF_ENV = GST_PLUGINS_BASE_CONF_OPT = \ --disable-examples \ - --disable-x \ - --disable-xvideo \ - --disable-xshm \ --disable-oggtest \ --disable-vorbistest \ --disable-freetypetest GST_PLUGINS_BASE_DEPENDENCIES = gstreamer +ifeq ($(BR2_PACKAGE_XORG7),y) +GST_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv +GST_PLUGINS_BASE_CONF_OPT += \ + --enable-x \ + --enable-xshm \ + --enable-xvideo +else +GST_PLUGINS_BASE_CONF_OPT += \ + --disable-x \ + --disable-xshm \ + --disable-xvideo +endif + ifeq ($(BR2_PACKAGE_ORC),y) GST_PLUGINS_BASE_DEPENDENCIES += orc endif diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk index 4e6b73e..ebd463b 100644 --- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk +++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk @@ -14,9 +14,6 @@ GST_PLUGINS_GOOD_CONF_OPT = \ --disable-sunaudio \ --disable-osx_audio \ --disable-osx_video \ - --disable-x \ - --disable-xshm \ - --disable-xvideo \ --disable-aalib \ --disable-aalibtest \ --disable-esd \ @@ -25,6 +22,19 @@ GST_PLUGINS_GOOD_CONF_OPT = \ GST_PLUGINS_GOOD_DEPENDENCIES = gstreamer gst-plugins-base +ifeq ($(BR2_PACKAGE_XORG7),y) +GST_PLUGINS_GOOD_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv +GST_PLUGINS_GOOD_CONF_OPT += \ + --enable-x \ + --enable-xshm \ + --enable-xvideo +else +GST_PLUGINS_GOOD_CONF_OPT += \ + --disable-x \ + --disable-xshm \ + --disable-xvideo +endif + ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG),y) GST_PLUGINS_GOOD_CONF_OPT += --enable-jpeg GST_PLUGINS_GOOD_DEPENDENCIES += jpeg