Re: [GnomeMeeting-devel-list] [BETA9] the "soft again" release
- From: PUYDT Julien <julien puydt laposte net>
- To: GnomeMeeting Devel Liste <gnomemeeting-devel-list gnome org>
- Cc: Kilian Krause <kk kilian ath cx>
- Subject: Re: [GnomeMeeting-devel-list] [BETA9] the "soft again" release
- Date: 14 Aug 2003 21:48:11 +0200
Le jeu 14/08/2003 à 21:24, PUYDT Julien a écrit :
> Try with this patched pwlib.patch...
And with this one?
Snark
diff -ur pwlib-20030811.CVS/configure.in pwlib-20030811.CVS.patched/configure.in
--- pwlib-20030811.CVS/configure.in 2003-08-05 17:49:43.000000000 +0200
+++ pwlib-20030811.CVS.patched/configure.in 2003-08-14 21:34:03.000000000 +0200
@@ -283,6 +283,90 @@
AC_MSG_ERROR([***You can currently not compile DC and AVC Firewire camera support at the same time.])
fi
+dnl #########################################################################
+dnl Did the user want to enable plugins?
+dnl #########################################################################
+plugins="no"
+AC_MSG_CHECKING(if plugins support needs to be compiled)
+AC_ARG_ENABLE(plugins,
+ [ --enable-plugins enable plugins' support in PWLIB],
+ plugins="yes")
+
+if test "${plugins}" = "yes" ; then
+ AC_DEFINE(TRY_PLUGINS, 1, "Plugins enabled")
+ AC_SUBST(TRY_PLUGINS, 1)
+ AC_MSG_RESULT(yes)
+ AC_MSG_CHECKING(which plugins to compile)
+ AC_ARG_WITH(plugins,
+ [ --with-plugins=<list> the list (comma-separated) of plugins to try to compile ]
+ [ 'all' compiles all plugins (default);]
+ [ currently available plugins: v4l avc oss alsa],
+ plugins="$withval", plugins="all")
+
+ if test "$plugins" = "all"; then
+ plugins="v4l, avc, oss, alsa"
+ fi
+ if test "$plugins" = "yes"; then
+ plugins=""
+ AC_MSG_RESULT(none)
+ fi
+
+ plugins=`echo $plugins | sed 's/,/ /g'`
+ AC_MSG_RESULT($plugins)
+ for plugin in $plugins
+ do
+ case "$plugin" in
+ v4l)
+ AC_CHECK_HEADER(linux/videodev.h, V4LHDR=1)
+ AC_MSG_CHECKING(the v4l plugin dependancies)
+ if test "${V4LHDR:-unset}" != "unset"; then
+ AC_SUBST(HAS_V4L, 1)
+ AC_MSG_RESULT(good)
+ else
+ AC_MSG_RESULT(bad)
+ fi
+ ;;
+ avc)
+ AC_CHECK_HEADER(libavc1394/avc1394.h, AVC1394HDR=1)
+ AC_CHECK_HEADER(libdv/dv.h, DVHDR=1)
+ AC_CHECK_HEADER(libraw1394/raw1394.h, RAW1394HDR=1)
+ AC_MSG_CHECKING(the avc plugin dependancies)
+ if test "${AVC1394HDR:-unset}" != "unset" -a ${DVHDR:-unset} != "unset" -a "${RAW1394HDR:-unset}" != "unset"; then
+ AC_SUBST(HAS_AVC1394, 1)
+ AC_MSG_RESULT(good)
+ else
+ AC_MSG_RESULT(bad)
+ fi
+ ;;
+ oss)
+ AC_CHECK_HEADER(sys/soundcard.h, SNDCARDHDR=1)
+ AC_MSG_CHECKING(the oss plugin dependancies)
+ if test "${SNDCARDHDR:-unset}" != "unset"; then
+ AC_SUBST(HAS_OSS, 1)
+ AC_MSG_RESULT(good)
+ else
+ AC_MSG_RESULT(bad)
+ fi
+ ;;
+ alsa)
+ AC_CHECK_HEADER(alsa/asoundlib.h, ALSAHDR=1)
+ AC_MSG_CHECKING(the alsa plugin dependancies)
+ if test "${ALSAHDR:-unset}" != "unset"; then
+ AC_SUBST(HAS_ALSA, 1)
+ AC_MSG_RESULT(good)
+ else
+ AC_MSG_RESULT(bad)
+ fi
+ ;;
+ *)
+ ;;
+ esac
+ done
+
+else
+ AC_SUBST(TRY_PLUGINS, 0)
+ AC_MSG_RESULT(no)
+fi
dnl ########################################################################
dnl look for DNS resolver code (must be done before OpenLDAP)
@@ -601,6 +685,7 @@
dnl ########################################################################
dnl output header file
+AC_CONFIG_FILES(include/ptbuildopts.h.in)
AC_CONFIG_HEADERS(include/ptbuildopts.h)
AC_OUTPUT()
diff -ur pwlib-20030811.CVS/include/ptbuildopts.h.in pwlib-20030811.CVS.patched/include/ptbuildopts.h.in
--- pwlib-20030811.CVS/include/ptbuildopts.h.in 2003-07-29 13:25:23.000000000 +0200
+++ pwlib-20030811.CVS.patched/include/ptbuildopts.h.in 2003-08-14 21:34:03.000000000 +0200
@@ -273,6 +273,14 @@
#undef TRY_1394AVC
#undef TRY_1394DC
+/////////////////////////////////////////////////
+//
+// Plugins
+//
+
+#undef TRY_PLUGINS
+#define SYSPLUGINDIR "@INSTALLPREFIX@/lib/pwlib"
+
/////////////////////////////////////////////////
//
diff -ur pwlib-20030811.CVS/include/ptlib/sound.h pwlib-20030811.CVS.patched/include/ptlib/sound.h
--- pwlib-20030811.CVS/include/ptlib/sound.h 2002-09-16 03:08:59.000000000 +0200
+++ pwlib-20030811.CVS.patched/include/ptlib/sound.h 2003-08-14 21:34:03.000000000 +0200
@@ -290,7 +290,7 @@
);
//
- ~PSoundChannel();
+ virtual ~PSoundChannel();
// Destroy and close the sound driver
//@}
@@ -327,7 +327,7 @@
@return
TRUE if the sound device is valid for playing/recording.
*/
- BOOL Open(
+ virtual BOOL Open(
const PString & device, /// Name of sound driver/device
Directions dir, /// Sound I/O direction
unsigned numChannels = 1, /// Number of channels eg mono/stereo
@@ -340,7 +340,7 @@
@return
TRUE if the sound has successfully been aborted.
*/
- BOOL Abort();
+ virtual BOOL Abort();
//@}
/** name Channel set up functions */
@@ -354,20 +354,20 @@
@return
TRUE if the format is valid.
*/
- BOOL SetFormat(
+ virtual BOOL SetFormat(
unsigned numChannels = 1, /// Number of channels eg mono/stereo
unsigned sampleRate = 8000, /// Samples per second
unsigned bitsPerSample = 16 /// Number of bits per sample
);
/// Get the number of channels (mono/stereo) in the sound.
- unsigned GetChannels() const;
+ virtual unsigned GetChannels() const;
/// Get the sample rate in samples per second.
- unsigned GetSampleRate() const;
+ virtual unsigned GetSampleRate() const;
/// Get the sample size in bits per sample.
- unsigned GetSampleSize() const;
+ virtual unsigned GetSampleSize() const;
/**Set the internal buffers for the sound channel I/O.
@@ -377,7 +377,7 @@
@return
TRUE if the sound device is valid for playing/recording.
*/
- BOOL SetBuffers(
+ virtual BOOL SetBuffers(
PINDEX size, /// Size of each buffer
PINDEX count = 2 /// Number of buffers
);
@@ -387,7 +387,7 @@
@return
TRUE if the buffer size were obtained.
*/
- BOOL GetBuffers(
+ virtual BOOL GetBuffers(
PINDEX & size, // Size of each buffer
PINDEX & count // Number of buffers
);
@@ -402,7 +402,7 @@
@return
TRUE if there were no errors.
*/
- BOOL SetVolume(
+ virtual BOOL SetVolume(
unsigned volume /// New volume level
);
@@ -412,7 +412,7 @@
@return
TRUE if there were no errors.
*/
- BOOL GetVolume(
+ virtual BOOL GetVolume(
unsigned & volume /// Variable to receive volume level.
);
//@}
@@ -435,7 +435,7 @@
TRUE if the sound is playing or has played.
*/
- BOOL PlaySound(
+ virtual BOOL PlaySound(
const PSound & sound, /// Sound to play.
BOOL wait = TRUE /// Flag to play sound synchronously.
);
@@ -454,7 +454,7 @@
@return
TRUE if the sound is playing or has played.
*/
- BOOL PlayFile(
+ virtual BOOL PlayFile(
const PFilePath & file, /// Sound file to play.
BOOL wait = TRUE /// Flag to play sound synchronously.
);
@@ -465,7 +465,7 @@
@return
TRUE if the sound has completed playing.
*/
- BOOL HasPlayCompleted();
+ virtual BOOL HasPlayCompleted();
/**Block the thread until the sound play begun with PlayBuffer() or
PlayFile() has completed.
@@ -473,7 +473,7 @@
@return
TRUE if the sound has successfully completed playing.
*/
- BOOL WaitForPlayCompletion();
+ virtual BOOL WaitForPlayCompletion();
//@}
@@ -496,7 +496,7 @@
@return
TRUE if the sound has been recorded.
*/
- BOOL RecordSound(
+ virtual BOOL RecordSound(
PSound & sound /// Sound recorded
);
@@ -512,7 +512,7 @@
@return
TRUE if the sound has been recorded.
*/
- BOOL RecordFile(
+ virtual BOOL RecordFile(
const PFilePath & file /// Sound file recorded
);
@@ -522,7 +522,7 @@
@return
TRUE if the sound driver has successfully started recording.
*/
- BOOL StartRecording();
+ virtual BOOL StartRecording();
/**Determine if a record buffer has been filled, so that the next Read()
call will not block. Provided that the amount of data read is less than
@@ -531,7 +531,7 @@
@return
TRUE if the sound driver has filled a buffer.
*/
- BOOL IsRecordBufferFull();
+ virtual BOOL IsRecordBufferFull();
/**Determine if all of the record buffer allocated has been filled. There
is an implicit Abort() of the recording if this occurs and recording is
@@ -541,7 +541,7 @@
@return
TRUE if the sound driver has filled a buffer.
*/
- BOOL AreAllRecordBuffersFull();
+ virtual BOOL AreAllRecordBuffersFull();
/**Block the thread until a record buffer has been filled, so that the
next Read() call will not block. Provided that the amount of data read
@@ -550,7 +550,7 @@
@return
TRUE if the sound driver has filled a buffer.
*/
- BOOL WaitForRecordBufferFull();
+ virtual BOOL WaitForRecordBufferFull();
/**Block the thread until all of the record buffer allocated has been
filled. There is an implicit Abort() of the recording if this occurs
@@ -560,7 +560,7 @@
@return
TRUE if the sound driver has filled a buffer.
*/
- BOOL WaitForAllRecordBuffersFull();
+ virtual BOOL WaitForAllRecordBuffersFull();
//@}
diff -ur pwlib-20030811.CVS/make/ptbuildopts.mak.in pwlib-20030811.CVS.patched/make/ptbuildopts.mak.in
--- pwlib-20030811.CVS/make/ptbuildopts.mak.in 2003-07-25 00:01:42.000000000 +0200
+++ pwlib-20030811.CVS.patched/make/ptbuildopts.mak.in 2003-08-14 21:34:03.000000000 +0200
@@ -20,6 +20,11 @@
HAS_SDL = @HAS_SDL@
TRY_1394AVC = @TRY_1394AVC@
TRY_1394DC = @TRY_1394DC@
+TRY_PLUGINS = @TRY_PLUGINS@
+HAS_V4L = @HAS_V4L@
+HAS_AVC1394 = @HAS_AVC1394@
+HAS_OSS = @HAS_OSS@
+HAS_ALSA = @HAS_ALSA@
SHAREDLIBEXT = @SHAREDLIBEXT@
diff -ur pwlib-20030811.CVS/Makefile.in pwlib-20030811.CVS.patched/Makefile.in
--- pwlib-20030811.CVS/Makefile.in 2003-07-29 13:22:17.000000000 +0200
+++ pwlib-20030811.CVS.patched/Makefile.in 2003-08-14 21:36:51.000000000 +0200
@@ -156,6 +156,9 @@
SUBDIRS := src/ptlib/$(TARGETDIR)
SUBDIRS += tools/asnparser
+ifeq (1, $(TRY_PLUGINS))
+SUBDIRS += plugins
+endif
# override P_SHAREDLIB for specific targets
optshared debugshared bothshared :: P_SHAREDLIB=1
@@ -178,7 +181,11 @@
install:
mkdir -p $(PREFIX)/include
mkdir -p $(PREFIX)/bin
+ifeq ($(TRY_PLUGINS), 1)
+ mkdir -p $(LIBDIR)/pwlib
+else
mkdir -p $(LIBDIR)
+endif
mkdir -p $(PREFIX)/share/pwlib
chmod a+r lib/* SHAREDLIBEXT@*
cp -df lib/* SHAREDLIBEXT@* $(LIBDIR)/
@@ -187,6 +194,9 @@
cp -rf include/ptbuildopts.h $(PREFIX)/include/
cp -rf include/ptlib.h $(PREFIX)/include/
cp tools/asnparser/obj*/asnparser $(PREFIX)/bin/
+ifeq ($(TRY_PLUGINS), 1)
+ cp -rf plugins/lib/*/*.so $(LIBDIR)/pwlib/
+endif
mkdir -p $(PREFIX)/share/pwlib/make/
cp -rf make/*.mak $(PREFIX)/share/pwlib/make/
cp make/ptlib-config $(PREFIX)/bin/
diff -ur pwlib-20030811.CVS/src/ptlib/unix/Makefile pwlib-20030811.CVS.patched/src/ptlib/unix/Makefile
--- pwlib-20030811.CVS/src/ptlib/unix/Makefile 2003-07-28 20:44:01.000000000 +0200
+++ pwlib-20030811.CVS.patched/src/ptlib/unix/Makefile 2003-08-14 21:34:03.000000000 +0200
@@ -528,6 +528,12 @@
SOUND_SOURCE = qsa.cxx
endif
+ifeq ($(TRY_PLUGINS), 1)
+PLUGINS_SOURCE = $(COMMON_SRC_DIR)/plugins_pdynalink.cxx
+else
+PLUGINS_SOURCE =
+endif
+
ifeq (1,$(HAS_EXPAT))
PXML_SOURCE = $(COMPONENT_SRC_DIR)/pxml.cxx \
$(COMPONENT_SRC_DIR)/pxmlrpc.cxx \
@@ -576,6 +582,7 @@
$(LDAP_SOURCE) \
$(VIDEO_SOURCE) \
$(SOUND_SOURCE) \
+ $(PLUGINS_SOURCE) \
$(GETDATE_SOURCE) \
$(PXML_SOURCE) \
uicmp.cxx \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
