From 8bbc662083403ba261b12b0d4f4336b98dc67876 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sat, 20 Jul 2013 05:24:59 +0200
Subject: [PATCH] Mesa: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/graphics/Mesa/build      | 101 -------------------------
 packages/graphics/Mesa/install    |  45 -----------
 packages/graphics/Mesa/meta       |  57 --------------
 packages/graphics/Mesa/package.mk | 121 ++++++++++++++++++++++++++++++
 4 files changed, 121 insertions(+), 203 deletions(-)
 delete mode 100755 packages/graphics/Mesa/build
 delete mode 100755 packages/graphics/Mesa/install
 delete mode 100644 packages/graphics/Mesa/meta
 create mode 100644 packages/graphics/Mesa/package.mk

diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build
deleted file mode 100755
index eacab61cf2..0000000000
--- a/packages/graphics/Mesa/build
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-get_graphicdrivers
-
-export CC_FOR_BUILD="$HOST_CC"
-export CXX_FOR_BUILD="$HOST_CXX"
-export CFLAGS_FOR_BUILD=""
-export CXXFLAGS_FOR_BUILD=""
-export LDFLAGS_FOR_BUILD=""
-
-export X11_INCLUDES=""
-export DRI_DRIVER_INSTALL_DIR="$XORG_PATH_DRI"
-export DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI"
-
-if [ "$LLVM_SUPPORT" = "yes" ]; then
-  export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config"
-  MESA_GALLIUM_LLVM="--enable-gallium-llvm --with-llvm-shared-libs"
-else
-  MESA_GALLIUM_LLVM="--disable-gallium-llvm"
-fi
-
-if [ "$MESA_VDPAU_SUPPORT" = "yes" ]; then
-  MESA_VDPAU="--enable-vdpau"
-else
-  MESA_VDPAU="--disable-vdpau"
-fi
-
-XA_CONFIG="--disable-xa"
-for drv in $GRAPHIC_DRIVERS; do
-  [ "$drv" = "vmware" ] && XA_CONFIG="--enable-xa"
-done
-
-cd $PKG_BUILD
-
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-            --disable-debug \
-            --enable-texture-float \
-            --enable-asm \
-            --disable-selinux \
-            --enable-opengl \
-            --enable-glx-tls \
-            --enable-driglx-direct \
-            --disable-gles1 \
-            --disable-gles2 \
-            --disable-openvg \
-            --enable-dri \
-            --enable-glx \
-            --disable-osmesa \
-            --disable-egl \
-            --disable-xorg \
-            $XA_CONFIG \
-            --disable-gbm \
-            --disable-xvmc \
-            $MESA_VDPAU \
-            --disable-opencl \
-            --disable-xlib-glx \
-            --disable-gallium-egl \
-            --disable-gallium-gbm \
-            --disable-r600-llvm-compiler \
-            --disable-gallium-tests \
-            --enable-shared-glapi \
-            --disable-glx-tls \
-            --disable-gallium-g3dvl \
-            $MESA_GALLIUM_LLVM \
-            --disable-silent-rules \
-            --with-gl-lib-name=GL \
-            --with-osmesa-lib-name=OSMesa \
-            --with-gallium-drivers="$GALLIUM_DRIVERS" \
-            --with-dri-drivers="$DRI_DRIVERS" \
-
-make
-
-$MAKEINSTALL
diff --git a/packages/graphics/Mesa/install b/packages/graphics/Mesa/install
deleted file mode 100755
index 21b87e8168..0000000000
--- a/packages/graphics/Mesa/install
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/libGL.so.1 $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/libdricore*.so* $INSTALL/usr/lib || true
-  cp -P $PKG_BUILD/lib/libglapi.so* $INSTALL/usr/lib
-  if [ -f $PKG_BUILD/lib/gallium/libxatracker.so ] ; then
-    cp -P $PKG_BUILD/lib/gallium/libxatracker.so* $INSTALL/usr/lib || true
-  fi
-
-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
-
-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 7cf81cf1ed..0000000000
--- a/packages/graphics/Mesa/meta
+++ /dev/null
@@ -1,57 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="Mesa"
-PKG_VERSION="9.1.5"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.mesa3d.org/"
-PKG_URL="ftp://freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes 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
-
-if [ "$DEVTOOLS" = yes ]; then
-  PKG_DEPENDS="$PKG_DEPENDS mesa-demos"
-fi
diff --git a/packages/graphics/Mesa/package.mk b/packages/graphics/Mesa/package.mk
new file mode 100644
index 0000000000..6f8c43e486
--- /dev/null
+++ b/packages/graphics/Mesa/package.mk
@@ -0,0 +1,121 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="Mesa"
+PKG_VERSION="9.1.5"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.mesa3d.org/"
+PKG_URL="ftp://freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libX11"
+PKG_BUILD_DEPENDS_TARGET="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"
+
+if [ "$LLVM_SUPPORT" = "yes" ]; then
+  PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET llvm"
+  PKG_DEPENDS="$PKG_DEPENDS llvm"
+  LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config"
+  MESA_GALLIUM_LLVM="--enable-gallium-llvm --with-llvm-shared-libs"
+else
+  MESA_GALLIUM_LLVM="--disable-gallium-llvm"
+fi
+
+if [ "$MESA_VDPAU_SUPPORT" = "yes" ]; then
+  PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libvdpau"
+  PKG_DEPENDS="$PKG_DEPENDS libvdpau"
+  MESA_VDPAU="--enable-vdpau"
+else
+  MESA_VDPAU="--disable-vdpau"
+fi
+
+if [ "$MESA_VAAPI_SUPPORT" = "yes" ]; then
+  PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libva"
+  PKG_DEPENDS="$PKG_DEPENDS libva"
+fi
+
+if [ "$DEVTOOLS" = yes ]; then
+  PKG_DEPENDS="$PKG_DEPENDS mesa-demos"
+fi
+
+get_graphicdrivers
+
+XA_CONFIG="--disable-xa"
+for drv in $GRAPHIC_DRIVERS; do
+  [ "$drv" = "vmware" ] && XA_CONFIG="--enable-xa"
+done
+
+PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \
+                           CXX_FOR_BUILD=$HOST_CXX \
+                           CFLAGS_FOR_BUILD= \
+                           CXXFLAGS_FOR_BUILD= \
+                           LDFLAGS_FOR_BUILD= \
+                           X11_INCLUDES= \
+                           DRI_DRIVER_INSTALL_DIR=$XORG_PATH_DRI \
+                           DRI_DRIVER_SEARCH_DIR=$XORG_PATH_DRI \
+                           --disable-debug \
+                           --enable-texture-float \
+                           --enable-asm \
+                           --disable-selinux \
+                           --enable-opengl \
+                           --enable-glx-tls \
+                           --enable-driglx-direct \
+                           --disable-gles1 \
+                           --disable-gles2 \
+                           --disable-openvg \
+                           --enable-dri \
+                           --enable-glx \
+                           --disable-osmesa \
+                           --disable-egl \
+                           --disable-xorg \
+                           $XA_CONFIG \
+                           --disable-gbm \
+                           --disable-xvmc \
+                           $MESA_VDPAU \
+                           --disable-opencl \
+                           --disable-xlib-glx \
+                           --disable-gallium-egl \
+                           --disable-gallium-gbm \
+                           --disable-r600-llvm-compiler \
+                           --disable-gallium-tests \
+                           --enable-shared-glapi \
+                           --disable-glx-tls \
+                           --disable-gallium-g3dvl \
+                           $MESA_GALLIUM_LLVM \
+                           --disable-silent-rules \
+                           --with-gl-lib-name=GL \
+                           --with-osmesa-lib-name=OSMesa \
+                           --with-gallium-drivers=$GALLIUM_DRIVERS \
+                           --with-dri-drivers=$DRI_DRIVERS"
+
+post_makeinstall_target() {
+  # rename and relink for cooperate with nvidia drivers
+    rm -rf $INSTALL/usr/lib/libGL.so
+    rm -rf $INSTALL/usr/lib/libGL.so.1
+    ln -sf libGL.so.1 $INSTALL/usr/lib/libGL.so
+    ln -sf /var/lib/libGL.so $INSTALL/usr/lib/libGL.so.1
+    mv $INSTALL/usr/lib/libGL.so.1.2.0 $INSTALL/usr/lib/libGL_mesa.so.1
+}