On Wed, Sep 06, 2017 at 02:33:25PM +0300, Timo Myyrä wrote:
> Antoine Jacoutot <ajacou...@bsdfrog.org> writes:
>
> > On Wed, Sep 06, 2017 at 01:21:58PM +0300, Timo Myyrä wrote:
> >
> >> Hi,
> >>
> >> Here's an update for the audacious port to bring it to latest version.
> >> Lightly tested on amd64 and playback works in various formats.
> >> Someone could try this on hppa/alpha to see if they are still broken.
> >>
> >> Most notably features is the switching back to gtk2. The plan seems to be
> >> to
> >> switch to Qt UI eventually and keep gtk2 running until Qt side matures.
> >>
> >> Note that this requires update to the audacious-plugins port as well which
> >> is
> >> coming soon in another mail.
> >>
> >> Timo
> >>
> >> Index: Makefile
> >> ===================================================================
> >> RCS file: /cvs/ports/audio/audacious/Makefile,v
> >> retrieving revision 1.55
> >> diff -u -p -r1.55 Makefile
> >> --- Makefile 31 Dec 2016 04:12:09 -0000 1.55
> >> +++ Makefile 6 Sep 2017 10:06:35 -0000
> >> @@ -3,14 +3,13 @@
> >> BROKEN-hppa = no atomic ops / __sync_fetch_and_add_4
> >> BROKEN-alpha = tinylock.c:58: internal compiler error: in
> >> extract_insn, at recog.c:2077
> >>
> >> -COMMENT = Gtk+3 media player
> >> +COMMENT = graphical audio player which supports lots of formats
> >>
> >> -DISTNAME = audacious-3.5.2
> >> -REVISION = 0
> >> +DISTNAME = audacious-3.9
> >>
> >> -SHARED_LIBS += audcore 3.0 # 1.0
> >> -SHARED_LIBS += audgui 3.0 # 1.0
> >> -SHARED_LIBS += audtag 2.1 # 1.0
> >> +SHARED_LIBS += audcore 4.0 # 5.0
> >> +SHARED_LIBS += audgui 4.0 # 5.0
> >> +SHARED_LIBS += audtag 3.0 # 3.0
> >>
> >> CATEGORIES = audio multimedia
> >>
> >> @@ -19,10 +18,11 @@ HOMEPAGE = http://audacious-media-playe
> >> # BSD
> >> PERMIT_PACKAGE_CDROM =Yes
> >>
> >> -WANTLIB += atk-1.0 c cairo cairo-gobject fontconfig freetype gdk-3
> >> -WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
> >> -WANTLIB += gtk-3 guess m pango-1.0 pangocairo-1.0 pangoft2-1.0
> >> -WANTLIB += pthread z
> >> +WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
> >> +WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
> >> +WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
> >> +WANTLIB += gmodule-2.0 gobject-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
> >> +WANTLIB += pangoft2-1.0 z
> >>
> >> MASTER_SITES = http://distfiles.audacious-media-player.org/
> >>
> >> @@ -32,10 +32,8 @@ MODULES = devel/gettext gcc4
> >> # for atomic builtins
> >> MODGCC4_ARCHS = arm
> >>
> >> -RUN_DEPENDS = devel/desktop-file-utils \
> >> - x11/gtk+3,-guic
> >
> > RUN_DEPENDS should not be modified.
> >
> >
>
> Should x11/gtk+3,guic be needed with gtk2 ports?
Yes.
> I assumed its only gtk3-only stuff so no longer needed.
It's needed to regen the icon cache.
$ cd /usr/ports/x11/gtk+3 && make show=PKGNAME-guic
gtk-update-icon-cache-3.22.19
Look at your PLIST.
>
> >> -LIB_DEPENDS = devel/libguess>=1.2 \
> >> - x11/gtk+3
> >> +RUN_DEPENDS = devel/desktop-file-utils
> >> +LIB_DEPENDS = x11/gtk+2
> >>
> >> MAKE_ENV = LIBaudcore_VERSION=${LIBaudcore_VERSION} \
> >> LIBaudgui_VERSION=${LIBaudgui_VERSION} \
> >> Index: distinfo
> >> ===================================================================
> >> RCS file: /cvs/ports/audio/audacious/distinfo,v
> >> retrieving revision 1.21
> >> diff -u -p -r1.21 distinfo
> >> --- distinfo 3 Nov 2014 04:28:11 -0000 1.21
> >> +++ distinfo 6 Sep 2017 10:06:35 -0000
> >> @@ -1,2 +1,2 @@
> >> -SHA256 (audacious-3.5.2.tar.bz2) =
> >> ORW5aS74rLJYiw4mwnOOWeNnZs/oPn5SwOYBaI5sGVY=
> >> -SIZE (audacious-3.5.2.tar.bz2) = 448436
> >> +SHA256 (audacious-3.9.tar.bz2) =
> >> LYBEZzrHhtcbCABPGQu8o2gli/YOZgL/wNliKDXMsF4=
> >> +SIZE (audacious-3.9.tar.bz2) = 599488
> >> Index: patches/patch-src_libaudcore_Makefile
> >> ===================================================================
> >> RCS file:
> >> /cvs/ports/audio/audacious/patches/patch-src_libaudcore_Makefile,v
> >> retrieving revision 1.7
> >> diff -u -p -r1.7 patch-src_libaudcore_Makefile
> >> --- patches/patch-src_libaudcore_Makefile 3 Nov 2014 04:28:11 -0000
> >> 1.7
> >> +++ patches/patch-src_libaudcore_Makefile 6 Sep 2017 10:06:35 -0000
> >> @@ -1,9 +1,10 @@
> >> $OpenBSD: patch-src_libaudcore_Makefile,v 1.7 2014/11/03 04:28:11 bcallah
> >> Exp $
> >> ---- src/libaudcore/Makefile.orig Thu Oct 16 20:00:28 2014
> >> -+++ src/libaudcore/Makefile Sat Nov 1 19:11:40 2014
> >> +Index: src/libaudcore/Makefile
> >> +--- src/libaudcore/Makefile.orig
> >> ++++ src/libaudcore/Makefile
> >> @@ -1,4 +1,4 @@
> >> -SHARED_LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}
> >> +SHARED_LIB = ${LIB_PREFIX}audcore.so.${LIBaudcore_VERSION}
> >> - LIB_MAJOR = 2
> >> + LIB_MAJOR = 5
> >> LIB_MINOR = 0
> >>
> >> Index: patches/patch-src_libaudgui_Makefile
> >> ===================================================================
> >> RCS file: /cvs/ports/audio/audacious/patches/patch-src_libaudgui_Makefile,v
> >> retrieving revision 1.4
> >> diff -u -p -r1.4 patch-src_libaudgui_Makefile
> >> --- patches/patch-src_libaudgui_Makefile 3 Nov 2014 04:28:11 -0000
> >> 1.4
> >> +++ patches/patch-src_libaudgui_Makefile 6 Sep 2017 10:06:35 -0000
> >> @@ -1,9 +1,10 @@
> >> $OpenBSD: patch-src_libaudgui_Makefile,v 1.4 2014/11/03 04:28:11 bcallah
> >> Exp $
> >> ---- src/libaudgui/Makefile.orig Thu Oct 16 20:00:28 2014
> >> -+++ src/libaudgui/Makefile Sat Nov 1 19:11:40 2014
> >> +Index: src/libaudgui/Makefile
> >> +--- src/libaudgui/Makefile.orig
> >> ++++ src/libaudgui/Makefile
> >> @@ -1,4 +1,4 @@
> >> -SHARED_LIB = ${LIB_PREFIX}audgui${LIB_SUFFIX}
> >> +SHARED_LIB = ${LIB_PREFIX}audgui.so.${LIBaudgui_VERSION}
> >> - LIB_MAJOR = 2
> >> + LIB_MAJOR = 5
> >> LIB_MINOR = 0
> >>
> >> Index: patches/patch-src_libaudtag_Makefile
> >> ===================================================================
> >> RCS file: /cvs/ports/audio/audacious/patches/patch-src_libaudtag_Makefile,v
> >> retrieving revision 1.3
> >> diff -u -p -r1.3 patch-src_libaudtag_Makefile
> >> --- patches/patch-src_libaudtag_Makefile 23 Oct 2013 19:15:15 -0000
> >> 1.3
> >> +++ patches/patch-src_libaudtag_Makefile 6 Sep 2017 10:06:35 -0000
> >> @@ -1,9 +1,10 @@
> >> $OpenBSD: patch-src_libaudtag_Makefile,v 1.3 2013/10/23 19:15:15 naddy
> >> Exp $
> >> ---- src/libaudtag/Makefile.orig Mon Sep 2 21:01:58 2013
> >> -+++ src/libaudtag/Makefile Mon Oct 21 00:13:00 2013
> >> +Index: src/libaudtag/Makefile
> >> +--- src/libaudtag/Makefile.orig
> >> ++++ src/libaudtag/Makefile
> >> @@ -1,4 +1,4 @@
> >> -SHARED_LIB = ${LIB_PREFIX}audtag${LIB_SUFFIX}
> >> +SHARED_LIB = ${LIB_PREFIX}audtag.so.${LIBaudtag_VERSION}
> >> - LIB_MAJOR = 1
> >> + LIB_MAJOR = 3
> >> LIB_MINOR = 0
> >>
> >> Index: pkg/PLIST
> >> ===================================================================
> >> RCS file: /cvs/ports/audio/audacious/pkg/PLIST,v
> >> retrieving revision 1.20
> >> diff -u -p -r1.20 PLIST
> >> --- pkg/PLIST 3 Nov 2014 04:28:11 -0000 1.20
> >> +++ pkg/PLIST 6 Sep 2017 10:06:35 -0000
> >> @@ -2,39 +2,35 @@
> >> @bin bin/audacious
> >> @bin bin/audtool
> >> include/audacious/
> >> -include/audacious/api-alias-begin.h
> >> -include/audacious/api-alias-end.h
> >> -include/audacious/api-define-begin.h
> >> -include/audacious/api-define-end.h
> >> -include/audacious/api.h
> >> include/audacious/audtag.h
> >> -include/audacious/debug.h
> >> -include/audacious/drct-api.h
> >> -include/audacious/drct.h
> >> -include/audacious/i18n.h
> >> -include/audacious/input-api.h
> >> -include/audacious/input.h
> >> -include/audacious/misc-api.h
> >> -include/audacious/misc.h
> >> -include/audacious/playlist-api.h
> >> -include/audacious/playlist.h
> >> -include/audacious/plugin.h
> >> -include/audacious/plugins-api.h
> >> -include/audacious/plugins.h
> >> -include/audacious/preferences.h
> >> -include/audacious/types.h
> >> include/libaudcore/
> >> include/libaudcore/audio.h
> >> include/libaudcore/audstrings.h
> >> -include/libaudcore/core.h
> >> +include/libaudcore/drct.h
> >> +include/libaudcore/equalizer.h
> >> +include/libaudcore/export.h
> >> include/libaudcore/hook.h
> >> +include/libaudcore/i18n.h
> >> include/libaudcore/index.h
> >> include/libaudcore/inifile.h
> >> +include/libaudcore/interface.h
> >> +include/libaudcore/list.h
> >> +include/libaudcore/mainloop.h
> >> include/libaudcore/multihash.h
> >> +include/libaudcore/objects.h
> >> +include/libaudcore/playlist.h
> >> +include/libaudcore/plugin.h
> >> +include/libaudcore/plugins.h
> >> +include/libaudcore/preferences.h
> >> +include/libaudcore/probe.h
> >> +include/libaudcore/ringbuf.h
> >> +include/libaudcore/runtime.h
> >> +include/libaudcore/templates.h
> >> include/libaudcore/tinylock.h
> >> include/libaudcore/tuple.h
> >> include/libaudcore/vfs.h
> >> include/libaudcore/vfs_async.h
> >> +include/libaudcore/visualizer.h
> >> include/libaudgui/
> >> include/libaudgui/libaudgui-gtk.h
> >> include/libaudgui/libaudgui.h
> >> @@ -52,6 +48,7 @@ share/audacious/AUTHORS
> >> share/audacious/COPYING
> >> share/audacious/images/
> >> share/audacious/images/about-logo.png
> >> +share/audacious/images/about-logo.svg
> >> share/audacious/images/album.png
> >> share/audacious/images/appearance.png
> >> share/audacious/images/audio.png
> >> @@ -61,6 +58,7 @@ share/audacious/images/playlist.png
> >> share/audacious/images/plugins.png
> >> share/icons/hicolor/48x48/apps/audacious.png
> >> share/icons/hicolor/scalable/apps/audacious.svg
> >> +share/locale/ar/LC_MESSAGES/audacious.mo
> >> share/locale/ast/LC_MESSAGES/audacious.mo
> >> share/locale/be/LC_MESSAGES/audacious.mo
> >> share/locale/bg/LC_MESSAGES/audacious.mo
> >> @@ -95,6 +93,8 @@ share/locale/id_ID/LC_MESSAGES/audacious
> >> share/locale/it/LC_MESSAGES/audacious.mo
> >> share/locale/ja/LC_MESSAGES/audacious.mo
> >> share/locale/ko/LC_MESSAGES/audacious.mo
> >> +share/locale/ky/
> >> +share/locale/ky/LC_MESSAGES/
> >> share/locale/ky/LC_MESSAGES/audacious.mo
> >> share/locale/lt/LC_MESSAGES/audacious.mo
> >> share/locale/lv/LC_MESSAGES/audacious.mo
> >>
>
>
--
Antoine
