diff options
Diffstat (limited to 'multimedia/HandBrake')
| -rw-r--r-- | multimedia/HandBrake/HandBrake.SlackBuild | 47 | ||||
| -rw-r--r-- | multimedia/HandBrake/HandBrake.info | 44 | ||||
| -rw-r--r-- | multimedia/HandBrake/README | 8 | ||||
| -rw-r--r-- | multimedia/HandBrake/system_x265.diff | 45 |
4 files changed, 103 insertions, 41 deletions
diff --git a/multimedia/HandBrake/HandBrake.SlackBuild b/multimedia/HandBrake/HandBrake.SlackBuild index 4c8a28ff04..e16c80373b 100644 --- a/multimedia/HandBrake/HandBrake.SlackBuild +++ b/multimedia/HandBrake/HandBrake.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for HandBrake @@ -7,10 +7,13 @@ # Modified by Erik Hanson at SlackBuilds.org # Patched to fix x264 segfault by John Vogel +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=HandBrake -VERSION=${VERSION:-1.0.7} -BUILD=${BUILD:-1} +VERSION=${VERSION:-1.5.1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} DOCDIR=${DOCDIR:-/usr/doc} if [ -z "$ARCH" ]; then @@ -21,13 +24,17 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -41,8 +48,6 @@ else fi SLKCFLAGS="$SLKCFLAGS -fno-aggressive-loop-optimizations" -saved_CFLAGS="$CFLAGS" -saved_CXXFLAGS="$CFLAGS" export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" @@ -52,10 +57,10 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION-source.tar.bz2 cd $PRGNAM-$VERSION mkdir -p download -cp -r $CWD/* download +cp -r $CWD/*{gz,bz2} download chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -63,25 +68,33 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# 20220324 bkw: this fixes the 32-bit build, at the cost of adding +# x265 as a required dep. It's based on Debian's +# 0001-Remove-embedded-downloaded-copies-of-various-librari.patch +# ...but it only affects x265. +patch -p1 < $CWD/system_x265.diff + +# Autodetect onevpl support +if pkg-config --exists vpl ; then qsv="--enable-qsv" ; else qsv="" ; fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --disable-gtk-update-checks \ --enable-fdk-aac \ - --disable-libav-aac \ + --enable-nvenc \ + --enable-vce \ --enable-x265 \ + $qsv \ --arch=$ARCH cd build - # Fix underlinking by configuring the gtk module first, then sed: - make gtk.configure make make install DESTDIR=$PKG -cd $TMP/$PRGNAM-$VERSION +strip $PKG/usr/bin/* -export CFLAGS="$saved_CFLAGS" -export CXXFLAGS="$saved_CXXFLAGS" +cd $TMP/$PRGNAM-$VERSION mkdir -p $PKG/$DOCDIR/$PRGNAM-$VERSION cp -a AUTHORS.markdown COPYING NEWS.markdown THANKS.markdown README.markdown \ @@ -93,4 +106,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/multimedia/HandBrake/HandBrake.info b/multimedia/HandBrake/HandBrake.info index c71c92ada3..3b55d6b603 100644 --- a/multimedia/HandBrake/HandBrake.info +++ b/multimedia/HandBrake/HandBrake.info @@ -1,26 +1,30 @@ PRGNAM="HandBrake" -VERSION="1.0.7" +VERSION="1.5.1" HOMEPAGE="https://handbrake.fr/" -DOWNLOAD="https://download.handbrake.fr/releases/1.0.7/HandBrake-1.0.7.tar.bz2 \ - https://download.handbrake.fr/contrib/libvpx-1.5.0.tar.bz2 \ - https://download.handbrake.fr/handbrake/contrib/libav-12.tar.gz \ - https://download.handbrake.fr/handbrake/contrib/fdk-aac-0.1.4.tar.gz \ - https://download.handbrake.fr/handbrake/contrib/libdvdread-5.0.0-6-gcb1ae87.tar.gz \ - https://download.handbrake.fr/handbrake/contrib/libdvdnav-5.0.1.tar.bz2 \ - https://download.handbrake.fr/contrib/x265_2.1-1.tar.gz \ - https://download.handbrake.fr/handbrake/contrib/libbluray-0.9.3.tar.bz2 \ - https://download.handbrake.fr/contrib/mfx_dispatch-9f4a84d7.tar.gz" -MD5SUM="bf39fcc56a82ccca32a9faac8fa633f5 \ - 49e59dd184caa255886683facea56fca \ - a389fd293cf7b52d8fe194615e2547a8 \ - e274a7d7f6cd92c71ec5c78e4dc9f8b7 \ - 607a5dd41b0dd2f35433d6deac79b99e \ - 81e30fb57eaf9f61aa6513a7bd85bd74 \ - 2d9cb183d2675dfb325abdedd2424bfa \ - c51fd34f933431559371be30b59cff51 \ - 694058b83b43b39b7e5b5fc38dbe2b88" +DOWNLOAD="https://github.com/HandBrake/HandBrake/releases/download/1.5.1/HandBrake-1.5.1-source.tar.bz2 \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/AMF-1.4.18.tar.gz \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/dav1d-0.9.2.tar.bz2 \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/fdk-aac-2.0.1.tar.gz \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/ffmpeg-4.4.1.tar.bz2 \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libbluray-1.3.0.tar.bz2 \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libdvdnav-6.1.1.tar.bz2 \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libdvdread-6.1.1.tar.bz2 \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/nv-codec-headers-11.0.10.1.tar.gz \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/oneVPL-2021.6.0.tar.gz \ + https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/zimg-3.0.3.tar.gz" +MD5SUM="d7fa3057eb830d11d5a18a868bd3ff2d \ + c1e8aae3434b8fe6109e47e88e5b4de4 \ + 52415d8b51774e960598bc6d07e6a608 \ + 5b85f858ee416a058574a1028a3e1b85 \ + 9c2ca54e7f353a861e57525ff6da335b \ + d185696bef5f10ac04154e2b22b55b67 \ + 46c46cb0294fbd1fcb8a0181818dad15 \ + 09c7423568fb679279fd2a2bc6b10b6e \ + 3400a117b9d4291f36be00c522057578 \ + 10e99ad6f862598f2f39a50d663bf4f3 \ + 43e157debdfebf737db3a709fc971869" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libass x264 lame jansson opus" +REQUIRES="libass x264 x265 numactl" MAINTAINER="klaatu" EMAIL="klaatu@member.fsf.org" diff --git a/multimedia/HandBrake/README b/multimedia/HandBrake/README index 85642f5a07..fd686dcd3b 100644 --- a/multimedia/HandBrake/README +++ b/multimedia/HandBrake/README @@ -1,7 +1,7 @@ -HandBrake is a DVD ripping application that reads DVDs and outputs to a -variety of video and audio formats, with options for subtitles, alternate -data streams, presets, and control over advanced options like bitrate, -pixel aspect ratio, deinterlacing, and so on. +HandBrake is a DVD ripping application that reads DVDs and outputs +to a variety of video and audio formats, with options for subtitles, +alternate data streams, presets, and control over advanced options +like bitrate, pixel aspect ratio, deinterlacing, and so on. The legality of ripping content from commercial DVDs varies from nation to nation. diff --git a/multimedia/HandBrake/system_x265.diff b/multimedia/HandBrake/system_x265.diff new file mode 100644 index 0000000000..0badbab3ec --- /dev/null +++ b/multimedia/HandBrake/system_x265.diff @@ -0,0 +1,45 @@ +diff -Naur HandBrake-1.5.1/libhb/module.defs HandBrake-1.5.1.patched/libhb/module.defs +--- HandBrake-1.5.1/libhb/module.defs 2022-01-10 14:11:37.000000000 -0500 ++++ HandBrake-1.5.1.patched/libhb/module.defs 2022-03-24 15:57:45.803548141 -0400 +@@ -129,10 +129,6 @@ + LIBHB.dll.libs += $(CONTRIB.build/)lib/libvpl.a + endif + +-ifeq (1,$(FEATURE.x265)) +-LIBHB.dll.libs += $(CONTRIB.build/)lib/libx265.a +-endif +- + ifneq ($(HAS.iconv),1) + LIBHB.dll.libs += $(CONTRIB.build/)lib/libiconv.a + else +diff -Naur HandBrake-1.5.1/make/include/main.defs HandBrake-1.5.1.patched/make/include/main.defs +--- HandBrake-1.5.1/make/include/main.defs 2022-01-10 14:11:37.000000000 -0500 ++++ HandBrake-1.5.1.patched/make/include/main.defs 2022-03-24 15:58:28.972263692 -0400 +@@ -40,13 +40,6 @@ + MODULES += contrib/fdk-aac + endif + +-ifeq (1,$(FEATURE.x265)) +- MODULES += contrib/x265 +- MODULES += contrib/x265_8bit +- MODULES += contrib/x265_10bit +- MODULES += contrib/x265_12bit +-endif +- + MODULES += contrib/libdav1d + MODULES += contrib/zimg + MODULES += contrib/ffmpeg +diff -Naur HandBrake-1.5.1/test/module.defs HandBrake-1.5.1.patched/test/module.defs +--- HandBrake-1.5.1/test/module.defs 2022-01-10 14:11:37.000000000 -0500 ++++ HandBrake-1.5.1.patched/test/module.defs 2022-03-24 15:59:19.957108790 -0400 +@@ -23,6 +23,10 @@ + TEST.GCC.l += fontconfig + endif + ++ifeq (1,$(FEATURE.x265)) ++ TEST.GCC.l += x265 ++endif ++ + ifeq (1,$(FEATURE.qsv)) + TEST.GCC.l += vpl + ifneq (,$(filter $(HOST.system),linux freebsd)) |