From patchwork Tue Jun 5 06:11:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 163019 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 B073CB6F86 for ; Tue, 5 Jun 2012 16:12:59 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2FED1101E21; Tue, 5 Jun 2012 06:12:58 +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 ovbVkM4jgLVr; Tue, 5 Jun 2012 06:12:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2372D101C97; Tue, 5 Jun 2012 06:12:55 +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 B920C8F75B for ; Tue, 5 Jun 2012 06:12:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B3C578D2A8 for ; Tue, 5 Jun 2012 06:12:54 +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 5o46ObbSDhyg for ; Tue, 5 Jun 2012 06:12:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by whitealder.osuosl.org (Postfix) with ESMTPS id 063AE8D232 for ; Tue, 5 Jun 2012 06:12:52 +0000 (UTC) Received: by wibhn6 with SMTP id hn6so2951909wib.10 for ; Mon, 04 Jun 2012 23:12:51 -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=6dTaouxrSUaGAd/XEep6uisoBw1lzoZ63NGCASllU2Y=; b=ySNn/Hfx4D51vecBLVh5fGE1KoL6CF3LnIjAisRGRRRGxoDijoxBXhqd8OPN2e/7xj ZExfgg/zkbuvxczOocVTYHDlSYLVNyr+BXEhr4fkM0ujhICvJkbCDm0D+tufOChPyPx7 vsFlhubIx300celNJsUW2DrWWAE92vpquGw399MbhmwqyxHOA44dUzb4fEkZzfmLJJFa OoXqX7Vl13okagMBfmcjLL7W9U2t9fMoH/7GjfGpMrUJ4FfCi4dEtxeBAYyQxHrgu62j jV8UNwBa6Z82K8Ograme3koEgerlok6DtsP+x15Aqngab18kv1s5C3iXp+cnqgiS1sGW h/kw== Received: by 10.216.208.221 with SMTP id q71mr12708808weo.174.1338876768879; Mon, 04 Jun 2012 23:12:48 -0700 (PDT) Received: from localhost.localdomain (host-78-150-204-81.as13285.net. [78.150.204.81]) by mx.google.com with ESMTPS id ei4sm2769495wid.5.2012.06.04.23.12.47 (version=SSLv3 cipher=OTHER); Mon, 04 Jun 2012 23:12:47 -0700 (PDT) From: spdawson@gmail.com To: buildroot@busybox.net Date: Tue, 5 Jun 2012 07:11:42 +0100 Message-Id: <1338876702-5506-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 --- package/multimedia/gst-plugins-base/Config.in | 3 +++ .../gst-plugins-base/gst-plugins-base.mk | 16 +++++++++++++--- .../gst-plugins-good/gst-plugins-good.mk | 16 +++++++++++++--- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/package/multimedia/gst-plugins-base/Config.in b/package/multimedia/gst-plugins-base/Config.in index 851337b..5d82533 100644 --- a/package/multimedia/gst-plugins-base/Config.in +++ b/package/multimedia/gst-plugins-base/Config.in @@ -1,6 +1,9 @@ menuconfig BR2_PACKAGE_GST_PLUGINS_BASE bool "gst-plugins-base" depends on BR2_PACKAGE_GSTREAMER + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXV if BR2_PACKAGE_XORG7 help A basic set of well-supported plug-ins for GStreamer. 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