handbrake: several unsuccessful (so far) refinements to the SlackBuild in an attempt to build static gtk3 support into the package

2 files changed, 38 insertions, 38 deletions

diff --git a/handbrake/build/handbrake.SlackBuild b/handbrake/build/handbrake.SlackBuild
index 25812336..e32711ed 100755
--- a/handbrake/build/handbrake.SlackBuild
+++ b/handbrake/build/handbrake.SlackBuild
@@ -55,6 +55,8 @@
 #             * New release. Was not able to compile.
 # 0.10.1-1:   21/mar/2015 by Eric Hameleers <alien@slackware.com>
 #             * New release. New attempt at compilation failed.
+# 0.10.2-1:   30/sep/2015 by Eric Hameleers <alien@slackware.com>
+#             * New release, another attempt.
 # 
 # Run 'sh handbrake.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -62,13 +64,11 @@
 #
 # -----------------------------------------------------------------------------
 
-# Set initial variables:
 
 PRGNAM=handbrake
-VERSION=${VERSION:-0.10.1}
-# Find the revision for a release tag using (example release 0.9.9):
-# svn info svn://svn.handbrake.fr/HandBrake/tags/0.9.9
-RELREV=${RELREV:-"6980"}
+VERSION=${VERSION:-0.10.2}
+# Find the revision for a release tag:
+RELREV=${RELREV:-""}
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
@@ -120,12 +120,12 @@ DLI=0
 # Download locations of sources:
 SOURCE[$DLI]="$SRCDIR/HandBrake-${VERSION}.tar.bz2"
 if [ -n "$RELREV" ]; then
-  # Download release tag from SVN so that we can create a "release" build,
-  # which shows the actual version in the about box instead of a SVN revision
+  # Download release tag from GIT so that we can create a "release" build,
+  # which shows the actual version in the about box instead of a GIT revision
   # ... how twisted can you get.
   SRCURL[$DLI]=""
 else
-  SRCURL[$DLI]="http://downloads.sourceforge.net/${PRGNAM}/HandBrake-${VERSION}.tar.bz2"
+  SRCURL[$DLI]="https://handbrake.fr/mirror/HandBrake-${VERSION}.tar.bz2"
 fi
 
 DLI=$(($DLI+1))
@@ -256,7 +256,7 @@ rm -rf $OUTPUT/{patch,configure,make,install,error,makepkg}-$PRGNAM.log
                           # remove old log files
 
 # Use the src_checkout() function if no downloadable tarball exists.
-# This function checks out sources from SVN/CVS and creates a tarball of them.
+# This function checks out sources from git and creates a tarball of them.
 src_checkout() {
   # Param #1 : index in the SOURCE[] array.
   # Param #2 : full path to where SOURCE[$i] tarball should be created.
@@ -303,7 +303,7 @@ for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
     if [ -f ${SOURCE[$i]} ]; then echo "Ah, found it!"; continue; fi
     if ! [ "x${SRCURL[$i]}" == "x" ]; then
       echo "Will download file to $(dirname $SOURCE[$i])"
-      wget -nv -T 20 -O "${SOURCE[$i]}" "${SRCURL[$i]}" || true
+      wget -nv -T 20 --no-check-certificate -O "${SOURCE[$i]}" "${SRCURL[$i]}" || true
       if [ $? -ne 0 -o ! -s "${SOURCE[$i]}" ]; then
         echo "Fail to download '$(basename ${SOURCE[$i]})'. Aborting the build."
         mv -f "${SOURCE[$i]}" "${SOURCE[$i]}".FAIL
@@ -362,7 +362,7 @@ cd libffi-${FFI}
     --mandir=$HBDEPSDIR/usr/man \
     --infodir=$HBDEPSDIR/usr/info \
     --docdir=$HBDEPSDIR/usr/doc/$PRGNAM-$VERSION \
-    --enable-static\
+    --enable-static \
     --disable-shared \
     --build=$TARGET \
     2>&1 | tee $OUTPUT/configure-${PRGNAM}_ffi.log
@@ -384,7 +384,7 @@ cd glib-${GLIB}
   ./configure \
     --prefix=$HBDEPSDIR/usr \
     --libdir=$HBDEPSDIR/usr/lib${LIBDIRSUFFIX} \
-    --enable-static\
+    --enable-static \
     --disable-shared \
     --build=$TARGET \
     2>&1 | tee $OUTPUT/configure-${PRGNAM}_glib.log
@@ -436,7 +436,7 @@ echo "Compiling pango static libraries:"
 cd pango-$PANGO
   # Fix for x86_64 (does not hurt the other archs but note that we will start
   # using /etc/pango/$host instead of /etc/pango/ now):
-  zcat $SRCDIR/patches/pango.etc.host.location.diff.gz | patch -p1 --verbose \
+  cat $SRCDIR/patches/pango.etc.host.location.diff | patch -p1 --verbose \
     2>&1 | tee $OUTPUT/patch-${PRGNAM}_pango.log
 
   # Autoconf changes linux to linux-gnu.
@@ -504,7 +504,7 @@ cd HandBrake-${VERSION}
 touch $OUTPUT/patch-${PRGNAM}.log
 
 # Handbrake thinks all Linux systems come with libass, lame and x264:
-cat $SRCDIR/patches/handbrake.static_fribidi_libass.patch |patch -p1 --verbose \
+cat $SRCDIR/patches/handbrake.static_modules.patch |patch -p1 --verbose \
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 # Add our own PKG_CONFIG_PATH to make it find our private GTK+3:
 cat $SRCDIR/patches/gtk/gtk_use_my_pkgconfigpath.patch \
@@ -544,7 +544,7 @@ fi
 # This will build the commandline and GTK programs
 CFLAGS="-I$HBDEPSDIR/usr/include $SLKCFLAGS" \
 CXXFLAGS="-I$HBDEPSDIR/usr/include $SLKCFLAGS" \
-LDFLAGS="-L$HBDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS -lpthread -lffi" \
+LDFLAGS="-L$HBDEPSDIR/usr/lib${LIBDIRSUFFIX} -lpthread -lffi $SLKLDFLAGS" \
 PKG_CONFIG_PATH="$HBDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 PKG_CONFIG="pkg-config --static" \
 ./configure \
@@ -552,12 +552,12 @@ PKG_CONFIG="pkg-config --static" \
   --disable-gtk-update-checks \
   --launch --launch-jobs=0 \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
-make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
-# Install the GTK gui and commandline client:
-( cd build
+# Compile and install the GTK gui and commandline client:
+cd build
+  make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
   make install DESTDIR=$PKG
-)
+cd -
 
 # Show an icon in the XFCE menu:
 mkdir -p $PKG/usr/share/pixmaps
diff --git a/handbrake/build/handbrake_static.SlackBuild b/handbrake/build/handbrake_static.SlackBuild
index 25812336..e32711ed 100755
--- a/handbrake/build/handbrake_static.SlackBuild
+++ b/handbrake/build/handbrake_static.SlackBuild
@@ -55,6 +55,8 @@
 #             * New release. Was not able to compile.
 # 0.10.1-1:   21/mar/2015 by Eric Hameleers <alien@slackware.com>
 #             * New release. New attempt at compilation failed.
+# 0.10.2-1:   30/sep/2015 by Eric Hameleers <alien@slackware.com>
+#             * New release, another attempt.
 # 
 # Run 'sh handbrake.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -62,13 +64,11 @@
 #
 # -----------------------------------------------------------------------------
 
-# Set initial variables:
 
 PRGNAM=handbrake
-VERSION=${VERSION:-0.10.1}
-# Find the revision for a release tag using (example release 0.9.9):
-# svn info svn://svn.handbrake.fr/HandBrake/tags/0.9.9
-RELREV=${RELREV:-"6980"}
+VERSION=${VERSION:-0.10.2}
+# Find the revision for a release tag:
+RELREV=${RELREV:-""}
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
@@ -120,12 +120,12 @@ DLI=0
 # Download locations of sources:
 SOURCE[$DLI]="$SRCDIR/HandBrake-${VERSION}.tar.bz2"
 if [ -n "$RELREV" ]; then
-  # Download release tag from SVN so that we can create a "release" build,
-  # which shows the actual version in the about box instead of a SVN revision
+  # Download release tag from GIT so that we can create a "release" build,
+  # which shows the actual version in the about box instead of a GIT revision
   # ... how twisted can you get.
   SRCURL[$DLI]=""
 else
-  SRCURL[$DLI]="http://downloads.sourceforge.net/${PRGNAM}/HandBrake-${VERSION}.tar.bz2"
+  SRCURL[$DLI]="https://handbrake.fr/mirror/HandBrake-${VERSION}.tar.bz2"
 fi
 
 DLI=$(($DLI+1))
@@ -256,7 +256,7 @@ rm -rf $OUTPUT/{patch,configure,make,install,error,makepkg}-$PRGNAM.log
                           # remove old log files
 
 # Use the src_checkout() function if no downloadable tarball exists.
-# This function checks out sources from SVN/CVS and creates a tarball of them.
+# This function checks out sources from git and creates a tarball of them.
 src_checkout() {
   # Param #1 : index in the SOURCE[] array.
   # Param #2 : full path to where SOURCE[$i] tarball should be created.
@@ -303,7 +303,7 @@ for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
     if [ -f ${SOURCE[$i]} ]; then echo "Ah, found it!"; continue; fi
     if ! [ "x${SRCURL[$i]}" == "x" ]; then
       echo "Will download file to $(dirname $SOURCE[$i])"
-      wget -nv -T 20 -O "${SOURCE[$i]}" "${SRCURL[$i]}" || true
+      wget -nv -T 20 --no-check-certificate -O "${SOURCE[$i]}" "${SRCURL[$i]}" || true
       if [ $? -ne 0 -o ! -s "${SOURCE[$i]}" ]; then
         echo "Fail to download '$(basename ${SOURCE[$i]})'. Aborting the build."
         mv -f "${SOURCE[$i]}" "${SOURCE[$i]}".FAIL
@@ -362,7 +362,7 @@ cd libffi-${FFI}
     --mandir=$HBDEPSDIR/usr/man \
     --infodir=$HBDEPSDIR/usr/info \
     --docdir=$HBDEPSDIR/usr/doc/$PRGNAM-$VERSION \
-    --enable-static\
+    --enable-static \
     --disable-shared \
     --build=$TARGET \
     2>&1 | tee $OUTPUT/configure-${PRGNAM}_ffi.log
@@ -384,7 +384,7 @@ cd glib-${GLIB}
   ./configure \
     --prefix=$HBDEPSDIR/usr \
     --libdir=$HBDEPSDIR/usr/lib${LIBDIRSUFFIX} \
-    --enable-static\
+    --enable-static \
     --disable-shared \
     --build=$TARGET \
     2>&1 | tee $OUTPUT/configure-${PRGNAM}_glib.log
@@ -436,7 +436,7 @@ echo "Compiling pango static libraries:"
 cd pango-$PANGO
   # Fix for x86_64 (does not hurt the other archs but note that we will start
   # using /etc/pango/$host instead of /etc/pango/ now):
-  zcat $SRCDIR/patches/pango.etc.host.location.diff.gz | patch -p1 --verbose \
+  cat $SRCDIR/patches/pango.etc.host.location.diff | patch -p1 --verbose \
     2>&1 | tee $OUTPUT/patch-${PRGNAM}_pango.log
 
   # Autoconf changes linux to linux-gnu.
@@ -504,7 +504,7 @@ cd HandBrake-${VERSION}
 touch $OUTPUT/patch-${PRGNAM}.log
 
 # Handbrake thinks all Linux systems come with libass, lame and x264:
-cat $SRCDIR/patches/handbrake.static_fribidi_libass.patch |patch -p1 --verbose \
+cat $SRCDIR/patches/handbrake.static_modules.patch |patch -p1 --verbose \
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 # Add our own PKG_CONFIG_PATH to make it find our private GTK+3:
 cat $SRCDIR/patches/gtk/gtk_use_my_pkgconfigpath.patch \
@@ -544,7 +544,7 @@ fi
 # This will build the commandline and GTK programs
 CFLAGS="-I$HBDEPSDIR/usr/include $SLKCFLAGS" \
 CXXFLAGS="-I$HBDEPSDIR/usr/include $SLKCFLAGS" \
-LDFLAGS="-L$HBDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS -lpthread -lffi" \
+LDFLAGS="-L$HBDEPSDIR/usr/lib${LIBDIRSUFFIX} -lpthread -lffi $SLKLDFLAGS" \
 PKG_CONFIG_PATH="$HBDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 PKG_CONFIG="pkg-config --static" \
 ./configure \
@@ -552,12 +552,12 @@ PKG_CONFIG="pkg-config --static" \
   --disable-gtk-update-checks \
   --launch --launch-jobs=0 \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
-make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
-# Install the GTK gui and commandline client:
-( cd build
+# Compile and install the GTK gui and commandline client:
+cd build
+  make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
   make install DESTDIR=$PKG
-)
+cd -
 
 # Show an icon in the XFCE menu:
 mkdir -p $PKG/usr/share/pixmaps