From: Arne Fitzenreiter Date: Sun, 25 Oct 2009 09:49:52 +0000 (+0100) Subject: Split ffmpeg to ffmpeg and ffmpeg-libs. X-Git-Tag: v2.9-beta1~650 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=c8119900f6800538f3e89c1c25df2fa89a871fd9;ds=sidebyside Split ffmpeg to ffmpeg and ffmpeg-libs. --- diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg index f422b875de..d403ca13f3 100644 --- a/config/rootfiles/packages/ffmpeg +++ b/config/rootfiles/packages/ffmpeg @@ -29,36 +29,36 @@ usr/bin/ffserver #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/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/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/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/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/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/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 +#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/ffmpeg-libs b/config/rootfiles/packages/ffmpeg-libs new file mode 100644 index 0000000000..a58dcd5231 --- /dev/null +++ b/config/rootfiles/packages/ffmpeg-libs @@ -0,0 +1,64 @@ +#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/lfs/ffmpeg b/lfs/ffmpeg index 55472c5ee2..113b7e916e 100644 --- a/lfs/ffmpeg +++ b/lfs/ffmpeg @@ -31,9 +31,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ffmpeg -PAK_VER = 2 +PAK_VER = 3 -DEPS = "sdl lame libvorbis xvid" +DEPS = "ffmpeg-libs sdl lame libvorbis xvid" ############################################################################### # Top-level Rules diff --git a/lfs/ffmpeg-libs b/lfs/ffmpeg-libs new file mode 100644 index 0000000000..6965ee14e0 --- /dev/null +++ b/lfs/ffmpeg-libs @@ -0,0 +1,47 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2008-04-13 +THISAPP = ffmpeg-export-$(VER) +PROG = ffmpeg-libs +PAK_VER = 3 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +install : + +check : + +download : + +md5 : + +dist: + @$(PAK) diff --git a/lfs/mpd b/lfs/mpd index de3c01b15b..ce2bd66074 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpd PAK_VER = 8 -DEPS = "alsa ffmpeg glib lame libshout libogg libid3tag libvorbis" +DEPS = "alsa ffmpeg-libs glib lame libshout libogg libid3tag libvorbis" ############################################################################### # Top-level Rules