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

Collapse All | Expand All

(-)multimedia/handbrake/Makefile (-26 / +26 lines)
Lines 2-18 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	handbrake
4
PORTNAME=	handbrake
5
PORTVERSION=	1.0.7
5
PORTVERSION=	1.1.0
6
PORTREVISION=	5
7
CATEGORIES=	multimedia
6
CATEGORIES=	multimedia
8
DIST_SUBDIR=	${PORTNAME}
7
DIST_SUBDIR=	${PORTNAME}
9
8
10
MAINTAINER=	ports@FreeBSD.org
9
MAINTAINER=	naito.yuichiro@gmail.com
11
COMMENT=	Versatile DVD ripper and video transcoder
10
COMMENT=	Versatile DVD ripper and video transcoder
12
11
13
LICENSE=	GPLv2
12
LICENSE=	GPLv2
14
LICENSE_FILE=	${WRKSRC}/COPYING
13
LICENSE_FILE=	${WRKSRC}/COPYING
15
14
15
BROKEN_aarch64=		invokes x86 assembler
16
BROKEN_armv6=		invokes x86 assembler
17
BROKEN_armv7=		invokes x86 assembler
18
BROKEN_mips=		invokes x86 assembler
19
BROKEN_mips64=		invokes x86 assembler
20
BROKEN_sparc64=		invokes x86 assembler
21
BROKEN_powerpc64=	invokes x86 assembler
22
16
BUILD_DEPENDS=	bash:shells/bash \
23
BUILD_DEPENDS=	bash:shells/bash \
17
		yasm:devel/yasm \
24
		yasm:devel/yasm \
18
		cmake:devel/cmake
25
		cmake:devel/cmake
Lines 34-59 Link Here
34
		libopus.so:audio/opus \
41
		libopus.so:audio/opus \
35
		libjansson.so:devel/jansson
42
		libjansson.so:devel/jansson
36
43
37
BROKEN_aarch64=		invokes x86 assembler
44
CONTRIB_FILES=	fdk-aac-0.1.5.tar.gz \
38
BROKEN_armv6=		invokes x86 assembler
45
		libav-12.3.tar.gz \
39
BROKEN_armv7=		invokes x86 assembler
46
		libbluray-1.0.2.tar.bz2 \
40
BROKEN_mips=		invokes x86 assembler
47
		libdvdnav-5.0.3.tar.bz2 \
41
BROKEN_mips64=		invokes x86 assembler
48
		libdvdread-5.0.3.tar.bz2 \
42
BROKEN_sparc64=		invokes x86 assembler
49
		libvpx-1.6.1.tar.bz2 \
43
BROKEN_powerpc64=	invokes x86 assembler
50
		x265_2.6.tar.gz
44
51
MASTER_SITES+=	https://download.handbrake.fr/contrib/:contrib
45
USE_GITHUB=	yes
46
GH_ACCOUNT=	HandBrake
47
GH_PROJECT=	HandBrake
48
49
CONTRIB_FILES=	fdk-aac-0.1.4.tar.gz \
50
		libav-12.tar.gz \
51
		libbluray-0.9.3.tar.bz2 \
52
		libdvdnav-5.0.1.tar.bz2 \
53
		libdvdread-5.0.0-6-gcb1ae87.tar.gz \
54
		libvpx-1.5.0.tar.bz2 \
55
		x265_2.1-1.tar.gz
56
MASTER_SITES+=	http://download.handbrake.fr/contrib/:contrib
57
DISTFILES+=	${CONTRIB_FILES:S/$/:contrib/}
52
DISTFILES+=	${CONTRIB_FILES:S/$/:contrib/}
58
53
59
.if !defined(PACKAGE_BUILDING)
54
.if !defined(PACKAGE_BUILDING)
Lines 62-72 Link Here
62
.endif
57
.endif
63
58
64
GNU_CONFIGURE=	yes
59
GNU_CONFIGURE=	yes
65
USE_GCC=	yes
66
USES=		autoreconf:build compiler:features gmake iconv \
60
USES=		autoreconf:build compiler:features gmake iconv \
67
		libtool:build localbase:ldflags pkgconfig python:2.7,build
61
		libtool:build localbase:ldflags pkgconfig python:2.7,build
68
MAKE_ENV=	V=1 ACLOCAL=${LOCALBASE}/bin/aclocal
62
MAKE_ENV=	V=1 ACLOCAL=${LOCALBASE}/bin/aclocal
69
63
64
USE_GITHUB=	yes
65
GH_ACCOUNT=	HandBrake
66
GH_PROJECT=	HandBrake
67
68
USE_GCC=	yes
69
70
CONFIGURE_ARGS=	--force --enable-x265
70
CONFIGURE_ARGS=	--force --enable-x265
71
CONFIGURE_TARGET=	build
71
CONFIGURE_TARGET=	build
72
72
Lines 105-117 Link Here
105
.if ${PORT_OPTIONS:MX11}
105
.if ${PORT_OPTIONS:MX11}
106
CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
106
CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
107
MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
107
MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
108
CONFIGURE_ARGS+=	--disable-gtk-update-checks --disable-gst
108
CONFIGURE_ARGS+=	--disable-gtk-update-checks
109
BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
109
BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
110
LIB_DEPENDS+=	libvpx.so:multimedia/libvpx \
110
LIB_DEPENDS+=	libvpx.so:multimedia/libvpx \
111
		libdbus-glib-1.so:devel/dbus-glib \
112
		libnotify.so:devel/libnotify
111
		libnotify.so:devel/libnotify
113
USES+=		gettext desktop-file-utils
112
USES+=		gettext desktop-file-utils
114
USE_GNOME+=	gtk30 intltool cairo gdkpixbuf2
113
USE_GNOME+=	gtk30 intltool cairo gdkpixbuf2
114
USE_GSTREAMER1=	gdkpixbuf
115
.else
115
.else
116
CONFIGURE_ARGS+=	--disable-gtk
116
CONFIGURE_ARGS+=	--disable-gtk
117
.endif
117
.endif
(-)multimedia/handbrake/distinfo (-17 / +17 lines)
Lines 1-17 Link Here
1
TIMESTAMP = 1491873041
1
TIMESTAMP = 1523151983
2
SHA256 (handbrake/fdk-aac-0.1.4.tar.gz) = 5910fe788677ca13532e3f47b7afaa01d72334d46a2d5e1d1f080f1173ff15ab
2
SHA256 (handbrake/fdk-aac-0.1.5.tar.gz) = 2164592a67b467e5b20fdcdaf5bd4c50685199067391c6fcad4fa5521c9b4dd7
3
SIZE (handbrake/fdk-aac-0.1.4.tar.gz) = 1986515
3
SIZE (handbrake/fdk-aac-0.1.5.tar.gz) = 2091081
4
SHA256 (handbrake/libav-12.tar.gz) = ca5cb22ba660f0bdc47817fdb9d99059a71f9eb0776c68cf8bef769a5ccc7534
4
SHA256 (handbrake/libav-12.3.tar.gz) = 115b659022dd387f662e26fbc5bc0cc14ec18daa100003ffd34f4da0479b272e
5
SIZE (handbrake/libav-12.tar.gz) = 7578674
5
SIZE (handbrake/libav-12.3.tar.gz) = 7582844
6
SHA256 (handbrake/libbluray-0.9.3.tar.bz2) = a6366614ec45484b51fe94fcd1975b3b8716f90f038a33b24d59978de3863ce0
6
SHA256 (handbrake/libbluray-1.0.2.tar.bz2) = 6d9e7c4e416f664c330d9fa5a05ad79a3fb39b95adfc3fd6910cbed503b7aeff
7
SIZE (handbrake/libbluray-0.9.3.tar.bz2) = 722686
7
SIZE (handbrake/libbluray-1.0.2.tar.bz2) = 733058
8
SHA256 (handbrake/libdvdnav-5.0.1.tar.bz2) = 72b1cb8266f163d4a1481b92c7b6c53e6dc9274d2a6befb08ffc351fe7a4a2a9
8
SHA256 (handbrake/libdvdnav-5.0.3.tar.bz2) = 5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d
9
SIZE (handbrake/libdvdnav-5.0.1.tar.bz2) = 354568
9
SIZE (handbrake/libdvdnav-5.0.3.tar.bz2) = 372203
10
SHA256 (handbrake/libdvdread-5.0.0-6-gcb1ae87.tar.gz) = d2e4200c3c5d5f812892f9c14851c94e2f707d54e7328946c6397ac999f15f17
10
SHA256 (handbrake/libdvdread-5.0.3.tar.bz2) = 321cdf2dbdc83c96572bc583cd27d8c660ddb540ff16672ecb28607d018ed82b
11
SIZE (handbrake/libdvdread-5.0.0-6-gcb1ae87.tar.gz) = 124494
11
SIZE (handbrake/libdvdread-5.0.3.tar.bz2) = 394885
12
SHA256 (handbrake/libvpx-1.5.0.tar.bz2) = 306d67908625675f8e188d37a81fbfafdf5068b09d9aa52702b6fbe601c76797
12
SHA256 (handbrake/libvpx-1.6.1.tar.bz2) = 1c2c0c2a97fba9474943be34ee39337dee756780fc12870ba1dc68372586a819
13
SIZE (handbrake/libvpx-1.5.0.tar.bz2) = 1906571
13
SIZE (handbrake/libvpx-1.6.1.tar.bz2) = 1959534
14
SHA256 (handbrake/x265_2.1-1.tar.gz) = 88fcb9af4ba52c0757ac9c0d8cd5ec79951a22905ae886897e06954353d6a643
14
SHA256 (handbrake/x265_2.6.tar.gz) = 1bf0036415996af841884802161065b9e6be74f5f6808ac04831363e2549cdbf
15
SIZE (handbrake/x265_2.1-1.tar.gz) = 1036921
15
SIZE (handbrake/x265_2.6.tar.gz) = 1271976
16
SHA256 (handbrake/HandBrake-HandBrake-1.0.7_GH0.tar.gz) = 4f24f623d3078e3a5603a25ff718d75216d8eec7e25eb9a8cb267f28a0688fe7
16
SHA256 (handbrake/HandBrake-HandBrake-1.1.0_GH0.tar.gz) = c51f25e8fa2e979295bed281b050186d36f48d9ed0fc3cb7e4f5497985d000b0
17
SIZE (handbrake/HandBrake-HandBrake-1.0.7_GH0.tar.gz) = 13167548
17
SIZE (handbrake/HandBrake-HandBrake-1.1.0_GH0.tar.gz) = 15797528
(-)multimedia/handbrake/files/patch-contrib_libbluray_A02-expose-clip__id.patch (-18 lines)
Lines 1-18 Link Here
1
--- contrib/libbluray/A02-expose-clip_id.patch.orig     2017-02-25
2
20:56:19 UTC
3
+++ contrib/libbluray/A02-expose-clip_id.patch
4
@@ -35,3 +35,14 @@ index 3cd7118..177b3d4 100644
5
 --
6
 2.5.5
7
8
+--- a/Makefile.in.orig 2017-03-25 19:30:14 UTC
9
++++ b/Makefile.in      2017-03-25 19:30:36 UTC
10
+@@ -772,7 +772,7 @@
11
+ MOSTLYCLEANFILES = $(DX_CLEANFILES)
12
+ @ENABLE_UDF_FALSE@POSIX_C_SOURCE = 200112L
13
+ @ENABLE_UDF_TRUE@POSIX_C_SOURCE = 200809L
14
+-SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=$(POSIX_C_SOURCE) -D_REENTRANT
15
++SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=$(POSIX_C_SOURCE) -D_REENTRANT -D_XOPEN_SOURCE=700
16
+ SET_INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/libbluray -I$(top_builddir)/src/libbluray $(BDJAVA_CFLAGS)
17
+ AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBXML2_CFLAGS) \
18
+       $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(UDF_CFLAGS) \
(-)multimedia/handbrake/files/patch-contrib_x265__10bit_module.defs (+23 lines)
Line 0 Link Here
1
--- contrib/libbluray/P01-freebsd-configure.patch.orig	2018-04-09 12:18:09 UTC
2
+++ contrib/libbluray/P01-freebsd-configure.patch
3
@@ -0,0 +1,13 @@
4
+--- libbluray-1.0.2/configure.orig	2017-12-04 00:27:38.000000000 +0900
5
++++ libbluray-1.0.2/configure
6
+@@ -14,6 +14,10 @@
7
+ ## M4sh Initialization. ##
8
+ ## -------------------- ##
9
+
10
++if test `uname` = 'FreeBSD' ; then
Line 0 Link Here
1
--- contrib/x265_10bit/module.defs.orig	2017-12-24 00:33:48 UTC
2
+++ contrib/x265_10bit/module.defs
3
@@ -19,6 +19,10 @@ X265_10.CONFIGURE.static      =
4
 X265_10.CONFIGURE.shared      = -DENABLE_SHARED=OFF
5
 X265_10.CONFIGURE.extra       = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=ON -DENABLE_LIBNUMA=OFF -DEXPORT_C_API=OFF
6
 
7
+ifneq (x86_64,$(BUILD.machine))
8
+    X265_10.CONFIGURE.extra       += -DENABLE_ASSEMBLY=0
9
+endif
10
+
11
 ifneq (none,$(X265_10.GCC.g))
12
     X265_10.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Debug
13
 endif
(-)multimedia/handbrake/files/patch-contrib_x265__12bit_module.defs (+13 lines)
Line 0 Link Here
1
--- contrib/x265_12bit/module.defs.orig	2017-12-24 00:33:48 UTC
2
+++ contrib/x265_12bit/module.defs
3
@@ -19,6 +19,10 @@ X265_12.CONFIGURE.static      =
4
 X265_12.CONFIGURE.shared      = -DENABLE_SHARED=OFF
5
 X265_12.CONFIGURE.extra       = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=ON -DENABLE_LIBNUMA=OFF -DEXPORT_C_API=OFF -DMAIN12=ON
6
 
7
+ifneq (x86_64,$(BUILD.machine))
8
+    X265_12.CONFIGURE.extra       += -DENABLE_ASSEMBLY=0
9
+endif
10
+
11
 ifneq (none,$(X265_12.GCC.g))
12
     X265_12.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Debug
13
 endif
(-)multimedia/handbrake/files/patch-gtk_configure.ac (-12 lines)
Lines 1-12 Link Here
1
--- gtk/configure.ac.orig	2017-02-25 20:56:19 UTC
2
+++ gtk/configure.ac
3
@@ -182,6 +182,9 @@ case $host in
4
 	fi
5
     HB_LIBS="$HB_LIBS -lregex -luuid"
6
     ;;
7
+  *-*-freebsd*)
8
+    HB_LIBS="$HB_LIBS -lpthread"
9
+    ;;
10
   *)
11
     HB_LIBS="$HB_LIBS -ldl -lpthread"
12
     ;;
(-)multimedia/handbrake/files/patch-gtk_src_callbacks.c (-17 lines)
Lines 1-17 Link Here
1
--- gtk/src/callbacks.c.orig	2017-02-25 20:56:19 UTC
2
+++ gtk/src/callbacks.c
3
@@ -46,6 +46,9 @@
4
 #include <dbus/dbus-glib.h>
5
 #include <dbus/dbus-glib-lowlevel.h>
6
 
7
+#if defined( __FreeBSD__ )
8
+#include <sys/socket.h>
9
+#endif
10
 #include <netinet/in.h>
11
 #include <netdb.h>
12
 
13
@@ -5537,4 +5540,3 @@ void ghb_container_empty(GtkContainer *c
14
 {
15
     gtk_container_foreach(c, container_empty_cb, NULL);
16
 }
17
-
(-)multimedia/handbrake/files/patch-libhb_fifo.c (-11 lines)
Lines 1-11 Link Here
1
--- libhb/fifo.c.orig	2017-02-25 20:56:19 UTC
2
+++ libhb/fifo.c
3
@@ -13,7 +13,7 @@
4
 #include "qsv_libav.h"
5
 #endif
6
 
7
-#ifndef SYS_DARWIN
8
+#if !defined(SYS_DARWIN) && !defined(SYS_FREEBSD)
9
 #include <malloc.h>
10
 #endif
11
 
(-)multimedia/handbrake/files/patch-libhb_module.defs (-27 / +9 lines)
Lines 1-29 Link Here
1
--- libhb/module.defs.orig	2017-02-25 20:56:19 UTC
1
--- libhb/module.defs.orig	2018-01-13 05:30:25 UTC
2
+++ libhb/module.defs
2
+++ libhb/module.defs
3
@@ -47,7 +47,7 @@ LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB
3
@@ -49,7 +49,7 @@ LIBHB.GCC.D += __LIBHB__ USE_PTHREAD
4
 ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
4
 LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB.build/)include
5
 LIBHB.GCC.I += $(CONTRIB.build/)include/libxml2
5
 
6
 ifeq ($(BUILD.system),freebsd)
7
-    LIBHB.GCC.I += /usr/local/include/libxml2
8
+    LIBHB.GCC.I += $(LOCALBASE)/include/libxml2
9
 else ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
10
     LIBHB.GCC.I += $(CONTRIB.build/)include/libxml2
6
 else
11
 else
7
-LIBHB.GCC.I += /usr/include/libxml2
8
+LIBHB.GCC.I += /usr/local/include/libxml2
9
 endif
10
 
11
 ifeq ($(BUILD.system),cygwin)
12
@@ -58,6 +58,8 @@ else ifeq ($(BUILD.system),darwin)
13
     LIBHB.m += $(wildcard $(LIBHB.src/)platform/macosx/*.m)
14
 else ifeq ($(BUILD.system),linux)
15
     LIBHB.GCC.D += SYS_LINUX _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
16
+else ifeq ($(BUILD.system),freebsd)
17
+    LIBHB.GCC.D += SYS_FREEBSD _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
18
 else ifeq ($(BUILD.system),mingw)
19
     LIBHB.GCC.D += SYS_MINGW
20
 ifneq ($(HAS.pthread),1)
21
@@ -188,4 +190,8 @@ endif
22
 
23
 ###############################################################################
24
 
25
+ifeq ($(HAS.pthread),1)
26
+    LIBHB.GCC.l += pthread
27
+endif
28
+
29
 BUILD.out += $(LIBHB.out)
(-)multimedia/handbrake/files/patch-libhb_nlmeans.c (-2 / +2 lines)
Lines 1-6 Link Here
1
--- libhb/nlmeans.c.orig	2017-02-25 20:56:19 UTC
1
--- libhb/nlmeans.c.orig	2017-10-05 21:17:34 UTC
2
+++ libhb/nlmeans.c
2
+++ libhb/nlmeans.c
3
@@ -786,7 +786,7 @@ static int nlmeans_init(hb_filter_object
3
@@ -787,7 +787,7 @@ static int nlmeans_init(hb_filter_object
4
     NLMeansFunctions *functions = &pv->functions;
4
     NLMeansFunctions *functions = &pv->functions;
5
 
5
 
6
     functions->build_integral = build_integral_scalar;
6
     functions->build_integral = build_integral_scalar;
(-)multimedia/handbrake/files/patch-libhb_nlmeans__x86.c (-1 / +1 lines)
Lines 1-4 Link Here
1
--- libhb/nlmeans_x86.c.orig	2017-02-25 20:56:19 UTC
1
--- libhb/nlmeans_x86.c.orig	2017-10-05 21:17:34 UTC
2
+++ libhb/nlmeans_x86.c
2
+++ libhb/nlmeans_x86.c
3
@@ -10,7 +10,7 @@
3
@@ -10,7 +10,7 @@
4
 
4
 
(-)multimedia/handbrake/files/patch-make_configure.py (-64 / +3 lines)
Lines 1-72 Link Here
1
--- make/configure.py.orig	2017-02-25 20:56:19 UTC
1
--- make/configure.py.orig	2018-01-13 05:30:25 UTC
2
+++ make/configure.py
2
+++ make/configure.py
3
@@ -590,6 +590,9 @@ class ArchAction( Action ):
3
@@ -1515,7 +1515,7 @@ try:
4
             pass
5
         elif host.match( '*-*-solaris*' ):
6
             pass
7
+        elif host.match( '*-*-freebsd.*' ):
8
+            self.mode['i386']   = 'i386-portsbuild-freebsd%s' % (host.release)
9
+            self.mode['amd64'] = 'amd64-portsbuild-freebsd%s' % (host.release)
10
         else:
11
             self.msg_pass = 'WARNING'
12
 
13
@@ -1294,13 +1297,13 @@ def createCLI():
14
     h = IfHost( 'enable assembly code in non-contrib modules', 'NOMATCH*-*-darwin*', 'NOMATCH*-*-linux*', none=optparse.SUPPRESS_HELP ).value
15
     grp.add_option( '--enable-asm', default=False, action='store_true', help=h )
16
 
17
-    h = IfHost( 'disable GTK GUI', '*-*-linux*', none=optparse.SUPPRESS_HELP ).value
18
+    h = IfHost( 'disable GTK GUI', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
19
     grp.add_option( '--disable-gtk', default=False, action='store_true', help=h )
20
-    h = IfHost( 'disable GTK GUI update checks', '*-*-linux*', none=optparse.SUPPRESS_HELP ).value
21
+    h = IfHost( 'disable GTK GUI update checks', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
22
     grp.add_option( '--disable-gtk-update-checks', default=False, action='store_true', help=h )
23
     h = IfHost( 'enable GTK GUI (mingw)', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
24
     grp.add_option( '--enable-gtk-mingw', default=False, action='store_true', help=h )
25
-    h = IfHost( 'disable gstreamer (live preview)', '*-*-linux*', none=optparse.SUPPRESS_HELP ).value
26
+    h = IfHost( 'disable gstreamer (live preview)', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
27
     grp.add_option( '--disable-gst', default=False, action='store_true', help=h )
28
     h = IfHost( 'enable use of Intel Quick Sync Video hardware acceleration', '*-*-*', none=optparse.SUPPRESS_HELP ).value
29
     grp.add_option( '--enable-qsv', default=False, action='store_true', help=h )
30
@@ -1352,7 +1355,7 @@ def createCLI():
31
     h = IfHost( 'Build and use local pkg-config', '*-*-darwin*', none=optparse.SUPPRESS_HELP ).value
32
     grp.add_option( '--enable-local-pkgconfig', default=False, action='store_true', help=h )
33
 
34
-    h = IfHost( 'Build extra contribs for flatpak packaging', '*-*-linux*', none=optparse.SUPPRESS_HELP ).value
35
+    h = IfHost( 'Build extra contribs for flatpak packaging', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
36
     grp.add_option( '--flatpak', default=False, action='store_true', help=h )
37
     cli.add_option_group( grp )
38
 
39
@@ -1517,7 +1520,7 @@ try:
40
     class Tools:
4
     class Tools:
41
         ar    = ToolProbe( 'AR.exe',    'ar' )
5
         ar    = ToolProbe( 'AR.exe',    'ar' )
42
         cp    = ToolProbe( 'CP.exe',    'cp' )
6
         cp    = ToolProbe( 'CP.exe',    'cp' )
43
-        gcc   = ToolProbe( 'GCC.gcc',   'gcc', IfHost( 'gcc-4', '*-*-cygwin*' ))
7
-        gcc   = ToolProbe( 'GCC.gcc',   'gcc', IfHost( 'gcc-4', '*-*-cygwin*' ))
44
+        gcc   = ToolProbe( 'GCC.gcc',   'gcc', IfHost( os.environ['CC'], '*-*-freebsd*' ))
8
+        gcc   = ToolProbe( 'GCC.gcc',   'gcc', IfHost( os.environ['CC'], '*-*-freebsd*' ), IfHost( 'gcc-4', '*-*-cygwin*' ))
45
 
9
 
46
         if host.match( '*-*-darwin*' ):
10
         if host.match( '*-*-darwin*' ):
47
             gmake = ToolProbe( 'GMAKE.exe', 'make', 'gmake' )
11
             gmake = ToolProbe( 'GMAKE.exe', 'make', 'gmake' )
48
@@ -1924,10 +1927,15 @@ int main()
49
         doc.add( 'GCC.sysroot', '' )
50
         doc.add( 'GCC.minver', '' )
51
 
52
+    if build.match( '*-*-freebsd*' ):
53
+        doc.add( 'HAS.pthread', 1 )
54
+
55
     if build.match( 'i?86-*' ):
56
         doc.add( 'LIBHB.GCC.D', 'ARCH_X86_32', append=True )
57
     elif build.match( 'x86_64-*' ):
58
         doc.add( 'LIBHB.GCC.D', 'ARCH_X86_64', append=True )
59
+    elif build.match( 'amd64-*' ):
60
+        doc.add( 'LIBHB.GCC.D', 'ARCH_X86_64', append=True )
61
 
62
     if options.enable_asm and ( not Tools.yasm.fail or options.enable_local_yasm ):
63
         asm = ''
64
@@ -1940,7 +1948,7 @@ int main()
65
             else:
66
                 doc.add( 'LIBHB.YASM.f', 'elf32' )
67
             doc.add( 'LIBHB.YASM.m', 'x86' )
68
-        elif build.match( 'x86_64-*' ):
69
+        elif build.match( 'x86_64-*' ) or build.match( 'amd64-*' ):
70
             asm = 'x86'
71
             doc.add( 'LIBHB.GCC.D', 'HAVE_MMX ARCH_X86_64', append=True )
72
             if build.match( '*-*-darwin*' ):
(-)multimedia/handbrake/files/patch-make_include_main.defs (-14 lines)
Lines 1-14 Link Here
1
--- make/include/main.defs.orig	2017-02-25 20:56:19 UTC
2
+++ make/include/main.defs
3
@@ -134,6 +134,11 @@ ifeq (1-linux,$(FEATURE.gtk)-$(BUILD.sys
4
     MODULES += gtk
5
 endif
6
 
7
+ifeq (1-freebsd,$(FEATURE.gtk)-$(BUILD.system))
8
+    ## build gtk when gtk+freebsd
9
+    MODULES += gtk
10
+endif
11
+
12
 ifeq (1-kfreebsd,$(FEATURE.gtk)-$(BUILD.system))
13
     ## build gtk when gtk+kfreebsd
14
     MODULES += gtk
(-)multimedia/handbrake/files/patch-scripts_build-presets.sh (-8 lines)
Lines 1-8 Link Here
1
--- scripts/build-presets.sh.orig	2017-02-25 20:56:19 UTC
2
+++ scripts/build-presets.sh
3
@@ -1,4 +1,4 @@
4
-#!/bin/bash
5
+#!/usr/bin/env bash
6
 # usage: build-presets
7
 
8
 SELF="${BASH_SOURCE[0]}"
(-)multimedia/handbrake/files/patch-scripts_create__resources.py (-8 lines)
Lines 1-8 Link Here
1
--- scripts/create_resources.py.orig	2017-02-25 20:56:19 UTC
2
+++ scripts/create_resources.py
3
@@ -1,4 +1,4 @@
4
-#! /usr/bin/python
5
+#! /usr/bin/env python
6
 #
7
 
8
 import types
(-)multimedia/handbrake/files/patch-scripts_mac-toolchain-build (-8 lines)
Lines 1-8 Link Here
1
--- scripts/mac-toolchain-build.orig	2017-02-25 20:56:19 UTC
2
+++ scripts/mac-toolchain-build
3
@@ -1,4 +1,4 @@
4
-#!/bin/bash
5
+#!/usr/bin/env bash
6
 
7
 # mac only
8
 if [[ "$(uname)" != "Darwin" ]]; then
(-)multimedia/handbrake/files/patch-scripts_manicure.rb (-8 lines)
Lines 1-8 Link Here
1
--- scripts/manicure.rb.orig	2017-02-25 20:56:19 UTC
2
+++ scripts/manicure.rb
3
@@ -1,4 +1,4 @@
4
-#! /usr/bin/ruby
5
+#! /usr/bin/env ruby
6
 # manincure.rb version 0.66
7
 
8
 # This file is part of the HandBrake source code.
(-)multimedia/handbrake/files/patch-scripts_mingw-w64-build (-8 lines)
Lines 1-8 Link Here
1
--- scripts/mingw-w64-build.orig	2017-02-25 20:56:19 UTC
2
+++ scripts/mingw-w64-build
3
@@ -1,4 +1,4 @@
4
-#!/bin/bash
5
+#!/usr/bin/env bash
6
 # mingw-w64-build - download and build mingw-w64 toolchain
7
 #
8
 # Project: https://github.com/bradleysepos/mingw-w64-build
(-)multimedia/handbrake/files/patch-scripts_quotestring.py (-8 lines)
Lines 1-8 Link Here
1
--- scripts/quotestring.py.orig	2017-02-25 20:56:19 UTC
2
+++ scripts/quotestring.py
3
@@ -1,4 +1,4 @@
4
-#! /usr/bin/python
5
+#! /usr/bin/env python
6
 
7
 import re
8
 import getopt
(-)multimedia/handbrake/files/patch-scripts_repo-info.sh (-8 lines)
Lines 1-8 Link Here
1
--- scripts/repo-info.sh.orig	2017-02-25 20:56:19 UTC
2
+++ scripts/repo-info.sh
3
@@ -1,4 +1,4 @@
4
-#! /bin/bash
5
+#!/usr/bin/env bash
6
 #
7
 # Retrieves git repository info for directory ${1} using command ${2}
8
 
(-)multimedia/handbrake/files/patch-scripts_tag-release.sh (-8 lines)
Lines 1-8 Link Here
1
--- scripts/tag-release.sh.orig	2017-02-25 20:56:19 UTC
2
+++ scripts/tag-release.sh
3
@@ -1,4 +1,4 @@
4
-#! /bin/bash
5
+#!/usr/bin/env bash
6
 #
7
 # Usage: tag-release.sh <release-ver> [<ref>]
8
 #
(-)multimedia/handbrake/files/patch-test_module.defs (-11 lines)
Lines 1-11 Link Here
1
--- test/module.defs.orig	2017-02-25 20:56:19 UTC
2
+++ test/module.defs
3
@@ -13,7 +13,7 @@ TEST.GCC.L = $(CONTRIB.build/)lib
4
 
5
 TEST.libs = $(LIBHB.a)
6
 
7
-TEST.GCC.l = \
8
+TEST.GCC.l = pthread \
9
         ass avresample avformat avcodec avfilter avutil mp3lame dvdnav \
10
         dvdread fontconfig fribidi \
11
         samplerate swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
(-)multimedia/handbrake/files/patch-version.txt (-5 / +5 lines)
Lines 2-12 Link Here
2
+++ version.txt
2
+++ version.txt
3
@@ -0,0 +1,9 @@
3
@@ -0,0 +1,9 @@
4
+URL=https://github.com/HandBrake/HandBrake.git
4
+URL=https://github.com/HandBrake/HandBrake.git
5
+HASH=91ed34ff38d46f389e841c46fe27b7cbfed8467c
5
+HASH=b463d33a4ed4c9da5fb6432e7fb7e08422fc1aad
6
+SHORTHASH=91ed34f
6
+SHORTHASH=b463d33
7
+TAG=1.0.7
7
+TAG=1.1.0
8
+TAG_HASH=91ed34ff38d46f389e841c46fe27b7cbfed8467c
8
+TAG_HASH=b463d33a4ed4c9da5fb6432e7fb7e08422fc1aad
9
+REV=0
9
+REV=0
10
+BRANCH=
10
+BRANCH=
11
+REMOTE=https://github.com/HandBrake/HandBrake.git
11
+REMOTE=https://github.com/HandBrake/HandBrake.git
12
+DATE=2017-04-09 23:31:00 +0300
12
+DATE=2018-04-08 15:16:00 +0900

Return to bug 227374