Merge pull request #5514 from heitbaum/soil

Remove soil package

packages/graphics/soil/package.mk

@@ -1,20 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-
-PKG_NAME="soil"
-PKG_VERSION="1.16"
-PKG_SHA256="5f2d8a8c78e81d29df07f0f97c34fa2f75187bcadfdc7222cbd026859acaff2f"
-PKG_LICENSE="CCPL"
-PKG_SITE="http://www.lonesock.net/soil.html"
-PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain mesa"
-PKG_LONGDESC="A tiny C lib primarily for loading textures into OpenGL"
-PKG_BUILD_FLAGS="+pic"
-
-pre_make_target() {
-  sed "s/1.07-20071110/${PKG_VERSION}/" -i Makefile
-}
-
-pre_makeinstall_target() {
-  export DESTDIR=${SYSROOT_PREFIX}
-}

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

@@ -1,47 +0,0 @@
---- /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

packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk

@@ -10,7 +10,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/xbmc/screensaver.asterwave"
 PKG_URL="https://github.com/xbmc/screensaver.asterwave/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain kodi-platform soil glm"
+PKG_DEPENDS_TARGET="toolchain kodi-platform glm"
 PKG_SECTION=""
 PKG_SHORTDESC="screensaver.asterwave"
 PKG_LONGDESC="screensaver.asterwave"

packages/mediacenter/kodi-binary-addons/screensaver.matrixtrails/package.mk

@@ -10,7 +10,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/xbmc/screensaver.matrixtrails"
 PKG_URL="https://github.com/xbmc/screensaver.matrixtrails/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain kodi-platform soil"
+PKG_DEPENDS_TARGET="toolchain kodi-platform"
 PKG_SECTION=""
 PKG_SHORTDESC="screensaver.matrixtrails"
 PKG_LONGDESC="screensaver.matrixtrails"

tools/mkpkg/mkpkg_soil

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-
-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