File HandBrake-build-shared.patch of Package handbrake

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

Currently displaying revision 18 , Show latest

--- make/include/main.defs.orig	2017-02-02 09:06:45.671052425 +0100
+++ make/include/main.defs	2017-02-02 09:08:58.159266536 +0100
@@ -55,6 +55,12 @@
     MODULES += contrib/libsamplerate
     MODULES += contrib/lame
     MODULES += contrib/x264
+    MODULES += contrib/x265
+    MODULES += contrib/ffmpeg
+    MODULES += contrib/libvpx
+    MODULES += contrib/libdvdread
+    MODULES += contrib/libdvdnav
+    MODULES += contrib/libbluray
     MODULES += contrib/jansson
 endif
 
@@ -73,16 +79,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))
 ifneq ($(HAS.pthread),1)
 ifneq ($(HAS.pthreadGC2),1)
--- gtk/configure.ac.orig	2017-02-02 09:05:49.146961277 +0100
+++ gtk/configure.ac	2017-02-02 09:06:36.951038356 +0100
@@ -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-02-02 09:09:04.291276461 +0100
+++ test/module.defs	2017-02-02 09:09:14.031292229 +0100
@@ -16,7 +16,7 @@
 TEST.GCC.l = \
         ass avresample avformat avcodec avfilter avutil mp3lame dvdnav \
         dvdread fontconfig 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 (1,$(FEATURE.qsv))