diff options
| author |   Eric Hameleers <alien@slackware.com> | 2013-05-27 22:17:15 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2013-05-27 22:17:15 +0000 |
| commit | 8e43a26720e0b2243eb8b6c0edf4659264380d28 (patch) | |
| tree | 3d7b6b0f8b2338c059895b68e2a9a3051c42da48 /vlc | |
| parent | 7446fdcc77bf5454db0e8bd30581308c21f71171 (diff) | |
| download | asb-8e43a26720e0b2243eb8b6c0edf4659264380d28.tar.gz asb-8e43a26720e0b2243eb8b6c0edf4659264380d28.tar.xz | |
This works for ARM and compiles x264 assembly using gcc
Diffstat (limited to 'vlc')
| -rwxr-xr-x | vlc/build/vlc.SlackBuild | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild index c6550c34..1448bf65 100755 --- a/vlc/build/vlc.SlackBuild +++ b/vlc/build/vlc.SlackBuild @@ -779,8 +779,8 @@ SRCPAT[26]="NO" USE[26]="YES" # X264 encoder - for H264/AVC video streams -SOURCE[27]="$SRCDIR/x264-snapshot-${X264}.tar.bz2" -SRCURL[27]="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264}.tar.bz2" +SOURCE[27]="$SRCDIR/x264-snapshot-${X264}-stable.tar.bz2" +SRCURL[27]="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264}-stable.tar.bz2" SRCPAT[27]="NO" USE[27]="YES" @@ -1495,10 +1495,10 @@ fi cd $TMP/tmp-$PRGNAM/ffmpeg-${FFMPEG} -# Apply stability patches: -touch $OUTPUT/patch-${PRGNAM}_ffmpeg.log -cat $SRCDIR/ffmpeg_swfdec.patch | patch -p1 --verbose \ - 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ffmpeg.log +## Apply stability patches: +#touch $OUTPUT/patch-${PRGNAM}_ffmpeg.log +#cat $SRCDIR/ffmpeg_swfdec.patch | patch -p1 --verbose \ +# 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ffmpeg.log if [ "$ARCH" = "x86_64" ]; then ARCHOPTS="--arch=x86_64 --enable-pic" @@ -2536,12 +2536,15 @@ cd $INDIR make_x264() { echo -e "**\n** x264 ...\n**" -if [ "$ARCH" = "x86_64" -o "$ARCH" = "armv7hl" ]; then - ARCHOPTS="--enable-pic" -else - ARCHOPTS="" -fi -cd $TMP/tmp-$PRGNAM/x264-snapshot-${X264} + +case "$ARCH" in + x86_64|arm*) + ARCHOPTS="--enable-pic" ;; + *) + ARCHOPTS="" ;; +esac + +cd $TMP/tmp-$PRGNAM/x264-snapshot-${X264}-stable CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="$SLKLDFLAGS" \ @@ -2887,9 +2890,9 @@ make_kate() echo -e "**\n** kate ...\n**" cd $TMP/tmp-$PRGNAM/libkate-${KATE} -# Compatibility patch for libpng14: -cat $SRCDIR/libkate_png14.patch | patch -p0 --verbose \ - 2>&1 | tee $OUTPUT/patch-${PRGNAM}_kate.log +## Compatibility patch for libpng14: +#cat $SRCDIR/libkate_png14.patch | patch -p0 --verbose \ +# 2>&1 | tee $OUTPUT/patch-${PRGNAM}_kate.log CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -3688,6 +3691,9 @@ else make_qt4 fi + # This one first, which resolves weird build failures on ARM (assembly fails) + make_x264 + # If anyone can fix the 'unresolved symbols' in several vlc plugins when # libva is compiled before ffmpeg, let me know! make_libva @@ -3735,7 +3741,6 @@ else make_dca make_ebml make_matroska - make_x264 make_libmpeg2 make_mpcdec make_twolame |