From e3077bc8225ef10361f1b81b93d3eafc35bd2e55 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 1 Sep 2010 17:16:19 +0200
Subject: taglib: convert old-style hook to new-style hook

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

(limited to 'package/multimedia')

diff --git a/package/multimedia/taglib/taglib.mk b/package/multimedia/taglib/taglib.mk
index 2620b971a..e5433a42b 100644
--- a/package/multimedia/taglib/taglib.mk
+++ b/package/multimedia/taglib/taglib.mk
@@ -16,10 +16,12 @@ TAGLIB_CONF_ENV = \
 
 TAGLIB_CONF_OPT = --disable-libsuffix --program-prefix=''
 
-$(eval $(call AUTOTARGETS,package/multimedia,taglib))
+define TAGLIB_REMOVE_DEVFILE
+	rm -f $(TARGET_DIR)/usr/bin/taglib-config
+endef
 
 ifneq ($(BR2_HAVE_DEVFILES),y)
-$(TAGLIB_HOOK_POST_INSTALL):
-	rm -f $(TARGET_DIR)/usr/bin/taglib-config
-	touch $@
+TAGLIB_POST_INSTALL_TARGET_HOOKS += TAGLIB_REMOVE_DEVFILE
 endif
+
+$(eval $(call AUTOTARGETS,package/multimedia,taglib))
-- 
cgit v1.2.3


From 879465e040214d77238c7d42fcbad148a6580f8b Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Wed, 1 Sep 2010 23:19:39 +0200
Subject: alsa-lib: use correct step override method

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/multimedia/alsa-lib/alsa-lib.mk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'package/multimedia')

diff --git a/package/multimedia/alsa-lib/alsa-lib.mk b/package/multimedia/alsa-lib/alsa-lib.mk
index 6e4c5754f..c1a2b1a5d 100644
--- a/package/multimedia/alsa-lib/alsa-lib.mk
+++ b/package/multimedia/alsa-lib/alsa-lib.mk
@@ -72,15 +72,16 @@ ALSA_LIB_CONF_ENV = CFLAGS="$(ALSA_LIB_CFLAGS)" \
 # the above doesn't work with shared config.cache
 ALSA_LIB_USE_CONFIG_CACHE = NO
 
-$(eval $(call AUTOTARGETS,package/multimedia,alsa-lib))
-
-$(ALSA_LIB_TARGET_UNINSTALL):
+define ALSA_LIB_UNINSTALL_TARGET_CMDS
 	-rm -f $(TARGET_DIR)/usr/lib/libasound.so*
 	-rm -rf $(TARGET_DIR)/usr/lib/alsa-lib
 	-rm -rf $(TARGET_DIR)/usr/share/alsa
+endef
 
-$(ALSA_LIB_TARGET_CLEAN):
+define ALSA_LIB_UNINSTALL_STAGING_CMDS
 	-rm -f $(STAGING_DIR)/usr/lib/libasound.*
 	-rm -rf $(STAGING_DIR)/usr/lib/alsa-lib
 	-rm -rf $(STAGING_DIR)/usr/share/alsa
+endef
 
+$(eval $(call AUTOTARGETS,package/multimedia,alsa-lib))
-- 
cgit v1.2.3


From bfa1a7fc13f9e1ed4cd4c04700779d246ac31787 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 2 Sep 2010 00:08:47 +0200
Subject: speex: convert to new style hook

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

(limited to 'package/multimedia')

diff --git a/package/multimedia/speex/speex.mk b/package/multimedia/speex/speex.mk
index e246b2491..7de3b3830 100644
--- a/package/multimedia/speex/speex.mk
+++ b/package/multimedia/speex/speex.mk
@@ -12,7 +12,7 @@ SPEEX_INSTALL_TARGET = YES
 SPEEX_DEPENDENCIES = libogg
 SPEEX_CONF_OPT = --with-ogg-libraries=$(STAGING_DIR)/usr/lib \
 		 --with-ogg-includes=$(STAGING_DIR)/usr/include \
-		 --enable-fixed-point 
+		 --enable-fixed-point
 
 ifeq ($(BR2_PACKAGE_SPEEX_ARM4),y)
 	SPEEX_CONF_OPT += --enable-arm4-asm
@@ -22,15 +22,15 @@ ifeq ($(BR2_PACKAGE_SPEEX_ARM5E),y)
 	SPEEX_CONF_OPT += --enable-arm5e-asm
 endif
 
-$(eval $(call AUTOTARGETS,package/multimedia,speex))
+define SPEEX_LIBTOOL_FIXUP
+	$(SED) 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' $(@D)/libtool
+	$(SED) 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' $(@D)/libtool
+endef
+
+SPEEX_POST_CONFIGURE_HOOKS += SPEEX_LIBTOOL_FIXUP
 
-$(SPEEX_TARGET_BUILD): $(SPEEX_TARGET_CONFIGURE)
-	$(call MESSAGE,"Building")
-	$(SED) 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' $(SPEEX_DIR)/libtool
-	$(SED) 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' $(SPEEX_DIR)/libtool
+define SPEEX_BUILD_CMDS
 	$($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPT) -C $(@D)/$($(PKG)_SUBDIR)
-	$(Q)touch $@
+endef
 
-$(SPEEX_HOOK_POST_INSTALL): $(SPEEX_TARGET_INSTALL_TARGET)
-	rm -rf $(TARGET_DIR)/usr/share/doc/speex
-	touch $@
+$(eval $(call AUTOTARGETS,package/multimedia,speex))
-- 
cgit v1.2.3