diff options
| author | tnut <thierryn1 at hispeed dot ch> | 2010-02-02 20:15:24 +0100 |
|---|---|---|
| committer | tnut <thierryn1 at hispeed dot ch> | 2010-02-02 20:15:24 +0100 |
| commit | 7ab7b078079db0ec8713067bd21d26fb1df8ff62 (patch) | |
| tree | e68d262f40945e547a793b2475da447a74673248 | |
| parent | ae548101a52d2c728afad7bad76874baa5ffa6e1 (diff) | |
| download | nutyx-extra-7ab7b078079db0ec8713067bd21d26fb1df8ff62.tar.gz nutyx-extra-7ab7b078079db0ec8713067bd21d26fb1df8ff62.tar.bz2 nutyx-extra-7ab7b078079db0ec8713067bd21d26fb1df8ff62.tar.xz nutyx-extra-7ab7b078079db0ec8713067bd21d26fb1df8ff62.zip | |
libmad, déplacé dans base et nettoyage du paquet
| -rw-r--r-- | base/libmad/.footprint (renamed from extra/libmad/.footprint) | 0 | ||||
| -rw-r--r-- | base/libmad/.md5sum (renamed from extra/libmad/.md5sum) | 1 | ||||
| -rwxr-xr-x | base/libmad/Pkgfile (renamed from extra/libmad/Pkgfile) | 9 | ||||
| -rw-r--r-- | base/libmad/libmad.patch (renamed from extra/libmad/libmad.patch) | 0 | ||||
| -rw-r--r-- | extra/libmad/mad.pc | 11 |
5 files changed, 4 insertions, 17 deletions
diff --git a/extra/libmad/.footprint b/base/libmad/.footprint index 0325aa9ae..0325aa9ae 100644 --- a/extra/libmad/.footprint +++ b/base/libmad/.footprint diff --git a/extra/libmad/.md5sum b/base/libmad/.md5sum index 10e9cd31c..21e2d9857 100644 --- a/extra/libmad/.md5sum +++ b/base/libmad/.md5sum @@ -1,3 +1,2 @@ 1be543bc30c56fb6bea1d7bf6a64e66c libmad-0.15.1b.tar.gz 2612dee908a8ab4ceae5c7e552c70ab0 libmad.patch -5cc156f1f0ba8c6226656244480da852 mad.pc diff --git a/extra/libmad/Pkgfile b/base/libmad/Pkgfile index 3fc11848b..d97d7a4b5 100755 --- a/extra/libmad/Pkgfile +++ b/base/libmad/Pkgfile @@ -2,18 +2,15 @@ # URL: http://www.underbit.com/products/mad/ # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: name=libmad version=0.15.1b release=2 source=(ftp://ftp.mars.org/pub/mpeg/$name-$version.tar.gz\ - mad.pc libmad.patch) + libmad.patch) build() { - mkdir -p $PKG/usr/lib/pkgconfig/ -# sed "s/#version#/$version/" mad.pc > $PKG/usr/lib/pkgconfig/mad.pc cd $name-$version patch -Np1 -i ../libmad.patch ./configure --prefix=/usr \ @@ -21,6 +18,7 @@ build() { --infodir=/usr/share/info make make DESTDIR=$PKG install + mkdir -p $PKG/usr/lib/pkgconfig cat > $PKG/usr/lib/pkgconfig/mad.pc << "EOF" prefix=/usr exec_prefix=${prefix} @@ -30,8 +28,9 @@ includedir=${prefix}/include Name: mad Description: MPEG audio decoder Requires: -Version: 0.15.1b +Version: #version# Libs: -L${libdir} -lmad Cflags: -I${includedir} EOF +sed -i "s/#version#/$version/" $PKG/usr/lib/pkgconfig/mad.pc } diff --git a/extra/libmad/libmad.patch b/base/libmad/libmad.patch index a6120254c..a6120254c 100644 --- a/extra/libmad/libmad.patch +++ b/base/libmad/libmad.patch diff --git a/extra/libmad/mad.pc b/extra/libmad/mad.pc deleted file mode 100644 index 7205d9ce2..000000000 --- a/extra/libmad/mad.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: mad -Description: MPEG audio decoder -Requires: -Version: #version# -Libs: -L${libdir} -lmad -Cflags: -I${includedir} |