summaryrefslogtreecommitdiffstats
path: root/ffmpeg/build/ffmpeg.SlackBuild
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2013-04-14 11:42:16 +0000
committer Eric Hameleers <alien@slackware.com>2013-04-14 11:42:16 +0000
commit9a8f47c1de937220d000d83d568d9d3b19328651 (patch)
tree59066e9934a81d0fe302a3f586a9968b95486ae0 /ffmpeg/build/ffmpeg.SlackBuild
parent14ba0a943b40eb6ee52f9412befb5a850d3df7bd (diff)
downloadasb-9a8f47c1de937220d000d83d568d9d3b19328651.tar.gz
asb-9a8f47c1de937220d000d83d568d9d3b19328651.tar.xz
Fix for files that got installed to the root filesystem (v4l)
Diffstat (limited to 'ffmpeg/build/ffmpeg.SlackBuild')
-rwxr-xr-xffmpeg/build/ffmpeg.SlackBuild7
1 files changed, 5 insertions, 2 deletions
diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index 07c95a6b..62e076d4 100755
--- a/ffmpeg/build/ffmpeg.SlackBuild
+++ b/ffmpeg/build/ffmpeg.SlackBuild
@@ -1279,7 +1279,7 @@ export LDFLAGS="$SLKLDFLAGS -ljpeg"
--prefix=$FFMPEGDEPSDIR/usr \
--libdir=$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
- --udevrulesdir=/lib/udev/rules.d \
+ --with-udevdir=/lib/udev \
--enable-static \
--disable-shared \
--disable-libdvbv5 \
@@ -1299,7 +1299,10 @@ sed -i "/^Libs: /s/$/ -lv4l2 -lv4lconvert -ljpeg/" lib/libv4l1/libv4l1.pc
sed -i "/^Libs: /s/ -lv4l2/ -lv4l2 -lv4lconvert -ljpeg/" lib/libv4l2/libv4l2.pc
# Install libv4l into a temp directory so that ffmpeg can pick it up later:
make install LINKTYPE=static \
- udevrulesdir=$FFMPEGDEPSDIR/lib/udev/rules.d sysconfdir=$FFMPEGDEPSDIR/etc \
+ sysconfdir=$FFMPEGDEPSDIR/etc \
+ man1dir=$FFMPEGDEPSDIR/usr/man/man1 \
+ keytablesystemdir=$FFMPEGDEPSDIR/lib/udev/rc_keymaps \
+ udevrulesdir=$FFMPEGDEPSDIR/lib/udev/rules.d \
2>&1 | tee -a $OUTPUT/make-${PRGNAM}_v4l.log
# Add DOCS to the ffmpegdeps to have it added to ffmpeg package later:
mkdir -p $FFMPEGDEPSDIR/doc/v4l-utils