summaryrefslogtreecommitdiffstats
path: root/vlc
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2017-12-01 19:06:36 +0000
committer Eric Hameleers <alien@slackware.com>2017-12-01 19:06:36 +0000
commitee7bc6a316cdc8fd11b8fb9179d263ef04517aee (patch)
tree5afd72072e0c4799c1cbb044bd75d26241a8150e /vlc
parent345f63261ad5568209d0119a5172e6c0f19e219f (diff)
downloadasb-ee7bc6a316cdc8fd11b8fb9179d263ef04517aee.tar.gz
asb-ee7bc6a316cdc8fd11b8fb9179d263ef04517aee.tar.xz
vlc: updated to 2.2.8.
Many updates to internal support libraries. Removed: orc/schroedinger (no longer developed). Removed: libggi (obsoleted, unsupported). Removed: aacenc, faad2/faac libraries (not used anymore).
Diffstat (limited to 'vlc')
-rwxr-xr-xvlc/build/vlc.SlackBuild855
1 files changed, 332 insertions, 523 deletions
diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild
index a82b656a..be44868c 100755
--- a/vlc/build/vlc.SlackBuild
+++ b/vlc/build/vlc.SlackBuild
@@ -426,6 +426,13 @@
# * Update.
# 2.2.6-2 26/oct/2017 by Eric Hameleers <alien@slackware.com>
# * Rebuilt for -current to fix broken TLS support.
+# 2.2.8-1 29/nov/2017 by Eric Hameleers <alien@slackware.com>
+# * Update. New versions of internal support libraries:
+# bluray, dvbpsi, ebml, ffmpeg, lame, matroska, opus, ssh2,
+# vaapi, x262, x264, x265.
+# Removed: orc/schroedinger (no longer developed).
+# Removed: libggi (obsoleted, unsupported).
+# Removed: aacenc, faad2/faac libraries (not used anymore).
#
# Run 'sh vlc.SlackBuild' to build a Slackware package.
# The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -449,7 +456,7 @@
PRGNAM=vlc
PRGNAM2=npapi-vlc
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
NPBUILD=${NPBUILD:-1}
TAG=${TAG:-"alien"}
@@ -478,11 +485,11 @@ SLACKVER=${SLACKVER:-$(cat /etc/slackware-version| cut -d' ' -f2)}
#DEFGITURI=${GITURI:-"git://git.videolan.org/vlc.git"}
DEFGITURI=${GITURI:-"git://git.videolan.org/vlc/vlc-2.2.git"}
-VERSION=${VERSION:-"2.2.6"}
+VERSION=${VERSION:-"2.2.8"}
DOCS="ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS README THANKS"
-NUMJOBS=${NUMJOBS:-7} # Number of parallel jobs for the compiler
+NUMJOBS=${NUMJOBS:--j7} # Number of parallel jobs for the compiler
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -575,53 +582,48 @@ fi
# Dependent package versions
A52=0.7.4
-AACENC=0.1.2
AMRWBENC=0.1.3
AMR=0.1.3
ASDCPLIB=1.12.58
ASS=0.13.6
AVC1394=0.5.4
-BLURAY=1.0.0
+BLURAY=1.0.1
CDDB=1.3.2
CDIO=0.90
DAAP=0.4.0
DC1394=2.2.1
DCA=0.0.5
DV=1.0.0
-DVBPSI=1.3.0
+DVBPSI=1.3.1
DVDNAV=5.0.3
DVDREAD=5.0.3
DVDCSS=1.4.0
-EBML=1.3.3
-FAAC=1.28
-FAAD2=2.7
-FFMPEG=cdb0225 # git snapshot 28 jul 2015
+EBML=1.3.5
+FFMPEG=a824685 # git snapshot 12 jul 2017
FLUID=1.1.6
FRIBIDI=0.19.7
-GGI=2.2.2
GII=1.0.2
-GLEW=2.0.0
+GLEW=2.1.0
GOOM=2k4-0
GSM=1.0.16
KATE=0.4.1
-LAME=3.99.5
-LIBVA=1.6.2
+LAME=3.100
+LIBVA=1.8.2
LIVE=2016.02.22
LUA=5.1.5
-MATROSKA=1.4.4
+MATROSKA=1.4.8
MPCDEC=r481
MPEG2DEC=0.5.1
-NPAPI=20170523
-OPUS=1.1.4
-ORC=0.4.26
+NPAPI=20171129
+OPUS=1.2.1
PROJECTM=2.0.1
-QT4=4.8.6
+QT4=4.8.7
RAW1394=2.0.5
-SCHROEDINGER=1.0.11
SHOUT=2.4.1
SPEEX=1.2.0
SPEEXDSP=1.2rc3
-TAGLIB=1.9.1
+SSH2=1.4.3
+TAGLIB=1.11
THEORA=1.1.1
TIGER=0.3.4
TWOLAME=0.3.13
@@ -629,9 +631,9 @@ UPNP=1.6.19
VCD=0.7.24
VDPAU=1.1.1
VPX=1.6.1
-X262=20170523
-X264=20170523-2245
-X265=2.4
+X262=20171128
+X264=20171128-2245
+X265=2.5
# Determine what X we're running (the modular X returns the prefix
# in the next command, while older versions stay silent):
@@ -712,9 +714,9 @@ SRCURL[2]="http://downloads.sourceforge.net/opencore-amr/opencore-amr-${AMR}.tar
SRCPAT[2]="NO"
USE[2]="YES"
-# Kate - a karaoke/text stream overlay codec
-SOURCE[3]="$SRCDIR/libkate-${KATE}.tar.gz"
-SRCURL[3]="http://libkate.googlecode.com/files/libkate-${KATE}.tar.gz"
+# Lame is used for the audio in FLV videos; will statically link with ffmpeg
+SOURCE[3]="$SRCDIR/lame-$LAME.tar.gz"
+SRCURL[3]="http://downloads.sourceforge.net/lame/lame-$LAME.tar.gz"
SRCPAT[3]="NO"
USE[3]="YES"
@@ -730,9 +732,9 @@ SRCURL[5]="http://www.lua.org/ftp/lua-${LUA}.tar.gz"
SRCPAT[5]="NO"
USE[5]="YES"
-# Lame is used for the audio in FLV videos; will statically link with ffmpeg
-SOURCE[6]="$SRCDIR/lame-$LAME.tar.gz"
-SRCURL[6]="http://downloads.sourceforge.net/lame/lame-$LAME.tar.gz"
+# Kate - a karaoke/text stream overlay codec
+SOURCE[6]="$SRCDIR/libkate-${KATE}.tar.gz"
+SRCURL[6]="http://libkate.googlecode.com/files/libkate-${KATE}.tar.gz"
SRCPAT[6]="NO"
USE[6]="YES"
@@ -742,32 +744,32 @@ SRCURL[7]="http://downloads.sourceforge.net/libdv/libdv-${DV}.tar.gz"
SRCPAT[7]="NO"
USE[7]="YES"
-# FAAC library, will be statically linked with ffmpeg
-SOURCE[8]="$SRCDIR/faac-$FAAC.tar.gz"
-SRCURL[8]="http://downloads.sourceforge.net/faac/faac-$FAAC.tar.gz"
-SRCPAT[8]="YES"
-USE[8]="YES"
-
# Qt4 is used for the GUI - VLC will link statically against it
-SOURCE[9]="$SRCDIR/qt-x11-opensource-src-$QT4.tar.gz"
-SRCURL[9]="http://download.qt-project.org/archive/qt/$(echo $QT4 |cut -d. -f1,2)/${QT4}/qt-everywhere-opensource-src-${QT4}.tar.gz"
+SOURCE[8]="$SRCDIR/qt-x11-opensource-src-$QT4.tar.gz"
+SRCURL[8]="http://download.qt-project.org/archive/qt/$(echo $QT4 |cut -d. -f1,2)/${QT4}/qt-everywhere-opensource-src-${QT4}.tar.gz"
+SRCPAT[8]="NO"
+USE[8]="NO"
+
+# HEVC (X.265) codec:
+SOURCE[9]="$SRCDIR/x265-${X265}.tar.gz"
+SRCURL[9]="http://github.com/videolan/x265/archive/${X265}.tar.gz"
SRCPAT[9]="NO"
-USE[9]="NO"
+USE[9]="YES"
-# FAAD2 support:
-SOURCE[10]="$SRCDIR/faad2-$FAAD2.tar.gz"
-SRCURL[10]="http://downloads.sourceforge.net/faac/faad2-$FAAD2.tar.gz"
+# MPEG-2 Part 2 (X.262) codec:
+SOURCE[10]="$SRCDIR/x262-${X262}.tar.gz"
+SRCURL[10]=""
SRCPAT[10]="NO"
USE[10]="YES"
# Matroska support:
-SOURCE[11]="$SRCDIR/libebml-$EBML.tar.bz2"
-SRCURL[11]="http://dl.matroska.org/downloads/libebml/libebml-$EBML.tar.bz2"
+SOURCE[11]="$SRCDIR/libebml-$EBML.tar.xz"
+SRCURL[11]="http://dl.matroska.org/downloads/libebml/libebml-$EBML.tar.xz"
SRCPAT[11]="NO"
USE[11]="YES"
-SOURCE[12]="$SRCDIR/libmatroska-$MATROSKA.tar.bz2"
-SRCURL[12]="http://dl.matroska.org/downloads/libmatroska/libmatroska-$MATROSKA.tar.bz2"
+SOURCE[12]="$SRCDIR/libmatroska-$MATROSKA.tar.xz"
+SRCURL[12]="http://dl.matroska.org/downloads/libmatroska/libmatroska-$MATROSKA.tar.xz"
SRCPAT[12]="NO"
USE[12]="YES"
@@ -814,15 +816,15 @@ SRCURL[19]="http://download.videolan.org/pub/contrib/musepack_src_${MPCDEC}.tar.
SRCPAT[19]="NO"
USE[19]="YES"
-# Orc (oil runtime compiler) is a dependency for schroedinger
-SOURCE[20]="$SRCDIR/orc-${ORC}.tar.xz"
-SRCURL[20]="https://gstreamer.freedesktop.org/src/orc/orc-${ORC}.tar.xz"
+# GLEW needs to be compiled statically to prevent a clash in newer Slackware±
+SOURCE[20]="$SRCDIR/glew-${GLEW}.tgz"
+SRCURL[20]="http://downloads.sourceforge.net/glew/${GLEW}/glew-${GLEW}.tgz"
SRCPAT[20]="NO"
USE[20]="YES"
-# Dirac video codec support by schroedinger:
-SOURCE[21]="$SRCDIR/schroedinger-${SCHROEDINGER}.tar.gz"
-SRCURL[21]="http://www.diracvideo.org/download/schroedinger/schroedinger-${SCHROEDINGER}.tar.gz"
+# SFTP access through libssh2:
+SOURCE[21]="$SRCDIR/libssh2-${SSH2}.tar.gz"
+SRCURL[21]="http://www.libssh2.org/download/libssh2-${SSH2}.tar.gz"
SRCPAT[21]="NO"
USE[21]="YES"
@@ -851,9 +853,9 @@ SRCURL[25]="http://downloads.sourceforge.net/goom/goom-${GOOM}-src.tar.gz"
SRCPAT[25]="NO"
USE[25]="YES"
-# GGI, output plugin
-SOURCE[26]="$SRCDIR/ggi-${GGI}-bundle.src.tar.bz2"
-SRCURL[26]="http://sourceforge.net/projects/ggi/files/bundle/GGI-${GGI}/ggi-${GGI}-bundle.src.tar.gz/download"
+# Taglib for audio files:
+SOURCE[26]="$SRCDIR/taglib-${TAGLIB}.tar.gz"
+SRCURL[26]="http://taglib.github.io/releases/taglib-${TAGLIB}.tar.gz"
SRCPAT[26]="NO"
USE[26]="YES"
@@ -903,9 +905,9 @@ SRCURL[34]="http://download.videolan.org/pub/videolan/libdca/${DCA}/libdca-${DCA
SRCPAT[34]="NO"
USE[34]="YES"
-# Theora encoder/decoder libraries
-SOURCE[35]="$SRCDIR/libtheora-${THEORA}.tar.gz"
-SRCURL[35]="http://downloads.xiph.org/releases/theora/libtheora-${THEORA}.tar.gz"
+# VAAPI for video hardware acceleration:
+SOURCE[35]="$SRCDIR/libva-${LIBVA}.tar.bz2"
+SRCURL[35]="http://www.freedesktop.org/software/vaapi/releases/libva/libva-${LIBVA}.tar.bz2"
SRCPAT[35]="NO"
USE[35]="YES"
@@ -948,9 +950,9 @@ SRCURL[41]="http://sourceforge.net/projects/projectm/files/${PROJECTM}/projectM-
SRCPAT[41]="NO"
USE[41]="YES"
-# VAAPI for video hardware acceleration:
-SOURCE[42]="$SRCDIR/libva-${LIBVA}.tar.bz2"
-SRCURL[42]="http://www.freedesktop.org/software/vaapi/releases/libva/libva-${LIBVA}.tar.bz2"
+# Theora encoder/decoder libraries
+SOURCE[42]="$SRCDIR/libtheora-${THEORA}.tar.gz"
+SRCURL[42]="http://downloads.xiph.org/releases/theora/libtheora-${THEORA}.tar.gz"
SRCPAT[42]="NO"
USE[42]="YES"
@@ -968,15 +970,15 @@ SRCURL[44]="http://storage.googleapis.com/downloads.webmproject.org/releases/web
SRCPAT[44]="NO"
USE[44]="YES"
-# VisualOn AAC encoding library, for AAC (MP4 audio) encoding
-SOURCE[45]="$SRCDIR/vo-aacenc-$AACENC.tar.gz"
-SRCURL[45]="http://downloads.sourceforge.net/opencore-amr/vo-aacenc-$AACENC.tar.gz"
-SRCPAT[45]="YES"
+# AMR-WB encoder libraries used to encode 3GPP audio
+SOURCE[45]="$SRCDIR/vo-amrwbenc-${AMRWBENC}.tar.gz"
+SRCURL[45]="http://downloads.sourceforge.net/opencore-amr/vo-amrwbenc-${AMRWBENC}.tar.gz"
+SRCPAT[45]="NO"
USE[45]="YES"
-# AMR-WB encoder libraries used to encode 3GPP audio
-SOURCE[46]="$SRCDIR/vo-amrwbenc-${AMRWBENC}.tar.gz"
-SRCURL[46]="http://downloads.sourceforge.net/opencore-amr/vo-amrwbenc-${AMRWBENC}.tar.gz"
+# speex dsp implementation:
+SOURCE[46]="$SRCDIR/speexdsp-${SPEEXDSP}.tar.gz"
+SRCURL[46]="http://downloads.us.xiph.org/releases/speex/speexdsp-${SPEEXDSP}.tar.gz"
SRCPAT[46]="NO"
USE[46]="YES"
@@ -1005,47 +1007,17 @@ SRCURL[50]="http://people.freedesktop.org/~aplattner/vdpau/libvdpau-${VDPAU}.tar
SRCPAT[50]="NO"
USE[50]="YES"
-# Taglib for audio files:
-SOURCE[51]="$SRCDIR/taglib-${TAGLIB}.tar.gz"
-SRCURL[51]="http://taglib.github.io/releases/taglib-${TAGLIB}.tar.gz"
+# Library for AS-DCP files:
+SOURCE[51]="$SRCDIR/asdcplib-${ASDCPLIB}.tar.gz"
+SRCURL[51]="http://download.cinecert.com/asdcplib/asdcplib-${ASDCPLIB}.tar.gz"
SRCPAT[51]="NO"
USE[51]="YES"
-# Library for AS-DCP files:
-SOURCE[52]="$SRCDIR/asdcplib-${ASDCPLIB}.tar.gz"
-SRCURL[52]="http://download.cinecert.com/asdcplib/asdcplib-${ASDCPLIB}.tar.gz"
-SRCPAT[52]="NO"
-USE[52]="YES"
-
-# HEVC (X.265) codec:
-SOURCE[53]="$SRCDIR/x265_${X265}.tar.gz"
-SRCURL[53]="https://download.videolan.org/pub/videolan/x265/x265_${X265}.tar.gz"
-SRCPAT[53]="NO"
-USE[53]="YES"
-
-# MPEG-2 Part 2 (X.262) codec:
-SOURCE[54]="$SRCDIR/x262-${X262}.tar.gz"
-SRCURL[54]=""
-SRCPAT[54]="NO"
-USE[54]="YES"
-
-# speex dsp implementation:
-SOURCE[55]="$SRCDIR/speexdsp-${SPEEXDSP}.tar.gz"
-SRCURL[55]="http://downloads.us.xiph.org/releases/speex/speexdsp-${SPEEXDSP}.tar.gz"
-SRCPAT[55]="NO"
-USE[55]="YES"
-
-# GLEW needs to be compiled statically to prevent a clash in newer Slackware±
-SOURCE[56]="$SRCDIR/glew-${GLEW}.tgz"
-SRCURL[56]="http://downloads.sourceforge.net/glew/${GLEW}/glew-${GLEW}.tgz"
-SRCPAT[56]="NO"
-USE[56]="YES"
-
# CSS decoding- VLC can do without if you install an external libdvdcss package.
-SOURCE[57]="$SRCDIR/libdvdcss-${DVDCSS}.tar.bz2"
-SRCURL[57]="http://download.videolan.org/pub/libdvdcss/${DVDCSS}/libdvdcss-${DVDCSS}.tar.bz2"
-SRCPAT[57]="YES"
-USE[57]="YES"
+SOURCE[52]="$SRCDIR/libdvdcss-${DVDCSS}.tar.bz2"
+SRCURL[52]="http://download.videolan.org/pub/libdvdcss/${DVDCSS}/libdvdcss-${DVDCSS}.tar.bz2"
+SRCPAT[52]="YES"
+USE[52]="YES"
# Use the src_checkout() function if no downloadable tarball exists.
# This function checks out sources from SVN/CVS and creates a tarball of them.
@@ -1099,6 +1071,16 @@ src_checkout() {
&& tar --exclude .git -${TARCOMP}cf ${2} ffmpeg-${FFMPEG}
rm -rf ffmpeg-${FFMPEG}
;;
+ 10) # We clone the git of x262 at a certain date:
+ mkdir x262-${X262} \
+ && cd x262-${X262} \
+ && git clone git://git.videolan.org/x262.git . \
+ && git checkout $(git rev-list -n 1 --before="`date -d $X262`" master) \
+ && chown -R root:root . \
+ && cd .. \
+ && tar --exclude .git -${TARCOMP}cf ${2} x262-${X262}
+ rm -rf x262-${X262}
+ ;;
14) # libdvdnav-$DVDNAV
# We clone the git of libdvdnav at a certain date:
mkdir libdvdnav-${DVDNAV} \
@@ -1147,6 +1129,16 @@ src_checkout() {
&& tar --exclude .git -${TARCOMP}cf ${2} libvpx-${VPX}
rm -rf libvpx-${VPX}
;;
+ 46) # We clone the git of speexdsp at a certain date:
+ mkdir speexdsp-${SPEEXDSP} \
+ && cd speexdsp-${SPEEXDSP} \
+ && git clone https://git.xiph.org/speexdsp.git . \
+ && git checkout $(git rev-list -n 1 --before="`date -d $SPEEXDSP`" master) \
+ && chown -R root:root . \
+ && cd .. \
+ && tar --exclude .git -${TARCOMP}cf ${2} speexdsp-${SPEEXDSP}
+ rm -rf speexdsp-${SPEEXDSP}
+ ;;
47) # We clone the git of npapi-vlc at a certain date:
mkdir npapi-vlc-${NPAPI} \
&& cd npapi-vlc-${NPAPI} \
@@ -1168,26 +1160,6 @@ src_checkout() {
&& tar --exclude .git -${TARCOMP}cf ${2} libbluray-${BLURAY}
rm -rf libbluray-${BLURAY}
;;
- 54) # We clone the git of x262 at a certain date:
- mkdir x262-${X262} \
- && cd x262-${X262} \
- && git clone git://git.videolan.org/x262.git . \
- && git checkout $(git rev-list -n 1 --before="`date -d $X262`" master) \
- && chown -R root:root . \
- && cd .. \
- && tar --exclude .git -${TARCOMP}cf ${2} x262-${X262}
- rm -rf x262-${X262}
- ;;
- 55) # We clone the git of speexdsp at a certain date:
- mkdir speexdsp-${SPEEXDSP} \
- && cd speexdsp-${SPEEXDSP} \
- && git clone https://git.xiph.org/speexdsp.git . \
- && git checkout $(git rev-list -n 1 --before="`date -d $SPEEXDSP`" master) \
- && chown -R root:root . \
- && cd .. \
- && tar --exclude .git -${TARCOMP}cf ${2} speexdsp-${SPEEXDSP}
- rm -rf speexdsp-${SPEEXDSP}
- ;;
*) # Do nothing
;;
esac
@@ -1244,13 +1216,11 @@ if [ "$STATIC_FFMPEG" != "YES" ]; then
echo "**"
USE[1]="NO" # ffmpeg
USE[2]="NO" # opencore-amr
- USE[6]="NO" # lame
- USE[8]="NO" # faac
- USE[35]="NO" # theora
+ USE[3]="NO" # lame
+ USE[42]="NO" # theora
USE[43]="NO" # gsm
USE[44]="NO" # vpx
- USE[45]="NO" # aacenc
- USE[46]="NO" # vo-amrwb
+ USE[45]="NO" # vo-amrwb
fi
# Source file availability:
@@ -1379,7 +1349,7 @@ LDFLAGS="$SLKLDFLAGS" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_theora.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_theora.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_theora.log
# Install theora into a temp location so ffmpeg can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_theora.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -1398,16 +1368,16 @@ make_lame()
echo -e "**\n** lame ...\n**"
cd $TMP/tmp-$PRGNAM/lame-${LAME}
-# Fix compiler error introduced by gcc-4.9 on 32-bit:
-if [ "$(gcc --version|grep '^gcc'|cut -d' ' -f3|cut -d. -f1,2)" = "4.9" ]; then
- case $(uname -m) in
- i?86) sed -i -e '/xmmintrin\.h/d' configure ;;
- esac
-fi
-
-# Fix compilation on x86 (xmmintrin.h error: inlining failed)
-cat $SRCDIR/patches/lame_x86-xmmintrin.patch | patch -p1 --verbose \
- 2>&1 | tee $OUTPUT/patch-${PRGNAM}_lame.log
+## Fix compiler error introduced by gcc-4.9 on 32-bit:
+#if [ "$(gcc --version|grep '^gcc'|cut -d' ' -f3|cut -d. -f1,2)" = "4.9" ]; then
+# case $(uname -m) in
+# i?86) sed -i -e '/xmmintrin\.h/d' configure ;;
+# esac
+#fi
+#
+## Fix compilation on x86 (xmmintrin.h error: inlining failed)
+#cat $SRCDIR/patches/lame_x86-xmmintrin.patch | patch -p1 --verbose \
+# 2>&1 | tee $OUTPUT/patch-${PRGNAM}_lame.log
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -1415,13 +1385,15 @@ LDFLAGS="$SLKLDFLAGS" \
./configure \
--prefix=$VLCDEPSDIR/usr \
--libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
+ --enable-mp3rtp \
+ --enable-nasm \
--enable-static \
--disable-shared \
--program-prefix= \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_lame.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_lame.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_lame.log
# Install lame into a temp location so ffmpeg can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_lame.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -1432,43 +1404,6 @@ cd -
}
# -----------------------------------------------------------------------------
-# Compile faac library
-# The ffmpeg will use these
-# -----------------------------------------------------------------------------
-make_faac()
-{
-echo -e "**\n** faac ...\n**"
-cd $TMP/tmp-$PRGNAM/faac-$FAAC
-
-# Newer gcc/glibc will bail out otherwise:
-cat $SRCDIR/patches/faac_gcc44.diff | patch -p1 --verbose \
- 2>&1 | tee $OUTPUT/patch-${PRGNAM}_faac.log
-
-#sh bootstrap
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -std=gnu++98" \
-LDFLAGS="$SLKLDFLAGS" \
-./configure \
- --prefix=$VLCDEPSDIR/usr \
- --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
- --enable-static \
- --disable-shared \
- --with-mp4v2 \
- --program-prefix= \
- --program-suffix= \
- --build=$TARGET \
- 2>&1 | tee $OUTPUT/configure-${PRGNAM}_faac.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_faac.log
-# Install faac into a temp location so ffmpeg can pickup the library
-make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_faac.log
-# Add DOCS to the vlcdeps to have it added to vlc package later:
-mkdir -p $VLCDEPSDIR/doc/faac/
-cp AUTHORS COPYING ChangeLog NEWS README TODO \
- $VLCDEPSDIR/doc/faac/ || true
-cd -
-}
-
-# -----------------------------------------------------------------------------
# Compile amr wideband/narrowband library
# The ffmpeg will use these
# -----------------------------------------------------------------------------
@@ -1488,7 +1423,7 @@ CFLAGS="$SLKCFLAGS" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_amr.log
-make -j$NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}_amr.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_amr.log
make install PREFIX=$VLCDEPSDIR/usr LIBDIR=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
2>&1 | tee -a $OUTPUT/make-${PRGNAM}_amr.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -1518,7 +1453,7 @@ CFLAGS="$SLKCFLAGS" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_amrwbenc.log
-make -j$NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}_amrwbenc.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_amrwbenc.log
make install $VLCDEPSDIR/PREFIX=/usr LIBDIR=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
2>&1 | tee -a $OUTPUT/make-${PRGNAM}_amrwbenc.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -1528,39 +1463,6 @@ cp -a AUTHORS COPYING ChangeLog LICENSE NEWS README \
cd -
}
-
-# -----------------------------------------------------------------------------
-# Compile aacenc library
-# The ffmpeg will use these
-# -----------------------------------------------------------------------------
-make_aacenc()
-{
-echo -e "**\n** aacenc ...\n**"
-cd $TMP/tmp-$PRGNAM/vo-aacenc-${AACENC}
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="$SLKLDFLAGS" \
-./configure \
- --prefix=$VLCDEPSDIR/usr \
- --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
- --enable-static \
- --disable-shared \
- --program-prefix= \
- --program-suffix= \
- --build=$TARGET \
- 2>&1 | tee $OUTPUT/configure-${PRGNAM}_aacenc.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_aacenc.log
-# Install aacenc into a temp location so ffmpeg can pickup the library
-make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_aacenc.log
-# Add DOCS to the vlcdeps to have it added to vlc package later:
-mkdir -p $VLCDEPSDIR/doc/aacenc
-cp -a AUTHORS COPYING* ChangeLog NEWS NOTICE README \
- $VLCDEPSDIR/doc/aacenc || true
-cd -
-}
-
-
# -----------------------------------------------------------------------------
# Compile gsm
# -----------------------------------------------------------------------------
@@ -1574,7 +1476,7 @@ cd $TMP/tmp-$PRGNAM/gsm-${GSM}
# Without this, x86_64 builds will fail:
sed -i -e "/^CCFLAGS/s,-O2 ,$SLKCFLAGS ," \
-e "s,^# LDFLAGS.*,LDFLAGS = $SLKLDFLAGS," Makefile
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_gsm.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_gsm.log
# Install gsm into a temp location so ffmpeg can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_gsm.log
mkdir -p $VLCDEPSDIR/usr/{bin,include/gsm,lib${LIBDIRSUFFIX}}
@@ -1591,7 +1493,7 @@ cd -
# -----------------------------------------------------------------------------
-# Compile ffmpeg with support for AMR, LAME, XVID, FAAC, RTMP, ...
+# Compile ffmpeg with support for AMR, LAME, XVID, RTMP, ...
# Later, we will statically link VLC to the generated libavcodec libraries
# -----------------------------------------------------------------------------
make_ffmpeg()
@@ -1607,23 +1509,22 @@ fi
# Only use patented code if we are allowing it:
if [ "${USE_PATENTS}" == "YES" ]; then
- USE_PATENTED="--enable-libfaac \
- --enable-libvo-aacenc \
+ USE_PATENTED="--enable-encoder=aac \
--enable-nonfree"
else
- USE_PATENTED=" "
+ USE_PATENTED="--disable-encoder=aac"
fi
cd $TMP/tmp-$PRGNAM/ffmpeg-${FFMPEG}
# Apply patches:
touch $OUTPUT/patch-${PRGNAM}_ffmpeg.log
-# Adjust for the newer libvpx:
-cat $SRCDIR/patches/ffmpeg_vpx_removed_ids.patch | patch -p1 --verbose \
- 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ffmpeg.log
-# Prevent a segfault:
-cat $SRCDIR/patches/ffmpeg_xwd_segfault.patch | patch -p1 --verbose \
- 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ffmpeg.log
+## Adjust for the newer libvpx:
+#cat $SRCDIR/patches/ffmpeg_vpx_removed_ids.patch | patch -p1 --verbose \
+# 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ffmpeg.log
+## Prevent a segfault:
+#cat $SRCDIR/patches/ffmpeg_xwd_segfault.patch | patch -p1 --verbose \
+# 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ffmpeg.log
if [ "$ARCH" = "x86_64" ]; then
ARCHOPTS="--arch=x86_64 --enable-pic"
@@ -1653,15 +1554,19 @@ PKG_CONFIG_PATH="${VLCDEPSDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
${USE_PULSE} \
--disable-avdevice \
--disable-avfilter \
+ --disable-avisynth \
--disable-avresample \
--disable-bsfs \
- --disable-decoder=dca \
+ --disable-encoder=vorbis \
+ --disable-decoder=opus \
--disable-devices \
--disable-filters \
--disable-debug \
--disable-doc \
--disable-iconv \
+ --disable-nvenc \
--disable-programs \
+ --disable-protocol=concat \
--disable-shared \
--disable-swresample \
--enable-gpl \
@@ -1675,12 +1580,11 @@ PKG_CONFIG_PATH="${VLCDEPSDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
--enable-libvo-amrwbenc \
--enable-libvpx \
--enable-pthreads \
- --enable-hardcoded-tables \
--enable-static \
- --enable-memalign-hack \
--enable-bzlib \
--enable-zlib \
$ARCHOPTS \
+ --target-os=linux \
--extra-cflags="-I${VLCDEPSDIR}/usr/include" \
--extra-ldflags="-L${VLCDEPSDIR}/usr/lib${LIBDIRSUFFIX} -ldl" \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_ffmpeg.log
@@ -1706,7 +1610,7 @@ PKG_CONFIG_PATH="${VLCDEPSDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
#--enable-vaapi \
#--enable-vdpau \
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_ffmpeg.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_ffmpeg.log
[ $? -ne 0 ] && return 1
# Install ffmpeg into a temp location so vlc can pickup the libraries
@@ -1789,7 +1693,7 @@ export PKG_CONFIG_PATH="${VLCDEPSDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig"
-no-separate-debug-info \
-no-pch \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_qt4.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_qt4.log || exit 1
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_qt4.log || exit 1
# With the above prefix we can install without INSTALL_ROOT; we need this
# so the Qt4 binaries will be picked up by vlc's configure script:
#make install INSTALL_ROOT=$VLCDEPSDIR \
@@ -1808,39 +1712,6 @@ cd -
# -----------------------------------------------------------------------------
-# Compile faad2
-# -----------------------------------------------------------------------------
-make_faad2()
-{
-echo -e "**\n** faad2 ...\n**"
-cd $TMP/tmp-$PRGNAM/faad2-$FAAD2
-#autoreconf -vif
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="$SLKLDFLAGS" \
-./configure \
- --prefix=$VLCDEPSDIR/usr \
- --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
- --without-xmms \
- --enable-static \
- --disable-shared \
- --program-prefix= \
- --program-suffix= \
- --build=$TARGET \
- 2>&1 | tee $OUTPUT/configure-${PRGNAM}_faad2.log
- # No longer available:
- #--with-mp4v2 \
- # Gives errors "faad bitstream value not allowed by specification":
- #--with-drm \
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_faad2.log
-# Add DOCS to the vlcdeps to have it added to vlc package later:
-mkdir -p $VLCDEPSDIR/doc/faad2/
-cp AUTHORS COPYING ChangeLog README* TODO \
- $VLCDEPSDIR/doc/faad2/ || true
-cd -
-}
-
-# -----------------------------------------------------------------------------
# Compile a52 libraries
# -----------------------------------------------------------------------------
make_a52()
@@ -1859,7 +1730,7 @@ LDFLAGS="$SLKLDFLAGS" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_a52.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_a52.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_a52.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
mkdir -p $VLCDEPSDIR/doc/a52dec/
cp AUTHORS COPYING ChangeLog HISTORY INSTALL NEWS README TODO \
@@ -1877,6 +1748,11 @@ cd $TMP/tmp-$PRGNAM/live
# Force the use of our CFLAGS
sed -i -e "s|-O2|${SLKCFLAGS}|g" config.linux
+
+# Be compatible with glibc >= 2.26:
+sed -i -e 's/#include <xlocale.h>.*/#include <locale.h>/' \
+ liveMedia/include/Locale.hh
+
# Live555 is not useable with vlc unless linked statically.
# We need this patch for the tarballs around end september 2009:
if ! $(grep -q Bstatic config.linux) ; then
@@ -1885,7 +1761,7 @@ if ! $(grep -q Bstatic config.linux) ; then
config.linux
fi
./genMakefiles linux 2>&1 | tee $OUTPUT/configure-${PRGNAM}_live.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_live.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_live.log
# Move the live555 stuff into place for vlc to pick it up:
mkdir -p $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} $VLCDEPSDIR/usr/include
cp \
@@ -1928,7 +1804,7 @@ LDFLAGS="$SLKLDFLAGS" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_ebml.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_ebml.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_ebml.log
# Install into a temp directory where vlc & matroska can pick it up:
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ebml.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -1959,7 +1835,7 @@ export PKG_CONFIG_PATH="${VLCDEPSDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig"
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_matroska.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_matroska.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_matroska.log
# Install into a temp directory where vlc can pick it up:
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_matroska.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -1994,7 +1870,7 @@ LDFLAGS="$SLKLDFLAGS" \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_libmpeg2.log
#--without-x \
#--disable-sdl \
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_libmpeg2.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_libmpeg2.log
# Install libmpeg2 into a temp location so vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_mbpeg2.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -2034,7 +1910,7 @@ cd build
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-DSHARED=OFF \
2>&1 | tee $OUTPUT/cmake-${PRGNAM}_mpcdec.log
- make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_mpcdec.log
+ make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_mpcdec.log
# Install mpcdec into a temp location so vlc can pickup the library
# (with the move to 'cmake', the install target does not work any longer):
mkdir -p $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}
@@ -2072,7 +1948,7 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_dvdnav.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dvdnav.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dvdnav.log
# Install libdvdnav into a temp location so vlc can pickup the library
make install m4datadir=$VLCDEPSDIR/usr/share/aclocal \
2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dvdnav.log
@@ -2109,7 +1985,7 @@ LDFLAGS="$SLKLDFLAGS" \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_dvdcss.log
# Shared library needed so that libdvdread can query the library
#--disable-shared \
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dvdcss.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dvdcss.log
# Install libdvdcss into a temp location so libdvdread can pickup the library
echo -e "\n**\n**\n"
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dvdcss.log
@@ -2171,7 +2047,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
2>&1 | tee -a $OUTPUT/configure-${PRGNAM}_dvdread.log
# Prevent documentation from being generated:
touch ChangeLog stamp-doxygen
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dvdread.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dvdread.log
# Install libdvdread into a temp location so libdvdnav can pickup the library
echo -e "\n**\n**\n"
make install m4datadir=$VLCDEPSDIR/usr/share/aclocal \
@@ -2203,7 +2079,7 @@ LDFLAGS="-L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_cddb.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_cddb.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_cddb.log
# Install libcddb into a temp location so cdio and vlc can pickup the library
echo -e "\n**\n**\n"
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_cddb.log
@@ -2244,7 +2120,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_cdio.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_cdio.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_cdio.log
# Install libcdio into a temp location so vlc can pickup the library
echo -e "\n**\n**\n"
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_cdio.log
@@ -2275,7 +2151,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_vcd.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_vcd.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_vcd.log
# Install libvcd into a temp location so vlc can pickup the library
echo -e "\n**\n**\n"
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_vcd.log
@@ -2305,7 +2181,7 @@ LDFLAGS="$SLKLDFLAGS" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_twolame.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_twolame.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_twolame.log
# Install twolame into a temp location so vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_twolame.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -2335,7 +2211,7 @@ LDFLAGS="$SLKLDFLAGS" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_daap.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_daap.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_daap.log
# Install libdaap into a temp location so vlc can pickup the library
echo -e "\n**\n**\n"
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_daap.log
@@ -2380,7 +2256,7 @@ LDFLAGS="$SLKLDFLAGS" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_upnp.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_upnp.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_upnp.log
# Install libupnp into a temp location so vlc can pickup the library
echo -e "\n**\n**\n"
# The 'make install' will install into $VLCDEPSDIR :
@@ -2394,94 +2270,6 @@ cd -
# -----------------------------------------------------------------------------
-# Compile orc
-# -----------------------------------------------------------------------------
-make_orc()
-{
-echo -e "**\n** orc ...\n**"
-
-cd $TMP/tmp-$PRGNAM/orc-$ORC
-## Make the static build succeed:
-#cat $SRCDIR/patches/orc-0.4.3_static.diff | patch -p1 --verbose \
-# 2>&1 | tee $OUTPUT/patch-${PRGNAM}_orc.log
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="$SLKLDFLAGS" \
-./configure \
- --prefix=$VLCDEPSDIR/usr \
- --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
- --enable-static \
- --disable-shared \
- --program-prefix= \
- --program-suffix= \
- --build=$TARGET \
- 2>&1 | tee $OUTPUT/configure-${PRGNAM}_orc.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_orc.log
-# Install orc into a temp location so schroedinger can pickup the library
-echo -e "\n**\n**\n"
-# We used --prefix=$VLCDEPSDIR/usr so that schroedinger's build will find the
-# headers in the $VLCDEPS instead of the filesystem root:
-make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_orc.log
-# Add DOCS to the vlcdeps to have it added to vlc package later:
-mkdir -p $VLCDEPSDIR/doc/orc/
-cp COPYING README TODO \
- $VLCDEPSDIR/doc/orc/ || true
-cd -
-}
-
-# -----------------------------------------------------------------------------
-# Compile schroedinger
-# -----------------------------------------------------------------------------
-make_schroedinger()
-{
-echo -e "**\n** schroedinger ...\n**"
-if [ "$ARCH" = "x86_64" -o "$ARCH" = "armv7hl" ]; then
- ARCHOPTS="--with-pic"
-else
- ARCHOPTS=""
-fi
-cd $TMP/tmp-$PRGNAM/schroedinger-$SCHROEDINGER
-
-cat $SRCDIR/patches/schroedinger_notests.patch | patch -p1 --verbose \
- 2>&1 | tee $OUTPUT/patch-${PRGNAM}_schroedinger.log
-
-# Since the patch touches Makefile.am we have to reconfigure:
-autoreconf -vif
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="$SLKLDFLAGS" \
-PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
-./configure \
- --prefix=$VLCDEPSDIR/usr \
- --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
- --disable-gtk-doc \
- --disable-shared \
- --with-thread=none \
- --program-prefix= \
- --program-suffix= \
- $ARCHOPTS \
- --build=$TARGET \
- 2>&1 | tee $OUTPUT/configure-${PRGNAM}_schroedinger.log
-make 2>&1 | tee $OUTPUT/make-${PRGNAM}_schroedinger.log
-# Install schroedinger into a temp location so vlc can pickup the library
-echo -e "\n**\n**\n"
-make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_schroedinger.log
-# Or else the vlc build wil fail:
-cp schroedinger.pc $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig/schroedinger.pc
-cp schroedinger.pc $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig/schroedinger-1.0.pc
-( cd $VLCDEPSDIR/usr/include
- ln -sf schroedinger-1.0/schroedinger
-)
-# Add DOCS to the vlcdeps to have it added to vlc package later:
-mkdir -p $VLCDEPSDIR/doc/schroedinger/
-cp AUTHORS COPYING* NEWS TODO \
- $VLCDEPSDIR/doc/schroedinger/ || true
-cd -
-}
-
-# -----------------------------------------------------------------------------
# Compile speex codec
# -----------------------------------------------------------------------------
make_speex()
@@ -2510,7 +2298,7 @@ LDFLAGS="$SLKLDFLAGS" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_speex.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_speex.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_speex.log
# Install speex into a temp location so libshout and vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_speex.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -2548,7 +2336,7 @@ LDFLAGS="$SLKLDFLAGS" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee -a $OUTPUT/configure-${PRGNAM}_speexdsp.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_speexdsp.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_speexdsp.log
# Install speexdsp into a temp location so vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_speexdsp.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -2579,7 +2367,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_shout.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_shout.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_shout.log
# Install libshout into a temp location so vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_shout.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -2634,7 +2422,7 @@ LDFLAGS="$SLKLDFLAGS" \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_goom.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_goom.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_goom.log
# Install libgoom into a temp location so vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_goom.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -2656,7 +2444,7 @@ cd $TMP/tmp-$PRGNAM/glew-${GLEW}
CFLAGS="$SLKCFLAGS -DGLEW_STATIC" \
CXXFLAGS="$SLKCFLAGS" \
LDFLAGS="$SLKLDFLAGS" \
- make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_glew.log
+ make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_glew.log
# Install libGLEW into a temp location so vlc can pickup the library
make GLEW_DEST=$VLCDEPSDIR/usr install \
2>&1 | tee -a $OUTPUT/make-${PRGNAM}_glew.log
@@ -2713,7 +2501,7 @@ cd build
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
.. \
2>&1 | tee $OUTPUT/cmake-${PRGNAM}_projectm.log
- make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_projectm.log
+ make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_projectm.log
# Install projectm into a temp location so vlc can pickup the library
make install DESTDIR=$VLCDEPSDIR \
2>&1 | tee -a $OUTPUT/make-${PRGNAM}_projectm.log
@@ -2729,72 +2517,6 @@ cd -
# -----------------------------------------------------------------------------
-# Compile ggi
-# -----------------------------------------------------------------------------
-make_ggi()
-{
-echo -e "**\n** ggi ...\n**"
-INDIR=$(pwd)
-# First libgii which is a dependency
-cd $TMP/tmp-$PRGNAM/ggi-${GGI}-bundle/libgii-$GII
-# Do not add '-fPIC' or "undefined reference to `ggGetSwarType'" will occur
-# when building cpuinfo:
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="$SLKLDFLAGS" \
-./configure \
- --prefix=$VLCDEPSDIR/usr \
- --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/usr/share/vlc/etc \
- --enable-static \
- --disable-shared \
- --disable-debug \
- --program-prefix= \
- --program-suffix= \
- --build=$TARGET \
- 2>&1 | tee $OUTPUT/configure-${PRGNAM}_ggi.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_ggi.log
-# Install gii into a temp location so libggi can pickup the library
-echo -e "\n**\n**\n"
-make sysconfdir=$VLCDEPSDIR/etc install \
- 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ggi.log
-# Add DOCS to the vlcdeps to have it added to vlc package later:
-mkdir -p $VLCDEPSDIR/doc/libgii/
-cp ChangeLog* FAQ NEWS README \
- $VLCDEPSDIR/doc/libgii/ || true
-
-# Next, libggi
-cd $TMP/tmp-$PRGNAM/ggi-${GGI}-bundle/libggi-$GGI
-CFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \
-CPPFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \
-LDFLAGS="-L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS" \
-PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
-./configure \
- --prefix=$VLCDEPSDIR/usr \
- --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/usr/share/vlc/etc \
- --enable-static \
- --disable-shared \
- --disable-debug \
- --with-gii=$VLCDEPSDIR/usr \
- --program-prefix= \
- --program-suffix= \
- --build=$TARGET \
- 2>&1 | tee -a $OUTPUT/configure-${PRGNAM}_ggi.log
-make -j${NUMJOBS} 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ggi.log
-# Install ggi into a temp location so vlc can pickup the library
-echo -e "\n**\n**\n"
-make sysconfdir=$VLCDEPSDIR/etc install \
- 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ggi.log
-# Add DOCS to the vlcdeps to have it added to vlc package later:
-mkdir -p $VLCDEPSDIR/doc/libggi/
-cp ChangeLog* FAQ NEWS README \
- $VLCDEPSDIR/doc/libggi/ || true
-
-cd $INDIR
-}
-
-# -----------------------------------------------------------------------------
# Compile x262
# -----------------------------------------------------------------------------
make_x262()
@@ -2832,7 +2554,7 @@ LDFLAGS="$SLKLDFLAGS" \
sed -i -e "s/x264.pc/x262.pc/g" Makefile
sed -i -e "s/x264.h/x262.h/g" Makefile
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_x262.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_x262.log
# Compensate even a bit more for lack of maturity:
cp x264.h x262.h
@@ -2847,6 +2569,7 @@ cp AUTHORS COPYING \
cd -
}
+
# -----------------------------------------------------------------------------
# Compile x264
# -----------------------------------------------------------------------------
@@ -2873,9 +2596,10 @@ LDFLAGS="$SLKLDFLAGS" \
--disable-avs \
--disable-lavf \
--disable-ffms \
+ --disable-opencl \
$ARCHOPTS \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_x264.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_x264.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_x264.log
# Install x264 into a temp location so vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_x264.log
@@ -2896,6 +2620,7 @@ LDFLAGS="$SLKLDFLAGS" \
--disable-avs \
--disable-lavf \
--disable-ffms \
+ --disable-opencl \
--bit-depth=10 \
$ARCHOPTS \
2>&1 | tee -a $OUTPUT/configure-${PRGNAM}_x264.log
@@ -2903,7 +2628,7 @@ sed -i -e 's/libx264/libx26410b/g' Makefile config.mak
sed -i -e 's/x264/x26410b/g' x264.pc
mv x264.pc x26410b.pc
sed -i -e 's/x264.pc/x26410b.pc/g' Makefile
-make -j${NUMJOBS} 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_x264.log
+make ${NUMJOBS} 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_x264.log
# Install x26410b into a temp location so vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_x264.log
@@ -2935,7 +2660,7 @@ LDFLAGS="$SLKLDFLAGS" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_dv.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dv.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dv.log
# Install dv into a temp location so vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dv.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -2966,7 +2691,7 @@ LDFLAGS="$SLKLDFLAGS" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_dvbpsi.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dvbpsi.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dvbpsi.log
# Install dvbpsi into a temp location so vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dvbpsi.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -2996,7 +2721,7 @@ LDFLAGS="$SLKLDFLAGS" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_dca.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dca.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dca.log
# Install dca into a temp location so vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dca.log
# Fix a broken symlink:
@@ -3043,7 +2768,7 @@ LDFLAGS="$SLKLDFLAGS" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_raw1394.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_raw1394.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_raw1394.log
# Install libraw1394 into a temp location so vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_raw1394.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -3070,7 +2795,7 @@ LIBRAW1394_LIBS="-L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} -lraw1394" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_avc1394.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_avc1394.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_avc1394.log
# Install libavc1394 into a temp location so vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_avc1394.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -3104,7 +2829,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
# Building the examples fails on kernel >= 2.6.38 because that deprecated
# the v4l1 interface. You'll get the error "dc1394_vloopback.c:49:28:
# fatal error: linux/videodev.h: No such file or directory"
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dc1394.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_dc1394.log
# Install libdc1394 into a temp location so vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dc1394.log
# Fix the pkgconfig file to get rid of unresolved symbols at runtime:
@@ -3156,7 +2881,7 @@ LDFLAGS="$SLKLDFLAGS" \
$ARCHOPTS \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_fribidi.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_fribidi.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_fribidi.log
# Install fribidi into a temp location so vlc can pickup the library
echo -e "\n**\n**\n"
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_fribidi.log
@@ -3196,7 +2921,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_ass.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_ass.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_ass.log
# Install libass into a temp location so vlc can pickup the library
echo -e "\n**\n**\n"
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ass.log
@@ -3222,11 +2947,11 @@ LDFLAGS="$SLKLDFLAGS" \
cmake . \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DENABLE_STATIC:BOOL=ON \
+ -DBUILD_SHARED_LIBS=OFF \
-DWITH_ASF:BOOL=ON \
-DWITH_MP4:BOOL=ON \
2>&1 | tee $OUTPUT/cmake-${PRGNAM}_taglib.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_taglib.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_taglib.log
# Install taglib into a temp location so vlc can pickup the library
make install DESTDIR=$VLCDEPSDIR \
2>&1 | tee -a $OUTPUT/make-${PRGNAM}_taglib.log
@@ -3260,7 +2985,7 @@ LDFLAGS="$SLKLDFLAGS" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_fluid.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_fluid.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_fluid.log
# Install fluid into a temp location so vlc can pickup the library
echo -e "\n**\n**\n"
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_fluid.log
@@ -3302,7 +3027,7 @@ LEXLIB="/usr/lib${LIBDIRSUFFIX}/libfl.a" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_kate.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_kate.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_kate.log
# Install kate into a temp location so vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_kate.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -3335,7 +3060,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_tiger.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_tiger.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_tiger.log
# Install tiger into a temp location so vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_tiger.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -3367,7 +3092,7 @@ sed -i "s/-DLUA_USE_LINUX/\"-DLUA_USE_LINUX $SLKCFLAGS\"/g" src/Makefile
sed -i "s#/lib#/lib${LIBDIRSUFFIX}#" Makefile
sed -i "s#/usr/local#/usr#" Makefile
-MYLDFLAGS="$SLKLDFLAGS -ld" make linux -j${NUMJOBS} \
+MYLDFLAGS="$SLKLDFLAGS -ld" make linux ${NUMJOBS} \
2>&1 | tee $OUTPUT/make-${PRGNAM}_lua.log
# Install lua into a temp location so vlc can pickup the library
make install INSTALL_TOP=$VLCDEPSDIR/usr \
@@ -3407,20 +3132,20 @@ cd $TMP/tmp-$PRGNAM/libva-$LIBVA
# Ati hardware I can not build a package for xvba-video myself)
#
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="$SLKLDFLAGS" \
+CFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \
+CXXFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS" \
+LDFLAGS="-L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS" \
+PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--enable-static \
- --enable-shared \
- --with-dummy-driver \
+ --disable-shared \
--program-prefix= \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_libva.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_libva.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_libva.log
# Strip the static lib to prevent linking errors in 64-bit,
find . -name "*.a" | xargs strip --strip-unneeded
# Install libva into a temp location so vlc can pickup the library
@@ -3459,7 +3184,7 @@ LDFLAGS="$SLKLDFLAGS" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_vdpau.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_vdpau.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_vdpau.log
# Strip the static lib to prevent linking errors in 64-bit,
find . -name "*.a" | xargs strip --strip-unneeded
# Install vdpau into a temp location so vlc can pickup the library
@@ -3527,7 +3252,7 @@ LDFLAGS="$SLKLDFLAGS" \
$ARCHOPTS \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_vpx.log
#--disable-examples \ causes errors
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_vpx.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_vpx.log
# Install libvpx into a temp location so vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_vpx.log
# The build system vor libvpx is not yet mature:
@@ -3562,7 +3287,7 @@ LDFLAGS="$SLKLDFLAGS" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_opus.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_opus.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_opus.log
# Install opus into a temp location so vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_opus.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -3595,7 +3320,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_npapi.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_npapi.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_npapi.log
cd -
}
@@ -3630,7 +3355,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_bluray.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_bluray.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_bluray.log
# Install libbluray into a temp location so vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_bluray.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -3664,7 +3389,7 @@ PKG_CONFIG_PATH="$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
--program-suffix= \
--build=$TARGET \
2>&1 | tee $OUTPUT/configure-${PRGNAM}_asdcplib.log
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_asdcplib.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_asdcplib.log
# Install asdcplib into a temp location so vlc can pickup the library
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_asdcplib.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
@@ -3681,36 +3406,144 @@ make_x265()
{
echo -e "**\n** x265 ...\n**"
# We use videolan's contribs repository now:
-cd $TMP/tmp-$PRGNAM/x265_${X265}
+cd $TMP/tmp-$PRGNAM/x265-${X265}
pkg_static "source/x265.pc.in"
-mkdir -p build_x265
-cd build_x265
- CFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS"
- CXXFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS"
- LDFLAGS="-L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS"
- cmake ../source \
- -DCMAKE_C_FLAGS:STRING="$CFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$CXXFLAGS" \
- -DCMAKE_LDFLAGS:STRING="$LDFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib${LIBDIRSUFFIX} \
- -DENABLE_SHARED:BOOL=OFF \
- 2>&1 | tee $OUTPUT/cmake-${PRGNAM}_x265.log
- make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_x265.log
- # Install x265 into a temp location so vlc can pickup the library
- make install DESTDIR=$VLCDEPSDIR \
- 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_x265.log
-cd -
+# Set the compiler flags:
+CFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS"
+CXXFLAGS="-I$VLCDEPSDIR/usr/include $SLKCFLAGS"
+LDFLAGS="-L$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS"
+
+# We follow the build instructions at:
+# https://github.com/videolan/x265/blob/master/build/linux/multilib.sh
+# See also https://bitbucket.org/multicoreware/x265/wiki/Home :
+# Build 10bit and 12bit only on x86_64 for which assembler code exists.
+if [ "$ARCH" = "x86_64" ]; then
+ mkdir build-12
+ cd build-12
+ cmake ../source \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib${LIBDIRSUFFIX} \
+ -DHIGH_BIT_DEPTH=ON \
+ -DMAIN12=ON \
+ -DEXPORT_C_API=OFF \
+ -DENABLE_CLI=OFF \
+ -DENABLE_SHARED=OFF \
+ -DCMAKE_BUILD_TYPE=Release \
+ 2>&1 | tee $OUTPUT/configure-${PRGNAM}_x265.log
+ make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_x265.log
+ cd -
+ mkdir build-10
+ cd build-10
+ cmake ../source \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib${LIBDIRSUFFIX} \
+ -DHIGH_BIT_DEPTH=ON \
+ -DEXPORT_C_API=OFF \
+ -DENABLE_CLI=OFF \
+ -DENABLE_SHARED=OFF \
+ -DCMAKE_BUILD_TYPE=Release \
+ 2>&1 | tee -a $OUTPUT/configure-${PRGNAM}_x265.log
+ make ${NUMJOBS} 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_x265.log
+ cd -
+ mkdir build-8
+ cd build-8
+ ln -s ../build-10/libx265.a libx265_main10.a
+ ln -s ../build-12/libx265.a libx265_main12.a
+ cmake ../source \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib${LIBDIRSUFFIX} \
+ -DEXTRA_LIB="x265_main10.a;x265_main12.a" \
+ -DEXTRA_LINK_FLAGS="-L." \
+ -DLINKED_10BIT=ON \
+ -DLINKED_12BIT=ON \
+ -DENABLE_SHARED=OFF \
+ -DCMAKE_BUILD_TYPE=Release \
+ 2>&1 | tee -a $OUTPUT/configure-${PRGNAM}_x265.log
+ make ${NUMJOBS} 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_x265.log
+ # Rename the 8bit library, then combine all three into libx265.a using ar:
+ mv libx265.a libx265_main.a
+ ar -M <<EOF
+CREATE libx265.a
+ADDLIB libx265_main.a
+ADDLIB libx265_main10.a
+ADDLIB libx265_main12.a
+SAVE
+END
+EOF
+else
+ mkdir build-8
+ cd build-8
+ cmake ../source \
+ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib${LIBDIRSUFFIX} \
+ -DENABLE_SHARED=OFF \
+ -DCMAKE_BUILD_TYPE=Release \
+ 2>&1 | tee $OUTPUT/configure-${PRGNAM}_x265.log
+ make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_x265.log
+fi
+
+# We were left in the final build directory:
+# Install x265 into a temp location so vlc can pickup the library
+make install DESTDIR=$VLCDEPSDIR \
+ 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_x265.log
+cd ..
# Add DOCS to the vlcdeps to have it added to vlc package later:
mkdir -p $VLCDEPSDIR/doc/x265/
cp COPYING* build/README* $VLCDEPSDIR/doc/x265/ || true
+}
+
+# -----------------------------------------------------------------------------
+# Compile libssh2
+# -----------------------------------------------------------------------------
+make_ssh2()
+{
+echo -e "**\n** ssh2 ...\n**"
+cd $TMP/tmp-$PRGNAM/libssh2-${SSH2}
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+LDFLAGS="$SLKLDFLAGS -lz -lgpg-error" \
+./configure \
+ --prefix=$VLCDEPSDIR/usr \
+ --libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
+ --enable-static \
+ --disable-shared \
+ --disable-examples-build \
+ --with-libgcrypt \
+ --without-openssl \
+ --program-prefix= \
+ --program-suffix= \
+ --build=$TARGET \
+ 2>&1 | tee $OUTPUT/configure-${PRGNAM}_ssh2.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_ssh2.log
+# Install ssh2 into a temp location so vlc can pickup the library
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_ssh2.log
+# Add DOCS to the vlcdeps to have it added to vlc package later:
+mkdir -p $VLCDEPSDIR/doc/libssh2/
+cp AUTHORS COPYING ChangeLog NEWS README \
+ $VLCDEPSDIR/doc/libssh2/ || true
cd -
}
+
# -----------------------------------------------------------------------------
# VLC
# -----------------------------------------------------------------------------
@@ -3773,17 +3606,10 @@ else
DO_LOADER=""
fi
-# Only include libs for patented codecs if we are allowing/needing it:
-if [ "${USE_PATENTS}" == "YES" -a "$STATIC_FFMPEG" == "YES" ]; then
- DO_FFMPEG_LIBS_PAT="-lfaac"
-else
- DO_FFMPEG_LIBS_PAT=""
-fi
-
## FFMPEG changed it's CPU flag definitions but VLC did not yet follow:
#if grep -q FF_MM_MMX modules/stream_out/switcher.c ; then
# cat $SRCDIR/patches/vlc_ffmpeg_mm_api.patch | patch -p1 --verbose \
-# 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+# 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
#fi
if [ "$STATIC_FFMPEG" == "YES" ]; then
@@ -3791,7 +3617,7 @@ if [ "$STATIC_FFMPEG" == "YES" ]; then
## vlc-cache-gen trips over at the end of the build, when we add LIBS
## to avoid missing symbols in the avcodec plugin at runtime:
if ! grep -q " -ldrm" ${VLCDEPSDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig/libavcodec.pc ; then
- sed -i "/^Libs: /s/$/ -lva -lva-x11 -lX11 -lXext -lXfixes -ldrm/" \
+ sed -i "/^Libs: /s/$/ -lvdpau -lva -lva-drm -lva-x11 -lX11 -lXext -lXfixes -lm -ldrm/" \
${VLCDEPSDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig/libavcodec.pc
fi
fi
@@ -3807,14 +3633,14 @@ fi
# Plug a xss vulnerability, commited right after 2.0.6:
if [ "$VERSION" = "2.0.6" ]; then
cat $SRCDIR/patches/vlc-2.0.6_xss_vulns.patch | patch -p1 --verbose \
- 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
fi
# avcodec audio decoder: update block pointer (emergency patch for 2.0.8
# after which a new 2.0.8a tarball was released):
if [ "$VERSION" = "2.0.8" ]; then
cat $SRCDIR/patches/vlc-2.0.8_update_block_pointer.patch | patch -p1 --verbose \
- 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
fi
# We patched our Qt 5.5.1 package:
@@ -3831,6 +3657,10 @@ sed -i configure.ac \
## it can make use of it. NOTE: with glibc 2.8 it will work... have to wait...
#sed -i -e 's/^#ifdef HAVE_EVENTFD/#ifdef HAVE_SYS_EVENTFD_H/' src/misc/objects.c
+# Fix build against ffmpeg 3.x (patch adapted from freebsd original):
+cat $SRCDIR/patches/vlc2_ffmpeg3.patch | patch -p0 --verbose \
+ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_vlc.log
+
sh bootstrap
# Slackware > 14.2 switched to ncurses 6.x:
@@ -3876,10 +3706,10 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
--enable-libass \
--enable-caca \
--enable-aa \
+ --enable-sftp \
--enable-upnp \
--enable-flac \
--enable-shout \
- --enable-schroedinger \
--enable-live555 \
--enable-realrtsp \
--enable-speex \
@@ -3889,8 +3719,6 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
--enable-x265 \
--enable-a52 \
--with-a52-tree=$TMP/tmp-$PRGNAM/a52dec-$A52 \
- --enable-faad \
- --with-faad-tree=$TMP/tmp-$PRGNAM/faad2-$FAAD2 \
--enable-twolame \
--enable-ogg \
--enable-vorbis \
@@ -3919,7 +3747,6 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
#--with-dvdread-tree=$TMP/tmp-$PRGNAM/libdvdread-$DVDREAD \
#--enable-goom \
#--with-goom-tree=$TMP/tmp-$PRGNAM/goom$GOOM \
- #--enable-ggi \
# Sometimes skins support breaks and we'll have to disable it:
#--disable-skins2 \
@@ -3965,7 +3792,7 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
#AVCODEC_CFLAGS="" \
# Now, we are ready for the compile:
-make -j${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
# If we are compiling the browser plugin, then we need to install to $VLCDEPSDIR
if [ "$MOZPLUGIN" == "YES" ]; then
@@ -4039,15 +3866,6 @@ if [ -d $VLCDEPSDIR/usr/share/vlc/projectM ]; then
ln -sf /usr/share/fonts/TTF/DejaVuSansMono.ttf $PKG/usr/share/vlc/projectM/fonts/VeraMono.ttf
fi
-# Copy libggi configuration files into the package if we added support for it:
-if [ -f $VLCDEPSDIR/etc/ggi/libggi.conf ]; then
- mkdir -p $PKG/usr/share/vlc/etc/
- cp -a $VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/ggi $PKG/usr/share/vlc/
- cp -a $VLCDEPSDIR/etc/ggi $PKG/usr/share/vlc/etc/
- sed -i -e "s#$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX}/#/usr/share/vlc/#" \
- $PKG/usr/share/vlc/etc/ggi/*.conf
-fi
-
# Add this to the doinst.sh:
mkdir -p $PKG/install
cat <<EOINS > $PKG/install/doinst.sh
@@ -4093,8 +3911,8 @@ mkdir -p $PKG/usr/man/man1
gzip -9c doc/vlc.1 > $PKG/usr/man/man1/vlc.1.gz
# Add a vlc log syntax definition file for vim:
-mkdir -p $PKG/$(cd /usr/share/vim/vim*/syntax ; pwd)
-cp extras/analyser/vlc.vim $PKG/$(cd /usr/share/vim/vim*/syntax ; pwd)/
+mkdir -p $PKG/usr/share/vim/vimfiles/syntax
+install -m644 extras/analyser/vlc.vim $PKG/usr/share/vim/vimfiles/syntax/
# Remove traces of our temporary install location from libtool files:
find $PKG/usr/lib${LIBDIRSUFFIX} -name "*.la" -o -name "*.pc" \
@@ -4212,18 +4030,12 @@ else
make_amrwbenc
make_gsm
make_lame
- # Only use patented code if we are allowing it:
- if [ "${USE_PATENTS}" == "YES" ]; then
- make_faac
- make_aacenc
- fi
# ffmpeg uses the above static libraries:
make_ffmpeg
fi
# Additional libraries that vlc will use:
- make_faad2
make_a52
make_dca
make_ebml
@@ -4233,8 +4045,6 @@ else
make_twolame
#make_daap
make_upnp
- make_orc
- make_schroedinger
make_live555
make_fribidi
make_taglib
@@ -4247,12 +4057,12 @@ else
make_lua
make_bluray
make_opus
+ make_ssh2
# Visualisations:
# FIXME: getting symbol errors but we need a static libGLEW:
#make_glew
make_goom
- make_ggi
make_projectm
# Digital video:
@@ -4274,7 +4084,6 @@ if echo "$*" | grep -qw -- --wrapvlcdeps ; then
tar -jcf $OUTPUT/$PRGNAM-vlcdeps-${SLACKVER}-$ARCH.tar.bz2 \
vlcdeps \
a52dec-$A52 \
- faad2-$FAAD2
echo "Created vlcdeps binary tarball in '$OUTPUT/$PRGNAM-vlcdeps-${SLACKVER}-$ARCH.tar.bz2'..."
cd -
generated by cgit v1.2.3-65-gdbad (git 2.45.1) at 2024-06-12 08:28:11 +0000