From bfa9d62435ec1ef75f3d2fca4d10791eb4b1a59e Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Fri, 3 Jan 2020 18:47:34 +0000 Subject: [PATCH] (wip) multimedia/handbrake: update to 1.3.0.114 PR: 242849 Changes: https://github.com/HandBrake/HandBrake/compare/1.3.0...e75e88e6a --- multimedia/handbrake/Makefile | 9 ++-- multimedia/handbrake/distinfo | 8 ++-- .../files/patch-contrib_ffmpeg_module.defs | 11 ----- .../handbrake/files/patch-gtk_configure.ac | 12 ------ .../handbrake/files/patch-gtk_src_Makefile.am | 11 ----- .../files/patch-libhb_handbrake_ports.h | 36 ---------------- .../handbrake/files/patch-libhb_ports.c | 41 ------------------- .../handbrake/files/patch-libhb_qsv__common.c | 20 --------- .../handbrake/files/patch-make_configure.py | 29 ------------- .../files/patch-make_include_main.defs | 12 ------ .../handbrake/files/patch-test_module.defs | 11 ----- 11 files changed, 9 insertions(+), 191 deletions(-) delete mode 100644 multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs delete mode 100644 multimedia/handbrake/files/patch-gtk_configure.ac delete mode 100644 multimedia/handbrake/files/patch-gtk_src_Makefile.am delete mode 100644 multimedia/handbrake/files/patch-libhb_handbrake_ports.h delete mode 100644 multimedia/handbrake/files/patch-libhb_ports.c delete mode 100644 multimedia/handbrake/files/patch-libhb_qsv__common.c delete mode 100644 multimedia/handbrake/files/patch-make_configure.py delete mode 100644 multimedia/handbrake/files/patch-make_include_main.defs delete mode 100644 multimedia/handbrake/files/patch-test_module.defs diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile index 3faa1ea82302..411fca643f4b 100644 --- a/multimedia/handbrake/Makefile +++ b/multimedia/handbrake/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= handbrake -DISTVERSION= 1.3.0 -PORTREVISION= 2 +DISTVERSION= 1.3.0-114 +DISTVERSIONSUFFIX= -ge75e88e6a CATEGORIES= multimedia DIST_SUBDIR= ${PORTNAME} @@ -42,13 +42,14 @@ USES= autoreconf:build compiler:c11 gmake iconv \ libtool:build localbase:ldflags pkgconfig python:3.6+,build CONTRIB_FILES= fdk-aac-2.0.1.tar.gz \ - ffmpeg-4.2.1.tar.bz2 \ + ffmpeg-4.2.2.tar.bz2 \ libbluray-1.1.2.tar.bz2 \ libdvdnav-6.0.1.tar.bz2 \ libdvdread-6.0.2.tar.bz2 \ dav1d-0.5.1.tar.bz2 \ x265_3.2.1.tar.gz -MASTER_SITES+= https://download.handbrake.fr/contrib/:contrib +MASTER_SITES+= https://download.handbrake.fr/contrib/:contrib \ + https://ffmpeg.org/releases/:contrib DISTFILES+= ${CONTRIB_FILES:S/$/:contrib/} diff --git a/multimedia/handbrake/distinfo b/multimedia/handbrake/distinfo index 71607dd9e338..dcbf21132012 100644 --- a/multimedia/handbrake/distinfo +++ b/multimedia/handbrake/distinfo @@ -1,8 +1,8 @@ TIMESTAMP = 1573434561 SHA256 (handbrake/fdk-aac-2.0.1.tar.gz) = a4142815d8d52d0e798212a5adea54ecf42bcd4eec8092b37a8cb615ace91dc6 SIZE (handbrake/fdk-aac-2.0.1.tar.gz) = 2488373 -SHA256 (handbrake/ffmpeg-4.2.1.tar.bz2) = 682a9fa3f6864d7f0dbf224f86b129e337bc60286e0d00dffcd710998d521624 -SIZE (handbrake/ffmpeg-4.2.1.tar.bz2) = 10953293 +SHA256 (handbrake/ffmpeg-4.2.2.tar.bz2) = b620d187c26f76ca19e74210a0336c3b8380b97730df5cdf45f3e69e89000e5c +SIZE (handbrake/ffmpeg-4.2.2.tar.bz2) = 10953320 SHA256 (handbrake/libbluray-1.1.2.tar.bz2) = a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42 SIZE (handbrake/libbluray-1.1.2.tar.bz2) = 745779 SHA256 (handbrake/libdvdnav-6.0.1.tar.bz2) = e566a396f1950017088bfd760395b0565db44234195ada5413366c9d23926733 @@ -13,5 +13,5 @@ SHA256 (handbrake/dav1d-0.5.1.tar.bz2) = 0214d201a338e8418f805b68f9ad277e33d79c1 SIZE (handbrake/dav1d-0.5.1.tar.bz2) = 548584 SHA256 (handbrake/x265_3.2.1.tar.gz) = fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc SIZE (handbrake/x265_3.2.1.tar.gz) = 1426255 -SHA256 (handbrake/HandBrake-HandBrake-1.3.0_GH0.tar.gz) = d31c6f669da5f49b60ff2d04f5c5906e15fc5e81563331333e3f862e4e48668b -SIZE (handbrake/HandBrake-HandBrake-1.3.0_GH0.tar.gz) = 17908235 +SHA256 (handbrake/HandBrake-HandBrake-1.3.0-114-ge75e88e6a_GH0.tar.gz) = 862468dc44ef92700f2d76c6720ee0ed2121676ce5e4eda6ccac25fa2a354670 +SIZE (handbrake/HandBrake-HandBrake-1.3.0-114-ge75e88e6a_GH0.tar.gz) = 18054029 diff --git a/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs b/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs deleted file mode 100644 index 5b9155ee0367..000000000000 --- a/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs +++ /dev/null @@ -1,11 +0,0 @@ ---- contrib/ffmpeg/module.defs.orig 2019-11-09 20:44:32 UTC -+++ contrib/ffmpeg/module.defs -@@ -60,7 +60,7 @@ FFMPEG.CONFIGURE.extra = \ - --cc="$(FFMPEG.GCC.gcc)" \ - --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)" - --ifeq (1-linux,$(FEATURE.qsv)-$(HOST.system)) -+ifneq (,$(filter $(FEATURE.qsv)-$(HOST.system),1-linux 1-freebsd)) - FFMPEG.CONFIGURE.extra += --enable-vaapi - FFMPEG.CONFIGURE.extra += --disable-xlib - else diff --git a/multimedia/handbrake/files/patch-gtk_configure.ac b/multimedia/handbrake/files/patch-gtk_configure.ac deleted file mode 100644 index 82ad9f6dc410..000000000000 --- a/multimedia/handbrake/files/patch-gtk_configure.ac +++ /dev/null @@ -1,12 +0,0 @@ ---- gtk/configure.ac.orig 2019-11-09 20:44:32 UTC -+++ gtk/configure.ac -@@ -227,6 +227,9 @@ case $host in - ;; - *-*-freebsd*) - HB_LIBS="$HB_LIBS -lpthread" -+ if test "x$use_qsv" = "xyes" ; then -+ HB_LIBS="$HB_LIBS -lva -lva-drm" -+ fi - ;; - *-*-netbsd*) - HB_LIBS="$HB_LIBS -pthread" diff --git a/multimedia/handbrake/files/patch-gtk_src_Makefile.am b/multimedia/handbrake/files/patch-gtk_src_Makefile.am deleted file mode 100644 index 7e4520ebfdde..000000000000 --- a/multimedia/handbrake/files/patch-gtk_src_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk/src/Makefile.am.orig 2019-11-09 20:44:32 UTC -+++ gtk/src/Makefile.am -@@ -51,7 +51,7 @@ DISTCLEANFILES = \ - $(appdata_files) - - AM_CPPFLAGS = \ -- -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -+ -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \ - -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ - $(GHB_CFLAGS) diff --git a/multimedia/handbrake/files/patch-libhb_handbrake_ports.h b/multimedia/handbrake/files/patch-libhb_handbrake_ports.h deleted file mode 100644 index d80ad280daaf..000000000000 --- a/multimedia/handbrake/files/patch-libhb_handbrake_ports.h +++ /dev/null @@ -1,36 +0,0 @@ ---- libhb/handbrake/ports.h.orig 2019-11-09 20:44:32 UTC -+++ libhb/handbrake/ports.h -@@ -28,7 +28,7 @@ - - #if HB_PROJECT_FEATURE_QSV - #include "mfx/mfxstructures.h" --#ifdef SYS_LINUX -+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) - #include - #endif - #endif -@@ -36,9 +36,9 @@ - /************************************************************************ - * HW accel display - ***********************************************************************/ --#ifdef SYS_LINUX -+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) - extern const char* DRM_INTEL_DRIVER_NAME; --#endif // SYS_LINUX -+#endif // SYS_LINUX || SYS_FREEBSD - - typedef struct - { -@@ -46,10 +46,10 @@ typedef struct - #if HB_PROJECT_FEATURE_QSV - mfxHandleType mfxType; - --#ifdef SYS_LINUX -+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) - int vaFd; - VADisplay vaDisplay; --#endif // SYS_LINUX -+#endif // SYS_LINUX || SYS_FREEBSD - #endif - } hb_display_t; - diff --git a/multimedia/handbrake/files/patch-libhb_ports.c b/multimedia/handbrake/files/patch-libhb_ports.c deleted file mode 100644 index 43b7a9e77fdf..000000000000 --- a/multimedia/handbrake/files/patch-libhb_ports.c +++ /dev/null @@ -1,41 +0,0 @@ ---- libhb/ports.c.orig 2019-11-09 20:44:32 UTC -+++ libhb/ports.c -@@ -28,7 +28,11 @@ - #if defined(SYS_DARWIN) || defined(SYS_FREEBSD) - #include - #include -+#if HB_PROJECT_FEATURE_QSV && defined(SYS_FREEBSD) -+#include -+#include - #endif -+#endif - - #ifdef SYS_OPENBSD - #include -@@ -1518,7 +1522,7 @@ char * hb_strndup(const char * src, size_t len) - } - - #if HB_PROJECT_FEATURE_QSV --#ifdef SYS_LINUX -+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) - - #define MAX_NODES 16 - #define DRI_RENDER_NODE_START 128 -@@ -1676,7 +1680,7 @@ void hb_display_close(hb_display_t ** _d) - *_d = NULL; - } - --#else // !SYS_LINUX -+#else // !SYS_LINUX && !SYS_FREEBSD - - hb_display_t * hb_display_init(const char * driver_name, - const char * const * interface_names) -@@ -1689,7 +1693,7 @@ void hb_display_close(hb_display_t ** _d) - (void)_d; - } - --#endif // SYS_LINUX -+#endif // SYS_LINUX || SYS_FREEBSD - #else // !HB_PROJECT_FEATURE_QSV - - hb_display_t * hb_display_init(const char * driver_name, diff --git a/multimedia/handbrake/files/patch-libhb_qsv__common.c b/multimedia/handbrake/files/patch-libhb_qsv__common.c deleted file mode 100644 index 23e44bf827f3..000000000000 --- a/multimedia/handbrake/files/patch-libhb_qsv__common.c +++ /dev/null @@ -1,20 +0,0 @@ ---- libhb/qsv_common.c.orig 2019-11-09 20:44:32 UTC -+++ libhb/qsv_common.c -@@ -678,7 +678,7 @@ int hb_qsv_info_init() - */ - mfxSession session; - mfxVersion version = { .Major = 1, .Minor = 0, }; --#ifdef SYS_LINUX -+#if defined(SYS_LINUX) || defined(SYS_FREEBSD) - mfxIMPL hw_preference = MFX_IMPL_VIA_ANY; - #else - mfxIMPL hw_preference = MFX_IMPL_VIA_D3D11; -@@ -738,7 +738,7 @@ int hb_qsv_info_init() - } - else - { --#ifndef SYS_LINUX -+#if !defined(SYS_LINUX) && !defined(SYS_FREEBSD) - // Windows only: After D3D11 we will try D3D9 - if (hw_preference == MFX_IMPL_VIA_D3D11) - hw_preference = MFX_IMPL_VIA_D3D9; diff --git a/multimedia/handbrake/files/patch-make_configure.py b/multimedia/handbrake/files/patch-make_configure.py deleted file mode 100644 index dfc888a7f0b8..000000000000 --- a/multimedia/handbrake/files/patch-make_configure.py +++ /dev/null @@ -1,29 +0,0 @@ ---- make/configure.py.orig 2019-11-09 20:44:32 UTC -+++ make/configure.py -@@ -1413,7 +1413,7 @@ def createCLI( cross = None ): - grp.add_argument( '--enable-nvenc', dest="enable_nvenc", default=IfHost( True, '*-*-linux*', '*-*-mingw*', none=False).value, action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) ) - grp.add_argument( '--disable-nvenc', dest="enable_nvenc", action='store_false', help=(( 'disable %s' %h ) if h != argparse.SUPPRESS else h) ) - -- h = IfHost( 'Intel QSV video encoder/decoder', '*-*-linux*', '*-*-mingw*', none=argparse.SUPPRESS).value -+ h = IfHost( 'Intel QSV video encoder/decoder', '*-*-linux*', '*-*-freebsd*', '*-*-mingw*', none=argparse.SUPPRESS).value - grp.add_argument( '--enable-qsv', dest="enable_qsv", default=IfHost(True, "*-*-mingw*", none=False).value, action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) ) - grp.add_argument( '--disable-qsv', dest="enable_qsv", action='store_false', help=(( 'disable %s' %h ) if h != argparse.SUPPRESS else h) ) - -@@ -1684,7 +1684,7 @@ try: - none=False).value - and options.enable_x265) - # Disable QSV on unsupported platforms -- options.enable_qsv = IfHost(options.enable_qsv, '*-*-linux*', -+ options.enable_qsv = IfHost(options.enable_qsv, '*-*-linux*', '*-*-freebsd*', - '*-*-mingw*', none=False).value - # Disable VCE on unsupported platforms - options.enable_vce = IfHost(options.enable_vce, '*-*-linux*', '*-*-mingw*', -@@ -2124,7 +2124,7 @@ int main() - stdout.write( 'Enable NVENC: %s' % options.enable_nvenc ) - stdout.write( ' (%s)\n' % note_unsupported ) if not (host_tuple.system == 'linux' or host_tuple.system == 'mingw') else stdout.write( '\n' ) - stdout.write( 'Enable QSV: %s' % options.enable_qsv ) -- stdout.write( ' (%s)\n' % note_unsupported ) if not (host_tuple.system == 'linux' or host_tuple.system == 'mingw') else stdout.write( '\n' ) -+ stdout.write( ' (%s)\n' % note_unsupported ) if not (host_tuple.system == 'linux' or host_tuple.system == 'freebsd' or host_tuple.system == 'mingw') else stdout.write( '\n' ) - stdout.write( 'Enable VCE: %s' % options.enable_vce ) - stdout.write( ' (%s)\n' % note_unsupported ) if not (host_tuple.system == 'linux' or host_tuple.system == 'mingw') else stdout.write( '\n' ) - diff --git a/multimedia/handbrake/files/patch-make_include_main.defs b/multimedia/handbrake/files/patch-make_include_main.defs deleted file mode 100644 index 76608653f9a3..000000000000 --- a/multimedia/handbrake/files/patch-make_include_main.defs +++ /dev/null @@ -1,12 +0,0 @@ ---- make/include/main.defs.orig 2019-11-09 20:44:32 UTC -+++ make/include/main.defs -@@ -53,7 +53,9 @@ MODULES += contrib/libdvdnav - MODULES += contrib/libbluray - - ifeq (1,$(FEATURE.qsv)) -+ifeq (,$(filter $(HOST.system),freebsd)) - MODULES += contrib/libmfx -+endif - endif - - ifeq (1,$(FEATURE.vce)) diff --git a/multimedia/handbrake/files/patch-test_module.defs b/multimedia/handbrake/files/patch-test_module.defs deleted file mode 100644 index 165c0a34b957..000000000000 --- a/multimedia/handbrake/files/patch-test_module.defs +++ /dev/null @@ -1,11 +0,0 @@ ---- test/module.defs.orig 2019-11-09 20:44:32 UTC -+++ test/module.defs -@@ -25,7 +25,7 @@ endif - - ifeq (1,$(FEATURE.qsv)) - TEST.GCC.l += mfx --ifeq ($(HOST.system),linux) -+ifneq (,$(filter $(HOST.system),linux freebsd)) - TEST.GCC.l += va va-drm - endif - endif