Commit b541fedc authored by Mateusz Łukasik's avatar Mateusz Łukasik

Imported Upstream version 3.6.2

parent 5f4fd439
......@@ -8,7 +8,8 @@ The Audacious project began in 2005 under the leadership of William Pitcock
(“nenolod”). Many people have made contributions, both large and small, since
that time. At present, the project is led by John Lindgren and Michał Lipski
(“tallica”), with help from a few others. Special thanks go to Michał Lipski
for setting up and maintaining the current website.
for setting up and maintaining the current website, and to Thomas Lange for
leading the translation effort.
The Audacious logo was designed by George Averill and updated by John Lindgren.
It uses the “Circulate” font created by Brian Kent.
......
LICENSE
Copyright © 2001-2014 Audacious developers and others
Copyright © 2001-2015 Audacious developers and others
(A list of the copyright holders is provided in the AUTHORS file.)
......
SUBDIRS = src man pixmaps po
SUBDIRS = src man images po
DISTCLEAN = audacious.pc buildsys.mk config.h config.log config.status extra.mk
DATA = AUTHORS COPYING
DATA = AUTHORS \
COPYING \
images/about-logo.png \
images/about-logo.svg \
images/album.png \
images/appearance.png \
images/audio.png \
images/connectivity.png \
images/info.png \
images/playlist.png \
images/plugins.png
include buildsys.mk
......
dnl Add $1 to CFLAGS and CXXFLAGS if supported
dnl ------------------------------------------
dnl ==========================================
AC_DEFUN([AUD_CHECK_CFLAGS],[
AC_MSG_CHECKING([whether the C/C++ compiler supports $1])
......@@ -15,25 +15,30 @@ AC_DEFUN([AUD_CHECK_CFLAGS],[
])
])
dnl Add $1 to CXXFLAGS if supported
dnl ===============================
AC_DEFUN([AUD_CHECK_CXXFLAGS],[
AC_MSG_CHECKING([whether the C++ compiler supports $1])
AC_LANG_PUSH([C++])
OLDCXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $1 -Werror"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[return 0;])],[
AC_MSG_RESULT(yes)
CXXFLAGS="$OLDCXXFLAGS $1"
],[
AC_MSG_RESULT(no)
CXXFLAGS="$OLDCXXFLAGS"
])
AC_LANG_POP([C++])
])
dnl **
dnl ** Common checks
dnl **
AC_DEFUN([AUD_COMMON_PROGS], [
dnl Check for C and C++ compilers
dnl =============================
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_PROG_CXX])
AC_REQUIRE([AC_C_BIGENDIAN])
AC_REQUIRE([AC_SYS_LARGEFILE])
if test "x$GCC" = "xyes"; then
CFLAGS="$CFLAGS -std=gnu99 -ffast-math -Wall -pipe"
CXXFLAGS="$CXXFLAGS -Wall -pipe"
AUD_CHECK_CFLAGS(-Wtype-limits)
fi
dnl Check platform
dnl ==============
......@@ -44,6 +49,7 @@ AC_MSG_CHECKING([operating system type])
HAVE_LINUX=no
HAVE_MSWINDOWS=no
HAVE_DARWIN=no
case "$target" in
*linux*)
......@@ -54,6 +60,10 @@ case "$target" in
AC_MSG_RESULT(Windows)
HAVE_MSWINDOWS=yes
;;
*darwin*)
AC_MSG_RESULT(Darwin)
HAVE_DARWIN=yes
;;
*)
AC_MSG_RESULT(other UNIX)
;;
......@@ -61,6 +71,38 @@ esac
AC_SUBST(HAVE_MSWINDOWS)
AC_SUBST(HAVE_LINUX)
AC_SUBST(HAVE_DARWIN)
dnl Check for C and C++ compilers
dnl =============================
AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_PROG_CXX])
AC_REQUIRE([AC_C_BIGENDIAN])
AC_REQUIRE([AC_SYS_LARGEFILE])
if test "x$GCC" = "xyes"; then
CFLAGS="$CFLAGS -std=gnu99 -ffast-math -Wall -pipe"
if test "x$HAVE_DARWIN" = "xyes"; then
CXXFLAGS="$CXXFLAGS -stdlib=libc++ -std=gnu++11 -ffast-math -Wall -pipe"
LDFLAGS="$LDFLAGS -lc++ -stdlib=libc++"
else
CXXFLAGS="$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe"
fi
AUD_CHECK_CFLAGS(-Wtype-limits)
AUD_CHECK_CXXFLAGS(-Woverloaded-virtual)
fi
dnl On Mac, check for Objective-C and -C++ compilers
dnl ================================================
if test "x$HAVE_DARWIN" = "xyes"; then
AC_PROG_OBJC
AC_PROG_OBJCPP
AC_PROG_OBJCXX
AC_PROG_OBJCXXCPP
OBJCXXFLAGS="$OBJCXXFLAGS -stdlib=libc++ -std=c++11"
fi
dnl Enable "-Wl,-z,defs" only on Linux
dnl ==================================
......@@ -74,6 +116,26 @@ if test $HAVE_MSWINDOWS = yes ; then
CFLAGS="$CFLAGS -march=i686"
fi
dnl Byte order
dnl ==========
AC_C_BIGENDIAN([BIGENDIAN=1], [BIGENDIAN=0],
[AC_MSG_ERROR([Unknown machine byte order])],
[AC_MSG_ERROR([Universal builds are not supported, sorry])])
AC_SUBST([BIGENDIAN])
dnl Prevent symbol collisions
dnl =========================
if test "x$HAVE_MSWINDOWS" = "xyes" ; then
EXPORT="__declspec(dllexport)"
elif test "x$GCC" = "xyes" ; then
CFLAGS="$CFLAGS -fvisibility=hidden"
CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
EXPORT="__attribute__((visibility(\"default\")))"
else
AC_MSG_ERROR([Unknown syntax for EXPORT keyword])
fi
AC_DEFINE_UNQUOTED([EXPORT], [$EXPORT], [Define to compiler syntax for public symbols])
dnl Checks for various programs
dnl ===========================
AC_PROG_LN_S
......@@ -93,7 +155,20 @@ dnl =======================
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32)
PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= 2.32)
PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.4)
dnl GTK+ support
dnl =============
AC_ARG_ENABLE(gtk,
AS_HELP_STRING(--disable-gtk, [Disable GTK+ support (default=enabled)]),
USE_GTK=$enableval, USE_GTK=yes)
if test $USE_GTK = yes ; then
PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.24)
AC_DEFINE(USE_GTK, 1, [Define if GTK+ support enabled])
fi
AC_SUBST(USE_GTK)
if test $HAVE_MSWINDOWS = yes ; then
PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.32)
......@@ -110,4 +185,23 @@ AC_SUBST(GMODULE_LIBS)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
dnl Qt support
dnl ==========
AC_ARG_ENABLE(qt,
AS_HELP_STRING(--enable-qt, [Enable Qt support (default=disabled)]),
USE_QT=$enableval, USE_QT=no)
if test $USE_QT = yes ; then
PKG_CHECK_MODULES([QT], [Qt5Core Qt5Gui Qt5Widgets])
AC_DEFINE(USE_QT, 1, [Define if Qt support enabled])
# needed if Qt was built with -reduce-relocations
QT_CFLAGS="$QT_CFLAGS -fPIC"
fi
AC_SUBST(USE_QT)
AC_SUBST(QT_CFLAGS)
AC_SUBST(QT_LIBS)
])
......@@ -3,35 +3,77 @@ Version=1.0
Type=Application
Name=Audacious
GenericName=Music Player
GenericName[be]=Музычны плэер
GenericName[da]=Lydafspiller
GenericName[de]=Musikspieler
GenericName[es]=Reproductor de música
GenericName[fr]=Lecteur de Musique
GenericName[it]=Lettore di Musica
GenericName[lt]=Muzikos grotuvas
GenericName[nl]=Muziekspeler
GenericName[nb]=Lydavspiller
GenericName[pt]=Leitor de Música
GenericName[ro]=Lector de Muzică
GenericName[ru]=Аудиоплеер
GenericName[se]=Ljudspelare
GenericName[zh_TW]=音樂播放器
Comment=Listen to music
Comment[be]=Слухайце музыку
Comment[de]=Musik hören
Comment[fr]=Écouter de la musique
Comment[hu]=Hallgasson zenét
Comment[it]=Ascoltare musica
Comment[lt]=Klausyti muzikos
Comment[nb]=Lytt til musikk
Comment[nl]=Muziek luisteren
Comment[ru]=Слушайте музыку
Comment[es]=Escucha música
Comment[zh_TW]=音樂鑑賞
Icon=audacious
Categories=AudioVideo;Audio;Player;GTK;
Exec=audacious %U
TryExec=audacious
Terminal=false
MimeType=application/ogg;application/x-cue;application/x-ogg;application/xspf+xml;audio/midi;audio/mp3;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/x-flac;audio/x-it;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-vorbis+ogg;audio/x-wav;audio/x-xm;inode/directory;x-content/audio-cdda;
Comment[be]=Слухайце музыку
Comment[bg]=Слушай музика
Comment[cs]=Poslouchej hudbu
Comment[da]=Lyt til musik
Comment[de]=Musik hören
Comment[el]=Ακρόαση μουσικής
Comment[eo]=Aŭskulti muzikon
Comment[es_MX]=Escuchar la música
Comment[es]=Escuchar música
Comment[fi]=Kuuntele musiikkia
Comment[fr]=Écouter de la musique
Comment[gl]=Escoitar música
Comment[hu]=Hallgasson zenét
Comment[id_ID]=Dengarkan musik
Comment[it]=Ascolta la musica
Comment[ja]=音楽を聴きます
Comment[ko]=음악을 들어요
Comment[lt]=Klausyti muzikos
Comment[lv]=Klausīties mūziku
Comment[ms]=Dengar muzik
Comment[nl]=Luister naar muziek
Comment[pl]=Słuchaj muzyki
Comment[pt_BR]=Ouvir Música
Comment[pt_PT]=Reprodução de músicas
Comment[ro]=Ascultă muzică
Comment[ru]=Слушать музыку
Comment[sr]=Слушајте музику
Comment[sr_RS]=Слушајте музику
Comment[sv]=Lyssna på musik
Comment[tr]=Müzik dinleyin
Comment[uk]=Слухати музику
Comment[zh_CN]=聆听音乐
Comment[zh_TW]=音樂鑑賞
GenericName[be]=Музычны плэер
GenericName[bg]=Музикален плейър
GenericName[cs]=Hudební přehrávač
GenericName[da]=Musikafspiller
GenericName[de]=Musikspieler
GenericName[el]=Πρόγραμμα αναπαραγωγής μουσικής
GenericName[eo]=Muzik-ludilo
GenericName[es_MX]=Reproductor de Música
GenericName[es]=Reproductor de música
GenericName[fi]=Musiikkisoitin
GenericName[fr]=Diffuseur de musique
GenericName[gl]=Reprodutor de música
GenericName[hu]=Zene lejátszó
GenericName[id_ID]=Pemutar musik
GenericName[it]=Lettore musicale
GenericName[ja]=音楽プレイヤー
GenericName[ko]=음악 재생기
GenericName[lt]=Muzikos grotuvas
GenericName[lv]=Mūzikas atskaņotājs
GenericName[ms]=Pemain Muzik
GenericName[nl]=Muziekspeler
GenericName[pl]=Odtwarzacz muzyczny
GenericName[pt_BR]=Player de Música
GenericName[pt_PT]=Reprodutor áudio
GenericName[ro]=Player de muzică
GenericName[ru]=Музыкальный проигрыватель
GenericName[sr]=Програм за слушање музике
GenericName[sv]=Musikspelare
GenericName[tr]=Müzik Çalar
GenericName[uk]=Музичний програвач
GenericName[zh_CN]=音乐播放器
GenericName[zh_TW]=音樂播放器
......@@ -12,5 +12,5 @@ plugin_dir=@plugindir@
Name: Audacious
Description: Audacious is a versatile and handy multi platform media player
Version: @PACKAGE_VERSION@
Libs: -L${lib_dir} -laudcore -laudgui
Libs: -L${lib_dir} -laudcore
Cflags: -I${audacious_include_dir}
......@@ -6,6 +6,9 @@
/* Build stamp */
#undef BUILDSTAMP
/* Copyright */
#undef COPYRIGHT
/* Define to 1 if translation of program messages to the user's native
language is requested. */
#undef ENABLE_NLS
......@@ -100,6 +103,12 @@
/* Define if D-Bus support enabled */
#undef USE_DBUS
/* Define if GTK+ support enabled */
#undef USE_GTK
/* Define if Qt support enabled */
#undef USE_QT
/* Define to allow Valgrind analysis */
#undef VALGRIND_FRIENDLY
......
This diff is collapsed.
......@@ -5,11 +5,12 @@ dnl ***
dnl Initialize
dnl ==========
AC_PREREQ([2.59])
AC_INIT([audacious], [3.5.1])
AC_COPYRIGHT([(C) 2005-2014 Audacious Team])
AC_INIT([audacious], [3.6.2])
AC_COPYRIGHT([Copyright (C) 2001-2015 Audacious developers and others])
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE_NAME", [Name of package])
AC_DEFINE_UNQUOTED(VERSION, "$PACKAGE_VERSION", [Version number of package])
AC_DEFINE_UNQUOTED(COPYRIGHT, "Copyright © 2001-2015 Audacious developers and others", [Copyright])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
......@@ -22,26 +23,6 @@ AC_DEFINE_UNQUOTED(PLUGIN_SUFFIX, "$PLUGIN_SUFFIX", [Suffix for plugins])
m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], AC_SUBST([pkgconfigdir], ${libdir}/pkgconfig))
dnl Byte order
dnl ==========
AC_C_BIGENDIAN([BIGENDIAN=1], [BIGENDIAN=0],
[AC_MSG_ERROR([Unknown machine byte order])],
[AC_MSG_ERROR([Universal builds are not supported, sorry])])
AC_SUBST([BIGENDIAN])
dnl Prevent symbol collisions
dnl =========================
if test "x$HAVE_MSWINDOWS" = "xyes" ; then
EXPORT="__declspec(dllexport)"
elif test "x$GCC" = "xyes" ; then
CFLAGS="$CFLAGS -fvisibility=hidden"
CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
EXPORT="__attribute__((visibility(\"default\")))"
else
AC_MSG_ERROR([Unknown syntax for EXPORT keyword])
fi
AC_DEFINE_UNQUOTED([EXPORT], [$EXPORT], [Define to compiler syntax for public symbols])
dnl Headers and functions
dnl ===============================
......@@ -182,5 +163,7 @@ echo " Install path: $prefix"
echo ""
echo " Automatic character code detection: $USE_CHARDET"
echo " D-Bus support: $USE_DBUS"
echo " GTK+ support: $USE_GTK"
echo " Qt support: $USE_QT"
echo " Valgrind analysis support: $enable_valgrind"
echo ""
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2015 Audacious developers -->
<component type="desktop">
<id>audacious.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>BSD-2-Clause</project_license>
<name>Audacious</name>
<summary>Lightweight audio player</summary>
<description>
<p>
Audacious is an open source audio player. Originally a descendant of XMMS,
Audacious plays your music how you want it, without stealing away your
computer’s resources from other tasks.
</p>
<p>
Drag and drop folders and individual song files, search for artists and
albums in your entire music library, or create and edit your own custom
playlists. Listen to CD’s or stream music from the Internet. Tweak the
sound with the graphical equalizer or experiment with LADSPA
effects. Enjoy the modern GTK-themed interface or change things up with
Winamp Classic skins. Use the plugins included with Audacious to fetch
lyrics for your music, to set an alarm in the morning, and more.
</p>
</description>
<url type="homepage">http://audacious-media-player.org</url>
<screenshots>
<screenshot type="default">http://audacious-media-player.org/images/gtk-interface.png</screenshot>
<screenshot>http://audacious-media-player.org/images/winamp-interface.png</screenshot>
<screenshot>http://audacious-media-player.org/images/settings-window.png</screenshot>
</screenshots>
</component>
......@@ -11,15 +11,14 @@
<key>CFBundleIconFile</key>
<string>Audacious.icns</string>
<key>CFBundleIdentifier</key>
<string>org.atheme.audacious</string>
<string>org.audacious-media-player</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>1.4.5</string>
<string>3.6-devel</string>
<key>CFBundleName</key>
<string>Audacious</string>
<key>CFBundleShortVersionString</key>
<string>1.4</string>
<string>3.6</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2008 Atheme.org
All Rights Reserved.</string>
<string>Copyright © 2001-2014 Audacious developers and others</string>
</dict>
</plist>
gtk-icon-theme-name = "gnome"
This diff is collapsed.
diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
index 253d151..c92b63b 100644
--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
@@ -31,7 +31,7 @@ if srcdir is not None:
path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
elif os.name == 'nt':
# Makes gdbus-codegen 'relocatable' at runtime on Windows.
- path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gdbus-2.0')
+ path = os.path.join(os.path.dirname(__file__), '..', 'share', 'glib-2.0')
else:
path = os.path.join('@datadir@', 'glib-2.0')
--- gdk-pixbuf/gdk-pixbuf-io.c.0 2014-07-19 14:54:26 -0400
+++ gdk-pixbuf/gdk-pixbuf-io.c 2014-07-19 14:54:38 -0400
@@ -340,7 +340,7 @@
strncmp (*path, GDK_PIXBUF_PREFIX "\\", strlen (GDK_PIXBUF_PREFIX "\\")) == 0)
{
gchar *tem = NULL;
- if (strlen(*path) > 5 && strncmp (*path - 5, ".libs", 5) == 0)
+ if (strlen(*path) > 5 && strncmp (*path, ".libs", 5) == 0)
{
/* We are being run from inside the build tree, and shouldn't mess about. */
return;
--- glocalfileinfo.c.0 2015-05-17 01:31:00 -0400
+++ glocalfileinfo.c 2015-05-17 01:54:24 -0400
@@ -1579,13 +1579,12 @@
}
}
-static const char *
-get_icon_name (const char *path,
- const char *content_type,
- gboolean use_symbolic,
- gboolean *with_fallbacks_out)
+static GIcon *
+get_icon_for_folder (const char *path,
+ gboolean use_symbolic)
{
- const char *name = NULL;
+ GIcon *icon;
+ const char *name;
gboolean with_fallbacks = TRUE;
if (strcmp (path, g_get_home_dir ()) == 0)
@@ -1626,45 +1625,15 @@
{
name = use_symbolic ? "folder-videos-symbolic" : "folder-videos";
}
- else if (g_strcmp0 (content_type, "inode/directory") == 0)
- {
- name = use_symbolic ? "folder-symbolic" : "folder";
- }
else
{
- name = NULL;
+ name = use_symbolic ? "folder-symbolic" : "folder";
}
- if (with_fallbacks_out != NULL)
- *with_fallbacks_out = with_fallbacks;
-
- return name;
-}
-
-static GIcon *
-get_icon (const char *path,
- const char *content_type,
- gboolean use_symbolic)
-{
- GIcon *icon = NULL;
- const char *icon_name;
- gboolean with_fallbacks;
-
- icon_name = get_icon_name (path, content_type, use_symbolic, &with_fallbacks);
- if (icon_name != NULL)
- {
- if (with_fallbacks)
- icon = g_themed_icon_new_with_default_fallbacks (icon_name);
- else
- icon = g_themed_icon_new (icon_name);
- }
+ if (with_fallbacks)
+ icon = g_themed_icon_new_with_default_fallbacks (name);
else
- {
- if (use_symbolic)
- icon = g_content_type_get_symbolic_icon (content_type);
- else
- icon = g_content_type_get_icon (content_type);
- }
+ icon = g_themed_icon_new (name);
return icon;
}
@@ -1839,37 +1808,47 @@
{
char *content_type = get_content_type (basename, path, stat_ok ? &statbuf : NULL, is_symlink, symlink_broken, flags, FALSE);
- if (content_type)
- {
- g_file_info_set_content_type (info, content_type);
-
- if (_g_file_attribute_matcher_matches_id (attribute_matcher,
- G_FILE_ATTRIBUTE_ID_STANDARD_ICON)
- || _g_file_attribute_matcher_matches_id (attribute_matcher,
- G_FILE_ATTRIBUTE_ID_STANDARD_SYMBOLIC_ICON))
- {
- GIcon *icon;
+ if (_g_file_attribute_matcher_matches_id (attribute_matcher,
+ G_FILE_ATTRIBUTE_ID_STANDARD_ICON) ||
+ _g_file_attribute_matcher_matches_id (attribute_matcher,
+ G_FILE_ATTRIBUTE_ID_STANDARD_SYMBOLIC_ICON))
+ {
+ GIcon *icon;
- /* non symbolic icon */
- icon = get_icon (path, content_type, FALSE);
- if (icon != NULL)
- {
- g_file_info_set_icon (info, icon);
- g_object_unref (icon);
- }
-
- /* symbolic icon */
- icon = get_icon (path, content_type, TRUE);
- if (icon != NULL)
- {
- g_file_info_set_symbolic_icon (info, icon);
- g_object_unref (icon);
- }
+ /* non symbolic icon */
+ if (stat_ok && S_ISDIR (statbuf.st_mode))
+ icon = get_icon_for_folder (path, FALSE);
+ else if (content_type != NULL)
+ icon = g_content_type_get_icon (content_type);
+ else
+ icon = NULL;
+
+ if (icon != NULL)
+ {
+ g_file_info_set_icon (info, icon);
+ g_object_unref (icon);
+ }
+
+ /* symbolic icon */
+ if (stat_ok && S_ISDIR (statbuf.st_mode))
+ icon = get_icon_for_folder (path, TRUE);
+ else if (content_type != NULL)
+ icon = g_content_type_get_symbolic_icon (content_type);
+ else
+ icon = NULL;
+
+ if (icon != NULL)
+ {
+ g_file_info_set_symbolic_icon (info, icon);
+ g_object_unref (icon);
+ }
+ }
- }
-
- g_free (content_type);
- }
+ if (content_type != NULL)
+ {
+ g_file_info_set_content_type (info, content_type);
+ g_free (content_type);
+ }
}
if (_g_file_attribute_matcher_matches_id (attribute_matcher,
--- gtksettings.c.0 2013-08-30 07:08:29 -0400
+++ gtksettings.c 2013-09-15 12:55:35 -0400