From c36a5fae629f2c1ed579f495e5bf8908fdcdb72c Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sun, 18 Oct 2020 17:17:20 +0000 Subject: obs-studio: rebuilt against fdk-aac --- obs-studio/build/obs-studio.SlackBuild | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'obs-studio') diff --git a/obs-studio/build/obs-studio.SlackBuild b/obs-studio/build/obs-studio.SlackBuild index d165268e..6c00a7e5 100755 --- a/obs-studio/build/obs-studio.SlackBuild +++ b/obs-studio/build/obs-studio.SlackBuild @@ -29,12 +29,15 @@ # Descr: software for video recording and live streaming # URL: https://obsproject.com/ # Build needs: -# Needs: jack2, mbedtls, vlc +# Needs: fdk-aac, jack2, mbedtls, vlc, x264 # Changelog: # 26.0.1-1: 05/Oct/2020 by Eric Hameleers # * Initial build. # 26.0.2-1: 06/Oct/2020 by Eric Hameleers # * Initial build. +# 26.0.2-2: 18/Oct/2020 by Eric Hameleers +# * Add fdk-aac dependency so that you no longer have to reply +# on a custom-built ffmpeg with AAC encoder support. # # Run 'sh obs-studio.SlackBuild' to build a Slackware package. # The package (.t?z) and .txt file as well as build logs are created in /tmp . @@ -44,7 +47,7 @@ PRGNAM=obs-studio VERSION=${VERSION:-26.0.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(nproc) "} TAG=${TAG:-alien} @@ -217,6 +220,12 @@ for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do done cd ${PRGNAM}-${VERSION} mv -i ../obs-vst-master/* plugins/obs-vst/ + +# Fix loading Python binary modules, +# see https://github.com/obsproject/obs-studio/issues/2222 +cat $SRCDIR/patches/obs-studio_load_python_binmods.patch \ + | patch -p1 --verbose 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log + chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . @@ -282,9 +291,9 @@ cat $SRCDIR/slack-required > $PKG/install/slack-required # Build the package: cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log +makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-tgz}.md5 +md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 cd - cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep -- cgit v1.2.3