libvorbis: split tremor into its own package
PATCH 1/3 libvorbis: split tremor into its own package
This commit splits the Tremor fixed-point implementation out of the libvorbis package and creates a new package called 'tremor' for it.
--- 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
package/multimedia/Config.in +1 -0
@@ -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
package/multimedia/libvorbis/Config.in +0 -7
@@ -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
package/multimedia/libvorbis/libvorbis.mk +2 -73
91 lines not on this page · raw message
package/multimedia/tremor/Config.in new file +7 -0
@@ -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.
package/multimedia/tremor/tremor.mk new file +31 -0
@@ -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
Signature · 1 line
1.6.5.3
PATCH 2/3 tremor: add patch to export all symbols
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.
--- .../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
package/multimedia/tremor/tremor-export-all-symbols.patch new file +32 -0
@@ -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)
Signature · 1 line
1.6.5.3
PATCH 3/3 gst-plugins-bad: allow the build of ivorbisdec plugin
Allow to select the ivorbisdec plugin using the tremor fixed-point Ogg Vorbis decoder.
--- package/multimedia/gst-plugins-bad/Config.in | 4 ++++ .../multimedia/gst-plugins-bad/gst-plugins-bad.mk | 7 +++++++ 2 files changed, 11 insertions(+), 0 deletions(-)
package/multimedia/gst-plugins-bad/Config.in +4 -0
@@ -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"
package/multimedia/gst-plugins-bad/gst-plugins-bad.mk +7 -0
@@ -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
Signature · 1 line
1.6.5.3
PATCH 1/3 libvorbis: split tremor into its own package
In reply to Sven NeumannQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Sven" == Sven Neumann <[email protected]> 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!
Signature · 1 line
Bye, Peter Korsgaard