Slackware 14.2slackware-14.2

Thu Jun 30 20:26:57 UTC 2016
Slackware 14.2 x86_64 stable is released!

The long development cycle (the Linux community has lately been living in
"interesting times", as they say) is finally behind us, and we're proud to
announce the release of Slackware 14.2.  The new release brings many updates
and modern tools, has switched from udev to eudev (no systemd), and adds
well over a hundred new packages to the system.  Thanks to the team, the
upstream developers, the dedicated Slackware community, and everyone else
who pitched in to help make this release a reality.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

Have fun!  :-)

2 files changed, 79 insertions, 38 deletions

diff --git a/source/xap/xine-lib/xine-lib.SlackBuild b/source/xap/xine-lib/xine-lib.SlackBuild
index 510b83513..bc3e5eb7d 100755
--- a/source/xap/xine-lib/xine-lib.SlackBuild
+++ b/source/xap/xine-lib/xine-lib.SlackBuild
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 # Copyright 2008, 2009, 2012  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2011, 2012  Eric Hameleers, Eindhoven, NL
+# Copyright 2015  Heinz Wiesinger, Amsterdam, NL
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,52 +24,103 @@
 
 
 # Version on the tarball
-VERSION=1.1.21
+VERSION=1.2.6
 # Version used in the source directory to cd into
-DIRVER=1.1.21
+DIRVER=1.2.6
 # Version used for the Slackware package
-PKGVER=1.1.21
+PKGVER=1.2.6
 
-BUILD=${BUILD:-2}
+# Version used for statically linked ffmpeg
+FFMPEG_VERSION=${FFMPEG_VERSION:-$(echo ../MPlayer/ffmpeg-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
+
+BUILD=${BUILD:-8}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i686 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
 
-# I would use "-march=i486 -mtune=i686" here as usual, but with XINE it's all or nothing.
-# I'd rather have it work well for the i686/Athlon crowd than suck for everyone.
 TARGET=${TARGET:-$ARCH-pc-linux-gnu}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 if [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
+  FFARCHOPTS="--arch=x86_64 --enable-pic"
+elif [ "$ARCH" = "i586" ]; then
+  LIBDIRSUFFIX=""
+  # 32bit x86 fails without this... let me know if you have a fix
+  FFARCHOPTS="--disable-asm"
 else
   LIBDIRSUFFIX=""
+  FFARCHOPTS=""
 fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-xine-lib
-rm -rf $PKG
-mkdir -p $TMP $PKG/usr
+FFMPEG_PKG=$TMP/package-ffmpeg
+rm -rf $PKG $FFMPEG_PKG
+mkdir -p $TMP $PKG/usr $FFMPEG_PKG
 
 cd $TMP
+rm -rf ffmpeg*
+tar xvf $CWD/../MPlayer/ffmpeg-$FFMPEG_VERSION.tar.xz || exit 1
+cd ffmpeg* || exit 1
+
+  chown -R root:root .
+  find . \
+   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+   -exec chmod 755 {} \; -o \
+   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+   -exec chmod 644 {} \;
+
+  echo Building static ffmpeg libs ...
+
+  FFMPEGDIR=/tmp/ff-$(mcookie)
+
+  CFLAGS="$SLKCFLAGS -fvisibility=hidden -I/usr/include/openmj2-2.1" \
+  CXXFLAGS="$SLKCFLAGS -fvisibility=hidden -I/usr/include/openmj2-2.1" \
+  ./configure \
+    --prefix=$FFMPEGDIR/usr \
+    --libdir=$FFMPEGDIR/usr/lib${LIBDIRSUFFIX} \
+    --shlibdir=$FFMPEGDIR/usr/lib${LIBDIRSUFFIX} \
+    --enable-gpl \
+    --enable-version3 \
+    --enable-libtheora \
+    --enable-postproc \
+    --disable-doc \
+    --disable-avfilter \
+    --disable-avdevice \
+    --disable-swresample \
+    --disable-ffserver \
+    --disable-ffplay \
+    --disable-ffmpeg \
+    --disable-ffprobe \
+    --enable-pthreads \
+    --disable-debug \
+    --disable-shared \
+    --enable-static \
+    --enable-hardcoded-tables \
+    --enable-memalign-hack \
+    --enable-bzlib \
+    --enable-zlib \
+    --enable-libopenjpeg \
+    ${FFARCHOPTS}
+
+    make $NUMJOBS V=1 || exit 1
+    make install # Note: no DESTDIR !!
+cd -
+
 rm -rf xine-lib-$VERSION
 tar xvf $CWD/xine-lib-$VERSION.tar.xz || exit 1
 cd xine-lib-$DIRVER || exit 1
 
-zcat $CWD/xine-lib.XvMClib.h.diff.gz | patch -p1 --verbose || exit 1
-
-# Fix for zlib-1.2.6 (or higher):
-sed -i 's#gzgetc(#gzgetc_(#' src/xine-engine/osd.c
-
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -75,6 +128,11 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+export PKG_CONFIG_PATH="${FFMPEGDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig"
+export CFLAGS="-I${FFMPEGDIR}/usr/include $SLKCFLAGS"
+export CXXFLAGS="-I${FFMPEGDIR}/usr/include $SLKCFLAGS"
+export LDFLAGS="-L${FFMPEGDIR}/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS"
+
 XINE_BUILD=$TARGET \
 ./configure \
   --prefix=/usr \
@@ -82,13 +140,18 @@ XINE_BUILD=$TARGET \
   --docdir=/usr/doc/xine-lib-$VERSION \
   --mandir=/usr/man \
   --with-w32-path=/usr/lib${LIBDIRSUFFIX}/codecs \
-  --with-arts \
+  --with-wavpack \
   --disable-nosefart \
-  --without-speex
+  --disable-vcd \
+  --without-speex \
+  --with-external-dvdnav
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Remove .la files:
+rm -f $PKG//usr/lib${LIBDIRSUFFIX}/*.la
+
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/codecs
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" \
diff --git a/source/xap/xine-lib/xine-lib.XvMClib.h.diff b/source/xap/xine-lib/xine-lib.XvMClib.h.diff
deleted file mode 100644
index 663e7a769..000000000
--- a/source/xap/xine-lib/xine-lib.XvMClib.h.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -u -r --new-file xine-lib-1.1.19.orig/src/video_out/video_out_xxmc.c xine-lib-1.1.19/src/video_out/video_out_xxmc.c
---- xine-lib-1.1.19.orig/src/video_out/video_out_xxmc.c	2010-04-08 09:52:43.000000000 -0500
-+++ xine-lib-1.1.19/src/video_out/video_out_xxmc.c	2010-11-06 16:01:34.278017097 -0500
-@@ -35,6 +35,7 @@
- 
- 
- #include "xxmc.h"
-+#include <X11/extensions/XvMClib.h>
- #include <unistd.h>
- #include "xv_common.h"
- 
-diff -u -r --new-file xine-lib-1.1.19.orig/src/video_out/xvmc_mocomp.c xine-lib-1.1.19/src/video_out/xvmc_mocomp.c
---- xine-lib-1.1.19.orig/src/video_out/xvmc_mocomp.c	2010-03-09 16:17:05.000000000 -0600
-+++ xine-lib-1.1.19/src/video_out/xvmc_mocomp.c	2010-11-06 16:01:34.272017924 -0500
-@@ -21,6 +21,7 @@
-  */
- 
- #include "xxmc.h"
-+#include <X11/extensions/XvMClib.h>
- 
- 
- static void calc_DMV(int DMV[][2], int *dmvector,