rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to 2019.02

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
bsp/buildroot/package/libsquish/0001-Makefile-add-f-option-for-ln-to-remove-existing-dest.patch Normal file
View File

@@ -0,0 +1,32 @@
From 1e541293ac19c49f886220b64de6006c5c700144 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Sat, 12 Jan 2019 12:50:54 +0100
Subject: [PATCH] Makefile: add -f option for ln to remove existing destination
files
While reinstalling the library, all symlinks are present.
Ask ln to remove them with -f.
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index fd7d6c8..2683819 100644
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,8 @@ install: $(LIB) $(LIBA) libsquish.pc
$(INSTALL_FILE) $(LIBA) $(INSTALL_DIR)/$(LIB_PATH)
ifneq ($(USE_SHARED),0)
$(INSTALL_FILE) $(LIB) $(INSTALL_DIR)/$(LIB_PATH)
- ln -s $(LIB) $(INSTALL_DIR)/$(LIB_PATH)/$(SOLIB)
- ln -s $(LIB) $(INSTALL_DIR)/$(LIB_PATH)/libsquish.so
+ ln -sf $(LIB) $(INSTALL_DIR)/$(LIB_PATH)/$(SOLIB)
+ ln -sf $(LIB) $(INSTALL_DIR)/$(LIB_PATH)/libsquish.so
$(INSTALL_DIRECTORY) $(INSTALL_DIR)/$(LIB_PATH)/pkgconfig
$(INSTALL_FILE) libsquish.pc $(INSTALL_DIR)/$(LIB_PATH)/pkgconfig
endif
--
2.14.5

5
bsp/buildroot/package/libsquish/Config.in
View File

@@ -1,7 +1,6 @@
config BR2_PACKAGE_LIBSQUISH
bool "libsquish"
depends on BR2_INSTALL_LIBSTDCPP
depends on !BR2_STATIC_LIBS
help
The libSquish library compresses images with the DXT standard
(also known as S3TC). This standard is mainly used by OpenGL
@@ -9,5 +8,5 @@ config BR2_PACKAGE_LIBSQUISH
http://sourceforge.net/projects/libsquish
comment "libsquish needs a toolchain w/ C++, dynamic library"
depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
comment "libsquish needs a toolchain w/ C++"
depends on !BR2_INSTALL_LIBSTDCPP

2
bsp/buildroot/package/libsquish/libsquish.hash
View File

@@ -1,3 +1,5 @@
# From http://sourceforge.net/projects/libsquish/files
sha1 51844b9a8bc815a27e2cc0ffbede5fee3ef75110 libsquish-1.15.tgz
md5 c02645800131e55b519ff8dbe7284f93 libsquish-1.15.tgz
# Locally calculated
sha256 a6b8c383bf3ab28460d6507484d605dd722e03971606f0cd3032a3af682b63a5 LICENSE.txt

15
bsp/buildroot/package/libsquish/libsquish.mk
View File

@@ -12,26 +12,29 @@ LIBSQUISH_STRIP_COMPONENTS = 0
LIBSQUISH_LICENSE = MIT
LIBSQUISH_LICENSE_FILES = LICENSE.txt
ifeq ($(BR2_STATIC_LIBS),y)
LIBSQUISH_MAKE_ENV = USE_SHARED=0
else
LIBSQUISH_MAKE_ENV = USE_SHARED=1
endif
define LIBSQUISH_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
$(TARGET_CONFIGURE_OPTS) $(LIBSQUISH_MAKE_ENV) $(MAKE) -C $(@D)
endef
define LIBSQUISH_INSTALL_STAGING_CMDS
mkdir -p $(STAGING_DIR)/usr/include
mkdir -p $(STAGING_DIR)/usr/lib
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
$(TARGET_CONFIGURE_OPTS) $(LIBSQUISH_MAKE_ENV) $(MAKE) -C $(@D) \
install PREFIX=/usr INSTALL_DIR=$(STAGING_DIR)/usr
$(INSTALL) -D -m 644 $(@D)/libsquish.pc $(STAGING_DIR)/usr/lib/pkgconfig/libsquish.pc
ln -sf libsquish.so.0.0 $(STAGING_DIR)/usr/lib/libsquish.so
ln -sf libsquish.so.0.0 $(STAGING_DIR)/usr/lib/libsquish.so.0
endef
define LIBSQUISH_INSTALL_TARGET_CMDS
mkdir -p $(TARGET_DIR)/usr/include
mkdir -p $(TARGET_DIR)/usr/lib
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
$(TARGET_CONFIGURE_OPTS) $(LIBSQUISH_MAKE_ENV) $(MAKE) -C $(@D) \
install PREFIX=/usr INSTALL_DIR=$(TARGET_DIR)/usr
ln -sf libsquish.so.0.0 $(TARGET_DIR)/usr/lib/libsquish.so.0
endef
$(eval $(generic-package))