From c83e54fcf99bfe0244e7d64c648592e36ffeff8a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 12 Nov 2010 18:29:35 +0100 Subject: [PATCH] Mesa add multiversion support, add meta file support, remove package 'mesa-master', remove package 'mesa-master-GL' Signed-off-by: Stephan Raue --- packages/addons/games/megaglest-source/meta | 4 +- packages/addons/games/sauerbraten/meta | 4 +- packages/debug/mesa-demos/build | 2 +- packages/debug/mesa-demos/install | 2 +- packages/graphics/Mesa-GL/build | 16 +--- packages/graphics/Mesa-GL/meta | 14 ++++ packages/graphics/Mesa/build | 14 ---- packages/graphics/Mesa/install | 10 --- packages/graphics/Mesa/meta | 19 +++++ packages/graphics/Mesa/url | 1 - packages/graphics/cairo/build | 2 +- packages/graphics/cairo/install | 1 + packages/graphics/glew/build | 2 +- packages/graphics/glew/install | 2 +- packages/graphics/mesa-master-GL/build | 56 ------------- packages/graphics/mesa-master/build | 87 --------------------- packages/graphics/mesa-master/install | 26 ------ packages/graphics/mesa-master/url | 1 - packages/mediacenter/xbmc-dharma/meta | 4 +- packages/mediacenter/xbmc/meta | 4 +- packages/multimedia/SDL/meta | 4 +- packages/multimedia/SDL_ttf/build | 2 +- packages/multimedia/SDL_ttf/install | 2 +- packages/multimedia/libva/build | 2 +- packages/multimedia/libva/install | 2 +- packages/sdk/games-sdk/install | 2 +- packages/x11/driver/xf86-video-nouveau/meta | 4 +- packages/x11/xserver/xorg-server/build | 2 +- packages/x11/xserver/xorg-server/install | 2 +- projects/ATV/options | 4 +- projects/ION/options | 4 +- projects/generic/options | 4 +- projects/intel/options | 4 +- 33 files changed, 68 insertions(+), 241 deletions(-) create mode 100644 packages/graphics/Mesa-GL/meta create mode 100644 packages/graphics/Mesa/meta delete mode 100644 packages/graphics/Mesa/url delete mode 100755 packages/graphics/mesa-master-GL/build delete mode 100755 packages/graphics/mesa-master/build delete mode 100755 packages/graphics/mesa-master/install delete mode 100644 packages/graphics/mesa-master/url diff --git a/packages/addons/games/megaglest-source/meta b/packages/addons/games/megaglest-source/meta index 94ac401142..b79e0b88cc 100644 --- a/packages/addons/games/megaglest-source/meta +++ b/packages/addons/games/megaglest-source/meta @@ -5,8 +5,8 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.glest.org" PKG_URL="http://downloads.sourceforge.net/project/megaglest/current_release/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="curl xerces-c $LIBJPEG libpng libvorbis libogg SDL openal-soft libX11 $MESA" -PKG_BUILD_DEPENDS="toolchain lua curl xerces-c $LIBJPEG libpng libvorbis libogg SDL openal-soft libX11 $MESA" +PKG_DEPENDS="curl xerces-c $LIBJPEG libpng libvorbis libogg SDL openal-soft libX11 Mesa" +PKG_BUILD_DEPENDS="toolchain lua curl xerces-c $LIBJPEG libpng libvorbis libogg SDL openal-soft libX11 Mesa" PKG_PRIORITY="optional" PKG_SECTION="games" PKG_SHORTDESC="(Game) MegaGlest: a free 3D real-time strategy game" diff --git a/packages/addons/games/sauerbraten/meta b/packages/addons/games/sauerbraten/meta index f9596c248e..9cd9a1fa9b 100644 --- a/packages/addons/games/sauerbraten/meta +++ b/packages/addons/games/sauerbraten/meta @@ -5,8 +5,8 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://sauerbraten.org/" PKG_URL="http://downloads.sourceforge.net/project/sauerbraten/sauerbraten/2010_07_19/${PKG_NAME}_${PKG_VERSION}_justice_edition_linux.tar.bz2" -PKG_DEPENDS="zlib libpng $LIBJPEG libX11 SDL SDL_image SDL_mixer $MESA" -PKG_BUILD_DEPENDS="toolchain zlib libpng $LIBJPEG libX11 SDL SDL_image SDL_mixer $MESA" +PKG_DEPENDS="zlib libpng $LIBJPEG libX11 SDL SDL_image SDL_mixer Mesa" +PKG_BUILD_DEPENDS="toolchain zlib libpng $LIBJPEG libX11 SDL SDL_image SDL_mixer Mesa" PKG_PRIORITY="optional" PKG_SECTION="games" PKG_SHORTDESC="(Game) Cube 2: Sauerbraten" diff --git a/packages/debug/mesa-demos/build b/packages/debug/mesa-demos/build index 05297e26c2..1c61867820 100755 --- a/packages/debug/mesa-demos/build +++ b/packages/debug/mesa-demos/build @@ -4,7 +4,7 @@ $SCRIPTS/build toolchain $SCRIPTS/build libX11 -$SCRIPTS/build $MESA +$SCRIPTS/build Mesa $SCRIPTS/build glew cd $PKG_BUILD diff --git a/packages/debug/mesa-demos/install b/packages/debug/mesa-demos/install index 45097435df..4dd826ce32 100755 --- a/packages/debug/mesa-demos/install +++ b/packages/debug/mesa-demos/install @@ -3,7 +3,7 @@ . config/options $1 $SCRIPTS/install libX11 -$SCRIPTS/install $MESA +$SCRIPTS/install Mesa $SCRIPTS/install glew mkdir -p $INSTALL/usr/bin diff --git a/packages/graphics/Mesa-GL/build b/packages/graphics/Mesa-GL/build index c6c47a900c..41041b10a6 100755 --- a/packages/graphics/Mesa-GL/build +++ b/packages/graphics/Mesa-GL/build @@ -2,21 +2,9 @@ . config/options $1 -$SCRIPTS/unpack $MESA -$SCRIPTS/build libxml2-host -$SCRIPTS/build talloc -$SCRIPTS/build expat -$SCRIPTS/build glproto -$SCRIPTS/build dri2proto -$SCRIPTS/build libdrm -$SCRIPTS/build libXext -$SCRIPTS/build libXdamage -$SCRIPTS/build libXfixes -$SCRIPTS/build libXxf86vm -$SCRIPTS/build libxcb -$SCRIPTS/build libX11 +$SCRIPTS/unpack Mesa -cd $BUILD/$MESA* +cd $BUILD/Mesa* ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/graphics/Mesa-GL/meta b/packages/graphics/Mesa-GL/meta new file mode 100644 index 0000000000..c1e8728ad7 --- /dev/null +++ b/packages/graphics/Mesa-GL/meta @@ -0,0 +1,14 @@ +PKG_NAME="Mesa-GL" +PKG_VERSION="" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="OSS" +PKG_SITE="http://www.mesa3d.org/" +PKG_URL="" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS="toolchain libxml2-host talloc expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11" +PKG_PRIORITY="optional" +PKG_SECTION="graphics" +PKG_SHORTDESC="Mesa-GL: 3-D graphics library with OpenGL API (GL part)" +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" diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build index a0c17abe82..e5abcb0c55 100755 --- a/packages/graphics/Mesa/build +++ b/packages/graphics/Mesa/build @@ -2,20 +2,6 @@ . config/options $1 -$SCRIPTS/build libxml2-host -$SCRIPTS/build talloc -$SCRIPTS/build expat -$SCRIPTS/build glproto -$SCRIPTS/build dri2proto -$SCRIPTS/build libdrm -$SCRIPTS/build libXext -$SCRIPTS/build libXdamage -$SCRIPTS/build libXfixes -$SCRIPTS/build libXxf86vm -$SCRIPTS/build libxcb -$SCRIPTS/build libX11 -$SCRIPTS/build xorg-server - get_graphicdrivers # dont use strip because of use from mklib diff --git a/packages/graphics/Mesa/install b/packages/graphics/Mesa/install index 781d48a53c..cac0c4de80 100755 --- a/packages/graphics/Mesa/install +++ b/packages/graphics/Mesa/install @@ -2,16 +2,6 @@ . config/options $1 -$SCRIPTS/install libXdamage -$SCRIPTS/install libdrm -$SCRIPTS/install talloc -$SCRIPTS/install expat -$SCRIPTS/install libXext -$SCRIPTS/install libXfixes -$SCRIPTS/install libXxf86vm -$SCRIPTS/install libxcb -$SCRIPTS/install libX11 - 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 diff --git a/packages/graphics/Mesa/meta b/packages/graphics/Mesa/meta new file mode 100644 index 0000000000..195562722e --- /dev/null +++ b/packages/graphics/Mesa/meta @@ -0,0 +1,19 @@ +PKG_NAME="Mesa" +PKG_VERSION="7.9.1-20101109" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="OSS" +PKG_SITE="http://www.mesa3d.org/" +PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_DEPENDS="libXdamage libdrm talloc expat libXext libXfixes libXxf86vm libxcb libX11" +PKG_BUILD_DEPENDS="toolchain libxml2-host talloc expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11 xorg-server" +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" + +if [ $MESA_MASTER = "yes" ]; then + PKG_VERSION="20101111" + PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2" +fi diff --git a/packages/graphics/Mesa/url b/packages/graphics/Mesa/url deleted file mode 100644 index 15170d3fc0..0000000000 --- a/packages/graphics/Mesa/url +++ /dev/null @@ -1 +0,0 @@ -http://sources.openelec.tv/svn/Mesa-7.9.1-20101109.tar.bz2 \ No newline at end of file diff --git a/packages/graphics/cairo/build b/packages/graphics/cairo/build index f00a5da18d..f1ab58d627 100755 --- a/packages/graphics/cairo/build +++ b/packages/graphics/cairo/build @@ -10,7 +10,7 @@ $SCRIPTS/build libpng $SCRIPTS/build pixman $SCRIPTS/build libXrender $SCRIPTS/build libX11 -# $SCRIPTS/build $MESA +# $SCRIPTS/build Mesa # $SCRIPTS/build libdrm # $SCRIPTS/build libxcb diff --git a/packages/graphics/cairo/install b/packages/graphics/cairo/install index b5ed0bd0d8..4df4aa7299 100755 --- a/packages/graphics/cairo/install +++ b/packages/graphics/cairo/install @@ -9,6 +9,7 @@ $SCRIPTS/install libpng $SCRIPTS/install pixman $SCRIPTS/install libXrender $SCRIPTS/install libX11 +$SCRIPTS/install Mesa #$SCRIPTS/install libxcb mkdir -p $INSTALL/usr/lib diff --git a/packages/graphics/glew/build b/packages/graphics/glew/build index c2d8508e3b..fa6ffb3bd0 100755 --- a/packages/graphics/glew/build +++ b/packages/graphics/glew/build @@ -7,7 +7,7 @@ $SCRIPTS/build libX11 $SCRIPTS/build libXext $SCRIPTS/build libXi $SCRIPTS/build libXmu -$SCRIPTS/build $MESA +$SCRIPTS/build Mesa cd $PKG_BUILD make SYSTEM=linux \ diff --git a/packages/graphics/glew/install b/packages/graphics/glew/install index 88c4dd6ef8..808fcee24b 100755 --- a/packages/graphics/glew/install +++ b/packages/graphics/glew/install @@ -6,7 +6,7 @@ $SCRIPTS/install libX11 $SCRIPTS/install libXext $SCRIPTS/install libXi $SCRIPTS/install libXmu -$SCRIPTS/install $MESA +$SCRIPTS/install Mesa mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/lib/lib*.so* $INSTALL/usr/lib diff --git a/packages/graphics/mesa-master-GL/build b/packages/graphics/mesa-master-GL/build deleted file mode 100755 index c6c47a900c..0000000000 --- a/packages/graphics/mesa-master-GL/build +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh - -. config/options $1 - -$SCRIPTS/unpack $MESA -$SCRIPTS/build libxml2-host -$SCRIPTS/build talloc -$SCRIPTS/build expat -$SCRIPTS/build glproto -$SCRIPTS/build dri2proto -$SCRIPTS/build libdrm -$SCRIPTS/build libXext -$SCRIPTS/build libXdamage -$SCRIPTS/build libXfixes -$SCRIPTS/build libXxf86vm -$SCRIPTS/build libxcb -$SCRIPTS/build libX11 - -cd $BUILD/$MESA* -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --enable-shared \ - --disable-debug \ - --disable-selinux \ - --enable-xcb \ - --disable-glx-tls \ - --enable-driglx-direct \ - --disable-egl \ - --disable-glu \ - --disable-gl-osmesa \ - --disable-glut \ - --disable-glw \ - --disable-motif \ - --with-driver=dri \ - --with-dri-drivers="" \ - --disable-gallium - - make -C src/glx - make -C src/mesa gl.pc - make -C src/mesa/drivers/dri dri.pc - - mkdir -p $SYSROOT_PREFIX/usr/include/GL - cp include/GL/*.h $SYSROOT_PREFIX/usr/include/GL - mkdir -p $SYSROOT_PREFIX/usr/lib - cp -P lib/libGL.so* $SYSROOT_PREFIX/usr/lib/pkgconfig - mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig - cp src/mesa/gl.pc $SYSROOT_PREFIX/usr/lib/pkgconfig - - mkdir -p $SYSROOT_PREFIX/usr/include/GL/internal - cp include/GL/internal/dri_interface.h $SYSROOT_PREFIX/usr/include/GL/internal - mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig - cp src/mesa/drivers/dri/dri.pc $SYSROOT_PREFIX/usr/lib/pkgconfig diff --git a/packages/graphics/mesa-master/build b/packages/graphics/mesa-master/build deleted file mode 100755 index a0c17abe82..0000000000 --- a/packages/graphics/mesa-master/build +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh - -. config/options $1 - -$SCRIPTS/build libxml2-host -$SCRIPTS/build talloc -$SCRIPTS/build expat -$SCRIPTS/build glproto -$SCRIPTS/build dri2proto -$SCRIPTS/build libdrm -$SCRIPTS/build libXext -$SCRIPTS/build libXdamage -$SCRIPTS/build libXfixes -$SCRIPTS/build libXxf86vm -$SCRIPTS/build libxcb -$SCRIPTS/build libX11 -$SCRIPTS/build xorg-server - -get_graphicdrivers - -# dont use strip because of use from mklib - LDFLAGS=`echo $LDFLAGS | sed -e "s|-s||"` - -MESA_CONFIG=" --disable-gallium --disable-gallium-nouveau --disable-gallium-i915 --disable-gallium-i965" -MESA_CONFIG="$MESA_CONFIG --disable-gallium-radeon --disable-gallium-r600 --disable-gallium-svga --disable-gallium-swrast" - -for drv in $GRAPHIC_DRIVERS; do - [ $drv = i915 ] && \ - MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-intel/disable-gallium-intel/'` - - [ $drv = i965 ] && \ - MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-intel/disable-gallium-intel/'` - - [ $drv = radeon ] && \ - MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-radeon/disable-gallium-radeon/'` - - [ $drv = r600 ] && \ - MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r600/disable-gallium-r600/'` - - [ $drv = nouveau ] && \ - MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium/enable-gallium/'` && \ - MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-nouveau/enable-gallium-nouveau/'` && \ - MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx,xorg" - - [ $drv = vmware ] && \ - MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium/enable-gallium/'` && \ - MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-svga/enable-gallium-svga/'` && \ - MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx,xorg" -done - -cd $PKG_BUILD - -make clean - -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 \ - --disable-selinux \ - --enable-xcb \ - --disable-glx-tls \ - --enable-driglx-direct \ - --disable-egl \ - --enable-glu \ - --disable-gl-osmesa \ - --disable-glut \ - --disable-glw \ - --disable-motif \ - --with-driver=dri \ - --with-dri-drivers=$MESA_DRIVERS \ - --with-dri-driverdir="$XORG_PATH_DRI" \ - --with-xorg-driver-dir="$XORG_PATH_DRIVERS" \ - $MESA_CONFIG \ - -make - -$MAKEINSTALL -C src/mesa -$MAKEINSTALL -C src/glu diff --git a/packages/graphics/mesa-master/install b/packages/graphics/mesa-master/install deleted file mode 100755 index 781d48a53c..0000000000 --- a/packages/graphics/mesa-master/install +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -. config/options $1 - -$SCRIPTS/install libXdamage -$SCRIPTS/install libdrm -$SCRIPTS/install talloc -$SCRIPTS/install expat -$SCRIPTS/install libXext -$SCRIPTS/install libXfixes -$SCRIPTS/install libXxf86vm -$SCRIPTS/install libxcb -$SCRIPTS/install libX11 - -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 - -mkdir -p $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 diff --git a/packages/graphics/mesa-master/url b/packages/graphics/mesa-master/url deleted file mode 100644 index 6f1a9370f7..0000000000 --- a/packages/graphics/mesa-master/url +++ /dev/null @@ -1 +0,0 @@ -http://sources.openelec.tv/svn/mesa-master-20101111.tar.bz2 \ No newline at end of file diff --git a/packages/mediacenter/xbmc-dharma/meta b/packages/mediacenter/xbmc-dharma/meta index 84c2be1fda..8c2fe9ebf1 100644 --- a/packages/mediacenter/xbmc-dharma/meta +++ b/packages/mediacenter/xbmc-dharma/meta @@ -5,8 +5,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc" -PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba" +PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc" +PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba" PKG_PRIORITY="optional" PKG_SECTION="mediacenter" PKG_SHORTDESC="xbmc: XBMC Mediacenter" diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 2dd6b6b4ea..68438ad440 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -5,8 +5,8 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc" -PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba" +PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc" +PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba" PKG_PRIORITY="optional" PKG_SECTION="mediacenter" PKG_SHORTDESC="xbmc: XBMC Mediacenter" diff --git a/packages/multimedia/SDL/meta b/packages/multimedia/SDL/meta index 8fd26f3018..a70c82005e 100644 --- a/packages/multimedia/SDL/meta +++ b/packages/multimedia/SDL/meta @@ -5,8 +5,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 alsa-lib libX11 libXrandr $MESA" +PKG_DEPENDS="alsa-lib libX11 libXrandr Mesa" +PKG_BUILD_DEPENDS="toolchain 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/build b/packages/multimedia/SDL_ttf/build index 946b9e9162..69ec9db794 100755 --- a/packages/multimedia/SDL_ttf/build +++ b/packages/multimedia/SDL_ttf/build @@ -7,7 +7,7 @@ $SCRIPTS/build SDL $SCRIPTS/build libICE $SCRIPTS/build libX11 $SCRIPTS/build freetype -$SCRIPTS/build $MESA +$SCRIPTS/build Mesa cd $PKG_BUILD ./configure --host=$TARGET_NAME \ diff --git a/packages/multimedia/SDL_ttf/install b/packages/multimedia/SDL_ttf/install index 981955a40c..67e598571a 100755 --- a/packages/multimedia/SDL_ttf/install +++ b/packages/multimedia/SDL_ttf/install @@ -6,7 +6,7 @@ $SCRIPTS/install SDL $SCRIPTS/install libICE $SCRIPTS/install libX11 $SCRIPTS/install freetype -$SCRIPTS/install $MESA +$SCRIPTS/install Mesa mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/multimedia/libva/build b/packages/multimedia/libva/build index 6dc16a9039..e889e0b3b1 100755 --- a/packages/multimedia/libva/build +++ b/packages/multimedia/libva/build @@ -7,7 +7,7 @@ $SCRIPTS/build libX11 $SCRIPTS/build libXext $SCRIPTS/build libXfixes $SCRIPTS/build libdrm -$SCRIPTS/build $MESA +$SCRIPTS/build Mesa cd $PKG_BUILD diff --git a/packages/multimedia/libva/install b/packages/multimedia/libva/install index e42dd8729d..e82f25bb9b 100755 --- a/packages/multimedia/libva/install +++ b/packages/multimedia/libva/install @@ -6,7 +6,7 @@ $SCRIPTS/install libX11 $SCRIPTS/install libXext $SCRIPTS/install libXfixes $SCRIPTS/install libdrm -$SCRIPTS/install $MESA +$SCRIPTS/install Mesa mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/va/.libs/libva*.so* $INSTALL/usr/lib diff --git a/packages/sdk/games-sdk/install b/packages/sdk/games-sdk/install index 2c40deae7f..8d17d6d98e 100755 --- a/packages/sdk/games-sdk/install +++ b/packages/sdk/games-sdk/install @@ -19,4 +19,4 @@ $SCRIPTS/install openal-soft $SCRIPTS/install libX11 $SCRIPTS/install pango $SCRIPTS/install fontconfig -$SCRIPTS/install $MESA +$SCRIPTS/install Mesa diff --git a/packages/x11/driver/xf86-video-nouveau/meta b/packages/x11/driver/xf86-video-nouveau/meta index f5f6f0c699..798c2d2a8f 100644 --- a/packages/x11/driver/xf86-video-nouveau/meta +++ b/packages/x11/driver/xf86-video-nouveau/meta @@ -5,8 +5,8 @@ PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" PKG_SITE="http://www.x.org/" PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="libXrandr libXrender libdrm libXext libpciaccess udev $MESA" -PKG_BUILD_DEPENDS="toolchain libXrandr libXrender libdrm libXext libpciaccess udev $MESA xorg-server" +PKG_DEPENDS="libXrandr libXrender libdrm libXext libpciaccess udev Mesa" +PKG_BUILD_DEPENDS="toolchain 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/build b/packages/x11/xserver/xorg-server/build index c578e56790..6f1655484f 100755 --- a/packages/x11/xserver/xorg-server/build +++ b/packages/x11/xserver/xorg-server/build @@ -25,7 +25,7 @@ $SCRIPTS/build libX11 $SCRIPTS/build libXfont $SCRIPTS/build libxkbfile $SCRIPTS/build libdrm -$SCRIPTS/build ${MESA}-GL +$SCRIPTS/build Mesa-GL $SCRIPTS/build openssl $SCRIPTS/build freetype $SCRIPTS/build pixman diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install index 07a804cd20..d4b352685c 100755 --- a/packages/x11/xserver/xorg-server/install +++ b/packages/x11/xserver/xorg-server/install @@ -10,7 +10,7 @@ $SCRIPTS/install openssl $SCRIPTS/install libX11 $SCRIPTS/install libXfont $SCRIPTS/install libdrm -$SCRIPTS/install $MESA +$SCRIPTS/install Mesa $SCRIPTS/install pixman $SCRIPTS/install udev diff --git a/projects/ATV/options b/projects/ATV/options index d7904ccf8b..ee2a8b8708 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -131,8 +131,8 @@ # use libdrm-master (latest git) instead latest released version LIBDRM_MASTER="yes" -# Mesa to use (Mesa / mesa-master) - MESA="mesa-master" +# use Mesa-master (latest git) instead latest released version + MESA_MASTER="yes" # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="no" diff --git a/projects/ION/options b/projects/ION/options index 56b6476258..209efb238d 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -131,8 +131,8 @@ # use libdrm-master (latest git) instead latest released version LIBDRM_MASTER="no" -# Mesa to use (Mesa / mesa-master) - MESA="Mesa" +# use Mesa-master (latest git) instead latest released version + MESA_MASTER="no" # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="yes" diff --git a/projects/generic/options b/projects/generic/options index 67f3786b36..fe71dad5e9 100644 --- a/projects/generic/options +++ b/projects/generic/options @@ -131,8 +131,8 @@ # use libdrm-master (latest git) instead latest released version LIBDRM_MASTER="no" -# Mesa to use (Mesa / mesa-master) - MESA="Mesa" +# use Mesa-master (latest git) instead latest released version + MESA_MASTER="no" # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="yes" diff --git a/projects/intel/options b/projects/intel/options index 2313bc5856..8758d44965 100644 --- a/projects/intel/options +++ b/projects/intel/options @@ -131,8 +131,8 @@ # use libdrm-master (latest git) instead latest released version LIBDRM_MASTER="no" -# Mesa to use (Mesa / mesa-master) - MESA="Mesa" +# use Mesa-master (latest git) instead latest released version + MESA_MASTER="no" # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="no"