diff options
| author |   Eric Hameleers <alien@slackware.com> | 2019-03-14 21:03:24 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-03-14 21:03:24 +0000 |
| commit | a39084c707c71150cf657b1a3a2c2ab277ecf1a9 (patch) | |
| tree | b9b58bcef3a2b71a28acbc9059c07175f9ed8310 /handbrake | |
| parent | 9a78994c9e642e78f0253ada3664444150b68f1e (diff) | |
| download | asb-a39084c707c71150cf657b1a3a2c2ab277ecf1a9.tar.gz asb-a39084c707c71150cf657b1a3a2c2ab277ecf1a9.tar.xz | |
handbrake: fix the broken package on -current where several of the static libraries (most notably ffmpeg's) are also available in the system as shared libraries
Diffstat (limited to 'handbrake')
| -rwxr-xr-x | handbrake/build/handbrake.SlackBuild | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/handbrake/build/handbrake.SlackBuild b/handbrake/build/handbrake.SlackBuild index 0f412b71..9d6db2fc 100755 --- a/handbrake/build/handbrake.SlackBuild +++ b/handbrake/build/handbrake.SlackBuild @@ -70,6 +70,8 @@ # * Update. # 1.2.2-1: 07/mar/2019 by Eric Hameleers <alien@slackware.com> # * Update. +# 1.2.2-2: 14/mar/2019 by Eric Hameleers <alien@slackware.com> +# * Try to make it work again. # # Run 'sh handbrake.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -82,7 +84,7 @@ PRGNAM=handbrake VERSION=${VERSION:-1.2.2} # Find the revision for a release tag (does not currently work!): RELREV=${RELREV:-""} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-alien} # -- PATENT ALERT! -- @@ -427,13 +429,21 @@ chmod -R u+w,go+r-w,a+X-s . echo Building ... +# Prefer our new static libraries over the system libraries: +HBDEPSDIR="$TMP/tmp-$PRGNAM/HandBrake-$VERSION/build/contrib" + # This will build the commandline and GTK (if requested) programs, # adding ' -lglib-2.0' to the LDFLAGS was needed for the program to link # against libfribidi.a on 32bit. # The '-lm' is required to make speex link: -CFLAGS="$SLKCFLAGS -fno-aggressive-loop-optimizations" \ -CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="$SLKLDFLAGS -lglib-2.0 -lm" \ +export CFLAGS="-I$HBDEPSDIR/include -fno-aggressive-loop-optimizations -fno-strict-aliasing $SLKCFLAGS" +export CXXFLAGS="-I$HBDEPSDIR/include -fno-aggressive-loop-optimizations -fno-strict-aliasing $SLKCFLAGS" +export LDFLAGS="-L$HBDEPSDIR/lib -lglib-2.0 -lm $SLKLDFLAGS" +export PATH="$HBDEPSDIR/bin:$PATH" +export PKG_CONFIG_PATH="$HBDEPSDIR/lib/pkgconfig" +export LD_LIBRARY_PATH="$HBDEPSDIR/lib" +export LD_RUN_PATH="$HBDEPSDIR/lib" + ./configure \ --prefix=/usr \ --launch --launch-jobs=0 \ |