From c8255b553f374a0d41f4a3a9882e02bd52b195b1 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Fri, 28 Sep 2007 13:03:56 +0000 Subject: Fix TEXTRELs using patch from PaX Team from bug 193222 and while at it, attempt to clean up ebuild a bit. Revert last commit restoring elibtoolize for fbsd since eautoreconf allready does libtoolize. Package-Manager: portage-2.1.3.9 --- media-libs/flac/ChangeLog | 10 +++- media-libs/flac/Manifest | 19 +++++-- media-libs/flac/files/digest-flac-1.2.1-r1 | 3 ++ media-libs/flac/files/flac-1.2.1-asm.patch | 80 ++++++++++++++++++++++++++++++ media-libs/flac/flac-1.2.1-r1.ebuild | 56 +++++++++++++++++++++ 5 files changed, 163 insertions(+), 5 deletions(-) create mode 100644 media-libs/flac/files/digest-flac-1.2.1-r1 create mode 100644 media-libs/flac/files/flac-1.2.1-asm.patch create mode 100644 media-libs/flac/flac-1.2.1-r1.ebuild (limited to 'media-libs/flac') diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog index feb1188209d1..5c48c565ac1a 100644 --- a/media-libs/flac/ChangeLog +++ b/media-libs/flac/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-libs/flac # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.121 2007/09/26 16:30:59 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.122 2007/09/28 13:03:55 drac Exp $ + +*flac-1.2.1-r1 (28 Sep 2007) + + 28 Sep 2007; Samuli Suominen + +files/flac-1.2.1-asm.patch, +flac-1.2.1-r1.ebuild: + Fix TEXTRELs using patch from PaX Team from bug 193222 and while at it, + attempt to clean up ebuild a bit. Revert last commit restoring elibtoolize + for fbsd since eautoreconf allready does libtoolize. 26 Sep 2007; Raúl Porcel flac-1.1.4.ebuild: alpha/ia64 stable wrt #191280 diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest index 0f1ca843ac5d..0254123eeab4 100644 --- a/media-libs/flac/Manifest +++ b/media-libs/flac/Manifest @@ -1,3 +1,7 @@ +AUX flac-1.2.1-asm.patch 2844 RMD160 7e2f1dbdf1dbe7c019089f5359f794123cb388f9 SHA1 9cf5708bcc181b66632868e95e23a84b0a1644af SHA256 b9a6d2011b9902924372316f3544e94cb066fe202e256b9696bf6cd6ee8a490b +MD5 123897707d3c91abadf526b9163a01c0 files/flac-1.2.1-asm.patch 2844 +RMD160 7e2f1dbdf1dbe7c019089f5359f794123cb388f9 files/flac-1.2.1-asm.patch 2844 +SHA256 b9a6d2011b9902924372316f3544e94cb066fe202e256b9696bf6cd6ee8a490b files/flac-1.2.1-asm.patch 2844 AUX flac-1.2.1-asneeded.patch 840 RMD160 42570f0d4c8bb6ff2f188e81952ac774fa9cfd0d SHA1 a87abf76cbc9db5cf65d6282cdfcf3b5cfcd329c SHA256 cb112fcc85fa57fb68e9fb0d1f735225132fb25b3cd41bb08febfc2d2154bb63 MD5 13689b8e6ff0c056bd0be6d61a5ddee4 files/flac-1.2.1-asneeded.patch 840 RMD160 42570f0d4c8bb6ff2f188e81952ac774fa9cfd0d files/flac-1.2.1-asneeded.patch 840 @@ -19,14 +23,18 @@ EBUILD flac-1.1.4.ebuild 1933 RMD160 208776e227b317247dbcfac4f362759b8624574d SH MD5 4599308870c6077ee49db00a81d4c834 flac-1.1.4.ebuild 1933 RMD160 208776e227b317247dbcfac4f362759b8624574d flac-1.1.4.ebuild 1933 SHA256 9b8efbef42f0a19dc9852b84a1bcb38506eb35adf081bf70b96d5213026df4a7 flac-1.1.4.ebuild 1933 +EBUILD flac-1.2.1-r1.ebuild 1445 RMD160 cc01639b65bfdaa1f59dded9452ce8375ff9b5a0 SHA1 4a5e8396ca885e09b44d9bef433ad315fe6e8473 SHA256 eac8b2bbc82a87bca8cd19f3e524cd3a5a240cfef266b20be6bb173a15c251b4 +MD5 b7adfa660db254f3ce6122a0345d2a6f flac-1.2.1-r1.ebuild 1445 +RMD160 cc01639b65bfdaa1f59dded9452ce8375ff9b5a0 flac-1.2.1-r1.ebuild 1445 +SHA256 eac8b2bbc82a87bca8cd19f3e524cd3a5a240cfef266b20be6bb173a15c251b4 flac-1.2.1-r1.ebuild 1445 EBUILD flac-1.2.1.ebuild 1565 RMD160 ff9435e0030f59710ac9a58d185a44e367bed1eb SHA1 d31bffd5dfdfbdf3af72ca46f9fb40eb76e47e23 SHA256 1e45dbb9485811b245e385455536370f59481b751fe35f0f4fd5d044727458e8 MD5 610829ef3a20bc539a7d9a6cf4297d8c flac-1.2.1.ebuild 1565 RMD160 ff9435e0030f59710ac9a58d185a44e367bed1eb flac-1.2.1.ebuild 1565 SHA256 1e45dbb9485811b245e385455536370f59481b751fe35f0f4fd5d044727458e8 flac-1.2.1.ebuild 1565 -MISC ChangeLog 16976 RMD160 8569feec2e5a44332aff697deac259875c4a2dc7 SHA1 988687194d70e61399da04da2de82045d2dd6d47 SHA256 485d686857ec40ccb1c616af9a1cf7a063867f7587784d008a6ba84cac604ff0 -MD5 3c4f6804325a19d9e84db4c1c159c596 ChangeLog 16976 -RMD160 8569feec2e5a44332aff697deac259875c4a2dc7 ChangeLog 16976 -SHA256 485d686857ec40ccb1c616af9a1cf7a063867f7587784d008a6ba84cac604ff0 ChangeLog 16976 +MISC ChangeLog 17313 RMD160 81658422fdef341bf2b17b6fb90e4130f22ef38c SHA1 bb6353ca5be55439e2ec45d49550c8178769b9ee SHA256 3025763571858d67f4ecd55074734e6b00ec9d318d3e9090fc389e1a9e6ffbec +MD5 106511c3580ffc45dc052721c12604c1 ChangeLog 17313 +RMD160 81658422fdef341bf2b17b6fb90e4130f22ef38c ChangeLog 17313 +SHA256 3025763571858d67f4ecd55074734e6b00ec9d318d3e9090fc389e1a9e6ffbec ChangeLog 17313 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158 @@ -40,3 +48,6 @@ SHA256 b89c8cb30133ab8c8b6bdefddb9e994fcfec1264c6a57c2155fca2470f369809 files/di MD5 8c7d52c68177f53a96c7e8abb29e76f2 files/digest-flac-1.2.1 235 RMD160 dd7c4777804d72a8a3b75166d75a029e24264033 files/digest-flac-1.2.1 235 SHA256 f5f86f0b423fbab0265a4ab7e1b20850e026cb20b63085c71ff2093f1556d78c files/digest-flac-1.2.1 235 +MD5 8c7d52c68177f53a96c7e8abb29e76f2 files/digest-flac-1.2.1-r1 235 +RMD160 dd7c4777804d72a8a3b75166d75a029e24264033 files/digest-flac-1.2.1-r1 235 +SHA256 f5f86f0b423fbab0265a4ab7e1b20850e026cb20b63085c71ff2093f1556d78c files/digest-flac-1.2.1-r1 235 diff --git a/media-libs/flac/files/digest-flac-1.2.1-r1 b/media-libs/flac/files/digest-flac-1.2.1-r1 new file mode 100644 index 000000000000..061357afea8b --- /dev/null +++ b/media-libs/flac/files/digest-flac-1.2.1-r1 @@ -0,0 +1,3 @@ +MD5 153c8b15a54da428d1f0fadc756c22c7 flac-1.2.1.tar.gz 2009217 +RMD160 bd3223c848054f0a75d11200b30f903bdd375bfc flac-1.2.1.tar.gz 2009217 +SHA256 9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf flac-1.2.1.tar.gz 2009217 diff --git a/media-libs/flac/files/flac-1.2.1-asm.patch b/media-libs/flac/files/flac-1.2.1-asm.patch new file mode 100644 index 000000000000..cc832eec74a2 --- /dev/null +++ b/media-libs/flac/files/flac-1.2.1-asm.patch @@ -0,0 +1,80 @@ +diff -urp flac-1.2.1-old/src/libFLAC/ia32/bitreader_asm.nasm flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm +--- flac-1.2.1-old/src/libFLAC/ia32/bitreader_asm.nasm 2007-03-30 02:54:53.000000000 +0200 ++++ flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm 2007-09-27 21:39:45.000000000 +0200 +@@ -140,8 +140,13 @@ cident FLAC__bitreader_read_rice_signed_ + %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE + mov edi, _FLAC__crc16_table + %else ++%ifdef OBJ_FORMAT_elf ++ mov edi, [esp + 16] ; saved ebx (GOT base) ++ lea edi, [edi + FLAC__crc16_table wrt ..gotoff] ++%else + mov edi, FLAC__crc16_table + %endif ++%endif + ;; eax (ax) crc a.k.a. br->read_crc + ;; ebx (bl) intermediate result index into FLAC__crc16_table[] + ;; ecx br->crc16_align +@@ -216,8 +221,13 @@ cident FLAC__bitreader_read_rice_signed_ + %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE + mov edi, _FLAC__crc16_table + %else ++%ifdef OBJ_FORMAT_elf ++ mov edi, [esp + 16] ; saved ebx (GOT base) ++ lea edi, [edi + FLAC__crc16_table wrt ..gotoff] ++%else + mov edi, FLAC__crc16_table + %endif ++%endif + ;; eax (ax) crc a.k.a. br->read_crc + ;; ebx (bl) intermediate result index into FLAC__crc16_table[] + ;; ecx br->crc16_align +@@ -315,8 +325,13 @@ cident FLAC__bitreader_read_rice_signed_ + %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE + call _bitreader_read_from_client_ + %else ++%ifdef OBJ_FORMAT_elf ++ mov ebx, [esp + 20] ; saved ebx (GOT base) ++ call bitreader_read_from_client_ wrt ..plt ++%else + call bitreader_read_from_client_ + %endif ++%endif + pop edx ; /* discard, unused */ + pop ecx ; /* restore */ + mov esi, [ebp + 16] ; cwords = br->consumed_words; +@@ -362,13 +377,20 @@ cident FLAC__bitreader_read_rice_signed_ + mov [ebp + 16], esi ; br->consumed_words = cwords; + mov [ebp + 20], ecx ; br->consumed_bits = cbits; + push ecx ; /* save */ ++ push ebx ; /* save */ + push ebp ; /* push br argument */ + %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE + call _bitreader_read_from_client_ + %else ++%ifdef OBJ_FORMAT_elf ++ mov ebx, [esp + 24] ; saved ebx (GOT base) ++ call bitreader_read_from_client_ wrt ..plt ++%else + call bitreader_read_from_client_ + %endif ++%endif + pop edx ; /* discard, unused */ ++ pop ebx ; /* restore */ + pop ecx ; /* restore */ + mov esi, [ebp + 16] ; cwords = br->consumed_words; + ; ucbits = (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits; +@@ -437,8 +459,13 @@ cident FLAC__bitreader_read_rice_signed_ + %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE + mov edi, _FLAC__crc16_table + %else ++%ifdef OBJ_FORMAT_elf ++ mov edi, [esp + 24] ; saved ebx (GOT base) ++ lea edi, [edi + FLAC__crc16_table wrt ..gotoff] ++%else + mov edi, FLAC__crc16_table + %endif ++%endif + ;; eax (ax) crc a.k.a. br->read_crc + ;; ebx (bl) intermediate result index into FLAC__crc16_table[] + ;; ecx br->crc16_align diff --git a/media-libs/flac/flac-1.2.1-r1.ebuild b/media-libs/flac/flac-1.2.1-r1.ebuild new file mode 100644 index 000000000000..d38e764e8cf2 --- /dev/null +++ b/media-libs/flac/flac-1.2.1-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/09/28 13:03:55 drac Exp $ + +inherit autotools eutils + +DESCRIPTION="free lossless audio encoder and decoder" +HOMEPAGE="http://flac.sourceforge.net" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="3dnow altivec debug doc ogg sse" + +RDEPEND="ogg? ( >=media-libs/libogg-1.1.3 )" +DEPEND="${RDEPEND} + x86? ( dev-lang/nasm ) + sys-apps/gawk + sys-devel/gettext + dev-util/pkgconfig" + +src_unpack() { + unpack ${A} + cd "${S}" + + # Stop using upstream CFLAGS. Fix building with + # ldflag asneeded on non glibc systems. Fix + # broken asm causing text relocations. + epatch "${FILESDIR}"/${P}-asneeded.patch + epatch "${FILESDIR}"/${P}-cflags.patch + epatch "${FILESDIR}"/${P}-asm.patch + + AT_M4DIR="m4" eautoreconf +} + +src_compile() { + econf $(use_enable ogg) \ + $(use_enable sse) \ + $(use_enable 3dnow) \ + $(use_enable altivec) \ + $(use_enable debug) \ + --disable-doxygen-docs \ + --disable-dependency-tracking \ + --disable-xmms-plugin + + emake || die "emake failed." +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed." + + rm -rf "${D}"/usr/share/doc/flac-1.2.1 + dodoc AUTHORS README + use doc && dohtml -r doc/html/* +} -- cgit v1.2.3-65-gdbad