Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 18 Apr 2018 21:32:34 +0000 (UTC)
From:      =?UTF-8?Q?Fernando_Apestegu=c3=ada?= <fernape@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r467738 - in head/multimedia/handbrake: . files
Message-ID:  <201804182132.w3ILWYbi022948@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: fernape
Date: Wed Apr 18 21:32:33 2018
New Revision: 467738
URL: https://svnweb.freebsd.org/changeset/ports/467738

Log:
  Update multimedia/handbrake to 1.1.0
  
  Handing over maintainership to naito.yuichiro@gmail.com
  
  PR:	227374
  Reported by:	naito.yuichiro@gmail.com
  Approved by:	tcberner (mentor)
  Differential Revision:	https://reviews.freebsd.org/D15063

Added:
  head/multimedia/handbrake/files/patch-contrib_libbluray_P01-freebsd-configure.patch   (contents, props changed)
  head/multimedia/handbrake/files/patch-contrib_x265__10bit_module.defs   (contents, props changed)
  head/multimedia/handbrake/files/patch-contrib_x265__12bit_module.defs   (contents, props changed)
Deleted:
  head/multimedia/handbrake/files/patch-contrib_libbluray_A02-expose-clip__id.patch
  head/multimedia/handbrake/files/patch-gtk_configure.ac
  head/multimedia/handbrake/files/patch-gtk_src_callbacks.c
  head/multimedia/handbrake/files/patch-libhb_fifo.c
  head/multimedia/handbrake/files/patch-make_include_main.defs
  head/multimedia/handbrake/files/patch-scripts_build-presets.sh
  head/multimedia/handbrake/files/patch-scripts_create__resources.py
  head/multimedia/handbrake/files/patch-scripts_mac-toolchain-build
  head/multimedia/handbrake/files/patch-scripts_manicure.rb
  head/multimedia/handbrake/files/patch-scripts_mingw-w64-build
  head/multimedia/handbrake/files/patch-scripts_quotestring.py
  head/multimedia/handbrake/files/patch-scripts_repo-info.sh
  head/multimedia/handbrake/files/patch-scripts_tag-release.sh
  head/multimedia/handbrake/files/patch-test_module.defs
Modified:
  head/multimedia/handbrake/Makefile
  head/multimedia/handbrake/distinfo
  head/multimedia/handbrake/files/patch-libhb_module.defs
  head/multimedia/handbrake/files/patch-libhb_nlmeans.c
  head/multimedia/handbrake/files/patch-libhb_nlmeans__x86.c
  head/multimedia/handbrake/files/patch-make_configure.py
  head/multimedia/handbrake/files/patch-version.txt

Modified: head/multimedia/handbrake/Makefile
==============================================================================
--- head/multimedia/handbrake/Makefile	Wed Apr 18 21:06:33 2018	(r467737)
+++ head/multimedia/handbrake/Makefile	Wed Apr 18 21:32:33 2018	(r467738)
@@ -2,17 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	handbrake
-PORTVERSION=	1.0.7
-PORTREVISION=	5
+DISTVERSION=	1.1.0
 CATEGORIES=	multimedia
 DIST_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	naito.yuichiro@gmail.com
 COMMENT=	Versatile DVD ripper and video transcoder
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+ONLY_FOR_ARCHS=	amd64 i386
+
 BUILD_DEPENDS=	bash:shells/bash \
 		yasm:devel/yasm \
 		cmake:devel/cmake
@@ -34,26 +35,14 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libopus.so:audio/opus \
 		libjansson.so:devel/jansson
 
-BROKEN_aarch64=		invokes x86 assembler
-BROKEN_armv6=		invokes x86 assembler
-BROKEN_armv7=		invokes x86 assembler
-BROKEN_mips=		invokes x86 assembler
-BROKEN_mips64=		invokes x86 assembler
-BROKEN_sparc64=		invokes x86 assembler
-BROKEN_powerpc64=	invokes x86 assembler
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	HandBrake
-GH_PROJECT=	HandBrake
-
-CONTRIB_FILES=	fdk-aac-0.1.4.tar.gz \
-		libav-12.tar.gz \
-		libbluray-0.9.3.tar.bz2 \
-		libdvdnav-5.0.1.tar.bz2 \
-		libdvdread-5.0.0-6-gcb1ae87.tar.gz \
-		libvpx-1.5.0.tar.bz2 \
-		x265_2.1-1.tar.gz
-MASTER_SITES+=	http://download.handbrake.fr/contrib/:contrib
+CONTRIB_FILES=	fdk-aac-0.1.5.tar.gz \
+		libav-12.3.tar.gz \
+		libbluray-1.0.2.tar.bz2 \
+		libdvdnav-5.0.3.tar.bz2 \
+		libdvdread-5.0.3.tar.bz2 \
+		libvpx-1.6.1.tar.bz2 \
+		x265_2.6.tar.gz
+MASTER_SITES+=	https://download.handbrake.fr/contrib/:contrib
 DISTFILES+=	${CONTRIB_FILES:S/$/:contrib/}
 
 .if !defined(PACKAGE_BUILDING)
@@ -62,11 +51,16 @@ LIB_DEPENDS+=	libdvdcss.so:multimedia/libdvdcss
 .endif
 
 GNU_CONFIGURE=	yes
-USE_GCC=	yes
 USES=		autoreconf:build compiler:features gmake iconv \
 		libtool:build localbase:ldflags pkgconfig python:2.7,build
 MAKE_ENV=	V=1 ACLOCAL=${LOCALBASE}/bin/aclocal
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	HandBrake
+GH_PROJECT=	HandBrake
+
+USE_GCC=	yes
+
 CONFIGURE_ARGS=	--force --enable-x265
 CONFIGURE_TARGET=	build
 
@@ -98,23 +92,18 @@ LICENSE_NAME_FDK_AAC=		Software License for The Fraunh
 LICENSE_FILE_FDK_AAC=		${WRKDIR}/${DISTFILES:Mfdk*:R:R}/NOTICE
 LICENSE_PERMS_FDK_AAC=		dist-mirror pkg-mirror auto-accept
 
-.include <bsd.port.options.mk>
-
 # Recent GNU binutils are required to handle inline SSSE3 asm (in x264), and
 # to support --exclude-libs option for ld(1) when building GUI program
-.if ${PORT_OPTIONS:MX11}
-CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
-MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
-CONFIGURE_ARGS+=	--disable-gtk-update-checks --disable-gst
-BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
-LIB_DEPENDS+=	libvpx.so:multimedia/libvpx \
-		libdbus-glib-1.so:devel/dbus-glib \
-		libnotify.so:devel/libnotify
-USES+=		gettext desktop-file-utils
-USE_GNOME+=	gtk30 intltool cairo gdkpixbuf2
-.else
-CONFIGURE_ARGS+=	--disable-gtk
-.endif
+X11_CONFIGURE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
+X11_MAKE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
+X11_CONFIGURE_ON=	--disable-gtk-update-checks
+X11_CONFIGURE_OFF=	--disable-gtk
+X11_BUILD_DEPENDS=	${LOCALBASE}/bin/ld:devel/binutils
+X11_LIB_DEPENDS=	libvpx.so:multimedia/libvpx \
+			libnotify.so:devel/libnotify
+X11_USES=	gettext desktop-file-utils
+X11_USE=	gstreamer1=gdkpixbuf,libav \
+		gnome=gtk30,intltool,cairo,gdkpixbuf2
 
 # HandBrake tries to fetch its dependencies during build phase, which is not
 # considered good in FreeBSD.  Instead, we will provided the downloaded files.

Modified: head/multimedia/handbrake/distinfo
==============================================================================
--- head/multimedia/handbrake/distinfo	Wed Apr 18 21:06:33 2018	(r467737)
+++ head/multimedia/handbrake/distinfo	Wed Apr 18 21:32:33 2018	(r467738)
@@ -1,17 +1,17 @@
-TIMESTAMP = 1491873041
-SHA256 (handbrake/fdk-aac-0.1.4.tar.gz) = 5910fe788677ca13532e3f47b7afaa01d72334d46a2d5e1d1f080f1173ff15ab
-SIZE (handbrake/fdk-aac-0.1.4.tar.gz) = 1986515
-SHA256 (handbrake/libav-12.tar.gz) = ca5cb22ba660f0bdc47817fdb9d99059a71f9eb0776c68cf8bef769a5ccc7534
-SIZE (handbrake/libav-12.tar.gz) = 7578674
-SHA256 (handbrake/libbluray-0.9.3.tar.bz2) = a6366614ec45484b51fe94fcd1975b3b8716f90f038a33b24d59978de3863ce0
-SIZE (handbrake/libbluray-0.9.3.tar.bz2) = 722686
-SHA256 (handbrake/libdvdnav-5.0.1.tar.bz2) = 72b1cb8266f163d4a1481b92c7b6c53e6dc9274d2a6befb08ffc351fe7a4a2a9
-SIZE (handbrake/libdvdnav-5.0.1.tar.bz2) = 354568
-SHA256 (handbrake/libdvdread-5.0.0-6-gcb1ae87.tar.gz) = d2e4200c3c5d5f812892f9c14851c94e2f707d54e7328946c6397ac999f15f17
-SIZE (handbrake/libdvdread-5.0.0-6-gcb1ae87.tar.gz) = 124494
-SHA256 (handbrake/libvpx-1.5.0.tar.bz2) = 306d67908625675f8e188d37a81fbfafdf5068b09d9aa52702b6fbe601c76797
-SIZE (handbrake/libvpx-1.5.0.tar.bz2) = 1906571
-SHA256 (handbrake/x265_2.1-1.tar.gz) = 88fcb9af4ba52c0757ac9c0d8cd5ec79951a22905ae886897e06954353d6a643
-SIZE (handbrake/x265_2.1-1.tar.gz) = 1036921
-SHA256 (handbrake/HandBrake-HandBrake-1.0.7_GH0.tar.gz) = 4f24f623d3078e3a5603a25ff718d75216d8eec7e25eb9a8cb267f28a0688fe7
-SIZE (handbrake/HandBrake-HandBrake-1.0.7_GH0.tar.gz) = 13167548
+TIMESTAMP = 1523151983
+SHA256 (handbrake/fdk-aac-0.1.5.tar.gz) = 2164592a67b467e5b20fdcdaf5bd4c50685199067391c6fcad4fa5521c9b4dd7
+SIZE (handbrake/fdk-aac-0.1.5.tar.gz) = 2091081
+SHA256 (handbrake/libav-12.3.tar.gz) = 115b659022dd387f662e26fbc5bc0cc14ec18daa100003ffd34f4da0479b272e
+SIZE (handbrake/libav-12.3.tar.gz) = 7582844
+SHA256 (handbrake/libbluray-1.0.2.tar.bz2) = 6d9e7c4e416f664c330d9fa5a05ad79a3fb39b95adfc3fd6910cbed503b7aeff
+SIZE (handbrake/libbluray-1.0.2.tar.bz2) = 733058
+SHA256 (handbrake/libdvdnav-5.0.3.tar.bz2) = 5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d
+SIZE (handbrake/libdvdnav-5.0.3.tar.bz2) = 372203
+SHA256 (handbrake/libdvdread-5.0.3.tar.bz2) = 321cdf2dbdc83c96572bc583cd27d8c660ddb540ff16672ecb28607d018ed82b
+SIZE (handbrake/libdvdread-5.0.3.tar.bz2) = 394885
+SHA256 (handbrake/libvpx-1.6.1.tar.bz2) = 1c2c0c2a97fba9474943be34ee39337dee756780fc12870ba1dc68372586a819
+SIZE (handbrake/libvpx-1.6.1.tar.bz2) = 1959534
+SHA256 (handbrake/x265_2.6.tar.gz) = 1bf0036415996af841884802161065b9e6be74f5f6808ac04831363e2549cdbf
+SIZE (handbrake/x265_2.6.tar.gz) = 1271976
+SHA256 (handbrake/HandBrake-HandBrake-1.1.0_GH0.tar.gz) = c51f25e8fa2e979295bed281b050186d36f48d9ed0fc3cb7e4f5497985d000b0
+SIZE (handbrake/HandBrake-HandBrake-1.1.0_GH0.tar.gz) = 15797528

Added: head/multimedia/handbrake/files/patch-contrib_libbluray_P01-freebsd-configure.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/handbrake/files/patch-contrib_libbluray_P01-freebsd-configure.patch	Wed Apr 18 21:32:33 2018	(r467738)
@@ -0,0 +1,16 @@
+--- contrib/libbluray/P01-freebsd-configure.patch.orig	2018-04-09 12:18:09 UTC
++++ contrib/libbluray/P01-freebsd-configure.patch
+@@ -0,0 +1,13 @@
++--- libbluray-1.0.2/configure.orig	2017-12-04 00:27:38.000000000 +0900
+++++ libbluray-1.0.2/configure
++@@ -14,6 +14,10 @@
++ ## M4sh Initialization. ##
++ ## -------------------- ##
++
+++if test `uname` = 'FreeBSD' ; then
+++  ln -s linux jni/freebsd
+++fi
+++
++ # Be more Bourne compatible
++ DUALCASE=1; export DUALCASE # for MKS sh
++ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :

Added: head/multimedia/handbrake/files/patch-contrib_x265__10bit_module.defs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/handbrake/files/patch-contrib_x265__10bit_module.defs	Wed Apr 18 21:32:33 2018	(r467738)
@@ -0,0 +1,13 @@
+--- contrib/x265_10bit/module.defs.orig	2017-12-24 00:33:48 UTC
++++ contrib/x265_10bit/module.defs
+@@ -19,6 +19,10 @@ X265_10.CONFIGURE.static      =
+ X265_10.CONFIGURE.shared      = -DENABLE_SHARED=OFF
+ X265_10.CONFIGURE.extra       = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=ON -DENABLE_LIBNUMA=OFF -DEXPORT_C_API=OFF
+ 
++ifneq (x86_64,$(BUILD.machine))
++    X265_10.CONFIGURE.extra       += -DENABLE_ASSEMBLY=0
++endif
++
+ ifneq (none,$(X265_10.GCC.g))
+     X265_10.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Debug
+ endif

Added: head/multimedia/handbrake/files/patch-contrib_x265__12bit_module.defs
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/handbrake/files/patch-contrib_x265__12bit_module.defs	Wed Apr 18 21:32:33 2018	(r467738)
@@ -0,0 +1,13 @@
+--- contrib/x265_12bit/module.defs.orig	2017-12-24 00:33:48 UTC
++++ contrib/x265_12bit/module.defs
+@@ -19,6 +19,10 @@ X265_12.CONFIGURE.static      =
+ X265_12.CONFIGURE.shared      = -DENABLE_SHARED=OFF
+ X265_12.CONFIGURE.extra       = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=ON -DENABLE_LIBNUMA=OFF -DEXPORT_C_API=OFF -DMAIN12=ON
+ 
++ifneq (x86_64,$(BUILD.machine))
++    X265_12.CONFIGURE.extra       += -DENABLE_ASSEMBLY=0
++endif
++
+ ifneq (none,$(X265_12.GCC.g))
+     X265_12.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Debug
+ endif

Modified: head/multimedia/handbrake/files/patch-libhb_module.defs
==============================================================================
--- head/multimedia/handbrake/files/patch-libhb_module.defs	Wed Apr 18 21:06:33 2018	(r467737)
+++ head/multimedia/handbrake/files/patch-libhb_module.defs	Wed Apr 18 21:32:33 2018	(r467738)
@@ -1,29 +1,11 @@
---- libhb/module.defs.orig	2017-02-25 20:56:19 UTC
+--- libhb/module.defs.orig	2018-01-13 05:30:25 UTC
 +++ libhb/module.defs
-@@ -47,7 +47,7 @@ LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB
- ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
- LIBHB.GCC.I += $(CONTRIB.build/)include/libxml2
- else
--LIBHB.GCC.I += /usr/include/libxml2
-+LIBHB.GCC.I += /usr/local/include/libxml2
- endif
+@@ -49,7 +49,7 @@ LIBHB.GCC.D += __LIBHB__ USE_PTHREAD
+ LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB.build/)include
  
- ifeq ($(BUILD.system),cygwin)
-@@ -58,6 +58,8 @@ else ifeq ($(BUILD.system),darwin)
-     LIBHB.m += $(wildcard $(LIBHB.src/)platform/macosx/*.m)
- else ifeq ($(BUILD.system),linux)
-     LIBHB.GCC.D += SYS_LINUX _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
-+else ifeq ($(BUILD.system),freebsd)
-+    LIBHB.GCC.D += SYS_FREEBSD _LARGEFILE_SOURCE _FILE_OFFSET_BITS=64
- else ifeq ($(BUILD.system),mingw)
-     LIBHB.GCC.D += SYS_MINGW
- ifneq ($(HAS.pthread),1)
-@@ -188,4 +190,8 @@ endif
- 
- ###############################################################################
- 
-+ifeq ($(HAS.pthread),1)
-+    LIBHB.GCC.l += pthread
-+endif
-+
- BUILD.out += $(LIBHB.out)
+ ifeq ($(BUILD.system),freebsd)
+-    LIBHB.GCC.I += /usr/local/include/libxml2
++    LIBHB.GCC.I += $(LOCALBASE)/include/libxml2
+ else ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
+     LIBHB.GCC.I += $(CONTRIB.build/)include/libxml2
+ else

Modified: head/multimedia/handbrake/files/patch-libhb_nlmeans.c
==============================================================================
--- head/multimedia/handbrake/files/patch-libhb_nlmeans.c	Wed Apr 18 21:06:33 2018	(r467737)
+++ head/multimedia/handbrake/files/patch-libhb_nlmeans.c	Wed Apr 18 21:32:33 2018	(r467738)
@@ -1,6 +1,6 @@
---- libhb/nlmeans.c.orig	2017-02-25 20:56:19 UTC
+--- libhb/nlmeans.c.orig	2017-10-05 21:17:34 UTC
 +++ libhb/nlmeans.c
-@@ -786,7 +786,7 @@ static int nlmeans_init(hb_filter_object
+@@ -787,7 +787,7 @@ static int nlmeans_init(hb_filter_object
      NLMeansFunctions *functions = &pv->functions;
  
      functions->build_integral = build_integral_scalar;

Modified: head/multimedia/handbrake/files/patch-libhb_nlmeans__x86.c
==============================================================================
--- head/multimedia/handbrake/files/patch-libhb_nlmeans__x86.c	Wed Apr 18 21:06:33 2018	(r467737)
+++ head/multimedia/handbrake/files/patch-libhb_nlmeans__x86.c	Wed Apr 18 21:32:33 2018	(r467738)
@@ -1,4 +1,4 @@
---- libhb/nlmeans_x86.c.orig	2017-02-25 20:56:19 UTC
+--- libhb/nlmeans_x86.c.orig	2017-10-05 21:17:34 UTC
 +++ libhb/nlmeans_x86.c
 @@ -10,7 +10,7 @@
  

Modified: head/multimedia/handbrake/files/patch-make_configure.py
==============================================================================
--- head/multimedia/handbrake/files/patch-make_configure.py	Wed Apr 18 21:06:33 2018	(r467737)
+++ head/multimedia/handbrake/files/patch-make_configure.py	Wed Apr 18 21:32:33 2018	(r467738)
@@ -1,72 +1,11 @@
---- make/configure.py.orig	2017-02-25 20:56:19 UTC
+--- make/configure.py.orig	2018-01-13 05:30:25 UTC
 +++ make/configure.py
-@@ -590,6 +590,9 @@ class ArchAction( Action ):
-             pass
-         elif host.match( '*-*-solaris*' ):
-             pass
-+        elif host.match( '*-*-freebsd.*' ):
-+            self.mode['i386']   = 'i386-portsbuild-freebsd%s' % (host.release)
-+            self.mode['amd64'] = 'amd64-portsbuild-freebsd%s' % (host.release)
-         else:
-             self.msg_pass = 'WARNING'
- 
-@@ -1294,13 +1297,13 @@ def createCLI():
-     h = IfHost( 'enable assembly code in non-contrib modules', 'NOMATCH*-*-darwin*', 'NOMATCH*-*-linux*', none=optparse.SUPPRESS_HELP ).value
-     grp.add_option( '--enable-asm', default=False, action='store_true', help=h )
- 
--    h = IfHost( 'disable GTK GUI', '*-*-linux*', none=optparse.SUPPRESS_HELP ).value
-+    h = IfHost( 'disable GTK GUI', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
-     grp.add_option( '--disable-gtk', default=False, action='store_true', help=h )
--    h = IfHost( 'disable GTK GUI update checks', '*-*-linux*', none=optparse.SUPPRESS_HELP ).value
-+    h = IfHost( 'disable GTK GUI update checks', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
-     grp.add_option( '--disable-gtk-update-checks', default=False, action='store_true', help=h )
-     h = IfHost( 'enable GTK GUI (mingw)', '*-*-mingw*', none=optparse.SUPPRESS_HELP ).value
-     grp.add_option( '--enable-gtk-mingw', default=False, action='store_true', help=h )
--    h = IfHost( 'disable gstreamer (live preview)', '*-*-linux*', none=optparse.SUPPRESS_HELP ).value
-+    h = IfHost( 'disable gstreamer (live preview)', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
-     grp.add_option( '--disable-gst', default=False, action='store_true', help=h )
-     h = IfHost( 'enable use of Intel Quick Sync Video hardware acceleration', '*-*-*', none=optparse.SUPPRESS_HELP ).value
-     grp.add_option( '--enable-qsv', default=False, action='store_true', help=h )
-@@ -1352,7 +1355,7 @@ def createCLI():
-     h = IfHost( 'Build and use local pkg-config', '*-*-darwin*', none=optparse.SUPPRESS_HELP ).value
-     grp.add_option( '--enable-local-pkgconfig', default=False, action='store_true', help=h )
- 
--    h = IfHost( 'Build extra contribs for flatpak packaging', '*-*-linux*', none=optparse.SUPPRESS_HELP ).value
-+    h = IfHost( 'Build extra contribs for flatpak packaging', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
-     grp.add_option( '--flatpak', default=False, action='store_true', help=h )
-     cli.add_option_group( grp )
- 
-@@ -1517,7 +1520,7 @@ try:
+@@ -1515,7 +1515,7 @@ try:
      class Tools:
          ar    = ToolProbe( 'AR.exe',    'ar' )
          cp    = ToolProbe( 'CP.exe',    'cp' )
 -        gcc   = ToolProbe( 'GCC.gcc',   'gcc', IfHost( 'gcc-4', '*-*-cygwin*' ))
-+        gcc   = ToolProbe( 'GCC.gcc',   'gcc', IfHost( os.environ['CC'], '*-*-freebsd*' ))
++        gcc   = ToolProbe( 'GCC.gcc',   'gcc', IfHost( os.environ['CC'], '*-*-freebsd*' ), IfHost( 'gcc-4', '*-*-cygwin*' ))
  
          if host.match( '*-*-darwin*' ):
              gmake = ToolProbe( 'GMAKE.exe', 'make', 'gmake' )
-@@ -1924,10 +1927,15 @@ int main()
-         doc.add( 'GCC.sysroot', '' )
-         doc.add( 'GCC.minver', '' )
- 
-+    if build.match( '*-*-freebsd*' ):
-+        doc.add( 'HAS.pthread', 1 )
-+
-     if build.match( 'i?86-*' ):
-         doc.add( 'LIBHB.GCC.D', 'ARCH_X86_32', append=True )
-     elif build.match( 'x86_64-*' ):
-         doc.add( 'LIBHB.GCC.D', 'ARCH_X86_64', append=True )
-+    elif build.match( 'amd64-*' ):
-+        doc.add( 'LIBHB.GCC.D', 'ARCH_X86_64', append=True )
- 
-     if options.enable_asm and ( not Tools.yasm.fail or options.enable_local_yasm ):
-         asm = ''
-@@ -1940,7 +1948,7 @@ int main()
-             else:
-                 doc.add( 'LIBHB.YASM.f', 'elf32' )
-             doc.add( 'LIBHB.YASM.m', 'x86' )
--        elif build.match( 'x86_64-*' ):
-+        elif build.match( 'x86_64-*' ) or build.match( 'amd64-*' ):
-             asm = 'x86'
-             doc.add( 'LIBHB.GCC.D', 'HAVE_MMX ARCH_X86_64', append=True )
-             if build.match( '*-*-darwin*' ):

Modified: head/multimedia/handbrake/files/patch-version.txt
==============================================================================
--- head/multimedia/handbrake/files/patch-version.txt	Wed Apr 18 21:06:33 2018	(r467737)
+++ head/multimedia/handbrake/files/patch-version.txt	Wed Apr 18 21:32:33 2018	(r467738)
@@ -2,11 +2,11 @@
 +++ version.txt
 @@ -0,0 +1,9 @@
 +URL=https://github.com/HandBrake/HandBrake.git
-+HASH=91ed34ff38d46f389e841c46fe27b7cbfed8467c
-+SHORTHASH=91ed34f
-+TAG=1.0.7
-+TAG_HASH=91ed34ff38d46f389e841c46fe27b7cbfed8467c
++HASH=b463d33a4ed4c9da5fb6432e7fb7e08422fc1aad
++SHORTHASH=b463d33
++TAG=1.1.0
++TAG_HASH=b463d33a4ed4c9da5fb6432e7fb7e08422fc1aad
 +REV=0
 +BRANCH=
 +REMOTE=https://github.com/HandBrake/HandBrake.git
-+DATE=2017-04-09 23:31:00 +0300
++DATE=2018-04-08 15:16:00 +0900



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804182132.w3ILWYbi022948>