Re: UPDATE: handbrake 1.6.0

2023-04-09 Thread Brad Smith
On Sun, Jan 01, 2023 at 02:03:07AM -0500, Brad Smith wrote:
> 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

Here is an update to HandBrake 1.6.1.


https://github.com/HandBrake/HandBrake/releases/tag/1.6.1


Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/handbrake/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- Makefile30 Dec 2022 00:13:29 -  1.17
+++ Makefile1 Feb 2023 00:44:51 -
@@ -1,8 +1,8 @@
-V =1.3.3
 COMMENT =  open source video transcoder
+
+V =1.6.1
 DISTNAME = HandBrake-${V}-source
 PKGNAME =  handbrake-${V}
-REVISION = 5
 EXTRACT_SUFX = .tar.bz2
 CATEGORIES =   multimedia x11
 
@@ -12,20 +12,20 @@ MAINTAINER =Brian Callahan 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: /home/cvs/ports/multimedia/handbrake/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo20 Jun 2020 21:12:38 -  1.5
+++ distinfo1 Feb 2023 00:39:09 -
@@ -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.1-source.tar.bz2) = 
lMz+A9uRepFlAADFEPf9U/hE2hnxmtS0vhuPa8MajUw=
+SIZE (HandBrake-1.6.1-source.tar.bz2) = 15934833
Index: patches/patch-gtk_configure_ac
===
RCS file: /home/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 -  1.5
+++ patches/patch-gtk_configure_ac  13 Jan 2023 21:44:11 -
@@ -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 

Re: UPDATE: handbrake 1.6.0

2023-01-03 Thread Brian Callahan
On 1/1/2023 2:03 AM, Brad Smith wrote:
> 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
> 
> 

Thanks Brad. I will review/commit once I am home this weekend.

~Brian



UPDATE: handbrake 1.6.0

2022-12-31 Thread Brad Smith
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
--- Makefile30 Dec 2022 00:13:29 -  1.17
+++ Makefile1 Jan 2023 05:56:39 -
@@ -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 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
--- distinfo20 Jun 2020 21:12:38 -  1.5
+++ distinfo1 Jan 2023 05:56:39 -
@@ -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 -  1.5
+++ patches/patch-gtk_configure_ac  1 Jan 2023 05:56:39 -
@@ -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