package/libsoil: new package
PATCH v4 1/1 package/libsoil: new package
Needed for these new Kodi addons:
kodi-screensaver-asterwave
kodi-screensaver-cpblobs
kodi-screensaver-matrixtrails
kodi-screensaver-planestate
kodi-visualisation-fountain
---
v4: added various changes after a review by Thomas
- moved "-c -fPIC" from _CFLAGS to the patched Makefile
- moved extracted source code from the "Simple OpenGL Image Library" subdir into $(@D)
- LIBSOIL_MAKEFILE now contains the filename of the Makefile
v3: added various changes after a review by Peter
- in comment for v2: s/tarball/zipfile/
- moved -fPIC from 0001-fix-makefile.patch to LIBSOIL_CFLAGS
Because this library will be used in at least five packages I decided against using the other upstream makefile providing a static-only library.
v2: added various changes after a review by Thomas
- not available as static library
- used author's upstream tarball instead from Debian
- added a Makefile fix to simplify the usage of variable CC
package/Config.in | 1 + package/libsoil/0001-fix-makefile.patch | 40 ++++++++++++++++++++++++++++++ package/libsoil/Config.in | 12 +++++++++ package/libsoil/libsoil.hash | 2 ++ package/libsoil/libsoil.mk | 43 +++++++++++++++++++++++++++++++++ 5 files changed, 98 insertions(+) create mode 100644 package/libsoil/0001-fix-makefile.patch create mode 100644 package/libsoil/Config.in create mode 100644 package/libsoil/libsoil.hash create mode 100644 package/libsoil/libsoil.mk
package/Config.in +1 -0
@@ -835,6 +835,7 @@ menu "Graphics" source "package/libqrencode/Config.in" source "package/libraw/Config.in" source "package/librsvg/Config.in" + source "package/libsoil/Config.in" source "package/libsvg/Config.in" source "package/libsvg-cairo/Config.in" source "package/libsvgtiny/Config.in"
package/libsoil/0001-fix-makefile.patch new file +40 -0
@@ -0,0 +1,40 @@ +Various makefile fixes to allow cross compilation + +Partly ported from +http://anonscm.debian.org/cgit/pkg-games/libsoil.git/tree/debian/patches/linking_correctly.patch + +Signed-off-by: Bernd Kuhls <[email protected]> + +diff -uNr "soil.org/projects/makefile/alternate Makefile.txt" "soil/projects/makefile/alternate Makefile.txt" +--- "soil.org/projects/makefile/alternate Makefile.txt" 2008-07-07 18:13:28.000000000 +0200 ++++ "soil/projects/makefile/alternate Makefile.txt" 2015-11-07 11:15:04.140106336 +0100 +@@ -1,8 +1,8 @@ + MAKE = make +-CC = gcc +-INSTALL_FILE = install -p -o root -g root -m 644 +-INSTALL_DIR = install -p -o root -g root -d +-LN = ln -s ++CC = $(GCC) ++INSTALL_FILE = $(INSTALL) -m 644 ++INSTALL_DIR = $(INSTALL) -d ++LN = ln -sf + RM = rm -fv + CFLAGS += -c -O2 -Wall + LDFLAGS += +@@ -23,13 +23,13 @@ + all: $(OFILES) lib + + %.o: %.c +- $(CC) $(CFLAGS) $< -o $@ ++ $(CC) $(CFLAGS) -c -fPIC $< -o $@ + + lib: $(OFILES) + # create static library +- ar -cvq $(LIBNAME).a $(OFILES) ++ $(AR) -cvq $(LIBNAME).a $(OFILES) + # create shared library +- gcc -shared -Wl,-soname,$(LIBNAME).so.$(MAJOR) -o $(LIBNAME).so.$(VERSION) $(OFILES) ++ $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(MAJOR) -o $(LIBNAME).so.$(VERSION) $(OFILES) -lGL -lm + + install: + $(INSTALL_DIR) $(DESTDIR)/$(INCLUDEDIR)
package/libsoil/Config.in new file +12 -0
@@ -0,0 +1,12 @@ +config BR2_PACKAGE_LIBSOIL + bool "libsoil" + depends on BR2_PACKAGE_HAS_LIBGL + depends on !BR2_STATIC_LIBS + help + SOIL is a tiny C library used primarily for uploading + textures into OpenGL. + + http://www.lonesock.net/soil.html + +comment "libsoil needs an OpenGL backend and a toolchain w/ dynamic library" + depends on !BR2_PACKAGE_HAS_LIBGL || BR2_STATIC_LIBS
package/libsoil/libsoil.hash new file +2 -0
@@ -0,0 +1,2 @@ +# Locally calculated +sha256 a2305b8d64f6d636e36d669bbdb0ca5445d1345c754b3d61d3f037dad2e5f701 soil.zip
package/libsoil/libsoil.mk new file +43 -0
43 lines not on this page · raw message
Signature · 1 line
2.6.2
PATCH v4 1/1 package/libsoil: new package
Dear Bernd Kuhls,
Quoted 8 lines · Bernd Kuhls
Needed for these new Kodi addons:
kodi-screensaver-asterwave
kodi-screensaver-cpblobs
kodi-screensaver-matrixtrails
kodi-screensaver-planestate
kodi-visualisation-fountain
Quoted 7 lines
Signed-off-by Bernd Kuhls <[email protected]>---
v4: added various changes after a review by Thomas
- moved "-c -fPIC" from_CFLAGSto the patchedMakefile
- moved extracted source code from the "Simple OpenGL Image Library" subdir into $(@D)
-LIBSOIL_MAKEFILEnow contains the filename of theMakefile
Applied with some minor changes:
[Thomas:
- don't pass LIBSOIL_CFLAGS since this variable no longer exists.
- pass TARGET_CONFIGURE_OPTS on the right hand side of make for the install steps, like was done for the build step.]
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com