handbrake: update to 1.3.1.

This commit is contained in:
Piraty 2020-03-04 14:29:16 +01:00
parent f094c40bf4
commit 4a3f290977
2 changed files with 26 additions and 28 deletions

View file

@ -1,18 +1,15 @@
diff --git a/gtk/configure.ac b/gtk/configure.ac
index 92aabcbe8..1f4a1df95 100644
--- gtk/configure.ac
+++ gtk/configure.ac
@@ -199,7 +199,7 @@ PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES])
@@ -199,7 +199,7 @@
GHB_CFLAGS="$HBINC $GHB_CFLAGS"
AM_CONDITIONAL([MINGW], [test "x$mingw_flag" = "xyes"])
-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="-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 -ldl"
-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="$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 -ldl"
HB_CPPFLAGS="$HB_CPPFLAGS $HBINC"
if test "x$use_fdk_aac" = "xyes" ; then
HB_LIBS="$HB_LIBS -lfdk-aac"
diff --git a/test/module.defs b/test/module.defs
index ffc00a8b2..62b01ffd5 100644
PKG_CHECK_MODULES([x264], [x264], sys_x264=yes, sys_x264=no)
--- test/module.defs
+++ test/module.defs
@@ -69,6 +69,9 @@ else ifeq ($(HOST.system),linux)

View file

@ -1,30 +1,29 @@
# Template file for 'handbrake'
pkgname=handbrake
version=1.3.0
revision=3
archs="i686* x86_64* ppc64*"
version=1.3.1
revision=1
wrksrc="HandBrake-${version}"
build_style=gnu-configure
configure_args="--force --disable-gtk-update-checks
configure_args="--force --disable-gtk-update-checks --disable-df-fetch --harden
$(vopt_enable fdk_aac fdk-aac) $(vopt_enable nvenc)"
make_build_args="-C ${XBPS_TRIPLET}"
make_install_args="-C ${XBPS_TRIPLET}"
hostmakedepends="automake libtool cmake pkg-config python3 intltool
nasm wget m4 gettext-devel glib-devel meson"
makedepends="zlib-devel bzip2-devel libnotify-devel gtk+3-devel ncurses-devel
gst-plugins-base1-devel libgudev-devel x264-devel x265-devel dbus-glib-devel
fribidi-devel libass-devel fontconfig-devel libxml2-devel libogg-devel
libdvdnav-devel libdvdread-devel libtheora-devel lame-devel jansson-devel
libsamplerate-devel libbluray-devel librsvg-devel libvpx-devel ffmpeg-devel
opus-devel speex-devel atk-devel libnuma-devel $(vopt_if nvenc nv-codec-headers)
$(vopt_if fdk_aac fdk-aac-devel)"
depends="gst-plugins-good1 desktop-file-utils hicolor-icon-theme"
hostmakedepends="automake cmake gettext-devel glib-devel intltool libtool m4 meson nasm pkg-config python3"
makedepends="bzip2-devel ffmpeg-devel gst-plugins-base1-devel gtk+3-devel
jansson-devel lame-devel libass-devel libbluray-devel libdav1d-devel
libdvdnav-devel libdvdread-devel libgudev-devel libnuma-devel
libsamplerate-devel libtheora-devel libvorbis-devel libvpx-devel libxml2-devel
opus-devel speex-devel x264-devel x265-devel
$(vopt_if fdk_aac fdk-aac-devel)
$(vopt_if nvenc nv-codec-headers)"
depends="desktop-file-utils gst-plugins-good1 hicolor-icon-theme"
short_desc="Multithreaded video transcoder"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://handbrake.fr/"
distfiles="https://github.com/HandBrake/HandBrake/releases/download/${version}/HandBrake-${version}-source.tar.bz2"
checksum=a9a82eb5ca04a793705b3d7d11cefa29946694eeb13b40161446aaca35b31d96
checksum=c005de993af4123babbb60f7d12f6ff46fb7eea26ff0a3556034683901ce2c27
nocross=yes
build_options="fdk_aac nvenc"
@ -32,12 +31,14 @@ case "$XBPS_TARGET_MACHINE" in
x86_64*|i686*)
CFLAGS="-msse"
build_options_default="nvenc"
;;
;;
esac
pre_configure() {
# use system libraries in place of bundled ones
for module in ffmpeg libbluray libvpx libdvdread libdvdnav x265 fdk-aac; do
# use system libraries, don't download them
rm -rf contrib/
for module in fdk-aac ffmpeg libbluray libdav1d libdvdnav libdvdread nvenc \
x265; do
vsed -i "/MODULES += contrib\/${module}/d" make/include/main.defs
done
}