summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/openal/Manifest2
-rw-r--r--media-libs/openal/files/openal-1.17.0-jackfix.patch11
-rw-r--r--media-libs/openal/openal-1.17.1.ebuild (renamed from media-libs/openal/openal-1.17.0.ebuild)12
3 files changed, 4 insertions, 21 deletions
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 7ac38359e508..8d1d4e8e7bfd 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,3 +1,3 @@
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
+DIST openal-soft-1.17.1.tar.bz2 485178 SHA256 087153baab375c23d7aa7e9f3237c0a1d02e336537b485aee56d9ac312baf6f8 SHA512 f0b14e9fdcc22bb18d9c3278392fd94959cd3d85d83ad0472dcac24122fe1f8c818ef8c47197424f6d9789524d0aff64965ce502965f5d6541a772fc8dc3286d WHIRLPOOL f184de05834175b2babb54ae50b38ea01f412e0b56b4c4c5570a318e325dac73e9719cef60167760832d211d74cfb861acc7a8cf9a6946ed51aeb4f07dfaa72b
diff --git a/media-libs/openal/files/openal-1.17.0-jackfix.patch b/media-libs/openal/files/openal-1.17.0-jackfix.patch
deleted file mode 100644
index 6b41478c6ada..000000000000
--- a/media-libs/openal/files/openal-1.17.0-jackfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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.1.ebuild
index 5c6070aee668..59619fa72e3c 100644
--- a/media-libs/openal/openal-1.17.0.ebuild
+++ b/media-libs/openal/openal-1.17.1.ebuild
@@ -15,12 +15,13 @@ LICENSE="LGPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
IUSE="
- alsa coreaudio debug oss portaudio pulseaudio qt4
+ alsa coreaudio debug jack oss portaudio pulseaudio qt4
cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
neon
"
RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+ jack? ( media-sound/jack-audio-connection-kit[${MULTILIB_USEDEP}] )
portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
@@ -35,20 +36,13 @@ S=${WORKDIR}/${MY_P}
DOCS="alsoftrc.sample env-vars.txt hrtf.txt ChangeLog README"
-PATCHES=(
- "${FILESDIR}/${P}-jackfix.patch"
-)
-
-src_prepare() {
- epatch "${PATCHES[@]}"
-}
-
src_configure() {
# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
my_configure() {
local mycmakeargs=(
"-DALSOFT_BACKEND_ALSA=$(usex alsa ON OFF)"
"-DALSOFT_BACKEND_COREAUDIO=$(usex coreaudio ON OFF)"
+ "-DALSOFT_BACKEND_JACK=$(usex jack ON OFF)"
"-DALSOFT_BACKEND_OSS=$(usex oss ON OFF)"
"-DALSOFT_BACKEND_PORTAUDIO=$(usex portaudio ON OFF)"
"-DALSOFT_BACKEND_PULSEAUDIO=$(usex pulseaudio ON OFF)"