From: gobo72 Date: Tue, 20 Apr 2010 23:28:41 +0000 (+0000) Subject: Fetch audio utilities ok X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=2f337c932e5c659d31b4860d4414dde540cb74bb;p=hvlinux.git Fetch audio utilities ok --- diff --git a/functions-update b/functions-update index 93ddb15..d56e2bf 100644 --- a/functions-update +++ b/functions-update @@ -96,11 +96,17 @@ static_checkpatch() local PATCHES_LIST=${2} local PATCHES_URL=${3} - local PATCHES_FOUND=$(cat ${PATCHES_LIST} | grep "${PACK}-" | sed "s/.*\(${PACK}-.*\.patch\).*/\1/") + # Remplace les "+" par "%2B" + local PACK_URL=$(echo $PACK | sed s!\+!%2B!g) + + local PATCHES_FOUND=$(cat ${PATCHES_LIST} | grep "${PACK_URL}-" | sed "s/.*\(${PACK_URL}-.*\.patch\).*/\1/") if [ -n "${PATCHES_FOUND}" ]; then for p in ${PATCHES_FOUND}; do - if [ ! -f ${LFS_PKG_DIR}/${p} ]; then - rcmd "Fetching ${p} from ${PATCHES_URL}" ${WGETCMD} ${PATCHES_URL}/${p} + # Remplace les "%2B" par "+" + PATCH_NAME=$(echo ${p} | sed s!%2B!\+!g) + + if [ ! -f ${LFS_PKG_DIR}/${PATCH_NAME} ]; then + rcmd "Fetching ${PATCH_NAME} from ${PATCHES_URL}" ${WGETCMD} ${PATCHES_URL}/${p} fi done fi diff --git a/packages-list b/packages-list index 53ae236..43fa46b 100644 --- a/packages-list +++ b/packages-list @@ -5,11 +5,11 @@ ABIWORD="abiword-2.6.4" AGG="agg-2.5" -ALSA_DRIVER="alsa-driver-1.0.15" -ALSA_LIB="alsa-lib-1.0.15" -ALSA_PLUGINS="alsa-plugins-1.0.15" -ALSA_UTILS="alsa-utils-1.0.15" -ALSA_OSS="alsa-oss-1.0.15" +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.21" APR="apr-1.3.9" APR_UTIL="apr-util-1.3.9" @@ -225,7 +225,7 @@ IPROUTE2="iproute2-2.6.29-1" IPTABLES="iptables-1.3.8" ISO_CODES="iso-codes-3.11" -JACK="jack-audio-connection-kit-0.103.0" +JACK="jack-audio-connection-kit-0.118.0" JADETEX="jadetex-3.13" JASPER="jasper-1.900.1" JAVA="jre-1.6.0_05" @@ -235,7 +235,7 @@ KERBEROS5="krb5-1.4.1" KERNEL="linux-2.6.32.9" KVM="kvm-84" -LAME="lame-3.97" +LAME="lame-398-2" LCMS="lcms-1.18a" LESS="less-436" LESSTIF="lesstif-0.95.2" @@ -264,20 +264,20 @@ LIBMNG="libmng-1.0.10" LIBMUSICBRAINZ="libmusicbrainz-2.1.5" LIBNOTIFY="libnotify-0.4.4" LIBOGG="libogg-1.1.4" -LIBOIL="liboil-0.3.15" +LIBOIL="liboil-0.3.17" LIBOPENJPEG="libopenjpeg-1.2" LIBPCAP="libpcap-1.0.0" LIBPNG="libpng-1.2.39" LIBPROXY="libproxy-0.2.3" LIBPTHREAD_STUBS="libpthread-stubs-0.1" LIBRSVG="librsvg-2.26.0" -LIBSAMPLERATE="libsamplerate-0.1.2" +LIBSAMPLERATE="libsamplerate-0.1.7" LIBSIGCPP="libsigc++-2.2.4.2" -LIBSNDFILE="libsndfile-1.0.18pre18" +LIBSNDFILE="libsndfile-1.0.21" LIBSOUP="libsoup-2.28.2" LIBSPF2="libspf2-1.2.5" LIBTASN1="libtasn1-2.3" -LIBTHEORA="libtheora-1.0" +LIBTHEORA="libtheora-1.1.1" LIBTOOL="libtool-2.2.6a" LIBVORBIS="libvorbis-1.2.3" VORBIS_TOOLS="vorbis-tools-1.2.0" @@ -287,7 +287,7 @@ LIBWNCK="libwnck-2.28.0" LIBXKLAVIER="libxklavier-5.0" LIBXML2="libxml2-2.7.6" LIBXSLT="libxslt-1.1.26" -LILYPOND="lilypond-2.12.2" +LILYPOND="lilypond-2.12.3" LTSP_UTILS="ltsp-utils-0.25-0" MAILMAN="mailman-2.1.8" @@ -329,7 +329,7 @@ PCMANFM="pcmanfm-0.5" PCRE="pcre-8.00" PERL="perl-5.10.1" PERL_MOD_PDL="PDL-2.4.6" -PERL_MOD_PARSE_REDESCENT="Parse-RecDescent-1.963" +PERL_MOD_PARSE_REDESCENT="Parse-RecDescent-1.965001" PERL_MOD_XML_WRITER="XML-Writer-0.606" PERL_MOD_XML_PARSER="XML-Parser-2.36" PERL_MOD_XML_SIMPLE="XML-Simple-2.18" @@ -347,13 +347,13 @@ POLICYKIT="PolicyKit-0.9" POPPLER="poppler-0.12.4" PKG_CONFIG="pkg-config-0.23" POPT="popt-1.15" -PORTAUDIO="portaudio-v19_061121" +PORTAUDIO="portaudio-v19_20071207" PORTMAP="portmap-6.0" PPL="ppl-0.10.2" PROCMAIL="procmail-3.22" PROCPS="procps-3.2.8" PSMISC="psmisc-22.9" -PULSEAUDIO="pulseaudio-0.9.12" +PULSEAUDIO="pulseaudio-0.9.21" PYCAIRO="pycairo-1.8.8" PYGOBJECT="pygobject-2.20.0" PYGTK="pygtk-2.16.0" @@ -396,7 +396,7 @@ SYSKLOGD="sysklogd-1.5" SYSVINIT="sysvinit-2.86" T1LIB="t1lib-5.1.2" -TANGO_ICON_THEME="tango-icon-theme-0.8.1" +TANGO_ICON_THEME="tango-icon-theme-0.8.90" TANGO_ICON_THEME_EXTRAS="tango-icon-theme-extras-0.1.0" TAR_PACKAGE="tar-1.22" TCPDUMP="tcpdump-4.0.0" diff --git a/stage3/cis-pm b/stage3/cis-pm deleted file mode 100755 index ace1555..0000000 --- a/stage3/cis-pm +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -set -o errexit - -# First argument of this script is the package name. -# Remaining arguments are additional configure options. - -# Reading system configuration informations, functions and package versions. -source ../sysinfos -source ../functions -source ../packages-list - -PACKAGE=${1} -shift -CONFIGURE_OPTS=${*} - -# Applying patches (if any) -apply_patches ${PACKAGE} - -cd ${LFS_TMP}/${PACKAGE} -# The option "-n" is used to avoid having to answer a question and accept the -# default configuration. -perl Makefile.PL -n ${CONFIGURE_OPTS} -make -make install -ldconfig - -exit $? diff --git a/stage5/cis-pm b/stage5/cis-pm new file mode 100755 index 0000000..ace1555 --- /dev/null +++ b/stage5/cis-pm @@ -0,0 +1,27 @@ +#!/bin/sh +set -o errexit + +# First argument of this script is the package name. +# Remaining arguments are additional configure options. + +# Reading system configuration informations, functions and package versions. +source ../sysinfos +source ../functions +source ../packages-list + +PACKAGE=${1} +shift +CONFIGURE_OPTS=${*} + +# Applying patches (if any) +apply_patches ${PACKAGE} + +cd ${LFS_TMP}/${PACKAGE} +# The option "-n" is used to avoid having to answer a question and accept the +# default configuration. +perl Makefile.PL -n ${CONFIGURE_OPTS} +make +make install +ldconfig + +exit $? diff --git a/stage5/packages-update b/stage5/packages-update index 6dcddea..b6199d5 100755 --- a/stage5/packages-update +++ b/stage5/packages-update @@ -98,59 +98,55 @@ fpkg_sf ${JADETEX} fpkg -e tar.gz -s "${SANE_BACKENDS}" ${SANE_BACKENDS} "ftp://ftp.sane-project.org/pub/sane" fpkg -e tar.gz -s "xsane" ${XSANE} "ftp://ftp.sane-project.org/pub/sane" -exit 1 -exit 1 - fpkg ${PERL_MOD_XML_SIMPLE} "http://www.cpan.org/modules/by-module/XML" -fpkg ${PERL_MOD_PARSE_REDESCENT} "http://www.cpan.org/modules/by-module/Parse" +fpkg ${PERL_MOD_PARSE_REDESCENT} "http://search.cpan.org/CPAN/authors/id/D/DC/DCONWAY" fpkg ${ICON_NAMING_UTILS} "http://tango.freedesktop.org/releases" -fpkg ${TANGO_ICON_THEME} "http://tango-project.org/releases" -fpkg ${TANGO_ICON_THEME_EXTRAS} "http://tango-project.org/releases" - - - +fpkg ${TANGO_ICON_THEME} "http://tango.freedesktop.org/releases" +fpkg ${TANGO_ICON_THEME_EXTRAS} "http://tango.freedesktop.org/releases" +fpkg ${LIBOIL} "http://liboil.freedesktop.org/download" -fpkg_sf ${JACK} "jackit" fpkg ${ALSA_LIB} "ftp://ftp.alsa-project.org/pub/lib" -fpkg ${ALSA_PLUGINS} "ftp://ftp.alsa-project.org/pub/plugins" fpkg ${ALSA_UTILS} "ftp://ftp.alsa-project.org/pub/utils" fpkg ${ALSA_OSS} "ftp://ftp.alsa-project.org/pub/oss-lib" -# Multimedia libraries and drivers. -fpkg ${AUDIOFILE} "http://www.68k.org/~michael/audiofile" -fpkg_gnome ${ESOUND} - fpkg ${LIBSAMPLERATE} "http://www.mega-nerd.com/SRC" -fpkg ${LIBOIL} "http://liboil.freedesktop.org/download" -fpkg ${SPEEX} "http://downloads.xiph.org/releases/speex" -fpkg ${PULSEAUDIO} "http://0pointer.de/lennart/projects/pulseaudio" - -# Temporaire, version beta -fpkg ${LIBSNDFILE} "http://www.mega-nerd.com/tmp" -#fpkg ${LIBSNDFILE} "http://www.mega-nerd.com/libsndfile" fpkg ${LIBOGG} "http://downloads.xiph.org/releases/ogg" fpkg ${LIBVORBIS} "http://downloads.xiph.org/releases/vorbis" -fpkg ${LIBTHEORA} "http://downloads.xiph.org/releases/theora" - fpkg_hv ${FLAC} -fpkg_hv ${FFMPEG} -fpkg ${XVIDCORE} "http://downloads.xvid.org/downloads" - -# Audio utilities fpkg_sf ${LAME} -fpkg ${VORBIS_TOOLS} "http://downloads.xiph.org/releases/vorbis" fpkg_hv ${LIBA52} fpkg_hv ${LIBID3TAG} fpkg ${LIBMAD} "ftp://ftp.mars.org/pub/mpeg" + fpkg_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 ${AUDIOFILE} "http://www.68k.org/~michael/audiofile" +fpkg_hv ${PORTAUDIO} +fpkg ${LIBSNDFILE} "http://www.mega-nerd.com/libsndfile" + +#fpkg_gnome ${ESOUND} +fpkg ${SPEEX} "http://downloads.xiph.org/releases/speex" +###fpkg ${PULSEAUDIO} "http://0pointer.de/lennart/projects/pulseaudio" +fpkg_sf ${JACK} "jackit" + +fpkg ${ALSA_PLUGINS} "ftp://ftp.alsa-project.org/pub/plugins" +fpkg ${VORBIS_TOOLS} "http://downloads.xiph.org/releases/vorbis" + fpkg_sf ${GRIP} fpkg_sf ${CDRDAO} -fpkg_hv ${PORTAUDIO} fpkg_hv ${SWEEP} +fpkg_sf ${EASYTAG} fpkg ${LILYPOND} "http://lilypond.org/download/sources/v$(get_pkg_ver_base ${LILYPOND})" + +fpkg_hv ${FFMPEG} + +exit 1 + fpkg ${SYLPHEED} "http://sylpheed.good-day.net/sylpheed/v$(get_pkg_ver_base ${SYLPHEED})" fpkg_hv ${NSS} diff --git a/stage5/stage5-install b/stage5/stage5-install index 8c41429..cd267f7 100755 --- a/stage5/stage5-install +++ b/stage5/stage5-install @@ -115,9 +115,6 @@ if [ "x${SANE_SUPPORT}" = "xyes" ]; then ipkg_cust ${XSANE} cis-xsane fi - -exit 1 - ipkg_pm ${PERL_MOD_XML_SIMPLE} ipkg_pm ${PERL_MOD_PARSE_REDESCENT} ipkg_ac ${ICON_NAMING_UTILS}