diff --git a/audio/audacious/Makefile b/audio/audacious/Makefile index 7f48dded1d2..ed0797358dc 100644 --- a/audio/audacious/Makefile +++ b/audio/audacious/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.13 2009/08/10 06:29:52 kili Exp $ +# $OpenBSD: Makefile,v 1.14 2009/09/15 21:49:01 fgsch Exp $ SHARED_ONLY = Yes COMMENT = gtk+2 media player based on BMP and XMMS -DISTNAME = audacious-1.5.1 -PKGNAME = ${DISTNAME}p0 -SHARED_LIBS = audclient 0.0 +DISTNAME = audacious-2.1 +SHARED_LIBS = audclient 1.0 CATEGORIES = audio multimedia diff --git a/audio/audacious/distinfo b/audio/audacious/distinfo index 59e746b62d0..d26be51939c 100644 --- a/audio/audacious/distinfo +++ b/audio/audacious/distinfo @@ -1,5 +1,5 @@ -MD5 (audacious-1.5.1.tgz) = PCBqbQbUnYpo8O3Zkz0iGQ== -RMD160 (audacious-1.5.1.tgz) = acvTD/3jOeoFScYxdmpbhmzzLCk= -SHA1 (audacious-1.5.1.tgz) = PDyzpPmZf1qzprSTcmCyiZyESAY= -SHA256 (audacious-1.5.1.tgz) = rFlwwJ7SWsVtrBXgNTKFksrOUyHHiVIp5oLKySIB8dc= -SIZE (audacious-1.5.1.tgz) = 1937747 +MD5 (audacious-2.1.tgz) = A6tqBi5ZCSFIQfkPdn8RRw== +RMD160 (audacious-2.1.tgz) = unxWcmVONq5vo5pPaOJYNjzdrwU= +SHA1 (audacious-2.1.tgz) = Ugxxksy4nGU1Pi2IQMzO+fEcakI= +SHA256 (audacious-2.1.tgz) = MuFkEtRG8ydEy0d9W4oGZEfAyCb3E0fsZT6ajLXOdHw= +SIZE (audacious-2.1.tgz) = 1852176 diff --git a/audio/audacious/patches/patch-buildsys_mk_in b/audio/audacious/patches/patch-buildsys_mk_in index 31ac4dfc81b..066942565d2 100644 --- a/audio/audacious/patches/patch-buildsys_mk_in +++ b/audio/audacious/patches/patch-buildsys_mk_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-buildsys_mk_in,v 1.1 2008/04/02 00:39:19 fgsch Exp $ ---- buildsys.mk.in.orig Thu Mar 13 22:19:27 2008 -+++ buildsys.mk.in Sun Mar 23 05:55:30 2008 -@@ -76,7 +76,7 @@ OBJS5 = ${OBJS4:.erl=.beam} - OBJS += ${OBJS5:.m=.o} - DEPS += ${OBJS:.o=.dep} +$OpenBSD: patch-buildsys_mk_in,v 1.2 2009/09/15 21:49:01 fgsch Exp $ +--- buildsys.mk.in.orig Mon Jul 6 23:39:11 2009 ++++ buildsys.mk.in Sat Aug 1 15:21:49 2009 +@@ -81,7 +81,7 @@ OBJS6 = ${OBJS5:.m=.o} + OBJS7 = ${OBJS6:.py=.pyc} + OBJS += ${OBJS7:.xpm=.o} -.SILENT: +#.SILENT: - .SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m + .SUFFIXES: + .SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m .o .py .pyc .xpm .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean - diff --git a/audio/audacious/patches/patch-m4_buildsys_m4 b/audio/audacious/patches/patch-m4_buildsys_m4 index a6c089d28a3..3bf7b8a02a5 100644 --- a/audio/audacious/patches/patch-m4_buildsys_m4 +++ b/audio/audacious/patches/patch-m4_buildsys_m4 @@ -1,20 +1,15 @@ -$OpenBSD: patch-m4_buildsys_m4,v 1.1 2008/04/02 00:39:19 fgsch Exp $ ---- m4/buildsys.m4.orig Thu Mar 13 22:19:27 2008 -+++ m4/buildsys.m4 Wed Apr 2 01:35:47 2008 -@@ -106,14 +106,14 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [ - AC_MSG_RESULT(POSIX) +$OpenBSD: patch-m4_buildsys_m4,v 1.2 2009/09/15 21:49:01 fgsch Exp $ +--- m4/buildsys.m4.orig Sat Aug 1 15:26:59 2009 ++++ m4/buildsys.m4 Sat Aug 1 15:27:59 2009 +@@ -88,9 +88,9 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [ + AC_MSG_RESULT(Solaris) LIB_CPPFLAGS='-DPIC' LIB_CFLAGS='-fPIC' -- LIB_LDFLAGS='-shared -fPIC -Wl,-soname,${LIB}.${LIB_MAJOR}' +- LIB_LDFLAGS='-shared -fPIC' + LIB_LDFLAGS='-shared -fPIC -Wl,-soname,${LIB}' LIB_PREFIX='lib' - LIB_SUFFIX='.so' +- LIB_SUFFIX='.so.${LIB_MAJOR}.${LIB_MINOR}' ++ LIB_SUFFIX='.so' PLUGIN_CPPFLAGS='-DPIC' PLUGIN_CFLAGS='-fPIC' PLUGIN_LDFLAGS='-shared -fPIC' - PLUGIN_SUFFIX='.so' -- INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i' -+ INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i' - UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0' - CLEAN_LIB='' - ;; diff --git a/audio/audacious/patches/patch-src_libaudclient_Makefile b/audio/audacious/patches/patch-src_libaudclient_Makefile index cc218451d24..1f71ab05339 100644 --- a/audio/audacious/patches/patch-src_libaudclient_Makefile +++ b/audio/audacious/patches/patch-src_libaudclient_Makefile @@ -1,9 +1,9 @@ -$OpenBSD: patch-src_libaudclient_Makefile,v 1.1 2008/04/02 00:39:19 fgsch Exp $ ---- src/libaudclient/Makefile.orig Wed Jan 30 01:51:39 2008 -+++ src/libaudclient/Makefile Wed Jan 30 01:52:13 2008 +$OpenBSD: patch-src_libaudclient_Makefile,v 1.2 2009/09/15 21:49:01 fgsch Exp $ +--- src/libaudclient/Makefile.orig Mon Jul 6 23:39:12 2009 ++++ src/libaudclient/Makefile Sat Aug 1 15:20:12 2009 @@ -1,4 +1,4 @@ -LIB = ${LIB_PREFIX}audclient${LIB_SUFFIX} +LIB = ${LIB_PREFIX}audclient${LIB_SUFFIX}.${LIBaudclient_VERSION} - LIB_MAJOR = 1 + LIB_MAJOR = 2 LIB_MINOR = 0 diff --git a/audio/audacious/patches/patch-src_libaudtag_util_h b/audio/audacious/patches/patch-src_libaudtag_util_h new file mode 100644 index 00000000000..1859455ae04 --- /dev/null +++ b/audio/audacious/patches/patch-src_libaudtag_util_h @@ -0,0 +1,9 @@ +$OpenBSD: patch-src_libaudtag_util_h,v 1.1 2009/09/15 21:49:01 fgsch Exp $ +--- src/libaudtag/util.h.orig Sat Aug 1 15:43:39 2009 ++++ src/libaudtag/util.h Sat Aug 1 15:43:45 2009 +@@ -1,4 +1,4 @@ +-#include ++#include + #include "libaudcore/tuple.h" + #include "libaudcore/vfs.h" + diff --git a/audio/audacious/patches/patch-src_libaudtag_wma_guid_c b/audio/audacious/patches/patch-src_libaudtag_wma_guid_c new file mode 100644 index 00000000000..7d0809e1577 --- /dev/null +++ b/audio/audacious/patches/patch-src_libaudtag_wma_guid_c @@ -0,0 +1,10 @@ +$OpenBSD: patch-src_libaudtag_wma_guid_c,v 1.1 2009/09/15 21:49:01 fgsch Exp $ +--- src/libaudtag/wma/guid.c.orig Sat Aug 1 15:46:12 2009 ++++ src/libaudtag/wma/guid.c Sat Aug 1 15:46:17 2009 +@@ -1,5 +1,5 @@ + #include +-#include ++#include + + #include "libaudcore/vfs.h" + #include "guid.h" diff --git a/audio/audacious/patches/patch-src_libaudtag_wma_wma_c b/audio/audacious/patches/patch-src_libaudtag_wma_wma_c new file mode 100644 index 00000000000..b615b1151e2 --- /dev/null +++ b/audio/audacious/patches/patch-src_libaudtag_wma_wma_c @@ -0,0 +1,11 @@ +$OpenBSD: patch-src_libaudtag_wma_wma_c,v 1.1 2009/09/15 21:49:01 fgsch Exp $ +--- src/libaudtag/wma/wma.c.orig Sat Aug 1 15:46:41 2009 ++++ src/libaudtag/wma/wma.c Sat Aug 1 15:46:45 2009 +@@ -1,6 +1,6 @@ + /* functions for WMA file handling */ + +-#include ++#include + #include "wma.h" + #include "guid.h" + #include "wma_fmt.h" diff --git a/audio/audacious/patches/patch-src_libaudtag_wma_wma_fmt_h b/audio/audacious/patches/patch-src_libaudtag_wma_wma_fmt_h new file mode 100644 index 00000000000..1e274ea4277 --- /dev/null +++ b/audio/audacious/patches/patch-src_libaudtag_wma_wma_fmt_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_libaudtag_wma_wma_fmt_h,v 1.1 2009/09/15 21:49:01 fgsch Exp $ +--- src/libaudtag/wma/wma_fmt.h.orig Sat Aug 1 15:44:21 2009 ++++ src/libaudtag/wma/wma_fmt.h Sat Aug 1 15:44:25 2009 +@@ -1,7 +1,7 @@ + #ifndef AUD_WMA_FMT_H + #define AUD_WMA_FMT_H + +-#include ++#include + + #define ASF_HEADER_OBJECT_GUID "75B22630-668E-11CF-A6D900AA0062CE6C" + #define ASF_FILE_PROPERTIES_OBJECT_GUID "8CABDCA1-A947-11CF-8EE400C00C205365" diff --git a/audio/audacious/pkg/PLIST b/audio/audacious/pkg/PLIST index deff0337449..50b7fe513fd 100644 --- a/audio/audacious/pkg/PLIST +++ b/audio/audacious/pkg/PLIST @@ -1,21 +1,25 @@ -@comment $OpenBSD: PLIST,v 1.6 2009/01/25 02:02:19 fgsch Exp $ -@bin bin/audacious -@bin bin/audtool +@comment $OpenBSD: PLIST,v 1.7 2009/09/15 21:49:01 fgsch Exp $ +@bin bin/audacious2 +@bin bin/audtool2 include/audacious/ include/audacious/audconfig.h include/audacious/audctrl.h include/audacious/auddrct.h +include/audacious/audtag.h +include/audacious/audutil.h include/audacious/configdb.h include/audacious/custom_uri.h include/audacious/dbus-service.h include/audacious/dbus.h include/audacious/discovery.h +include/audacious/equalizer_preset.h include/audacious/eventqueue.h include/audacious/flow.h include/audacious/hook.h include/audacious/i18n.h include/audacious/id3tag.h include/audacious/input.h +include/audacious/interface.h include/audacious/main.h include/audacious/mime.h include/audacious/output.h @@ -23,29 +27,37 @@ include/audacious/playback.h include/audacious/playlist.h include/audacious/playlist_container.h include/audacious/plugin.h +include/audacious/preferences.h include/audacious/rcfile.h -include/audacious/strings.h -include/audacious/tuple.h -include/audacious/tuple_compiler.h -include/audacious/tuple_formatter.h +include/audacious/scanner.h include/audacious/ui_fileinfopopup.h include/audacious/ui_plugin_menu.h include/audacious/ui_preferences.h include/audacious/util.h -include/audacious/vfs.h -include/audacious/vfs_buffer.h -include/audacious/vfs_buffered_file.h +include/audacious/vis_runner.h include/libSAD/ include/libSAD/common.h include/libSAD/dither.h include/libSAD/libSAD.h +include/libaudcore/ +include/libaudcore/audstrings.h +include/libaudcore/tuple.h +include/libaudcore/tuple_compiler.h +include/libaudcore/tuple_formatter.h +include/libaudcore/vfs.h +include/libaudcore/vfs_buffer.h +include/libaudcore/vfs_buffered_file.h +lib/libSAD.so @lib lib/libaudclient.so.${LIBaudclient_VERSION} +lib/libaudcore.so lib/libaudid3tag.so +lib/libaudtag.so +lib/libaudutil.so lib/pkgconfig/audacious.pc lib/pkgconfig/audclient.pc -@man man/man1/audacious.1 -@man man/man1/audtool.1 -share/applications/audacious.desktop +@man man/man1/audacious2.1 +@man man/man1/audtool2.1 +share/applications/audacious2.desktop share/audacious/ share/audacious/Skins/ share/audacious/Skins/Classic/ @@ -294,6 +306,7 @@ share/audacious/images/audacious_eq.xpm share/audacious/images/audacious_player.xpm share/audacious/images/audacious_playlist.xpm share/audacious/images/audio.png +share/audacious/images/blue.png share/audacious/images/connectivity.png share/audacious/images/menu_playlist.png share/audacious/images/menu_plugin.png @@ -308,6 +321,7 @@ share/audacious/ui/ share/audacious/ui/carbon-menubar.ui share/audacious/ui/equalizer.ui share/audacious/ui/mainwin.ui +share/audacious/ui/player.ui share/audacious/ui/playlist.ui share/locale/bg/LC_MESSAGES/audacious.mo share/locale/br/LC_MESSAGES/audacious.mo @@ -318,6 +332,7 @@ share/locale/de/LC_MESSAGES/audacious.mo share/locale/el/LC_MESSAGES/audacious.mo share/locale/es/LC_MESSAGES/audacious.mo share/locale/et/LC_MESSAGES/audacious.mo +share/locale/eu/LC_MESSAGES/audacious.mo share/locale/fi/LC_MESSAGES/audacious.mo share/locale/fr/LC_MESSAGES/audacious.mo share/locale/hi/LC_MESSAGES/audacious.mo @@ -328,6 +343,7 @@ share/locale/ja/LC_MESSAGES/audacious.mo share/locale/ka/LC_MESSAGES/audacious.mo share/locale/ko/LC_MESSAGES/audacious.mo share/locale/lt/LC_MESSAGES/audacious.mo +share/locale/lv/LC_MESSAGES/audacious.mo share/locale/mk/LC_MESSAGES/audacious.mo share/locale/nl/LC_MESSAGES/audacious.mo share/locale/pl/LC_MESSAGES/audacious.mo @@ -345,6 +361,6 @@ share/locale/uk/LC_MESSAGES/audacious.mo share/locale/zh_CN/LC_MESSAGES/audacious.mo share/locale/zh_TW/LC_MESSAGES/audacious.mo share/pixmaps/ -share/pixmaps/audacious.png @exec %D/bin/update-desktop-database @unexec %D/bin/update-desktop-database +share/pixmaps/audacious2.png