Hi ports --
Attached is an update to HandBrake. Needs the new libbluray that I just
committed.
FYI, I hit a "make: Could not fork" error when running make package the
first time. A subsequent run was ok.
Sadly it's more than a bit of churn; I suspect that's always going to be
a reality when updating this port.
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 8 Aug 2019 11:00:21 -0000 1.3
+++ Makefile 10 Nov 2019 21:28:03 -0000
@@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2019/08/08 11:00:21 naddy Exp $
-V = 1.2.2
+V = 1.3.0
COMMENT = open source video transcoder
DISTNAME = HandBrake-${V}-source
PKGNAME = handbrake-${V}
-REVISION = 0
EXTRACT_SUFX = .tar.bz2
CATEGORIES = multimedia x11
@@ -15,7 +14,7 @@ MAINTAINER = Brian Callahan <bcallah@ope
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
-WANTLIB += Xfixes Xi Xinerama Xrandr Xrender ass atk-1.0 atk-bridge-2.0
+WANTLIB += Xfixes Xi Xinerama Xrandr Xrender aom ass atk-1.0 atk-bridge-2.0
WANTLIB += avcodec avfilter avformat avresample avutil bluray
WANTLIB += bz2 c cairo cairo-gobject crypto dav1d dvdnav dvdread
WANTLIB += epoxy expat ffi fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0
@@ -24,9 +23,9 @@ WANTLIB += gsm gstaudio-1.0 gstbase-1.0
WANTLIB += gsttag-1.0 gstvideo-1.0 gthread-2.0 gtk-3 harfbuzz
WANTLIB += iconv intl jansson lzma m mp3lame ogg opus orc-0.4
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
-WANTLIB += png postproc samplerate speex ssl swresample swscale
-WANTLIB += theoradec theoraenc vorbis vorbisenc vpx x264 x265
-WANTLIB += xcb xcb-render xcb-shm xml2 xvidcore z
+WANTLIB += png postproc speex ssl swresample swscale theoradec
+WANTLIB += theoraenc vorbis vorbisenc vpx x264 x265 xcb xcb-render
+WANTLIB += xcb-shm xml2 xvidcore z
MASTER_SITES = https://download.handbrake.fr/releases/${V}/
@@ -44,6 +43,7 @@ BUILD_DEPENDS = devel/autoconf/${AUTOCON
LIB_DEPENDS = devel/jansson \
devel/orc \
graphics/ffmpeg \
+ multimedia/aom \
multimedia/libbluray \
multimedia/gstreamer1/plugins-base \
multimedia/libdvdnav \
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 5 Aug 2019 13:35:20 -0000 1.1.1.1
+++ distinfo 10 Nov 2019 21:28:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (HandBrake-1.2.2-source.tar.bz2) = 32gW9RfWCuimYmqnMYIa8tGWbBVfpTsrmgbEfzxWXkw=
-SIZE (HandBrake-1.2.2-source.tar.bz2) = 18010777
+SHA256 (HandBrake-1.3.0-source.tar.bz2) = qagutcoEp5NwWz19Ec76KZRmlO6xO0AWFEaqyjWzHZY=
+SIZE (HandBrake-1.3.0-source.tar.bz2) = 16801695
Index: patches/patch-gtk_configure_ac
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/patches/patch-gtk_configure_ac,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-gtk_configure_ac
--- patches/patch-gtk_configure_ac 5 Aug 2019 13:35:20 -0000 1.1.1.1
+++ patches/patch-gtk_configure_ac 10 Nov 2019 21:28:03 -0000
@@ -6,16 +6,16 @@ No -ldl on OpenBSD.
Index: gtk/configure.ac
--- gtk/configure.ac.orig
+++ gtk/configure.ac
-@@ -179,7 +179,7 @@ PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES])
+@@ -199,7 +199,7 @@ PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES])
GHB_CFLAGS="$HBINC $GHB_CFLAGS"
--HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
-+HB_LIBS="-L../../libhb -lhandbrake -lavformat -lavfilter -lavcodec -lavutil -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
+-HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
++HB_LIBS="-L../../libhb -lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
- case $host in
- *-*-mingw*)
-@@ -194,6 +194,9 @@ case $host in
+ if test "x$use_fdk_aac" = "xyes" ; then
+ HB_LIBS="$HB_LIBS -lfdk-aac"
+@@ -226,6 +226,9 @@ case $host in
HB_LIBS="$HB_LIBS -lbcrypt -lregex -luuid"
;;
*-*-freebsd*)
@@ -24,4 +24,4 @@ Index: gtk/configure.ac
+ *-*-openbsd*)
HB_LIBS="$HB_LIBS -lpthread"
;;
- *)
+ *-*-netbsd*)
Index: patches/patch-gtk_src_callbacks_c
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/patches/patch-gtk_src_callbacks_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-gtk_src_callbacks_c
--- patches/patch-gtk_src_callbacks_c 5 Aug 2019 13:35:20 -0000 1.1.1.1
+++ patches/patch-gtk_src_callbacks_c 10 Nov 2019 21:28:03 -0000
@@ -5,7 +5,7 @@ We need this include too.
Index: gtk/src/callbacks.c
--- gtk/src/callbacks.c.orig
+++ gtk/src/callbacks.c
-@@ -44,7 +44,7 @@
+@@ -43,7 +43,7 @@
#include <gudev/gudev.h>
#endif
Index: patches/patch-libhb_decsrtsub_c
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/patches/patch-libhb_decsrtsub_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-libhb_decsrtsub_c
--- patches/patch-libhb_decsrtsub_c 5 Aug 2019 13:35:20 -0000 1.1.1.1
+++ patches/patch-libhb_decsrtsub_c 10 Nov 2019 21:28:03 -0000
@@ -14,7 +14,7 @@ Index: libhb/decsrtsub.c
if (q != pv->utf8_buf + pv->utf8_end)
{
conversion = 1;
-@@ -661,7 +661,7 @@ static int decsrtInit( hb_work_object_t * w, hb_job_t
+@@ -672,7 +672,7 @@ static int decsrtInit( hb_work_object_t * w, hb_job_t
pv->start_time = AV_NOPTS_VALUE;
}
@@ -23,7 +23,7 @@ Index: libhb/decsrtsub.c
if( pv->iconv_context == (iconv_t) -1 )
{
hb_error("Could not open the iconv library with those file formats\n");
-@@ -692,7 +692,7 @@ fail:
+@@ -703,7 +703,7 @@ fail:
{
if (pv->iconv_context != (iconv_t) -1)
{
@@ -32,7 +32,7 @@ Index: libhb/decsrtsub.c
}
if (pv->file != NULL)
{
-@@ -743,7 +743,7 @@ static void decsrtClose( hb_work_object_t * w )
+@@ -754,7 +754,7 @@ static void decsrtClose( hb_work_object_t * w )
if (pv != NULL)
{
fclose( pv->file );
Index: patches/patch-libhb_fifo_c
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/patches/patch-libhb_fifo_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-libhb_fifo_c
--- patches/patch-libhb_fifo_c 5 Aug 2019 13:35:20 -0000 1.1.1.1
+++ patches/patch-libhb_fifo_c 10 Nov 2019 21:28:03 -0000
@@ -5,7 +5,7 @@ Add OpenBSD where appropriate.
Index: libhb/fifo.c
--- libhb/fifo.c.orig
+++ libhb/fifo.c
-@@ -13,7 +13,7 @@
+@@ -15,7 +15,7 @@
#endif
#ifndef SYS_DARWIN
@@ -14,30 +14,3 @@ Index: libhb/fifo.c
#include <stdlib.h>
#else
#include <malloc.h>
-@@ -395,7 +395,7 @@ hb_buffer_t * hb_buffer_init_internal( int size )
-
- if (size)
- {
--#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) || defined ( __FreeBSD__ ) || defined( SYS_MINGW )
-+#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) || defined ( __FreeBSD__ ) || defined( SYS_MINGW ) || defined ( __OpenBSD__ )
- b->data = malloc( b->alloc );
- #elif defined( SYS_CYGWIN )
- /* FIXME */
-@@ -821,7 +821,7 @@ hb_image_t * hb_image_init(int pix_fmt, int width, int
- {
- return NULL;
- }
--#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) || defined ( __FreeBSD__ ) || defined( SYS_MINGW )
-+#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) || defined ( __FreeBSD__ ) || defined( SYS_MINGW ) || defined ( __OpenBSD__ )
- image->data = malloc(size);
- #elif defined( SYS_CYGWIN )
- /* FIXME */
-@@ -862,7 +862,7 @@ hb_image_t * hb_buffer_to_image(hb_buffer_t *buf)
- {
- hb_image_t *image = calloc(1, sizeof(hb_image_t));
-
--#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) || defined ( __FreeBSD__ ) || defined( SYS_MINGW )
-+#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) || defined ( __FreeBSD__ ) || defined( SYS_MINGW ) || defined ( __OpenBSD__ )
- image->data = malloc( buf->size );
- #elif defined( SYS_CYGWIN )
- /* FIXME */
Index: patches/patch-make_configure_py
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/patches/patch-make_configure_py,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-make_configure_py
--- patches/patch-make_configure_py 5 Aug 2019 13:35:20 -0000 1.1.1.1
+++ patches/patch-make_configure_py 10 Nov 2019 21:28:03 -0000
@@ -6,69 +6,87 @@ Do not look for CMake; we don't need it.
Index: make/configure.py
--- make/configure.py.orig
+++ make/configure.py
-@@ -591,6 +591,8 @@ class ArchAction( Action ):
- elif host.match( '*-*-freebsd.*' ):
- self.mode['i386'] = 'i386-portsbuild-freebsd%s' % (host.release)
- self.mode['amd64'] = 'amd64-portsbuild-freebsd%s' % (host.release)
-+ elif host.match( '*-*-openbsd*' ):
+@@ -682,6 +682,8 @@ class ArchAction( Action ):
+ elif host_tuple.match( '*-*-freebsd*' ):
+ self.mode['i386'] = 'i386-portsbuild-freebsd%s' % (host_tuple.release)
+ self.mode['amd64'] = 'amd64-portsbuild-freebsd%s' % (host_tuple.release)
++ elif host_tuple.match( '*-*-openbsd*' ):
+ pass
else:
self.msg_pass = 'WARNING'
-@@ -1294,17 +1296,17 @@ 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 )
+@@ -1338,7 +1340,7 @@ def createCLI( cross = None ):
+ ## add build options
+ grp = cli.add_argument_group( 'Build Options' )
+ grp.add_argument( '--snapshot', default=False, action='store_true', help='Force a snapshot build' )
+- h = IfHost( 'Build extra contribs for flatpak packaging', '*-*-linux*', '*-*-freebsd*', none=argparse.SUPPRESS ).value
++ h = IfHost( 'Build extra contribs for flatpak packaging', '*-*-linux*', '*-*-freebsd*', '*-*-openbsd*', none=argparse.SUPPRESS ).value
+ grp.add_argument( '--flatpak', default=False, action='store_true', help=h )
+ cli.add_argument_group( grp )
+
+@@ -1378,10 +1380,10 @@ def createCLI( cross = None ):
+ h = IfHost( 'enable assembly code in non-contrib modules', 'NOMATCH*-*-darwin*', 'NOMATCH*-*-linux*', none=argparse.SUPPRESS ).value
+ grp.add_argument( '--enable-asm', default=False, action='store_true', help=h )
+
+- h = IfHost( 'disable GTK GUI', '*-*-linux*', '*-*-freebsd*', none=argparse.SUPPRESS ).value
++ h = IfHost( 'disable GTK GUI', '*-*-linux*', '*-*-freebsd*', '*-*-openbsd*', none=argparse.SUPPRESS ).value
+ grp.add_argument( '--disable-gtk', default=False, action='store_true', help=h )
+
+- h = IfHost( 'disable GTK GUI update checks', '*-*-linux*', '*-*-freebsd*', none=argparse.SUPPRESS ).value
++ h = IfHost( 'disable GTK GUI update checks', '*-*-linux*', '*-*-freebsd*', '*-*-openbsd*', none=argparse.SUPPRESS ).value
+ grp.add_argument( '--disable-gtk-update-checks', default=False, action='store_true', help=h )
+
+ h = 'enable GTK GUI for Windows' if (cross is not None and 'mingw' in cross) else argparse.SUPPRESS
+@@ -1390,7 +1392,7 @@ def createCLI( cross = None ):
+ h = IfHost( 'Build GUI with GTK4', '*-*-linux*', '*-*-freebsd*', none=argparse.SUPPRESS ).value
+ grp.add_argument( '--enable-gtk4', default=False, action='store_true', help=h )
+
+- h = IfHost( 'disable GStreamer (live preview)', '*-*-linux*', '*-*-freebsd*', none=argparse.SUPPRESS ).value
++ h = IfHost( 'disable GStreamer (live preview)', '*-*-linux*', '*-*-freebsd*', '*-*-openbsd*', none=argparse.SUPPRESS ).value
+ grp.add_argument( '--disable-gst', default=False, action='store_true', help=h )
+
+ h = IfHost( 'x265 video encoder', '*-*-*', none=argparse.SUPPRESS ).value
+@@ -1581,13 +1583,10 @@ try:
+ class Tools:
+ ar = ToolProbe( 'AR.exe', '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 )
+- tar = ToolProbe( 'TAR.exe', 'tar', 'gtar', 'tar', abort=True )
+ python = ToolProbe( 'PYTHON.exe', 'python', os.path.basename(sys.executable), abort=True )
-- h = IfHost( 'disable GTK GUI', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
-+ h = IfHost( 'disable GTK GUI', '*-*-linux*', '*-*-freebsd*', '*-*-openbsd*', 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*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
-+ h = IfHost( 'disable GTK GUI update checks', '*-*-linux*', '*-*-freebsd*', '*-*-openbsd*', 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*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
-+ h = IfHost( 'disable GStreamer (live preview)', '*-*-linux*', '*-*-freebsd*', '*-*-openbsd*', none=optparse.SUPPRESS_HELP ).value
-
- grp.add_option( '--disable-gst', default=False, action='store_true', help=h )
-
-@@ -1327,7 +1329,7 @@ def createCLI():
- grp.add_option( '--disable-ffmpeg-aac', dest="enable_ffmpeg_aac", action='store_false' )
-
- h = IfHost( 'enable Nvidia NVEnc video encoder', '*-*-*', none=optparse.SUPPRESS_HELP ).value
-- grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not (host.match( '*-*-darwin*' ) or host.match( '*-*-freebsd*' )), action='store_true', help=h )
-+ grp.add_option( '--enable-nvenc', dest="enable_nvenc", default=not (host.match( '*-*-darwin*' ) or host.match( '*-*-freebsd*' ) or host.match( '*-*-openbsd*') ), action='store_true', help=h )
-
-
- cli.add_option_group( grp )
-@@ -1385,7 +1387,7 @@ def createCLI():
- grp.add_option( '--snapshot', default=False, action='store_true',
- help='Force a snapshot build' )
-
-- h = IfHost( 'Build extra contribs for flatpak packaging', '*-*-linux*', '*-*-freebsd*', none=optparse.SUPPRESS_HELP ).value
-+ h = IfHost( 'Build extra contribs for flatpak packaging', '*-*-linux*', '*-*-freebsd*', '*-*-openbsd*', none=optparse.SUPPRESS_HELP ).value
- grp.add_option( '--flatpak', default=False, action='store_true', help=h )
- cli.add_option_group( grp )
-
-@@ -1531,17 +1533,12 @@ try:
+ gcc_tools = ['GCC.gcc',
+@@ -1602,16 +1601,10 @@ try:
else:
- gmake = ToolProbe( 'GMAKE.exe', 'gmake', 'make', abort=True )
+ gmake = ToolProbe( 'GMAKE.exe', 'make', 'gmake', 'make', abort=True )
-- m4 = ToolProbe( 'M4.exe', 'gm4', 'm4', abort=True )
- mkdir = ToolProbe( 'MKDIR.exe', 'mkdir', abort=True )
-- patch = ToolProbe( 'PATCH.exe', 'gpatch', 'patch', abort=True )
- rm = ToolProbe( 'RM.exe', 'rm', abort=True )
- ranlib = ToolProbe( 'RANLIB.exe', 'ranlib', abort=True )
- strip = ToolProbe( 'STRIP.exe', 'strip', abort=True )
-- tar = ToolProbe( 'TAR.exe', 'gtar', 'tar', abort=True )
-- nasm = ToolProbe( 'NASM.exe', 'nasm', abort=False, minversion=[2,13,0] )
- autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', abort=True )
- automake = ToolProbe( 'AUTOMAKE.exe', 'automake', abort=True )
-- cmake = ToolProbe( 'CMAKE.exe', 'cmake', abort=True )
- libtool = ToolProbe( 'LIBTOOL.exe', 'libtool', abort=True )
- pkgconfig = ToolProbe( 'PKGCONFIG.exe', 'pkg-config', abort=True )
+- autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', 'autoconf', abort=True, minversion=[2,69,0] )
+- automake = ToolProbe( 'AUTOMAKE.exe', 'automake', 'automake', abort=True, minversion=[1,15,0] )
+ libtool = ToolProbe( 'LIBTOOL.exe', 'libtool', 'libtool', abort=True )
+ lipo = ToolProbe( 'LIPO.exe', 'lipo', 'lipo', abort=False )
+ pkgconfig = ToolProbe( 'PKGCONFIG.exe', 'pkgconfig', 'pkg-config', abort=True, minversion=[0,29,0] )
+
+- meson = ToolProbe( 'MESON.exe', 'meson', 'meson', abort=True, minversion=[0,47,0] )
+- nasm = ToolProbe( 'NASM.exe', 'asm', 'nasm', abort=True, minversion=[2,13,0] )
+- ninja = ToolProbe( 'NINJA.exe', 'ninja', 'ninja-build', 'ninja', abort=True )
+-
+ xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild', 'xcodebuild', abort=(True if (build_tuple.match('*-*-darwin*') and cross is None) else False), versionopt='-version', minversion=[10,3,0] )
+
+ ## run tool probes
+@@ -1696,12 +1689,6 @@ try:
+ if options.flatpak or host_tuple.match('*-*-darwin*', '*-*-mingw'):
+ # Requires Jansson which requires CMake 3.1.0 or later
+ Tools.cmake = ToolProbe('CMAKE.exe', 'cmake', 'cmake', abort=True, minversion=[3,1,0])
+- else:
+- Tools.cmake = ToolProbe('CMAKE.exe', 'cmake', 'cmake', abort=True, minversion=[2,8,12])
+- Tools.cmake.__init__( Tools.cmake.var, Tools.cmake.option, Tools.cmake.name, **Tools.cmake.kwargs )
+- Tools.cmake.run()
+- for action in Action.actions:
+- action.run()
+ #########################################
+ ## MinGW specific library and tool checks
Index: patches/patch-make_include_gcc_defs
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/patches/patch-make_include_gcc_defs,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-make_include_gcc_defs
--- patches/patch-make_include_gcc_defs 5 Aug 2019 13:35:20 -0000 1.1.1.1
+++ patches/patch-make_include_gcc_defs 10 Nov 2019 21:28:03 -0000
@@ -13,9 +13,9 @@ Index: make/include/gcc.defs
-GCC.args.O.none = -O0
-GCC.args.O.size = -Os
-GCC.args.O.speed = -O3
-+GCC.args.O.none =
-+GCC.args.O.size =
-+GCC.args.O.speed =
++GCC.args.O.none =
++GCC.args.O.size =
++GCC.args.O.speed =
GCC.args.D = -D$(1)
-GCC.args.I = -I$(1)
+GCC.args.I = -I$(1) -I$(LOCALBASE)/include -I$(X11BASE)/include -I$(LOCALBASE)/include/libavcodec
Index: patches/patch-make_include_main_defs
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/patches/patch-make_include_main_defs,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-make_include_main_defs
--- patches/patch-make_include_main_defs 5 Aug 2019 13:35:20 -0000 1.1.1.1
+++ patches/patch-make_include_main_defs 10 Nov 2019 21:28:03 -0000
@@ -6,17 +6,17 @@ We'll let the ports tree handle it.
Index: make/include/main.defs
--- make/include/main.defs.orig
+++ make/include/main.defs
-@@ -7,97 +7,6 @@ include $(SRC/)make/include/tool.defs
+@@ -7,87 +7,6 @@ include $(SRC/)make/include/tool.defs
###############################################################################
--ifneq (,$(filter $(BUILD.system),cygwin mingw))
+-ifneq (,$(filter $(HOST.system),cygwin mingw))
-ifneq ($(HAS.bz2),1)
- MODULES += contrib/bzip2
-endif
-endif
-
--ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
+-ifneq (,$(filter $(HOST.system),darwin cygwin mingw))
- MODULES += contrib/freetype
- MODULES += contrib/fribidi
- MODULES += contrib/harfbuzz
@@ -27,15 +27,13 @@ Index: make/include/main.defs
- MODULES += contrib/libopus
- MODULES += contrib/libspeex
- MODULES += contrib/libtheora
-- MODULES += contrib/libsamplerate
- MODULES += contrib/lame
- MODULES += contrib/x264
- MODULES += contrib/jansson
+- MODULES += contrib/libvpx
-endif
-
-ifeq (1,$(FEATURE.flatpak))
-- MODULES += contrib/libopus
-- MODULES += contrib/lame
- MODULES += contrib/jansson
- MODULES += contrib/x264
-endif
@@ -51,20 +49,12 @@ Index: make/include/main.defs
- MODULES += contrib/x265_12bit
-endif
-
+-MODULES += contrib/libdav1d
-MODULES += contrib/ffmpeg
--MODULES += contrib/libvpx
-MODULES += contrib/libdvdread
-MODULES += contrib/libdvdnav
-MODULES += contrib/libbluray
-
--ifneq (,$(filter $(BUILD.system),mingw))
--ifneq ($(HAS.pthread),1)
--ifneq ($(HAS.pthreadGC2),1)
-- MODULES += contrib/pthreadw32
--endif
--endif
--endif
--
-ifeq (1,$(FEATURE.qsv))
- MODULES += contrib/libmfx
-endif
@@ -77,11 +67,11 @@ Index: make/include/main.defs
- MODULES += contrib/nvenc
-endif
-
--ifneq (,$(filter $(BUILD.system),darwin))
+-ifneq (,$(filter $(HOST.system),darwin))
- MODULES += contrib/xz
-endif
-
--ifneq (,$(filter $(BUILD.system),cygwin mingw))
+-ifneq (,$(filter $(HOST.system),cygwin mingw))
-ifneq ($(HAS.iconv),1)
- MODULES += contrib/libiconv
-endif
@@ -96,7 +86,7 @@ Index: make/include/main.defs
-endif
-endif
-
--ifneq (,$(filter $(BUILD.system),solaris))
+-ifneq (,$(filter $(HOST.system),solaris))
- MODULES += contrib/libiconv
-endif
-
@@ -104,10 +94,10 @@ Index: make/include/main.defs
## these must come after contrib since some contrib modules are optional
MODULES += libhb
-@@ -127,6 +36,11 @@ endif
+@@ -122,6 +41,11 @@ endif
- ifeq (1-kfreebsd,$(FEATURE.gtk)-$(BUILD.system))
- ## build gtk when gtk+kfreebsd
+ ifeq (1-gnu,$(FEATURE.gtk)-$(HOST.system))
+ ## build gtk when gtk+gnu
+ MODULES += gtk
+endif
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 5 Aug 2019 13:35:20 -0000 1.1.1.1
+++ pkg/PLIST 10 Nov 2019 21:28:03 -0000
@@ -5,25 +5,31 @@ bin/HandBrake
share/applications/fr.handbrake.ghb.desktop
share/icons/hicolor/scalable/apps/fr.handbrake.ghb.svg
share/icons/hicolor/scalable/apps/hb-icon.svg
+share/locale/af/LC_MESSAGES/ghb.mo
share/locale/cs/LC_MESSAGES/ghb.mo
share/locale/da/LC_MESSAGES/ghb.mo
share/locale/de/LC_MESSAGES/ghb.mo
share/locale/es/LC_MESSAGES/ghb.mo
+share/locale/eu/LC_MESSAGES/ghb.mo
share/locale/fr/LC_MESSAGES/ghb.mo
-share/locale/it_IT/
-share/locale/it_IT/LC_MESSAGES/
-share/locale/it_IT/LC_MESSAGES/ghb.mo
-share/locale/ja_JP/
-share/locale/ja_JP/LC_MESSAGES/
-share/locale/ja_JP/LC_MESSAGES/ghb.mo
+share/locale/hr/LC_MESSAGES/ghb.mo
+share/locale/it/LC_MESSAGES/ghb.mo
+share/locale/ja/LC_MESSAGES/ghb.mo
share/locale/ko/LC_MESSAGES/ghb.mo
+share/locale/nl/LC_MESSAGES/ghb.mo
share/locale/no/LC_MESSAGES/ghb.mo
+share/locale/pl/LC_MESSAGES/ghb.mo
+share/locale/pt/LC_MESSAGES/ghb.mo
share/locale/pt_BR/LC_MESSAGES/ghb.mo
-share/locale/ro_RO/
-share/locale/ro_RO/LC_MESSAGES/
-share/locale/ro_RO/LC_MESSAGES/ghb.mo
+share/locale/ro/LC_MESSAGES/ghb.mo
share/locale/ru/LC_MESSAGES/ghb.mo
+share/locale/sk/LC_MESSAGES/ghb.mo
+share/locale/sv/LC_MESSAGES/ghb.mo
share/locale/th/LC_MESSAGES/ghb.mo
+share/locale/tr/LC_MESSAGES/ghb.mo
+share/locale/uk_UA/
+share/locale/uk_UA/LC_MESSAGES/
+share/locale/uk_UA/LC_MESSAGES/ghb.mo
share/locale/zh_CN/LC_MESSAGES/ghb.mo
share/metainfo/
share/metainfo/fr.handbrake.ghb.appdata.xml
