Re: [Ekiga-devel-list] Ekiga 3 on FreeBSD
- From: Aragon Gouveia <aragon phat za net>
- To: Ekiga development mailing list <ekiga-devel-list gnome org>
- Subject: Re: [Ekiga-devel-list] Ekiga 3 on FreeBSD
- Date: Sat, 02 May 2009 18:08:43 +0200
Hi
Eugen Dedu wrote:
Aragon Gouveia wrote:
Hi,
I would like to try get Ekiga 3 running on FreeBSD with the hope of
getting a working port together.
I have got it sort of working. I'm using Ekiga 3.0.2, Opal 3.4.4, and
Ptlib 2.4.4 (which is already ported).
Couldn't you please use ekiga 3.2.0? It fixed several issues compared
to 3.0...
I've finally managed to try 3.2.0 with Ptlib 2.6.1 and Opal 3.6.1.
I am experiencing the same core dump as before. (gdb output below)
It seems to be originating from Ptlib. When porting Ptlib, there were
quite a few type definition changes needed to get it to compile, and
maybe that's causing the problem now. I've attached the ptlib patch
that I needed to apply to get it compiling.
Any ideas?
Thanks,
Aragon
Core was generated by `ekiga'.
Program terminated with signal 11, Segmentation fault.
Reading symbols from /usr/local/lib/libgconf-2.so.4...done.
Loaded symbols for /usr/local/lib/libgconf-2.so.4
Reading symbols from /usr/local/lib/libORBit-2.so.0...done.
Loaded symbols for /usr/local/lib/libORBit-2.so.0
Reading symbols from /usr/local/lib/libXv.so.1...done.
Loaded symbols for /usr/local/lib/libXv.so.1
Reading symbols from /usr/local/lib/libgthread-2.0.so.0...done.
Loaded symbols for /usr/local/lib/libgthread-2.0.so.0
Reading symbols from /usr/local/lib/libopal.so.3.6.1...done.
Loaded symbols for /usr/local/lib/libopal.so.3.6.1
Reading symbols from /usr/local/lib/libspeexdsp.so.1...done.
Loaded symbols for /usr/local/lib/libspeexdsp.so.1
Reading symbols from /usr/local/lib/libpt.so.2...done.
Loaded symbols for /usr/local/lib/libpt.so.2
Reading symbols from /lib/libthr.so.3...done.
Loaded symbols for /lib/libthr.so.3
Reading symbols from /usr/lib/libssl.so.5...done.
Loaded symbols for /usr/lib/libssl.so.5
Reading symbols from /usr/local/lib/libSDL-1.2.so.11...done.
Loaded symbols for /usr/local/lib/libSDL-1.2.so.11
Reading symbols from /usr/lib/libusbhid.so.3...done.
Loaded symbols for /usr/lib/libusbhid.so.3
Reading symbols from /usr/local/lib/libsigc-2.0.so.0...done.
Loaded symbols for /usr/local/lib/libsigc-2.0.so.0
Reading symbols from /usr/local/lib/libxml2.so.5...done.
Loaded symbols for /usr/local/lib/libxml2.so.5
Reading symbols from /usr/local/lib/libnotify.so.1...done.
Loaded symbols for /usr/local/lib/libnotify.so.1
Reading symbols from /usr/local/lib/libgtk-x11-2.0.so.0...done.
Loaded symbols for /usr/local/lib/libgtk-x11-2.0.so.0
Reading symbols from /usr/local/lib/libdbus-glib-1.so.2...done.
Loaded symbols for /usr/local/lib/libdbus-glib-1.so.2
Reading symbols from /usr/local/lib/libgdk-x11-2.0.so.0...done.
Loaded symbols for /usr/local/lib/libgdk-x11-2.0.so.0
Reading symbols from /usr/local/lib/libatk-1.0.so.0...done.
Loaded symbols for /usr/local/lib/libatk-1.0.so.0
Reading symbols from /usr/local/lib/libgdk_pixbuf-2.0.so.0...done.
Loaded symbols for /usr/local/lib/libgdk_pixbuf-2.0.so.0
Reading symbols from /usr/local/lib/libpangocairo-1.0.so.0...done.
Loaded symbols for /usr/local/lib/libpangocairo-1.0.so.0
Reading symbols from /usr/local/lib/libgio-2.0.so.0...done.
Loaded symbols for /usr/local/lib/libgio-2.0.so.0
Reading symbols from /usr/local/lib/libXinerama.so.1...done.
Loaded symbols for /usr/local/lib/libXinerama.so.1
Reading symbols from /usr/local/lib/libXi.so.6...done.
Loaded symbols for /usr/local/lib/libXi.so.6
Reading symbols from /usr/local/lib/libXrandr.so.2...done.
Loaded symbols for /usr/local/lib/libXrandr.so.2
Reading symbols from /usr/local/lib/libXcursor.so.1...done.
Loaded symbols for /usr/local/lib/libXcursor.so.1
Reading symbols from /usr/local/lib/libXcomposite.so.1...done.
Loaded symbols for /usr/local/lib/libXcomposite.so.1
Reading symbols from /usr/local/lib/libXext.so.6...done.
Loaded symbols for /usr/local/lib/libXext.so.6
Reading symbols from /usr/local/lib/libXdamage.so.1...done.
Loaded symbols for /usr/local/lib/libXdamage.so.1
Reading symbols from /usr/local/lib/libcairo.so.2...done.
Loaded symbols for /usr/local/lib/libcairo.so.2
Reading symbols from /usr/local/lib/libpixman-1.so.9...done.
Loaded symbols for /usr/local/lib/libpixman-1.so.9
Reading symbols from /usr/local/lib/libglitz.so.1...done.
Loaded symbols for /usr/local/lib/libglitz.so.1
Reading symbols from /usr/local/lib/libpng.so.5...done.
Loaded symbols for /usr/local/lib/libpng.so.5
Reading symbols from /usr/local/lib/libxcb-render-util.so.0...done.
Loaded symbols for /usr/local/lib/libxcb-render-util.so.0
Reading symbols from /usr/local/lib/libxcb-render.so.0...done.
Loaded symbols for /usr/local/lib/libxcb-render.so.0
Reading symbols from /usr/local/lib/libXrender.so.1...done.
Loaded symbols for /usr/local/lib/libXrender.so.1
Reading symbols from /usr/local/lib/libpangoft2-1.0.so.0...done.
Loaded symbols for /usr/local/lib/libpangoft2-1.0.so.0
Reading symbols from /usr/local/lib/libXfixes.so.3...done.
Loaded symbols for /usr/local/lib/libXfixes.so.3
Reading symbols from /usr/local/lib/libX11.so.6...done.
Loaded symbols for /usr/local/lib/libX11.so.6
Reading symbols from /usr/local/lib/libxcb.so.2...done.
Loaded symbols for /usr/local/lib/libxcb.so.2
Reading symbols from /usr/local/lib/libXau.so.6...done.
Loaded symbols for /usr/local/lib/libXau.so.6
Reading symbols from /usr/local/lib/libXdmcp.so.6...done.
Loaded symbols for /usr/local/lib/libXdmcp.so.6
Reading symbols from /usr/lib/librpcsvc.so.4...done.
Loaded symbols for /usr/lib/librpcsvc.so.4
Reading symbols from /usr/local/lib/libpango-1.0.so.0...done.
Loaded symbols for /usr/local/lib/libpango-1.0.so.0
Reading symbols from /usr/local/lib/libfontconfig.so.1...done.
Loaded symbols for /usr/local/lib/libfontconfig.so.1
Reading symbols from /usr/local/lib/libfreetype.so.9...done.
Loaded symbols for /usr/local/lib/libfreetype.so.9
Reading symbols from /lib/libz.so.4...done.
Loaded symbols for /lib/libz.so.4
Reading symbols from /usr/local/lib/libexpat.so.6...done.
Loaded symbols for /usr/local/lib/libexpat.so.6
Reading symbols from /usr/local/lib/libgmodule-2.0.so.0...done.
Loaded symbols for /usr/local/lib/libgmodule-2.0.so.0
Reading symbols from /usr/local/lib/libdbus-1.so.3...done.
Loaded symbols for /usr/local/lib/libdbus-1.so.3
Reading symbols from /usr/local/lib/libgobject-2.0.so.0...done.
Loaded symbols for /usr/local/lib/libgobject-2.0.so.0
Reading symbols from /usr/local/lib/libglib-2.0.so.0...done.
Loaded symbols for /usr/local/lib/libglib-2.0.so.0
Reading symbols from /usr/local/lib/libintl.so.8...done.
Loaded symbols for /usr/local/lib/libintl.so.8
Reading symbols from /usr/local/lib/libiconv.so.3...done.
Loaded symbols for /usr/local/lib/libiconv.so.3
Reading symbols from /usr/local/lib/libpcre.so.0...done.
Loaded symbols for /usr/local/lib/libpcre.so.0
Reading symbols from /usr/lib/libstdc++.so.6...done.
Loaded symbols for /usr/lib/libstdc++.so.6
Reading symbols from /lib/libm.so.5...done.
Loaded symbols for /lib/libm.so.5
Reading symbols from /lib/libgcc_s.so.1...done.
Loaded symbols for /lib/libgcc_s.so.1
Reading symbols from /lib/libc.so.7...done.
Loaded symbols for /lib/libc.so.7
Reading symbols from /lib/libcrypto.so.5...done.
Loaded symbols for /lib/libcrypto.so.5
Reading symbols from
/usr/local/lib/ptlib-2.6.1/devices/sound/oss_pwplugin.so...done.
Loaded symbols for /usr/local/lib/ptlib-2.6.1/devices/sound/oss_pwplugin.so
Reading symbols from
/usr/local/lib/ptlib-2.6.1/devices/videoinput/bsdvideo_pwplugin.so...done.
Loaded symbols for
/usr/local/lib/ptlib-2.6.1/devices/videoinput/bsdvideo_pwplugin.so
Reading symbols from
/usr/local/lib/opal-3.6.1/codecs/audio/g722_audio_pwplugin.so...done.
Loaded symbols for
/usr/local/lib/opal-3.6.1/codecs/audio/g722_audio_pwplugin.so
Reading symbols from
/usr/local/lib/opal-3.6.1/codecs/audio/gsm0610_audio_pwplugin.so...done.
Loaded symbols for
/usr/local/lib/opal-3.6.1/codecs/audio/gsm0610_audio_pwplugin.so
Reading symbols from
/usr/local/lib/opal-3.6.1/codecs/audio/speex_audio_pwplugin.so...done.
Loaded symbols for
/usr/local/lib/opal-3.6.1/codecs/audio/speex_audio_pwplugin.so
Reading symbols from /usr/local/lib/libspeex.so.1...done.
Loaded symbols for /usr/local/lib/libspeex.so.1
Reading symbols from
/usr/local/lib/opal-3.6.1/codecs/audio/ilbc_audio_pwplugin.so...done.
Loaded symbols for
/usr/local/lib/opal-3.6.1/codecs/audio/ilbc_audio_pwplugin.so
Reading symbols from
/usr/local/lib/opal-3.6.1/codecs/audio/lpc10_audio_pwplugin.so...done.
Loaded symbols for
/usr/local/lib/opal-3.6.1/codecs/audio/lpc10_audio_pwplugin.so
Reading symbols from
/usr/local/lib/opal-3.6.1/codecs/audio/g726_audio_pwplugin.so...done.
Loaded symbols for
/usr/local/lib/opal-3.6.1/codecs/audio/g726_audio_pwplugin.so
Reading symbols from
/usr/local/lib/opal-3.6.1/codecs/audio/ima_adpcm_audio_pwplugin.so...done.
Loaded symbols for
/usr/local/lib/opal-3.6.1/codecs/audio/ima_adpcm_audio_pwplugin.so
Reading symbols from
/usr/local/lib/opal-3.6.1/codecs/audio/gsmamrcodec_pwplugin.so...done.
Loaded symbols for
/usr/local/lib/opal-3.6.1/codecs/audio/gsmamrcodec_pwplugin.so
Reading symbols from
/usr/local/lib/opal-3.6.1/codecs/video/h261-vic_video_pwplugin.so...done.
Loaded symbols for
/usr/local/lib/opal-3.6.1/codecs/video/h261-vic_video_pwplugin.so
Reading symbols from
/usr/local/lib/opal-3.6.1/codecs/video/h264_video_pwplugin.so...done.
Loaded symbols for
/usr/local/lib/opal-3.6.1/codecs/video/h264_video_pwplugin.so
Reading symbols from /usr/local/lib/libavcodec.so.1...done.
Loaded symbols for /usr/local/lib/libavcodec.so.1
Reading symbols from /usr/local/lib/liba52.so.0...done.
Loaded symbols for /usr/local/lib/liba52.so.0
Reading symbols from /usr/local/lib/libavutil.so.1...done.
Loaded symbols for /usr/local/lib/libavutil.so.1
Reading symbols from /usr/local/lib/libmp3lame.so.0...done.
Loaded symbols for /usr/local/lib/libmp3lame.so.0
Reading symbols from /usr/local/lib/libtheora.so.0...done.
Loaded symbols for /usr/local/lib/libtheora.so.0
Reading symbols from /usr/local/lib/libvorbisenc.so.2...done.
Loaded symbols for /usr/local/lib/libvorbisenc.so.2
Reading symbols from /usr/local/lib/libvorbis.so.4...done.
Loaded symbols for /usr/local/lib/libvorbis.so.4
Reading symbols from /usr/local/lib/libx264.so.50...done.
Loaded symbols for /usr/local/lib/libx264.so.50
Reading symbols from /usr/local/lib/libxvidcore.so.4...done.
Loaded symbols for /usr/local/lib/libxvidcore.so.4
Reading symbols from /usr/local/lib/libogg.so.5...done.
Loaded symbols for /usr/local/lib/libogg.so.5
Reading symbols from
/usr/local/lib/opal-3.6.1/codecs/video/h263-1998_video_pwplugin.so...done.
Loaded symbols for
/usr/local/lib/opal-3.6.1/codecs/video/h263-1998_video_pwplugin.so
Reading symbols from
/usr/local/lib/opal-3.6.1/codecs/video/mpeg4-ffmpeg_video_pwplugin.so...done.
Loaded symbols for
/usr/local/lib/opal-3.6.1/codecs/video/mpeg4-ffmpeg_video_pwplugin.so
Reading symbols from
/usr/local/lib/opal-3.6.1/codecs/video/theora_video_pwplugin.so...done.
Loaded symbols for
/usr/local/lib/opal-3.6.1/codecs/video/theora_video_pwplugin.so
Reading symbols from
/usr/local/lib/gtk-2.0/2.10.0/engines/libpixmap.so...done.
Loaded symbols for /usr/local/lib/gtk-2.0/2.10.0/engines/libpixmap.so
Reading symbols from
/usr/local/lib/pango/1.6.0/modules/pango-basic-fc.so...done.
Loaded symbols for /usr/local/lib/pango/1.6.0/modules/pango-basic-fc.so
Reading symbols from
/usr/local/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.so...done.
Loaded symbols for
/usr/local/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.so
Reading symbols from
/usr/local/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.so...done.
Loaded symbols for
/usr/local/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.so
Reading symbols from /libexec/ld-elf.so.1...done.
Loaded symbols for /libexec/ld-elf.so.1
#0 0x0000000801b05390 in PChannel::SetBufferSize () from
/usr/local/lib/libpt.so.2
[New Thread 0x806203b00 (LWP 100303)]
[New Thread 0x806203980 (LWP 100308)]
[New Thread 0x806202f00 (LWP 100266)]
[New Thread 0x806202d80 (LWP 100210)]
[New Thread 0x806202c00 (LWP 100178)]
[New Thread 0x806202a80 (LWP 100154)]
[New Thread 0x806202780 (LWP 100153)]
[New Thread 0x806202600 (LWP 100132)]
[New Thread 0x806202180 (LWP 100217)]
(gdb) bt
#0 0x0000000801b05390 in PChannel::SetBufferSize () from
/usr/local/lib/libpt.so.2
#1 0x000000080145b919 in SIPEndPoint::NewIncomingConnection () from
/usr/local/lib/libopal.so.3.6.1
#2 0x0000000801211e11 in OpalEndPoint::ListenerCallback () from
/usr/local/lib/libopal.so.3.6.1
#3 0x000000080123795c in OpalListener::ListenForConnections () from
/usr/local/lib/libopal.so.3.6.1
#4 0x0000000801b10666 in PThread::PX_ThreadStart () from
/usr/local/lib/libpt.so.2
#5 0x0000000801d093ec in pthread_getprio () from /lib/libthr.so.3
#6 0x0000000000000000 in ?? ()
Cannot access memory at address 0x7ffffe7f5000
--- Makefile.in.orig 2009-01-12 06:53:18.000000000 +0800
+++ Makefile.in 2009-02-23 10:03:52.000000000 +0800
@@ -85,11 +85,11 @@
$(DESTDIR)$(PREFIX)/share/ptlib/make ; \
do mkdir -p $$dir ; chmod 755 $$dir ; \
done )
- $(INSTALL) -m 444 $(PT_LIBDIR)/$(PTLIB_FILE) MAJOR_VERSION@ MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)
+ $(INSTALL) -m 444 $(PT_LIBDIR)/$(PTLIB_FILE) MAJOR_VERSION@ $(DESTDIR)$(LIBDIR)
$(INSTALL) -m 444 $(PT_LIBDIR)/lib$(PTLIB_BASE)_s.a $(DESTDIR)$(LIBDIR)
(cd $(DESTDIR)$(LIBDIR) ; \
rm -f $(PTLIB_FILE) ; \
- ln -sf $(PTLIB_FILE) MAJOR_VERSION@ MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(PTLIB_FILE) \
+ ln -sf $(PTLIB_FILE) MAJOR_VERSION@ $(PTLIB_FILE) \
)
ifeq (1, $(HAS_PLUGINS))
if test -e $(PT_LIBDIR)/device/; then \
@@ -120,9 +120,9 @@
$(INSTALL) -m 755 make/ptlib-config $(DESTDIR)$(PREFIX)/share/ptlib/make/
(cd $(DESTDIR)$(PREFIX)/bin; rm -f ptlib-config ; ln -snf ../share/ptlib/make/ptlib-config ptlib-config)
- mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
- chmod 755 $(DESTDIR)$(LIBDIR)/pkgconfig
- $(INSTALL) -m 644 ptlib.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
+ mkdir -p $(DESTDIR)$(PREFIX)/libdata/pkgconfig
+ chmod 755 $(DESTDIR)$(PREFIX)/libdata/pkgconfig
+ $(INSTALL) -m 644 ptlib.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/
uninstall:
rm -rf $(DESTDIR)$(PREFIX)/include/ptlib \
$(DESTDIR)$(PREFIX)/include/ptclib \
@@ -130,9 +130,9 @@
$(DESTDIR)$(PREFIX)/include/ptbuildopts.h \
$(DESTDIR)$(PREFIX)/share/ptlib \
$(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR) \
- $(DESTDIR)$(LIBDIR)/pkgconfig/ptlib.pc
+ $(DESTDIR)$(PREFIX)/libdata/pkgconfig/ptlib.pc
rm -f $(DESTDIR)$(LIBDIR)/lib$(PTLIB_BASE)_s.a \
$(DESTDIR)$(LIBDIR)/$(PTLIB_FILE) \
- $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE) MAJOR_VERSION@ MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@
+ $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE) MAJOR_VERSION@
# End of Makefile.in
--- include/ptclib/vsdl.h.orig 2008-09-25 14:51:15.000000000 +0800
+++ include/ptclib/vsdl.h 2008-09-25 14:52:15.000000000 +0800
@@ -33,7 +33,7 @@
#include <ptlib.h>
#if defined(P_FREEBSD)
-#include <SDL11/SDL.h>
+#include <SDL/SDL.h>
#else
#include <SDL/SDL.h>
#endif
--- include/ptlib/critsec.h.orig 2009-05-02 05:43:03.000000000 +0200
+++ include/ptlib/critsec.h 2009-05-02 05:48:38.000000000 +0200
@@ -249,13 +249,13 @@
__inline PAtomicInteger::IntegerType PAtomicInteger::operator--(int) { return EXCHANGE_AND_ADD(&m_value, -1); }
__inline void PAtomicInteger::SetValue(IntegerType value) { m_value = value; }
#else
-__inline PAtomicInteger::PAtomicInteger(IntegerType value) : m_value(value) { pthread_mutex_init(&mutex, NULL); }
-__inline PAtomicInteger::~PAtomicInteger() { pthread_mutex_destroy(&mutex); }
-__inline PAtomicInteger::IntegerType PAtomicInteger::operator++() { pthread_mutex_lock(&mutex); int retval = ++m_value; pthread_mutex_unlock(&mutex); return retval; }
-__inline PAtomicInteger::IntegerType PAtomicInteger::operator++(int) { pthread_mutex_lock(&mutex); int retval = m_value++; pthread_mutex_unlock(&mutex); return retval; }
-__inline PAtomicInteger::IntegerType PAtomicInteger::operator--() { pthread_mutex_lock(&mutex); int retval = --m_value; pthread_mutex_unlock(&mutex); return retval; }
-__inline PAtomicInteger::IntegerType PAtomicInteger::operator--(int) { pthread_mutex_lock(&mutex); int retval = m_value--; pthread_mutex_unlock(&mutex); return retval; }
-__inline void PAtomicInteger::SetValue(IntegerType v) { pthread_mutex_lock(&mutex); m_value = v; pthread_mutex_unlock(&mutex); }
+__inline PAtomicInteger::PAtomicInteger(IntegerType value) : m_value(value) { pthread_mutex_init(&m_mutex, NULL); }
+__inline PAtomicInteger::~PAtomicInteger() { pthread_mutex_destroy(&m_mutex); }
+__inline PAtomicInteger::IntegerType PAtomicInteger::operator++() { pthread_mutex_lock(&m_mutex); int retval = ++m_value; pthread_mutex_unlock(&m_mutex); return retval; }
+__inline PAtomicInteger::IntegerType PAtomicInteger::operator++(int) { pthread_mutex_lock(&m_mutex); int retval = m_value++; pthread_mutex_unlock(&m_mutex); return retval; }
+__inline PAtomicInteger::IntegerType PAtomicInteger::operator--() { pthread_mutex_lock(&m_mutex); int retval = --m_value; pthread_mutex_unlock(&m_mutex); return retval; }
+__inline PAtomicInteger::IntegerType PAtomicInteger::operator--(int) { pthread_mutex_lock(&m_mutex); int retval = m_value--; pthread_mutex_unlock(&m_mutex); return retval; }
+__inline void PAtomicInteger::SetValue(IntegerType v) { pthread_mutex_lock(&m_mutex); m_value = v; pthread_mutex_unlock(&m_mutex); }
#endif
--- make/lib.mak.orig 2008-10-17 17:02:51.000000000 +0800
+++ make/lib.mak 2009-02-23 10:18:32.000000000 +0800
@@ -30,9 +30,9 @@
ifneq ($(OSTYPE),Darwin)
ifeq ($(BUILD_TYPE),.)
- LIBNAME_PAT = $(LIB_FILENAME).$(MAJOR_VERSION).$(MINOR_VERSION).$(BUILD_NUMBER)
+ LIBNAME_PAT = $(LIB_FILENAME).$(MAJOR_VERSION)
else
- LIBNAME_PAT = $(LIB_FILENAME).$(MAJOR_VERSION).$(MINOR_VERSION)-$(BUILD_TYPE)$(BUILD_NUMBER)
+ LIBNAME_PAT = $(LIB_FILENAME).$(MAJOR_VERSION)
endif
else
ifeq ($(BUILD_TYPE),.)
--- plugins/configure.orig 2008-09-15 16:26:48.000000000 +0800
+++ plugins/configure 2009-02-23 20:09:39.000000000 +0800
@@ -4993,6 +4993,268 @@ fi
if test "${enable_bsdvideo}z" = "yesz" ; then
+ if test "${ac_cv_header_ioctl_meteor_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for dev/bktr/ioctl_meteor.h" >&5
+echo $ECHO_N "checking for dev/bktr/ioctl_meteor.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_ioctl_meteor_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_ioctl_meteor_h" >&5
+echo "${ECHO_T}$ac_cv_header_ioctl_meteor_h" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking dev/bktr/ioctl_meteor.h usability" >&5
+echo $ECHO_N "checking dev/bktr/ioctl_meteor.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <dev/bktr/ioctl_meteor.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking dev/bktr/ioctl_meteor.h presence" >&5
+echo $ECHO_N "checking dev/bktr/ioctl_meteor.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <dev/bktr/ioctl_meteor.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_meteor.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: dev/bktr/ioctl_meteor.h: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for dev/bktr/ioctl_meteor.h" >&5
+echo $ECHO_N "checking for dev/bktr/ioctl_meteor.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_ioctl_meteor_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_ioctl_meteor_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_ioctl_meteor_h" >&5
+echo "${ECHO_T}$ac_cv_header_ioctl_meteor_h" >&6; }
+
+fi
+if test $ac_cv_header_ioctl_meteor_h = yes; then
+ BSDVIDEOHDR=1
+fi
+
+
+ if test "${ac_cv_header_ioctl_bt848_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for dev/bktr/ioctl_bt848.h" >&5
+echo $ECHO_N "checking for dev/bktr/ioctl_bt848.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_ioctl_bt848_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_ioctl_bt848_h" >&5
+echo "${ECHO_T}$ac_cv_header_ioctl_bt848_h" >&6; }
+else
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking dev/bktr/ioctl_bt848.h usability" >&5
+echo $ECHO_N "checking dev/bktr/ioctl_bt848.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <dev/bktr/ioctl_bt848.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking dev/bktr/ioctl_bt848.h presence" >&5
+echo $ECHO_N "checking dev/bktr/ioctl_bt848.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <dev/bktr/ioctl_bt848.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_bt848.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: dev/bktr/ioctl_bt848.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_bt848.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: dev/bktr/ioctl_bt848.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_bt848.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: dev/bktr/ioctl_bt848.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_bt848.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: dev/bktr/ioctl_bt848.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_bt848.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: dev/bktr/ioctl_bt848.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_bt848.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: dev/bktr/ioctl_bt848.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_bt848.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: dev/bktr/ioctl_bt848.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: dev/bktr/ioctl_bt848.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: dev/bktr/ioctl_bt848.h: in the future, the compiler will take precedence" >&2;}
+
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for dev/bktr/ioctl_bt848.h" >&5
+echo $ECHO_N "checking for dev/bktr/ioctl_bt848.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_ioctl_bt848_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_ioctl_bt848_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_ioctl_bt848_h" >&5
+echo "${ECHO_T}$ac_cv_header_ioctl_bt848_h" >&6; }
+
+fi
+if test $ac_cv_header_ioctl_bt848_h = yes; then
+ BSDVIDEOHDR=1
+fi
+
+
+# old path
+if test "$ac_cv_header_ioctl_bt848_h" != yes -a "$ac_cv_header_ioctl_meteor_h" != yes; then
if test "${ac_cv_header_machine_ioctl_meteor_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for machine/ioctl_meteor.h" >&5
echo $ECHO_N "checking for machine/ioctl_meteor.h... $ECHO_C" >&6; }
@@ -5123,18 +5385,18 @@ if test $ac_cv_header_machine_ioctl_mete
fi
- if test "${ac_cv_header_i386_ioctl_meteor_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for i386/ioctl_meteor.h" >&5
-echo $ECHO_N "checking for i386/ioctl_meteor.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_i386_ioctl_meteor_h+set}" = set; then
+ if test "${ac_cv_header_machine_ioctl_bt848_h+set}" = set; then
+ { echo "$as_me:$LINENO: checking for machine/ioctl_bt848.h" >&5
+echo $ECHO_N "checking for machine/ioctl_bt848.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_machine_ioctl_bt848_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_i386_ioctl_meteor_h" >&5
-echo "${ECHO_T}$ac_cv_header_i386_ioctl_meteor_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_machine_ioctl_bt848_h" >&5
+echo "${ECHO_T}$ac_cv_header_machine_ioctl_bt848_h" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking i386/ioctl_meteor.h usability" >&5
-echo $ECHO_N "checking i386/ioctl_meteor.h usability... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking machine/ioctl_bt848.h usability" >&5
+echo $ECHO_N "checking machine/ioctl_bt848.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5142,7 +5404,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-#include <i386/ioctl_meteor.h>
+#include <machine/ioctl_bt848.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
@@ -5174,15 +5436,15 @@ rm -f core conftest.err conftest.$ac_obj
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking i386/ioctl_meteor.h presence" >&5
-echo $ECHO_N "checking i386/ioctl_meteor.h presence... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking machine/ioctl_bt848.h presence" >&5
+echo $ECHO_N "checking machine/ioctl_bt848.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <i386/ioctl_meteor.h>
+#include <machine/ioctl_bt848.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
@@ -5215,43 +5477,44 @@ echo "${ECHO_T}$ac_header_preproc" >&6;
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: i386/ioctl_meteor.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: i386/ioctl_meteor.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: i386/ioctl_meteor.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: i386/ioctl_meteor.h: proceeding with the compiler's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: machine/ioctl_bt848.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: machine/ioctl_bt848.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: machine/ioctl_bt848.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: machine/ioctl_bt848.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: i386/ioctl_meteor.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: i386/ioctl_meteor.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: i386/ioctl_meteor.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: i386/ioctl_meteor.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: i386/ioctl_meteor.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: i386/ioctl_meteor.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: i386/ioctl_meteor.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: i386/ioctl_meteor.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: i386/ioctl_meteor.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: i386/ioctl_meteor.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: i386/ioctl_meteor.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: i386/ioctl_meteor.h: in the future, the compiler will take precedence" >&2;}
+ { echo "$as_me:$LINENO: WARNING: machine/ioctl_bt848.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: machine/ioctl_bt848.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: machine/ioctl_bt848.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: machine/ioctl_bt848.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: machine/ioctl_bt848.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: machine/ioctl_bt848.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: machine/ioctl_bt848.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: machine/ioctl_bt848.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: machine/ioctl_bt848.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: machine/ioctl_bt848.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: machine/ioctl_bt848.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: machine/ioctl_bt848.h: in the future, the compiler will take precedence" >&2;}
;;
esac
-{ echo "$as_me:$LINENO: checking for i386/ioctl_meteor.h" >&5
-echo $ECHO_N "checking for i386/ioctl_meteor.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_i386_ioctl_meteor_h+set}" = set; then
+{ echo "$as_me:$LINENO: checking for machine/ioctl_bt848.h" >&5
+echo $ECHO_N "checking for machine/ioctl_bt848.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_machine_ioctl_bt848_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_header_i386_ioctl_meteor_h=$ac_header_preproc
+ ac_cv_header_machine_ioctl_bt848_h=$ac_header_preproc
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_i386_ioctl_meteor_h" >&5
-echo "${ECHO_T}$ac_cv_header_i386_ioctl_meteor_h" >&6; }
+{ echo "$as_me:$LINENO: result: $ac_cv_header_machine_ioctl_bt848_h" >&5
+echo "${ECHO_T}$ac_cv_header_machine_ioctl_bt848_h" >&6; }
fi
-if test $ac_cv_header_i386_ioctl_meteor_h = yes; then
+if test $ac_cv_header_machine_ioctl_bt848_h = yes; then
BSDVIDEOHDR=1
fi
-
+fi
+# old path - end
if test "${ac_cv_header_dev_ic_bt8xx_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for dev/ic/bt8xx.h" >&5
--- plugins/vidinput_bsd/vidinput_bsd.h.orig 2009-03-18 05:43:35.000000000 +0200
+++ plugins/vidinput_bsd/vidinput_bsd.h 2009-05-02 18:05:14.000000000 +0200
@@ -17,8 +17,10 @@
#include <sys/param.h>
# if __FreeBSD_version >= 502100
#include <dev/bktr/ioctl_meteor.h>
+#include <dev/bktr/ioctl_bt848.h>
# else
#include <machine/ioctl_meteor.h>
+#include <machine/ioctl_bt848.h>
# endif
#endif
--- ./src/ptlib/common/osutils.cxx.orig 2009-02-14 22:04:50.000000000 +0100
+++ ./src/ptlib/common/osutils.cxx 2009-02-14 22:04:55.000000000 +0100
@@ -1548,7 +1548,7 @@
, m_library(false)
{
activeThreads.DisallowDeleteObjects();
- activeThreads.SetAt((PINDEX)GetCurrentThreadId(), this);
+ activeThreads.SetAt((unsigned long)GetCurrentThreadId(), this);
PProcessInstance = this;
@@ -1912,7 +1912,7 @@
PProcess & process = PProcess::Current();
process.activeThreadMutex.Wait();
- PThread * thread = process.activeThreads.GetAt((unsigned)GetCurrentThreadId());
+ PThread * thread = process.activeThreads.GetAt((unsigned long)GetCurrentThreadId());
process.activeThreadMutex.Signal();
if (thread == NULL)
@@ -2152,21 +2152,21 @@
PReadWriteMutex::Nest * PReadWriteMutex::GetNest() const
{
PWaitAndSignal mutex(nestingMutex);
- return nestedThreads.GetAt(POrdinalKey((PINDEX)PThread::GetCurrentThreadId()));
+ return nestedThreads.GetAt(POrdinalKey((unsigned long)PThread::GetCurrentThreadId()));
}
void PReadWriteMutex::EndNest()
{
nestingMutex.Wait();
- nestedThreads.RemoveAt(POrdinalKey((PINDEX)PThread::GetCurrentThreadId()));
+ nestedThreads.RemoveAt(POrdinalKey((unsigned long)PThread::GetCurrentThreadId()));
nestingMutex.Signal();
}
PReadWriteMutex::Nest & PReadWriteMutex::StartNest()
{
- POrdinalKey threadId = (PINDEX)PThread::GetCurrentThreadId();
+ POrdinalKey threadId = (unsigned long)PThread::GetCurrentThreadId();
nestingMutex.Wait();
--- src/ptlib/unix/config.cxx.orig 2009-05-02 05:54:30.000000000 +0200
+++ src/ptlib/unix/config.cxx 2009-05-02 05:54:37.000000000 +0200
@@ -49,9 +49,7 @@
#define EXTENSION ".ini"
#define ENVIRONMENT_CONFIG_STR "/\~~environment~~\/"
-#ifdef P_MACOSX
#define environ (NULL)
-#endif
//
// a single key/value pair
--- ./src/ptlib/unix/svcproc.cxx.orig 2009-02-14 22:03:27.000000000 +0100
+++ ./src/ptlib/unix/svcproc.cxx 2009-02-14 22:03:32.000000000 +0100
@@ -165,7 +165,7 @@
#elif defined(BE_THREADS)
thread_id tid = ::find_thread(NULL);
#else
- unsigned tid = (unsigned) pthread_self();
+ unsigned long tid = (unsigned long)pthread_self();
#endif
*out << "ThreadID=0x"
<< setfill('0') << ::hex
@@ -719,12 +719,12 @@
#elif defined(BE_THREADS)
thread_id tid = ::find_thread(NULL);
#else
- unsigned tid = (unsigned) pthread_self();
+ unsigned long tid = (unsigned long)pthread_self();
#endif
PThread * thread_ptr = activeThreads.GetAt(tid);
char msg[200];
- sprintf(msg, "\nCaught %s, thread_id=%u", sigmsg, tid);
+ sprintf(msg, "\nCaught %s, thread_id=%lu", sigmsg, tid);
if (thread_ptr != NULL) {
PString thread_name = thread_ptr->GetThreadName();
--- ./src/ptlib/unix/tlib.cxx.orig 2009-02-14 22:02:51.000000000 +0100
+++ ./src/ptlib/unix/tlib.cxx 2009-02-14 22:03:09.000000000 +0100
@@ -400,7 +400,7 @@
{
if (PProcessInstance != NULL) {
PWaitAndSignal m(PProcessInstance->activeThreadMutex);
- PThread & thread = PProcessInstance->activeThreads[(unsigned)id];
+ PThread & thread = PProcessInstance->activeThreads[(unsigned long)id];
return thread.GetThreadName();
}
return psprintf("%08x", id);
--- ./src/ptlib/unix/tlibthrd.cxx.orig 2009-02-14 22:04:11.000000000 +0100
+++ ./src/ptlib/unix/tlibthrd.cxx 2009-02-14 22:04:18.000000000 +0100
@@ -240,7 +240,7 @@
{
PWaitAndSignal m(activeThreadMutex);
- if (!activeThreads.Contains((unsigned)id))
+ if (!activeThreads.Contains((unsigned long)id))
return PFalse;
return pthread_kill(id, sig) == 0;
@@ -249,8 +249,8 @@
void PProcess::PXSetThread(pthread_t id, PThread * thread)
{
activeThreadMutex.Wait();
- PThread * currentThread = activeThreads.GetAt((PINDEX)id);
- activeThreads.SetAt((PINDEX)id, thread);
+ PThread * currentThread = activeThreads.GetAt((unsigned long)id);
+ activeThreads.SetAt((unsigned long)id, thread);
activeThreadMutex.Signal();
if (currentThread != NULL)
@@ -891,7 +891,7 @@
}
// remove this thread from the active thread list
- process.activeThreads.SetAt((unsigned)id, NULL);
+ process.activeThreads.SetAt((unsigned long)id, NULL);
bool deleteThread = thread->autoDelete; // Get flag before releasing lock
--- src/ptclib/vsdl.cxx.orig 2008-09-25 14:50:57.000000000 +0800
+++ src/ptclib/vsdl.cxx 2008-09-25 14:51:48.000000000 +0800
@@ -44,7 +44,7 @@
extern "C" {
#if defined(P_FREEBSD)
-#include <SDL11/SDL.h>
+#include <SDL/SDL.h>
#else
#include <SDL/SDL.h>
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
