File HandBrake-build-shared.patch of Package handbrake

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

Currently displaying revision 7ceb4f9bdf8c033fe69f232aa578a3b0 , Show latest

--- make/include/main.defs.orig	2020-01-07 18:53:44.906464000 +0100
+++ make/include/main.defs	2020-01-07 18:53:44.914463851 +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	2020-01-07 18:56:48.895031136 +0100
+++ gtk/configure.ac	2020-01-07 18:56:48.903030986 +0100
@@ -199,7 +199,7 @@
 
 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 -llzma"
+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 -llzma -ldl"
 HB_CPPFLAGS="$HB_CPPFLAGS $HBINC"
 
 PKG_CHECK_MODULES([x264], [x264], sys_x264=yes, sys_x264=no)
--- test/module.defs.orig	2020-01-07 18:57:33.970190122 +0100
+++ test/module.defs	2020-01-07 18:57:33.978189973 +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))