[Buildroot] urg and sdl minor fixes

[Buildroot] urg and sdl minor fixes

[Thomas Petazzoni]

Hello,

Here are three minor fixes for the urg and sdl packages.

Thomas

[Buildroot] [PATCH 1/3] urg: fix license

[Thomas Petazzoni]

The urg.mk file mentions a LGPLv3+ license. However, none of the
source code in the urg package carries a copyright notice that
indicates the "v3 or later". The only license information we have is
the COPYING file, that contains the text of the LGPLv3
license. Therefore, we should probably assume that the code is under
LGPLv3 only.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/urg/urg.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/urg/urg.mk b/package/urg/urg.mk
index 3f68bf2..b544ece 100644
--- a/package/urg/urg.mk
+++ b/package/urg/urg.mk
@@ -7,7 +7,7 @@
 URG_VERSION = 0.8.18
 URG_SITE = http://www.hokuyo-aut.jp/02sensor/07scanner/download/urg_programs_en/
 URG_SOURCE = urg-$(URG_VERSION).zip
-URG_LICENSE = LGPLv3+
+URG_LICENSE = LGPLv3
 URG_LICENSE_FILES = COPYING
 
 URG_INSTALL_STAGING = YES
-- 
1.7.9.5

[Buildroot] [PATCH 2/3] urg: handle config scripts properly

[Thomas Petazzoni]

urg installs two <foo>-config scripts, so the ones installed in
$(STAGING_DIR) should be fixed up, and the ones installed in
$(TARGET_DIR) should be removed. Use the <pkg>_CONFIG_SCRIPTS
infrastructure to do this.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/urg/urg.mk |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/urg/urg.mk b/package/urg/urg.mk
index b544ece..99f63a9 100644
--- a/package/urg/urg.mk
+++ b/package/urg/urg.mk
@@ -17,6 +17,8 @@ URG_DEPENDENCIES = sdl sdl_net
 URG_CONF_OPT = --with-sdl-prefix=$(STAGING_DIR)/usr \
 		--with-sdl-exec-prefix=$(STAGING_DIR)/usr
 
+URG_CONFIG_SCRIPTS = c_urg-config urg-config
+
 define URG_EXTRACT_CMDS
 	$(RM) -rf $(URG_DIR)
 	unzip -q -d $(BUILD_DIR)/ $(DL_DIR)/$(URG_SOURCE)
-- 
1.7.9.5

[Buildroot] [PATCH 3/3] sdl: use <pkg>_CONFIG_SCRIPTS for sdl-config

[Thomas Petazzoni]

Use the <pkg>_CONFIG_SCRIPTS mechanism to handle the sdl-config
script, so that it properly gets removed from the target. However, we
can't completely remove the manual fixup, because it also takes care
of removing the -Wl,-rpath option, which the general
<pkg>_CONFIG_SCRIPTS doesn't do.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/sdl/sdl.mk |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index 4786dc5..fb47c4d 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -57,13 +57,10 @@ SDL_CONF_OPT += --enable-pulseaudio=no \
 		--disable-nasm \
 		--disable-video-ps3
 
-# Fixup prefix= and exec_prefix= in sdl-config, and remove the
-# -Wl,-rpath option.
+SDL_CONFIG_SCRIPTS = sdl-config
+
+# Remove the -Wl,-rpath option.
 define SDL_FIXUP_SDL_CONFIG
-	$(SED) 's%prefix=/usr%prefix=$(STAGING_DIR)/usr%' \
-		$(STAGING_DIR)/usr/bin/sdl-config
-	$(SED) 's%exec_prefix=/usr%exec_prefix=$(STAGING_DIR)/usr%' \
-		$(STAGING_DIR)/usr/bin/sdl-config
 	$(SED) 's%-Wl,-rpath,\$${libdir}%%' \
 		$(STAGING_DIR)/usr/bin/sdl-config
 endef
-- 
1.7.9.5

[Buildroot] urg and sdl minor fixes

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> Hello,
 Thomas> Here are three minor fixes for the urg and sdl packages.

Committed series, thanks.

-- 
Bye, Peter Korsgaard