summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrice Clement <monsieurp@gentoo.org>2015-12-09 23:35:17 +0000
committerPatrice Clement <monsieurp@gentoo.org>2015-12-09 23:37:44 +0000
commitc52d5585f1f8c6b4fe7f9eb0a71f3629e13d9ac2 (patch)
tree2d54ad6b2434fdcb079e7d4032af1cf0c8b4239d /media-libs
parentwww-client/chromium: Stable channel bump (47.0.2526.80) (diff)
parentmedia-libs/openal: move epatch to src_prepare from src_unpack (diff)
downloadgentoo-c52d5585f1f8c6b4fe7f9eb0a71f3629e13d9ac2.tar.gz
gentoo-c52d5585f1f8c6b4fe7f9eb0a71f3629e13d9ac2.tar.bz2
gentoo-c52d5585f1f8c6b4fe7f9eb0a71f3629e13d9ac2.zip
Merge remote-tracking branch 'github/pr/431'.
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/openal/Manifest1
-rw-r--r--media-libs/openal/files/openal-1.17.0-jackfix.patch11
-rw-r--r--media-libs/openal/openal-1.17.0.ebuild4
3 files changed, 16 insertions, 0 deletions
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 7ac38359e508..2476dd66145e 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,3 +1,4 @@
DIST openal-soft-1.15.1.tar.bz2 253006 SHA256 0e29a162f0841ccb4135ce76e92e8a704589b680a85eddf76f898de5236eb056 SHA512 ca6dafdd503d06892dff08763bc00b974ec6e7c4bf3dcebb4cb41a486b4ea777c278299a198db182fee888a19a5716bd57d91a2859b764a532138a79f2bd672f WHIRLPOOL a47fcf4cc5da9576cb4683371979175111a1ec746c87ea1140bfb1b71433a3fe5d3df338e8844ab62adc0e6decb4b481d6d8fedb6f635b5bac715d5789077902
DIST openal-soft-1.16.0.tar.bz2 393280 SHA256 2f3dcd313fe26391284fbf8596863723f99c65d6c6846dccb48e79cadaf40d5f SHA512 b89e46902ce475afd47c4c153ae666646e8b277abf1be97f92b6a10dc585ed780c663591398a9fd7e4118595dd45d2d8d6df0101b4148686150bbb3fe2939ddc WHIRLPOOL c1143c0bc0b7299d088b2a2c440309461ba50efd4e8a924066b08411b0f66a02fb92afb6e5a9edc42552a7b59103ec204165b974bdc3297c963e8f9c0dfc55c0
DIST openal-soft-1.17.0.tar.bz2 484172 SHA256 5e93336de2e7c50f3a01beba51861d6f61c3e4045a896191dc806591e46264d1 SHA512 abe45385c29986cf9848502fc3034392bd03cd12ab969a97e82056ba9151a061f2a268a76abe393bc4b4f8cda69ef9511fccb09c997ddb90082a753c9caaef3d WHIRLPOOL e3f657216b06f40a8dfdf038feedfa58b033b69f30cf55318dba46a1a90c6dcac7c379829e156a32a430433fea20fb25fd4b6b2bb40f3248f511d497cd7bb34e
+AUX openal-1.17.0-jackfix.patch 440 SHA256 59679cde8572b3e55e65cc36b4cf9e139b2ec5c409e459d099c810c679ce335c SHA512 a5feefde2650522419177bab97dd86c5b66a22f05cd12326f7f39a13e1379f936db801da906c46f81df618d81affdc90f0dd71716356a559a7d25fea1e64fa56 WHIRLPOOL 4f0344ea3938fd3f305278805fea9b382fb6730483f4aad6edd56852cd380b0e3ea30a38966ab49491aa2d9e32ffcd2c23c0ca3e9456bbe018913ce91895acfc
diff --git a/media-libs/openal/files/openal-1.17.0-jackfix.patch b/media-libs/openal/files/openal-1.17.0-jackfix.patch
new file mode 100644
index 000000000000..6b41478c6ada
--- /dev/null
+++ b/media-libs/openal/files/openal-1.17.0-jackfix.patch
@@ -0,0 +1,11 @@
+--- openal-1.17.0/CMakeLists.txt
++++ openal-1.17.0/CMakeLists.txt
+@@ -924,7 +924,7 @@
+ SET(HAVE_JACK 1)
+ SET(BACKENDS "${BACKENDS} JACK${IS_LINKED},")
+ SET(ALC_OBJS ${ALC_OBJS} Alc/backends/jack.c)
+- ADD_BACKEND_LIBS(${PULSEAUDIO_LIBRARIES})
++ ADD_BACKEND_LIBS(${JACK_LIBRARIES})
+ IF(CMAKE_VERSION VERSION_LESS "2.8.8")
+ INCLUDE_DIRECTORIES(${JACK_INCLUDE_DIRS})
+ ENDIF()
diff --git a/media-libs/openal/openal-1.17.0.ebuild b/media-libs/openal/openal-1.17.0.ebuild
index c21e45237e26..2722476ba724 100644
--- a/media-libs/openal/openal-1.17.0.ebuild
+++ b/media-libs/openal/openal-1.17.0.ebuild
@@ -35,6 +35,10 @@ S=${WORKDIR}/${MY_P}
DOCS="alsoftrc.sample env-vars.txt hrtf.txt ChangeLog README"
+src_prepare() {
+ epatch "${FILESDIR}/${P}-jackfix.patch"
+}
+
src_configure() {
# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
my_configure() {