Update the shipped version of ogg.m4 so that users of libflac don't get a ton of libtool warnings while linking.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 149 insertions, 3 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index 84895bb5c990..c3e1040fbe58 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/flac
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.149 2010/09/16 11:24:19 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.150 2011/03/28 04:38:44 ford_prefect Exp $
+
+*flac-1.2.1-r4 (28 Mar 2011)
+
+  28 Mar 2011; Arun Raghavan <ford_prefect@gentoo.org> +flac-1.2.1-r4.ebuild,
+  +files/flac-1.2.1-ogg-m4.patch:
+  Update the shipped version of ogg.m4 so that users of libflac don't get a ton
+  of libtool warnings while linking.
 
   16 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> flac-1.2.1-r3.ebuild:
   USE="static-libs" and punt .la files. Fix LICENSE. Remove USE="doc" as it
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index ddd9d6696dec..cd3ea3ed3c8d 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -4,8 +4,10 @@ AUX flac-1.2.1-cflags.patch 435 RMD160 49cb14f8c107fada76252a67e6ef693dcc0f82b1
 AUX flac-1.2.1-dontbuild-examples.patch 1014 RMD160 3d15c25b66c46815b2e3c72920de39616681fd90 SHA1 29c555097b6aa675ec93f8bbd26a7575cb1825ce SHA256 73e3ac8aa17bbe6d22f6c1b28993de35061e967a3a6c27d8e68261ba740d5e85
 AUX flac-1.2.1-dontbuild-tests.patch 2721 RMD160 9a66b075f1cede2f4f535ed46623cadabe3d80a3 SHA1 caa022ad88e81e296ebeb46ebd825b1a0ed8a399 SHA256 1fa075309ed3e42391d767a6401511b76baf0782702ff39eef06e38ea3bc3ed7
 AUX flac-1.2.1-gcc-4.3-includes.patch 423 RMD160 d7502f5185e8b9bcefbadfa30014b91cc0446267 SHA1 7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560 SHA256 b9826946fb8372cf7da1b68538bce9a6069c1be0e6e288cba5522ce977a1d8d4
+AUX flac-1.2.1-ogg-m4.patch 2852 RMD160 549bcb7ab47fbefd45ccd898bbe9134f93587903 SHA1 ec671ded035726e7ae998889b2a22174e3d94faa SHA256 7c8c2c4685894d429472cff0630a3873b7654fa0fcfe5f1048b23a71298fcd47
 DIST flac-1.2.1-embedded-m4.tar.bz2 8545 RMD160 13e8b95c28ebc9bbd9978f3d538dfedf1cdd5ef6 SHA1 c8d02e810e0e2131e81cb0e70da5f8594861bdf2 SHA256 a32bd229ba454be595e66fa257805951c4484aff9f8ec2116727ca2b8a48fea9
 DIST flac-1.2.1.tar.gz 2009217 RMD160 bd3223c848054f0a75d11200b30f903bdd375bfc SHA1 bd54354900181b59db3089347cc84ad81e410b38 SHA256 9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf
 EBUILD flac-1.2.1-r3.ebuild 1724 RMD160 dd778b6594dec928a35a7e075854207f7bc552a8 SHA1 4929373a2852f6a1148ecae80c543964d9382de0 SHA256 0c7a7cb938011e7e607b50615bfadf8575e714f8c4597f01f55d6d1882dbbdd2
-MISC ChangeLog 21317 RMD160 27dcdbb805c1d1de274a46a1394620aadcd3dad0 SHA1 9d9a9db1921d070ac0a2b81b0c3a06ae27551ddd SHA256 65ab0da9a9e6c72dbd5a6c13f256799b6572be4199eaaecf90114f3df7f1f8e8
+EBUILD flac-1.2.1-r4.ebuild 1772 RMD160 83f30b3d8d88f4f99c03bccd0cb4cb039df8fc12 SHA1 e8b95393bf90f82dfcab5f38397ca3f03411d68f SHA256 b5490f22b6b880f1cb037e0a8c12eb595a9411430fce0b8f44daa0cb3459cd46
+MISC ChangeLog 21580 RMD160 0c84a0e230c8a182dfe5c9a0cfacc2edf3285d6b SHA1 8ddbf619b4d3015c1c60e23305d104f50897755f SHA256 5b830143f145c0471f3adc263fad40e26cce6c2da25bf45336bdac1d43fa9d83
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-libs/flac/files/flac-1.2.1-ogg-m4.patch b/media-libs/flac/files/flac-1.2.1-ogg-m4.patch
new file mode 100644
index 000000000000..ed551d5f80f4
--- /dev/null
+++ b/media-libs/flac/files/flac-1.2.1-ogg-m4.patch
@@ -0,0 +1,67 @@
+diff -urNp flac-1.2.1-old/m4/ogg.m4 flac-1.2.1/m4/ogg.m4
+--- flac-1.2.1-old/m4/ogg.m4	2011-03-28 09:54:44.355000011 +0530
++++ flac-1.2.1/m4/ogg.m4	2011-03-28 09:54:55.721000010 +0530
+@@ -9,23 +9,29 @@ AC_DEFUN([XIPH_PATH_OGG],
+ [dnl 
+ dnl Get the cflags and libraries
+ dnl
+-AC_ARG_WITH(ogg,[  --with-ogg=PFX   Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="")
+-AC_ARG_WITH(ogg-libraries,[  --with-ogg-libraries=DIR   Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="")
+-AC_ARG_WITH(ogg-includes,[  --with-ogg-includes=DIR   Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="")
+-AC_ARG_ENABLE(oggtest, [  --disable-oggtest       Do not try to compile and run a test Ogg program],, enable_oggtest=yes)
++AC_ARG_WITH(ogg,AC_HELP_STRING([--with-ogg=PFX],[Prefix where libogg is installed (optional)]), ogg_prefix="$withval", ogg_prefix="")
++AC_ARG_WITH(ogg-libraries,AC_HELP_STRING([--with-ogg-libraries=DIR],[Directory where libogg library is installed (optional)]), ogg_libraries="$withval", ogg_libraries="")
++AC_ARG_WITH(ogg-includes,AC_HELP_STRING([--with-ogg-includes=DIR],[Directory where libogg header files are installed (optional)]), ogg_includes="$withval", ogg_includes="")
++AC_ARG_ENABLE(oggtest,AC_HELP_STRING([--disable-oggtest],[Do not try to compile and run a test Ogg program]),, enable_oggtest=yes)
+ 
+   if test "x$ogg_libraries" != "x" ; then
+     OGG_LIBS="-L$ogg_libraries"
++  elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then
++    OGG_LIBS=""
+   elif test "x$ogg_prefix" != "x" ; then
+     OGG_LIBS="-L$ogg_prefix/lib"
+   elif test "x$prefix" != "xNONE" ; then
+     OGG_LIBS="-L$prefix/lib"
+   fi
+ 
+-  OGG_LIBS="$OGG_LIBS -logg"
++  if test "x$ogg_prefix" != "xno" ; then
++    OGG_LIBS="$OGG_LIBS -logg"
++  fi
+ 
+   if test "x$ogg_includes" != "x" ; then
+     OGG_CFLAGS="-I$ogg_includes"
++  elif test "x$ogg_prefix" = "xno" || test "x$ogg_prefix" = "xyes" ; then
++    OGG_CFLAGS=""
+   elif test "x$ogg_prefix" != "x" ; then
+     OGG_CFLAGS="-I$ogg_prefix/include"
+   elif test "x$prefix" != "xNONE"; then
+@@ -33,7 +39,12 @@ AC_ARG_ENABLE(oggtest, [  --disable-oggt
+   fi
+ 
+   AC_MSG_CHECKING(for Ogg)
+-  no_ogg=""
++  if test "x$ogg_prefix" = "xno" ; then
++    no_ogg="disabled"
++    enable_oggtest="no"
++  else
++    no_ogg=""
++  fi
+ 
+ 
+   if test "x$enable_oggtest" = "xyes" ; then
+@@ -62,9 +73,12 @@ int main ()
+        LIBS="$ac_save_LIBS"
+   fi
+ 
+-  if test "x$no_ogg" = "x" ; then
++  if test "x$no_ogg" = "xdisabled" ; then
++     AC_MSG_RESULT(no)
++     ifelse([$2], , :, [$2])
++  elif test "x$no_ogg" = "x" ; then
+      AC_MSG_RESULT(yes)
+-     ifelse([$1], , :, [$1])     
++     ifelse([$1], , :, [$1])
+   else
+      AC_MSG_RESULT(no)
+      if test -f conf.oggtest ; then
diff --git a/media-libs/flac/flac-1.2.1-r4.ebuild b/media-libs/flac/flac-1.2.1-r4.ebuild
new file mode 100644
index 000000000000..2e0ae976ca59
--- /dev/null
+++ b/media-libs/flac/flac-1.2.1-r4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r4.ebuild,v 1.1 2011/03/28 04:38:44 ford_prefect Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="free lossless audio encoder and decoder"
+HOMEPAGE="http://flac.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}-embedded-m4.tar.bz2"
+
+LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="3dnow altivec +cxx debug ogg sse static-libs"
+
+RDEPEND="ogg? ( >=media-libs/libogg-1.1.3 )"
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	!elibc_uclibc? ( sys-devel/gettext )
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-cflags.patch \
+		"${FILESDIR}"/${P}-asm.patch \
+		"${FILESDIR}"/${P}-dontbuild-tests.patch \
+		"${FILESDIR}"/${P}-dontbuild-examples.patch \
+		"${FILESDIR}"/${P}-gcc-4.3-includes.patch \
+		"${FILESDIR}"/${P}-ogg-m4.patch
+
+	cp "${WORKDIR}"/*.m4 m4 || die
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--disable-dependency-tracking \
+		$(use_enable debug) \
+		$(use_enable sse) \
+		$(use_enable 3dnow) \
+		$(use_enable altivec) \
+		--disable-doxygen-docs \
+		--disable-xmms-plugin \
+		$(use_enable cxx cpplibs) \
+		$(use_enable ogg) \
+		--disable-examples
+}
+
+src_test() {
+	if [ $UID != 0 ]; then
+		emake check || die
+	else
+		ewarn "Tests will fail if ran as root, skipping."
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	rm -rf "${D}"/usr/share/doc/${P}
+	dodoc AUTHORS README
+	dohtml -r doc/html/*
+
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}