contrib: forgotten patch for dvdcss

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

diff --git a/contrib/src/ogg/rules.mak b/contrib/src/ogg/rules.mak
index 01a5e21e3d69ae6b0a5cf487e710dec4592d1bf1..3c84f1875ccc5f3f0ee2c39f4b37d97d21342d0d 100644 (file)
--- a/contrib/src/ogg/rules.mak
+++ b/contrib/src/ogg/rules.mak
@@ -1,37 +1,31 @@
 # libogg
 
-OGG_VERSION := 1.2.2
+OGG_VERSION := 1.3.0
 
-OGG_TARBALL := libogg-$(OGG_VERSION).tar.xz
-OGG_URL := http://downloads.xiph.org/releases/ogg/$(OGG_TARBALL)
-#OGG_URL := $(CONTRIB_VIDEOLAN)/$(OGG_TARBALL)
+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
 
-NEED_OGG = $(call need_pkg,"ogg >= 1.0")
+PKGS += ogg
+ifeq ($(call need_pkg,"ogg >= 1.0"),)
+PKGS_FOUND += ogg
+endif
 
-$(TARBALLS)/$(OGG_TARBALL):
-       $(DOWNLOAD) $(OGG_URL)
+$(TARBALLS)/libogg-$(OGG_VERSION).tar.xz:
+       $(call download,$(OGG_URL))
 
-.sum-ogg: $(TARBALLS)/$(OGG_TARBALL)
-       $(CHECK_SHA512)
-       touch $@
+.sum-ogg: libogg-$(OGG_VERSION).tar.xz
 
-libogg: $(TARBALLS)/$(OGG_TARBALL) .sum-ogg
-       $(UNPACK_XZ)
-       (cd $@-$(OGG_VERSION) && patch -p1) < $(SRC)/ogg/libogg-1.1.patch
+libogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
+       $(UNPACK)
+       $(APPLY) $(SRC)/ogg/libogg-1.1.patch
 ifdef HAVE_WINCE
-       (cd $@-$(OGG_VERSION) && patch -p1) < $(SRC)/ogg/libogg-wince.patch
+       $(APPLY) $(SRC)/ogg/libogg-wince.patch
 endif
-       mv $@-$(OGG_VERSION) $@
-
-ifeq ($(NEED_OGG),)
-.ogg:
-else
-PKGS += ogg
+       $(MOVE)
 
 .ogg: libogg
-       #cd $< && autoreconf
+       #$(RECONF)
        cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
        cd $< && $(MAKE) install
-endif
        touch $@