| [proaudio] [2410] Fix jack-1.9.9.5 build when opus_custom.h is missing |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2410
Author: nedko
Date: 2013-01-29 23:39:49 +0100 (Tue, 29 Jan 2013)
Log Message:
-----------
Fix jack-1.9.9.5 build when opus_custom.h is missing
https://bugs.gentoo.org/show_bug.cgi?id=453398
The patch is a backport from the upstream git repo
Package-Manager: portage-2.1.11.31
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.9.5.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-1.9.9.5-opus_custom.patch
Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog 2013-01-29 20:08:13 UTC (rev 2409)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/ChangeLog 2013-01-29 22:39:49 UTC (rev 2410)
@@ -2,6 +2,15 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 29 Jan 2013; Nedko Arnaudov <nedko@xxxxxxxxxxxxx>
+ jack-audio-connection-kit-1.9.9.5.ebuild,
+ +files/jack-1.9.9.5-opus_custom.patch:
+ Fix jack-1.9.9.5 build when opus_custom.h is missing
+
+ https://bugs.gentoo.org/show_bug.cgi?id=453398
+
+ The patch is a backport from the upstream git repo
+
21 Jan 2013; Nedko Arnaudov <nedko@xxxxxxxxxxxxx>
jack-audio-connection-kit-1.9.9.5.ebuild:
set RESTRICT="mirror" for the jack-1.9.9.5 ebuild
Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest 2013-01-29 20:08:13 UTC (rev 2409)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/Manifest 2013-01-29 22:39:49 UTC (rev 2410)
@@ -1,3 +1,4 @@
+AUX jack-1.9.9.5-opus_custom.patch 876 SHA256 84a278391aa2a5017292c6ed9338a6fd89e03cd9a56b299872ee000780f18680 SHA512 24b176d0005535fefb4087632ea8ca6b19c40b800aa14040dba5b34eb3595facc21d25537ac8983f11dccc201affc4c9c3dc548766389b4ab0ffa4df2367c6ea WHIRLPOOL 21b3e13ce0abbef215363c438912e56f78ff1d670ea3b6e9d015f15b85ae91714c23a9d69656edaca86fa3724fd18a4180aae0257d808a2012cce55fe5db04c6
AUX jack-audio-connection-kit-2.9999-link-fix.patch 383 SHA256 32bdd416a1fb6586c361967c4095f75155c71c6bdc99a590b302e96c8e7690f9 SHA512 7c338195d67e6d6d412d6cd5f604a5e0254cdb5df192e874460965e9d61817f19e700ce2ae2a5f046d2b8c14b3b003e3dc8657f26511237ccc856fe2a06c3184 WHIRLPOOL 81f4894606f5876f186c6738bf8d6999b16b414bc6d294e0a0a52af517f5f16cce6646232c9efd1b24fe26de1534528e23d67ddb28298bee3be87fd56e002fbc
AUX jack-audio-connection-kit-freebsd.patch 496 SHA256 7834f5ec198f8e69e2ac119fc2c4ee349ed7e38d003e473fcb41257e7b605df8 SHA512 7c0cf60ddd3d07e12e036082ab10299308d1e112c6190d008a739ab0374c8ecf9e2dcb703055a58f8098e5187044e2351a1786271cecdeae23cbed72e6d68cd6 WHIRLPOOL 3d11baf0f4ebe0613c378d79efcb6b81f94c28e9070471b9a496dda5f0ba90a2eac1e789a621d7ec5d109f018a7f67b0adbd53bbce9e059f3e18b04ca4fb7cd1
AUX jack-audio-connection-kit-sparc-cpuinfo.patch 659 SHA256 256d48109d32ce8af89042401508392fbb90c499d4cf8b056104dc1a47522fe5 SHA512 c5964413c99fb1dd20dfe52dd40f857dab1cef123b26f74500e2f5607eda870b563595d39c4e4e0684428971e7295c847253d045b2d9ba0183f358630cfa9888 WHIRLPOOL 01d88bfce0394628fab10c48a4b80f0a025b741c5785f05bd22658fd95594e472439f569a450043cf7cc53700149d0d8b785bb7adc74711474fd3f6bcbc6d66f
@@ -6,8 +7,8 @@
DIST jack-audio-connection-kit-0.121.3-dbus.patch 337061 SHA256 da12003ed4528a09d8109ecc7e75f539f0173b23832a1d993800473f1f1d25fd SHA512 9be280a24d59d35bab07da75be407f0790fd36657bfb54d24522337f2a2bc15d6e8a9f88347ff3215ed3e6b32ab827c4e203f5435fefe30c456d638169524192 WHIRLPOOL 37b6a58c5103ff23e606e3dfd0b5ec2630b86f88ddb964635050555e64aa4ab687205e8e29add29659f36866d036098bb7d6128e230349adfd096c06cc641709
DIST jack-audio-connection-kit-0.121.3.tar.gz 1083545 SHA256 b7095d3deabeecd19772b37241e89c6c79de6afd6c031ba7567513cfe51beafa SHA512 57323393d5209baefe73cc0cd9a0e818b1cfd260cf9aa36cd6ad800252e22e3ddb7fc46649c54b8e840696878147c2d06c8d39fd7300b5bb92aeb69f44ed710f WHIRLPOOL a256cfb7c3546cb06d6003313802b02812d8da9c13671be9b0341a10442cd348a8b3f7fe65e8d27cc47b4e29ded799fa6cc0efa51d81d01f342c7c8eefbc9c55
EBUILD jack-audio-connection-kit-0.121.3.ebuild 2192 SHA256 8a7d2dc537b34e8b745d7d90a72ccc0a2734ca68ded2cb33eb4cfaa0cc774ab0 SHA512 3602ed78dfb961454d368da61c4bf87e000b84decb65869b6ff092dc97a5897dc57d507d338e0941ef6453668fe388ef952e4c3adf7bb225a84e56617c035e77 WHIRLPOOL 05c9bfb4c811ea68257ceb57aaa9fa0280d7a0b7c7d3c8628c3da5e0a874479e609523467f9393615c2a575e96482a2c67ef626211e7d0088e09aa2bdbe0e3f7
-EBUILD jack-audio-connection-kit-1.9.9.5.ebuild 1874 SHA256 f2a5ba5904817311a15f7816b64794070d4a60f824692389b7438cb1e6fa041e SHA512 d53658cebe3b014e56b92d366a05ce74ba12a226c71ca330d44bb68afc40d62bda64b07481f6d05f33b7e3e450cf08c6269084193c1b354c91be878c030758c4 WHIRLPOOL b57877dadb1eaa6df15a7d924ba35d70a32f1d10fabefe4ebc4368841a4becdcbdda3b1c168f5114dde6b7ab509871fcaf33157eaa0a7ff3981e1e5562aa567e
+EBUILD jack-audio-connection-kit-1.9.9.5.ebuild 1927 SHA256 70a90bd6b91abf9520982b38d81c505415c8925a5a771ff2bfcdb66530862a87 SHA512 4a81f8c6947ff94405c4c7d1dd7a2ef4d9d03d91d000f8f770ebbe19c0ebd4bd386dfb1efa0383af361cc90daed3e9b42577f98ef98b5cd2de6fc6792e0be771 WHIRLPOOL 4a8f468e10d89ee94e13e95500055e998be49411ca7435f78ac6f7cda3fb1cb49e41a09cedffc676714907be01299e820a169d715e43c09a366c1ec185aaadf9
EBUILD jack-audio-connection-kit-1.9999.ebuild 2626 SHA256 fc5bc080ec7839bf1806e70c36cd0c07314ea236d70fbc8d4226ec3ea204aa60 SHA512 d85ee3772275d3e3d84dc71b8e73afa19ebd0f87d200ece991c0250049ebc66565610d5047af729356232dfdf04e1aa0b4ce715f51e1db284bc0099c1f774a41 WHIRLPOOL f3e641c8c3825b002e0bc12a13b39f5f65bef39d0b88ac0f719020227f520ca9fa76fd602b4a8ee6919f3935b897fbbdce799561e37cd6e591dfb27b02dd87ef
EBUILD jack-audio-connection-kit-2.9999.ebuild 1727 SHA256 ae20eafdfd7381dc7a1569aa5f54e3bd4bc20c72d4da6cc0965cd77c9f4f19b6 SHA512 6c8580fb93863dfb5fc94b330a9f731b1fa42ef6094b7dc62387afad19dcffc205f719c0cc297e9f85d7ec26ace7dc9b91e0d8a49502584af94855e85d32afba WHIRLPOOL 8e60f6ad6a6f8d11a02e73c987732d9aaa5fe427ab5ef4e601cfaa0f71d46279123cbb43704112bec696a65e4d080fdf7fa1450410e88d698b7541d654031587
-MISC ChangeLog 10931 SHA256 d6610092481363fbe341e2c5d08993b9d43e55a0f0580c632007e5fa625b2494 SHA512 0a33c093b5a4f6de3d5b87e10546c2470c2e4278ab4d9de920ef8fc80dcd19e0c376aeb0118da89721566e6f29f8ddd68b6fc65b3aea0208755cb5e7cebc8ee1 WHIRLPOOL 6ba9e747af56a3e0281e7c5355bdb75ddd93899e313176af8cfbb6dc5c6c3651de232e0ab2f9c63d641f8772043f6ceae8befac67904e04e7d1f3551c4f3645e
+MISC ChangeLog 11228 SHA256 e79a6b3bdf7be8b65f0b7536ed61545d21db89eb853a0792c45c818cd2fd8310 SHA512 2bd5edd5a0d60d451762faaa2183d7b719d14da6d0b772be8facedcaee2caeeb3c3945cf549af915eeea8739a4e99c2656e824667dcbd4bf9d7c8507696cf48b WHIRLPOOL 4e7ad5aa42ac97a4bf6ded022eac12dca92df89ab6d2b736d38727cd4245404a001c96d65ca5f5608b5efa81e0f192310514351495ec471cdde28dbdc9f6b25e
MISC metadata.xml 1022 SHA256 061b2aae6c2a75151431640f599f946468dd2dc9ab51fefecacb43c6ef27b97d SHA512 58de0878c32efb5fb254c2c11183758aaca65558f59a8298f08d6ec0b52c04cd89cd217a5884a091d86e40ed58c73b9ad253f5647baca0450c22a85a87f93da4 WHIRLPOOL 11b571d09e1c1f86e3e2c277f5423e56e22bfcd25db6b10b57752bb0de10d4b022d5024d9cc2d7d2cecef5bf15656d020387f6d1f14c186bf64d0e69eb9274c8
Added: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-1.9.9.5-opus_custom.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-1.9.9.5-opus_custom.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/files/jack-1.9.9.5-opus_custom.patch 2013-01-29 22:39:49 UTC (rev 2410)
@@ -0,0 +1,26 @@
+commit 44aa9319ea920f12e139cb00f6c9df9529f6bb0a
+Author: Adrian Knoth <adi@xxxxxxxxxxxxxxxxxxxxx>
+Date: Sun Jan 6 20:34:56 2013 +0100
+
+ wscript: Set HAVE_OPUS=0 if custom headers are missing
+
+ As reported by Peter Nelson, waf's check_cfg sets HAVE_OPUS=1 if the
+ pkg-config check is successful, however, the code requires OPUS custom
+ headers.
+
+ So if a dev package without custom headers is installed, explicitly
+ reset HAVE_OPUS to 0 to fix the FTBFS.
+
+diff --git a/wscript b/wscript
+index 568dcf6..02d59c3 100644
+--- a/wscript
++++ b/wscript
+@@ -179,6 +179,8 @@ def configure(conf):
+ if conf.check_cc(header_name='opus/opus_custom.h', mandatory=False):
+ conf.define('HAVE_OPUS', 1)
+ conf.env['WITH_OPUS'] = True
++ else:
++ conf.define('HAVE_OPUS', 0)
+
+
+ conf.env['LIB_PTHREAD'] = ['pthread']
Modified: trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.9.5.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.9.5.ebuild 2013-01-29 20:08:13 UTC (rev 2409)
+++ trunk/overlays/proaudio/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-1.9.9.5.ebuild 2013-01-29 22:39:49 UTC (rev 2410)
@@ -44,6 +44,7 @@
src_prepare() {
epatch "${FILESDIR}/jack2-no-self-connect-1.9.9.5.patch"
+ epatch "${FILESDIR}/jack-1.9.9.5-opus_custom.patch"
}
src_configure() {