View | Details | Raw Unified | Return to bug 242849 | Differences between
and this patch

Collapse All | Expand All

(-)b/multimedia/handbrake/Makefile (-4 / +5 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	handbrake
4
PORTNAME=	handbrake
5
DISTVERSION=	1.3.0
5
DISTVERSION=	1.3.0-114
6
PORTREVISION=	2
6
DISTVERSIONSUFFIX=	-ge75e88e6a
7
CATEGORIES=	multimedia
7
CATEGORIES=	multimedia
8
DIST_SUBDIR=	${PORTNAME}
8
DIST_SUBDIR=	${PORTNAME}
9
9
Lines 42-54 USES= autoreconf:build compiler:c11 gmake iconv \ Link Here
42
		libtool:build localbase:ldflags pkgconfig python:3.6+,build
42
		libtool:build localbase:ldflags pkgconfig python:3.6+,build
43
43
44
CONTRIB_FILES=	fdk-aac-2.0.1.tar.gz \
44
CONTRIB_FILES=	fdk-aac-2.0.1.tar.gz \
45
		ffmpeg-4.2.1.tar.bz2 \
45
		ffmpeg-4.2.2.tar.bz2 \
46
		libbluray-1.1.2.tar.bz2 \
46
		libbluray-1.1.2.tar.bz2 \
47
		libdvdnav-6.0.1.tar.bz2 \
47
		libdvdnav-6.0.1.tar.bz2 \
48
		libdvdread-6.0.2.tar.bz2 \
48
		libdvdread-6.0.2.tar.bz2 \
49
		dav1d-0.5.1.tar.bz2 \
49
		dav1d-0.5.1.tar.bz2 \
50
		x265_3.2.1.tar.gz
50
		x265_3.2.1.tar.gz
51
MASTER_SITES+=	https://download.handbrake.fr/contrib/:contrib
51
MASTER_SITES+=	https://download.handbrake.fr/contrib/:contrib \
52
		https://ffmpeg.org/releases/:contrib
52
53
53
DISTFILES+=	${CONTRIB_FILES:S/$/:contrib/}
54
DISTFILES+=	${CONTRIB_FILES:S/$/:contrib/}
54
55
(-)b/multimedia/handbrake/distinfo (-4 / +4 lines)
Lines 1-8 Link Here
1
TIMESTAMP = 1573434561
1
TIMESTAMP = 1573434561
2
SHA256 (handbrake/fdk-aac-2.0.1.tar.gz) = a4142815d8d52d0e798212a5adea54ecf42bcd4eec8092b37a8cb615ace91dc6
2
SHA256 (handbrake/fdk-aac-2.0.1.tar.gz) = a4142815d8d52d0e798212a5adea54ecf42bcd4eec8092b37a8cb615ace91dc6
3
SIZE (handbrake/fdk-aac-2.0.1.tar.gz) = 2488373
3
SIZE (handbrake/fdk-aac-2.0.1.tar.gz) = 2488373
4
SHA256 (handbrake/ffmpeg-4.2.1.tar.bz2) = 682a9fa3f6864d7f0dbf224f86b129e337bc60286e0d00dffcd710998d521624
4
SHA256 (handbrake/ffmpeg-4.2.2.tar.bz2) = b620d187c26f76ca19e74210a0336c3b8380b97730df5cdf45f3e69e89000e5c
5
SIZE (handbrake/ffmpeg-4.2.1.tar.bz2) = 10953293
5
SIZE (handbrake/ffmpeg-4.2.2.tar.bz2) = 10953320
6
SHA256 (handbrake/libbluray-1.1.2.tar.bz2) = a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42
6
SHA256 (handbrake/libbluray-1.1.2.tar.bz2) = a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42
7
SIZE (handbrake/libbluray-1.1.2.tar.bz2) = 745779
7
SIZE (handbrake/libbluray-1.1.2.tar.bz2) = 745779
8
SHA256 (handbrake/libdvdnav-6.0.1.tar.bz2) = e566a396f1950017088bfd760395b0565db44234195ada5413366c9d23926733
8
SHA256 (handbrake/libdvdnav-6.0.1.tar.bz2) = e566a396f1950017088bfd760395b0565db44234195ada5413366c9d23926733
Lines 13-17 SHA256 (handbrake/dav1d-0.5.1.tar.bz2) = 0214d201a338e8418f805b68f9ad277e33d79c1 Link Here
13
SIZE (handbrake/dav1d-0.5.1.tar.bz2) = 548584
13
SIZE (handbrake/dav1d-0.5.1.tar.bz2) = 548584
14
SHA256 (handbrake/x265_3.2.1.tar.gz) = fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc
14
SHA256 (handbrake/x265_3.2.1.tar.gz) = fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc
15
SIZE (handbrake/x265_3.2.1.tar.gz) = 1426255
15
SIZE (handbrake/x265_3.2.1.tar.gz) = 1426255
16
SHA256 (handbrake/HandBrake-HandBrake-1.3.0_GH0.tar.gz) = d31c6f669da5f49b60ff2d04f5c5906e15fc5e81563331333e3f862e4e48668b
16
SHA256 (handbrake/HandBrake-HandBrake-1.3.0-114-ge75e88e6a_GH0.tar.gz) = 862468dc44ef92700f2d76c6720ee0ed2121676ce5e4eda6ccac25fa2a354670
17
SIZE (handbrake/HandBrake-HandBrake-1.3.0_GH0.tar.gz) = 17908235
17
SIZE (handbrake/HandBrake-HandBrake-1.3.0-114-ge75e88e6a_GH0.tar.gz) = 18054029
(-)a/multimedia/handbrake/files/patch-contrib_ffmpeg_module.defs (-11 lines)
Removed Link Here
1
--- contrib/ffmpeg/module.defs.orig	2019-11-09 20:44:32 UTC
2
+++ contrib/ffmpeg/module.defs
3
@@ -60,7 +60,7 @@ FFMPEG.CONFIGURE.extra = \
4
     --cc="$(FFMPEG.GCC.gcc)" \
5
     --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)"
6
 
7
-ifeq (1-linux,$(FEATURE.qsv)-$(HOST.system))
8
+ifneq (,$(filter $(FEATURE.qsv)-$(HOST.system),1-linux 1-freebsd))
9
     FFMPEG.CONFIGURE.extra += --enable-vaapi
10
     FFMPEG.CONFIGURE.extra += --disable-xlib
11
 else
(-)a/multimedia/handbrake/files/patch-gtk_configure.ac (-12 lines)
Removed Link Here
1
--- gtk/configure.ac.orig	2019-11-09 20:44:32 UTC
2
+++ gtk/configure.ac
3
@@ -227,6 +227,9 @@ case $host in
4
     ;;
5
   *-*-freebsd*)
6
     HB_LIBS="$HB_LIBS -lpthread"
7
+    if test "x$use_qsv" = "xyes" ; then
8
+        HB_LIBS="$HB_LIBS -lva -lva-drm"
9
+    fi
10
     ;;
11
   *-*-netbsd*)
12
     HB_LIBS="$HB_LIBS -pthread"
(-)a/multimedia/handbrake/files/patch-gtk_src_Makefile.am (-11 lines)
Removed Link Here
1
--- gtk/src/Makefile.am.orig	2019-11-09 20:44:32 UTC
2
+++ gtk/src/Makefile.am
3
@@ -51,7 +51,7 @@ DISTCLEANFILES = \
4
 	$(appdata_files)
5
 
6
 AM_CPPFLAGS = \
7
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
8
+	-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
9
 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
10
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
11
 	$(GHB_CFLAGS)
(-)a/multimedia/handbrake/files/patch-libhb_handbrake_ports.h (-36 lines)
Removed Link Here
1
--- libhb/handbrake/ports.h.orig	2019-11-09 20:44:32 UTC
2
+++ libhb/handbrake/ports.h
3
@@ -28,7 +28,7 @@
4
 
5
 #if HB_PROJECT_FEATURE_QSV
6
 #include "mfx/mfxstructures.h"
7
-#ifdef SYS_LINUX
8
+#if defined(SYS_LINUX) || defined(SYS_FREEBSD)
9
 #include <va/va_drm.h>
10
 #endif
11
 #endif
12
@@ -36,9 +36,9 @@
13
 /************************************************************************
14
  * HW accel display
15
  ***********************************************************************/
16
-#ifdef SYS_LINUX
17
+#if defined(SYS_LINUX) || defined(SYS_FREEBSD)
18
 extern const char* DRM_INTEL_DRIVER_NAME;
19
-#endif // SYS_LINUX
20
+#endif // SYS_LINUX || SYS_FREEBSD
21
 
22
 typedef struct
23
 {
24
@@ -46,10 +46,10 @@ typedef struct
25
 #if HB_PROJECT_FEATURE_QSV
26
     mfxHandleType   mfxType;
27
 
28
-#ifdef SYS_LINUX
29
+#if defined(SYS_LINUX) || defined(SYS_FREEBSD)
30
     int             vaFd;
31
     VADisplay       vaDisplay;
32
-#endif // SYS_LINUX
33
+#endif // SYS_LINUX || SYS_FREEBSD
34
 #endif
35
 } hb_display_t;
36
 
(-)a/multimedia/handbrake/files/patch-libhb_ports.c (-41 lines)
Removed Link Here
1
--- libhb/ports.c.orig	2019-11-09 20:44:32 UTC
2
+++ libhb/ports.c
3
@@ -28,7 +28,11 @@
4
 #if defined(SYS_DARWIN) || defined(SYS_FREEBSD)
5
 #include <sys/types.h>
6
 #include <sys/sysctl.h>
7
+#if HB_PROJECT_FEATURE_QSV && defined(SYS_FREEBSD)
8
+#include <libdrm/drm.h>
9
+#include <fcntl.h>
10
 #endif
11
+#endif
12
 
13
 #ifdef SYS_OPENBSD
14
 #include <sys/param.h>
15
@@ -1518,7 +1522,7 @@ char * hb_strndup(const char * src, size_t len)
16
 }
17
 
18
 #if HB_PROJECT_FEATURE_QSV
19
-#ifdef SYS_LINUX
20
+#if defined(SYS_LINUX) || defined(SYS_FREEBSD)
21
 
22
 #define MAX_NODES             16
23
 #define DRI_RENDER_NODE_START 128
24
@@ -1676,7 +1680,7 @@ void hb_display_close(hb_display_t ** _d)
25
     *_d = NULL;
26
 }
27
 
28
-#else // !SYS_LINUX
29
+#else // !SYS_LINUX && !SYS_FREEBSD
30
 
31
 hb_display_t * hb_display_init(const char         *  driver_name,
32
                                const char * const * interface_names)
33
@@ -1689,7 +1693,7 @@ void hb_display_close(hb_display_t ** _d)
34
     (void)_d;
35
 }
36
 
37
-#endif // SYS_LINUX
38
+#endif // SYS_LINUX || SYS_FREEBSD
39
 #else // !HB_PROJECT_FEATURE_QSV
40
 
41
 hb_display_t * hb_display_init(const char         *  driver_name,
(-)a/multimedia/handbrake/files/patch-libhb_qsv__common.c (-20 lines)
Removed Link Here
1
--- libhb/qsv_common.c.orig	2019-11-09 20:44:32 UTC
2
+++ libhb/qsv_common.c
3
@@ -678,7 +678,7 @@ int hb_qsv_info_init()
4
      */
5
     mfxSession session;
6
     mfxVersion version = { .Major = 1, .Minor = 0, };
7
-#ifdef SYS_LINUX
8
+#if defined(SYS_LINUX) || defined(SYS_FREEBSD)
9
     mfxIMPL hw_preference = MFX_IMPL_VIA_ANY;
10
 #else
11
     mfxIMPL hw_preference = MFX_IMPL_VIA_D3D11;
12
@@ -738,7 +738,7 @@ int hb_qsv_info_init()
13
         }
14
         else
15
         {
16
-#ifndef SYS_LINUX
17
+#if !defined(SYS_LINUX) && !defined(SYS_FREEBSD)
18
             // Windows only: After D3D11 we will try D3D9
19
             if (hw_preference == MFX_IMPL_VIA_D3D11)
20
                 hw_preference = MFX_IMPL_VIA_D3D9;
(-)a/multimedia/handbrake/files/patch-make_configure.py (-29 lines)
Removed Link Here
1
--- make/configure.py.orig	2019-11-09 20:44:32 UTC
2
+++ make/configure.py
3
@@ -1413,7 +1413,7 @@ def createCLI( cross = None ):
4
     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) )
5
     grp.add_argument( '--disable-nvenc', dest="enable_nvenc", action='store_false', help=(( 'disable %s' %h ) if h != argparse.SUPPRESS else h) )
6
 
7
-    h = IfHost( 'Intel QSV video encoder/decoder', '*-*-linux*', '*-*-mingw*', none=argparse.SUPPRESS).value
8
+    h = IfHost( 'Intel QSV video encoder/decoder', '*-*-linux*', '*-*-freebsd*', '*-*-mingw*', none=argparse.SUPPRESS).value
9
     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) )
10
     grp.add_argument( '--disable-qsv', dest="enable_qsv", action='store_false', help=(( 'disable %s' %h ) if h != argparse.SUPPRESS else h) )
11
 
12
@@ -1684,7 +1684,7 @@ try:
13
                                         none=False).value
14
                                  and options.enable_x265)
15
     # Disable QSV on unsupported platforms
16
-    options.enable_qsv        = IfHost(options.enable_qsv, '*-*-linux*',
17
+    options.enable_qsv        = IfHost(options.enable_qsv, '*-*-linux*', '*-*-freebsd*',
18
                                        '*-*-mingw*', none=False).value
19
     # Disable VCE on unsupported platforms
20
     options.enable_vce        = IfHost(options.enable_vce, '*-*-linux*', '*-*-mingw*',
21
@@ -2124,7 +2124,7 @@ int main()
22
     stdout.write( 'Enable NVENC:       %s' % options.enable_nvenc )
23
     stdout.write( ' (%s)\n' % note_unsupported ) if not (host_tuple.system == 'linux' or host_tuple.system == 'mingw') else stdout.write( '\n' )
24
     stdout.write( 'Enable QSV:         %s' % options.enable_qsv )
25
-    stdout.write( ' (%s)\n' % note_unsupported ) if not (host_tuple.system == 'linux' or host_tuple.system == 'mingw') else stdout.write( '\n' )
26
+    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' )
27
     stdout.write( 'Enable VCE:         %s' % options.enable_vce )
28
     stdout.write( ' (%s)\n' % note_unsupported ) if not (host_tuple.system == 'linux' or host_tuple.system == 'mingw') else stdout.write( '\n' )
29
 
(-)a/multimedia/handbrake/files/patch-make_include_main.defs (-12 lines)
Removed Link Here
1
--- make/include/main.defs.orig	2019-11-09 20:44:32 UTC
2
+++ make/include/main.defs
3
@@ -53,7 +53,9 @@ MODULES += contrib/libdvdnav
4
 MODULES += contrib/libbluray
5
 
6
 ifeq (1,$(FEATURE.qsv))
7
+ifeq (,$(filter $(HOST.system),freebsd))
8
     MODULES += contrib/libmfx
9
+endif
10
 endif
11
 
12
 ifeq (1,$(FEATURE.vce))
(-)a/multimedia/handbrake/files/patch-test_module.defs (-11 lines)
Removed Link Here
1
--- test/module.defs.orig	2019-11-09 20:44:32 UTC
2
+++ test/module.defs
3
@@ -25,7 +25,7 @@ endif
4
 
5
 ifeq (1,$(FEATURE.qsv))
6
     TEST.GCC.l += mfx
7
-ifeq ($(HOST.system),linux)
8
+ifneq (,$(filter $(HOST.system),linux freebsd))
9
     TEST.GCC.l += va va-drm
10
 endif
11
 endif

Return to bug 242849