contrib: ncurses: configure doesn't understand --datarootdir

[vlc] / contrib / src / shout / rules.mak

diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index 882b2a4273ab9c7c18d60bf28736f3dcf9be3897..5dcbedc41f553b7d09af4903cc65386053d15dcc 100644 (file)
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -1,9 +1,13 @@
 # shout
 
-SHOUT_VERSION := 2.2.2
+SHOUT_VERSION := 2.3.1
 SHOUT_URL := http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSION).tar.gz
 
+ifdef BUILD_ENCODERS
+ifdef BUILD_NETWORK
 PKGS += shout
+endif
+endif
 ifeq ($(call need_pkg,"shout >= 2.1"),)
 PKGS_FOUND += shout
 endif
@@ -17,16 +21,20 @@ $(TARBALLS)/libshout-$(SHOUT_VERSION).tar.gz:
 libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
        $(UNPACK)
        $(APPLY) $(SRC)/shout/libshout-win32.patch
+       $(APPLY) $(SRC)/shout/bsd.patch
+       $(UPDATE_AUTOCONFIG)
        $(MOVE)
 
 DEPS_shout = ogg $(DEPS_ogg) theora $(DEPS_theora) speex $(DEPS_speex)
-ifdef HAVE_FPU
 DEPS_shout += vorbis $(DEPS_vorbis)
-else
-DEPS_shout += tremor $(DEPS_tremor)
+
+SHOUT_CONF :=
+
+ifdef HAVE_WIN32
+SHOUT_CONF += "--disable-thread"
 endif
 
 .shout: libshout
-       cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+       cd $< && $(HOSTVARS) ./configure $(SHOUT_CONF) $(HOSTCONF)
        cd $< && $(MAKE) install
        touch $@