0002-Fix-linking-issue-when-disabling-internal-x265.patch 1.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344
  1. From 8712791f459d5b8e36ae6f407c6f45e661a2311d Mon Sep 17 00:00:00 2001
  2. From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
  3. Date: Wed, 13 Nov 2019 16:07:39 +0100
  4. Subject: [PATCH 2/2] Fix linking issue when disabling internal x265
  5. Without that fix we have:
  6. /usr/bin/ld: ./libhb/libhandbrake.a(common.o): undefined reference to symbol 'x265_api_query'
  7. /usr/bin/ld: /usr/lib/libx265.so.179: error adding symbols: DSO missing from command line
  8. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
  9. ---
  10. gtk/configure.ac | 1 +
  11. test/module.defs | 2 +-
  12. 2 files changed, 2 insertions(+), 1 deletion(-)
  13. diff --git a/gtk/configure.ac b/gtk/configure.ac
  14. index 82e8d88ce..034ccdcdb 100644
  15. --- a/gtk/configure.ac
  16. +++ b/gtk/configure.ac
  17. @@ -237,6 +237,7 @@ case $host in
  18. HB_LIBS="$HB_LIBS -lva -lva-drm"
  19. fi
  20. if test "x$use_x265" = "xyes" ; then
  21. + HB_LIBS="$HB_LIBS -lx265"
  22. if test "x$use_numa" = "xyes" ; then
  23. HB_LIBS="$HB_LIBS -lnuma"
  24. fi
  25. diff --git a/test/module.defs b/test/module.defs
  26. index ffc00a8b2..1895d16ee 100644
  27. --- a/test/module.defs
  28. +++ b/test/module.defs
  29. @@ -16,7 +16,7 @@ TEST.libs = $(LIBHB.a)
  30. TEST.GCC.l = \
  31. ass avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
  32. dvdread fribidi \
  33. - swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
  34. + swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 x265 \
  35. bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d
  36. ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
  37. --
  38. 2.24.0