From daf63b7b22a58cd6f6d51dac3a0f10e6aca641fd Mon Sep 17 00:00:00 2001
From: Kevin Mitchell <kevmitch@gmail.com>
Date: Wed, 5 Nov 2014 20:16:22 -0800
Subject: debian: make ffmpeg_configure depend on libass_build so

this way --enable-libass in ffmpeg_options works
---
 debian/rules | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index 32e25d3..53ca4aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,8 +36,14 @@ install:
 %:
 	exec dh $@
 
-# the dependencies must be built before mpv is configured
-ffmpeg_config:
+libass_config:
+	scripts/libass-config
+
+libass_build: libass_config
+	scripts/libass-build $(MFLAGS)
+
+# depend on libass_build in case the user specified --enable-libass in ffmpeg_options
+ffmpeg_config: libass_build
 	scripts/ffmpeg-config \
 		--enable-gnutls \
 		--enable-libgsm \
@@ -58,12 +64,6 @@ ffmpeg_config:
 ffmpeg_build: ffmpeg_config
 	scripts/ffmpeg-build $(MFLAGS)
 
-libass_config:
-	scripts/libass-config
-
-libass_build: libass_config
-	scripts/libass-build $(MFLAGS)
-
 # put the config in the right place and drop the local/ since it's package managed now
 override_dh_auto_configure: ffmpeg_build libass_build
 	scripts/mpv-config --prefix=/usr --confdir=/etc/mpv --enable-cdda # --enable-sdl2
-- 
cgit v1.2.3