* [Buildroot] svn commit: trunk/buildroot/package/libvorbis
@ 2007-10-31 6:36 ulf at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: ulf at uclibc.org @ 2007-10-31 6:36 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-10-30 23:36:04 -0700 (Tue, 30 Oct 2007)
New Revision: 20344
Log:
Fix Tremor (integer version of libvorbis) so it builds
Modified:
trunk/buildroot/package/libvorbis/Config.in
trunk/buildroot/package/libvorbis/libvorbis.mk
Changeset:
Modified: trunk/buildroot/package/libvorbis/Config.in
===================================================================
--- trunk/buildroot/package/libvorbis/Config.in 2007-10-31 06:35:06 UTC (rev 20343)
+++ trunk/buildroot/package/libvorbis/Config.in 2007-10-31 06:36:04 UTC (rev 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
Modified: trunk/buildroot/package/libvorbis/libvorbis.mk
===================================================================
--- trunk/buildroot/package/libvorbis/libvorbis.mk 2007-10-31 06:35:06 UTC (rev 20343)
+++ trunk/buildroot/package/libvorbis/libvorbis.mk 2007-10-31 06:36:04 UTC (rev 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)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libvorbis
@ 2008-06-16 11:26 jacmet at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: jacmet at uclibc.org @ 2008-06-16 11:26 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-16 04:26:56 -0700 (Mon, 16 Jun 2008)
New Revision: 22373
Log:
libvorbis: show comment if libogg isn't enabled, not if libvorbis isn't.
Modified:
trunk/buildroot/package/libvorbis/Config.in
Changeset:
Modified: trunk/buildroot/package/libvorbis/Config.in
===================================================================
--- trunk/buildroot/package/libvorbis/Config.in 2008-06-16 11:25:25 UTC (rev 22372)
+++ trunk/buildroot/package/libvorbis/Config.in 2008-06-16 11:26:56 UTC (rev 22373)
@@ -33,4 +33,4 @@
Not yet implemented
comment "libvorbis requires the package libogg to build"
- depends on !BR2_PACKAGE_LIBVORBIS
+ depends on !BR2_PACKAGE_LIBOGG
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libvorbis
@ 2008-06-16 11:34 jacmet at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: jacmet at uclibc.org @ 2008-06-16 11:34 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-16 04:34:11 -0700 (Mon, 16 Jun 2008)
New Revision: 22374
Log:
libvorbis: fix av32 typo in tremor default
Modified:
trunk/buildroot/package/libvorbis/Config.in
Changeset:
Modified: trunk/buildroot/package/libvorbis/Config.in
===================================================================
--- trunk/buildroot/package/libvorbis/Config.in 2008-06-16 11:26:56 UTC (rev 22373)
+++ trunk/buildroot/package/libvorbis/Config.in 2008-06-16 11:34:11 UTC (rev 22374)
@@ -25,7 +25,7 @@
config BR2_PACKAGE_LIBVORBIS_TREMOR
bool "libvorbis integer implementation"
- default y if BR2_arm || BR2_av32
+ default y if BR2_arm || BR2_avr32
default n
depends on BR2_PACKAGE_LIBVORBIS
help
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libvorbis
@ 2008-06-16 11:34 jacmet at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: jacmet at uclibc.org @ 2008-06-16 11:34 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-16 04:34:29 -0700 (Mon, 16 Jun 2008)
New Revision: 22375
Log:
libvorbis: remove BR2_PACKAGE_LIBVORBIS_HEADERS
We don't need per-package header install options now that we have
BR2_HAVE_DEVFILES (they are in fact useless as the files will get
overwritten/deleted anyway).
Modified:
trunk/buildroot/package/libvorbis/Config.in
trunk/buildroot/package/libvorbis/libvorbis.mk
Changeset:
Modified: trunk/buildroot/package/libvorbis/Config.in
===================================================================
--- trunk/buildroot/package/libvorbis/Config.in 2008-06-16 11:34:11 UTC (rev 22374)
+++ trunk/buildroot/package/libvorbis/Config.in 2008-06-16 11:34:29 UTC (rev 22375)
@@ -15,14 +15,6 @@
performance than MPEG-1/2 audio layer 3, MPEG-4 audio (TwinVQ),
WMA and PAC.
-
-config BR2_PACKAGE_LIBVORBIS_HEADERS
- bool "libvorbis target headers"
- default n
- depends on BR2_PACKAGE_LIBVORBIS
- help
- Add target headers for the Vorbis open source audio decoder
-
config BR2_PACKAGE_LIBVORBIS_TREMOR
bool "libvorbis integer implementation"
default y if BR2_arm || BR2_avr32
Modified: trunk/buildroot/package/libvorbis/libvorbis.mk
===================================================================
--- trunk/buildroot/package/libvorbis/libvorbis.mk 2008-06-16 11:34:11 UTC (rev 22374)
+++ trunk/buildroot/package/libvorbis/libvorbis.mk 2008-06-16 11:34:29 UTC (rev 22375)
@@ -47,15 +47,6 @@
$(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBVORBIS_DIR) install
touch $@
-$(TARGET_DIR)/usr/lib/libvorbis.a: $(TARGET_DIR)/usr/lib/libvorbis.so
- cp -dpf $(LIBVORBIS_DIR)/lib/libvorbis.a $(TARGET_DIR)/usr/lib/
- touch $@
-
-libvorbis-header: $(TARGET_DIR)/usr/lib/libvorbis.a
- mkdir -p $(TARGET_DIR)/usr/include/vorbis
- cp -dpf $(LIBVORBIS_DIR)/include/vorbis/*.h \
- $(TARGET_DIR)/usr/include/vorbis
-
libvorbis: uclibc pkgconfig libogg $(TARGET_DIR)/usr/lib/libvorbis.so
libvorbis-source: $(DL_DIR)/$(LIBVORBIS_SOURCE)
@@ -124,11 +115,6 @@
cp -dpf $(TREMOR_DIR)/lib/tremor.a $(TARGET_DIR)/usr/lib/
touch $@
-tremor-header: $(TARGET_DIR)/usr/lib/tremor.a
- mkdir -p $(TARGET_DIR)/usr/include/vorbis
- cp -dpf $(TREMOR_DIR)/include/vorbis/*.h \
- $(TARGET_DIR)/usr/include/vorbis
-
tremor: uclibc pkgconfig libogg $(TARGET_DIR)/usr/lib/tremor.so
tremor-source: $(DL_DIR)/$(TREMOR_SOURCE)
@@ -152,7 +138,3 @@
endif
TARGETS+=libvorbis
endif
-
-ifeq ($(strip $(BR2_PACKAGE_LIBVORBIS_HEADERS)),y)
-TARGETS+=libvorbis-header
-endif
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libvorbis
@ 2008-06-16 11:42 jacmet at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: jacmet at uclibc.org @ 2008-06-16 11:42 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-16 04:42:16 -0700 (Mon, 16 Jun 2008)
New Revision: 22376
Log:
libvorbis: make tremor option description more clear
Also remove comment about not being implemented.
Modified:
trunk/buildroot/package/libvorbis/Config.in
Changeset:
Modified: trunk/buildroot/package/libvorbis/Config.in
===================================================================
--- trunk/buildroot/package/libvorbis/Config.in 2008-06-16 11:34:29 UTC (rev 22375)
+++ trunk/buildroot/package/libvorbis/Config.in 2008-06-16 11:42:16 UTC (rev 22376)
@@ -16,13 +16,12 @@
WMA and PAC.
config BR2_PACKAGE_LIBVORBIS_TREMOR
- bool "libvorbis integer implementation"
+ bool "use fixed point implementation (tremor)
default y if BR2_arm || BR2_avr32
default n
depends on BR2_PACKAGE_LIBVORBIS
help
Use the Tremor fixed point implementation
- Not yet implemented
comment "libvorbis requires the package libogg to build"
depends on !BR2_PACKAGE_LIBOGG
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libvorbis
@ 2008-06-16 11:42 jacmet at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: jacmet at uclibc.org @ 2008-06-16 11:42 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-16 04:42:19 -0700 (Mon, 16 Jun 2008)
New Revision: 22377
Log:
libvorbis: use BR2_SOFT_FLOAT to set default for tremor
Use BR2_SOFT_FLOAT to set default for tremor instead of hardcoded arch list.
Modified:
trunk/buildroot/package/libvorbis/Config.in
Changeset:
Modified: trunk/buildroot/package/libvorbis/Config.in
===================================================================
--- trunk/buildroot/package/libvorbis/Config.in 2008-06-16 11:42:16 UTC (rev 22376)
+++ trunk/buildroot/package/libvorbis/Config.in 2008-06-16 11:42:19 UTC (rev 22377)
@@ -17,7 +17,7 @@
config BR2_PACKAGE_LIBVORBIS_TREMOR
bool "use fixed point implementation (tremor)
- default y if BR2_arm || BR2_avr32
+ default y if BR2_SOFT_FLOAT
default n
depends on BR2_PACKAGE_LIBVORBIS
help
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libvorbis
@ 2008-06-17 5:29 hamish at uclibc.org
2008-06-17 7:17 ` Peter Korsgaard
0 siblings, 1 reply; 9+ messages in thread
From: hamish at uclibc.org @ 2008-06-17 5:29 UTC (permalink / raw)
To: buildroot
Author: hamish
Date: 2008-06-16 22:29:48 -0700 (Mon, 16 Jun 2008)
New Revision: 22387
Log:
Fix missing punctuation
Modified:
trunk/buildroot/package/libvorbis/Config.in
Changeset:
Modified: trunk/buildroot/package/libvorbis/Config.in
===================================================================
--- trunk/buildroot/package/libvorbis/Config.in 2008-06-17 05:11:43 UTC (rev 22386)
+++ trunk/buildroot/package/libvorbis/Config.in 2008-06-17 05:29:48 UTC (rev 22387)
@@ -16,7 +16,7 @@
WMA and PAC.
config BR2_PACKAGE_LIBVORBIS_TREMOR
- bool "use fixed point implementation (tremor)
+ bool "use fixed point implementation (tremor)"
default y if BR2_SOFT_FLOAT
default n
depends on BR2_PACKAGE_LIBVORBIS
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libvorbis
2008-06-17 5:29 hamish at uclibc.org
@ 2008-06-17 7:17 ` Peter Korsgaard
0 siblings, 0 replies; 9+ messages in thread
From: Peter Korsgaard @ 2008-06-17 7:17 UTC (permalink / raw)
To: buildroot
>>>>> "hamish" == hamish <hamish@uclibc.org> writes:
hamish> Author: hamish
hamish> Date: 2008-06-16 22:29:48 -0700 (Mon, 16 Jun 2008)
hamish> New Revision: 22387
hamish> Log:
hamish> Fix missing punctuation
Ups, just noticed as well - Thanks for fixing it.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libvorbis
@ 2008-07-03 8:14 ulf at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: ulf at uclibc.org @ 2008-07-03 8:14 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2008-07-03 01:14:54 -0700 (Thu, 03 Jul 2008)
New Revision: 22616
Log:
Cleanup libvorbis, install in STAGING_DIR, courtesy Conrad Parker
Modified:
trunk/buildroot/package/libvorbis/libvorbis.mk
Changeset:
Modified: trunk/buildroot/package/libvorbis/libvorbis.mk
===================================================================
--- trunk/buildroot/package/libvorbis/libvorbis.mk 2008-07-03 08:12:51 UTC (rev 22615)
+++ trunk/buildroot/package/libvorbis/libvorbis.mk 2008-07-03 08:14:54 UTC (rev 22616)
@@ -40,13 +40,16 @@
touch $@
$(LIBVORBIS_DIR)/.libs: $(LIBVORBIS_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) -C $(LIBVORBIS_DIR)
+ $(MAKE) -C $(@D)
touch $@
-$(TARGET_DIR)/usr/lib/libvorbis.so: $(LIBVORBIS_DIR)/.libs
- $(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBVORBIS_DIR) install
- touch $@
+$(STAGING_DIR)/usr/lib/libvorbis.so: $(LIBVORBIS_DIR)/.libs
+ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBVORBIS_DIR) install
+$(TARGET_DIR)/usr/lib/libvorbis.so: $(STAGING_DIR)/usr/lib/libvorbis.so
+ $(INSTALL) -D $(STAGING_DIR)/usr/lib/libvorbis*.so* $(TARGET_DIR)/usr/lib
+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libvorbis*.so*
+
libvorbis: uclibc pkgconfig libogg $(TARGET_DIR)/usr/lib/libvorbis.so
libvorbis-source: $(DL_DIR)/$(LIBVORBIS_SOURCE)
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2008-07-03 8:14 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-16 11:26 [Buildroot] svn commit: trunk/buildroot/package/libvorbis jacmet at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2008-07-03 8:14 ulf at uclibc.org
2008-06-17 5:29 hamish at uclibc.org
2008-06-17 7:17 ` Peter Korsgaard
2008-06-16 11:42 jacmet at uclibc.org
2008-06-16 11:42 jacmet at uclibc.org
2008-06-16 11:34 jacmet at uclibc.org
2008-06-16 11:34 jacmet at uclibc.org
2007-10-31 6:36 ulf at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox