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
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
From: Christian Marillat <marillat@debian.org>
Date: Tue, 17 Apr 2018 21:11:53 +0200
Subject: Remove embedded/downloaded copies of various libraries
Once this is acceptable, this should be forwarded upstream so that the
use of system libraries is an option, instead of downloading libraries
and programs at build time.
---
gtk/configure.ac | 2 +-
libhb/module.defs | 8 ++------
make/include/main.defs | 29 -----------------------------
test/module.defs | 8 ++++++--
4 files changed, 9 insertions(+), 38 deletions(-)
diff --git a/gtk/configure.ac b/gtk/configure.ac
index 23c526f..70a303d 100644
--- a/gtk/configure.ac
+++ b/gtk/configure.ac
@@ -203,7 +203,7 @@ AM_CONDITIONAL([GHB_GTK_3_16], [test "$HAVE_GTK_316" -eq 1])
AM_CONDITIONAL([MINGW], [test "x$mingw_flag" = "xyes"])
-HB_LIBS="$HB_LIBS -lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -lturbojpeg -llzma -lzimg -lSvtAv1Enc"
+HB_LIBS="$HB_LIBS -lhandbrake -lavformat -lavfilter -lavcodec -lavutil -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -lturbojpeg -llzma"
HB_CPPFLAGS="$HB_CPPFLAGS $HBINC"
PKG_CHECK_MODULES([x264], [x264], sys_x264=yes, sys_x264=no)
diff --git a/libhb/module.defs b/libhb/module.defs
index 760e5e8..52a2709 100644
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -1,7 +1,7 @@
__deps__ := A52DEC BZIP2 LIBVPX SVT-AV1 FFMPEG FREETYPE LAME LIBASS LIBDCA \
LIBDVDREAD LIBDVDNAV LIBICONV LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBOGG \
LIBXML2 X264 X265 ZLIB LIBBLURAY FDKAAC LIBVPL LIBGNURX JANSSON \
- HARFBUZZ LIBOPUS LIBSPEEX LIBDAV1D LIBJPEGTURBO
+ HARFBUZZ LIBOPUS LIBSPEEX LIBJPEGTURBO
ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
__deps__ += FONTCONFIG
@@ -125,7 +125,7 @@ LIBHB.lib = $(LIBHB.build/)hb.lib
LIBHB.dll.libs = $(foreach n, \
ass avformat avfilter avcodec avutil swresample postproc dvdnav dvdread \
freetype mp3lame swscale vpx theora vorbis vorbisenc ogg x264 xml2 \
- bluray jansson harfbuzz opus speex dav1d turbojpeg zimg SvtAv1Enc, \
+ bluray jansson harfbuzz opus speex turbojpeg, \
$(CONTRIB.build/)lib/lib$(n).a )
ifeq (1,$(FEATURE.fdk_aac))
@@ -136,10 +136,6 @@ ifeq (1,$(FEATURE.qsv))
LIBHB.dll.libs += $(CONTRIB.build/)lib/libvpl.a
endif
-ifeq (1,$(FEATURE.x265))
-LIBHB.dll.libs += $(CONTRIB.build/)lib/libx265.a
-endif
-
ifneq ($(HAS.iconv),1)
LIBHB.dll.libs += $(CONTRIB.build/)lib/libiconv.a
else
diff --git a/make/include/main.defs b/make/include/main.defs
index a53bd34..488d756 100644
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -41,43 +41,14 @@ ifeq (1,$(FEATURE.fdk_aac))
MODULES += contrib/fdk-aac
endif
-ifeq (1,$(FEATURE.x265))
- MODULES += contrib/x265
- MODULES += contrib/x265_8bit
- MODULES += contrib/x265_10bit
- MODULES += contrib/x265_12bit
-endif
-
-MODULES += contrib/libdav1d
-MODULES += contrib/svt-av1
-MODULES += contrib/zimg
-MODULES += contrib/ffmpeg
-MODULES += contrib/libdvdread
-MODULES += contrib/libdvdnav
-MODULES += contrib/libbluray
-
-ifeq (1,$(FEATURE.qsv))
-ifeq (,$(filter $(HOST.system),freebsd))
- MODULES += contrib/libvpl
-endif
-endif
-
ifeq (1,$(FEATURE.vce))
MODULES += contrib/amf
endif
-ifeq (1,$(FEATURE.nvenc))
- MODULES += contrib/nvenc
-endif
-
ifneq (,$(filter $(HOST.system),darwin))
MODULES += contrib/xz
endif
-ifneq (,$(filter $(HOST.machine),arm64 aarch64))
- MODULES += contrib/sse2neon
-endif
-
ifneq (,$(filter $(HOST.system),cygwin mingw))
ifneq ($(HAS.iconv),1)
MODULES += contrib/libiconv
diff --git a/test/module.defs b/test/module.defs
index 8fc95e6..7f2da1d 100644
--- a/test/module.defs
+++ b/test/module.defs
@@ -16,13 +16,17 @@ 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 bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d \
- turbojpeg zimg SvtAv1Enc
+ x264 bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma \
+ turbojpeg
ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
TEST.GCC.l += fontconfig
endif
+ifeq (1,$(FEATURE.x265))
+ TEST.GCC.l += x265
+endif
+
ifeq (1,$(FEATURE.qsv))
TEST.GCC.l += vpl
ifneq (,$(filter $(HOST.system),linux freebsd))
|
