soil: add as a dependency for new screensavers

packages/graphics/soil/package.mk

@@ -17,30 +17,26 @@
 ################################################################################
 
 PKG_NAME="soil"
-PKG_VERSION="1.07"
+PKG_VERSION="1.16"
 PKG_REV="1"
 PKG_ARCH="any"
-PKG_LICENSE="PD"
+PKG_LICENSE="CCPL"
 PKG_SITE="http://www.lonesock.net/soil.html"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS_TARGET="mesa"
+PKG_DEPENDS_TARGET="toolchain mesa"
 PKG_PRIORITY="optional"
 PKG_SECTION="graphics"
-PKG_SHORTDESC="libsoil: Simple OpenGL Image Library"
-PKG_LONGDESC="libsoil: Simple OpenGL Image Library"
+PKG_SHORTDESC="A tiny C lib primarily for loading textures into OpenGL"
+PKG_LONGDESC="A tiny C lib primarily for loading textures into OpenGL"
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-make_target() {
-  mkdir projects/makefile/obj
-  make CXX="$CXX" CC="$CC" LD="$CC" AR="$AR" CFLAGS="-fPIC -O2" CXXFLAGS="-fPIC -O2" -C projects/makefile
+pre_make_target() {
+  sed "s/1.07-20071110/$PKG_VERSION/" -i Makefile
+  export CFLAGS="$CFLAGS -fPIC"
 }
 
-makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/lib
-    cp -PR lib/libSOIL.a $SYSROOT_PREFIX/usr/lib
-
-  mkdir -p $SYSROOT_PREFIX/usr/include/SOIL
-    cp -P src/SOIL.h $SYSROOT_PREFIX/usr/include/SOIL
+pre_makeinstall_target() {
+  export DESTDIR=$SYSROOT_PREFIX
 }

packages/graphics/soil/patches/soil-0001_fix-makefile.patch

@@ -0,0 +1,47 @@
+--- /dev/null	2015-06-05 20:37:04.396503995 +0200
++++ b/Makefile	2016-01-27 22:47:09.795982961 +0100
+@@ -0,0 +1,44 @@
++CC ?= gcc
++INSTALL_FILE = install -p -m 644
++INSTALL_DIR = install -p -d
++LN = ln -s
++RM = rm -fv
++CFLAGS += -c -O2 -Wall
++LDFLAGS +=
++
++SRC = src
++CFILES = $(SRC)/image_DXT.c $(SRC)/image_helper.c $(SRC)/SOIL.c $(SRC)/stb_image_aug.c
++OFILES = $(CFILES:.c=.o)
++LIBNAME = libSOIL
++VERSION = 1.07-20071110
++MAJOR = 1
++
++HFILES = $(SRC)/SOIL.h $(SRC)/image_DXT.h $(SRC)/image_helper.h \
++  $(SRC)/stbi_DDS_aug.h $(SRC)/stbi_DDS_aug_c.h $(SRC)/stb_image_aug.h
++AFILE = libSOIL.a
++INCLUDEDIR = /usr/include/SOIL
++LIBDIR = /usr/lib
++
++all: $(OFILES) lib
++
++%.o: %.c
++	$(CC) $(CFLAGS) $< -o $@
++
++lib: $(OFILES)
++	# create static library
++	$(AR) -cvq $(LIBNAME).a $(OFILES)
++
++install:
++	$(INSTALL_DIR) $(DESTDIR)/$(INCLUDEDIR)
++	$(INSTALL_FILE) $(HFILES) $(DESTDIR)/$(INCLUDEDIR)
++	$(INSTALL_DIR) $(DESTDIR)/$(LIBDIR)
++	$(INSTALL_FILE) $(AFILE) $(DESTDIR)/$(LIBDIR)
++
++clean:
++	$(RM) *.o
++	$(RM) *~
++
++distclean:
++	$(RM) $(AFILE) $(SOFILE)
++
++.PHONY: all lib clean distclean

tools/mkpkg/mkpkg_soil

@@ -0,0 +1,30 @@
+#!/bin/sh
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC 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 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+echo "getting sources..."
+  wget http://www.lonesock.net/files/soil.zip
+  unzip soil.zip
+  mv "Simple OpenGL Image Library" soil-1.16
+
+echo "packing sources..."
+  tar cvJf soil-1.16.tar.xz soil-1.16
+
+echo "remove temporary sourcedir..."
+  rm -rf soil-1.16
+  rm -rf soil.zip