Added faad2 to build, this enables mp4a playback for vlc.

diff --git a/config/rootfiles/packages/faad2 b/config/rootfiles/packages/faad2
new file mode 100644 (file)
index 0000000..b59e6b2
--- /dev/null
+++ b/config/rootfiles/packages/faad2
@@ -0,0 +1,13 @@
+usr/bin/faad
+#usr/include/faad.h
+#usr/include/mp4ff.h
+#usr/include/mp4ffint.h
+#usr/include/neaacdec.h
+usr/lib/libfaad.a
+usr/lib/libfaad.la
+usr/lib/libfaad.so
+usr/lib/libfaad.so.2
+usr/lib/libfaad.so.2.0.0
+usr/lib/libmp4ff.a
+#usr/share/man/manm
+#usr/share/man/manm/faad.man
\ No newline at end of file

diff --git a/config/rootfiles/packages/videolan b/config/rootfiles/packages/videolan
index ddad49457d277e11529bf4a65968ed149adbdcc5..2b980f9b625dd91faaf7023538b3086ad6ccf262 100644 (file)
--- a/config/rootfiles/packages/videolan
+++ b/config/rootfiles/packages/videolan
@@ -83,6 +83,7 @@ usr/lib/vlc/codec/libcmml_plugin.so
 usr/lib/vlc/codec/libcvdsub_plugin.so
 usr/lib/vlc/codec/libdts_plugin.so
 usr/lib/vlc/codec/libdvbsub_plugin.so
 usr/lib/vlc/codec/libcvdsub_plugin.so
 usr/lib/vlc/codec/libdts_plugin.so
 usr/lib/vlc/codec/libdvbsub_plugin.so

+usr/lib/vlc/codec/libfaad_plugin.so

 usr/lib/vlc/codec/libfake_plugin.so
 usr/lib/vlc/codec/libflacdec_plugin.so
 usr/lib/vlc/codec/liblibmpeg2_plugin.so
 usr/lib/vlc/codec/libfake_plugin.so
 usr/lib/vlc/codec/libflacdec_plugin.so
 usr/lib/vlc/codec/liblibmpeg2_plugin.so

diff --git a/lfs/faad b/lfs/faad
new file mode 100644 (file)
index 0000000..bd258f7
--- /dev/null
+++ b/lfs/faad
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2010  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        = 2.7
+
+THISAPP    = faad2-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = faad2
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = ee1b4d67ea2d76ee52c5621bc6dbf61e
+
+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 zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared 
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/videolan b/lfs/videolan
index b9a78a4dafbe16ed169e8ba0b57fcb878b7ace93..17a9f7ac8cbe698ebf111ed7f32599c2f7b5baa6 100644 (file)
--- a/lfs/videolan
+++ b/lfs/videolan
@@ -33,9 +33,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = videolan
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = videolan

-PAK_VER    = 4
+PAK_VER    = 5

 
 

-DEPS       = "libshout libmpeg2 libmad libdvbpsi directfb ffmpeg"
+DEPS       = "libshout libmpeg2 libmad libdvbpsi directfb ffmpeg faad2"

 
 ###############################################################################
 # Top-level Rules
 
 ###############################################################################
 # Top-level Rules


@@ -96,7 +96,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                                                                --with-v4l=/usr/src/v4l-dvb \
                                                                --enable-libdvbpsi --enable-faac --enable-mkv \
                                                                --enable-x264 --enable-release --enable-sout \
                                                                --with-v4l=/usr/src/v4l-dvb \
                                                                --enable-libdvbpsi --enable-faac --enable-mkv \
                                                                --enable-x264 --enable-release --enable-sout \

-                                                               --disable-nls \
+                                                               --disable-nls --enable-faad \

                                                                --enable-directfb --with-directfb=/usr/src/directfb
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
                                                                --enable-directfb --with-directfb=/usr/src/directfb
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install

diff --git a/make.sh b/make.sh
index 6229cd122886a474f49c2519796b6657ecdbb6dc..6c09095236d7a7082a8a8234c7a0717d3c02e89a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -584,6 +584,7 @@ buildipfire() {
   ipfiremake freefont
   ipfiremake directfb
   ipfiremake dfb++
   ipfiremake freefont
   ipfiremake directfb
   ipfiremake dfb++

+  ipfiremake faad

   ipfiremake ffmpeg
   ipfiremake videolan
   ipfiremake vdr
   ipfiremake ffmpeg
   ipfiremake videolan
   ipfiremake vdr