Fixes for Kernel >= 4.14 | libcdio-1.0.0

This commit is contained in:
layman
2017-11-26 21:44:02 +01:00
parent 9ecf863008
commit 49378e8b72
20 changed files with 927 additions and 0 deletions
+5
View File
@@ -0,0 +1,5 @@
AUX audacious-plugins-3.9-libcdio-1.0.0.patch 2123 SHA256 96a3099ef52c574fda3636633bceef04f2f896e7c7a5f0d2c48a8867b25bb237 SHA512 ad6dc10bc107c0e587caeb14dd4465339bfbbf9ed8ff9649e153f621993fe11ee1cdf57c5db46eaf6dcdad27308fc543c04a17cdda857ab16e7d9c2bbe89cb2d WHIRLPOOL 1712b8e27a9a7dfa396afbf3f564a44fa36e198c96b849a695ff2ad7366d1c4c51215b20173b3adaedaf1931680cf726ed17c1e931caf15c9cf5df136faf6b47
DIST audacious-plugins-3.9-gtk3.tar.bz2 1842950 SHA256 2ad7ec156df316a26d77918b9258133a8c08cb2ae78565336cfddb5bd81993bd SHA512 e2529af761bc97e589cac08689b16db657096b1bbfcc802789726ae1b472746025bec1b492de52eef755d7b50574d09b9250761bf701b1ca37f8a0e8db0f207b WHIRLPOOL 576acdaa673d174e956dd17142e70f867d53aec1974660f62f5cb9edd5cd7def334e163384e549e4e8b2393724b3d0ac7c43c6018e1339764b6823689e12a657
DIST audacious-plugins-3.9.tar.bz2 1843084 SHA256 8bf7f21089cb3406968cc9c71307774aee7100ec4607f28f63cf5690d5c927b8 SHA512 00c8c53d69995ca1fedb91c7df609cc6c65b13e1af23b98a2fbda143c02ac554cc2c42c01f1c593af252e36bfb85b6324f2daca8632d3b672c69fb4dead2e3fa WHIRLPOOL e0b7cb6a6fb97d7cd69be4d2efc7867bb8510e6ea94af84055e3c61ffb8b06e716f7ac30b961155d560f4e646b82c7df894a7024cfe68c0ee47c64b9e66e9665
EBUILD audacious-plugins-3.9-r1.ebuild 4540 SHA256 4c9abca78f10ccc2c847fd60af9db24a58cbb19fd2115f7a49065d25c922a3d3 SHA512 2c89dbd2756b5915b31cb3a15e45e3e3982942be9d8bb5ada7fb27259e863bd247c90b92cbed091c305c89755530a5c0ea1ceda8f0eed2e560d943b55dff650f WHIRLPOOL c9319edb06e73024c0456a490f396d7ebc889db07076de1429a8b995d3381f3c598cf6e62a2fefe14d50ff9bb70cac750fb411a9449e88dd5dfc826f0f1dc6e5
MISC metadata.xml 1428 SHA256 dad00cbbfbcd399a36aa7a4549b37e7bbfd09e4e3a20c0d18701f06802d635b2 SHA512 720a609a086b8477062fa836b1e7ac2dcca5e9a0aaac25848fd6a6c69d48fcc8161885ac9bc3c428d81c3e8e1b2256f0343c799cc07e8ceb7ec4fd2ce3d7680d WHIRLPOOL 82a776cdb03df831e48827c31a54441c74f9395f37d7fc63d9842f7e07c5d131051770c0e81773e92ae8293f4a4c871dce313218ff616979c9c1944d2e5dbbfe
@@ -0,0 +1,182 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
MY_P="${P/_/-}"
DESCRIPTION="Audacious Player - Your music, your way, no exceptions"
HOMEPAGE="http://audacious-media-player.org/"
inherit eutils
if [[ ${PV} == *9999 ]]; then
inherit autotools git-r3
EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
else
SRC_URI="
!gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 )
gtk3? ( http://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )"
KEYWORDS="~amd64 ~x86"
fi
LICENSE="GPL-2"
SLOT="0"
IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth gnome hotkeys http gme gtk gtk3 jack lame libav
libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
REQUIRED_USE="
^^ ( gtk gtk3 qt5 )
qt5? ( !libnotify )
|| ( alsa jack pulseaudio sdl )
ampache? ( qt5 http )"
# The following plugins REQUIRE a GUI build of audacious, because non-GUI
# builds do NOT install the libaudgui library & headers.
# Plugins without a configure option:
# alarm
# albumart
# delete-files
# ladspa
# playlist-manager
# search-tool
# skins
# vtx
# Plugins with a configure option:
# glspectrum
# gtkui
# hotkey
# notify
# statusicon
RDEPEND="
app-arch/unzip
dev-libs/dbus-glib
dev-libs/glib
dev-libs/libxml2:2
~media-sound/audacious-${PV}[gtk?,gtk3?,qt5?]
aac? ( >=media-libs/faad2-2.7 )
alsa? ( >=media-libs/alsa-lib-1.0.16 )
ampache? ( =media-libs/ampache_browser-1* )
aosd? (
x11-libs/libXrender
x11-libs/libXcomposite
)
bs2b? ( media-libs/libbs2b )
cdda? (
>=media-libs/libcddb-1.2.1
dev-libs/libcdio-paranoia
)
cue? ( media-libs/libcue )
ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
flac? (
>=media-libs/libvorbis-1.0
>=media-libs/flac-1.2.1-r1
)
fluidsynth? ( media-sound/fluidsynth )
http? ( >=net-libs/neon-0.26.4 )
gtk? ( x11-libs/gtk+:2 )
gtk3? ( x11-libs/gtk+:3 )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtmultimedia:5
dev-qt/qtwidgets:5
media-libs/adplug
)
jack? (
>=media-libs/bio2jack-0.4
media-sound/jack-audio-connection-kit
)
lame? ( media-sound/lame )
libnotify? ( x11-libs/libnotify )
libsamplerate? ( media-libs/libsamplerate:= )
lirc? ( app-misc/lirc )
mms? ( >=media-libs/libmms-0.3 )
modplug? ( media-libs/libmodplug )
mp3? ( >=media-sound/mpg123-1.12.1 )
pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
scrobbler? ( net-misc/curl )
sdl? ( media-libs/libsdl2[sound] )
sid? ( >=media-libs/libsidplayfp-1.0.0 )
sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
soxr? ( media-libs/soxr )
speedpitch? ( media-libs/libsamplerate:= )
vorbis? (
>=media-libs/libvorbis-1.2.0
>=media-libs/libogg-1.1.3
)
wavpack? ( >=media-sound/wavpack-4.50.1-r1 )"
DEPEND="${RDEPEND}
dev-util/gdbus-codegen
virtual/pkgconfig
nls? ( dev-util/intltool )"
S="${WORKDIR}/${MY_P}"
src_unpack() {
if [[ ${PV} == *9999 ]]; then
git-r3_src_unpack
else
default
if use gtk3; then
mv "${MY_P}"{-gtk3,} || die
fi
fi
}
src_prepare() {
epatch "${FILESDIR}"/${P}-libcdio-1.0.0.patch
default
[[ ${PV} == *9999 ]] && eautoreconf
}
src_configure() {
if ! use mp3 ; then
ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
fi
econf \
--enable-mpris2 \
--enable-songchange \
--disable-oss4 \
--disable-qtaudio \
--disable-qtglspectrum \
--disable-coreaudio \
--disable-sndio \
$(use_enable aac) \
$(use_enable alsa) \
$(use_enable ampache) \
$(use_enable aosd) \
$(use_enable bs2b) \
$(use_enable cdda cdaudio) \
$(use_enable cue) \
$(use_enable flac) \
$(use_enable fluidsynth amidiplug) \
$(use_enable flac filewriter) \
$(use_enable gme console) \
$(use_enable $(usex gtk gtk gtk3) gtk) \
$(use_enable hotkeys hotkey) \
$(use_enable http neon) \
$(use_enable jack) \
$(use_enable gnome gnomeshortcuts) \
$(use_enable lame filewriter_mp3) \
$(use_enable libnotify notify) \
$(use_enable libsamplerate resample) \
$(use_enable lirc) \
$(use_enable mms) \
$(use_enable modplug) \
$(use_enable mp3 mpg123) \
$(use_enable nls) \
$(use_enable pulseaudio pulse) \
$(use_enable qt5 qt) \
$(use_enable scrobbler scrobbler2) \
$(use_enable sdl sdlout) \
$(use_enable sid) \
$(use_enable sndfile) \
$(use_enable soxr) \
$(use_enable speedpitch) \
$(use_enable vorbis) \
$(use_enable wavpack) \
$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
}
@@ -0,0 +1,48 @@
diff -ur audacious-plugins-3.9.orig/src/cdaudio/cdaudio-ng.cc audacious-plugins-3.9/src/cdaudio/cdaudio-ng.cc
--- audacious-plugins-3.9.orig/src/cdaudio/cdaudio-ng.cc 2017-08-20 03:47:43.000000000 +0200
+++ audacious-plugins-3.9/src/cdaudio/cdaudio-ng.cc 2017-11-26 20:57:29.554579385 +0100
@@ -33,7 +33,7 @@
#include <cdio/sector.h>
#include <cdio/cd_types.h>
-#if LIBCDIO_VERSION_NUM >= 90
+#if LIBCDIO_VERSION_NUM >= 90 || LIBCDIO_VERSION_NUM == 1
#include <cdio/paranoia/cdda.h>
#else
#include <cdio/cdda.h>
@@ -540,7 +540,7 @@
if (aud_get_bool ("CDDA", "use_cdtext"))
{
AUDDBG ("getting cd-text information for disc\n");
-#if LIBCDIO_VERSION_NUM >= 90
+#if LIBCDIO_VERSION_NUM >= 90 || LIBCDIO_VERSION_NUM == 1
pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio);
if (pcdtext == nullptr)
#else
@@ -552,7 +552,7 @@
}
else
{
-#if LIBCDIO_VERSION_NUM >= 90
+#if LIBCDIO_VERSION_NUM >= 90 || LIBCDIO_VERSION_NUM == 1
trackinfo[0].performer = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_PERFORMER, 0));
trackinfo[0].name = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_TITLE, 0));
trackinfo[0].genre = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_GENRE, 0));
@@ -568,7 +568,7 @@
bool cdtext_was_available = false;
for (int trackno = firsttrackno; trackno <= lasttrackno; trackno++)
{
-#if LIBCDIO_VERSION_NUM < 90
+#if LIBCDIO_VERSION_NUM < 90 && LIBCDIO_VERSION_NUM != 1
if (aud_get_bool ("CDDA", "use_cdtext"))
{
AUDDBG ("getting cd-text information for track %d\n", trackno);
@@ -583,7 +583,7 @@
if (pcdtext != nullptr)
{
-#if LIBCDIO_VERSION_NUM >= 90
+#if LIBCDIO_VERSION_NUM >= 90 || LIBCDIO_VERSION_NUM == 1
trackinfo[trackno].performer = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_PERFORMER, trackno));
trackinfo[trackno].name = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_TITLE, trackno));
trackinfo[trackno].genre = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_GENRE, trackno));
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zx2c4@gentoo.org</email>
<name>Jason A. Donenfeld</name>
</maintainer>
<maintainer type="project">
<email>sound@gentoo.org</email>
<name>Gentoo Sound project</name>
</maintainer>
<use>
<flag name="adplug">Build with AdPlug (Adlib sound card emulation) support</flag>
<flag name="ampache">Support controlling audacious via <pkg>www-apps/ampache</pkg></flag>
<flag name="aosd">Enable support for Audacious OSD</flag>
<flag name="bs2b">Enable Bauer Bauer stereophonic-to-binaural headphone filter</flag>
<flag name="cue">Support CUE sheets using the libcue library</flag>
<flag name="fluidsynth">Support FluidSynth as MIDI synth backend</flag>
<flag name="gme">Support various gaming console music formats</flag>
<flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+)</flag>
<flag name="hotkeys">Enable support for controlling via hotkeys</flag>
<flag name="http">Support HTTP streams through neon</flag>
<flag name="scrobbler">Build with scrobbler/LastFM submission support</flag>
<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
<flag name="soxr">Build with SoX Resampler support</flag>
<flag name="speedpitch">Enable speed/pitch effects</flag>
</use>
</pkgmetadata>