From patchwork Wed Apr 2 19:46:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 336450 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 2D798140128 for ; Thu, 3 Apr 2014 06:49:00 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A12C08C3D3; Wed, 2 Apr 2014 19:48:57 +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 qxTumglU-pp8; Wed, 2 Apr 2014 19:48:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id D9B258C5A3; Wed, 2 Apr 2014 19:48:20 +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 4E1F11BFA57 for ; Wed, 2 Apr 2014 19:47:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4B7268BC94 for ; Wed, 2 Apr 2014 19:47:31 +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 oTZVydfNQ_7U for ; Wed, 2 Apr 2014 19:47:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout05.t-online.de (mailout05.t-online.de [194.25.134.82]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 69F818BCB0 for ; Wed, 2 Apr 2014 19:47:30 +0000 (UTC) Received: from fwd09.aul.t-online.de (fwd09.aul.t-online.de [172.20.27.151]) by mailout05.t-online.de (Postfix) with SMTP id DC59A2EE092 for ; Wed, 2 Apr 2014 21:47:18 +0200 (CEST) Received: from fli4l.lan.fli4l (XLkemoZYwhrG7q6eBitjdBTRT0-W1qfS+PrjkggRWYBoWUjP1NK6AR3GxWRqqwEZvr@[79.247.149.125]) by fwd09.t-online.de with esmtp id 1WVR81-2Hyjce0; Wed, 2 Apr 2014 21:47:17 +0200 Received: from [192.168.1.122] (port=45260 helo=fli4lbuild64.lan.fli4l) by fli4l.lan.fli4l with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.80.1) (envelope-from ) id 1WVR80-0000Wh-J3; Wed, 02 Apr 2014 21:47:16 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Wed, 2 Apr 2014 21:46:50 +0200 Message-Id: <1396468015-1724-36-git-send-email-bernd.kuhls@t-online.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1396468015-1724-1-git-send-email-bernd.kuhls@t-online.de> References: <1396468015-1724-1-git-send-email-bernd.kuhls@t-online.de> X-ID: XLkemoZYwhrG7q6eBitjdBTRT0-W1qfS+PrjkggRWYBoWUjP1NK6AR3GxWRqqwEZvr X-TOI-MSGID: 229ae3f7-797e-422b-bec1-fcca759d1177 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH v2 36/41] WIP: xbmc: Add X.org 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 Signed-off-by: Bernd Kuhls --- package/xbmc/Config.in | 10 ++++++++++ package/xbmc/xbmc.mk | 42 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/package/xbmc/Config.in b/package/xbmc/Config.in index e0576b6..765f325 100644 --- a/package/xbmc/Config.in +++ b/package/xbmc/Config.in @@ -20,6 +20,8 @@ menuconfig BR2_PACKAGE_XBMC select BR2_PACKAGE_LIBCDIO select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBFRIBIDI + select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBID3TAG select BR2_PACKAGE_LIBMAD @@ -48,10 +50,18 @@ menuconfig BR2_PACKAGE_XBMC select BR2_PACKAGE_PYTHON_UNICODEDATA select BR2_PACKAGE_PYTHON_ZLIB select BR2_PACKAGE_READLINE + select BR2_PACKAGE_SDL if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_SDL_X11 if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_SDL_IMAGE if BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_SQLITE select BR2_PACKAGE_TAGLIB select BR2_PACKAGE_TIFF select BR2_PACKAGE_TINYXML + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_XMU if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_XRANDR if BR2_PACKAGE_XSERVER_XORG_SERVER + select BR2_PACKAGE_XLIB_XT if BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_YAJL select BR2_PACKAGE_ZLIB depends on BR2_LARGEFILE diff --git a/package/xbmc/xbmc.mk b/package/xbmc/xbmc.mk index e5eadd9..691cad6 100644 --- a/package/xbmc/xbmc.mk +++ b/package/xbmc/xbmc.mk @@ -14,7 +14,7 @@ XBMC_LICENSE_FILES = LICENSE.GPL # http://wiki.xbmc.org/index.php?title=TexturePacker XBMC_DEPENDENCIES = host-gawk host-gperf host-infozip host-lzo host-sdl_image host-swig XBMC_DEPENDENCIES += boost bzip2 expat flac fontconfig freetype jasper jpeg \ - libass libcdio libcurl libegl libfribidi libgcrypt libgles libmad libmodplug libmpeg2 \ + libass libcdio libcurl libfribidi libgcrypt libmad libmodplug libmpeg2 \ libogg libplist libpng libsamplerate libungif libvorbis libxml2 libxslt lzo ncurses \ openssl pcre python readline sqlite taglib tiff tinyxml yajl zlib @@ -31,7 +31,6 @@ XBMC_CONF_OPT += \ --disable-crystalhd \ --disable-debug \ --disable-dvdcss \ - --disable-gl \ --disable-hal \ --disable-joystick \ --disable-mysql \ @@ -39,14 +38,10 @@ XBMC_CONF_OPT += \ --disable-optical-drive \ --disable-projectm \ --disable-pulse \ - --disable-sdl \ --disable-ssh \ --disable-vaapi \ --disable-vdpau \ --disable-vtbdecoder \ - --disable-x11 \ - --disable-xrandr \ - --enable-gles \ --enable-optimizations ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) @@ -60,6 +55,41 @@ ifeq ($(BR2_PACKAGE_DBUS),y) XBMC_DEPENDENCIES += dbus endif +ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER),y) +XBMC_DEPENDENCIES += \ + libglew \ + libglu \ + mesa3d \ + sdl_image \ + xlib_libX11 \ + xlib_libXext \ + xlib_libXmu \ + xlib_libXrandr \ + xlib_libXt +XBMC_CONF_OPT += \ + --enable-x11 \ + --enable-xrandr \ + --enable-gl \ + --enable-sdl +else +XBMC_CONF_OPT += \ + --disable-x11 \ + --disable-xrandr \ + --disable-gl \ + --disable-sdl +endif + +ifeq ($(BR2_PACKAGE_HAS_OPENGL_EGL),y) +XBMC_DEPENDENCIES += libegl +endif + +ifeq ($(BR2_PACKAGE_HAS_OPENGL_ES),y) +XBMC_DEPENDENCIES += libgles +XBMC_CONF_OPT += --enable-gles +else +XBMC_CONF_OPT += --disable-gles +endif + ifeq ($(BR2_PACKAGE_XBMC_LIBUSB),y) XBMC_DEPENDENCIES += libusb-compat XBMC_CONF_OPT += --enable-libusb