From beae0a920501c63b44f9b6749156831a9a917414 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Mon, 6 Aug 2012 21:19:51 -0500 Subject: flac 1.21 --- abs/core/flac/PKGBUILD | 69 ++++++++++++++++--------- abs/core/flac/__changelog | 1 + abs/core/flac/flac-1.2.1-gcc-4.3-includes.patch | 11 ++++ abs/core/flac/flac-1.2.1-gcc43.patch | 10 ---- abs/core/flac/flac-linking.diff | 12 ----- abs/core/flac/xmms-plugin.patch | 11 ---- 6 files changed, 56 insertions(+), 58 deletions(-) create mode 100644 abs/core/flac/__changelog create mode 100644 abs/core/flac/flac-1.2.1-gcc-4.3-includes.patch delete mode 100644 abs/core/flac/flac-1.2.1-gcc43.patch delete mode 100644 abs/core/flac/flac-linking.diff delete mode 100644 abs/core/flac/xmms-plugin.patch diff --git a/abs/core/flac/PKGBUILD b/abs/core/flac/PKGBUILD index f28b964..a6cb0c2 100644 --- a/abs/core/flac/PKGBUILD +++ b/abs/core/flac/PKGBUILD @@ -1,32 +1,51 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Maintainer: Paul Mattal -# Contributor: Tom Newsom -pkgname=flac +# $Id: PKGBUILD 135033 2011-08-09 23:31:20Z eric $ +# Maintainer: Eric Bélanger + +pkgbase=flac +pkgname=('flac' 'flac-doc') pkgver=1.2.1 -pkgrel=2 -pkgdesc="Free Lossless Audio Codec" -license=('custom:Xiph' 'LGPL' 'GPL' 'FDL') +pkgrel=3 +arch=('i686' 'x86_64') url="http://flac.sourceforge.net/" -arch=(i686 x86_64) -options=('!libtool') -depends=('glibc' 'libogg' 'xmms') -makedepends=('nasm' 'xmms') -source=(http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz \ - flac-1.2.1-gcc43.patch) -md5sums=('153c8b15a54da428d1f0fadc756c22c7' '4922379f33c86792630b624ddc83b236') +license=('BSD' 'GPL') +depends=('libogg') +makedepends=('nasm' ) +options=('!libtool' '!makeflags') +source=(http://downloads.sf.net/sourceforge/${pkgbase}/${pkgbase}-${pkgver}.tar.gz + flac-1.2.1-gcc-4.3-includes.patch) +md5sums=('153c8b15a54da428d1f0fadc756c22c7' + 'b9d245422bbc547b18a72897366bea77') +sha1sums=('bd54354900181b59db3089347cc84ad81e410b38' + '7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560') build() { - # -j1 to get the xmms plugin working (from gentoo) - export MAKEFLAGS="-j1" - cd $startdir/src/$pkgname-$pkgver || return 1 - patch -Np1 -i $startdir/src/flac-1.2.1-gcc43.patch - ./configure --prefix=/usr --enable-shared --disable-sse \ - --disable-rpath --with-pic || return 1 - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 + cd "${srcdir}/${pkgbase}-${pkgver}" + patch -Np1 -i "${srcdir}/flac-1.2.1-gcc-4.3-includes.patch" + ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared \ + --disable-sse --disable-rpath --with-pic + make +} - # install license - install -Dm0644 $startdir/src/$pkgname-$pkgver/COPYING.Xiph \ - $startdir/pkg/usr/share/licenses/$pkgname/COPYING.Xiph +check() { + cd "${srcdir}/${pkgbase}-${pkgver}" + make check } +package_flac() { + pkgdesc="Free Lossless Audio Codec" + #optdepends=('xmms: for using the xmms plugin') + options=('!libtool' '!docs') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_flac-doc() { + pkgdesc="Developer documentation for the Free Lossless Audio Codec" + depends=('flac') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" -C doc install + install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/abs/core/flac/__changelog b/abs/core/flac/__changelog new file mode 100644 index 0000000..ba7c043 --- /dev/null +++ b/abs/core/flac/__changelog @@ -0,0 +1 @@ +removed xmms diff --git a/abs/core/flac/flac-1.2.1-gcc-4.3-includes.patch b/abs/core/flac/flac-1.2.1-gcc-4.3-includes.patch new file mode 100644 index 0000000..52fec8b --- /dev/null +++ b/abs/core/flac/flac-1.2.1-gcc-4.3-includes.patch @@ -0,0 +1,11 @@ +diff -Naur flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp +--- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp 2007-09-13 09:58:03.000000000 -0600 ++++ flac-1.2.1/examples/cpp/encode/file/main.cpp 2007-11-18 12:59:45.000000000 -0600 +@@ -30,6 +30,7 @@ + + #include + #include ++#include + #include "FLAC++/metadata.h" + #include "FLAC++/encoder.h" + diff --git a/abs/core/flac/flac-1.2.1-gcc43.patch b/abs/core/flac/flac-1.2.1-gcc43.patch deleted file mode 100644 index d8e8ab9..0000000 --- a/abs/core/flac/flac-1.2.1-gcc43.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43 2007-09-13 17:58:03.000000000 +0200 -+++ flac-1.2.1/examples/cpp/encode/file/main.cpp 2008-01-08 10:27:39.000000000 +0100 -@@ -29,6 +29,7 @@ - #endif - - #include -+#include - #include - #include "FLAC++/metadata.h" - #include "FLAC++/encoder.h" diff --git a/abs/core/flac/flac-linking.diff b/abs/core/flac/flac-linking.diff deleted file mode 100644 index 3f9f595..0000000 --- a/abs/core/flac/flac-linking.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur flac-1.1.2-orig/configure flac-1.1.2/configure ---- flac-1.1.2-orig/configure 2005-07-24 17:58:19.180907080 +0100 -+++ flac-1.1.2/configure 2005-07-24 17:58:59.139832400 +0100 -@@ -3462,7 +3462,7 @@ - # This must be Linux ELF. - linux-gnu*) - case $host_cpu in -- alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* ) -+ alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* | x86_64* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM diff --git a/abs/core/flac/xmms-plugin.patch b/abs/core/flac/xmms-plugin.patch deleted file mode 100644 index e5fcf2e..0000000 --- a/abs/core/flac/xmms-plugin.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/plugin_xmms/configure.c.old 2005-04-08 12:16:17.000000000 +0200 -+++ src/plugin_xmms/configure.c 2005-04-08 12:16:41.000000000 +0200 -@@ -61,7 +61,7 @@ - "", /* proxy_user */ - "", /* proxy_pass */ - FALSE, /* save_http_stream */ -- "", /* save_http_path */ -+ FALSE, /* save_http_path */ - FALSE, /* cast_title_streaming */ - FALSE /* use_udp_channel */ - }, -- cgit v0.12