diff options
| -rwxr-xr-x | vlc/build/vlc-1.0.SlackBuild | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild index ec2bcace..05461a48 100755 --- a/vlc/build/vlc-1.0.SlackBuild +++ b/vlc/build/vlc-1.0.SlackBuild @@ -2314,11 +2314,15 @@ make_v4l() echo -e "**\n** v4l ...\n**" cd $TMP/tmp-$PRGNAM/libv4l-${V4L} export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS" +export CPPFLAGS="$SLKCFLAGS" export LDFLAGS="$SLKLDFLAGS" -make -j${NUMJOBS} LINKTYPE=static PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} 2>&1 | tee $OUTPUT/make-${PRGNAM}_v4l.log +make -j${NUMJOBS} LINKTYPE=static PREFIX=$VLCDEPSDIR/usr LIBDIR=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} 2>&1 | tee $OUTPUT/make-${PRGNAM}_v4l.log +# Strip the static lib to prevent linking errors in 64-bit, +# and fix the pkg-cconfig file (to fix unresolved symbols in the plugin) +find . -name "*.a" | xargs strip --strip-unneeded +sed -i "/^Libs: /s/ -lv4l2/ -lv4l2 -lv4lconvert/" libv4l2/libv4l2.pc # Install libv4l into a temp directory so that vlc can pick it up later: -make install LINKTYPE=static PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$VLCDEPSDIR \ +make install LINKTYPE=static PREFIX=$VLCDEPSDIR/usr LIBDIR=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \ 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_v4l.log # Add DOCS to the vlcdeps to have it added to vlc package later: mkdir -p $VLCDEPSDIR/doc/libv4l/ |