diff options
author | Ian Whyman <thev00d00@gentoo.org> | 2020-06-27 10:38:40 +0100 |
---|---|---|
committer | Ian Whyman <thev00d00@gentoo.org> | 2020-06-27 10:39:05 +0100 |
commit | de81c6b585f654b688425b8d84801677c4357c57 (patch) | |
tree | c2ebb934d9b92f3d843b14d8cfa6e42988e25c91 /media-video/handbrake/files | |
parent | media-video/handbrake: Tidy old (diff) | |
download | gentoo-de81c6b585f654b688425b8d84801677c4357c57.tar.gz gentoo-de81c6b585f654b688425b8d84801677c4357c57.tar.bz2 gentoo-de81c6b585f654b688425b8d84801677c4357c57.zip |
media-video/handbrake: Bump, fix x265 link, drop old
Closes: https://bugs.gentoo.org/713598
Closes: https://bugs.gentoo.org/724650
Closes: https://bugs.gentoo.org/724650
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Ian Whyman <thev00d00@gentoo.org>
Diffstat (limited to 'media-video/handbrake/files')
-rw-r--r-- | media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch | 27 | ||||
-rw-r--r-- | media-video/handbrake/files/handbrake-1.3.2-x265-link.patch | 12 |
2 files changed, 12 insertions, 27 deletions
diff --git a/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch b/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch deleted file mode 100644 index 598fc7c6efaa..000000000000 --- a/media-video/handbrake/files/handbrake-1.3.0-missing-linker-flags.patch +++ /dev/null @@ -1,27 +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" -diff --git a/test/module.defs b/test/module.defs -index ffc00a8b2..62b01ffd5 100644 ---- a/test/module.defs -+++ b/test/module.defs -@@ -69,6 +69,9 @@ else ifeq ($(HOST.system),linux) - ifeq (1, $(FEATURE.numa)) - TEST.GCC.l += numa - endif -+ifeq (1, $(FEATURE.x265)) -+ TEST.GCC.l += x265 -+endif - else ifeq ($(HOST.system),kfreebsd) - TEST.GCC.l += pthread dl m - else ifeq ($(HOST.system),freebsd) diff --git a/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch b/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch new file mode 100644 index 000000000000..589a204cc195 --- /dev/null +++ b/media-video/handbrake/files/handbrake-1.3.2-x265-link.patch @@ -0,0 +1,12 @@ +diff -Naru a/test/module.defs b/test/module.defs +--- a/test/module.defs 2020-05-23 17:23:21.912103481 +0200 ++++ b/test/module.defs 2020-05-23 17:23:36.106103799 +0200 +@@ -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)) |