flac: update to 1.3.0.

This commit is contained in:
Juan RP 2013-05-29 08:21:47 +02:00
parent a65167e26e
commit df7d815726
4 changed files with 8 additions and 50 deletions

View File

@ -1,9 +0,0 @@
--- autogen.sh.orig 2013-03-21 17:21:18.281013739 +0100
+++ autogen.sh 2013-03-21 17:21:23.960040231 +0100
@@ -124,6 +124,3 @@ echo " $AUTOMAKE --add-missing $AUTOMAK
$AUTOMAKE --add-missing $AUTOMAKE_FLAGS || exit 1
echo " autoconf"
autoconf || exit 1
-
-cd $olddir
-$srcdir/configure --enable-maintainer-mode "$@" && echo

View File

@ -1,22 +0,0 @@
--- configure.in.orig 2013-03-21 17:43:57.269562981 +0100
+++ configure.in 2013-03-21 17:44:23.956687605 +0100
@@ -44,7 +44,7 @@ AC_FUNC_FSEEKO
AC_CHECK_SIZEOF(void*,0)
#@@@ new name is AC_CONFIG_HEADERS
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AC_C_BIGENDIAN
@@ -256,8 +256,8 @@ AH_TEMPLATE(FLAC__HAS_OGG, [define if yo
fi
dnl check for i18n(internationalization); these are from libiconv/gettext
-AM_ICONV
-AM_LANGINFO_CODESET
+AC_DEFINE([HAVE_ICONV], [], [Whether we have libiconv available]) LIBICONV=""
+AC_SUBST(LIBICONV)
AC_CHECK_PROGS(DOCBOOK_TO_MAN, docbook-to-man docbook2man)
AM_CONDITIONAL(FLaC__HAS_DOCBOOK_TO_MAN, test -n "$DOCBOOK_TO_MAN")

View File

@ -1,10 +0,0 @@
--- examples/cpp/encode/file/main.cpp 2007-09-13 09:58:03.000000000 -0600
+++ examples/cpp/encode/file/main.cpp 2007-11-18 12:59:45.000000000 -0600
@@ -30,6 +30,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <cstring>
#include "FLAC++/metadata.h"
#include "FLAC++/encoder.h"

View File

@ -1,7 +1,7 @@
# Template file for 'flac' # Template file for 'flac'
pkgname=flac pkgname=flac
version=1.2.1 version=1.3.0
revision=6 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin" configure_args="--disable-rpath --disable-doxygen-docs --disable-xmms-plugin"
if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
@ -12,8 +12,8 @@ short_desc="Free Lossless Audio Codec"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://flac.sourceforge.net/" homepage="http://flac.sourceforge.net/"
license="BSD, GPL" license="BSD, GPL"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" distfiles="http://downloads.xiph.org/releases/flac/flac-${version}.tar.xz"
checksum=9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf checksum=fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc
long_desc=" long_desc="
FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, FLAC is FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, FLAC is
similar to MP3, but lossless. The FLAC project consists of: similar to MP3, but lossless. The FLAC project consists of:
@ -26,15 +26,15 @@ long_desc="
works)" works)"
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends="automake pkg-config" hostmakedepends="automake pkg-config libtool"
pre_configure() { pre_configure() {
./autogen.sh autoreconf -fi
} }
configure_args+=" --with-ogg=$XBPS_CROSS_BASE" configure_args+=" --with-ogg=$XBPS_CROSS_BASE"
fi fi
libflac_package() { libflac_package() {
short_desc="${short_desc} - shared libraries" short_desc+=" - shared libraries"
pkg_install() { pkg_install() {
vmove "usr/lib/*.so*" vmove "usr/lib/*.so*"
} }
@ -42,11 +42,10 @@ libflac_package() {
libflac-devel_package() { libflac-devel_package() {
depends="libstdc++-devel libogg-devel libflac>=${version}" depends="libstdc++-devel libogg-devel libflac>=${version}"
short_desc="${short_desc} - development files" short_desc+=" - development files"
pkg_install() { pkg_install() {
vmove usr/include vmove usr/include
vmove usr/lib/pkgconfig vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
vmove usr/share/aclocal vmove usr/share/aclocal
vmove usr/share/doc vmove usr/share/doc
} }