diff options
| author |   Stuart Shelton <stuart@shelton.me> | 2016-08-11 18:07:42 +0100 |
|---|---|---|
| committer | Stuart Shelton <stuart@shelton.me> | 2016-08-11 18:07:42 +0100 |
| commit | 4ace8147c40c80c13d7f87937da8df1cf4e873a6 (patch) | |
| tree | 622c33038eb6c9647b2af740540f1ff3f5e3f2e3 /media-libs | |
| parent | Update dev-lang/php-5.5.38, dev-lang/php-5.6.24 (diff) | |
| download | srcshelton-4ace8147c40c80c13d7f87937da8df1cf4e873a6.tar.gz srcshelton-4ace8147c40c80c13d7f87937da8df1cf4e873a6.tar.bz2 srcshelton-4ace8147c40c80c13d7f87937da8df1cf4e873a6.zip | |
Update media-libs/flac-1.3.1-r1
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/flac/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/flac/files/flac-1.3.1-x32.patch | 29 | ||||
| -rw-r--r-- | media-libs/flac/flac-1.3.1-r1.ebuild | 6 |
3 files changed, 31 insertions, 8 deletions
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest index 3597cbc8..3f453bb8 100644 --- a/media-libs/flac/Manifest +++ b/media-libs/flac/Manifest @@ -3,9 +3,9 @@ AUX flac-1.3.0-dontbuild-examples.patch 723 SHA256 8330ab837796cf94eb5c62c8ef787 AUX flac-1.3.0-dontbuild-tests.patch 2111 SHA256 31d1a8bb80d623db4cbac8182e3b2027b8498f9bf77d5baf38acea9558dea970 SHA512 50329cdb766111dbda41856363cbba74dc92e7348605e086697778e7004cce514ff9452c1d5bd72e327c9d7182af218e74d82625f6cdcb977a7dad1cf3d07995 WHIRLPOOL 4ab0ea936c6d4f9e28684f806c86dbe94bd082892ecdf4c5b4917cf3a738ad544e9f2336b678f904c2614b8e8c33aadf1326583605e5a6917e7fd87f1f5f4b00 AUX flac-1.3.0-metaflac_strcat.patch 503 SHA256 0a2efaa33e933d2fb3b8aca8cba7704e222edf68552ec283bf2c4f40e513a5a9 SHA512 461e0f11dd5e04e4ba05e535ff38fc8ae7a085686945b809715de232a1c14ff5721d6e7fb70f40025c2740789d90cda464ff008dda7880e1f147c936d0e41903 WHIRLPOOL 906503c9a8702c6e5d08efd6a0389648e4845b498e6db8fb4f7b959a53370777a2816ec85a91e008128f7bd9baafb80f9dd62b4470356fa518fc31abca3c4762 AUX flac-1.3.1-cflags.patch 786 SHA256 077cbb1c3254218e257bcee5ae1b22b5cadd02eba085163c8bc51da2041e1862 SHA512 4c639023861b8508d7a1be2bdafd4ff33d398b2399ce97350890b25394c4ebd9745d622053305723cc85acb2391b46364caba1cdbf3b3723a9cf05971306b7b0 WHIRLPOOL 54a918b35e656568663f0abb134191d5520866811a9c37631e5d48602987e2db2f842884c4c7eb1f764da82eb6bdbb27ec1a25e7e0cffbea60b159e347796985 -AUX flac-1.3.1-x32.patch 1398 SHA256 6073a3fbd8f3c200c1037679205cf33e7acfdc7675e64bf6518029c930dca8c3 SHA512 8a0014f7e850c774a9d4ed893488c877a629a3dac627b5ea8fdcd4f3b197a9fb24a60a03145277abfda5ab173e64328cbda9cc1c8ec9c82f51cd9672bc92694d WHIRLPOOL b4649d3273b6297786efefd814b8f1c44663ff932d6f3c49db5eaf5b2a928572486666e63b644796cf36f71c5ac138dc44d8a2cd5b23a50695d970553498630d +AUX flac-1.3.1-x32.patch 2085 SHA256 c8ed029c93e0def7ef290841c05dbe64183fedaefa835ba07d022e0a5f132ea0 SHA512 bc07359b03cdd2473555f67b9f47715a81d05a740b24118d3045cbf0330773475506c7d765c8494f150a43882a5f4a0753b20eb4ff01cdb6f46089c86fd9caea WHIRLPOOL 587395c18832b3f6fcaa86ecb808401b1a7878861516fde6c735394e888af0c74a26d58ab26fc67345cb5d28cbff8aeea31780617e4a56c3a00bcc8aa014cf11 DIST flac-1.3.0.tar.xz 1084256 SHA256 fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc SHA512 9f62a83c2041ec6f02c0df65b796a920a0cd6ba6c2c034bb69535bca5df57ed69f96fe4bb41c0d5ccc229241d90efd2c7ec3785662b5a582a8e20e2e991e6477 WHIRLPOOL e328f41db3aa7f6404a1596ac2fddd437fefc031fc9f1ea91420104054d338029120d526ac58b2a6994811a8f2f7cc107e120789113340e48dec842ea9013196 DIST flac-1.3.1.tar.xz 941848 SHA256 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c SHA512 923cd0ffe2155636febf2b4633791bc83370d57080461b97ebb69ea21a4b1be7c0ff376c7fc8ca3979af4714e761112114a24b49ff6c80228b58b929db6e96d5 WHIRLPOOL abda096c0c1392499a613cc99c917cd519a20936bb98390a466c971ee981385a0e249e80f0bdac27b1eb6566a3392c1a4cb6ff9a6695952f16127a0b290fa5d4 EBUILD flac-1.3.0-r1.ebuild 1838 SHA256 3ec9c33a0bb32b6d13d1e0a8d8f11e11039a640c3b63d4ec2677a44ff528fed2 SHA512 5460cc8b3d52f69564e69e6db08eb0f8ce26d33aa09cddd1813d51e70724e7de40f44cc6d1866a50ac50c81cb079734117da964796df3df8b04396abfdcb8353 WHIRLPOOL 15793fb8625d76bfe47c322eb24ff62ed15525be9c33f0fcc120df15575c219892d927e8465b96ae9630abc3a43b872e95c53b8cab076278fe6220652b0464a9 EBUILD flac-1.3.0.ebuild 1781 SHA256 eb0253edcc000b4cec7d5ba8f8eda102579f3399116026682af67b0c7d95a316 SHA512 9ae9f211126a1a0074c9bb6f5b0b391f417097b3ddbae1c9c6c1b42a58907af64519570d394b00e508c6a3e60e0c499c981afd0569866bf1aee6bf16a094090d WHIRLPOOL 04925ae120229ac3dc84759e0eb4320897bf20aac8e50d190375ded0b10589bf8c49183432c59c92a04a6977a60e513223b59ce19f90dc0046e89d2371674a9f -EBUILD flac-1.3.1-r1.ebuild 2079 SHA256 774aa11c6a847373a4ad4653c5b5efab700be87652f43a3070f49be86a3b2fb3 SHA512 ecb373a30f4b8876d880a242fc0643d505ba15a11e0a88f5961f434a095d8ebebed7dced7677dcb9a557e04f3a79ef543ad439194c6b5bb82e165a41bbabb091 WHIRLPOOL cd9338daaff42b28b393a49317854d69fe08a61ff1b80a41e015bd3f845e81e87f1066d8bfcff6048b90f1fdfd38bbed36be2356fb4c3206a7ec7dc3e7c40a72 +EBUILD flac-1.3.1-r1.ebuild 2084 SHA256 0bb6580ac3f6afd4e3302f596c549f5c8862b25841d8a20200afa68732a60ddf SHA512 fce7f339b4d13f613c8cafe74d6a10fdad48e6a6e8badd0589a049b60b8c2b823b6fe8ebc6240fdefcbf2b198d868761c20fdee9bc89384fdd36efdfb6b703ac WHIRLPOOL 612be929ff5f3d6124803c6d2e231d89af4fa7f777bbb83c689d22f80e29acc8567e7ac0d10d0a5ada1d40ccc445f5fb3736db1d8f73581d7c5493e6a45f9952 diff --git a/media-libs/flac/files/flac-1.3.1-x32.patch b/media-libs/flac/files/flac-1.3.1-x32.patch index e9b31878..e612f830 100644 --- a/media-libs/flac/files/flac-1.3.1-x32.patch +++ b/media-libs/flac/files/flac-1.3.1-x32.patch @@ -1,6 +1,27 @@ ---- configure.ac.dist 2015-03-07 15:03:56.570459411 +0000 -+++ configure.ac 2015-03-07 15:13:02.847469169 +0000 -@@ -105,19 +105,30 @@ +https://bugs.gentoo.org/574984 + +fix from upstream + +From 7566d3d4c11c16801e1c98093c4db33589451c17 Mon Sep 17 00:00:00 2001 +From: Erik de Castro Lopo <erikd@mega-nerd.com> +Date: Wed, 11 Mar 2015 20:51:42 +1100 +Subject: [PATCH] configure.ac : Tweak for x32 architecture. + +The x32 architecture uses and ILP32 (32 bit ints, longs and pointers) +on an x86_64 CPU. Since the CPU is x86_64 we need to set FLAC__CPU_X86_64 +even though the pointer size is 32 bits. + +Patch-from: Stuart Shelton +Closes: https://sourceforge.net/p/flac/bugs/427/ +--- + configure.ac | 37 ++++++++++++++++++++++++------------- + 1 file changed, 24 insertions(+), 13 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3b1c037e80f5..2dcc6987a03d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -105,19 +105,30 @@ AC_CHECK_SIZEOF(void*,1) asm_optimisation=no case "$host_cpu" in x86_64) @@ -44,3 +65,5 @@ ;; i*86) cpu_ia32=true +-- +2.9.0 diff --git a/media-libs/flac/flac-1.3.1-r1.ebuild b/media-libs/flac/flac-1.3.1-r1.ebuild index c5d18c18..63525a5e 100644 --- a/media-libs/flac/flac-1.3.1-r1.ebuild +++ b/media-libs/flac/flac-1.3.1-r1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: 79112a386a24de5573a15341324c32691aef3e97 $ +# $Id: 5d2f37248ab1b4343479d5b89c76689bbc0778e0 $ EAPI=5 AUTOTOOLS_AUTORECONF=1 AUTOTOOLS_PRUNE_LIBTOOL_FILES=all -inherit autotools autotools-multilib +inherit autotools-multilib DESCRIPTION="free lossless audio encoder and decoder" HOMEPAGE="http://flac.sourceforge.net" @@ -30,11 +30,11 @@ DEPEND="${RDEPEND} src_prepare() { local PATCHES=( - "${FILESDIR}"/${P}-x32.patch "${FILESDIR}"/${P}-cflags.patch "${FILESDIR}"/${PN}-1.3.0-asneeded.patch "${FILESDIR}"/${PN}-1.3.0-dontbuild-tests.patch "${FILESDIR}"/${PN}-1.3.0-dontbuild-examples.patch + "${FILESDIR}"/${PN}-1.3.1-x32.patch #574984 ) AT_M4DIR="m4" autotools-multilib_src_prepare |