commit: 193a89966684bd614c5043e16c9d10c0843f2dfd Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Wed May 7 08:21:09 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri May 23 06:39:23 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=193a8996
media-video/handbrake: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Part-of: https://github.com/gentoo/gentoo/pull/41972 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/handbrake-1.3.3-x265-link.patch | 13 ----------- .../files/handbrake-1.6.1-missing-include.patch | 20 ----------------- .../handbrake-9999-dont-search-for-python.patch | 26 ---------------------- .../files/handbrake-9999-remove-dvdnav-dup.patch | 20 ----------------- .../files/handbrake-9999-system-tools.patch | 22 ------------------ 5 files changed, 101 deletions(-) diff --git a/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch b/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch deleted file mode 100644 index 779366db543b..000000000000 --- a/media-video/handbrake/files/handbrake-1.3.3-x265-link.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/test/module.defs -+++ a/test/module.defs -@@ -30,6 +30,10 @@ - endif - endif - -+ifeq (1,$(FEATURE.x265)) -+ TEST.GCC.l += x265 -+endif -+ - ifeq (1,$(FEATURE.flatpak)) - TEST.GCC.l += glib-2.0 - endif diff --git a/media-video/handbrake/files/handbrake-1.6.1-missing-include.patch b/media-video/handbrake/files/handbrake-1.6.1-missing-include.patch deleted file mode 100644 index cfe16e718fc4..000000000000 --- a/media-video/handbrake/files/handbrake-1.6.1-missing-include.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/libhb/muxavformat.c -+++ b/libhb/muxavformat.c -@@ -7,6 +7,7 @@ - For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html - */ - -+#include <time.h> - #include <ogg/ogg.h> - #include "libavcodec/bsf.h" - #include "libavformat/avformat.h" ---- a/libhb/work.c -+++ b/libhb/work.c -@@ -7,6 +7,7 @@ - For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html - */ - -+#include <time.h> - #include "handbrake/handbrake.h" - #include "libavformat/avformat.h" - #include "handbrake/decomb.h" diff --git a/media-video/handbrake/files/handbrake-9999-dont-search-for-python.patch b/media-video/handbrake/files/handbrake-9999-dont-search-for-python.patch deleted file mode 100644 index f9971e508404..000000000000 --- a/media-video/handbrake/files/handbrake-9999-dont-search-for-python.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- 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-remove-dvdnav-dup.patch b/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch deleted file mode 100644 index 7dc1f69328ea..000000000000 --- a/media-video/handbrake/files/handbrake-9999-remove-dvdnav-dup.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/libhb/dvdnav.c -+++ b/libhb/dvdnav.c -@@ -1225,16 +1225,7 @@ - { - for (kk = 0; kk < buttons; kk++) - { -- dvdnav_t *dvdnav_copy; -- -- result = dvdnav_dup( &dvdnav_copy, d->dvdnav ); -- if (result != DVDNAV_STATUS_OK) -- { -- hb_log("dvdnav dup failed: %s", dvdnav_err_to_string(d->dvdnav)); -- goto done; -- } -- title = try_button( dvdnav_copy, kk, list_title ); -- dvdnav_free_dup( dvdnav_copy ); -+ title = try_button( d->dvdnav, kk, list_title ); - - if ( title >= 0 ) - { diff --git a/media-video/handbrake/files/handbrake-9999-system-tools.patch b/media-video/handbrake/files/handbrake-9999-system-tools.patch deleted file mode 100644 index 820b4af8b3e8..000000000000 --- a/media-video/handbrake/files/handbrake-9999-system-tools.patch +++ /dev/null @@ -1,22 +0,0 @@ -# https://bugs.gentoo.org/738110 - ---- a/make/configure.py -+++ b/make/configure.py -@@ -1626,14 +1626,14 @@ try: - - ## create tools in a scope - class Tools: -- ar = ToolProbe( 'AR.exe', 'ar', 'ar', abort=True ) -+ ar = ToolProbe( 'AR.exe', 'ar', os.environ.get('AR', 'ar'), abort=True ) - cp = ToolProbe( 'CP.exe', 'cp', 'cp', abort=True ) - m4 = ToolProbe( 'M4.exe', 'm4', 'gm4', 'm4', abort=True ) - mkdir = ToolProbe( 'MKDIR.exe', 'mkdir', 'mkdir', abort=True ) - patch = ToolProbe( 'PATCH.exe', 'patch', 'gpatch', 'patch', abort=True ) - rm = ToolProbe( 'RM.exe', 'rm', 'rm', abort=True ) -- ranlib = ToolProbe( 'RANLIB.exe', 'ranlib', 'ranlib', abort=True ) -- strip = ToolProbe( 'STRIP.exe', 'strip', 'strip', abort=True ) -+ ranlib = ToolProbe( 'RANLIB.exe', 'ranlib', os.environ.get('RANLIB', 'ranlib'), abort=True ) -+ strip = ToolProbe( 'STRIP.exe', 'strip', os.environ.get('STRIP', 'strip'), abort=True ) - tar = ToolProbe( 'TAR.exe', 'tar', 'gtar', 'tar', abort=True ) - python = ToolProbe( 'PYTHON.exe', 'python', os.path.basename(sys.executable), abort=True ) -
