Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Don't enforce GLib dependency on plugins (experimental).

  • Loading branch information...
commit b4d235858a2a5cea1a110a4e3a346ac0ebc30484 1 parent b5fe0ed
John Lindgren jlindgren90 authored
14 acinclude.m4
View
@@ -1,16 +1,3 @@
-
-dnl ** ADD_PKG_REQUIRES([requirement])
-dnl ** Adds a dependency to package's pkg-config file.
-AC_DEFUN([ADD_PC_REQUIRES], [
- if test "x$PC_REQUIRES" = "x"; then
- PC_REQUIRES="$1"
- else
- PC_REQUIRES="$PC_REQUIRES, $1"
- fi
- AC_SUBST([PC_REQUIRES])
-])
-
-
dnl ** AUD_CHECK_MODULE([define name], [module], [version required],
dnl ** [informational name], [additional error message])
dnl **
@@ -21,7 +8,6 @@ dnl **
dnl ** AUD_CHECK_MODULE([GLIB], [gtk+-2.0], [>= 2.8.0], [Gtk+2], [See http://www.gtk.org/])
AC_DEFUN([AUD_CHECK_MODULE], [
PKG_CHECK_MODULES([$1], [$2 $3], [
- ADD_PC_REQUIRES([$2 $3])
],[
PKG_CHECK_EXISTS([$2], [
cv_pkg_version=`$PKG_CONFIG --modversion "$2" 2>/dev/null`
1  audacious.pc.in
View
@@ -20,6 +20,5 @@ discovery_plugin_dir=@plugindir@/@DISCOVERY_PLUGIN_DIR@
Name: Audacious
Description: Audacious is a versatile and handy multi platform media player
Version: @VERSION@
-Requires: @PC_REQUIRES@
Libs: -L${lib_dir} -laudcore -laudgui
Cflags: -I${audacious_include_dir}
8 configure.ac
View
@@ -108,12 +108,6 @@ if test $use_gtk3 = no ; then
AC_MSG_ERROR([Cannot find GTK headers. Aborting ...]))
fi
-if test $use_gtk3 = yes ; then
- ADD_PC_REQUIRES([gtk+-3.0 >= 3.0.0])
-else
- ADD_PC_REQUIRES([gtk+-2.0 >= 2.12.0])
-fi
-
AC_SUBST([GTK_LIBS])
AC_SUBST([GTK_CFLAGS])
@@ -165,8 +159,6 @@ AUD_ARG_ENABLE([dbus], [yes],
if test "x$DBUS_BINDING_TOOL" = "xno" || test "x$GLIB_GENMARSHAL" = "xno" || test "x$enable_dbus" = "xno" ; then
enable_dbus="no"
else
- ADD_PC_REQUIRES([dbus-1 >= 0.60])
- ADD_PC_REQUIRES([dbus-glib-1 >= 0.60])
AC_DEFINE([USE_DBUS], 1, [Define if D-Bus support enabled])
LIBAUDCLIENT_LDFLAGS="-laudclient"
AC_SUBST([DBUS_CFLAGS])
1  src/audacious/output.c
View
@@ -19,6 +19,7 @@
* using our public API to be a derived work.
*/
+#include <glib.h>
#include <math.h>
#include <pthread.h>
#include <string.h>
1  src/audacious/playlist-files.c
View
@@ -19,6 +19,7 @@
* using our public API to be a derived work.
*/
+#include <glib.h>
#include <string.h>
#include "debug.h"
4 src/audacious/plugin.h
View
@@ -22,8 +22,6 @@
#ifndef AUDACIOUS_PLUGIN_H
#define AUDACIOUS_PLUGIN_H
-#include <gmodule.h>
-
#include <audacious/api.h>
#include <audacious/types.h>
#include <libaudcore/audio.h>
@@ -505,7 +503,7 @@ stype _aud_plugin_self = { \
.type = itype, \
.size = sizeof (stype), \
__VA_ARGS__}; \
-G_MODULE_EXPORT stype * get_plugin_info (AudAPITable * table) { \
+stype * get_plugin_info (AudAPITable * table) { \
_aud_api_table = table; \
return & _aud_plugin_self; \
}
1  src/audacious/probe.c
View
@@ -19,6 +19,7 @@
* using our public API to be a derived work.
*/
+#include <glib.h>
#include <stdio.h>
#include <string.h>
5 src/libaudcore/core.h
View
@@ -26,6 +26,11 @@
#undef bool_t
#define bool_t int
+#undef FALSE
+#define FALSE ((bool_t) 0)
+#undef TRUE
+#define TRUE ((bool_t) 1)
+
/* Simple sanity check to catch (1) strings that are still in use after their
* reference count has dropped to zero and (2) strings that should have been
* pooled but never were. If the check fails, the program is aborted. */
Please sign in to comment.
Something went wrong with that request. Please try again.