Hello --
On 9/4/2022 5:05 AM, Brad Smith wrote:
> On 9/3/2022 9:44 PM, Brian Callahan wrote:
>> Hi again Ruben --
>>
>> On 9/3/2022 5:00 PM, Brian Callahan wrote:
>>> Hi Ruben --
>>>
>>> On 9/3/2022 3:16 PM, Rubén Llorente wrote:
>>>> Hello!
>>>>
>>>> The HandBrake version actually in ports seems to suffer from audio
>>>> encoding issues, so I have taken the liberty to play around a bit and
>>>> update the port. I have encoded some test videos with it and so far it
>>>> looks like it is working. A copy of this email is being sent to the
>>>> official port maintainer.
>>>>
>>>> I am attaching a patch for the port. Since changes are so huge, I am
>>>> attaching a whole copy of the port too for convenience.
>>>>
>>>> The patch for test/module.defs is a bit dirty so I take suggestions
>>>> as to how to do it in a more portable way.
>>>>
>>>> Cheers!
>>>>
>>> I thought I had an update for HandBrake but seems like I don't.
>>> I will review this tonight and get back to you.
>>>
>>> ~Brian
>>>
>> I've tested your patch. It looks like it's working here too.
>> As to the test/module.defs patch, the best solution is to port zimg. I
>> have done that and I will send the new port in a follow up email to
>> ports@. After zimg is imported, I can commit your HandBrake update,
>> slightly modified to include zimg support.
>>
>> ~Brian
>
>
> patch-libhb_decsrtsub_c can be removed.
>
> patch-make_variant_freebsd_defs fixed what the former is working around.
>
Now that zimg is in, here is the diff for HandBrake. It includes Brad's
suggestion.
One quick question for you Ruben: in patch-make_configure_py it looks
like configure will only work for amd64 and i386. Are there other archs
(like maybe arm64) where HandBrake ought to work? If not, we should
probably set ONLY_FOR_ARCHS = amd64 i386.
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 27 Jul 2022 15:14:10 -0000 1.14
+++ Makefile 8 Sep 2022 11:55:28 -0000
@@ -1,8 +1,7 @@
-V = 1.3.3
+V = 1.5.1
COMMENT = open source video transcoder
DISTNAME = HandBrake-${V}-source
PKGNAME = handbrake-${V}
-REVISION = 2
EXTRACT_SUFX = .tar.bz2
CATEGORIES = multimedia x11
@@ -12,20 +11,20 @@ MAINTAINER = Brian Callahan <bcallah@ope
# GPLv2 only
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
-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
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
-WANTLIB += gsm gstaudio-1.0 gstbase-1.0 gstpbutils-1.0 gstreamer-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 speex ssl swresample swscale theoradec
-WANTLIB += theoraenc vorbis vorbisenc vpx x264 x265 xcb xcb-render
-WANTLIB += xcb-shm xml2 xvidcore z
-WANTLIB += Xau Xdmcp execinfo jpeg udfread vidstab
+WANTLIB += ${COMPILER_LIBCXX} X11 Xau Xcomposite Xcursor Xdamage
+WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender aom ass
+WANTLIB += atk-1.0 atk-bridge-2.0 avcodec avfilter avformat avresample
+WANTLIB += avutil bluray bz2 c cairo cairo-gobject crypto dav1d
+WANTLIB += dvdnav dvdread epoxy execinfo expat ffi fontconfig
+WANTLIB += freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gsm gstaudio-1.0
+WANTLIB += gstbase-1.0 gstpbutils-1.0 gstreamer-1.0 gsttag-1.0
+WANTLIB += gstvideo-1.0 gthread-2.0 gtk-3 harfbuzz iconv intl
+WANTLIB += jansson jpeg lzma m mp3lame ogg opus orc-0.4 pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png postproc
+WANTLIB += speex ssl swresample swscale theoradec theoraenc turbojpeg
+WANTLIB += udfread vidstab vorbis vorbisenc vpx x264 x265 xcb
+WANTLIB += xcb-render xcb-shm xml2 xvidcore z zimg
MASTER_SITES = https://github.com/HandBrake/HandBrake/releases/download/${V}/
@@ -43,6 +42,8 @@ BUILD_DEPENDS = devel/autoconf/${AUTOCON
LIB_DEPENDS = devel/jansson \
devel/orc \
graphics/ffmpeg \
+ graphics/jpeg \
+ graphics/zimg \
multimedia/aom \
multimedia/libbluray \
multimedia/gstreamer1/plugins-base \
@@ -70,8 +71,10 @@ MAKE_ENV = AUTOCONF_VERSION="${AUTOCONF_
AUTOMAKE_VERSION="${AUTOMAKE_VERSION}" \
MKDIR_P='/bin/mkdir -p'
MAKE_FILE = GNUmakefile
-MAKE_FLAGS = CFLAGS="${CFLAGS} -I${LOCALBASE}/include/libxml2
-D_NO_UPDATE_CHECK" \
- LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib -lx265
-liconv"
+MAKE_FLAGS = CFLAGS="${CFLAGS} -I${LOCALBASE}/include/libxml2 \
+ -D_NO_UPDATE_CHECK" \
+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib \
+ -L${X11BASE}/lib -lx265 -liconv"
.if ${MACHINE_ARCH:Mi386}
CFLAGS += -msse2
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 20 Jun 2020 21:12:38 -0000 1.5
+++ distinfo 8 Sep 2022 11:55:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (HandBrake-1.3.3-source.tar.bz2) =
IYo32V9ItefPKFNj06sWwxTZdienpxDKs3WJAq6Hf4U=
-SIZE (HandBrake-1.3.3-source.tar.bz2) = 16804119
+SHA256 (HandBrake-1.5.1-source.tar.bz2) =
OZn+BtUwnIGXmac6loqOw4QOeEDCtkr49c23/YyUMPA=
+SIZE (HandBrake-1.5.1-source.tar.bz2) = 16137974
Index: patches/patch-gtk_configure_ac
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/patches/patch-gtk_configure_ac,v
retrieving revision 1.5
diff -u -p -r1.5 patch-gtk_configure_ac
--- patches/patch-gtk_configure_ac 11 Mar 2022 19:39:19 -0000 1.5
+++ patches/patch-gtk_configure_ac 8 Sep 2022 11:55:28 -0000
@@ -4,22 +4,22 @@ No -ldl on OpenBSD.
Index: gtk/configure.ac
--- gtk/configure.ac.orig
+++ gtk/configure.ac
-@@ -199,7 +199,7 @@ AM_CONDITIONAL([GHB_GTK_3_16], [test "$HAVE_GTK_316" -
+@@ -203,7 +203,7 @@ AM_CONDITIONAL([GHB_GTK_3_16], [test "$HAVE_GTK_316" -
AM_CONDITIONAL([MINGW], [test "x$mingw_flag" = "xyes"])
--HB_LIBS="$HB_LIBS -lhandbrake -lavformat -lavfilter -lavcodec -lavutil
-ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis
-lvorbisenc -logg -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray
-lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
-+HB_LIBS="-L../../libhb $HB_LIBS -lhandbrake -lavformat -lavfilter -lavcodec
-lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis
-lvorbisenc -logg -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray
-lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
+-HB_LIBS="$HB_LIBS -lhandbrake -lavformat -lavfilter -lavcodec -lavutil
-ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis
-lvorbisenc -logg -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray
-lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -lturbojpeg
-llzma -lzimg"
++HB_LIBS="-L../../libhb $HB_LIBS -lhandbrake -lavformat -lavfilter -lavcodec
-lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis
-lvorbisenc -logg -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray
-lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma
-lturbojpeg -lzimg"
HB_CPPFLAGS="$HB_CPPFLAGS $HBINC"
PKG_CHECK_MODULES([x264], [x264], sys_x264=yes, sys_x264=no)
-@@ -236,6 +236,9 @@ case $host in
- HB_LIBS="$HB_LIBS -lbcrypt -lregex -luuid -lole32"
- ;;
- *-*-freebsd*)
-+ HB_LIBS="$HB_LIBS -lpthread"
-+ ;;
-+ *-*-openbsd*)
- HB_LIBS="$HB_LIBS -lpthread"
- ;;
- *-*-netbsd*)
+@@ -245,6 +245,9 @@ case $host in
+ if test "x$use_qsv" = "xyes" ; then
+ HB_LIBS="$HB_LIBS -lva -lva-drm"
+ fi
++ ;;
++ *-*-openbsd*)
++ HB_LIBS="$HB_LIBS -lpthread"
+ ;;
+ *-*-netbsd*)
+ HB_LIBS="$HB_LIBS -pthread"
Index: patches/patch-gtk_src_callbacks_c
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/patches/patch-gtk_src_callbacks_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-gtk_src_callbacks_c
--- patches/patch-gtk_src_callbacks_c 11 Mar 2022 19:39:19 -0000 1.3
+++ patches/patch-gtk_src_callbacks_c 8 Sep 2022 11:55:28 -0000
@@ -8,7 +8,7 @@ Index: gtk/src/callbacks.c
#endif
-#if defined( __FreeBSD__ )
-+#if defined( __FreeBSD__ ) || defined( __OpenBSD__ )
++#if defined( __FreeBSD__ ) || defined ( __OpenBSD__ )
#include <sys/socket.h>
#endif
#include <netinet/in.h>
Index: patches/patch-libhb_decsrtsub_c
===================================================================
RCS file: patches/patch-libhb_decsrtsub_c
diff -N patches/patch-libhb_decsrtsub_c
--- patches/patch-libhb_decsrtsub_c 11 Mar 2022 19:39:19 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-iconv* => libiconv* for use with our libiconv
-
-Index: libhb/decsrtsub.c
---- libhb/decsrtsub.c.orig
-+++ libhb/decsrtsub.c
-@@ -271,7 +271,7 @@ static int utf8_fill( hb_work_private_t * pv )
- q = pv->utf8_buf + pv->utf8_end;
- in_size = pv->end - pv->pos;
-
-- retval = iconv( pv->iconv_context, &p, &in_size, &q, &out_size);
-+ retval = libiconv( pv->iconv_context, &p, &in_size, &q, &out_size);
- if (q != pv->utf8_buf + pv->utf8_end)
- {
- conversion = 1;
-@@ -672,7 +672,7 @@ static int decsrtInit( hb_work_object_t * w, hb_job_t
- pv->start_time = AV_NOPTS_VALUE;
- }
-
-- pv->iconv_context = iconv_open( "utf-8", pv->subtitle->config.src_codeset
);
-+ pv->iconv_context = libiconv_open( "utf-8",
pv->subtitle->config.src_codeset );
- if( pv->iconv_context == (iconv_t) -1 )
- {
- hb_error("Could not open the iconv library with those file
formats\n");
-@@ -703,7 +703,7 @@ fail:
- {
- if (pv->iconv_context != (iconv_t) -1)
- {
-- iconv_close(pv->iconv_context);
-+ libiconv_close(pv->iconv_context);
- }
- if (pv->file != NULL)
- {
-@@ -754,7 +754,7 @@ static void decsrtClose( hb_work_object_t * w )
- if (pv != NULL)
- {
- fclose( pv->file );
-- iconv_close(pv->iconv_context);
-+ libiconv_close(pv->iconv_context);
- free( w->private_data );
- }
- }
Index: patches/patch-libhb_encavcodecaudio_c
===================================================================
RCS file: patches/patch-libhb_encavcodecaudio_c
diff -N patches/patch-libhb_encavcodecaudio_c
--- patches/patch-libhb_encavcodecaudio_c 27 Jul 2022 15:14:10 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-Fix missing audio tracks.
-
- * https://bugzilla.rpmfusion.org/show_bug.cgi?id=6006
- *
https://github.com/HandBrake/HandBrake/commit/f28289fb06ab461ea082b4be56d6d1504c0c31c2
-
-Index: libhb/encavcodecaudio.c
---- libhb/encavcodecaudio.c.orig
-+++ libhb/encavcodecaudio.c
-@@ -409,7 +409,10 @@ static void Encode(hb_work_object_t *w, hb_buffer_list
-
- // Prepare input frame
- int out_size;
-- AVFrame frame = { .nb_samples = pv->samples_per_frame, };
-+ AVFrame frame = { .nb_samples = pv->samples_per_frame,
-+ .format = pv->context->sample_fmt,
-+ .channels = pv->context->channels
-+ };
-
- out_size = av_samples_get_buffer_size(NULL,
- pv->context->channels,
Index: patches/patch-libhb_fifo_c
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/patches/patch-libhb_fifo_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-libhb_fifo_c
--- patches/patch-libhb_fifo_c 11 Mar 2022 19:39:19 -0000 1.4
+++ patches/patch-libhb_fifo_c 8 Sep 2022 11:55:28 -0000
@@ -7,8 +7,8 @@ Index: libhb/fifo.c
#endif
#ifndef SYS_DARWIN
--#if defined( SYS_FREEBSD ) || defined ( __FreeBSD__ )
-+#if defined( SYS_FREEBSD ) || defined ( __FreeBSD__ ) || defined (
__OpenBSD__ )
+-#if defined( SYS_FREEBSD ) || defined ( __FreeBSD__ ) || defined(SYS_NETBSD)
++#if defined( SYS_FREEBSD ) || defined ( __FreeBSD__ ) || defined (
__OpenBSD__) || defined(SYS_NETBSD)
#include <stdlib.h>
#else
#include <malloc.h>
Index: patches/patch-make_configure_py
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/patches/patch-make_configure_py,v
retrieving revision 1.4
diff -u -p -r1.4 patch-make_configure_py
--- patches/patch-make_configure_py 11 Mar 2022 19:39:19 -0000 1.4
+++ patches/patch-make_configure_py 8 Sep 2022 11:55:28 -0000
@@ -4,16 +4,17 @@ Do not look for CMake; we don't need it.
Index: make/configure.py
--- make/configure.py.orig
+++ make/configure.py
-@@ -682,6 +682,8 @@ class ArchAction( Action ):
+@@ -700,6 +700,9 @@ 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
++ self.mode['i386'] = 'i386-unknown-openbsd%s' %
(host_tuple.release)
++ self.mode['amd64'] = 'amd64-unknown-openbsd%s' %
(host_tuple.release)
else:
self.msg_pass = 'WARNING'
-@@ -1338,7 +1340,7 @@ def createCLI( cross = None ):
+@@ -1361,7 +1364,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' )
@@ -22,29 +23,29 @@ Index: make/configure.py
grp.add_argument( '--flatpak', default=False, action='store_true', help=h
)
cli.add_argument_group( grp )
-@@ -1378,10 +1380,10 @@ def createCLI( cross = None ):
+@@ -1404,10 +1407,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*',
'*-*-netbsd*', 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*', '*-*-netbsd*', 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 ):
+@@ -1416,7 +1419,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*', '*-*-netbsd*', 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:
+@@ -1629,13 +1632,10 @@ try:
class Tools:
ar = ToolProbe( 'AR.exe', 'ar', 'ar',
abort=True )
cp = ToolProbe( 'CP.exe', 'cp', 'cp',
abort=True )
@@ -58,11 +59,11 @@ Index: make/configure.py
python = ToolProbe( 'PYTHON.exe', 'python',
os.path.basename(sys.executable), abort=True )
gcc_tools = ['GCC.gcc',
-@@ -1602,14 +1601,9 @@ try:
+@@ -1650,14 +1650,9 @@ try:
else:
gmake = ToolProbe( 'GMAKE.exe', 'make', 'gmake',
'make', abort=True )
-- autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', 'autoconf',
abort=True, minversion=[2,69,0] )
+- autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', 'autoconf',
abort=True, minversion=([2,71,0] if build_tuple.match('*-*-darwin*') else
[2,69,0]) )
- automake = ToolProbe( 'AUTOMAKE.exe', 'automake', 'automake',
abort=True, minversion=[1,13,0] )
libtool = ToolProbe( 'LIBTOOL.exe', 'libtool', 'libtool',
abort=True )
lipo = ToolProbe( 'LIPO.exe', 'lipo', 'lipo',
abort=False )
@@ -71,14 +72,12 @@ Index: make/configure.py
- 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] )
+ xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild', 'xcodebuild',
abort=(True if (not xcode_opts['disabled'] and
(build_tuple.match('*-*-darwin*') and cross is None)) else False),
versionopt='-version', minversion=[10,3,0] )
-@@ -1695,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])
+@@ -1749,10 +1744,6 @@ try:
+ #####################################
+ # Requires oneVPL which requires CMake 3.16.3 or later
+ Tools.cmake = ToolProbe('CMAKE.exe', 'cmake', 'cmake', abort=True,
minversion=[3,16,3])
- Tools.cmake.__init__( Tools.cmake.var, Tools.cmake.option,
Tools.cmake.name, **Tools.cmake.kwargs )
- Tools.cmake.run()
- for action in Action.actions:
Index: patches/patch-make_include_gcc_defs
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/patches/patch-make_include_gcc_defs,v
retrieving revision 1.3
diff -u -p -r1.3 patch-make_include_gcc_defs
--- patches/patch-make_include_gcc_defs 11 Mar 2022 19:39:19 -0000 1.3
+++ patches/patch-make_include_gcc_defs 8 Sep 2022 11:55:28 -0000
@@ -4,25 +4,27 @@ Proper -I and -L dirs.
Index: make/include/gcc.defs
--- make/include/gcc.defs.orig
+++ make/include/gcc.defs
-@@ -60,16 +60,16 @@ GCC.args.g.none = -g0
- GCC.args.g.min = -gdwarf-2 -g1
- GCC.args.g.std = -gdwarf-2
- GCC.args.g.max = -gdwarf-2 -g3
--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.D = -D$(1)
--GCC.args.I = -I$(1)
-+GCC.args.I = -I$(1) -I$(LOCALBASE)/include -I$(X11BASE)/include
-I$(LOCALBASE)/include/libavcodec
- GCC.args.muldefs = -Wl,--allow-multiple-definition
- GCC.args.start = -Wl,--start-group
- GCC.args.F = -F$(1)
- GCC.args.f = -framework $(1)
--GCC.args.L = -L$(1)
-+GCC.args.L = -L$(1) -L$(LOCALBASE)/lib -L$(X11BASE)/lib
- GCC.args.l = -l$(1)
- GCC.args.end = -Wl,--end-group
+@@ -60,17 +60,17 @@ GCC.args.g.none = -g0
+ GCC.args.g.min = -gdwarf-2 -g1
+ GCC.args.g.std = -gdwarf-2
+ GCC.args.g.max = -gdwarf-2 -g3
+-GCC.args.O.none = -O0
+-GCC.args.O.size = -Os
+-GCC.args.O.size-aggressive = -Oz
+-GCC.args.O.speed = -O3
++GCC.args.O.none =
++GCC.args.O.size =
++GCC.args.O.size-aggressive =
++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
+ GCC.args.muldefs = -Wl,--allow-multiple-definition
+ GCC.args.start = -Wl,--start-group
+ GCC.args.F = -F$(1)
+ GCC.args.f = -framework $(1)
+-GCC.args.L = -L$(1)
++GCC.args.L = -L$(1) -L$(LOCALBASE)/lib -L$(X11BASE)/lib
+ GCC.args.l = -l$(1)
+ GCC.args.end = -Wl,--end-group
Index: patches/patch-make_include_main_defs
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/patches/patch-make_include_main_defs,v
retrieving revision 1.3
diff -u -p -r1.3 patch-make_include_main_defs
--- patches/patch-make_include_main_defs 11 Mar 2022 19:39:19 -0000
1.3
+++ patches/patch-make_include_main_defs 8 Sep 2022 11:55:28 -0000
@@ -4,7 +4,7 @@ We'll let the ports tree handle it.
Index: make/include/main.defs
--- make/include/main.defs.orig
+++ make/include/main.defs
-@@ -7,87 +7,6 @@ include $(SRC/)make/include/tool.defs
+@@ -7,91 +7,7 @@ include $(SRC/)make/include/tool.defs
###############################################################################
@@ -13,7 +13,7 @@ Index: make/include/main.defs
- MODULES += contrib/bzip2
-endif
-endif
--
+
-ifneq (,$(filter $(HOST.system),darwin cygwin mingw))
- MODULES += contrib/freetype
- MODULES += contrib/fribidi
@@ -29,6 +29,7 @@ Index: make/include/main.defs
- MODULES += contrib/x264
- MODULES += contrib/jansson
- MODULES += contrib/libvpx
+- MODULES += contrib/libjpeg-turbo
-endif
-
-ifeq (1,$(FEATURE.flatpak))
@@ -48,13 +49,16 @@ Index: make/include/main.defs
-endif
-
-MODULES += contrib/libdav1d
+-MODULES += contrib/zimg
-MODULES += contrib/ffmpeg
-MODULES += contrib/libdvdread
-MODULES += contrib/libdvdnav
-MODULES += contrib/libbluray
-
-ifeq (1,$(FEATURE.qsv))
-- MODULES += contrib/libmfx
+-ifeq (,$(filter $(HOST.system),freebsd))
+- MODULES += contrib/libvpl
+-endif
-endif
-
-ifeq (1,$(FEATURE.vce))
@@ -92,7 +96,7 @@ Index: make/include/main.defs
## these must come after contrib since some contrib modules are optional
MODULES += libhb
-@@ -122,6 +41,11 @@ endif
+@@ -126,6 +42,11 @@ endif
ifeq (1-gnu,$(FEATURE.gtk)-$(HOST.system))
## build gtk when gtk+gnu
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 11 Mar 2022 19:39:19 -0000 1.4
+++ pkg/PLIST 8 Sep 2022 11:55:28 -0000
@@ -5,12 +5,16 @@ share/applications/fr.handbrake.ghb.desk
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/co/
+share/locale/co/LC_MESSAGES/
+share/locale/co/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/he/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
@@ -22,7 +26,11 @@ share/locale/pt/LC_MESSAGES/ghb.mo
share/locale/pt_BR/LC_MESSAGES/ghb.mo
share/locale/ro/LC_MESSAGES/ghb.mo
share/locale/ru/LC_MESSAGES/ghb.mo
+share/locale/si/LC_MESSAGES/ghb.mo
share/locale/sk/LC_MESSAGES/ghb.mo
+share/locale/sl_SI/
+share/locale/sl_SI/LC_MESSAGES/
+share/locale/sl_SI/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
@@ -30,6 +38,7 @@ 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/locale/zh_TW/LC_MESSAGES/ghb.mo
share/metainfo/
share/metainfo/fr.handbrake.ghb.metainfo.xml
@tag update-desktop-database
