add w_scan rootfile, changed path of ffmpeg lib to /usr/lib

diff --git a/config/rootfiles/cdrom_corever b/config/rootfiles/cdrom_corever
index f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2..48082f72f087ce7e6fa75b9c41d7387daecd447b 100644 (file)
--- a/config/rootfiles/cdrom_corever
+++ b/config/rootfiles/cdrom_corever
@@ -1 +1 @@
-10
+12

diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg
index ab584f64f3e901ecef2115232d1bb4c032a41ae8..43752ded19423593eaad042d5c1ae8d6a01f4d69 100644 (file)
--- a/config/rootfiles/packages/ffmpeg
+++ b/config/rootfiles/packages/ffmpeg
@@ -1,64 +1,65 @@
-usr/local/bin/ffmpeg
-usr/local/bin/ffplay
-usr/local/bin/ffserver
-#usr/local/include/libavcodec
-#usr/local/include/libavcodec/avcodec.h
-#usr/local/include/libavcodec/opt.h
-#usr/local/include/libavdevice
-#usr/local/include/libavdevice/avdevice.h
-#usr/local/include/libavformat
-#usr/local/include/libavformat/avformat.h
-#usr/local/include/libavformat/avio.h
-#usr/local/include/libavformat/rtsp.h
-#usr/local/include/libavformat/rtspcodes.h
-#usr/local/include/libavutil
-#usr/local/include/libavutil/adler32.h
-#usr/local/include/libavutil/avstring.h
-#usr/local/include/libavutil/avutil.h
-#usr/local/include/libavutil/base64.h
-#usr/local/include/libavutil/common.h
-#usr/local/include/libavutil/crc.h
-#usr/local/include/libavutil/fifo.h
-#usr/local/include/libavutil/intfloat_readwrite.h
-#usr/local/include/libavutil/log.h
-#usr/local/include/libavutil/lzo.h
-#usr/local/include/libavutil/mathematics.h
-#usr/local/include/libavutil/md5.h
-#usr/local/include/libavutil/mem.h
-#usr/local/include/libavutil/random.h
-#usr/local/include/libavutil/rational.h
-#usr/local/include/libavutil/sha1.h
-#usr/local/lib/libavcodec.a
-usr/local/lib/libavcodec.so
-usr/local/lib/libavcodec.so.51
-usr/local/lib/libavcodec.so.51.54.0
-#usr/local/lib/libavdevice.a
-usr/local/lib/libavdevice.so
-usr/local/lib/libavdevice.so.52
-usr/local/lib/libavdevice.so.52.0.0
-#usr/local/lib/libavformat.a
-usr/local/lib/libavformat.so
-usr/local/lib/libavformat.so.52
-usr/local/lib/libavformat.so.52.13.0
-#usr/local/lib/libavutil.a
-usr/local/lib/libavutil.so
-usr/local/lib/libavutil.so.49
-usr/local/lib/libavutil.so.49.6.0
-#usr/local/lib/pkgconfig
-usr/local/lib/pkgconfig/libavcodec.pc
-usr/local/lib/pkgconfig/libavdevice.pc
-usr/local/lib/pkgconfig/libavformat.pc
-usr/local/lib/pkgconfig/libavutil.pc
-#usr/local/lib/vhook
-usr/local/lib/vhook/drawtext.so
-usr/local/lib/vhook/fish.so
-usr/local/lib/vhook/null.so
-usr/local/lib/vhook/ppm.so
-usr/local/lib/vhook/watermark.so
-#usr/local/include/libpostproc
-#usr/local/include/libpostproc/postprocess.h
-#usr/local/lib/libpostproc.a
-usr/local/lib/libpostproc.so
-usr/local/lib/libpostproc.so.51
-usr/local/lib/libpostproc.so.51.1.0
-usr/local/lib/pkgconfig/libpostproc.pc
+usr/bin/ffmpeg
+usr/bin/ffplay
+usr/bin/ffserver
+#usr/include/libavcodec
+#usr/include/libavcodec/avcodec.h
+#usr/include/libavcodec/opt.h
+#usr/include/libavdevice
+#usr/include/libavdevice/avdevice.h
+#usr/include/libavformat
+#usr/include/libavformat/avformat.h
+#usr/include/libavformat/avio.h
+#usr/include/libavformat/rtsp.h
+#usr/include/libavformat/rtspcodes.h
+#usr/include/libavutil
+#usr/include/libavutil/adler32.h
+#usr/include/libavutil/avstring.h
+#usr/include/libavutil/avutil.h
+#usr/include/libavutil/base64.h
+#usr/include/libavutil/common.h
+#usr/include/libavutil/crc.h
+#usr/include/libavutil/fifo.h
+#usr/include/libavutil/intfloat_readwrite.h
+#usr/include/libavutil/log.h
+#usr/include/libavutil/lzo.h
+#usr/include/libavutil/mathematics.h
+#usr/include/libavutil/md5.h
+#usr/include/libavutil/mem.h
+#usr/include/libavutil/random.h
+#usr/include/libavutil/rational.h
+#usr/include/libavutil/sha1.h
+#usr/lib/libavcodec.a
+usr/lib/libavcodec.so
+usr/lib/libavcodec.so.51
+usr/lib/libavcodec.so.51.54.0
+#usr/lib/libavdevice.a
+usr/lib/libavdevice.so
+usr/lib/libavdevice.so.52
+usr/lib/libavdevice.so.52.0.0
+#usr/lib/libavformat.a
+usr/lib/libavformat.so
+usr/lib/libavformat.so.52
+usr/lib/libavformat.so.52.13.0
+#usr/lib/libavutil.a
+usr/lib/libavutil.so
+usr/lib/libavutil.so.49
+usr/lib/libavutil.so.49.6.0
+#usr/lib/pkgconfig
+usr/lib/pkgconfig/libavcodec.pc
+usr/lib/pkgconfig/libavdevice.pc
+usr/lib/pkgconfig/libavformat.pc
+usr/lib/pkgconfig/libavutil.pc
+#usr/lib/vhook
+usr/lib/vhook/drawtext.so
+usr/lib/vhook/fish.so
+usr/lib/vhook/null.so
+usr/lib/vhook/ppm.so
+usr/lib/vhook/watermark.so
+#usr/include/libpostproc
+#usr/include/libpostproc/postprocess.h
+#usr/lib/libpostproc.a
+usr/lib/libpostproc.so
+usr/lib/libpostproc.so.51
+usr/lib/libpostproc.so.51.1.0
+usr/
+lib/pkgconfig/libpostproc.pc

diff --git a/config/rootfiles/packages/w_scan b/config/rootfiles/packages/w_scan
new file mode 100644 (file)
index 0000000..1a6e707
--- /dev/null
+++ b/config/rootfiles/packages/w_scan
@@ -0,0 +1,2 @@
+opt/vdr/bin/w_scan
+opt/vdr/bin/w_scan_start.sh

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
index 7a3afabe8a90722191c725398863ffb0aa6512cc..721d1f9da51345e43477e218fe7dfcfdb19f4555 100644 (file)
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -79,7 +79,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr/local \
+       cd $(DIR_APP) && ./configure --prefix=/usr \
                                      --enable-shared \
                                     --enable-postproc \
                                     --enable-gpl