cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanups:

Browse Source 
- regen patches, add RCS keywords
- remove redundant dependencies
- remove unused libtool dependency
- add major version number to library dependencies
- don't build included gettext
- miscellaneous
This commit is contained in:
naddy 2001-07-25 15:48:26 +00:00
parent d4024ad7cf
commit 944184ef66
15 changed files with 91 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
audio/xmms/Makefile
View File

@ -1,5 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2001/07/25 15:24:56 espie Exp $
# $Id: Makefile,v 1.5 2001/07/25 15:24:56 espie Exp $
# $OpenBSD: Makefile,v 1.6 2001/07/25 15:48:26 naddy Exp $
NOT_FOR_ARCHS=${NO_SHARED_ARCHS}
@ -50,21 +49,19 @@ SUBPACKAGE?=
RUN_DEPENDS= unzip::archivers/unzip
LIB_DEPENDS= gtk.1.2::x11/gtk+ \
iconv.2::converters/libiconv \
intl.1::devel/gettext \
xml.9::textproc/libxml1
USE_X11= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= ${CONFIGURE_SHARED} --without-gnome
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \
XML_CONFIG="${LOCALBASE}/bin/xml-config" \
LIBMIKMOD_CONFIG=/usr/bin/false
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \
XML_CONFIG="${LOCALBASE}/bin/xml-config" \
LIBMIKMOD_CONFIG=/usr/bin/false
DISTFILES= ${DISTNAME}.tar.gz \
${DISTDRIVER}.tar.gz:0
@ -77,23 +74,23 @@ SUBST_VARS= MAINTAINER PKGNAME-vorbis PKGNAME-esd
.if defined(PACKAGING)
. if ${SUBPACKAGE} == "-esd"
LIB_DEPENDS= esd.::audio/esound
LIB_DEPENDS= esd.2::audio/esound
RUN_DEPENDS= xmms::audio/xmms
. endif
. if ${SUBPACKAGE} == "-vorbis"
LIB_DEPENDS= vorbis.::audio/libvorbis
LIB_DEPENDS= vorbis.0::audio/libvorbis
RUN_DEPENDS= xmms::audio/xmms
. endif
.else
. if ${MULTI_PACKAGES:M-esd}
LIB_DEPENDS += esd.::audio/esound
LIB_DEPENDS += esd.2::audio/esound
CONFIGURE_ARGS+= --with-esd-prefix=${LOCALBASE}
. else
CONFIGURE_ENV+= ESD_CONFIG=/usr/bin/false
. endif
. if ${MULTI_PACKAGES:M-vorbis}
LIB_DEPENDS += vorbis.::audio/libvorbis
LIB_DEPENDS += vorbis.0::audio/libvorbis
CONFIGURE_ARGS+= --with-ogg-prefix=${LOCALBASE} \
--with-vorbis-prefix=${LOCALBASE}
. else
@ -104,9 +101,6 @@ CONFIGURE_ENV+= OGG_LIBS=its-not-my-godamn-planet-understand-monkey-boy
post-extract:
@mv -f ${WRKDIR}/${DISTDRIVER}/Output/sun ${WRKSRC}/Output/sun
pre-build:
@ln -sf ${LOCALBASE}/include/libintl.h ${WRKSRC}/intl
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmms
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/xmms

7
audio/xmms/patches/patch-Input_cdaudio_Makefile_am
View File

@ -1,6 +1,7 @@
--- Input/cdaudio/Makefile.am.orig Thu Jul 12 15:34:26 2001
+++ Input/cdaudio/Makefile.am Thu Jul 12 15:35:27 2001
@@ -29,7 +29,7 @@
$OpenBSD: patch-Input_cdaudio_Makefile_am,v 1.2 2001/07/25 15:48:26 naddy Exp $
--- Input/cdaudio/Makefile.am.orig Sat Jul 29 02:59:17 2000
+++ Input/cdaudio/Makefile.am Wed Jul 25 16:47:42 2001
@@ -29,7 +29,7 @@ lib_LTLIBRARIES = $(cdaudioltlibs)
libdir = $(plugindir)/$(INPUT_PLUGIN_DIR)

7
audio/xmms/patches/patch-Input_cdaudio_Makefile_in
View File

@ -1,6 +1,7 @@
--- Input/cdaudio/Makefile.in.orig Thu Jul 12 15:34:33 2001
+++ Input/cdaudio/Makefile.in Thu Jul 12 15:35:18 2001
@@ -166,7 +166,7 @@
$OpenBSD: patch-Input_cdaudio_Makefile_in,v 1.2 2001/07/25 15:48:26 naddy Exp $
--- Input/cdaudio/Makefile.in.orig Mon Jun 18 21:55:46 2001
+++ Input/cdaudio/Makefile.in Wed Jul 25 16:47:42 2001
@@ -169,7 +169,7 @@ lib_LTLIBRARIES = $(cdaudioltlibs)
libdir = $(plugindir)/$(INPUT_PLUGIN_DIR)

45
audio/xmms/patches/patch-Output_Makefile_in
View File

@ -1,12 +1,13 @@
--- Output/Makefile.in.orig Thu Jul 5 21:03:11 2001
+++ Output/Makefile.in Thu Jul 5 21:20:34 2001
$OpenBSD: patch-Output_Makefile_in,v 1.2 2001/07/25 15:48:26 naddy Exp $
--- Output/Makefile.in.orig Mon Jun 18 21:55:33 2001
+++ Output/Makefile.in Wed Jul 25 16:47:42 2001
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p1 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -157,7 +157,7 @@
@@ -157,7 +157,7 @@ sidplay_cflags = @sidplay_cflags@
sidplay_library = @sidplay_library@
xmmsdir = @xmmsdir@
@ -15,41 +16,3 @@
SUBDIRS = @OUTPUT_PLUGINS@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h ../xmms/i18n.h
@@ -167,14 +167,14 @@
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-TAR = gtar
+TAR = tar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Output/Makefile
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu Output/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -216,6 +216,7 @@
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
rev="$$subdir $$rev"; \
test "$$subdir" = "." && dot_seen=yes; \
+ true; \
done; \
test "$$dot_seen" = "no" && rev=". $$rev"; \
target=`echo $@ | sed s/-recursive//`; \
@@ -273,6 +274,11 @@
subdir = Output
distdir: $(DISTFILES)
+ here=`cd $(top_builddir) && pwd`; \
+ top_distdir=`cd $(top_distdir) && pwd`; \
+ distdir=`cd $(distdir) && pwd`; \
+ cd $(top_srcdir) \
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Output/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \

9
audio/xmms/patches/patch-README
View File

@ -1,6 +1,7 @@
--- README.orig Thu Jul 5 21:19:17 2001
+++ README Thu Jul 5 21:18:19 2001
@@ -31,6 +31,7 @@
$OpenBSD: patch-README,v 1.2 2001/07/25 15:48:26 naddy Exp $
--- README.orig Wed Dec 20 15:30:36 2000
+++ README Wed Jul 25 16:47:42 2001
@@ -31,6 +31,7 @@ TABLE OF CONTENTS
3.6.2.1 OSS Driver
3.6.2.2 Disk Writer
3.6.2.3 eSound Output
@ -8,7 +9,7 @@
3.6.3 Effect plugins
3.6.3.1 Echo
3.6.3.2 Extra Stereo
@@ -763,6 +764,37 @@
@@ -763,6 +764,37 @@ and port to send to. This is probably on
the audio data is sent uncompressed to the remote ESD.
The 'Buffering' tab works just like the 'OSS Driver' one.

16
audio/xmms/patches/patch-aclocal_m4 Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2001/07/25 15:48:26 naddy Exp $
--- aclocal.m4.orig Mon Jun 18 21:53:38 2001
+++ aclocal.m4 Wed Jul 25 16:48:15 2001
@@ -2059,10 +2059,9 @@ AC_DEFUN(AM_WITH_NLS,
if test "$gt_cv_func_gettext_libc" != "yes"; then
AC_CHECK_LIB(intl, bindtextdomain,
- [AC_CACHE_CHECK([for gettext in libintl],
- gt_cv_func_gettext_libintl,
+ [AC_CACHE_VAL(gt_cv_func_gettext_libintl,
[AC_CHECK_LIB(intl, gettext,
- gt_cv_func_gettext_libintl=yes,
+ [gt_cv_func_gettext_libintl=yes; LIBS="$LIBS -lintl"],
gt_cv_func_gettext_libintl=no)],
gt_cv_func_gettext_libintl=no)])
fi

23
audio/xmms/patches/patch-configure_in
View File

@ -1,6 +1,7 @@
--- configure.in.orig Mon Jun 18 15:58:21 2001
+++ configure.in Tue Jul 24 03:08:11 2001
@@ -18,6 +18,10 @@
$OpenBSD: patch-configure_in,v 1.3 2001/07/25 15:48:26 naddy Exp $
--- configure.in.orig Mon Jun 18 20:58:21 2001
+++ configure.in Wed Jul 25 16:47:42 2001
@@ -18,6 +18,10 @@ AC_ARG_ENABLE( user-plugin-dir,
[ --disable-user-plugin-dir disable per-user plugin dir],,
enable_user_plugin_dir="yes")
@ -11,7 +12,7 @@
AC_ARG_WITH(dev-dsp,
[ --with-dev-dsp=path Path to OSS DSP data pipe, default is /dev/dsp.],
dev_dsp="$withval", dev_dsp="/dev/dsp")
@@ -43,10 +47,9 @@
@@ -43,10 +47,9 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
@ -23,7 +24,7 @@
AC_PATH_PROG(XMMS_PATH,xmms,no)
LIBS_save=$LIBS
@@ -73,7 +76,6 @@
@@ -73,7 +76,6 @@ CFLAGS=$CFLAGS_save
LIBS=$LIBS_save
AC_SUBST(VM_LIBS)
@ -31,7 +32,7 @@
AC_MSG_CHECKING(for old style FreeBSD -pthread flag)
AC_EGREP_CPP(yes,
[#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version <= 500001
@@ -100,19 +102,18 @@
@@ -100,19 +102,18 @@ fi
if test "x$PTHREAD_LIBS" = xerror; then
AC_MSG_ERROR(*** Unable to locate working posix thread library ***)
fi
@ -54,7 +55,7 @@
have_opengl_headers=yes
AC_CHECK_HEADERS(GL/gl.h GL/glx.h,,have_opengl_headers=no)
@@ -335,13 +336,9 @@
@@ -335,13 +336,9 @@ fi
arch_type=other
have_solaris=no
@ -69,7 +70,7 @@
ppc-*-*)
arch_type=ppc
;;
@@ -351,12 +348,29 @@
@@ -351,12 +348,29 @@ case "$host" in
*-sun-*)
have_solaris=yes
;;
@ -99,7 +100,7 @@
plugindir=$libdir/xmms
AC_SUBST(plugindir)
@@ -384,7 +398,7 @@
@@ -384,7 +398,7 @@ AC_SUBST(GENERAL_PLUGIN_DIR)
AC_SUBST(VISUALIZATION_PLUGIN_DIR)
AC_SUBST(pluginsubs)
@ -108,7 +109,7 @@
if test "x$enable_user_plugin_dir" = "xno"; then
AC_DEFINE(DISABLE_USER_PLUGIN_DIR,, [Define to disable per user plugin directory])
@@ -411,6 +425,7 @@
@@ -411,6 +425,7 @@ Output/OSS/Makefile
Output/esd/Makefile
Output/disk_writer/Makefile
Output/solaris/Makefile
@ -116,7 +117,7 @@
Input/Makefile
Input/wav/Makefile
Input/mpg123/Makefile
@@ -454,6 +469,7 @@
@@ -454,6 +469,7 @@ echo " Build esd plugin: $hav
echo " Build mikmod plugin: $have_mikmod"
echo " Build Ogg Vorbis plugin: $have_oggvorbis"
echo " Build Solaris plugin: $have_solaris"

50
audio/xmms/patches/patch-intl_Makefile_in
View File

@ -1,50 +0,0 @@
--- intl/Makefile.in.orig Mon Jun 18 21:53:37 2001
+++ intl/Makefile.in Mon Jul 9 22:33:21 2001
@@ -64,11 +64,11 @@ SOURCES = $(COMSRCS) intl-compat.c cat-c
COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \
finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \
explodename.c
-OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \
-finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \
-explodename.$lo
-CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo
-GETTOBJS = intl-compat.$lo
+OBJECTS = @INTLOBJS@ bindtextdom.o dcgettext.o dgettext.o gettext.o \
+finddomain.o loadmsgcat.o localealias.o textdomain.o l10nflist.o \
+explodename.o
+CATOBJS = cat-compat.o ../po/cat-id-tbl.o
+GETTOBJS = intl-compat.o
DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \
xopen-msg.sed $(HEADERS) $(SOURCES)
DISTFILES.normal = VERSION
@@ -85,7 +85,7 @@ INCLUDES = -I.. -I. -I$(top_srcdir)/intl
all: all-@USE_INCLUDED_LIBINTL@
-all-yes: libintl.$la intlh.inst
+all-yes: libintl.a
all-no:
libintl.a: $(OBJECTS)
@@ -97,8 +97,8 @@ libintl.la: $(OBJECTS)
$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \
-version-info 1:0 -rpath $(libdir)
-../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot
- cd ../po && $(MAKE) cat-id-tbl.$lo
+../po/cat-id-tbl.o: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot
+ cd ../po && $(MAKE) cat-id-tbl.o
check: all
@@ -153,8 +153,8 @@ uninstall:
info dvi:
$(OBJECTS): ../config.h libgettext.h
-bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h
-dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h
+bindtextdom.o finddomain.o loadmsgcat.o: gettextP.h gettext.h loadinfo.h
+dcgettext.o: gettextP.h gettext.h hash-string.h loadinfo.h
tags: TAGS

11
audio/xmms/patches/patch-libxmms_configure
View File

@ -1,11 +0,0 @@
--- libxmms/configure.orig Thu Jul 5 21:04:29 2001
+++ libxmms/configure Thu Jul 5 21:06:48 2001
@@ -2129,7 +2129,7 @@
fi
- for module in . gthread
+ for module in .
do
case "$module" in
gthread)

7
audio/xmms/patches/patch-libxmms_configure_in
View File

@ -1,6 +1,7 @@
--- libxmms/configure.in.orig Thu Jul 5 21:04:26 2001
+++ libxmms/configure.in Thu Jul 5 21:04:51 2001
@@ -30,7 +30,7 @@
$OpenBSD: patch-libxmms_configure_in,v 1.2 2001/07/25 15:48:26 naddy Exp $
--- libxmms/configure.in.orig Fri Jun 1 15:07:49 2001
+++ libxmms/configure.in Wed Jul 25 16:47:43 2001
@@ -30,7 +30,7 @@ AM_ENABLE_SHARED
XMMS_FUNC_POSIX(sched_setscheduler nanosleep)
AM_PATH_GLIB(1.2.2,,AC_MSG_ERROR([*** GLIB >= 1.2.2 not installed - please install first ***]))

12
audio/xmms/patches/patch-ltconfig
View File

@ -1,8 +1,6 @@
$Id: patch-ltconfig,v 1.2 2001/07/25 12:52:24 espie Exp $
vim:syn=diff
--- ltconfig.orig Wed Mar 21 10:22:22 2001
+++ ltconfig Fri Mar 30 08:44:01 2001
$OpenBSD: patch-ltconfig,v 1.3 2001/07/25 15:48:26 naddy Exp $
--- ltconfig.orig Wed Feb 16 16:20:30 2000
+++ ltconfig Wed Jul 25 16:47:43 2001
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
with_gnu_ld=no
fi
@ -13,7 +11,7 @@ vim:syn=diff
esac
@@ -1403,10 +1406,21 @@ else
@@ -1396,10 +1399,21 @@ else
;;
openbsd*)
@ -37,7 +35,7 @@ vim:syn=diff
;;
os2*)
@@ -2030,13 +2044,10 @@ netbsd*)
@@ -1997,13 +2011,10 @@ netbsd*)
openbsd*)
version_type=sunos

16
audio/xmms/patches/patch-ltmain_sh
View File

@ -1,9 +1,7 @@
$Id: patch-ltmain_sh,v 1.2 2001/07/25 12:52:24 espie Exp $
vim:syn=diff
--- ltmain.sh.orig Fri Feb 18 20:59:48 2000
+++ ltmain.sh Tue May 15 00:47:04 2001
@@ -1079,7 +1079,18 @@
$OpenBSD: patch-ltmain_sh,v 1.3 2001/07/25 15:48:26 naddy Exp $
--- ltmain.sh.orig Wed Feb 16 16:20:31 2000
+++ ltmain.sh Wed Jul 25 16:47:43 2001
@@ -1079,7 +1079,18 @@ compiler."
# These systems don't actually have c library (as such)
continue
;;
@ -22,7 +20,7 @@ vim:syn=diff
elif test "$arg" = "-lm"; then
case "$host" in
*-*-cygwin* | *-*-beos*)
@@ -1091,6 +1102,10 @@
@@ -1091,6 +1102,10 @@ compiler."
deplibs="$deplibs $arg"
;;
@ -33,7 +31,7 @@ vim:syn=diff
-module)
module=yes
continue
@@ -1795,6 +1810,9 @@
@@ -1795,6 +1810,9 @@ compiler."
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)!
;;
@ -43,7 +41,7 @@ vim:syn=diff
*)
# Add libc to deplibs on all other systems.
deplibs="$deplibs -lc"
@@ -3555,40 +3573,6 @@
@@ -3555,40 +3573,6 @@ libdir='$install_libdir'\
# Exit here if they wanted silent mode.
test "$show" = : && exit 0

9
audio/xmms/patches/patch-xmms_main_c
View File

@ -1,6 +1,7 @@
--- xmms/main.c.orig Thu Jul 5 21:58:03 2001
+++ xmms/main.c Thu Jul 5 21:58:31 2001
@@ -3204,14 +3204,6 @@
$OpenBSD: patch-xmms_main_c,v 1.2 2001/07/25 15:48:26 naddy Exp $
--- xmms/main.c.orig Sun Jun 17 01:05:47 2001
+++ xmms/main.c Wed Jul 25 16:47:43 2001
@@ -3204,14 +3204,6 @@ gboolean handle_cmd_line_options(struct
return FALSE;
}
@ -15,7 +16,7 @@
static gboolean pposition_configure(GtkWidget *w, GdkEventConfigure *event, gpointer data)
{
gint x,y;
@@ -3340,15 +3332,6 @@
@@ -3340,15 +3332,6 @@ int main(int argc, char **argv)
textdomain(PACKAGE);
#endif

7
audio/xmms/patches/patch-xmms_plugin_h
View File

@ -1,6 +1,7 @@
--- xmms/plugin.h.orig Thu Jul 5 21:09:52 2001
+++ xmms/plugin.h Thu Jul 5 21:10:20 2001
@@ -58,6 +58,7 @@
$OpenBSD: patch-xmms_plugin_h,v 1.2 2001/07/25 15:48:26 naddy Exp $
--- xmms/plugin.h.orig Wed Mar 1 21:28:06 2000
+++ xmms/plugin.h Wed Jul 25 16:47:43 2001
@@ -58,6 +58,7 @@ typedef struct
int (*output_time) (void); /* Return the current playing time */
int (*written_time) (void); /* Return the length of all the data that has been written to
the buffer */

21
audio/xmms/patches/patch-xmms_pluginenum_c
View File

@ -1,5 +1,6 @@
--- xmms/pluginenum.c.orig Thu Jul 5 21:10:37 2001
+++ xmms/pluginenum.c Thu Jul 5 21:14:57 2001
$OpenBSD: patch-xmms_pluginenum_c,v 1.2 2001/07/25 15:48:26 naddy Exp $
--- xmms/pluginenum.c.orig Mon Oct 16 15:37:56 2000
+++ xmms/pluginenum.c Wed Jul 25 16:47:43 2001
@@ -33,6 +33,19 @@
# define RTLD_NOW 0
#endif
@ -20,7 +21,7 @@
gchar *plugin_dir_list[] =
{
@@ -264,9 +277,9 @@
@@ -264,9 +277,9 @@ void add_plugin(gchar * filename)
#endif /* HPUX */
{
#ifdef HPUX
@ -32,7 +33,7 @@
#endif
{
InputPlugin *p;
@@ -282,9 +295,9 @@
@@ -282,9 +295,9 @@ void add_plugin(gchar * filename)
ip_data->input_list = g_list_prepend(ip_data->input_list, p);
}
#ifdef HPUX
@ -44,7 +45,7 @@
#endif
{
OutputPlugin *p;
@@ -295,9 +308,9 @@
@@ -295,9 +308,9 @@ void add_plugin(gchar * filename)
op_data->output_list = g_list_prepend(op_data->output_list, p);
}
#ifdef HPUX
@ -56,7 +57,7 @@
#endif
{
EffectPlugin *p;
@@ -308,9 +321,9 @@
@@ -308,9 +321,9 @@ void add_plugin(gchar * filename)
ep_data->effect_list = g_list_prepend(ep_data->effect_list, p);
}
#ifdef HPUX
@ -68,7 +69,7 @@
#endif
{
GeneralPlugin *p;
@@ -322,9 +335,9 @@
@@ -322,9 +335,9 @@ void add_plugin(gchar * filename)
gp_data->general_list = g_list_prepend(gp_data->general_list, p);
}
#ifdef HPUX
@ -80,7 +81,7 @@
#endif
{
VisPlugin *p;
@@ -355,7 +368,7 @@
@@ -355,7 +368,7 @@ void add_plugin(gchar * filename)
void scan_plugins(char *dirname)
{
@ -89,7 +90,7 @@
DIR *dir;
struct dirent *ent;
struct stat statbuf;
@@ -368,9 +381,8 @@
@@ -368,9 +381,8 @@ void scan_plugins(char *dirname)
{
filename = g_strdup_printf("%s/%s", dirname, ent->d_name);
if (!stat(filename, &statbuf) && S_ISREG(statbuf.st_mode) &&
@ -101,7 +102,7 @@
g_free(filename);
}
closedir(dir);
@@ -422,6 +434,12 @@
@@ -422,6 +434,12 @@ void cleanup_plugins(void)
while (node)
{
op = (OutputPlugin *) node->data;