contrib: lame: fix sse optimizations build on win32 with gcc 4.9

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

diff --git a/contrib/src/ogg/rules.mak b/contrib/src/ogg/rules.mak
index 59141fe056d53a60a6f66f50b0a03b76b28edc2e..1573f72c2faadff71cdb39753b0b35db4e8fc097 100644 (file)
--- a/contrib/src/ogg/rules.mak
+++ b/contrib/src/ogg/rules.mak
@@ -1,12 +1,15 @@
 # libogg
 
-OGG_VERSION := 1.2.2
+OGG_VERSION := 1.3.1
 
 OGG_URL := http://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.xz
 #OGG_URL := $(CONTRIB_VIDEOLAN)/libogg-$(OGG_VERSION).tar.xz
-OGG_CVSROOT := :pserver:anoncvs@xiph.org:/usr/local/cvsroot
+#OGG_CVSROOT := :pserver:anoncvs@xiph.org:/usr/local/cvsroot
 
-NEED_OGG = $(call need_pkg,"ogg >= 1.0")
+PKGS += ogg
+ifeq ($(call need_pkg,"ogg >= 1.0"),)
+PKGS_FOUND += ogg
+endif
 
 $(TARBALLS)/libogg-$(OGG_VERSION).tar.xz:
        $(call download,$(OGG_URL))
@@ -16,19 +19,12 @@ $(TARBALLS)/libogg-$(OGG_VERSION).tar.xz:
 libogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
        $(UNPACK)
        $(APPLY) $(SRC)/ogg/libogg-1.1.patch
-ifdef HAVE_WINCE
-       $(APPLY) $(SRC)/ogg/libogg-wince.patch
-endif
+       $(APPLY) $(SRC)/ogg/libogg-disable-check.patch
+       $(UPDATE_AUTOCONFIG)
        $(MOVE)
 
-ifeq ($(NEED_OGG),)
-.ogg:
-else
-PKGS += ogg
-
 .ogg: libogg
-       #cd $< && autoreconf -fiv $(ACLOCAL_AMFLAGS)
+       $(RECONF)
        cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
        cd $< && $(MAKE) install
-endif
        touch $@