config test only checks libass headers because we dynamic load it at

runtime pass CONFIG =config_libass_link to force linking against libass. add this for debian as a dependency
githubAtom · Aug 24, 2015 · 3e3fea9 · 3e3fea9
1 parent e650c8d
commit 3e3fea9
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/config.tests/libass/libass.pro b/config.tests/libass/libass.pro
@@ -3,5  3,5 @@ CONFIG  = console
 
 SOURCES  = main.cpp
 
-LIBS  = -lass
 #LIBS  = -lass
 include(../paths.pri)
diff --git a/config.tests/libass/main.cpp b/config.tests/libass/main.cpp
@@ -21,8  21,3 @@
 extern "C" {
 #include <ass/ass.h>
 }
-int main()
-{
-    ass_library_done(ass_library_init());
-    return 0;
-}
diff --git a/debian/rules b/debian/rules
@@ -7,5  7,5 @@ export QT_SELECT=qt5
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	qmake "CONFIG =no_rpath recheck"
 	qmake "CONFIG =no_rpath recheck config_libass_link"
 
diff --git a/src/libQtAV.pro b/src/libQtAV.pro
@@ -275,7  275,7 @@ config_openglwindow {
 }
 config_libass {
 #link against libass instead of dynamic load
-  !capi|android|ios|winrt {
   !capi|android|ios|winrt|config_libass_link {
     LIBS  = -lass #-lfribidi -lfontconfig -lxml2 -lfreetype -lharfbuzz -lz
     DEFINES  = CAPI_LINK_ASS
   }