Changeset 1208Tweet

Timestamp:

Oct 20, 2006, 12:43:17 AM (16 years ago)

Author:

Sam Hocevar

Message:

• Added a --enable-plugins configure flag that builds the GL and X11 drivers as plugins. This way, libcaca does not directly depend on those libraries.

Location:

libcaca/trunk

Files:

• caca/Makefile.am (modified) (3 diffs)
• caca/caca.c (modified) (6 diffs)
• caca/caca_internals.h (modified) (1 diff)
• configure.ac (modified) (7 diffs)

libcaca/trunk/caca/Makefile.am

@@ -3 +3 @@
 EXTRA_DIST = caca.pc.in
 DISTCLEANFILES = caca.pc
+
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -DPLUGINDIR=\"$(plugindir)\"
 
 pkgconfig_DATA = caca.pc
@@ -21 +23 @@
         time.c \
         driver_conio.c \
-        driver_gl.c \
         driver_ncurses.c \
         driver_raw.c \
@@ -27 +28 @@
         driver_vga.c \
         driver_win32.c \
-        driver_x11.c \
+        $(extra_drivers) \
         $(NULL)
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul
 libcaca_la_LDFLAGS = -no-undefined -version-info @LT_VERSION@
 libcaca_la_LIBADD = ../cucul/libcucul.la @CACA_LIBS@
 
+if USE_PLUGINS
+plugin_LTLIBRARIES = libx11_plugin.la libgl_plugin.la
+plugindir = $(libdir)/caca
+
+libx11_plugin_la_SOURCES = driver_x11.c
+libx11_plugin_la_LDFLAGS = -no-undefined -module -no-version
+libx11_plugin_la_LIBADD = libcaca.la ../cucul/libcucul.la @X11_LIBS@
+
+libgl_plugin_la_SOURCES = driver_gl.c
+libgl_plugin_la_LDFLAGS = -no-undefined -module -no-version
+libgl_plugin_la_LIBADD = libcaca.la ../cucul/libcucul.la @GL_LIBS@
+else
+extra_drivers = driver_x11.c driver_gl.c
+endif
+

libcaca/trunk/caca/caca.c

@@ -24 +24 @@
 #   include <stdlib.h>
 #   include <string.h>
+#   include <stdio.h>
 #   if defined(HAVE_ERRNO_H)
 #       include <errno.h>
+#   endif
+#   if defined(USE_PLUGINS)
+#       if defined(HAVE_DLFCN_H)
+#           include <dlfcn.h>
+#       endif
 #   endif
 #endif
@@ -34 +40 @@
 #include "caca_internals.h"
 
-static int caca_select_driver(caca_display_t *dp);
+#if defined(USE_PLUGINS)
+#   define gl_install(p) caca_plugin_install("gl", p)
+#   define x11_install(p) caca_plugin_install("x11", p)
+#endif
+
+static int caca_select_driver(caca_display_t *);
+#if defined(USE_PLUGINS)
+static int caca_plugin_install(char const *, caca_display_t *);
+#endif
 
 /** \brief Attach a caca graphical context to a cucul canvas.
@@ -63 +77 @@
 
     dp->cv = cv;
+#if defined(USE_PLUGINS)
+    dp->plugin = NULL;
+#endif
 
     if(caca_select_driver(dp))
     {
+#if defined(USE_PLUGINS)
+        if(dp->plugin)
+            dlclose(dp->plugin);
+#endif
         free(dp);
 #if defined(HAVE_ERRNO_H)
@@ -75 +96 @@
     if(dp->drv.init_graphics(dp))
     {
+#if defined(USE_PLUGINS)
+        if(dp->plugin)
+            dlclose(dp->plugin);
+#endif
         free(dp);
 #if defined(HAVE_ERRNO_H)
@@ -129 +154 @@
 {
     dp->drv.end_graphics(dp);
+#if defined(USE_PLUGINS)
+    if(dp->plugin)
+        dlclose(dp->plugin);
+#endif
     dp->cv->refcount--;
     free(dp);
@@ -202 +231 @@
 }
 
+#if defined(USE_PLUGINS)
+static int caca_plugin_install(char const *name, caca_display_t *dp)
+{
+    char buf[512];
+    int (*sym) (caca_display_t *);
+
+    sprintf(buf, "%s/lib%s_plugin.so", PLUGINDIR, name);
+    dp->plugin = dlopen(buf, RTLD_NOW);
+    if(!dp->plugin)
+    {
+        sprintf(buf, "lib%s_plugin.so", name);
+        dp->plugin = dlopen(buf, RTLD_NOW);
+        if(!dp->plugin)
+            return -1;
+    }
+
+    sprintf(buf, "%s_install", name);
+    sym = dlsym(dp->plugin, buf);
+    if(!sym)
+    {
+        dlclose(dp->plugin);
+        return -1;
+    }
+
+    return sym(dp);
+}
+#endif
+

libcaca/trunk/caca/caca_internals.h

@@ -89 +89 @@
     cucul_canvas_t *cv;
 
+#if defined(USE_PLUGINS)
+    void *plugin;
+#endif
+
     /* Device-specific functions */
     struct drv

libcaca/trunk/configure.ac

@@ -63 +63 @@
 
 dnl conditional builds
+AC_ARG_ENABLE(plugins,
+  [  --enable-plugins        build X11 and GL drivers as plugins])
 AC_ARG_ENABLE(doc,
   [  --enable-doc            build documentation (needs doxygen and LaTeX)])
 
-AC_CHECK_HEADERS(stdio.h stdarg.h signal.h sys/ioctl.h sys/time.h inttypes.h endian.h unistd.h arpa/inet.h netinet/in.h winsock2.h errno.h locale.h getopt.h)
+AC_CHECK_HEADERS(stdio.h stdarg.h signal.h sys/ioctl.h sys/time.h inttypes.h endian.h unistd.h arpa/inet.h netinet/in.h winsock2.h errno.h locale.h getopt.h dlfcn.h)
 AC_CHECK_FUNCS(signal ioctl vsnprintf getenv putenv strcasecmp htons)
 AC_CHECK_FUNCS(usleep gettimeofday)
@@ -157 +159 @@
     AC_DEFINE(USE_X11, 1, Define to 1 to activate the X11 backend driver)
     CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
-    CACA_LIBS="${CACA_LIBS} -lX11 ${X_LIBS}"
+    X11_LIBS="${X11_LIBS} -lX11 ${X_LIBS}"
     CACA_DRIVERS="${CACA_DRIVERS} x11"],
    [ac_cv_my_have_x11="no"],
@@ -181 +183 @@
   if test "${ac_cv_my_have_gl}" = "yes"; then
     AC_DEFINE(USE_GL, 1, Define to 1 to activate the OpenGL backend driver)
-    CACA_LIBS="${CACA_LIBS} -lGL -lglut"
+    GL_LIBS="${GL_LIBS} -lGL -lglut"
     CACA_DRIVERS="${CACA_DRIVERS} gl"
   elif test "${enable_gl}" = "yes"; then
@@ -225 +227 @@
 AM_CONDITIONAL(USE_KERNEL, test "${ac_cv_my_have_vga}" = "yes")
 
+if test "${enable_plugins}" = "yes"; then
+  ac_cv_my_have_plugins="yes"
+  AC_DEFINE(USE_PLUGINS, 1, Define to 1 to activate plugins)
+  CACA_LIBS="${CACA_LIBS} -ldl"
+else
+  CACA_LIBS="${CACA_LIBS} ${X11_LIBS} ${GL_LIBS}"
+fi
+AM_CONDITIONAL(USE_PLUGINS, test "${ac_cv_my_have_plugins}" = "yes")
+
 AC_MSG_CHECKING(valid output drivers)
 if test -z "${CACA_DRIVERS}"; then
@@ -238 +249 @@
 AC_SUBST(GETOPT_LIBS)
 AC_SUBST(CACA_LIBS)
+AC_SUBST(X11_LIBS)
+AC_SUBST(GL_LIBS)
 
 # Optimizations
@@ -262 +275 @@
 if test "${enable_imlib2}" != "no"; then
   IMLIB2="no"
-  PKG_CHECK_MODULES(imlib2, imlib2, [IMLIB2="yes"], [AC_MSG_RESULT(no)])
+  PKG_CHECK_MODULES(IMLIB2, imlib2, [IMLIB2="yes"], [AC_MSG_RESULT(no)])
   if test "${IMLIB2}" = no; then
     AC_MSG_ERROR([[cannot find Imlib2 development files. Without Imlib2, cacaview will only open BMP files; if this is really what you want, re-run configure with '--disable-imlib2'.]])
@@ -270 +283 @@
 # Build development tools?
 PANGOFT2="no"
-PKG_CHECK_MODULES(pangoft2, pangoft2, [PANGOFT2="yes"], [AC_MSG_RESULT(no)])
+PKG_CHECK_MODULES(PANGOFT2, pangoft2, [PANGOFT2="yes"], [AC_MSG_RESULT(no)])
 AM_CONDITIONAL(USE_PANGO, test "${PANGOFT2}" != "no")