Here is an update to HandBrake 1.6.0.
I did a bit of cleaning up after upstreaming the local patches.
https://github.com/HandBrake/HandBrake/releases/tag/1.6.0
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- Makefile 30 Dec 2022 00:13:29 -0000 1.17
+++ Makefile 1 Jan 2023 05:56:39 -0000
@@ -1,8 +1,8 @@
-V = 1.3.3
COMMENT = open source video transcoder
+
+V = 1.6.0
DISTNAME = HandBrake-${V}-source
PKGNAME = handbrake-${V}
-REVISION = 5
EXTRACT_SUFX = .tar.bz2
CATEGORIES = multimedia x11
@@ -12,20 +12,20 @@ MAINTAINER = Brian Callahan <bcallah@ope
# GPLv2 only
PERMIT_PACKAGE = Yes
-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 atspi avcodec avfilter avformat
-WANTLIB += avutil bluray bz2 c cairo cairo-gobject
-WANTLIB += crypto dav1d dbus-1 dvdnav dvdread epoxy execinfo expat
-WANTLIB += 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 jpeg lzma m mp3lame ogg opus orc-0.4
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8 pixman-1
-WANTLIB += png postproc speex ssl swresample swscale theoradec
-WANTLIB += theoraenc udfread vidstab vorbis vorbisenc vpx x264
-WANTLIB += x265 xcb xcb-render xcb-shm xml2 xvidcore z zimg
+WANTLIB += ${COMPILER_LIBCXX} SvtAv1Enc X11 Xau Xcomposite Xcursor
+WANTLIB += Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender
+WANTLIB += aom ass atk-1.0 atk-bridge-2.0 atspi avcodec avfilter
+WANTLIB += avformat avutil bluray bz2 c cairo cairo-gobject crypto
+WANTLIB += dav1d dbus-1 dvdnav dvdread epoxy execinfo expat ffi
+WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 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 pcre2-8 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}/
@@ -40,17 +40,32 @@ BUILD_DEPENDS = devel/autoconf/${AUTOCON
devel/libtool \
textproc/intltool
-LIB_DEPENDS = devel/jansson \
- devel/orc \
+LIB_DEPENDS = archivers/bzip2 \
+ archivers/xz \
+ audio/lame \
+ audio/libogg \
+ audio/libvorbis \
+ audio/opus \
+ audio/speex \
+ converters/libiconv \
+ devel/fribidi \
+ devel/harfbuzz \
+ devel/jansson \
+ devel/libdvdread \
graphics/ffmpeg \
+ graphics/jpeg \
+ graphics/zimg \
multimedia/aom \
+ multimedia/libass \
multimedia/libbluray \
multimedia/gstreamer1/plugins-base \
multimedia/libdvdnav \
multimedia/libtheora \
multimedia/libvpx \
+ multimedia/svt-av1 \
multimedia/x264 \
multimedia/x265 \
+ textproc/libxml \
x11/gtk+3
RUN_DEPENDS = devel/desktop-file-utils \
@@ -60,8 +75,6 @@ SEPARATE_BUILD = Yes
CONFIGURE_STYLE = simple
CONFIGURE_SCRIPT = ${MODPY_BIN} ${WRKSRC}/make/configure.py
-CONFIGURE_ARGS = --disable-gtk-update-checks \
- --enable-x265
# Yes, autoconf is called *during* the build but not at configure time...
USE_GMAKE = Yes
@@ -70,22 +83,20 @@ 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}" \
+ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
.if ${MACHINE_ARCH:Mi386}
CFLAGS += -msse2
CXXFLAGS += -msse2
.endif
-AUTOCONF_VERSION = 2.69
+CFLAGS+= -D_NO_UPDATE_CHECK
+
+AUTOCONF_VERSION = 2.71
AUTOMAKE_VERSION = 1.16
WRKDIST = ${WRKDIR}/HandBrake-${V}
-
-post-extract:
- ln -s ${WRKSRC}/make/variant/freebsd.defs \
- ${WRKSRC}/make/variant/openbsd.defs
post-install:
ln -s ${TRUEPREFIX}/bin/ghb ${PREFIX}/bin/HandBrake
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/handbrake/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo 20 Jun 2020 21:12:38 -0000 1.5
+++ distinfo 1 Jan 2023 05:56:39 -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.6.0-source.tar.bz2) = fyPHYDi3vzKQidDrM8FImEAPzAQm4xDofcEeU4wQPNo=
+SIZE (HandBrake-1.6.0-source.tar.bz2) = 15968851
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 -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 1 Jan 2023 05:56:39 -0000
@@ -1,25 +1,14 @@
Get the proper library directory for -lhandbrake.
-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 -lSvtAv1Enc"
++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 -lturbojpeg -llzma -lzimg -lSvtAv1Enc"
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*)
Index: patches/patch-gtk_src_callbacks_c
===================================================================
RCS file: patches/patch-gtk_src_callbacks_c
diff -N patches/patch-gtk_src_callbacks_c
--- patches/patch-gtk_src_callbacks_c 11 Mar 2022 19:39:19 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-We need this include too.
-
-Index: gtk/src/callbacks.c
---- gtk/src/callbacks.c.orig
-+++ gtk/src/callbacks.c
-@@ -43,7 +43,7 @@
- #include <gudev/gudev.h>
-
No comments:
Post a Comment