File HandBrake-build-shared.patch of Package handbrake

File HandBrake-build-shared.patch of Package handbrake (Revision 32)

Currently displaying revision 32 , Show latest

--- make/include/main.defs.orig	2019-12-30 19:59:28.789369050 +0100
+++ make/include/main.defs	2019-12-30 19:59:28.797368897 +0100
@@ -28,32 +28,22 @@
     MODULES += contrib/x264
     MODULES += contrib/jansson
     MODULES += contrib/libvpx
-endif
-
-ifeq (1,$(FEATURE.flatpak))
-    MODULES += contrib/jansson
-    MODULES += contrib/x264
-endif
-
-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
+    MODULES += contrib/libdav1d
+    MODULES += contrib/ffmpeg
+    MODULES += contrib/libdvdread
+    MODULES += contrib/libdvdnav
+    MODULES += contrib/libbluray
+    MODULES += contrib/fdk-aac
+    MODULES += contrib/libmfx
 endif
 
-MODULES += contrib/libdav1d
-MODULES += contrib/ffmpeg
-MODULES += contrib/libdvdread
-MODULES += contrib/libdvdnav
-MODULES += contrib/libbluray
-
-ifeq (1,$(FEATURE.qsv))
-    MODULES += contrib/libmfx
+ifeq (1,$(FEATURE.flatpak))
+    MODULES += contrib/jansson
+    MODULES += contrib/x264
 endif
 
 ifeq (1,$(FEATURE.vce))
--- gtk/configure.ac.orig	2019-12-30 20:02:01.998446129 +0100
+++ gtk/configure.ac	2019-12-30 20:02:02.006445977 +0100
@@ -199,7 +199,7 @@
 
 GHB_CFLAGS="$HBINC $GHB_CFLAGS"
 
-HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
+HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lx264 -lx265 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma -ldl"
 
 if test "x$use_fdk_aac" = "xyes" ; then
     HB_LIBS="$HB_LIBS -lfdk-aac"
--- test/module.defs.orig	2019-12-30 20:03:22.552921543 +0100
+++ test/module.defs	2019-12-30 20:03:22.564921316 +0100
@@ -16,7 +16,7 @@
 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))