diff options
| -rw-r--r-- | src/libdvdnav.mk | 4 | ||||
| -rw-r--r-- | src/libdvdread-1-fix-disable-apidoc.patch | 41 | ||||
| -rw-r--r-- | src/libdvdread.mk | 26 |
3 files changed, 14 insertions, 57 deletions
diff --git a/src/libdvdnav.mk b/src/libdvdnav.mk index 7e78aea..2fab361 100644 --- a/src/libdvdnav.mk +++ b/src/libdvdnav.mk @@ -3,8 +3,8 @@ PKG := libdvdnav $(PKG)_IGNORE := -$(PKG)_VERSION := 4d3753f -$(PKG)_CHECKSUM := 0717da4d0997cc43417afd58d9fc7ef35711c20e +$(PKG)_VERSION := f7ab2a7 +$(PKG)_CHECKSUM := 6a990f4e86e12535f27c1b2e3a7b30c252707652 $(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) diff --git a/src/libdvdread-1-fix-disable-apidoc.patch b/src/libdvdread-1-fix-disable-apidoc.patch deleted file mode 100644 index 7a1cf94..0000000 --- a/src/libdvdread-1-fix-disable-apidoc.patch +++ /dev/null @@ -1,41 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Taken from: -http://lists.mplayerhq.hu/pipermail/dvdnav-discuss/2014-March/002154.html - -From 967043381ad30ca32428e58b697f4928c6160e92 Mon Sep 17 00:00:00 2001 -From: Timothy Gu <timothygu99@gmail.com> -Date: Sun, 23 Mar 2014 16:50:05 -0700 -Subject: [PATCH] libdvdread/configure: fix --disable-apidoc - -Signed-off-by: Timothy Gu <timothygu99@gmail.com> ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fd2ce0f..2981f1a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -84,7 +84,7 @@ AC_SUBST([CSS_REQUIRES]) - CC_CHECK_CFLAGS_APPEND([-Wall -Wsign-compare]) - - --AC_ARG_ENABLE([doc], -+AC_ARG_ENABLE([apidoc], - AS_HELP_STRING([--disable-apidoc], [Disable building (with Doxygen) and intalling API documentation @<:@default=auto@:@>])) - - AC_PATH_PROG([DOXYGEN], [doxygen]) -@@ -94,7 +94,7 @@ AS_IF([test "x$DOXYGEN" = "x"], [ - AC_MSG_ERROR([You need Doxygen to build API documentation]) - ]) - ]) --AM_CONDITIONAL([APIDOC], [test "x$DOXYGEN" != "x"]) -+AM_CONDITIONAL([APIDOC], [test "x$DOXYGEN" != "x" && test "x$enable_apidoc" = "xyes"]) - - dnl --------------------------------------------- - dnl Output configuration files --- -1.8.3.2 - diff --git a/src/libdvdread.mk b/src/libdvdread.mk index fe08a2a..2e6485c 100644 --- a/src/libdvdread.mk +++ b/src/libdvdread.mk @@ -3,30 +3,28 @@ PKG := libdvdread $(PKG)_IGNORE := -$(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) -# 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)_URL := https://dvdnav.mplayerhq.hu/releases/$($(PKG)_FILE) +$(PKG)_VERSION := 4.9.9 +$(PKG)_CHECKSUM := 5536084fc7cd9a5d9fff9f91bfe7bf3e4cf3700e +$(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) # 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 -define $(PKG)_UPDATE +define $(PKG)_UPDATE_GIT $(WGET) -q -O- 'https://github.com/mirror/libdvdread/commits/master' | \ $(SED) -n 's#.*<span class="sha">\([^<]\{7\}\)[^<]\{3\}<.*#\1#p' | \ head -1 endef -define $(PKG)_UPDATE_RELEASE +define $(PKG)_UPDATE $(WGET) -q -O- 'https://dvdnav.mplayerhq.hu/releases/' | \ $(SED) -n 's,.*libdvdread-\([0-9][^<]*\)\.tar.*,\1,p' | \ grep -v 'alpha\|beta\|rc' | \ |