gentoo resync : 15.12.2019

3 files changed, 40 insertions, 13 deletions

diff --git a/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch b/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch
new file mode 100644
index 000000000000..a999fc325646
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.2.2-fix-missing-x265-link-flag.patch
@@ -0,0 +1,13 @@
+Written by: Peter Foley <pefoley2@pefoley.com>
+Gentoo Bug: #552792
+
+--- ./test/module.defs.bak	2015-06-21 13:19:40.626249439 -0400
++++ ./test/module.defs	2015-06-21 13:19:54.919757726 -0400
+@@ -25,6 +25,7 @@
+ 
+ ifeq (1,$(FEATURE.x265))
+     TEST.GCC.D += USE_X265
++    TEST.GCC.l += x265
+ endif
+ 
+ TEST.GCC.l += $(foreach m,$(MODULES.NAMES),$($m.OSL.libs))
diff --git a/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch b/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch
new file mode 100644
index 000000000000..551a64ee3817
--- /dev/null
+++ b/media-video/handbrake/files/handbrake-1.3.0-dont-search-for-python.patch
@@ -0,0 +1,27 @@
+diff --git a/configure b/configure
+index 5c870e1d7..2f5834083 100755
+--- a/configure
++++ b/configure
+@@ -14,20 +14,8 @@ inpath()
+ }
+ 
+ if ( inpath bash ); then
+-    pp=""
+-    for p in python3 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python2 python2.7 python
+-    do
+-        if ( inpath $p ); then
+-            pp="$p"
+-            break
+-        fi
+-    done
+-    if [ pp != "" ]; then
+-        exec $pp `dirname $0`/make/configure.py "$@"
+-        exit 0
+-    else
+-        echo "ERROR: no suitable version of python found."
+-    fi
++    exec python `dirname $0`/make/configure.py "$@"
++    exit 0
+ else
+     echo "ERROR: bash shell not found."
+ fi
diff --git a/media-video/handbrake/files/handbrake-9999-libdl-link.patch b/media-video/handbrake/files/handbrake-9999-libdl-link.patch
deleted file mode 100644
index ace1528053a0..000000000000
--- a/media-video/handbrake/files/handbrake-9999-libdl-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/gtk/configure.ac b/gtk/configure.ac
-index 92aabcbe8..1f4a1df95 100644
---- a/gtk/configure.ac
-+++ b/gtk/configure.ac
-@@ -199,7 +199,7 @@ PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES])
- 
- 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 -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"