Advertisement
hobbes1069

Use system libass

May 26th, 2011
511
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.31 KB | None | 0 0
  1. diff -Naur avidemux_2.5.4.orig/plugins/ADM_videoFilters/Ass/ADM_vidASS.h avidemux_2.5.4/plugins/ADM_videoFilters/Ass/ADM_vidASS.h
  2. --- avidemux_2.5.4.orig/plugins/ADM_videoFilters/Ass/ADM_vidASS.h   2010-01-09 05:03:17.000000000 -0600
  3. +++ avidemux_2.5.4/plugins/ADM_videoFilters/Ass/ADM_vidASS.h    2011-05-25 14:27:23.828297237 -0500
  4. @@ -14,7 +14,7 @@
  5.  
  6.  extern "C"
  7.  {
  8. -#include "ADM_libAss/ass.h"
  9. +#include <ass/ass.h>
  10.  }
  11.  #include "ADM_vidAss_Params.h"
  12.  class ADMVideoSubASS : public AVDMGenericVideoStream
  13. diff -Naur avidemux_2.5.4.orig/plugins/ADM_videoFilters/Ass/CMakeLists.txt avidemux_2.5.4/plugins/ADM_videoFilters/Ass/CMakeLists.txt
  14. --- avidemux_2.5.4.orig/plugins/ADM_videoFilters/Ass/CMakeLists.txt 2010-01-09 05:03:17.000000000 -0600
  15. +++ avidemux_2.5.4/plugins/ADM_videoFilters/Ass/CMakeLists.txt  2011-05-25 15:45:05.219501216 -0500
  16. @@ -2,13 +2,14 @@
  17.  checkFreeType()
  18.  
  19.  IF (USE_FREETYPE)
  20. -   ADD_SUBDIRECTORY(ADM_libAss)
  21. +   #ADD_SUBDIRECTORY(ADM_libAss)
  22.  
  23.     INCLUDE(vf_plugin)
  24.     SET(ADM_vf_ssa_SRCS ADM_vidASS.cpp)
  25.  
  26.     ADD_LIBRARY(ADM_vf_ssa SHARED ${ADM_vf_ssa_SRCS})
  27. -   TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass)
  28. +   FIND_LIBRARY(LIBASS ass)
  29. +   TARGET_LINK_LIBRARIES(ADM_vf_ssa ${LIBASS})
  30.     ADD_TARGET_CFLAGS(ADM_vf_ssa "-DCONFIG_FREETYPE=1")
  31.     ADD_TARGET_LDFLAGS(ADM_vf_ssa "${FREETYPE2_LDFLAGS}")
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement