From 8ca27d79e24486b85d8d5ddeb563521e5c561f51 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 13 Dec 2007 21:43:41 +0000 Subject: Final. This one created errorfree package --- vlc/build/vlc-1.0.SlackBuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'vlc') diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild index 7447c814..4cc04698 100755 --- a/vlc/build/vlc-1.0.SlackBuild +++ b/vlc/build/vlc-1.0.SlackBuild @@ -1297,6 +1297,10 @@ echo -e "**\n** 1394 ...\n**" OLDDIR=`pwd` cd $TMP/tmp-$PRGNAM/libraw1394-${RAW1394} +# Or else vlc compilation fails with "error: redefinition of typedef 'byte_t'" +patch -p0 < $SRCDIR/libraw1394_typedef.patch \ + 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_raw1394.log + # Seems I need this ugly prefix or else I have to dig into the problem of vlc # incorrectly interpreting libcdio.la contents... CFLAGS="$SLKCFLAGS" \ @@ -1384,10 +1388,6 @@ cat $SRCDIR/vlc_dirac-0.8.0-api.patch | patch -p1 \ cat $SRCDIR/vlc-0.8.6a_osdmenu_paths.patch | patch -p1 \ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log -# Or else vlc compilation fails with "error: redefinition of typedef 'byte_t'" -patch -p0 < $SRCDIR/vlc_raw1394_typedef.patch \ - 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log - # Fix PLUGIN_PATH path for lib64 sed -i -e 's|/lib/vlc|/usr/lib${LIBDIRSUFFIX}/vlc|g' vlc-config.in.in configure* \ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log -- cgit v1.2.3-65-gdbad