summaryrefslogtreecommitdiff
path: root/source/xap/xine-lib
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/xap/xine-lib
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/xap/xine-lib')
-rw-r--r--source/xap/xine-lib/slack-desc10
-rwxr-xr-xsource/xap/xine-lib/xine-lib.SlackBuild108
2 files changed, 44 insertions, 74 deletions
diff --git a/source/xap/xine-lib/slack-desc b/source/xap/xine-lib/slack-desc
index 27673668..69d68e33 100644
--- a/source/xap/xine-lib/slack-desc
+++ b/source/xap/xine-lib/slack-desc
@@ -1,19 +1,19 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# The "handy ruler" below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
xine-lib: xine-lib (xine multimedia playback engine libraries)
xine-lib:
xine-lib: xine-lib is a free (GPL licensed) high-performance multimedia
-xine-lib: playback engine. The xine shared libraries are used by xine-ui (and
+xine-lib: playback engine. The xine shared libraries are used by xine-ui (and
xine-lib: other media players and multimedia applications) for smooth video
xine-lib: processing and playback of multimedia streams such as movies, radio
xine-lib: and TV network streams, DVDs, and VCDs.
xine-lib:
-xine-lib:
+xine-lib: Homepage: https://www.xine-project.org/home
xine-lib:
xine-lib:
diff --git a/source/xap/xine-lib/xine-lib.SlackBuild b/source/xap/xine-lib/xine-lib.SlackBuild
index bc3e5eb7..03caf741 100755
--- a/source/xap/xine-lib/xine-lib.SlackBuild
+++ b/source/xap/xine-lib/xine-lib.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2012, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# Copyright 2011, 2012 Eric Hameleers, Eindhoven, NL
-# Copyright 2015 Heinz Wiesinger, Amsterdam, NL
+# Copyright 2017 Heinz Wiesinger, Amsterdam, NL
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,18 +22,17 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+PKGNAM=xine-lib
# Version on the tarball
-VERSION=1.2.6
+VERSION=1.2.9
# Version used in the source directory to cd into
-DIRVER=1.2.6
+DIRVER=1.2.9
# Version used for the Slackware package
-PKGVER=1.2.6
+PKGVER=1.2.9
-# 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}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -61,66 +60,41 @@ else
FFARCHOPTS=""
fi
-CWD=$(pwd)
+# If this package is being built for ALSA (no PulseAudio), use the _alsa $TAG:
+if [ ! -r /usr/lib${LIBDIRSUFFIX}/pkgconfig/libpulse.pc ]; then
+ TAG="_alsa"
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$PKGVER-$ARCH-$BUILD$TAG.txz"
+ exit 0
+fi
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-xine-lib
-FFMPEG_PKG=$TMP/package-ffmpeg
-rm -rf $PKG $FFMPEG_PKG
-mkdir -p $TMP $PKG/usr $FFMPEG_PKG
+rm -rf $PKG
+mkdir -p $TMP $PKG/usr
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
+# # Fix source for ffmpeg-3.2.x:
+# sed -e 's/avcodec_alloc_frame/av_frame_alloc/' \
+# -e 's/avcodec_free_frame/av_frame_free/' \
+# -i src/combined/ffmpeg/ff_{audio,video}_decoder.c \
+# src/dxr3/ffmpeg_encoder.c &&
+# #sed -e 's|wand/magick_wand.h|MagickWand/MagickWand.h|' \
+# # -i src/video_dec/image.c &&
+# sed -e '/xineplug_vo_out_xcbxv_la_LIBADD/s/$(XCB_LIBS)/$(XCBSHM_LIBS) $(XCB_LIBS)/' \
+# -i src/video_out/Makefile.in &&
+# sed -e 's/\(xcb-shape >= 1.0\)/xcb \1/' \
+# -i m4/video_out.m4 &&
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -128,11 +102,6 @@ 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 \
@@ -144,7 +113,8 @@ XINE_BUILD=$TARGET \
--disable-nosefart \
--disable-vcd \
--without-speex \
- --with-external-dvdnav
+ --without-xcb \
+ --with-external-dvdnav || exit 1
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
@@ -172,5 +142,5 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $TMP/xine-lib-$PKGVER-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/xine-lib-$PKGVER-$ARCH-$BUILD$TAG.txz