d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libbluray: update and fix update script 

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
This commit is contained in:
Timothy Gu 2014-02-23 14:12:39 -08:00
parent 88cde28994
commit 8f98170ec7
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ffmpeg-1-libbluray-pkg-config.patch Normal file
View File

@ -0,0 +1,16 @@
This file is part of MXE.
See index.html for further information.
diff --git a/configure b/configure
index f831999..40c0a19 100755
--- a/configure
+++ b/configure
@@ -4273,7 +4273,7 @@ enabled ladspa && { check_header ladspa.h || die "ERROR: ladspa.h hea
enabled libiec61883 && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883
enabled libaacplus && require "libaacplus >= 2.0.0" aacplus.h aacplusEncOpen -laacplus
enabled libass && require_pkg_config libass ass/ass.h ass_library_init
-enabled libbluray && require libbluray libbluray/bluray.h bd_open -lbluray
+enabled libbluray && require_pkg_config libbluray libbluray/bluray.h bd_open
enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 &&
{ check_lib celt/celt.h celt_decoder_create_custom -lcelt0 ||
die "ERROR: libcelt must be installed and version must be >= 0.11.0."; }

3
src/ffmpeg.mk
View File

@ -9,7 +9,7 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://www.ffmpeg.org/releases/$($(PKG)_FILE)
$(PKG)_URL_2 := http://launchpad.net/ffmpeg/main/$($(PKG)_VERSION)/+download/$($(PKG)_FILE)
$(PKG)_DEPS := gcc bzip2 gnutls lame libass libvpx opencore-amr opus sdl speex theora vo-aacenc vo-amrwbenc vorbis x264 xvidcore zlib
$(PKG)_DEPS := gcc bzip2 gnutls lame libass libbluray libvpx opencore-amr opus sdl speex theora vo-aacenc vo-amrwbenc vorbis x264 xvidcore zlib
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://www.ffmpeg.org/download.html' | \
@ -41,6 +41,7 @@ define $(PKG)_BUILD
--enable-avisynth \
--enable-gnutls \
--enable-libass \
--enable-libbluray \
--enable-libmp3lame \
--enable-libopencore-amrnb \
--enable-libopencore-amrwb \

15
src/libbluray-2-freetype2.patch
View File

@ -1,15 +0,0 @@
This file is part of MXE.
See index.html for further information.
diff -ur libbluray-0.4.0.orig/src/libbluray/decoders/textst_render.c libbluray-0.4.0/src/libbluray/decoders/textst_render.c
--- libbluray-0.4.0.orig/src/libbluray/decoders/textst_render.c 2013-12-26 17:53:01.000000000 +1100
+++ libbluray-0.4.0/src/libbluray/decoders/textst_render.c 2013-12-26 17:54:24.000000000 +1100
@@ -30,7 +30,7 @@
#ifdef HAVE_FT2
#include <ft2build.h>
#include FT_FREETYPE_H
-#include <freetype/ftsynth.h>
+#include <freetype2/ftsynth.h>
#endif
#include "textst_render.h"

6
src/libbluray.mk
View File

@ -3,15 +3,15 @@
PKG := libbluray
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.4.0
$(PKG)_CHECKSUM := 39984aae77efde2e0917ed7e183ebf612813d7f3
$(PKG)_VERSION := 0.5.0
$(PKG)_CHECKSUM := 1a9c61daefc31438f9165e7681c563d0524b2d3e
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $($(PKG)_SUBDIR).tar.bz2
$(PKG)_URL := ftp://ftp.videolan.org/pub/videolan/libbluray/$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc freetype libxml2
define $(PKG)_UPDATE
$(WGET) -q -O- 'ftp://ftp.videolan.org/pub/videolan/libbluray/last/' | \
$(WGET) -q -O- 'http://www.videolan.org/developers/libbluray.html' | \
$(SED) -n 's,.*libbluray-\([0-9][^<]*\)\.tar.*,\1,p' | \
head -1
endef