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

better solution

Browse Source
This commit is contained in:
pvalchev 2002-04-06 19:32:39 +00:00
parent 59d43c3e3f
commit c6b1dd1878
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.5 2002/04/06 19:09:06 pvalchev Exp $
$OpenBSD: patch-configure_in,v 1.6 2002/04/06 19:32:40 pvalchev Exp $
--- configure.in.orig Mon Mar 4 14:50:26 2002
+++ configure.in Sat Apr 6 11:49:37 2002
+++ configure.in Sat Apr 6 12:25:48 2002
@@ -15,6 +15,10 @@ AC_ARG_ENABLE( user-plugin-dir,
[ --disable-user-plugin-dir disable per-user plugin dir],,
enable_user_plugin_dir="yes")
@ -48,7 +48,7 @@ $OpenBSD: patch-configure_in,v 1.5 2002/04/06 19:09:06 pvalchev Exp $
have_opengl_headers=yes
AC_CHECK_HEADERS(GL/gl.h GL/glx.h,,have_opengl_headers=no)
@@ -473,11 +477,15 @@ fi
@@ -473,10 +477,11 @@ fi
arch_type=other
have_solaris=no
@ -56,16 +56,13 @@ $OpenBSD: patch-configure_in,v 1.5 2002/04/06 19:09:06 pvalchev Exp $
ARCH_DEFINES=""
case "$host" in
- *-*-openbsd* | *-*-netbsd* | *-*darwin*)
+ i386|sparc|m68k-*-openbsd*)
AC_DEFINE(SYMBOL_PREFIX, "_", [Define to symbol prefix, if any])
;;
- AC_DEFINE(SYMBOL_PREFIX, "_", [Define to symbol prefix, if any])
+ *-*-openbsd*)
+ have_sun=yes
+ ;;
;;
i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
ARCH_DEFINES="-DI386_ASSEM"
arch_type=ix86
@@ -497,6 +505,7 @@ AC_SUBST(ARCH_DEFINES)
@@ -497,6 +502,7 @@ AC_SUBST(ARCH_DEFINES)
AM_CONDITIONAL(ARCH_X86, test "x$arch_type" = "xix86")
AM_CONDITIONAL(ARCH_PPC, test "x$arch_type" = "xppc")
AM_CONDITIONAL(HAVE_SOLARIS, test "x$have_solaris" = xyes)
@ -73,7 +70,7 @@ $OpenBSD: patch-configure_in,v 1.5 2002/04/06 19:09:06 pvalchev Exp $
plugindir=$libdir/xmms
AC_SUBST(plugindir)
@@ -524,7 +533,7 @@ AC_SUBST(GENERAL_PLUGIN_DIR)
@@ -524,7 +530,7 @@ AC_SUBST(GENERAL_PLUGIN_DIR)
AC_SUBST(VISUALIZATION_PLUGIN_DIR)
AC_SUBST(pluginsubs)
@ -82,7 +79,7 @@ $OpenBSD: patch-configure_in,v 1.5 2002/04/06 19:09:06 pvalchev Exp $
if test "x$enable_user_plugin_dir" = "xno"; then
AC_DEFINE(DISABLE_USER_PLUGIN_DIR,, [Define to disable per user plugin directory])
@@ -554,6 +563,7 @@ Output/OSS/Makefile
@@ -554,6 +560,7 @@ Output/OSS/Makefile
Output/esd/Makefile
Output/disk_writer/Makefile
Output/solaris/Makefile
@ -90,7 +87,7 @@ $OpenBSD: patch-configure_in,v 1.5 2002/04/06 19:09:06 pvalchev Exp $
Input/Makefile
Input/wav/Makefile
Input/mpg123/Makefile
@@ -591,6 +601,7 @@ echo " Build esd plugin: $hav
@@ -591,6 +598,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"

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

@ -1,7 +1,18 @@
$OpenBSD: patch-xmms_pluginenum_c,v 1.4 2002/02/05 04:07:57 pvalchev Exp $
--- xmms/pluginenum.c.orig Fri Jan 18 06:44:35 2002
+++ xmms/pluginenum.c Fri Jan 18 06:47:26 2002
@@ -431,6 +431,12 @@
$OpenBSD: patch-xmms_pluginenum_c,v 1.5 2002/04/06 19:32:39 pvalchev Exp $
--- xmms/pluginenum.c.orig Wed Jan 2 07:21:32 2002
+++ xmms/pluginenum.c Sat Apr 6 12:15:28 2002
@@ -35,6 +35,10 @@
# define RTLD_NOW 0
#endif
+#if defined(__OpenBSD__) && !defined(__ELF__)
+# define SYMBOL_PREFIX "_"
+#endif
+
gchar *plugin_dir_list[] =
{
@@ -431,6 +435,12 @@ void cleanup_plugins(void)
while (node)
{
op = (OutputPlugin *) node->data;