Re: UPDATE audio/audacious-4.0.1
On 2020-04-08, Bjorn Ketelaars wrote: > Diff below brings audacious to 4.0.1. Changes: > https://audacious-media-player.org/news/45-audacious-4-0-released > https://audacious-media-player.org/news/46-audacious-4-0-1-released > > Upstream has switched to Qt5 by default but still offers GTK2 support. > For now I prefer to use the latter. Also note: "Users of the Winamp-like UI may want to continue using GTK2 for now." I don't know about other people, but personally I use exclusively the Winamp interface. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: UPDATE audio/audacious-4.0.1
On Wed 08/04/2020 13:43, Stuart Henderson wrote:
> audacious itself looks good but plugins build fails for me:
>
> streamtuner.cc:22:10: fatal error: 'libaudqt/treeview.h' file not found
> #include
> ^
> 1 error generated.
> Failed to compile streamtuner.cc (plugin)!
>
> autoconf log below.
It seems that your build picked up Qt5Network thus enabling Stream
tuner. The latter depends on libaudqt, which is not build/installed
because I opted for disabling qt5 support. Fix is to add
'--disable-streamtuner' to CONFIGURE_ARGS.
> I wonder, would this be a good opportunity to reorganise it so that
> "pkg_add audacious" gives you something usable? (Currently "pkg_add
> audacious-plugins" is needed and it's not very clear..)
>
> It could be organised like this
>
> path package @pkgpath
> meta/audaciousaudacious-4.0.1 audio/audacious
> audio/audacious/playeraudacious-player-4.0.1 (none needed)
> audio/audacious/plugins audacious-plugins-4.0.1 audio/audacious-plugins
>
> and audio/audacious/player would need an @conflict on the old version
> (audacious-<4.0 would do), the others don't need an @conflict ..
I think this makes sense. Attached is a new diff which (should)
addresses the build error and reorganises audacious as laid out by you.
Please note that this patch should be applied in /usr/ports/audio.
Also included is a tarball for the metapackage.
meta_audacious.tgz
Description: application/tar-gz
diff --git Makefile Makefile
index 671b55c1776..92db7f331cf 100644
--- Makefile
+++ Makefile
@@ -10,7 +10,6 @@
SUBDIR += ascd
SUBDIR += aucatctl
SUBDIR += audacious
- SUBDIR += audacious-plugins
SUBDIR += audacity
SUBDIR += audiality2
SUBDIR += beets
diff --git audacious-plugins/Makefile audacious-plugins/Makefile
deleted file mode 100644
index fcc13cb46e2..000
--- audacious-plugins/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@
-# $OpenBSD: Makefile,v 1.81 2020/02/02 16:06:13 bket Exp $
-
-COMMENT = input and output plugins for Audacious
-
-V =3.10.1
-DISTNAME = audacious-plugins-$V
-
-CATEGORIES = audio multimedia
-
-HOMEPAGE = https://audacious-media-player.org/
-
-# BSD / GPL
-PERMIT_PACKAGE = Yes
-
-WANTLIB += ${COMPILER_LIBCXX} FLAC GL X11 Xcomposite Xcursor Xdamage
-WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 audgui
-WANTLIB += audtag avcodec avformat avutil cairo cddb cdio cdio_cdda
-WANTLIB += cue curl faad fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gtk-x11-2.0
-WANTLIB += harfbuzz iconv intl m mms modplug mp3lame mpg123 neon
-WANTLIB += notify ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 samplerate
-WANTLIB += sndfile sndio soxr vorbis vorbisenc vorbisfile wavpack
-WANTLIB += xml2 z
-
-MASTER_SITES = https://distfiles.audacious-media-player.org/
-
-EXTRACT_SUFX = .tar.bz2
-
-COMPILER = base-clang ports-gcc
-
-BUILD_DEPENDS =audio/audacious>=${V} \
- devel/gettext,-tools
-
-RUN_DEPENDS = audio/audacious>=${V}
-# needed for the gio plugin
-RUN_DEPENDS += x11/gnome/gvfs
-
-LIB_DEPENDS = audio/faad>=2.7 \
- audio/flac \
- audio/lame \
- audio/libcdio \
- audio/libcdio-paranoia \
- audio/libcue \
- audio/libmodplug \
- audio/libsamplerate \
- audio/libsndfile \
- audio/libsoxr \
- audio/libvorbis \
- audio/mpg123 \
- audio/wavpack \
- devel/libnotify>=0.7.2 \
- graphics/ffmpeg \
- multimedia/libmms \
- net/curl \
- net/neon \
- textproc/libxml \
- x11/gtk+2 \
- x11/dbus-glib
-
-USE_GMAKE =Yes
-
-CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS += --disable-alsa \
- --disable-amidiplug \
- --disable-bs2b \
- --disable-jack \
- --disable-lirc \
- --disable-oss4 \
- --disable-pulse \
- --disable-sdlout \
- --disable-sid
-CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
-
-NO_TEST = Yes
-
-.include
diff --git audacious-plugins/distinfo audacious-plugins/distinfo
deleted file mode 100644
index b4a3f1061c9..000
--- audacious-plugins/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (audacious-plugins-3.10.1.tar.bz2) =
Re: UPDATE audio/audacious-4.0.1
audacious itself looks good but plugins build fails for me: streamtuner.cc:22:10: fatal error: 'libaudqt/treeview.h' file not found #include ^ 1 error generated. Failed to compile streamtuner.cc (plugin)! autoconf log below. I wonder, would this be a good opportunity to reorganise it so that "pkg_add audacious" gives you something usable? (Currently "pkg_add audacious-plugins" is needed and it's not very clear..) It could be organised like this pathpackage @pkgpath meta/audacious audacious-4.0.1 audio/audacious audio/audacious/player audacious-player-4.0.1 (none needed) audio/audacious/plugins audacious-plugins-4.0.1 audio/audacious-plugins and audio/audacious/player would need an @conflict on the old version (audacious-<4.0 would do), the others don't need an @conflict .. +++ Wed Apr 8 13:37:10 BST 2020 ===> Configuring for audacious-plugins-4.0.1 Using /usr/obj/ports/audacious-plugins-4.0.1/config.site (generated) configure: WARNING: unrecognized options: --disable-silent-rules, --disable-gtk-doc configure: loading site script /usr/obj/ports/audacious-plugins-4.0.1/config.site checking build system type... x86_64-unknown-openbsd6.6 checking host system type... x86_64-unknown-openbsd6.6 checking target system type... x86_64-unknown-openbsd6.6 checking for gcc... cc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... (cached) o checking whether we are using the GNU C compiler... (cached) yes checking whether cc accepts -g... (cached) yes checking for cc option to accept ISO C89... none needed checking whether we are using the GNU C++ compiler... (cached) yes checking whether c++ accepts -g... (cached) yes checking how to run the C preprocessor... cc -E checking for grep that handles long lines and -e... (cached) /usr/bin/grep checking for egrep... (cached) /usr/bin/egrep checking for ANSI C header files... (cached) yes checking for sys/types.h... (cached) yes checking for sys/stat.h... (cached) yes checking for stdlib.h... (cached) yes checking for string.h... (cached) yes checking for memory.h... (cached) yes checking for strings.h... (cached) yes checking for inttypes.h... (cached) yes checking for stdint.h... (cached) yes checking for unistd.h... (cached) yes checking whether byte ordering is bigendian... no checking for special C compiler options needed for large files... no checking for _FILE_OFFSET_BITS value needed for large files... no checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking operating system type... other UNIX checking whether the C/C++ compiler supports -Wtype-limits... yes checking whether the C/C++ compiler supports -Wno-stringop-truncation... no checking whether the C++ compiler supports -Woverloaded-virtual... yes checking whether byte ordering is bigendian... (cached) no checking whether ln -s works... yes checking for rm... (cached) /bin/rm checking for mv... /bin/mv checking for cp... (cached) /bin/cp checking for ar... /usr/bin/ar checking for ranlib... /usr/bin/ranlib checking for windres... no checking for library containing pthread_create... -lpthread checking for GLIB... yes checking for GMODULE... yes checking for GTK... yes checking for GIO... yes checking for shared library system... OpenBSD checking whether gmake sets $(MAKE)... yes checking for a BSD-compatible install... /usr/obj/ports/audacious-plugins-4.0.1/bin/install -c checking for a thread-safe mkdir -p... mkdir -p checking for a sed that does not truncate output... (cached) /usr/bin/sed checking whether NLS is requested... yes checking for msgfmt... /usr/local/bin/msgfmt checking for gmsgfmt... /usr/local/bin/msgfmt checking for xgettext... /usr/local/bin/xgettext checking for msgmerge... /usr/local/bin/msgmerge checking for ld used by cc... /usr/bin/ld checking if the linker (/usr/bin/ld) is GNU ld... yes checking for shared library run path origin... done checking 32-bit host C ABI... no checking for the common suffixes of directories in the library search path... lib,lib checking for CFPreferencesCopyAppValue... no checking for CFLocaleCopyCurrent... no checking for CFLocaleCopyPreferredLanguages... no checking for GNU gettext in libc... no checking for iconv... yes checking for working iconv... yes checking how to link with libiconv... /usr/local/lib/libiconv.so.7.0 checking for GNU gettext in libintl... yes checking whether to use NLS... yes checking where the gettext function comes from... external libintl checking how to link with libintl... /usr/local/lib/libintl.so.6.0 /usr/local/lib/libiconv.so.7.0 -Wl,-rpath,/usr/local/lib checking for AUDACIOUS... yes checking for XML... yes checking for ADLIB... no configure: WARNING: AdLib support disabled due to missing dependency:
UPDATE audio/audacious-4.0.1
Diff below brings audacious to 4.0.1. Changes:
https://audacious-media-player.org/news/45-audacious-4-0-released
https://audacious-media-player.org/news/46-audacious-4-0-1-released
Upstream has switched to Qt5 by default but still offers GTK2 support.
For now I prefer to use the latter.
Changes to the port:
- Bump minors of libaudcore and libaudgui as symbols have been added
- Configure to use gtk
Run tested on amd64.
Comments/OK?
diff --git Makefile Makefile
index b4f4fbebee7..bc5d1527bf4 100644
--- Makefile
+++ Makefile
@@ -5,10 +5,10 @@ BROKEN-alpha =tinylock.c:58: internal compiler error:
in extract_insn, at recog
COMMENT = graphical audio player which supports lots of formats
-DISTNAME = audacious-3.10.1
+DISTNAME = audacious-4.0.1
-SHARED_LIBS += audcore 5.0 # 5.1
-SHARED_LIBS += audgui 4.0 # 5.0
+SHARED_LIBS += audcore 5.1 # 5.2
+SHARED_LIBS += audgui 4.1 # 5.1
SHARED_LIBS += audtag 3.0 # 3.0
CATEGORIES = audio multimedia
@@ -43,6 +43,8 @@ MAKE_ENV =
LIBaudcore_VERSION=${LIBaudcore_VERSION} \
USE_GMAKE =Yes
CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS = --disable-qt \
+ --enable-gtk
NO_TEST = Yes
diff --git distinfo distinfo
index 65a2003c36a..648cfb23110 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-3.10.1.tar.bz2) =
g2boQLs8lEjCzwz5oIABVbC9fMISooukSZDD0iica5M=
-SIZE (audacious-3.10.1.tar.bz2) = 564481
+SHA256 (audacious-4.0.1.tar.bz2) = rhPfaIeD8u6WSc9IhwOt48Czdvtc1rD7XtFLxD4qXLY=
+SIZE (audacious-4.0.1.tar.bz2) = 572314
diff --git patches/patch-src_libaudcore_Makefile
patches/patch-src_libaudcore_Makefile
index 776955527d4..5272f12fe6d 100644
--- patches/patch-src_libaudcore_Makefile
+++ patches/patch-src_libaudcore_Makefile
@@ -6,5 +6,5 @@ Index: src/libaudcore/Makefile
-SHARED_LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}
+SHARED_LIB = ${LIB_PREFIX}audcore.so.${LIBaudcore_VERSION}
LIB_MAJOR = 5
- LIB_MINOR = 1
+ LIB_MINOR = 2
diff --git patches/patch-src_libaudgui_Makefile
patches/patch-src_libaudgui_Makefile
index 6abad8f87b6..517340cbee9 100644
--- patches/patch-src_libaudgui_Makefile
+++ patches/patch-src_libaudgui_Makefile
@@ -6,5 +6,5 @@ Index: src/libaudgui/Makefile
-SHARED_LIB = ${LIB_PREFIX}audgui${LIB_SUFFIX}
+SHARED_LIB = ${LIB_PREFIX}audgui.so.${LIBaudgui_VERSION}
LIB_MAJOR = 5
- LIB_MINOR = 0
+ LIB_MINOR = 1
diff --git pkg/PLIST pkg/PLIST
index ad3f35b1215..269692f5ff3 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -26,6 +26,7 @@ include/libaudcore/probe.h
include/libaudcore/ringbuf.h
include/libaudcore/runtime.h
include/libaudcore/templates.h
+include/libaudcore/threads.h
include/libaudcore/tinylock.h
include/libaudcore/tuple.h
include/libaudcore/vfs.h
@@ -68,10 +69,6 @@ share/locale/es_MX/
share/locale/es_MX/LC_MESSAGES/
share/locale/es_MX/LC_MESSAGES/audacious.mo
share/locale/et/LC_MESSAGES/audacious.mo
-share/locale/eu/LC_MESSAGES/audacious.mo
-share/locale/fa_IR/
-share/locale/fa_IR/LC_MESSAGES/
-share/locale/fa_IR/LC_MESSAGES/audacious.mo
share/locale/fi/LC_MESSAGES/audacious.mo
share/locale/fr/LC_MESSAGES/audacious.mo
share/locale/gl/LC_MESSAGES/audacious.mo
@@ -82,7 +79,6 @@ share/locale/id_ID/LC_MESSAGES/audacious.mo
share/locale/it/LC_MESSAGES/audacious.mo
share/locale/ja/LC_MESSAGES/audacious.mo
share/locale/ko/LC_MESSAGES/audacious.mo
-share/locale/ky/LC_MESSAGES/audacious.mo
share/locale/lt/LC_MESSAGES/audacious.mo
share/locale/lv/LC_MESSAGES/audacious.mo
share/locale/ml_IN/
@@ -95,7 +91,6 @@ share/locale/pt_BR/LC_MESSAGES/audacious.mo
share/locale/pt_PT/
share/locale/pt_PT/LC_MESSAGES/
share/locale/pt_PT/LC_MESSAGES/audacious.mo
-share/locale/ro/LC_MESSAGES/audacious.mo
share/locale/ru/LC_MESSAGES/audacious.mo
share/locale/si/LC_MESSAGES/audacious.mo
share/locale/sk/LC_MESSAGES/audacious.mo
