[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-90-g0dcd223
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-90-g0dcd223
|
From: Julien B a. A. <ar...@us...> - 2010-01-05 21:41:17
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 0dcd22374ef572db5b7e21fb62d792d3b72cb5a5 (commit)
via b31cf5c1c13dc41cd91cc48f05a496f63ebca0c0 (commit)
from cd52851f5f80eb7968f2b3051ac535b93bbe22a1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0dcd22374ef572db5b7e21fb62d792d3b72cb5a5
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jan 5 22:39:43 2010 +0100
[BUILDROOT] Moves libsndfile to autotools infrastructure and bump version to 1.0.21 while we are at it.
commit b31cf5c1c13dc41cd91cc48f05a496f63ebca0c0
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jan 5 20:01:48 2010 +0100
[TOOLS] quiltify: works on 2.6.X.y Linux sources instead of 2.6.X ones
-----------------------------------------------------------------------
Summary of changes:
...6-libsndfile-updates_makefile_to_autotool.patch | 107 ++++++++++++++++++++
scripts/quiltify.sh | 2 +-
2 files changed, 108 insertions(+), 1 deletions(-)
create mode 100644 patches/buildroot/096-libsndfile-updates_makefile_to_autotool.patch
diff --git a/patches/buildroot/096-libsndfile-updates_makefile_to_autotool.patch b/patches/buildroot/096-libsndfile-updates_makefile_to_autotool.patch
new file mode 100644
index 0000000..800d642
--- /dev/null
+++ b/patches/buildroot/096-libsndfile-updates_makefile_to_autotool.patch
@@ -0,0 +1,107 @@
+Moves libsndfile to autotools infrastructure and bump version to 1.0.21.
+
+Will be removed when updating to Buildroot 2010.02
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/audio/libsndfile/libsndfile.mk
+===================================================================
+--- buildroot.orig/package/audio/libsndfile/libsndfile.mk 2010-01-05 21:53:11.000000000 +0100
++++ buildroot/package/audio/libsndfile/libsndfile.mk 2010-01-05 22:12:10.000000000 +0100
+@@ -3,63 +3,10 @@
+ # libsndfile
+ #
+ #############################################################
+-LIBSNDFILE_VERSION:=1.0.17
++LIBSNDFILE_VERSION:=1.0.21
+ LIBSNDFILE_SOURCE:=libsndfile-$(LIBSNDFILE_VERSION).tar.gz
+-LIBSNDFILE_SITE:=http://www.mega-nerd.com/libsndfile/$(LIBUSB_SOURCE)
+-LIBSNDFILE_DIR:=$(BUILD_DIR)/libsndfile-$(LIBSNDFILE_VERSION)
+-LIBSNDFILE_BINARY:=src/.libs/libsndfile.so
+-LIBSNDFILE_TARGET_BINARY:=usr/lib/libsndfile.so
++LIBSNDFILE_SITE:=http://www.mega-nerd.com/libsndfile/files
++LIBSNDFILE_LIBTOOL_PATCH:=NO
++LIBSNDFILE_INSTALL_STAGING:=YES
+
+-$(DL_DIR)/$(LIBSNDFILE_SOURCE):
+- $(WGET) -P $(DL_DIR) $(LIBSNDFILE_SITE)/$(LIBSNDFILE_SOURCE)
+-
+-$(LIBSNDFILE_DIR)/.unpacked: $(DL_DIR)/$(LIBSNDFILE_SOURCE)
+- $(ZCAT) $(DL_DIR)/$(LIBSNDFILE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+- toolchain/patch-kernel.sh $(LIBSNDFILE_DIR) package/audio/libsndfile/ \*.patch
+- $(CONFIG_UPDATE) $(LIBSNDFILE_DIR)
+- touch $@
+-
+-$(LIBSNDFILE_DIR)/.configured: $(LIBSNDFILE_DIR)/.unpacked
+- (cd $(LIBSNDFILE_DIR); rm -f config.cache; \
+- $(TARGET_CONFIGURE_OPTS) \
+- $(TARGET_CONFIGURE_ARGS) \
+- ./configure \
+- --target=$(GNU_TARGET_NAME) \
+- --host=$(GNU_TARGET_NAME) \
+- --build=$(GNU_HOST_NAME) \
+- --prefix=/usr \
+- --sysconfdir=/etc \
+- )
+- touch $@
+-
+-$(LIBSNDFILE_DIR)/$(LIBSNDFILE_BINARY): $(LIBSNDFILE_DIR)/.configured
+- $(MAKE) CC=$(TARGET_CC) -C $(LIBSNDFILE_DIR)
+-
+-$(TARGET_DIR)/$(LIBSNDFILE_TARGET_BINARY): $(LIBSNDFILE_DIR)/$(LIBSNDFILE_BINARY)
+- $(MAKE) prefix=$(STAGING_DIR)/usr -C $(LIBSNDFILE_DIR) install
+- $(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBSNDFILE_DIR) install
+-ifneq ($(BR2_HAVE_MANPAGES),y)
+- rm -Rf $(TARGET_DIR)/usr/share/man
+- rm -Rf $(STAGING_DIR)/usr/share/man
+-endif
+-
+-libsndfile: uclibc $(TARGET_DIR)/$(LIBSNDFILE_TARGET_BINARY)
+-
+-libsndfile-source: $(DL_DIR)/$(LIBSNDFILE_SOURCE)
+-
+-libsndfile-clean:
+- $(MAKE) prefix=$(STAGING_DIR)/usr -C $(LIBSNDFILE_DIR) uninstall
+- $(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBSNDFILE_DIR) uninstall
+- -$(MAKE) -C $(LIBSNDFILE_DIR) clean
+-
+-libsndfile-dirclean:
+- rm -rf $(LIBSNDFILE_DIR)
+-
+-#############################################################
+-#
+-# Toplevel Makefile options
+-#
+-#############################################################
+-ifeq ($(strip $(BR2_PACKAGE_LIBSNDFILE)),y)
+-TARGETS+=libsndfile
+-endif
++$(eval $(call AUTOTARGETS,package/audio,libsndfile))
+Index: buildroot/package/audio/libsndfile/libsndfile-srconly.patch
+===================================================================
+--- buildroot.orig/package/audio/libsndfile/libsndfile-srconly.patch 2010-01-05 22:13:11.000000000 +0100
++++ buildroot/package/audio/libsndfile/libsndfile-srconly.patch 2010-01-05 22:22:36.000000000 +0100
+@@ -1,11 +1,13 @@
+---- libsndfile-1.0.17/Makefile.in.orig 2006-12-06 17:26:46.000000000 +0100
+-+++ libsndfile-1.0.17/Makefile.in 2006-12-06 17:31:11.000000000 +0100
+-@@ -209,7 +209,7 @@
+- target_cpu = @target_cpu@
+- target_os = @target_os@
+- target_vendor = @target_vendor@
+--SUBDIRS = man doc Win32 Octave src examples regtest tests
++Index: libsndfile-1.0.21/Makefile.in
++===================================================================
++--- libsndfile-1.0.21.orig/Makefile.in 2010-01-05 22:21:21.000000000 +0100
+++++ libsndfile-1.0.21/Makefile.in 2010-01-05 22:21:37.000000000 +0100
++@@ -314,7 +314,7 @@
++ top_srcdir = @top_srcdir@
++ DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
++ @BUILD_OCTAVE_MOD_TRUE@octave_dir = Octave
++-SUBDIRS = M4 man doc Win32 src $(octave_dir) examples regtest tests programs
+ +SUBDIRS = src
+- DIST_SUBDIRS = $(SUBDIRS)
+- EXTRA_DIST = reconfigure.mk acinclude.m4 libsndfile.spec.in \
+- sndfile.pc.in Mingw-make-dist.sh
++ DIST_SUBDIRS = M4 man doc Win32 src Octave examples regtest tests programs
++ EXTRA_DIST = libsndfile.spec.in sndfile.pc.in
++ pkgconfigdir = $(libdir)/pkgconfig
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 0023164..0f97a82 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -39,7 +39,7 @@ if [ "$answer" == "2" ]; then
QUILT_TARGET_PATCH_DIR=$ARMADEUS_BUILDROOT_DIR/../patches/buildroot
else
QUILT_TARGET_NAME="Linux kernel"
- QUILT_MAKEFILE_TARGET="linux26-unpacked"
+ QUILT_MAKEFILE_TARGET="linux26-patched"
QUILT_TARGET_DIR=$ARMADEUS_LINUX_DIR
QUILT_TARGET_PATCH_DIR=$ARMADEUS_LINUX_PATCH_DIR
fi
hooks/post-receive
--
armadeus
|
