diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-12-01 09:56:54 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-12-01 09:56:54 +0100 |
| commit | c3b72c6cd7b82e70cf61f4eac59f176444eaebf1 (patch) | |
| tree | fe27a5f40b77b826a0bbe7bc2587e4592f74e6c5 /package/multimedia | |
| parent | c29253ef2e2a473e597637b7ada9fb268dfa8767 (diff) | |
| parent | e3c6b3853ef054efe3ab9800392aec7aa7656dd3 (diff) | |
Merge branch 'next'
And kickoff 2012.02 cycle.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/multimedia')
| -rw-r--r-- | package/multimedia/gst-dsp/gst-dsp.mk | 5 | ||||
| -rw-r--r-- | package/multimedia/lame/lame-no-static.patch | 28 | ||||
| -rw-r--r-- | package/multimedia/lame/lame.mk | 3 |
3 files changed, 4 insertions, 32 deletions
diff --git a/package/multimedia/gst-dsp/gst-dsp.mk b/package/multimedia/gst-dsp/gst-dsp.mk index 17eb18966..cd856c138 100644 --- a/package/multimedia/gst-dsp/gst-dsp.mk +++ b/package/multimedia/gst-dsp/gst-dsp.mk @@ -1,6 +1,5 @@ -GST_DSP_VERSION=0.8.0 -GST_DSP_SOURCE=gst-dsp-$(GST_DSP_VERSION).tar.gz -GST_DSP_SITE=http://gst-dsp.googlecode.com/files/ +GST_DSP_VERSION = 0.9.0 +GST_DSP_SITE = http://gst-dsp.googlecode.com/files/ define GST_DSP_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e diff --git a/package/multimedia/lame/lame-no-static.patch b/package/multimedia/lame/lame-no-static.patch deleted file mode 100644 index f507f7f70..000000000 --- a/package/multimedia/lame/lame-no-static.patch +++ /dev/null @@ -1,28 +0,0 @@ -We don't want statically compiled binaries by force so nuke that. - -Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> - -diff -Nura lame-3.98.4/frontend/Makefile.am lame-3.98.4.nostatic/frontend/Makefile.am ---- lame-3.98.4/frontend/Makefile.am 2006-09-30 06:17:05.000000000 -0300 -+++ lame-3.98.4.nostatic/frontend/Makefile.am 2011-02-10 13:46:05.512559590 -0300 -@@ -52,7 +52,7 @@ - endif - - CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@ --LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static -+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ - - INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir) - -diff -Nura lame-3.98.4/frontend/Makefile.in lame-3.98.4.nostatic/frontend/Makefile.in ---- lame-3.98.4/frontend/Makefile.in 2008-06-25 09:17:51.000000000 -0300 -+++ lame-3.98.4.nostatic/frontend/Makefile.in 2011-02-10 13:45:54.752559590 -0300 -@@ -152,7 +152,7 @@ - $(top_builddir)/libmp3lame/libmp3lame.la \ - @FRONTEND_LDADD@ - --LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static -+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ diff --git a/package/multimedia/lame/lame.mk b/package/multimedia/lame/lame.mk index 7609f2db3..fbf0ddae5 100644 --- a/package/multimedia/lame/lame.mk +++ b/package/multimedia/lame/lame.mk @@ -4,11 +4,12 @@ # ############################################################# -LAME_VERSION = 3.98.4 +LAME_VERSION = 3.99 LAME_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/lame LAME_DEPENDENCIES = host-pkg-config LAME_INSTALL_STAGING = YES LAME_CONF_ENV = GTK_CONFIG=/bin/false +LAME_CONF_OPT = --enable-dynamic-frontends ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) LAME_DEPENDENCIES += libsndfile |