Current status (v2) of OpenBSD BEAST



Checked libtool 1.3.5p3 from openbsd ports and found that it doesn't
work with current beast. However autoconf-2.57 seems ok. I vote
for >= 2.57 requirement because 2.58 is not packaged with OpenBSD 3.4.

docs/generated stillfails to build. After finding that I can supply con
figure options to autogen.sh and thus configuring only once, build fails
because of the already known "loading shared libraries from fixed
RELATIVE path" problem. Here is make output:

make[4]: Entering directory `/home/nedko/cvs/anoncvs.gnome.org/beast/docs/generated'
../../bse/bseautodoc  --seealso "beast-man://3/bse-procs,BSE Procedures" \
            structs >bse-structs.3.texi
/home/nedko/cvs/anoncvs.gnome.org/beast/bse/.libs/bseautodoc: can't load library '../sfi/.libs/libsfi.so.6.0'
make[4]: *** [bse-structs.3.texi] Error 4
make[4]: Leaving directory `/home/nedko/cvs/anoncvs.gnome.org/beast/docs/generated'

Patches for soundcard.h and getpwnam/getpwnam_r are attached.

--- configure.in.orig	Wed Dec 17 15:15:05 2003
+++ configure.in	Tue Dec 30 21:36:42 2003
@@ -383,7 +383,7 @@
     bse_have_pcmdev=
 	
     dnl OSS-Lite driver check
-    AC_CHECK_HEADER(sys/soundcard.h, have_oss_header=yes, have_oss_header=no)
+    AC_CHECK_HEADERS(sys/soundcard.h soundcard.h, have_oss_header=yes, have_oss_header=no)
     AC_ARG_ENABLE(osspcm,
 	[  --enable-osspcm=DEVICE  force DEVICE as OSS PCM device name],
 	[AC_MSG_WARN([Ignoring detection of PCM device])],
--- bse/bsepcmdevice-oss.c.orig	Tue Dec 30 21:40:00 2003
+++ bse/bsepcmdevice-oss.c	Tue Dec 30 21:44:10 2003
@@ -25,7 +25,11 @@
 BSE_DUMMY_TYPE (BsePcmDeviceOSS);
 #else   /* BSE_PCM_DEVICE_CONF_OSS */
 
+#if HAVE_SYS_SOUNDCARD_H
 #include	<sys/soundcard.h>
+#elif HAVE_SOUNDCARD_H
+#include	<soundcard.h>
+#endif
 #include	<sys/ioctl.h>
 #include	<sys/types.h>
 #include	<sys/time.h>
--- bse/bsemididevice-oss.c.orig	Tue Dec 30 22:23:31 2003
+++ bse/bsemididevice-oss.c	Tue Dec 30 22:23:57 2003
@@ -27,7 +27,11 @@
 BSE_DUMMY_TYPE (BseMidiDeviceOSS);
 #else   /* BSE_MIDI_DEVICE_CONF_OSS */
 
+#if HAVE_SYS_SOUNDCARD_H
 #include	<sys/soundcard.h>
+#elif HAVE_SOUNDCARD_H
+#include	<soundcard.h>
+#endif
 #include	<sys/ioctl.h>
 #include	<sys/types.h>
 #include	<sys/time.h>
--- configure.in.orig	Tue Dec 30 21:47:47 2003
+++ configure.in	Tue Dec 30 21:52:26 2003
@@ -539,6 +539,8 @@
 AC_BEAST_REQUIREMENTS
 AC_DOC_REQUIREMENTS
 
+AC_CHECK_FUNCS(getpwnam_r getpwnam)
+
 # Automake @VARIABLE@ exports.
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
--- sfi/sfifilecrawler.c.orig	Tue Dec 30 21:54:44 2003
+++ sfi/sfifilecrawler.c	Tue Dec 30 22:03:20 2003
@@ -581,7 +581,8 @@
                gboolean     use_fallbacks)
 {
   struct passwd *p = NULL;
-  if (user && 1 /* getpwnam_r check */)
+#if HAVE_GETPWNAM_R
+  if (user)
     {
       char buffer[8192];
       struct passwd spwd;
@@ -588,12 +589,14 @@
       if (getpwnam_r (user, &spwd, buffer, 8192, &p) == 0 && p)
         return g_strdup (p->pw_dir);
     }
-  if (user && 1 /* getpwnam check */)
+#elif HAVE_GETPWNAM
+  if (user)
     {
       p = getpwnam (user);
       if (p)
         return g_strdup (p->pw_dir);
     }
+#endif
   if (!user)
     return g_strdup (g_get_home_dir ());
   return use_fallbacks ? g_strdup (g_get_home_dir ()) : NULL;

-- 
Nedko Arnaudov



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]