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