Add ffmpeg, upd make to 3.81

diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg
new file mode 100644 (file)
index 0000000..ab584f6
--- /dev/null
+++ b/config/rootfiles/packages/ffmpeg
@@ -0,0 +1,64 @@
+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

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index e185af7d440391398eb5cf1a7c514312cfad4fab..d19919c11fca08029d06022eb54d2c9e75c0d0fa 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -84,6 +84,7 @@
 * ez-ipupdate-3.0.11b8
 * fcron-3.0.1
 * fetchmail-6.3.8
+* ffmpeg-export-2008-04-13
 * file-4.17
 * findutils-4.2.27
 * flex-2.5.33
@@ -171,7 +172,7 @@
 * lzo-2.02
 * m4-1.4.4
 * mISDNuser-1_1_5
-* make-3.80
+* make-3.81
 * man-db-2.4.3
 * man-pages-2.34
 * mbr-1.1.8

diff --git a/lfs/ffmpeg b/lfs/ffmpeg
new file mode 100644 (file)
index 0000000..7a3afab
--- /dev/null
+++ b/lfs/ffmpeg
@@ -0,0 +1,91 @@
+###############################################################################
+#                                                                             #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+
+
+
+VER        = 2008-04-13
+THISAPP    = ffmpeg-export-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = ffmpeg
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 017ab929ff92be552debb65c589c2183
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(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 \
+                                     --enable-shared \
+                                    --enable-postproc \
+                                    --enable-gpl
+       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make install
+       cd $(DIR_APP) && make install-libs
+       ldconfig
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/make b/lfs/make
index dbd197470dbd05591ce3b8d95a8e83650b34c72e..3a3c18a80fc36cc51ed7740c85fd062e100d876a 100644 (file)
--- a/lfs/make
+++ b/lfs/make
@@ -24,14 +24,14 @@
 
 include Config
 
-VER        = 3.80
+VER        = 3.81
 
 THISAPP    = make-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 PROG       = make
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -57,7 +57,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c68540da9302a48068d5cce1f0099477
+$(DL_FILE)_MD5 = 354853e0b2da90c527e35aabb8d6f1e6
 
 install : $(TARGET)
 
@@ -89,7 +89,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
        cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_APP) && make $(EXTRA_INSTALL) install

diff --git a/lfs/mpg123 b/lfs/mpg123
index 9d89f981f5b619973362d3f224b478a9d5e3a7be..ab3267f761d23ba24be5e55dd959fbcd71958abd 100644 (file)
--- a/lfs/mpg123
+++ b/lfs/mpg123
@@ -78,6 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/mpg123-0.59r-security-1.patch
+       cd $(DIR_APP) && patch < $(DIR_SRC)/src/patches/mpg123-0.59r-makefile.patch
        cd $(DIR_APP) && make PREFIX=/usr linux $(MAKETUNING)
        cd $(DIR_APP) && make PREFIX=/usr install
        @rm -rf $(DIR_APP)

diff --git a/make.sh b/make.sh
index bc6b22f28f67c7364122dd5d67406b879d94e62d..caf9acc3bcd5d4acf5640367464d3272fc84a0fa 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -565,6 +565,7 @@ buildipfire() {
   ipfiremake arptables
   ipfiremake fontconfig
   ipfiremake freefont
+  ipfiremake ffmpeg
   ipfiremake vdr
   ipfiremake w_scan
   ipfiremake git

diff --git a/src/patches/mpg123-0.59r-makefile.patch b/src/patches/mpg123-0.59r-makefile.patch
new file mode 100644 (file)
index 0000000..6afb0f2
--- /dev/null
+++ b/src/patches/mpg123-0.59r-makefile.patch
@@ -0,0 +1,12 @@
+--- Makefile   1999-06-15 22:39:06.000000000 +0200
++++ Makefile   2008-04-13 15:26:55.000000000 +0200
+@@ -104,8 +104,7 @@
+ 
+ linux:
+       $(MAKE) CC=gcc LDFLAGS= \
+-              OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+-                      audio_oss.o term.o' \
++              OBJECTS='decode_i386.o dct64_i386.o decode_i586.o audio_oss.o term.o' \
+               CFLAGS='-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
+                       -DREAD_MMAP -DOSS -DTERM_CONTROL\
+                       -Wall -O2 -m486 \