diff options
| author |   Eric Hameleers <alien@slackware.com> | 2009-05-04 15:47:40 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2009-05-04 15:47:40 +0000 |
| commit | 5315807d9e781814f5dfd027509adffac7e4f671 (patch) | |
| tree | 33477c182b5746937867d4036eb7657ffcd5326f /vlc | |
| parent | a822ff199c3c834920c4f40d4cc2a07cbbd5bf36 (diff) | |
| download | asb-5315807d9e781814f5dfd027509adffac7e4f671.tar.gz asb-5315807d9e781814f5dfd027509adffac7e4f671.tar.xz | |
Build 1.0.0.pre2 on Slackware 12.2
Diffstat (limited to 'vlc')
| -rwxr-xr-x | vlc/build/vlc-1.0.SlackBuild | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild index 6e9666fd..bbc12ece 100755 --- a/vlc/build/vlc-1.0.SlackBuild +++ b/vlc/build/vlc-1.0.SlackBuild @@ -151,9 +151,10 @@ # 0.9.9-1: 27/mar/2009 by Eric Hameleers <alien@slackware.com> # * Try to fix ffmeg video decoding as well as upgrade to 0.9.9; # apply several fixes taken from 1.0.0-git to fix x264 encoding. -# 20090417-1: 17/apr/2009 by Eric Hameleers <alien@slackware.com> -# * This is actually 1.0.0-pre2. I like it much more than the -# 'stable' 0.9.x +# 1.0.0.pre2-1: 04/may/2009 by Eric Hameleers <alien@slackware.com> +# * This is 1.0.0-pre2. I like it much more than the +# 'stable' 0.9.x. Furthermore, DVD playback was broken in +# my 0.9.9 package, so I needed to release an update. # # Run 'sh vlc.SlackBuild --cleanup' to build a Slackware package. # The package (.tgz) plus descriptive .txt file are created in /tmp . @@ -313,7 +314,7 @@ MPEG2DEC=0.5.1 OIL=0.3.16 QT4=4.4.3 RAW1394=1.3.0 -SCHROEDINGER=1.0.6 +SCHROEDINGER=1.0.7 SHOUT=2.2.2 SPEEX=1.2rc1 THEORA=1.0 @@ -1666,8 +1667,6 @@ make_schroedinger() { echo -e "**\n** schroedinger ...\n**" cd $TMP/tmp-$PRGNAM/schroedinger-$SCHROEDINGER -cat $SRCDIR/schroedinger-1.0.6-fixes.patch | patch -p1 --verbose \ - 2>&1 | tee $OUTPUT/patch_${PRGNAM}_schroedinger.log CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="$SLKLDFLAGS" \ @@ -2188,11 +2187,10 @@ then 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log fi -# Fix compilation of mkv plugin on 1.0.0-pre2 (fixed in 1.0.0-git) -if [ "$VERSION" == "1.0.0.pre2" ]; then - cat $SRCDIR/vlc-1.0.0_fixmkv.diff | patch -p1 --verbose \ - 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log -fi +# Fix compilation errors because of redefining gettext +# (this patch is not needed on slackware > 12.2): +cat $SRCDIR/vlc-1.0.0_fixgettext.diff | patch -p1 --verbose \ + 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log # Revert two commits to be able to compile VLC on Slackware 12.2 (glibc 2.7): cat $SRCDIR/vlc-1.0.0_allow_older_glibc.diff | patch -p1 -R --verbose \ |