From 029dc2320e6e07b545b08e2032d1ca8c45fcff32 Mon Sep 17 00:00:00 2001 From: Oliver Lehmann Date: Sun, 17 Oct 2010 10:08:54 +0000 Subject: [PATCH] update audacious to 2.4.0 --- audio/audacious-dumb/Makefile | 1 + multimedia/audacious-plugins/Makefile | 29 +++- multimedia/audacious-plugins/distinfo | 6 +- .../files/patch-src-OSS4-audio.c | 128 ++---------------- multimedia/audacious-plugins/pkg-plist | 16 ++- multimedia/audacious/Makefile | 14 +- multimedia/audacious/distinfo | 6 +- .../files/patch-src-audacious-Makefile | 29 ++-- multimedia/audacious/pkg-plist | 58 ++++---- 9 files changed, 104 insertions(+), 183 deletions(-) diff --git a/audio/audacious-dumb/Makefile b/audio/audacious-dumb/Makefile index 89bf95f65446..5f830e14ad6a 100644 --- a/audio/audacious-dumb/Makefile +++ b/audio/audacious-dumb/Makefile @@ -13,6 +13,7 @@ MASTER_SITES= http://www.netswarm.net/misc/ \ MAINTAINER= ehaupt@FreeBSD.org COMMENT= Audacious plugin that support the IT, XM, S3M or MOD formats +BROKEN= does not work with audacious 2.4.0 RUN_DEPENDS= audacious2:${PORTSDIR}/multimedia/audacious BUILD_DEPENDS= audacious2:${PORTSDIR}/multimedia/audacious \ diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile index 6be2a92bb049..efe73eb52159 100644 --- a/multimedia/audacious-plugins/Makefile +++ b/multimedia/audacious-plugins/Makefile @@ -6,8 +6,7 @@ # PORTNAME= audacious-plugins -PORTVERSION= 2.3 -PORTREVISION= 5 +PORTVERSION= 2.4.0 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.atheme.org/ EXTRACT_SUFX= .tgz @@ -23,7 +22,7 @@ USE_LDCONFIG= yes CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib" \ CFLAGS="-I${LOCALBASE}/include" \ CPP=${CPP} -CONFIGURE_ARGS= --disable-evdevplug --disable-alsa --disable-ffaudio \ +CONFIGURE_ARGS= --disable-evdevplug --disable-alsa \ --disable-pulse --disable-projectm --disable-projectm-1.0 WANT_GNOME= yes WANT_EFL= yes @@ -37,6 +36,7 @@ PORTDOCS= AUTHORS # PROJECTM "Enable projectM vis plugin" on \ OPTIONS= DBUS "Enable dbus support" on \ + CUE "Enable CUE support" on \ ESOUND "Enable Esound output output" off \ MP3 "Enable mp3 plugin" on \ ROCKLIGHT "Enable Rocklight vis plugin" on \ @@ -47,6 +47,7 @@ OPTIONS= DBUS "Enable dbus support" on \ ADPLUG "Enable AdPlug plugin" off \ VORBIS "Enable Ogg Vorbis input plugin" off \ FLAC "Enable FLAC input plugin" off \ + FFAUDIO "Enable FFAUDIO input plugin" off \ WAVPACK "Enable WavPack input plugin" off \ AAC "Enable aac plugin" on \ SNDFILE "Enable sndfile extensions" off \ @@ -77,6 +78,15 @@ CONFIGURE_ARGS+=--disable-dbus --disable-gnomeshortcuts PLIST_SUB+= DBUS="@comment " .endif +.if !defined(WITHOUT_CUE) +LIB_DEPENDS+= cue.1:${PORTSDIR}/textproc/libcue +CONFIGURE_ARGS+=--enable-cue +PLIST_SUB+= CUEPLUGIN="" +.else +CONFIGURE_ARGS+=--disable-cue +PLIST_SUB+= CUEPLUGIN="@comment " +.endif + .if defined(WITH_ESOUND) USE_GNOME+= esound CONFIGURE_ARGS+=--enable-esd @@ -171,6 +181,15 @@ CONFIGURE_ARGS+=--disable-flacng --disable-filewriter_flac PLIST_SUB+= FLACPLUGIN="@comment " .endif +.if defined(WITH_FFAUDIO) +LIB_DEPENDS+= avutil.1:${PORTSDIR}/multimedia/ffmpeg +CONFIGURE_ARGS+=--enable-ffaudio +PLIST_SUB+= FFAUDIOPLUGIN="" +.else +CONFIGURE_ARGS+=--disable-ffaudio +PLIST_SUB+= FFAUDIOPLUGIN="@comment " +.endif + .if defined(WITH_WAVPACK) LIB_DEPENDS+= wavpack.2:${PORTSDIR}/audio/wavpack CONFIGURE_ARGS+=--enable-wavpack @@ -218,7 +237,7 @@ PLIST_SUB+= JACKPLUGIN="@comment " .endif #OSS4 only works with recent changed in HEAD -.if ${OSVERSION} >= 800061 +.if ${OSVERSION} >= 900000 .if !defined(WITHOUT_OSS) PLIST_SUB+= OSSPLUGIN="" CONFIGURE_ARGS+=--enable-oss @@ -352,6 +371,8 @@ post-patch: @${REINPLACE_CMD} -e 's|malloc\.h|stdlib\.h|g' \ ${WRKSRC}/src/neon/cert_verification.c \ ${WRKSRC}/src/usf/memory.c + @${REINPLACE_CMD} -e 's|-ldl||g' \ + ${WRKSRC}/src/ladspa/Makefile pre-configure: .if defined(WITH_AUDIOCD) && !exists(${LOCALBASE}/lib/libcdio_cdda.so) diff --git a/multimedia/audacious-plugins/distinfo b/multimedia/audacious-plugins/distinfo index 006ecd604d0d..887bd2390a3e 100644 --- a/multimedia/audacious-plugins/distinfo +++ b/multimedia/audacious-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (audacious-plugins-2.3.tgz) = de350b7612ff42e3719ae19a36389118 -SHA256 (audacious-plugins-2.3.tgz) = 7da44d2aaccceea6ad838a8b677abd5f3e5e10ad168f6f478d3e5e2c4aacaa41 -SIZE (audacious-plugins-2.3.tgz) = 3273590 +MD5 (audacious-plugins-2.4.0.tgz) = fdf7d4bb660d95e90044556f12213f42 +SHA256 (audacious-plugins-2.4.0.tgz) = c5a9b5efe0315e4c34e0e1922a8852561ea5608974d0adb0f9ce91c20e743a13 +SIZE (audacious-plugins-2.4.0.tgz) = 3369517 diff --git a/multimedia/audacious-plugins/files/patch-src-OSS4-audio.c b/multimedia/audacious-plugins/files/patch-src-OSS4-audio.c index 27ca2bb871fa..68f805f48013 100644 --- a/multimedia/audacious-plugins/files/patch-src-OSS4-audio.c +++ b/multimedia/audacious-plugins/files/patch-src-OSS4-audio.c @@ -1,121 +1,11 @@ ---- src/OSS4/audio.c.orig 2010-04-26 16:11:51.000000000 +0200 -+++ src/OSS4/audio.c 2010-04-26 16:11:43.000000000 +0200 -@@ -204,26 +204,12 @@ - case FMT_U16_BE: - format = AFMT_U16_BE; - break; -- case FMT_U16_NE: --#if (G_BYTE_ORDER == G_BIG_ENDIAN) -- format = AFMT_U16_BE; --#else -- format = AFMT_U16_LE; --#endif -- break; - case FMT_S16_LE: - format = AFMT_S16_LE; - break; - case FMT_S16_BE: - format = AFMT_S16_BE; - break; -- case FMT_S16_NE: --#if (G_BYTE_ORDER == G_BIG_ENDIAN) -- format = AFMT_S16_BE; --#else -- format = AFMT_S16_LE; --#endif -- break; - #if 0 /* OSS currently doesn't support AFMT_U24_* */ - case FMT_U24_LE: - format = AFMT_U24_LE; -@@ -231,13 +217,6 @@ - case FMT_U24_BE: - format = AFMT_U24_BE; - break; -- case FMT_U24_NE: --#if (G_BYTE_ORDER == G_BIG_ENDIAN) -- format = AFMT_U24_BE; --#else -- format = AFMT_U24_LE; --#endif -- break; - #endif - case FMT_S24_LE: - format = AFMT_S24_LE; -@@ -245,13 +224,6 @@ - case FMT_S24_BE: - format = AFMT_S24_BE; - break; -- case FMT_S24_NE: --#if (G_BYTE_ORDER == G_BIG_ENDIAN) -- format = AFMT_S24_BE; --#else -- format = AFMT_S24_LE; --#endif -- break; - #if 0 /* OSS currently doesn't support AFMT_U32_* */ - case FMT_U32_LE: - format = AFMT_U32_LE; -@@ -259,13 +231,6 @@ - case FMT_U32_BE: - format = AFMT_U32_BE; - break; -- case FMT_U32_NE: --#if (G_BYTE_ORDER == G_BIG_ENDIAN) -- format = AFMT_U32_BE; --#else -- format = AFMT_U32_LE; --#endif -- break; - #endif - case FMT_S32_LE: - format = AFMT_S32_LE; -@@ -273,13 +238,6 @@ - case FMT_S32_BE: - format = AFMT_S32_BE; - break; -- case FMT_S32_NE: --#if (G_BYTE_ORDER == G_BIG_ENDIAN) -- format = AFMT_S32_BE; --#else -- format = AFMT_S32_LE; --#endif -- break; - } - return format; - } -@@ -633,7 +591,7 @@ - * soundcard, but not yet played. I don't - * think this is worth fixing. - */ -- ioctl(fd, SNDCTL_DSP_SYNC, 0); -+ ioctl(fd, SNDCTL_DSP_RESET, 0); - } - else if (unpause && paused) { - unpause = FALSE; -@@ -650,7 +608,7 @@ - * the driver to get fucked up by a reset - */ +--- src/oss4/oss.c.orig 2010-09-09 13:56:41.000000000 +0200 ++++ src/oss4/oss.c 2010-09-09 13:56:50.000000000 +0200 +@@ -212,7 +212,7 @@ + { + ERROR_MSG; -- ioctl(fd, SNDCTL_DSP_SYNC, 0); -+ ioctl(fd, SNDCTL_DSP_RESET, 0); - close(fd); - fd = open(device_name, O_WRONLY); - oss_set_audio_params(); -@@ -663,7 +621,7 @@ +- if (ioctl(oss_data->fd, SNDCTL_DSP_SYNC, NULL) == -1) ++ if (ioctl(oss_data->fd, SNDCTL_DSP_RESET, NULL) == -1) + DEBUG_MSG; - } - -- ioctl(fd, SNDCTL_DSP_SYNC, 0); -+ ioctl(fd, SNDCTL_DSP_RESET, 0); - oss_set_volume(start_vol_l, start_vol_r); - close(fd); - g_free(buffer); -@@ -677,7 +635,7 @@ - struct timeval tv; - fd_set set; - -- ioctl(fd, SNDCTL_DSP_SYNC, 0); -+ ioctl(fd, SNDCTL_DSP_RESET, 0); - frag = (NFRAGS << 16) | fragsize; - ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &frag); - /* + break; diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist index b640a1802dfd..185abf78dcf5 100644 --- a/multimedia/audacious-plugins/pkg-plist +++ b/multimedia/audacious-plugins/pkg-plist @@ -1,7 +1,9 @@ +%%CUEPLUGIN%%lib/audacious/Container/cue.so lib/audacious/Container/m3u.so lib/audacious/Container/pls.so lib/audacious/Container/xspf.so lib/audacious/Effect/compressor.so +lib/audacious/Effect/crossfade.so lib/audacious/Effect/crystalizer.so lib/audacious/Effect/ladspa.so lib/audacious/Effect/echo.so @@ -16,11 +18,11 @@ lib/audacious/General/alarm.so lib/audacious/General/gtkui.so lib/audacious/General/hotkey.so %%LIRCPLUGIN%%lib/audacious/General/lirc.so +lib/audacious/General/lyricwiki.so lib/audacious/General/skins.so lib/audacious/General/song_change.so %%STATUSICONPLUGIN%%lib/audacious/General/statusicon.so lib/audacious/General/streambrowser.so -lib/audacious/General/vfstrace.so %%AACPLUGIN%%lib/audacious/Input/aac.so %%ADPLUGPLUGIN%%lib/audacious/Input/adplug.so %%AMIDIPLUGIN%%lib/audacious/Input/amidi-plug/ap-fluidsynth.so @@ -28,6 +30,7 @@ lib/audacious/General/vfstrace.so %%CDAUDIOPLUGIN%%lib/audacious/Input/cdaudio-ng.so lib/audacious/Input/console.so %%FLACPLUGIN%%lib/audacious/Input/flacng.so +%%FFAUDIOPLUGIN%%lib/audacious/Input/ffaudio.so %%MP3PLUGIN%%lib/audacious/Input/madplug.so lib/audacious/Input/metronom.so %%MODPLUG%%lib/audacious/Input/modplug.so @@ -43,7 +46,6 @@ lib/audacious/Input/xsf.so %%OSSPLUGIN%%lib/audacious/Output/OSS.so %%OSS4PLUGIN%%lib/audacious/Output/OSS4.so %%ESDPLUGIN%%lib/audacious/Output/ESD.so -lib/audacious/Output/crossfade.so lib/audacious/Output/filewriter.so %%JACKPLUGIN%%lib/audacious/Output/jackout.so lib/audacious/Output/null.so @@ -308,6 +310,15 @@ share/audacious/Skins/TinyPlayer/text.png share/audacious/Skins/TinyPlayer/titlebar.png share/audacious/Skins/TinyPlayer/viscolor.txt share/audacious/Skins/TinyPlayer/volume.png +share/audacious/ui/equalizer.ui +share/audacious/ui/mainwin.ui +share/audacious/ui/playlist.ui +share/audacious/ui/carbon-menubar.ui +share/audacious/ui/player.ui +%%NLS%%share/locale/es/LC_MESSAGES/audacious-plugins.mo +%%NLS%%share/locale/hu/LC_MESSAGES/audacious-plugins.mo +%%NLS%%share/locale/pl/LC_MESSAGES/audacious-plugins.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/ca/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/cs/LC_MESSAGES/audacious-plugins.mo %%NLS%%share/locale/cy/LC_MESSAGES/audacious-plugins.mo @@ -359,4 +370,5 @@ share/audacious/Skins/TinyPlayer/volume.png @dirrm share/audacious/Skins/TinyPlayer @dirrm share/audacious/Skins @dirrmtry share/audacious/images +@dirrm share/audacious/ui @dirrmtry share/audacious diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile index 479c1b9fdfd0..80c989c4aec2 100644 --- a/multimedia/audacious/Makefile +++ b/multimedia/audacious/Makefile @@ -6,8 +6,7 @@ # PORTNAME= audacious -PORTVERSION= 2.3 -PORTREVISION= 3 +PORTVERSION= 2.4.0 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.atheme.org/ MASTER_SITE_SUBDIR=oliver @@ -22,8 +21,8 @@ USE_XORG= x11 sm USE_GNOME= gtk20 libglade2 USE_LDCONFIG= yes CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +#CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ +# LDFLAGS="-L${LOCALBASE}/lib" MAN1= audacious2.1 audtool2.1 @@ -75,9 +74,10 @@ PLIST_SUB+= NLS="@comment " post-patch: @${REINPLACE_CMD} 's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g' \ ${WRKSRC}/Makefile - @${REINPLACE_CMD} 's|CPPFLAGS +=|CPPFLAGS =|g' \ - ${WRKSRC}/src/libid3tag/Makefile \ - ${WRKSRC}/src/libaudgui/Makefile + @${REINPLACE_CMD} 's|CPPFLAGS +=\(.*\)|CPPFLAGS =\1 -I${LOCALBASE}/include|g' \ + ${WRKSRC}/src/libaudgui/Makefile \ + ${WRKSRC}/src/libaudtag/Makefile \ + ${WRKSRC}/src/libaudcore/Makefile @${REINPLACE_CMD} 's|FMT_FIXED32,|FMT_FIXED32|g; \ s|OUTPUT_PLUGIN_INIT_FOUND_DEVICES,|OUTPUT_PLUGIN_INIT_FOUND_DEVICES|g' \ ${WRKSRC}/src/audacious/plugin.h diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo index 7b156aaa517c..c86ee6e6dfb0 100644 --- a/multimedia/audacious/distinfo +++ b/multimedia/audacious/distinfo @@ -1,3 +1,3 @@ -MD5 (audacious-2.3.tgz) = b65753880c6762cdad6423df48590304 -SHA256 (audacious-2.3.tgz) = b19b3a75d4bac535231a77b6f993519b599a9619ac46c4d5627fd2bc8337416f -SIZE (audacious-2.3.tgz) = 1564114 +MD5 (audacious-2.4.0.tgz) = 113d99a09d4faead7adc07a86eab5c80 +SHA256 (audacious-2.4.0.tgz) = f2a2d45b9cb8fc24c1c55aef72a3a397a9a35776c18a94532b1bd3238577d5d8 +SIZE (audacious-2.4.0.tgz) = 1346549 diff --git a/multimedia/audacious/files/patch-src-audacious-Makefile b/multimedia/audacious/files/patch-src-audacious-Makefile index d05e3d1e733d..da2d0fb2702d 100644 --- a/multimedia/audacious/files/patch-src-audacious-Makefile +++ b/multimedia/audacious/files/patch-src-audacious-Makefile @@ -1,6 +1,6 @@ ---- src/audacious/Makefile.orig 2010-04-06 22:01:24.000000000 +0200 -+++ src/audacious/Makefile 2010-04-17 13:02:28.000000000 +0200 -@@ -108,14 +108,15 @@ +--- src/audacious/Makefile.orig 2010-08-26 01:04:25.000000000 +0200 ++++ src/audacious/Makefile 2010-09-09 11:07:04.000000000 +0200 +@@ -91,15 +91,16 @@ include ../../buildsys.mk ifeq ($(USE_DBUS),yes) @@ -13,26 +13,27 @@ pre-depend: ${DBUS_BINDINGS} - CPPFLAGS += -DHAVE_CONFIG_H \ + CPPFLAGS += -std=gnu99 \ + -DHAVE_CONFIG_H \ + -I.. -I../.. \ ${MOWGLI_CFLAGS} \ ${GLIB_CFLAGS} \ ${GTHREAD_CFLAGS} \ -@@ -133,7 +134,7 @@ - -I. \ - -I../libaudcore +@@ -116,7 +117,7 @@ + -I.. -I../.. \ + -I./intl -LIBS += ${LDADD} \ -+LIBS += \ ++LIBS += \ + -lm \ -L../libaudcore -laudcore \ - ${LIBINTL} \ - ../libguess/libguess.a \ -@@ -144,7 +145,8 @@ - ${DBUS_LIBS} \ + -L../libaudgui -laudgui \ +@@ -130,7 +131,8 @@ ${MOWGLI_LIBS} \ ${LIBMCS_LIBS} \ -- ${REGEX_LIBS} -+ ${REGEX_LIBS} \ + ${REGEX_LIBS} \ +- ${LIBGUESS_LIBS} ++ ${LIBGUESS_LIBS} \ + ${LDADD} LDFLAGS += ${PROG_IMPLIB_LDFLAGS} ${AUDLDFLAGS} diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist index 4305ec2c39ab..a1606e301757 100644 --- a/multimedia/audacious/pkg-plist +++ b/multimedia/audacious/pkg-plist @@ -1,32 +1,35 @@ +man/man1/audacious.1 +man/man1/audtool.1 bin/audacious bin/audacious2 %%WITH_DBUS%%bin/audtool %%WITH_DBUS%%bin/audtool2 %%WITH_DBUS%%include/audacious/audctrl.h include/audacious/audconfig.h -include/audacious/auddrct.h include/audacious/configdb.h include/audacious/dbus.h include/audacious/dbus-service.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/output.h -include/audacious/playback.h -include/audacious/playlist_container.h include/audacious/plugin.h include/audacious/preferences.h -include/audacious/rcfile.h -include/audacious/ui_fileinfopopup.h -include/audacious/ui_plugin_menu.h -include/audacious/ui_preferences.h -include/audacious/util.h +include/audacious/audtag.h +include/audacious/api.h +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/configdb-api.h +include/audacious/debug.h +include/audacious/drct.h +include/audacious/drct-api.h +include/audacious/misc.h +include/audacious/misc-api.h +include/audacious/playlist.h +include/audacious/playlist-api.h +include/audacious/plugins.h +include/audacious/plugins-api.h +include/audacious/types.h include/libaudcore/audio.h include/libaudcore/audstrings.h include/libaudcore/index.h @@ -39,10 +42,11 @@ include/libaudcore/md5.h include/libaudcore/vfs.h include/libaudcore/vfs_buffer.h include/libaudcore/vfs_buffered_file.h +include/libaudcore/eventqueue.h +include/libaudcore/hook.h +include/libaudcore/vfs_async.h include/libaudgui/libaudgui.h include/libaudgui/libaudgui-gtk.h -include/libaudtag/audtag.h -include/libaudtag/util.h %%WITH_DBUS%%lib/libaudclient.so %%WITH_DBUS%%lib/libaudclient.so.2 %%WITH_DBUS%%lib/libaudclient.so.2.0.0 @@ -52,16 +56,12 @@ lib/libaudcore.so.1.0.0 lib/libaudgui.so lib/libaudgui.so.1 lib/libaudgui.so.1.0.0 -lib/libaudid3tag.so -lib/libaudid3tag.so.2 -lib/libaudid3tag.so.2.0.0 lib/libaudtag.so lib/libaudtag.so.1 lib/libaudtag.so.1.0.0 libdata/pkgconfig/audacious.pc libdata/pkgconfig/audclient.pc share/applications/audacious2.desktop -share/applications/audacious2-gtkui.desktop %%DATADIR%%/images/about-logo.png %%DATADIR%%/images/audacious_eq.xpm %%DATADIR%%/images/audacious_playlist.xpm @@ -73,16 +73,13 @@ share/applications/audacious2-gtkui.desktop %%DATADIR%%/images/menu_playlist.png %%DATADIR%%/images/menu_plugin.png %%DATADIR%%/images/menu_queue_toggle.png -%%DATADIR%%/images/menu_randomize_playlist.png %%DATADIR%%/images/playback.png %%DATADIR%%/images/playlist.png %%DATADIR%%/images/plugins.png %%DATADIR%%/images/replay_gain.png -%%DATADIR%%/ui/carbon-menubar.ui -%%DATADIR%%/ui/equalizer.ui -%%DATADIR%%/ui/mainwin.ui -%%DATADIR%%/ui/player.ui -%%DATADIR%%/ui/playlist.ui +share/icons/hicolor/48x48/apps/audacious.png +share/icons/hicolor/scalable/apps/audacious.svg +%%NLS%%share/locale/ast/LC_MESSAGES/audacious.mo %%NLS%%share/locale/be/LC_MESSAGES/audacious.mo %%NLS%%share/locale/bg/LC_MESSAGES/audacious.mo %%NLS%%share/locale/br/LC_MESSAGES/audacious.mo @@ -120,13 +117,12 @@ share/applications/audacious2-gtkui.desktop %%NLS%%share/locale/uk/LC_MESSAGES/audacious.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious.mo -share/pixmaps/audacious2.png +share/pixmaps/audacious.png +share/pixmaps/audacious.svg @dirrmtry %%DATADIR%%/images -@dirrm %%DATADIR%%/ui @dirrmtry %%DATADIR%% @dirrm include/audacious @dirrm include/libaudcore @dirrm include/libaudgui -@dirrm include/libaudtag @dirrmtry lib/audacious @dirrmtry share/applications