diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-12-02 13:10:56 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-12-02 13:10:56 +0000 |
commit | e1089863f1d20130e7a3edb738c3d690c7244e99 (patch) | |
tree | 508bc0fb6c9653d90775b9ea79e39abcad54ca68 /media-libs | |
parent | Fix crash on first time run. (diff) | |
download | gentoo-2-e1089863f1d20130e7a3edb738c3d690c7244e99.tar.gz gentoo-2-e1089863f1d20130e7a3edb738c3d690c7244e99.tar.bz2 gentoo-2-e1089863f1d20130e7a3edb738c3d690c7244e99.zip |
Added patch to make flac dependency optional. See bug #114228.
(Portage version: 2.0.53)
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/libsndfile/ChangeLog | 9 | ||||
-rw-r--r-- | media-libs/libsndfile/Manifest | 13 | ||||
-rw-r--r-- | media-libs/libsndfile/files/digest-libsndfile-1.0.12-r1 (renamed from media-libs/libsndfile/files/digest-libsndfile-1.0.12) | 0 | ||||
-rw-r--r-- | media-libs/libsndfile/files/libsndfile-1.0.12-flac.patch | 30 | ||||
-rw-r--r-- | media-libs/libsndfile/libsndfile-1.0.12-r1.ebuild (renamed from media-libs/libsndfile/libsndfile-1.0.12.ebuild) | 14 |
5 files changed, 50 insertions, 16 deletions
diff --git a/media-libs/libsndfile/ChangeLog b/media-libs/libsndfile/ChangeLog index facaf9dc381a..85e533db48f0 100644 --- a/media-libs/libsndfile/ChangeLog +++ b/media-libs/libsndfile/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/libsndfile # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.44 2005/10/30 18:12:12 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.45 2005/12/02 13:10:56 flameeyes Exp $ + +*libsndfile-1.0.12-r1 (02 Dec 2005) + + 02 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> + +files/libsndfile-1.0.12-flac.patch, -libsndfile-1.0.12.ebuild, + +libsndfile-1.0.12-r1.ebuild: + Added patch to make flac dependency optional. See bug #114228. 30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> libsndfile-1.0.12.ebuild: diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest index ca524c47cc90..bcde9ab179cb 100644 --- a/media-libs/libsndfile/Manifest +++ b/media-libs/libsndfile/Manifest @@ -1,22 +1,13 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 29d91d960cb87853f5d01b4f2b078a03 ChangeLog 5908 MD5 a2f27725a7da73281e185f3fed80c16c files/digest-libsndfile-1.0.10 69 MD5 03568645ed600c683b4289c8a28a3beb files/digest-libsndfile-1.0.11 69 MD5 9e77b0bf2411d3be746027a39b01c99f files/digest-libsndfile-1.0.12 69 +MD5 9e77b0bf2411d3be746027a39b01c99f files/digest-libsndfile-1.0.12-r1 69 MD5 69310df3755bad8a23a2dd9de6425318 files/digest-libsndfile-1.0.5 68 MD5 741beed3c7e02485d6a453ebefaa6f69 files/digest-libsndfile-1.0.9 68 MD5 8b60e2e17a0b68294f919d3d25a26550 libsndfile-1.0.10.ebuild 1107 MD5 63e795bdf2a38036f28c30b1cc359aa8 libsndfile-1.0.11.ebuild 1069 -MD5 0998e0beb954aec6f153706b07b4905b libsndfile-1.0.12.ebuild 1182 +MD5 e5c2bba2bd0929cac7866990a72effef libsndfile-1.0.12-r1.ebuild 1282 MD5 bfcdcbdea917b696ff7e03c25cf84323 libsndfile-1.0.5.ebuild 731 MD5 90f661dd7cf7029a4c8f00b74da652e5 libsndfile-1.0.9.ebuild 758 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDZQ0Jj5H05b2HAEkRAv5mAJ98k8XJDadoZiSCCLi9rJ6ie/Nm1gCfTR7T -IdB3DsL04+QINkBzqWGx9/U= -=RZ5K ------END PGP SIGNATURE----- diff --git a/media-libs/libsndfile/files/digest-libsndfile-1.0.12 b/media-libs/libsndfile/files/digest-libsndfile-1.0.12-r1 index e71d343cc831..e71d343cc831 100644 --- a/media-libs/libsndfile/files/digest-libsndfile-1.0.12 +++ b/media-libs/libsndfile/files/digest-libsndfile-1.0.12-r1 diff --git a/media-libs/libsndfile/files/libsndfile-1.0.12-flac.patch b/media-libs/libsndfile/files/libsndfile-1.0.12-flac.patch new file mode 100644 index 000000000000..38599e673ec3 --- /dev/null +++ b/media-libs/libsndfile/files/libsndfile-1.0.12-flac.patch @@ -0,0 +1,30 @@ +Make flac dependency optional by providing a --without-flac option, as +requested in bug #114228. + +Index: libsndfile-1.0.12/configure.ac +=================================================================== +--- libsndfile-1.0.12.orig/configure.ac ++++ libsndfile-1.0.12/configure.ac +@@ -322,15 +322,19 @@ if test x$ac_cv_header_alsa_asoundlib_h + #==================================================================================== + # Check for FLAC + +-FLAC_LIBS="" +-AC_CHECK_HEADERS(FLAC/all.h) +-if test x$ac_cv_header_FLAC_all_h = xyes ; then ++AC_ARG_WITH([flac], AC_HELP_STRING([--without-flac], [Disable FLAC support (default: check)])) ++ ++if test "x$with_flac" != "xno"; then ++ FLAC_LIBS="" ++ AC_CHECK_HEADERS(FLAC/all.h) ++ if test x$ac_cv_header_FLAC_all_h = xyes ; then + AC_CHECK_LIB(FLAC, FLAC__seekable_stream_encoder_set_tell_callback, HAVE_FLAC_1_1_1="yes") + if test "x$HAVE_FLAC_1_1_1" = xyes ; then + AC_DEFINE(HAVE_FLAC_1_1_1, [1], [Define to 1 if you have libflac 1.1.1]) + fi + FLAC_LIBS="-lFLAC" + fi ++fi + + #==================================================================================== + # Test for sanity when cross-compiling. diff --git a/media-libs/libsndfile/libsndfile-1.0.12.ebuild b/media-libs/libsndfile/libsndfile-1.0.12-r1.ebuild index 29d4ea5ec955..810c9bc8f56e 100644 --- a/media-libs/libsndfile/libsndfile-1.0.12.ebuild +++ b/media-libs/libsndfile/libsndfile-1.0.12-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.12.ebuild,v 1.3 2005/10/30 18:12:12 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.12-r1.ebuild,v 1.1 2005/12/02 13:10:56 flameeyes Exp $ -inherit eutils libtool +inherit eutils libtool autotools DESCRIPTION="A C library for reading and writing files containing sampled sound" HOMEPAGE="http://www.mega-nerd.com/libsndfile/" @@ -11,14 +11,19 @@ SRC_URI="http://www.mega-nerd.com/libsndfile/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86" -IUSE="static sqlite" +IUSE="static sqlite flac" -RDEPEND="media-libs/flac +RDEPEND="flac? ( media-libs/flac ) sqlite? ( >=dev-db/sqlite-3.2 )" src_unpack() { unpack ${A} cd ${S} + + epatch "${FILESDIR}/${P}-flac.patch" + + eautoreconf + epunt_cxx elibtoolize } @@ -27,6 +32,7 @@ src_compile() { econf \ $(use_enable sqlite) \ $(use_enable static) \ + $(use_with flac) \ --disable-dependency-tracking # fix this weird doc installation directory libsndfile decides |