* [Buildroot] [PATCH 1/3] libvorbis: split tremor into its own package
@ 2009-12-03 23:02 Sven Neumann
2009-12-03 23:02 ` [Buildroot] [PATCH 2/3] tremor: add patch to export all symbols Sven Neumann
2009-12-08 20:51 ` [Buildroot] [PATCH 1/3] libvorbis: split tremor into its own package Peter Korsgaard
0 siblings, 2 replies; 4+ messages in thread
From: Sven Neumann @ 2009-12-03 23:02 UTC (permalink / raw)
To: buildroot
This commit splits the Tremor fixed-point implementation
out of the libvorbis package and creates a new package
called 'tremor' for it.
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
---
package/multimedia/Config.in | 1 +
package/multimedia/libvorbis/Config.in | 7 ---
package/multimedia/libvorbis/libvorbis.mk | 75 +----------------------------
package/multimedia/tremor/Config.in | 7 +++
package/multimedia/tremor/tremor.mk | 31 ++++++++++++
5 files changed, 41 insertions(+), 80 deletions(-)
create mode 100644 package/multimedia/tremor/Config.in
create mode 100644 package/multimedia/tremor/tremor.mk
diff --git a/package/multimedia/Config.in b/package/multimedia/Config.in
index 49932d0..98cf9d1 100644
--- a/package/multimedia/Config.in
+++ b/package/multimedia/Config.in
@@ -24,5 +24,6 @@ source "package/multimedia/speex/Config.in"
source "package/multimedia/swfdec/Config.in"
source "package/multimedia/festival/Config.in"
source "package/multimedia/taglib/Config.in"
+source "package/multimedia/tremor/Config.in"
source "package/multimedia/vlc/Config.in"
endmenu
diff --git a/package/multimedia/libvorbis/Config.in b/package/multimedia/libvorbis/Config.in
index 28a6a2e..e322dd2 100644
--- a/package/multimedia/libvorbis/Config.in
+++ b/package/multimedia/libvorbis/Config.in
@@ -12,10 +12,3 @@ config BR2_PACKAGE_LIBVORBIS
representations such as MPEG-4 (AAC), and similar to, but higher
performance than MPEG-1/2 audio layer 3, MPEG-4 audio (TwinVQ),
WMA and PAC.
-
-config BR2_PACKAGE_LIBVORBIS_TREMOR
- bool "use fixed point implementation (tremor)"
- default y if BR2_SOFT_FLOAT
- depends on BR2_PACKAGE_LIBVORBIS
- help
- Use the Tremor fixed point implementation
diff --git a/package/multimedia/libvorbis/libvorbis.mk b/package/multimedia/libvorbis/libvorbis.mk
index 6c5dc7b..3cabd5e 100644
--- a/package/multimedia/libvorbis/libvorbis.mk
+++ b/package/multimedia/libvorbis/libvorbis.mk
@@ -4,8 +4,6 @@
#
#############################################################
-ifneq ($(BR2_PACKAGE_LIBVORBIS_TREMOR),y)
-
LIBVORBIS_VERSION = 1.2.3
LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.gz
LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis/$(LIBVORBIS-SOURCE)
@@ -19,81 +17,12 @@ LIBVORBIS_DEPENDENCIES = host-pkgconfig libogg
$(eval $(call AUTOTARGETS,package/multimedia,libvorbis))
-else
-
-############################################################
-#
-# Tremor (Integer decoder for Vorbis)
-#
-############################################################
-
-TREMOR_TRUNK:=http://svn.xiph.org/trunk/Tremor/
-TREMOR_VERSION:=16259
-TREMOR_NAME:=Tremor-svn-r$(TREMOR_VERSION)
-TREMOR_DIR:=$(BUILD_DIR)/$(TREMOR_NAME)
-TREMOR_SOURCE:=$(TREMOR_NAME).tar.bz2
-TREMOR_CAT=$(BZCAT)
-
-$(DL_DIR)/$(TREMOR_SOURCE):
- $(SVN_CO) -r $(TREMOR_VERSION) $(TREMOR_TRUNK) $(TREMOR_DIR)
- tar -cv -C $(BUILD_DIR) $(TREMOR_NAME) | bzip2 - -c > $@
-
-$(TREMOR_DIR)/.source: $(DL_DIR)/$(TREMOR_SOURCE)
- $(TREMOR_CAT) $(DL_DIR)/$(TREMOR_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $@
-
-$(TREMOR_DIR)/.configured: $(TREMOR_DIR)/.source
- (cd $(TREMOR_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_ARGS) \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)" \
- ./autogen.sh \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --sysconfdir=/etc \
- --enable-shared \
- --enable-static \
- --disable-oggtest \
- $(DISABLE_NLS) \
- )
- touch $@
-
-$(TREMOR_DIR)/.libs: $(TREMOR_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) -C $(TREMOR_DIR)
- touch $@
-
-$(STAGING_DIR)/usr/lib/tremor.so: $(TREMOR_DIR)/.libs
- $(MAKE) prefix=$(STAGING_DIR)/usr -C $(TREMOR_DIR) install
- touch $@
-
-$(TARGET_DIR)/usr/lib/tremor.so: $(STAGING_DIR)/usr/lib/tremor.so
- $(MAKE) prefix=$(TARGET_DIR)/usr -C $(TREMOR_DIR) \
- $(if $(BR2_STRIP_none),install,install-strip)
- touch $@
-
-$(TARGET_DIR)/usr/lib/tremor.a: $(TARGET_DIR)/usr/lib/tremor.so
- cp -dpf $(TREMOR_DIR)/lib/tremor.a $(TARGET_DIR)/usr/lib/
- touch $@
-
-tremor libvorbis: host-pkgconfig host-autoconf host-automake libogg $(TARGET_DIR)/usr/lib/tremor.so
-
-tremor-source libvorbis-source: $(DL_DIR)/$(TREMOR_SOURCE)
-
-tremor-clean libvorbis-clean:
- $(MAKE) prefix=$(STAGING_DIR)/usr -C $(TREMOR_DIR) uninstall
- -$(MAKE) -C $(TREMOR_DIR) clean
-
-tremor-dirclean libvorbis-dirclean:
- rm -rf $(TREMOR_DIR)
-
############################################################
#
# Toplevel Makefile options
#
############################################################
-TARGETS+=tremor
-
+ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
+TARGETS+=libvorbis
endif
diff --git a/package/multimedia/tremor/Config.in b/package/multimedia/tremor/Config.in
new file mode 100644
index 0000000..2e58e09
--- /dev/null
+++ b/package/multimedia/tremor/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_TREMOR
+ bool "tremor (fixed point vorbis decoder)"
+ help
+ Tremor is a fixed point implementation of an Ogg Vorbis
+ decoder. It provides a decoding API similar to libvorbis,
+ but gives much better performance on systems without a
+ floating-point unit.
diff --git a/package/multimedia/tremor/tremor.mk b/package/multimedia/tremor/tremor.mk
new file mode 100644
index 0000000..b493375
--- /dev/null
+++ b/package/multimedia/tremor/tremor.mk
@@ -0,0 +1,31 @@
+############################################################
+#
+# Tremor (Integer decoder for Vorbis)
+#
+############################################################
+
+TREMOR_TRUNK:=http://svn.xiph.org/trunk/Tremor/
+TREMOR_VERSION:=16259
+TREMOR_NAME:=Tremor-svn-r$(TREMOR_VERSION)
+TREMOR_DIR:=$(BUILD_DIR)/$(TREMOR_NAME)
+TREMOR_SOURCE:=$(TREMOR_NAME).tar.bz2
+TREMOR_CAT=$(BZCAT)
+TREMOR_AUTORECONF = YES
+TREMOR_INSTALL_STAGING = YES
+TREMOR_INSTALL_TARGET = YES
+
+$(DL_DIR)/$(TREMOR_SOURCE):
+ $(SVN_CO) -r $(TREMOR_VERSION) $(TREMOR_TRUNK) $(TREMOR_DIR)
+ tar -cv -C $(BUILD_DIR) $(TREMOR_NAME) | bzip2 - -c > $@
+
+$(eval $(call AUTOTARGETS,package/multimedia,tremor))
+
+
+############################################################
+#
+# Toplevel Makefile options
+#
+############################################################
+ifeq ($(BR2_PACKAGE_TREMOR),y)
+TARGETS+=tremor
+endif
--
1.6.5.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/3] tremor: add patch to export all symbols
2009-12-03 23:02 [Buildroot] [PATCH 1/3] libvorbis: split tremor into its own package Sven Neumann
@ 2009-12-03 23:02 ` Sven Neumann
2009-12-03 23:02 ` [Buildroot] [PATCH 3/3] gst-plugins-bad: allow the build of ivorbisdec plugin Sven Neumann
2009-12-08 20:51 ` [Buildroot] [PATCH 1/3] libvorbis: split tremor into its own package Peter Korsgaard
1 sibling, 1 reply; 4+ messages in thread
From: Sven Neumann @ 2009-12-03 23:02 UTC (permalink / raw)
To: buildroot
Tremor comes with a Version_script file that limits the
list of exported symbols. Without these symbols we can't
build the ivorbisdec GStreamer plug-in (and probably other
application). This commit adds a patch that removes this
limitation and makes all global symbols available.
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
---
.../tremor/tremor-export-all-symbols.patch | 32 ++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
create mode 100644 package/multimedia/tremor/tremor-export-all-symbols.patch
diff --git a/package/multimedia/tremor/tremor-export-all-symbols.patch b/package/multimedia/tremor/tremor-export-all-symbols.patch
new file mode 100644
index 0000000..127d16b
--- /dev/null
+++ b/package/multimedia/tremor/tremor-export-all-symbols.patch
@@ -0,0 +1,32 @@
+--- tremor-16259-orig/configure.in 2009-12-02 11:45:11.000000000 +0100
++++ tremor-16259/configure.in 2009-12-03 16:50:19.000000000 +0100
+@@ -72,23 +72,6 @@
+ LDFLAGS="$LDFLAGS $ldflags_save"
+
+
+-# Test whenever ld supports -version-script
+-AC_PROG_LD
+-AC_PROG_LD_GNU
+-if test "x$lt_cv_prog_gnu_ld" = "xyes"; then
+- SHLIB_VERSION_ARG="Wl,--version-script=Version_script"
+-
+- dnl Set extra linker options
+- case "$target_os" in
+- linux* | solaris* )
+- SHLIB_VERSION_ARG="-Wl,--version-script=Version_script"
+- ;;
+- *)
+- ;;
+- esac
+- LDFLAGS="$LDFLAGS $SHLIB_VERSION_ARG"
+-fi
+-
+ dnl --------------------------------------------------
+ dnl Options
+ dnl --------------------------------------------------
+@@ -128,4 +111,4 @@
+ AC_SUBST(DEBUG)
+ AC_SUBST(PROFILE)
+
+-AC_OUTPUT(Makefile Version_script)
++AC_OUTPUT(Makefile)
--
1.6.5.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 3/3] gst-plugins-bad: allow the build of ivorbisdec plugin
2009-12-03 23:02 ` [Buildroot] [PATCH 2/3] tremor: add patch to export all symbols Sven Neumann
@ 2009-12-03 23:02 ` Sven Neumann
0 siblings, 0 replies; 4+ messages in thread
From: Sven Neumann @ 2009-12-03 23:02 UTC (permalink / raw)
To: buildroot
Allow to select the ivorbisdec plugin using the tremor
fixed-point Ogg Vorbis decoder.
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
---
package/multimedia/gst-plugins-bad/Config.in | 4 ++++
.../multimedia/gst-plugins-bad/gst-plugins-bad.mk | 7 +++++++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index c7ebe2a..66335a8 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -176,6 +176,10 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL
bool "sdl"
select BR2_PACKAGE_SDL
+config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TREMOR
+ bool "tremor"
+ select BR2_PACKAGE_TREMOR
+
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD
bool "vcd"
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
index 9a0955f..bd5b633 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
@@ -336,6 +336,13 @@ else
GST_PLUGINS_BAD_CONF_OPT += --disable-sdl
endif
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TREMOR),y)
+GST_PLUGINS_BAD_CONF_OPT += --enable-ivorbis
+GST_PLUGINS_BAD_DEPENDENCIES += tremor
+else
+GST_PLUGINS_BAD_CONF_OPT += --disable-ivorbis
+endif
+
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD),y)
GST_PLUGINS_BAD_CONF_OPT += --enable-vcd
else
--
1.6.5.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/3] libvorbis: split tremor into its own package
2009-12-03 23:02 [Buildroot] [PATCH 1/3] libvorbis: split tremor into its own package Sven Neumann
2009-12-03 23:02 ` [Buildroot] [PATCH 2/3] tremor: add patch to export all symbols Sven Neumann
@ 2009-12-08 20:51 ` Peter Korsgaard
1 sibling, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2009-12-08 20:51 UTC (permalink / raw)
To: buildroot
>>>>> "Sven" == Sven Neumann <s.neumann@raumfeld.com> writes:
Sven> This commit splits the Tremor fixed-point implementation
Sven> out of the libvorbis package and creates a new package
Sven> called 'tremor' for it.
Committed all 3, thanks!
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-12-08 20:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-03 23:02 [Buildroot] [PATCH 1/3] libvorbis: split tremor into its own package Sven Neumann
2009-12-03 23:02 ` [Buildroot] [PATCH 2/3] tremor: add patch to export all symbols Sven Neumann
2009-12-03 23:02 ` [Buildroot] [PATCH 3/3] gst-plugins-bad: allow the build of ivorbisdec plugin Sven Neumann
2009-12-08 20:51 ` [Buildroot] [PATCH 1/3] libvorbis: split tremor into its own package Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox