Skip to content

Commit 3a06696

Browse files
committed
my first attempts at dependency management LOL
1 parent 3fa0e8e commit 3a06696

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

cross_compile_ffmpeg.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,7 @@ build_libopus() {
633633
}
634634

635635
build_libdvdread() {
636+
build_libdvdcss
636637
download_and_unpack_file http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz libdvdread-4.9.9
637638
cd libdvdread-4.9.9
638639
generic_configure "CFLAGS=-DHAVE_DVDCSS_DVDCSS_H LDFLAGS=-ldvdcss" # vlc patch: "--enable-libdvdcss" # XXX ask how I'm *supposed* to do this to the dvdread peeps [svn?]
@@ -993,6 +994,7 @@ build_vidstab() {
993994

994995
build_vlc() {
995996
build_qt # needs libjpeg [?]
997+
build_libdvdread
996998
build_libdvdnav
997999
cpu_count=1 # not wig out on .rc.lo files etc.
9981000
#do_git_checkout https://github.com/videolan/vlc.git vlc_git # vlc git master seems to be unstable and break the build and not test for windows often, so specify a known working revision...
@@ -1032,6 +1034,7 @@ build_vlc() {
10321034
}
10331035

10341036
build_mplayer() {
1037+
build_libdvdread
10351038
build_libdvdnav
10361039
download_and_unpack_file http://sourceforge.net/projects/mplayer-edl/files/mplayer-export-snapshot.2014-05-19.tar.bz2/download mplayer-export-2014-05-19
10371040
cd mplayer-export-2014-05-19
@@ -1211,10 +1214,8 @@ build_dependencies() {
12111214
build_freetype # uses bz2/zlib seemingly
12121215
build_libexpat
12131216
build_libxml2
1214-
build_libbluray # needs libxml2, freetype
1217+
build_libbluray # needs libxml2, freetype [FFmpeg, VLC use this, at least]
12151218
build_libjpeg_turbo # mplayer can use this, VLC qt might need it? [replaces libjpeg]
1216-
build_libdvdcss
1217-
build_libdvdread # vlc, mplayer use it. needs dvdcss
12181219
build_libxvid
12191220
build_libxavs
12201221
build_libsoxr

0 commit comments

Comments
 (0)