From 143dd715361dfd52e97520e5e19257a12b6f471b Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Thu, 4 Sep 2014 17:09:03 -0700
Subject: libdvdnav, libdvdread: Update

---
 src/libdvdnav.mk  | 25 ++++++++++---------------
 src/libdvdread.mk | 20 ++++++++------------
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/libdvdnav.mk b/src/libdvdnav.mk
index a80f86d..bfd6645 100644
--- a/src/libdvdnav.mk
+++ b/src/libdvdnav.mk
@@ -3,25 +3,20 @@
 
 PKG             := libdvdnav
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := b945868
-$(PKG)_CHECKSUM := 5d55e5f2c1d9872742b6e2907722097c62bf40d6
-$(PKG)_SUBDIR   := mirror-$(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://github.com/mirror/$(PKG)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
-# Use Git snapshot for now because of its crash and assertion fixes
-# Commented out until new version based on Git is released
-# $(PKG)_VERSION  := 4.2.1
-# $(PKG)_CHECKSUM :=
-# $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-# $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
+$(PKG)_VERSION  := 5.0.1
+$(PKG)_CHECKSUM := 9c234fc1a11f760c90cc278b702b1e41fc418b7e
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
+# Later releases seem to be hosted on VideoLAN's server
 # $(PKG)_URL      := https://dvdnav.mplayerhq.hu/releases/$($(PKG)_FILE)
+$(PKG)_URL      := http://download.videolan.org/pub/videolan/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc libdvdread
 
-$(PKG)_UPDATE    = $(call MXE_GET_GITHUB_SHA, mirror/libdvdnav, master)
+# $(PKG)_UPDATE    = $(call MXE_GET_GITHUB_SHA, mirror/libdvdnav, master)
 
-define $(PKG)_UPDATE_RELEASE
-    $(WGET) -q -O- 'https://dvdnav.mplayerhq.hu/releases/' | \
-    $(SED) -n 's,.*libdvdnav-\([0-9][^<]*\)\.tar.*,\1,p' | \
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'http://download.videolan.org/pub/videolan/libdvdnav/' | \
+    $(SED) -n 's,.*href="\([0-9][^<]*\)/".*,\1,p' | \
     grep -v 'alpha\|beta\|rc' | \
     $(SORT) -V | \
     tail -1
diff --git a/src/libdvdread.mk b/src/libdvdread.mk
index 64339e6..b112781 100644
--- a/src/libdvdread.mk
+++ b/src/libdvdread.mk
@@ -3,17 +3,13 @@
 
 PKG             := libdvdread
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.9.9
-$(PKG)_CHECKSUM := 5536084fc7cd9a5d9fff9f91bfe7bf3e4cf3700e
+$(PKG)_VERSION  := 5.0.0
+$(PKG)_CHECKSUM := f1fadbf19fd8d3a9a63ff610ec8ce9021ebc6947
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := https://dvdnav.mplayerhq.hu/releases/$($(PKG)_FILE)
-# $(PKG)_VERSION  := 7c74365
-# $(PKG)_CHECKSUM := 99b12a4147064df85a7e5d6b0f00c00342c520a4
-# $(PKG)_SUBDIR   := mirror-$(PKG)-$($(PKG)_VERSION)
-# $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-# $(PKG)_URL      := https://github.com/mirror/$(PKG)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
-
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
+# Later releases seem to be hosted on VideoLAN's server
+# $(PKG)_URL      := https://dvdnav.mplayerhq.hu/releases/$($(PKG)_FILE)
+$(PKG)_URL      := http://download.videolan.org/pub/videolan/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 # libdvdread supports libdvdcss either by dynamic loading (dlfcn-win32) or
 # directly linking to libdvdcss. We directly links to the library here.
 $(PKG)_DEPS     := gcc libdvdcss
@@ -21,8 +17,8 @@ $(PKG)_DEPS     := gcc libdvdcss
 $(PKG)_UPDATE_GIT = $(call MXE_GET_GITHUB_SHA, mirror/libdvdread, master)
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://dvdnav.mplayerhq.hu/releases/' | \
-    $(SED) -n 's,.*libdvdread-\([0-9][^<]*\)\.tar.*,\1,p' | \
+    $(WGET) -q -O- 'http://download.videolan.org/pub/videolan/libdvdread/' | \
+    $(SED) -n 's,.*href="\([0-9][^<]*\)/".*,\1,p' | \
     grep -v 'alpha\|beta\|rc' | \
     $(SORT) -V | \
     tail -1
-- 
cgit v0.12