Fini deplacement librairies audios du stage5 vers le stage3

diff --git a/config/packages-list b/config/packages-list
index 99065d3..7dcd95d 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -5,11 +5,9 @@
 
 ABIWORD="abiword-2.8.6"
 AGG="agg-2.5"
-ALSA_DRIVER="alsa-driver-1.0.21"
 ALSA_LIB="alsa-lib-1.0.21"
 ALSA_PLUGINS="alsa-plugins-1.0.21"
 ALSA_UTILS="alsa-utils-1.0.21"
-ALSA_OSS="alsa-oss-1.0.17"
 
 APR="apr-1.3.9"
 APR_UTIL="apr-util-1.3.9"
@@ -304,6 +302,7 @@ METACITY="metacity-2.18.5"
 MFOUR="m4-1.4.15"
 MILTER_GREYLIST="milter-greylist-4.0"
 MILTER_SPF="smf-spf-2.0.1"
+MOC="moc-2.4.4"
 MODULE_INIT_TOOLS="module-init-tools-3.12"
 MPC="mpc-0.8.2"
 MPFR="mpfr-3.0.0"
@@ -311,6 +310,7 @@ MUTT="mutt-1.5.21"
 MYSQL="mysql-5.1.52"
 
 NANO="nano-2.2.6"
+NASM="nasm-2.09.04"
 NCURSES="ncurses-5.7"
 NEON="neon-0.29.1"
 NEWLIB="newlib-1.16.0"

diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 564e8f2..6434fe7 100755 (executable)
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -146,8 +146,50 @@ fi
 ipkg ${GNUPG} "--libexecdir=/usr/lib"
 ipkg ${MUTT} "--enable-imap --with-ssl --with-sasl"
 
-ipkg ${ALSA_LIB}
-ipkg -m acnb ${ALSA_UTILS}
+if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
+    # Audio
+    if [ "x${SOUND_CARD}" = "xyes" ]; then
+        # Needed by some packages, mostly audio applications.
+        #ipkg ${LIBOIL}
+
+        ipkg -m acnb ${NASM}
+
+        ipkg ${ALSA_LIB}
+        ipkg -m acnb ${ALSA_UTILS}
+
+        # Audio raw utilities
+        ipkg ${LIBSAMPLERATE}
+
+        # Audio file formats
+       ipkg ${LIBOGG}
+       ipkg ${LIBVORBIS}
+       ipkg -m acnb ${FLAC}
+       ipkg ${LAME}
+        ipkg ${LIBA52} "--enable-shared"
+
+       ipkg ${LIBID3TAG}
+       ipkg ${LIBMAD}
+
+        ipkg -m acnb ${LIBFAAC}
+        ipkg -m acnb ${LIBFAAD2}
+        ipkg ${LIBTHEORA}
+        ipkg ${XVIDCORE}
+
+        # Audio libraries
+       ipkg -m acnb ${AUDIOFILE}
+        ipkg ${PORTAUDIO}
+       ipkg ${LIBSNDFILE}
+
+        # Audio servers
+        ipkg ${SPEEX}
+       ipkg ${JACK} "--disable-portaudio"
+
+       ipkg ${ALSA_PLUGINS} # Depends on pulseaudio
+       ipkg ${VORBIS_TOOLS}
+
+       ipkg ${MOC}
+    fi
+fi
 
 write_completed_stage
 display_stage_build_stats

diff --git a/stage3/packages-update b/stage3/packages-update
index b882508..f3bd5de 100755 (executable)
--- a/stage3/packages-update
+++ b/stage3/packages-update
@@ -134,7 +134,44 @@ fi
 fpkg -s "gnupg" ${GNUPG} "ftp://ftp.gnupg.org/gcrypt"
 fpkg -m sf ${MUTT}
 
-fpkg ${ALSA_LIB}   "ftp://ftp.alsa-project.org/pub/lib"
-fpkg ${ALSA_UTILS} "ftp://ftp.alsa-project.org/pub/utils"
+
+if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
+    # Audio
+    if [ "x${SOUND_CARD}" = "xyes" ]; then
+
+        fpkg ${NASM} "http://www.nasm.us/pub/nasm/releasebuilds/$(get_pkg_ver \
+          ${NASM})"
+        fpkg ${ALSA_LIB}   "ftp://ftp.alsa-project.org/pub/lib"
+        fpkg ${ALSA_UTILS} "ftp://ftp.alsa-project.org/pub/utils"
+        ##fpkg -e "tar.gz" ${LIBOIL} "http://liboil.freedesktop.org/download"
+
+        fpkg -e "tar.gz" ${LIBSAMPLERATE} "http://www.mega-nerd.com/SRC"
+
+        fpkg -e "tar.gz" ${LIBOGG} "http://downloads.xiph.org/releases/ogg"
+        fpkg ${LIBVORBIS} "http://downloads.xiph.org/releases/vorbis"
+        fpkg -m sf ${FLAC}
+        fpkg -m sf ${LAME}
+        fpkg -m hv ${LIBA52}
+        fpkg -m hv ${LIBID3TAG}
+        fpkg -e "tar.gz" ${LIBMAD} "ftp://ftp.mars.org/pub/mpeg"
+
+        fpkg -m sf ${LIBFAAC}
+        fpkg ${LIBFAAD2} "http://downloads.sourceforge.net/faac"
+        fpkg ${LIBTHEORA} "http://downloads.xiph.org/releases/theora"
+        fpkg ${XVIDCORE} "http://downloads.xvid.org/downloads"
+
+        fpkg -e "tar.gz" ${AUDIOFILE} "http://www.68k.org/~michael/audiofile"
+        fpkg -e "tar.gz" -f "pa_stable_v19_20071207" ${PORTAUDIO} \
+          "http://www.portaudio.com/archives"
+        fpkg -e "tar.gz" ${LIBSNDFILE} "http://www.mega-nerd.com/libsndfile/files"
+
+        fpkg -e "tar.gz" ${SPEEX} "http://downloads.xiph.org/releases/speex"
+        fpkg -e "tar.gz" ${JACK} "http://jackaudio.org/downloads"
+        fpkg ${ALSA_PLUGINS} "ftp://ftp.alsa-project.org/pub/plugins"
+        fpkg -e "tar.gz" ${VORBIS_TOOLS} "http://downloads.xiph.org/releases/vorbis"
+
+        fpkg ${MOC} "ftp://ftp.daper.net/pub/soft/moc/stable"
+    fi
+fi
 
 exit $?

diff --git a/stage3/pkg/flac b/stage3/pkg/flac
new file mode 100644 (file)
index 0000000..7fbde67
--- /dev/null
+++ b/stage3/pkg/flac
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+hvconfig_pre()
+{
+    sed -e "s!#include <stdio.h>!&\n#include <string.h>!" -i \
+        ${LFS_TMP}/${PACKAGE}/examples/cpp/encode/file/main.cpp
+
+    CONFIGURE_OPTS="\
+        ${CONFIGURE_OPTS} \
+        --disable-thorough-test"
+}

diff --git a/stage3/pkg/libid3tag b/stage3/pkg/libid3tag
new file mode 100644 (file)
index 0000000..b489162
--- /dev/null
+++ b/stage3/pkg/libid3tag
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+hvbuild_post()
+{
+    # Some packages check for the pkg-config file for libid3tag.
+    # This file is particularly needed so that gst-plugins-ugly can
+    # recognize the installed libid3tag.
+    cat > /usr/lib/pkgconfig/id3tag.pc << "EOF"
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: id3tag
+Description: ID3 tag library
+Requires:
+Version: _LIBID3TAG_VERSION_
+Libs: -L${libdir} -lid3tag -lz
+Cflags: -I${includedir}
+EOF
+
+    sed -i -e "s!_LIBID3TAG_VERSION_!$(get_pkg_ver ${PACKAGE})!g" \
+        /usr/lib/pkgconfig/id3tag.pc
+}

diff --git a/stage3/pkg/libmad b/stage3/pkg/libmad
new file mode 100644 (file)
index 0000000..adf4045
--- /dev/null
+++ b/stage3/pkg/libmad
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+hvbuild_post()
+{
+    # Some packages check for the pkg-config file for libmad. This file is
+    # particularly needed so that Cdrdao can recognize the installed libmad.
+    cat > /usr/lib/pkgconfig/mad.pc << "EOF"
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: mad
+Description: MPEG audio decoder
+Requires:
+Version: _LIBMAD_VERSION_
+Libs: -L${libdir} -lmad
+Cflags: -I${includedir}
+EOF
+
+    sed -i -e "s!_LIBMAD_VERSION_!$(get_pkg_ver ${PACKAGE})!g" \
+        /usr/lib/pkgconfig/mad.pc
+}

diff --git a/stage3/pkg/xvidcore b/stage3/pkg/xvidcore
new file mode 100644 (file)
index 0000000..987d97c
--- /dev/null
+++ b/stage3/pkg/xvidcore
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+hvconfig()
+{
+    cd ${LFS_TMP}/${PACKAGE}/build/generic
+    ./configure \
+        --prefix=/usr
+}
+
+hvbuild_post()
+{
+    chmod -v 755 /usr/lib/libxvidcore.so.4.2
+    ln -v -sf libxvidcore.so.4.2 /usr/lib/libxvidcore.so.4
+    ln -v -sf libxvidcore.so.4   /usr/lib/libxvidcore.so
+}

diff --git a/stage5/pkg/libid3tag b/stage5/pkg/libid3tag
deleted file mode 100644 (file)
index b489162..0000000
--- a/stage5/pkg/libid3tag
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-hvbuild_post()
-{
-    # Some packages check for the pkg-config file for libid3tag.
-    # This file is particularly needed so that gst-plugins-ugly can
-    # recognize the installed libid3tag.
-    cat > /usr/lib/pkgconfig/id3tag.pc << "EOF"
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: id3tag
-Description: ID3 tag library
-Requires:
-Version: _LIBID3TAG_VERSION_
-Libs: -L${libdir} -lid3tag -lz
-Cflags: -I${includedir}
-EOF
-
-    sed -i -e "s!_LIBID3TAG_VERSION_!$(get_pkg_ver ${PACKAGE})!g" \
-        /usr/lib/pkgconfig/id3tag.pc
-}

diff --git a/stage5/pkg/libmad b/stage5/pkg/libmad
deleted file mode 100644 (file)
index adf4045..0000000
--- a/stage5/pkg/libmad
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-hvbuild_post()
-{
-    # Some packages check for the pkg-config file for libmad. This file is
-    # particularly needed so that Cdrdao can recognize the installed libmad.
-    cat > /usr/lib/pkgconfig/mad.pc << "EOF"
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: mad
-Description: MPEG audio decoder
-Requires:
-Version: _LIBMAD_VERSION_
-Libs: -L${libdir} -lmad
-Cflags: -I${includedir}
-EOF
-
-    sed -i -e "s!_LIBMAD_VERSION_!$(get_pkg_ver ${PACKAGE})!g" \
-        /usr/lib/pkgconfig/mad.pc
-}

diff --git a/stage5/pkg/xvidcore b/stage5/pkg/xvidcore
deleted file mode 100644 (file)
index 987d97c..0000000
--- a/stage5/pkg/xvidcore
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-hvconfig()
-{
-    cd ${LFS_TMP}/${PACKAGE}/build/generic
-    ./configure \
-        --prefix=/usr
-}
-
-hvbuild_post()
-{
-    chmod -v 755 /usr/lib/libxvidcore.so.4.2
-    ln -v -sf libxvidcore.so.4.2 /usr/lib/libxvidcore.so.4
-    ln -v -sf libxvidcore.so.4   /usr/lib/libxvidcore.so
-}