File HandBrake-build-shared.patch of Package handbrake

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

Currently displaying revision 22 , Show latest

--- make/include/main.defs.orig	2017-04-10 20:45:18.857323677 +0200
+++ make/include/main.defs	2017-04-10 20:45:18.881323241 +0200
@@ -55,6 +55,11 @@
     MODULES += contrib/lame
     MODULES += contrib/x264
     MODULES += contrib/jansson
+    MODULES += contrib/x265
+    MODULES += contrib/ffmpeg
+    MODULES += contrib/libvpx
+    MODULES += contrib/libdvdread
+    MODULES += contrib/libdvdnav
 endif
 
 ifeq (1,$(FEATURE.flatpak))
@@ -72,14 +77,6 @@
     MODULES += contrib/fdk-aac
 endif
 
-ifeq (1,$(FEATURE.x265))
-    MODULES += contrib/x265
-endif
-
-MODULES += contrib/ffmpeg
-MODULES += contrib/libvpx
-MODULES += contrib/libdvdread
-MODULES += contrib/libdvdnav
 MODULES += contrib/libbluray
 
 ifneq (,$(filter $(BUILD.system),mingw))
--- gtk/configure.ac.orig	2017-04-10 20:46:49.715672413 +0200
+++ gtk/configure.ac	2017-04-10 20:46:49.727672195 +0200
@@ -168,7 +168,7 @@
 
 GHB_CFLAGS="$HBINC $GHB_CFLAGS"
 
-HB_LIBS="-lhandbrake -lavresample -lavformat -lavcodec -lavfilter -lavutil -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus"
+HB_LIBS="-lhandbrake -lavresample -lavformat -lavcodec -lavfilter -lavutil -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lx265 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus"
 
 case $host in
   *-*-mingw*)
--- test/module.defs.orig	2017-04-10 20:47:32.746890083 +0200
+++ test/module.defs	2017-04-10 20:47:32.754889937 +0200
@@ -16,7 +16,7 @@
 TEST.GCC.l = \
         ass avresample avformat avcodec avfilter avutil 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
 
 ifeq (,$(filter $(BUILD.system),darwin cygwin mingw))