Created attachment 442872 [details] audacious-3.8_beta1 ebuild Ebuilds for Audacious 3.8 beta and Audacious Plugins 3.8 beta. Changes: audacious-3.8_beta1.ebuild: 1. Audacious can work with both GTK+ 2 and Qt UIs. It can be beneficial to the user to have them both available because each UI supports different set of plugins. Therefore I propose to change REQUIRED_USE from: ^^ ( gtk gtk3 qt5 ) to: ^^ ( gtk3 || ( gtk qt5 ) ) audacious-plugins-3.8_beta1.ebuild: 1. Same change in REQUIRED_USE as above. 2. Added support for Ampache Browser plugin (see bug #590882). Diff: --------diff-------------------------- --- audacious-plugins-3.7.1-r1.ebuild 2016-03-27 03:25:32.000000000 +0200 +++ audacious-plugins-3.8_beta1.ebuild 2016-08-07 16:05:13.068246046 +0200 @@ -15,10 +15,11 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux" -IUSE="aac +adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome http gtk gtk3 jack +IUSE="aac +adplug alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gnome http gtk gtk3 jack lame libnotify libsamplerate lirc mms mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile vorbis wavpack" REQUIRED_USE=" - ^^ ( gtk gtk3 qt5 ) + ^^ ( gtk3 || ( gtk qt5 ) ) + ampache? ( qt5 ) " # The following plugins REQUIRE a GUI build of audacious, because non-GUI # builds do NOT install the libaudgui library & headers. @@ -48,6 +49,7 @@ aac? ( >=media-libs/faad2-2.7 ) adplug? ( media-libs/adplug ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) + ampache? ( media-libs/ampache_browser ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 dev-libs/libcdio-paranoia ) @@ -147,6 +149,7 @@ $(use_enable adplug) \ $(use_enable aac) \ $(use_enable alsa) \ + $(use_enable ampache) \ $(use_enable bs2b) \ $(use_enable cdda cdaudio) \ $(use_enable cue) \ --------end of diff--------------------- Both ebuilds with changes described above are attached.
Created attachment 442874 [details] audacious-plugins-3.8_beta1 ebuild
Created attachment 447782 [details] audacious-3.8 ebuild 3.8 released.
Created attachment 447784 [details] audacious-plugins-3.8 ebuild 3.8 released
Hi, I just wanted to point out a lot of the use_enable lines in this ebuild are invalid. You might want to actually run ./configure and check what you're passing is sane: USE=-mp3 on a system that actually has no libmpg123 will get you a compile time error, for example.
Created attachment 460046 [details] audacious-3.8.1.ebuild There is new version 3.8.1 available and I took opportunity to update an ebuild for both audacious and audacious-plugins. Audacious itself does not have many changes. I just updated header and EAPI
Created attachment 460048 [details] audacious-plugins-3.8.1.ebuild Audacious-plugins was not so easy. There is some new plugins and use flags that I added. Those are more options available in configure. OSS is so long in Linux II had a feeling it was left out on purpose. Others I just dont know --enable-oss4 enable OSS output (default=auto) --enable-sndio enable Sndio output (default=auto) --enable-mpris2 enable MPRIS 2 server (default=auto) --enable-aosd enable X11 OSD (default=auto) --disable-coreaudio disable CoreAudio output plugin (default=enabled) However what puzzled me the most was this if use qt5 ;then notify="--disable-notify" elif use libnotify ;then notify="--enable-notify" fi Is that correct?
Created attachment 474218 [details, diff] Security fix for console plugin Posting here as all relevant people are already CCed. This is a backported patch from audaciou-plugins-3.8 branch to audacious-plugins-3.7.1 for the cve mentioned in bug 603092. it includes 2 commits squashed into one with the origin commit message. The initial commit is https://github.com/audacious-media-player/audacious-plugins/commit/916cf7feb5041c3574563f453385cdd989aa9cb0 and the follow to fix the previous commit is https://github.com/audacious-media-player/audacious-plugins/commit/cdd7a060ef433c3d868d2c536dd8c2828b029db2 ebuild diff: --- audacious-plugins-3.7.1-r1.ebuild 2017-05-25 12:00:35.689283895 +0200 +++ audacious-plugins-3.7.1-r2.ebuild 2017-05-25 12:09:57.837235075 +0200 @@ -111,6 +111,7 @@ --generate-c-code object-player mpris2-player.xml && \ cd "${S}" epatch "${FILESDIR}/${P}-gl-jack.patch" + epatch "${FILESDIR}/${P}-console-security.patch" } src_configure() {
(In reply to Wojciech Myrda from comment #6) > Those are more options available in configure. OSS is so long in Linux II > had a feeling it was left out on purpose. Others I just dont know I personally think its better to be explicit and handle options. > --enable-oss4 enable OSS output (default=auto) Gentoo does not support oss so we should just disabled it explicitly. > --enable-sndio enable Sndio output (default=auto) This is the bsd, openbsd if I am not mistaken, no need to handle > --enable-mpris2 enable MPRIS 2 server (default=auto) This is already enabled by forcing dbus support so better make it explicit, see next comment. > --enable-aosd enable X11 OSD (default=auto) See next comment > --disable-coreaudio disable CoreAudio output plugin (default=enabled) This is apple, no need to handle
Ebuild diffs that fix all the QA configure warnings Audacious QA no chardet configure options, uses bundled libguess (already in 3.7). Audacious-plugins * QA no status-icon option, plugin enabled with Gtk option * QA no adplug option, plugin enabled by default now * QA no flacng option, renamed to plain flac now * QA no filewriter_flac, renamed to filewriter * QA no option mp3, renamed to mpg123 * Add aosd USE and configure option and not let it auto configure * Gentoo does not support oss, forcefully disable * Enable mpris2 plugin, its auto enabled with dbus support. And dbus is forced on so lets make it explicit. --------------------------------------------------------- --- audacious-3.7.1-r1.ebuild 2017-05-28 11:52:07.613234709 +0200 +++ audacious-3.8.2.ebuild 2017-05-28 10:56:00.787527103 +0200 @@ -17,7 +17,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="+chardet nls gtk gtk3 qt5" +IUSE="nls gtk gtk3 qt5" REQUIRED_USE=" ^^ ( gtk gtk3 qt5 ) " @@ -28,7 +28,6 @@ >=x11-libs/cairo-1.2.6 >=x11-libs/pango-1.8.0 virtual/freedesktop-icon-theme - chardet? ( >=app-i18n/libguess-1.2 ) gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) qt5? ( dev-qt/qtcore:5 @@ -64,7 +63,6 @@ econf \ --enable-dbus \ ${gtk} \ - $(use_enable chardet) \ $(use_enable nls) \ $(use_enable qt5 qt) } --------------------------------------------------------- --- audacious-plugins-3.7.1-r1.ebuild 2017-05-25 12:00:35.689283895 +0200 +++ audacious-plugins-3.8.2.ebuild 2017-05-28 11:48:10.677255285 +0200 @@ -14,7 +14,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="aac +adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome http gtk gtk3 jack +IUSE="aac +adplug alsa aosd bs2b cdda cue ffmpeg flac fluidsynth gnome http gtk gtk3 jack lame libnotify libsamplerate lirc mms mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile vorbis wavpack" REQUIRED_USE=" ^^ ( gtk gtk3 qt5 ) @@ -43,10 +43,12 @@ media-libs/libmodplug ~media-sound/audacious-${PV} >=media-sound/audacious-3.7.1-r1 + media-libs/adplug ( || ( >=dev-libs/glib-2.32.2[utils] dev-util/gdbus-codegen ) ) aac? ( >=media-libs/faad2-2.7 ) - adplug? ( media-libs/adplug ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) + aosd? ( x11-libs/libXrender + x11-libs/libXcomposite ) bs2b? ( media-libs/libbs2b ) cdda? ( >=media-libs/libcddb-1.2.1 dev-libs/libcdio-paranoia ) @@ -110,7 +112,6 @@ --c-namespace Mpris \ --generate-c-code object-player mpris2-player.xml && \ cd "${S}" - epatch "${FILESDIR}/${P}-gl-jack.patch" } src_configure() { @@ -142,17 +143,18 @@ ${gtk} \ ${notify} \ --enable-modplug \ - --enable-statusicon \ + --enable-mpris2 \ --disable-soxr \ - $(use_enable adplug) \ + --disable-oss4 \ $(use_enable aac) \ $(use_enable alsa) \ + $(use_enable aosd) \ $(use_enable bs2b) \ $(use_enable cdda cdaudio) \ $(use_enable cue) \ - $(use_enable flac flacng) \ + $(use_enable flac) \ $(use_enable fluidsynth amidiplug) \ - $(use_enable flac filewriter_flac) \ + $(use_enable flac filewriter) \ $(use_enable http neon) \ $(use_enable jack) \ $(use_enable gnome gnomeshortcuts) \ @@ -160,7 +162,7 @@ $(use_enable libsamplerate resample) \ $(use_enable lirc) \ $(use_enable mms) \ - $(use_enable mp3) \ + $(use_enable mp3 mpg123) \ $(use_enable nls) \ $(use_enable pulseaudio pulse) \ $(use_enable qt5 qt) \
02:46:54 Z<@zx2c4> does chainsaw ever get online? 02:47:38 Z<@zx2c4> aballier: chutzpah: Soap__ : you guys around? 02:48:56 C<@chutzpah> zx2c4: i am around 02:49:04 Z<@zx2c4> chutzpah: hey 02:49:07 Z<@zx2c4> you're on the sound herd 02:49:13 Z<@zx2c4> can i fix https://bugs.gentoo.org/show_bug.cgi?id=590892 02:49:24 Z<@zx2c4> nobody has touched these ebuilds in a long time 02:49:29 Z<@zx2c4> new versions have been out for a longtime 02:49:32 Z<@zx2c4> its kind of rotting there 02:49:39 Z<@zx2c4> mind if i bump the packages and get things fresh? 02:50:08 C<@chutzpah> zx2c4: go for it 02:50:14 Z<@zx2c4> thanks!
https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdf95b06fb6e38d3803e3e5e2f3f265b0488958e
