[Armadeus-commitlog] SF.net SVN: armadeus: [673] trunk/patches/ 032-buildroot-vorbis-tremor-build-fix-for-buildroot-before-30102007.diff

[<ar...@us...>]

Revision: 673
          http://armadeus.svn.sourceforge.net/armadeus/?rev=673&view=rev
Author:   artemys
Date:     2007-11-10 02:16:49 -0800 (Sat, 10 Nov 2007)

Log Message:
-----------
[BUILDROOT] Add patches to compile libvorbis for pre-November 2007 Buildroots

Added Paths:
-----------
    trunk/patches/032-buildroot-vorbis-tremor-build-fix-for-buildroot-before-30102007.diff

Added: trunk/patches/032-buildroot-vorbis-tremor-build-fix-for-buildroot-before-30102007.diff
===================================================================
--- trunk/patches/032-buildroot-vorbis-tremor-build-fix-for-buildroot-before-30102007.diff	                        (rev 0)
+++ trunk/patches/032-buildroot-vorbis-tremor-build-fix-for-buildroot-before-30102007.diff	2007-11-10 10:16:49 UTC (rev 673)
@@ -0,0 +1,71 @@
+--- buildroot/package/libvorbis/Config.in	2007/09/19 20:13:08	19898
++++ buildroot.mod/package/libvorbis/Config.in	2007/10/31 06:36:04	20344
+@@ -1,6 +1,7 @@
+ config BR2_PACKAGE_LIBVORBIS
+ 	bool "libvorbis"
+ 	default n
++	depends on BR2_PACKAGE_LIBOGG
+ 	help
+ 	  Library for the Vorbis open source audio decoder
+ 	  Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
+@@ -29,3 +30,6 @@
+ 	help
+ 	  Use the Tremor fixed point implementation
+ 	  Not yet implemented
++
++comment "libvorbis requires the package libogg to build"
++	depends on !BR2_PACKAGE_LIBVORBIS
+--- buildroot/package/libvorbis/libvorbis.mk	2007/09/19 20:22:58	19899
++++ buildroot.mod/package/libvorbis/libvorbis.mk	2007/10/31 06:36:04	20344
+@@ -56,7 +56,7 @@
+ 	cp -dpf $(LIBVORBIS_DIR)/include/vorbis/*.h \
+ 		$(TARGET_DIR)/usr/include/vorbis
+ 
+-libvorbis: uclibc pkgconfig $(TARGET_DIR)/usr/lib/libvorbis.so
++libvorbis: uclibc pkgconfig libogg $(TARGET_DIR)/usr/lib/libvorbis.so
+ 
+ libvorbis-source: $(DL_DIR)/$(LIBVORBIS_SOURCE)
+ 
+@@ -74,20 +74,20 @@
+ ############################################################
+ 
+ TREMOR_TRUNK:=http://svn.xiph.org/trunk/Tremor/
+-TREMOR_VERSION:=-svn-$(DATE)
++TREMOR_VERSION:=svn-$(DATE)
+ TREMOR_NAME:=Tremor-$(TREMOR_VERSION)
+ TREMOR_DIR:=$(BUILD_DIR)/$(TREMOR_NAME)
+ TREMOR_SOURCE:=$(TREMOR_NAME).tar.bz2
+-
++TREMOR_CAT=$(BZCAT)
+ 
+ $(DL_DIR)/$(TREMOR_SOURCE):
+ 	(cd $(BUILD_DIR); \
+ 		$(SVN_CO) $(TREMOR_TRUNK); \
+ 		mv -f Tremor $(TREMOR_NAME); \
+-		tar -cvf $(TREMOR_NAME).tar $(TREMOR_DIR); \
++		tar -cvf $(TREMOR_NAME).tar $(TREMOR_NAME); \
+ 		bzip2 $(TREMOR_NAME).tar; \
+ 		rm -rf $(TREMOR_DIR); \
+-		mv $(TREMOR_NAME).tar.bz2 $(DL_DIR)/$(TREMOR_SOURCE); \
++		mv $(TREMOR_SOURCE) $(DL_DIR)/$(TREMOR_SOURCE); \
+ 	)
+ 
+ $(TREMOR_DIR)/.source: $(DL_DIR)/$(TREMOR_SOURCE)
+@@ -99,7 +99,7 @@
+ 		$(TARGET_CONFIGURE_ARGS) \
+ 		$(TARGET_CONFIGURE_OPTS) \
+ 		CFLAGS="$(TARGET_CFLAGS)" \
+-		./configure \
++		./autogen.sh \
+ 		--target=$(GNU_TARGET_NAME) \
+ 		--host=$(GNU_TARGET_NAME) \
+ 		--build=$(GNU_HOST_NAME) \
+@@ -129,7 +129,7 @@
+ 	cp -dpf $(TREMOR_DIR)/include/vorbis/*.h \
+ 		$(TARGET_DIR)/usr/include/vorbis
+ 
+-tremor: uclibc pkgconfig $(TARGET_DIR)/usr/lib/tremor.so
++tremor: uclibc pkgconfig libogg $(TARGET_DIR)/usr/lib/tremor.so
+ 
+ tremor-source: $(DL_DIR)/$(TREMOR_SOURCE)
+ 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.