From 430f5ad710a0c7ff3cabebbbc6f4caa531a9c5fe Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 14 Jan 2012 11:49:17 +0100 Subject: [PATCH] Mesa: update to Mesa-8.0-rc1, remove package 'mesa' Signed-off-by: Stephan Raue --- .../addons/service/multimedia/boblightd/meta | 4 +- packages/debug/mesa-demos/meta | 4 +- packages/graphics/Mesa/build | 23 +++- packages/graphics/Mesa/install | 9 +- packages/graphics/Mesa/meta | 14 ++- .../Mesa/patches/Mesa-7.11-llvm_so.patch | 12 -- .../patches/Mesa-8.0-rc1-llvm_so.patch} | 0 ...49d1ac53a66e6efb56ccf2a5953418a26ca.patch} | 0 packages/graphics/cairo/meta | 4 +- packages/graphics/glew/meta | 4 +- packages/graphics/mesa/build | 109 ------------------ packages/graphics/mesa/install | 44 ------- packages/graphics/mesa/meta | 54 --------- packages/mediacenter/xbmc-pvr/meta | 4 +- packages/mediacenter/xbmc/meta | 4 +- packages/multimedia/SDL/meta | 4 +- packages/multimedia/SDL_ttf/meta | 4 +- packages/multimedia/libva/meta | 4 +- packages/x11/driver/xf86-video-nouveau/meta | 4 +- packages/x11/xserver/xorg-server/meta | 4 +- projects/ATV/options | 3 - projects/Fusion/options | 3 - projects/Generic/options | 3 - projects/Generic_OSS/options | 3 - projects/ION/options | 3 - projects/Intel/options | 3 - projects/Ultra/options | 3 - 27 files changed, 58 insertions(+), 272 deletions(-) delete mode 100644 packages/graphics/Mesa/patches/Mesa-7.11-llvm_so.patch rename packages/graphics/{mesa/patches/mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8-llvm_so.patch => Mesa/patches/Mesa-8.0-rc1-llvm_so.patch} (100%) rename packages/graphics/{mesa/patches/mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8-revert_dc7f449d1ac53a66e6efb56ccf2a5953418a26ca.patch => Mesa/patches/Mesa-8.0-rc1-revert_dc7f449d1ac53a66e6efb56ccf2a5953418a26ca.patch} (100%) delete mode 100755 packages/graphics/mesa/build delete mode 100755 packages/graphics/mesa/install delete mode 100644 packages/graphics/mesa/meta diff --git a/packages/addons/service/multimedia/boblightd/meta b/packages/addons/service/multimedia/boblightd/meta index cba90a8862..c38d3d6981 100644 --- a/packages/addons/service/multimedia/boblightd/meta +++ b/packages/addons/service/multimedia/boblightd/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://code.google.com/p/boblight" PKG_URL="http://dl.dropbox.com/u/10051534/$PKG_NAME.tar.gz" -PKG_DEPENDS="libX11 libXext libX11 libXrender $MESA" -PKG_BUILD_DEPENDS="toolchain libX11 libXext libXrender $MESA" +PKG_DEPENDS="libX11 libXext libX11 libXrender Mesa" +PKG_BUILD_DEPENDS="toolchain libX11 libXext libXrender Mesa" PKG_PRIORITY="optional" PKG_SECTION="service/multimedia" PKG_SHORTDESC="boblightd: an ambilight controller." diff --git a/packages/debug/mesa-demos/meta b/packages/debug/mesa-demos/meta index ee98876b45..da88c4217a 100644 --- a/packages/debug/mesa-demos/meta +++ b/packages/debug/mesa-demos/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.mesa3d.org/" PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/demos/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="libX11 $MESA glew" -PKG_BUILD_DEPENDS="toolchain libX11 $MESA glew" +PKG_DEPENDS="libX11 Mesa glew" +PKG_BUILD_DEPENDS="toolchain libX11 Mesa glew" PKG_PRIORITY="optional" PKG_SECTION="debug" PKG_SHORTDESC="mesa-demos: Mesa 3D demos" diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build index 98de9c053c..2a7cde4b55 100755 --- a/packages/graphics/Mesa/build +++ b/packages/graphics/Mesa/build @@ -37,6 +37,18 @@ else MESA_GALLIUM_LLVM="--disable-gallium-llvm" fi +if [ "$MESA_VDPAU_SUPPORT" = "yes" ]; then + MESA_VDPAU="--enable-vdpau" +else + MESA_VDPAU="--disable-vdpau" +fi + +if [ "$MESA_VAAPI_SUPPORT" = "yes" ]; then + MESA_VAAPI="--enable-va" +else + MESA_VAAPI="--disable-va" +fi + cd $PKG_BUILD HOST_CC="$HOST_CC" \ @@ -62,22 +74,21 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \ --disable-openvg \ --disable-xorg \ --enable-glu \ - --disable-gl-osmesa \ - --disable-glut \ - --disable-glw \ - --disable-motif \ + --disable-osmesa \ --disable-d3d1x \ --disable-egl \ --disable-gbm \ + --disable-xvmc \ + $MESA_VDPAU \ + $MESA_VAAPI \ --disable-gallium-egl \ --disable-gallium-gbm \ --enable-shared-glapi \ --enable-xcb \ - --disable-shared-dricore \ + --enable-shared-dricore \ --disable-egl \ $MESA_GALLIUM_LLVM \ --with-gallium-drivers="$GALLIUM_DRIVERS" \ - --with-driver="dri" \ --with-dri-drivers="$DRI_DRIVERS" \ --with-x \ diff --git a/packages/graphics/Mesa/install b/packages/graphics/Mesa/install index 45caf0386a..8c4faba861 100755 --- a/packages/graphics/Mesa/install +++ b/packages/graphics/Mesa/install @@ -30,10 +30,15 @@ mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/lib/libglapi.so* $INSTALL/usr/lib mkdir -p $INSTALL/usr/lib/dri -# cp -P $PKG_BUILD/lib/libdricore.so $INSTALL/usr/lib -# cp -P $PKG_BUILD/lib/libglsl.so $INSTALL/usr/lib + cp -P $PKG_BUILD/lib/libdricore.so $INSTALL/usr/lib/dri + cp -P $PKG_BUILD/lib/libglsl.so $INSTALL/usr/lib/dri cp -P $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri || true cp -P $PKG_BUILD/lib/gallium/*_dri.so $INSTALL/usr/lib/dri || true mkdir -p $INSTALL/usr/lib/xorg/modules/drivers cp -P $PKG_BUILD/lib/gallium/*_drv.so $INSTALL/usr/lib/xorg/modules/drivers || true + +if [ "$MESA_VDPAU_SUPPORT" = "yes" ]; then + mkdir -p $INSTALL/usr/lib/vdpau + cp -P $PKG_BUILD/lib/gallium/libvdpau_*.so* $INSTALL/usr/lib/vdpau +fi diff --git a/packages/graphics/Mesa/meta b/packages/graphics/Mesa/meta index 6879701736..16f90ea962 100644 --- a/packages/graphics/Mesa/meta +++ b/packages/graphics/Mesa/meta @@ -19,12 +19,12 @@ ################################################################################ PKG_NAME="Mesa" -PKG_VERSION="7.11" +PKG_VERSION="8.0-rc1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.mesa3d.org/" -PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2" +PKG_URL="ftp://freedesktop.org/pub/mesa/8.0/MesaLib-$PKG_VERSION.tar.bz2" PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libXxf86vm libxcb libX11" PKG_BUILD_DEPENDS="toolchain Python-host makedepend libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11" PKG_PRIORITY="optional" @@ -41,3 +41,13 @@ if [ "$LLVM_SUPPORT" = "yes" ]; then PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS llvm" PKG_DEPENDS="$PKG_DEPENDS llvm" fi + +if [ "$MESA_VDPAU_SUPPORT" = "yes" ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libvdpau" + PKG_DEPENDS="$PKG_DEPENDS libvdpau" +fi + +if [ "$MESA_VAAPI_SUPPORT" = "yes" ]; then + PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libva" + PKG_DEPENDS="$PKG_DEPENDS libva" +fi diff --git a/packages/graphics/Mesa/patches/Mesa-7.11-llvm_so.patch b/packages/graphics/Mesa/patches/Mesa-7.11-llvm_so.patch deleted file mode 100644 index 378b1a7a70..0000000000 --- a/packages/graphics/Mesa/patches/Mesa-7.11-llvm_so.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur Mesa-7.11-rc2-old/configure.ac Mesa-7.11-rc2-new/configure.ac ---- Mesa-7.11-rc2-old/configure.ac 2011-07-19 16:39:56.000000000 -0700 -+++ Mesa-7.11-rc2-new/configure.ac 2011-07-21 10:08:33.000000000 -0700 -@@ -1737,7 +1737,7 @@ - if test "x$LLVM_CONFIG" != xno; then - LLVM_VERSION=`$LLVM_CONFIG --version` - LLVM_CFLAGS=`$LLVM_CONFIG --cppflags` -- LLVM_LIBS="`$LLVM_CONFIG --libs` -lstdc++" -+ LLVM_LIBS="-lLLVM-$LLVM_VERSION -lstdc++" - - LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags` - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe" diff --git a/packages/graphics/mesa/patches/mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8-llvm_so.patch b/packages/graphics/Mesa/patches/Mesa-8.0-rc1-llvm_so.patch similarity index 100% rename from packages/graphics/mesa/patches/mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8-llvm_so.patch rename to packages/graphics/Mesa/patches/Mesa-8.0-rc1-llvm_so.patch diff --git a/packages/graphics/mesa/patches/mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8-revert_dc7f449d1ac53a66e6efb56ccf2a5953418a26ca.patch b/packages/graphics/Mesa/patches/Mesa-8.0-rc1-revert_dc7f449d1ac53a66e6efb56ccf2a5953418a26ca.patch similarity index 100% rename from packages/graphics/mesa/patches/mesa-a56a732c6991f47d63f5ccbb27a45467541c43f8-revert_dc7f449d1ac53a66e6efb56ccf2a5953418a26ca.patch rename to packages/graphics/Mesa/patches/Mesa-8.0-rc1-revert_dc7f449d1ac53a66e6efb56ccf2a5953418a26ca.patch diff --git a/packages/graphics/cairo/meta b/packages/graphics/cairo/meta index 00fd0bc6ba..9dd9fa2ecd 100644 --- a/packages/graphics/cairo/meta +++ b/packages/graphics/cairo/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="LGPL" PKG_SITE="http://cairographics.org/" PKG_URL="http://cairographics.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="zlib freetype fontconfig libpng pixman libXrender libX11 $MESA" -PKG_BUILD_DEPENDS="toolchain zlib freetype fontconfig libpng pixman libXrender libX11 $MESA" +PKG_DEPENDS="zlib freetype fontconfig libpng pixman libXrender libX11 Mesa" +PKG_BUILD_DEPENDS="toolchain zlib freetype fontconfig libpng pixman libXrender libX11 Mesa" PKG_PRIORITY="optional" PKG_SECTION="graphics" PKG_SHORTDESC="cairo: Multi-platform 2D graphics library" diff --git a/packages/graphics/glew/meta b/packages/graphics/glew/meta index fb4eb79e72..aef2335097 100644 --- a/packages/graphics/glew/meta +++ b/packages/graphics/glew/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="BSD" PKG_SITE="http://glew.sourceforge.net/" PKG_URL="$SOURCEFORGE_SRC/glew/glew/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tgz" -PKG_DEPENDS="libX11 libXext libXi libXmu $MESA" -PKG_BUILD_DEPENDS="toolchain libX11 libXext libXi libXmu $MESA" +PKG_DEPENDS="libX11 libXext libXi libXmu Mesa" +PKG_BUILD_DEPENDS="toolchain libX11 libXext libXi libXmu Mesa" PKG_PRIORITY="optional" PKG_SECTION="graphics" PKG_SHORTDESC="glew: The OpenGL Extension Wrangler Library" diff --git a/packages/graphics/mesa/build b/packages/graphics/mesa/build deleted file mode 100755 index 2a7cde4b55..0000000000 --- a/packages/graphics/mesa/build +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -get_graphicdrivers - -# dont use gold linker because of compiling issues - strip_gold - -# Mesa fails to build with LTO optimization - strip_lto - -if [ "$LLVM_SUPPORT" = "yes" ]; then - export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config" - MESA_GALLIUM_LLVM="--enable-gallium-llvm" -else - MESA_GALLIUM_LLVM="--disable-gallium-llvm" -fi - -if [ "$MESA_VDPAU_SUPPORT" = "yes" ]; then - MESA_VDPAU="--enable-vdpau" -else - MESA_VDPAU="--disable-vdpau" -fi - -if [ "$MESA_VAAPI_SUPPORT" = "yes" ]; then - MESA_VAAPI="--enable-va" -else - MESA_VAAPI="--disable-va" -fi - -cd $PKG_BUILD - -HOST_CC="$HOST_CC" \ -HOST_OPT_FLAGS="$HOST_CFLAGS" \ -X11_INCLUDES= \ -DRI_DRIVER_INSTALL_DIR="$XORG_PATH_DRI" \ -DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \ -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --enable-shared \ - --disable-debug \ - --enable-texture-float \ - --disable-selinux \ - --enable-opengl \ - --enable-glx-tls \ - --enable-driglx-direct \ - --disable-gles1 \ - --disable-gles2 \ - --disable-openvg \ - --disable-xorg \ - --enable-glu \ - --disable-osmesa \ - --disable-d3d1x \ - --disable-egl \ - --disable-gbm \ - --disable-xvmc \ - $MESA_VDPAU \ - $MESA_VAAPI \ - --disable-gallium-egl \ - --disable-gallium-gbm \ - --enable-shared-glapi \ - --enable-xcb \ - --enable-shared-dricore \ - --disable-egl \ - $MESA_GALLIUM_LLVM \ - --with-gallium-drivers="$GALLIUM_DRIVERS" \ - --with-dri-drivers="$DRI_DRIVERS" \ - --with-x \ - -make CC="$HOST_CC" \ - CXX="$HOST_CXX" \ - CFLAGS="$HOST_CFLAGS" \ - CXXFLAGS="$HOST_CXXFLAGS" \ - LDFLAGS="$HOST_LDFLAGS" \ - -C src/glsl builtin_compiler - -cp src/glsl/builtin_compiler $ROOT/$TOOLCHAIN/bin -make -C src/glsl clean - -sed -e "s#\.\/builtin_compiler#$ROOT/$TOOLCHAIN/bin/builtin_compiler#g" -i src/glsl/Makefile - -make - -$MAKEINSTALL diff --git a/packages/graphics/mesa/install b/packages/graphics/mesa/install deleted file mode 100755 index 8c4faba861..0000000000 --- a/packages/graphics/mesa/install +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/lib - cp -P $PKG_BUILD/lib/libGL.so.1.2 $INSTALL/usr/lib/libGL_mesa.so.1 # rename for cooperate with nvidia drivers - ln -sf libGL.so.1 $INSTALL/usr/lib/libGL.so - ln -sf /var/lib/libGL.so $INSTALL/usr/lib/libGL.so.1 - cp -P $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib - cp -P $PKG_BUILD/lib/libglapi.so* $INSTALL/usr/lib - -mkdir -p $INSTALL/usr/lib/dri - cp -P $PKG_BUILD/lib/libdricore.so $INSTALL/usr/lib/dri - cp -P $PKG_BUILD/lib/libglsl.so $INSTALL/usr/lib/dri - cp -P $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri || true - cp -P $PKG_BUILD/lib/gallium/*_dri.so $INSTALL/usr/lib/dri || true - -mkdir -p $INSTALL/usr/lib/xorg/modules/drivers - cp -P $PKG_BUILD/lib/gallium/*_drv.so $INSTALL/usr/lib/xorg/modules/drivers || true - -if [ "$MESA_VDPAU_SUPPORT" = "yes" ]; then - mkdir -p $INSTALL/usr/lib/vdpau - cp -P $PKG_BUILD/lib/gallium/libvdpau_*.so* $INSTALL/usr/lib/vdpau -fi diff --git a/packages/graphics/mesa/meta b/packages/graphics/mesa/meta deleted file mode 100644 index 10321a7005..0000000000 --- a/packages/graphics/mesa/meta +++ /dev/null @@ -1,54 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="mesa" -#PKG_VERSION="cf5948380829ff44aafb12c911b0fc064360d352" -PKG_VERSION="a56a732c6991f47d63f5ccbb27a45467541c43f8" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://www.mesa3d.org/" -PKG_URL="http://cgit.freedesktop.org/mesa/mesa/snapshot/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libXxf86vm libxcb libX11" -PKG_BUILD_DEPENDS="toolchain Python-host makedepend libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11" -PKG_PRIORITY="optional" -PKG_SECTION="graphics" -PKG_SHORTDESC="mesa: 3-D graphics library with OpenGL API" -PKG_LONGDESC="Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax or state machine, it is being used with authorization from Silicon Graphics, Inc. However, the author makes no claim that Mesa is in any way a compatible replacement for OpenGL or associated with Silicon Graphics, Inc. Those who want a licensed implementation of OpenGL should contact a licensed vendor. While Mesa is not a licensed OpenGL implementation, it is currently being tested with the OpenGL conformance tests. For the current conformance status see the CONFORM file included in the Mesa distribution." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="yes" - -get_graphicdrivers - -if [ "$LLVM_SUPPORT" = "yes" ]; then - PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS llvm" - PKG_DEPENDS="$PKG_DEPENDS llvm" -fi - -if [ "$MESA_VDPAU_SUPPORT" = "yes" ]; then - PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libvdpau" - PKG_DEPENDS="$PKG_DEPENDS libvdpau" -fi - -if [ "$MESA_VAAPI_SUPPORT" = "yes" ]; then - PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libva" - PKG_DEPENDS="$PKG_DEPENDS libva" -fi diff --git a/packages/mediacenter/xbmc-pvr/meta b/packages/mediacenter/xbmc-pvr/meta index 86a890f32a..38e464484a 100644 --- a/packages/mediacenter/xbmc-pvr/meta +++ b/packages/mediacenter/xbmc-pvr/meta @@ -26,8 +26,8 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" #PKG_URL="http://gujs.openelec.tv/sources/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings xbmc-addon-xvdr" -PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql" +PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings xbmc-addon-xvdr" +PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql" PKG_PRIORITY="optional" PKG_SECTION="mediacenter" PKG_SHORTDESC="xbmc: XBMC Mediacenter" diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 5560220874..8048c64420 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings" -PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql" +PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings" +PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql" PKG_PRIORITY="optional" PKG_SECTION="mediacenter" PKG_SHORTDESC="xbmc: XBMC Mediacenter" diff --git a/packages/multimedia/SDL/meta b/packages/multimedia/SDL/meta index a05d37f93c..b6adedb2c8 100644 --- a/packages/multimedia/SDL/meta +++ b/packages/multimedia/SDL/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.libsdl.org/" PKG_URL="http://www.libsdl.org/release/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="alsa-lib libX11 libXrandr $MESA" -PKG_BUILD_DEPENDS="toolchain yasm alsa-lib libX11 libXrandr $MESA" +PKG_DEPENDS="alsa-lib libX11 libXrandr Mesa" +PKG_BUILD_DEPENDS="toolchain yasm alsa-lib libX11 libXrandr Mesa" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="libsdl: A cross-platform Graphic API" diff --git a/packages/multimedia/SDL_ttf/meta b/packages/multimedia/SDL_ttf/meta index 5fd71fa7f9..b79b3b6ce5 100644 --- a/packages/multimedia/SDL_ttf/meta +++ b/packages/multimedia/SDL_ttf/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.libsdl.org/" PKG_URL="http://www.libsdl.org/projects/SDL_ttf/release/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="SDL libICE libX11 freetype $MESA" -PKG_BUILD_DEPENDS="toolchain SDL libICE libX11 freetype $MESA" +PKG_DEPENDS="SDL libICE libX11 freetype Mesa" +PKG_BUILD_DEPENDS="toolchain SDL libICE libX11 freetype Mesa" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="libsdl_ttf: A library to use TrueType fonts in SDL applications" diff --git a/packages/multimedia/libva/meta b/packages/multimedia/libva/meta index 9801b33d44..323d23c599 100644 --- a/packages/multimedia/libva/meta +++ b/packages/multimedia/libva/meta @@ -25,8 +25,8 @@ PKG_ARCH="i386 x86_64" PKG_LICENSE="GPL" PKG_SITE="http://freedesktop.org/wiki/Software/vaapi" PKG_URL="http://cgit.freedesktop.org/libva/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="libX11 libXext libXfixes libdrm $MESA" -PKG_BUILD_DEPENDS="toolchain libX11 libXext libXfixes libdrm $MESA" +PKG_DEPENDS="libX11 libXext libXfixes libdrm Mesa" +PKG_BUILD_DEPENDS="toolchain libX11 libXext libXfixes libdrm Mesa" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="libva: The main motivation for VAAPI (Video Acceleration API) is to enable hardware accelerated video decode/encode at various entry-points (VLD, IDCT, Motion Compensation etc.) for the prevailing coding standards today (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3)." diff --git a/packages/x11/driver/xf86-video-nouveau/meta b/packages/x11/driver/xf86-video-nouveau/meta index 7ee929140d..07905577c0 100644 --- a/packages/x11/driver/xf86-video-nouveau/meta +++ b/packages/x11/driver/xf86-video-nouveau/meta @@ -25,8 +25,8 @@ PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" PKG_SITE="http://www.x.org/" PKG_URL="http://cgit.freedesktop.org/nouveau/xf86-video-nouveau/snapshot/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="libXrandr libXrender libdrm libXext libpciaccess udev $MESA" -PKG_BUILD_DEPENDS="toolchain util-macros libXrandr libXrender libdrm libXext libpciaccess udev $MESA xorg-server" +PKG_DEPENDS="libXrandr libXrender libdrm libXext libpciaccess udev Mesa" +PKG_BUILD_DEPENDS="toolchain util-macros libXrandr libXrender libdrm libXext libpciaccess udev Mesa xorg-server" PKG_PRIORITY="optional" PKG_SECTION="x11/driver" PKG_SHORTDESC="xf86-video-nouveau: Nouveau display driver (experimental)" diff --git a/packages/x11/xserver/xorg-server/meta b/packages/x11/xserver/xorg-server/meta index 0c6bccbb44..68b726e22b 100644 --- a/packages/x11/xserver/xorg-server/meta +++ b/packages/x11/xserver/xorg-server/meta @@ -25,8 +25,8 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="libpciaccess freetype libX11 libXfont libdrm $MESA openssl pixman udev" -PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto recordproto renderproto scrnsaverproto videoproto inputproto xf86dgaproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm $MESA openssl freetype pixman fontsproto udev" +PKG_DEPENDS="libpciaccess freetype libX11 libXfont libdrm Mesa openssl pixman udev" +PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto recordproto renderproto scrnsaverproto videoproto inputproto xf86dgaproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm Mesa openssl freetype pixman fontsproto udev" PKG_PRIORITY="optional" PKG_SECTION="x11/xserver" PKG_SHORTDESC="xorg-server: The Xorg X server" diff --git a/projects/ATV/options b/projects/ATV/options index c13e99d72d..8907da8d00 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -224,9 +224,6 @@ # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" GRAPHIC_DRIVERS="nouveau" -# Mesa to use (Mesa / mesa) - MESA="mesa" - # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="no" diff --git a/projects/Fusion/options b/projects/Fusion/options index affdf44459..1e03424145 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -224,9 +224,6 @@ # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon fglrx nvidia nouveau" GRAPHIC_DRIVERS="fglrx" -# Mesa to use (Mesa / mesa) - MESA="mesa" - # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="no" diff --git a/projects/Generic/options b/projects/Generic/options index 7e6bb96c6f..00c064cbe8 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -224,9 +224,6 @@ # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau" GRAPHIC_DRIVERS="fglrx i915 i965 nvidia vmware" -# Mesa to use (Mesa / mesa) - MESA="mesa" - # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="yes" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index bcedeb1622..6b4df52319 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -224,9 +224,6 @@ # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau" GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nouveau vmware" -# Mesa to use (Mesa / mesa) - MESA="mesa" - # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="no" diff --git a/projects/ION/options b/projects/ION/options index eadb474c12..131e85f8e2 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -224,9 +224,6 @@ # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" GRAPHIC_DRIVERS="nvidia" -# Mesa to use (Mesa / mesa) - MESA="mesa" - # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="yes" diff --git a/projects/Intel/options b/projects/Intel/options index d7c8fa4680..c956a52ae5 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -224,9 +224,6 @@ # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" GRAPHIC_DRIVERS="i915 i965" -# Mesa to use (Mesa / mesa) - MESA="mesa" - # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="no" diff --git a/projects/Ultra/options b/projects/Ultra/options index b1711ba659..2b1cb34dbd 100755 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -224,9 +224,6 @@ # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" GRAPHIC_DRIVERS="nvidia" -# Mesa to use (Mesa / mesa) - MESA="mesa" - # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="yes"