File HandBrake-build-shared.patch of Package handbrake

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

Currently displaying revision 29 , Show latest

--- make/include/main.defs.orig	2019-02-18 22:00:26.953265342 +0100
+++ make/include/main.defs	2019-02-18 22:00:26.957265264 +0100
@@ -28,6 +28,15 @@
     MODULES += contrib/lame
     MODULES += contrib/x264
     MODULES += contrib/jansson
+    MODULES += contrib/x265
+    MODULES += contrib/x265_8bit
+    MODULES += contrib/x265_10bit
+    MODULES += contrib/x265_12bit
+    MODULES += contrib/ffmpeg
+    MODULES += contrib/libvpx
+    MODULES += contrib/libdvdread
+    MODULES += contrib/libdvdnav
+    MODULES += contrib/libbluray
 endif
 
 ifeq (1,$(FEATURE.flatpak))
@@ -41,19 +50,6 @@
     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/ffmpeg
-MODULES += contrib/libvpx
-MODULES += contrib/libdvdread
-MODULES += contrib/libdvdnav
-MODULES += contrib/libbluray
-
 ifneq (,$(filter $(BUILD.system),mingw))
 ifneq ($(HAS.pthread),1)
 ifneq ($(HAS.pthreadGC2),1)
--- gtk/configure.ac.orig	2019-02-18 22:01:27.464099477 +0100
+++ gtk/configure.ac	2019-02-18 22:01:27.468099400 +0100
@@ -179,7 +179,7 @@
 
 GHB_CFLAGS="$HBINC $GHB_CFLAGS"
 
-HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
+HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lx265 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
 
 case $host in
   *-*-mingw*)
--- test/module.defs.orig	2019-02-18 22:02:05.643363874 +0100
+++ test/module.defs	2019-02-18 22:02:05.647363797 +0100
@@ -16,7 +16,7 @@
 TEST.GCC.l = \
         ass avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
         dvdread fribidi \
-        samplerate swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
+        samplerate swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 x265 \
         bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma
 
 ifeq (,$(filter $(BUILD.system),darwin cygwin mingw))