Update audio/audacious (and meta pkg) to version 4.1.

OK MAINTAINER: bket@. Thanks!
This commit is contained in:
edd 2021-02-03 21:44:37 +00:00
parent f065eca93f
commit dc0640a011
12 changed files with 222 additions and 32 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.5 2020/07/12 12:15:52 bket Exp $
# $OpenBSD: Makefile.inc,v 1.6 2021/02/03 21:44:37 edd Exp $
# Do not forget to sync meta/audacious
VERSION = 4.0.5
VERSION = 4.1
CATEGORIES = audio multimedia
@ -14,6 +14,8 @@ EXTRACT_SUFX = .tar.bz2
COMPILER = base-clang ports-gcc
FIX_EXTRACT_PERMISSIONS = Yes
BUILD_DEPENDS += devel/gettext,-tools
LIB_DEPENDS += x11/gtk+2

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.3 2020/07/12 12:15:52 bket Exp $
# $OpenBSD: Makefile,v 1.4 2021/02/03 21:44:37 edd Exp $
COMMENT = graphical audio player which supports lots of formats
DISTNAME = audacious-${VERSION}
PKGNAME = audacious-player-${VERSION}
SHARED_LIBS += audcore 5.1 # 5.2
SHARED_LIBS += audcore 5.2 # 5.3
SHARED_LIBS += audgui 4.1 # 5.1
SHARED_LIBS += audtag 3.0 # 3.0

View File

@ -1,2 +1,2 @@
SHA256 (audacious-4.0.5.tar.bz2) = Ua6p5qOxf1IJ1JKDot7ouafNfqlgKDFpCdqfC/6THwk=
SIZE (audacious-4.0.5.tar.bz2) = 577422
SHA256 (audacious-4.1.tar.bz2) = H1iFj5eJ6GfFE7UnKYfxO9+wkzKwPCgUrUxuKfUl41w=
SIZE (audacious-4.1.tar.bz2) = 586472

View File

@ -1,13 +1,105 @@
$OpenBSD: patch-buildsys_mk_in,v 1.1 2020/04/15 15:50:16 bket Exp $
$OpenBSD: patch-buildsys_mk_in,v 1.2 2021/02/03 21:44:37 edd Exp $
Show compiler invocations.
Index: buildsys.mk.in
--- buildsys.mk.in.orig
+++ buildsys.mk.in
@@ -113,7 +113,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
@@ -122,18 +122,18 @@ DEPS = ${OBJS:.o=.dep} \
MO_FILES = ${LOCALES:.po=.mo}
-.SILENT:
+#.SILENT:
.SUFFIXES:
.SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .moslib.o .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
.PHONY: all subdirs subdirs-after pre-depend depend install install-includes install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS} ${SUBDIRS_AFTER}
.SUFFIXES: .amigalib.o .beam .c .cc .class .cxx .d .erl .lib.o .java .mo .m .mm .o .plugin.o .po .py .pyc .rc .S .xpm
.PHONY: all subdirs subdirs-after pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales copy-headers-into-framework ${SUBDIRS} ${SUBDIRS_AFTER}
all:
- ${MAKE} -s pre-all
- ${MAKE} -s subdirs
- ${MAKE} -s depend
- ${MAKE} -s ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${STATIC_AMIGA_LIB} ${STATIC_AMIGA_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${FRAMEWORK} ${FRAMEWORK_NOINST} ${AMIGA_LIB} ${AMIGA_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
- ${MAKE} -s subdirs-after
- ${MAKE} -s post-all
+ ${MAKE} pre-all
+ ${MAKE} subdirs
+ ${MAKE} depend
+ ${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${STATIC_AMIGA_LIB} ${STATIC_AMIGA_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${FRAMEWORK} ${FRAMEWORK_NOINST} ${AMIGA_LIB} ${AMIGA_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
+ ${MAKE} subdirs-after
+ ${MAKE} post-all
pre-all post-all:
@@ -143,7 +143,7 @@ subdirs-after: ${SUBDIRS_AFTER}
${SUBDIRS} ${SUBDIRS_AFTER}:
for i in $@; do \
${DIR_ENTER}; \
- ${MAKE} -s || exit $$?; \
+ ${MAKE} || exit $$?; \
${DIR_LEAVE}; \
done
@@ -192,7 +192,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_
${FRAMEWORK} ${FRAMEWORK_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
${LINK_STATUS}
out="$@"; \
- if rm -fr $$out && ${MKDIR_P} $$out && ${MAKE} -s COPY_HEADERS_IF_SUBDIR=${includesubdir} COPY_HEADERS_DESTINATION=$$PWD/$@/Headers copy-headers-into-framework && if test -f Info.plist; then ${INSTALL} -m 644 Info.plist $$out/Info.plist; fi && if test -f module.modulemap; then ${MKDIR_P} $$out/Modules && ${INSTALL} -m 644 module.modulemap $$out/Modules/module.modulemap; fi && ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${FRAMEWORK_LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} $$out; then \
+ if rm -fr $$out && ${MKDIR_P} $$out && ${MAKE} COPY_HEADERS_IF_SUBDIR=${includesubdir} COPY_HEADERS_DESTINATION=$$PWD/$@/Headers copy-headers-into-framework && if test -f Info.plist; then ${INSTALL} -m 644 Info.plist $$out/Info.plist; fi && if test -f module.modulemap; then ${MKDIR_P} $$out/Modules && ${INSTALL} -m 644 module.modulemap $$out/Modules/module.modulemap; fi && ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${FRAMEWORK_LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} $$out; then \
${LINK_OK}; \
else \
rm -fr $$out; false; \
@@ -203,7 +203,7 @@ copy-headers-into-framework:
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
test x"$$i" = x"" && continue; \
cd $$i || exit 1; \
- ${MAKE} -s copy-headers-into-framework || exit $$?; \
+ ${MAKE} copy-headers-into-framework || exit $$?; \
cd .. || exit 1; \
done
@@ -652,7 +652,7 @@ install: install-extra
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
test x"$$i" = x"" && continue; \
${DIR_ENTER}; \
- ${MAKE} -s install || exit $$?; \
+ ${MAKE} install || exit $$?; \
${DIR_LEAVE}; \
done
@@ -765,7 +765,7 @@ uninstall: uninstall-extra
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
test x"$$i" = x"" && continue; \
${DIR_ENTER}; \
- ${MAKE} -s uninstall || exit $$?; \
+ ${MAKE} uninstall || exit $$?; \
${DIR_LEAVE}; \
done
@@ -880,7 +880,7 @@ clean:
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
test x"$$i" = x"" && continue; \
${DIR_ENTER}; \
- ${MAKE} -s clean || exit $$?; \
+ ${MAKE} clean || exit $$?; \
${DIR_LEAVE}; \
done
@@ -901,7 +901,7 @@ distclean: clean
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
test x"$$i" = x"" && continue; \
${DIR_ENTER}; \
- ${MAKE} -s distclean || exit $$?; \
+ ${MAKE} distclean || exit $$?; \
${DIR_LEAVE}; \
done
@@ -921,7 +921,7 @@ print-hierarchy:
test x"$$i" = x"" && continue; \
echo ${PRINT_HIERARCHY_PREFIX}$$i; \
cd $$i || exit $$?; \
- ${MAKE} -s PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \
+ ${MAKE} PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \
cd .. || exit $$?; \
done

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_libaudcore_Makefile,v 1.1 2020/04/15 15:50:16 bket Exp $
$OpenBSD: patch-src_libaudcore_Makefile,v 1.2 2021/02/03 21:44:37 edd Exp $
Index: src/libaudcore/Makefile
--- src/libaudcore/Makefile.orig
+++ 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 = 2
LIB_MINOR = 3

View File

@ -1,10 +1,11 @@
@comment $OpenBSD: PLIST,v 1.1 2020/04/15 15:50:16 bket Exp $
@comment $OpenBSD: PLIST,v 1.2 2021/02/03 21:44:37 edd Exp $
@conflict audacious-<4.0
@bin bin/audacious
@bin bin/audtool
include/audacious/
include/audacious/audtag.h
include/libaudcore/
include/libaudcore/archive_reader.h
include/libaudcore/audio.h
include/libaudcore/audstrings.h
include/libaudcore/drct.h
@ -95,6 +96,8 @@ share/locale/pt_PT/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
share/locale/sl/LC_MESSAGES/audacious.mo
share/locale/sq/LC_MESSAGES/audacious.mo
share/locale/sr/LC_MESSAGES/audacious.mo
share/locale/sr_RS/
share/locale/sr_RS/LC_MESSAGES/

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2020/07/12 12:15:52 bket Exp $
# $OpenBSD: Makefile,v 1.6 2021/02/03 21:44:37 edd Exp $
COMMENT = input and output plugins for Audacious
@ -8,7 +8,7 @@ DISTNAME = audacious-plugins-${VERSION}
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} FLAC GL X11 Xcomposite Xcursor Xdamage
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 audgui
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 audcore 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

View File

@ -1,2 +1,2 @@
SHA256 (audacious-plugins-4.0.5.tar.bz2) = nwJRkiiGk08qoyc5taMOrf76fHDdez54+Uqm/FTgxVs=
SIZE (audacious-plugins-4.0.5.tar.bz2) = 1759133
SHA256 (audacious-plugins-4.1.tar.bz2) = 2tb8YlBVNJ1Ynjbo5ciuffr83f6WiUgGUJaW2Cu2HUw=
SIZE (audacious-plugins-4.1.tar.bz2) = 1802825

View File

@ -1,13 +1,105 @@
$OpenBSD: patch-buildsys_mk_in,v 1.1 2020/04/15 15:50:16 bket Exp $
$OpenBSD: patch-buildsys_mk_in,v 1.2 2021/02/03 21:44:37 edd Exp $
Show compiler invocations.
Index: buildsys.mk.in
--- buildsys.mk.in.orig
+++ buildsys.mk.in
@@ -113,7 +113,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
@@ -122,18 +122,18 @@ DEPS = ${OBJS:.o=.dep} \
MO_FILES = ${LOCALES:.po=.mo}
-.SILENT:
+#.SILENT:
.SUFFIXES:
.SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .moslib.o .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
.PHONY: all subdirs subdirs-after pre-depend depend install install-includes install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS} ${SUBDIRS_AFTER}
.SUFFIXES: .amigalib.o .beam .c .cc .class .cxx .d .erl .lib.o .java .mo .m .mm .o .plugin.o .po .py .pyc .rc .S .xpm
.PHONY: all subdirs subdirs-after pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales copy-headers-into-framework ${SUBDIRS} ${SUBDIRS_AFTER}
all:
- ${MAKE} -s pre-all
- ${MAKE} -s subdirs
- ${MAKE} -s depend
- ${MAKE} -s ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${STATIC_AMIGA_LIB} ${STATIC_AMIGA_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${FRAMEWORK} ${FRAMEWORK_NOINST} ${AMIGA_LIB} ${AMIGA_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
- ${MAKE} -s subdirs-after
- ${MAKE} -s post-all
+ ${MAKE} pre-all
+ ${MAKE} subdirs
+ ${MAKE} depend
+ ${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${STATIC_AMIGA_LIB} ${STATIC_AMIGA_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${FRAMEWORK} ${FRAMEWORK_NOINST} ${AMIGA_LIB} ${AMIGA_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
+ ${MAKE} subdirs-after
+ ${MAKE} post-all
pre-all post-all:
@@ -143,7 +143,7 @@ subdirs-after: ${SUBDIRS_AFTER}
${SUBDIRS} ${SUBDIRS_AFTER}:
for i in $@; do \
${DIR_ENTER}; \
- ${MAKE} -s || exit $$?; \
+ ${MAKE} || exit $$?; \
${DIR_LEAVE}; \
done
@@ -192,7 +192,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_
${FRAMEWORK} ${FRAMEWORK_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
${LINK_STATUS}
out="$@"; \
- if rm -fr $$out && ${MKDIR_P} $$out && ${MAKE} -s COPY_HEADERS_IF_SUBDIR=${includesubdir} COPY_HEADERS_DESTINATION=$$PWD/$@/Headers copy-headers-into-framework && if test -f Info.plist; then ${INSTALL} -m 644 Info.plist $$out/Info.plist; fi && if test -f module.modulemap; then ${MKDIR_P} $$out/Modules && ${INSTALL} -m 644 module.modulemap $$out/Modules/module.modulemap; fi && ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${FRAMEWORK_LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} $$out; then \
+ if rm -fr $$out && ${MKDIR_P} $$out && ${MAKE} COPY_HEADERS_IF_SUBDIR=${includesubdir} COPY_HEADERS_DESTINATION=$$PWD/$@/Headers copy-headers-into-framework && if test -f Info.plist; then ${INSTALL} -m 644 Info.plist $$out/Info.plist; fi && if test -f module.modulemap; then ${MKDIR_P} $$out/Modules && ${INSTALL} -m 644 module.modulemap $$out/Modules/module.modulemap; fi && ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${FRAMEWORK_LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} $$out; then \
${LINK_OK}; \
else \
rm -fr $$out; false; \
@@ -203,7 +203,7 @@ copy-headers-into-framework:
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
test x"$$i" = x"" && continue; \
cd $$i || exit 1; \
- ${MAKE} -s copy-headers-into-framework || exit $$?; \
+ ${MAKE} copy-headers-into-framework || exit $$?; \
cd .. || exit 1; \
done
@@ -652,7 +652,7 @@ install: install-extra
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
test x"$$i" = x"" && continue; \
${DIR_ENTER}; \
- ${MAKE} -s install || exit $$?; \
+ ${MAKE} install || exit $$?; \
${DIR_LEAVE}; \
done
@@ -765,7 +765,7 @@ uninstall: uninstall-extra
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
test x"$$i" = x"" && continue; \
${DIR_ENTER}; \
- ${MAKE} -s uninstall || exit $$?; \
+ ${MAKE} uninstall || exit $$?; \
${DIR_LEAVE}; \
done
@@ -880,7 +880,7 @@ clean:
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
test x"$$i" = x"" && continue; \
${DIR_ENTER}; \
- ${MAKE} -s clean || exit $$?; \
+ ${MAKE} clean || exit $$?; \
${DIR_LEAVE}; \
done
@@ -901,7 +901,7 @@ distclean: clean
for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
test x"$$i" = x"" && continue; \
${DIR_ENTER}; \
- ${MAKE} -s distclean || exit $$?; \
+ ${MAKE} distclean || exit $$?; \
${DIR_LEAVE}; \
done
@@ -921,7 +921,7 @@ print-hierarchy:
test x"$$i" = x"" && continue; \
echo ${PRINT_HIERARCHY_PREFIX}$$i; \
cd $$i || exit $$?; \
- ${MAKE} -s PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \
+ ${MAKE} PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \
cd .. || exit $$?; \
done

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.3 2020/07/12 12:15:53 bket Exp $
$OpenBSD: patch-configure,v 1.4 2021/02/03 21:44:37 edd Exp $
Set AUDACIOUS_{CFLAGS,LIBS} only after the end of all plugin checks.
This fixes some of the autoconf checks as the LIBS variable is being
@ -7,7 +7,7 @@ polluted very early on, breaking most of the checks using AC_CHECK_LIB.
Index: configure
--- configure.orig
+++ configure
@@ -10283,8 +10283,6 @@ $as_echo "yes" >&6; }
@@ -11424,8 +11424,6 @@ printf "%s\n" "yes" >&6; }
fi
@ -16,12 +16,12 @@ Index: configure
if test $HAVE_DARWIN = yes ; then
@@ -15525,6 +15523,8 @@ as_fn_error ()
as_fn_exit $as_status
} # as_fn_error
@@ -16672,6 +16670,8 @@ then :
fi
+CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
+LIBS="$LIBS $AUDACIOUS_LIBS"
# as_fn_set_status STATUS
# -----------------------
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1 2020/04/15 15:50:16 bket Exp $
@comment $OpenBSD: PLIST,v 1.2 2021/02/03 21:44:38 edd Exp $
@pkgpath audio/audacious-plugins,-main
@pkgpath audio/audacious-plugins
lib/audacious/
@ -31,7 +31,6 @@ lib/audacious/General/
@so lib/audacious/General/delete-files.so
@so lib/audacious/General/gtkui.so
@so lib/audacious/General/hotkey.so
@so lib/audacious/General/lyricwiki.so
@so lib/audacious/General/mpris2.so
@so lib/audacious/General/notify.so
@so lib/audacious/General/playlist-manager.so
@ -227,6 +226,8 @@ share/locale/pt_PT/LC_MESSAGES/audacious-plugins.mo
share/locale/ru/LC_MESSAGES/audacious-plugins.mo
share/locale/si/LC_MESSAGES/audacious-plugins.mo
share/locale/sk/LC_MESSAGES/audacious-plugins.mo
share/locale/sl/LC_MESSAGES/audacious-plugins.mo
share/locale/sq/LC_MESSAGES/audacious-plugins.mo
share/locale/sr/LC_MESSAGES/audacious-plugins.mo
share/locale/sr_RS/LC_MESSAGES/audacious-plugins.mo
share/locale/sv/LC_MESSAGES/audacious-plugins.mo

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2020/07/12 12:15:53 bket Exp $
# $OpenBSD: Makefile,v 1.6 2021/02/03 21:44:37 edd Exp $
COMMENT = audacious meta-package
VERSION = 4.0.5
VERSION = 4.1
PKGNAME = audacious-${VERSION}
MAINTAINER = Bjorn Ketelaars <bket@openbsd.org>