diff options
author | Stefan Schweizer <genstef@gentoo.org> | 2007-04-14 08:16:57 +0000 |
---|---|---|
committer | Stefan Schweizer <genstef@gentoo.org> | 2007-04-14 08:16:57 +0000 |
commit | 703f3eed8377cb123f780563cfd6ee1970777aaf (patch) | |
tree | 9f73d9cd6cfd795e7e9ac7995c4074107446487c /dev-libs/pwlib/files | |
parent | remove old (diff) | |
download | historical-703f3eed8377cb123f780563cfd6ee1970777aaf.tar.gz historical-703f3eed8377cb123f780563cfd6ee1970777aaf.tar.bz2 historical-703f3eed8377cb123f780563cfd6ee1970777aaf.zip |
remove old
Package-Manager: portage-2.1.2.3
Diffstat (limited to 'dev-libs/pwlib/files')
-rw-r--r-- | dev-libs/pwlib/files/digest-pwlib-1.10.0 | 3 | ||||
-rw-r--r-- | dev-libs/pwlib/files/digest-pwlib-1.10.1 | 3 | ||||
-rw-r--r-- | dev-libs/pwlib/files/digest-pwlib-1.10.2 | 3 | ||||
-rw-r--r-- | dev-libs/pwlib/files/digest-pwlib-1.10.2-r1 | 3 | ||||
-rw-r--r-- | dev-libs/pwlib/files/digest-pwlib-1.10.4 | 3 | ||||
-rw-r--r-- | dev-libs/pwlib/files/digest-pwlib-1.6.3-r3 | 3 | ||||
-rw-r--r-- | dev-libs/pwlib/files/digest-pwlib-1.6.6-r2 | 3 | ||||
-rw-r--r-- | dev-libs/pwlib/files/digest-pwlib-1.8.3-r1 | 3 | ||||
-rw-r--r-- | dev-libs/pwlib/files/digest-pwlib-1.8.4 | 3 | ||||
-rw-r--r-- | dev-libs/pwlib/files/digest-pwlib-1.8.7 | 3 | ||||
-rw-r--r-- | dev-libs/pwlib/files/pwlib-1.6.3-dyn-esd.patch | 11 | ||||
-rw-r--r-- | dev-libs/pwlib/files/pwlib-1.6.6-alsa_dmix.diff | 259 | ||||
-rw-r--r-- | dev-libs/pwlib/files/pwlib-1.6.6-ieee1394dc-fix.diff | 197 | ||||
-rw-r--r-- | dev-libs/pwlib/files/pwlib-1.8.4-gcc4.diff | 46 | ||||
-rw-r--r-- | dev-libs/pwlib/files/pwlib-1.8.7-gcc-4.1-v4l2.patch | 11 | ||||
-rw-r--r-- | dev-libs/pwlib/files/pwlib-1.8.7-gcc41.patch | 38 |
16 files changed, 0 insertions, 592 deletions
diff --git a/dev-libs/pwlib/files/digest-pwlib-1.10.0 b/dev-libs/pwlib/files/digest-pwlib-1.10.0 deleted file mode 100644 index 405b316bcac2..000000000000 --- a/dev-libs/pwlib/files/digest-pwlib-1.10.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 97da19588bdc25cd8b48afb135eded1d pwlib-1.10.0.tar.gz 1480233 -RMD160 5341a4d21996472665032b3cfcc184f04435ddab pwlib-1.10.0.tar.gz 1480233 -SHA256 3bcbb47600061b6872215fbc68e7f04566a93bc602fa008636c85d47be5f5c00 pwlib-1.10.0.tar.gz 1480233 diff --git a/dev-libs/pwlib/files/digest-pwlib-1.10.1 b/dev-libs/pwlib/files/digest-pwlib-1.10.1 deleted file mode 100644 index aa6a792d3c1e..000000000000 --- a/dev-libs/pwlib/files/digest-pwlib-1.10.1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 51414920d7b21125df2bf6870c0fc2e4 pwlib-1.10.1.tar.gz 1485094 -RMD160 860ce13ea7df77723c5697691602be4fe9087b5d pwlib-1.10.1.tar.gz 1485094 -SHA256 c7356f43f13995ece66e0becf84e38932b2e9f7a238b07f345c5b8fac6f823e3 pwlib-1.10.1.tar.gz 1485094 diff --git a/dev-libs/pwlib/files/digest-pwlib-1.10.2 b/dev-libs/pwlib/files/digest-pwlib-1.10.2 deleted file mode 100644 index 08b9c85b04b3..000000000000 --- a/dev-libs/pwlib/files/digest-pwlib-1.10.2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 05ad5b279ed2053eb7ef0befff9166d0 pwlib-1.10.2.tar.gz 1485529 -RMD160 d0af8b73131773eb95bd89bf03e024ba861f7982 pwlib-1.10.2.tar.gz 1485529 -SHA256 a2981bee47971405098d39e9d518dcaeea84ccf9b49d46c2f8c35a84a8338e61 pwlib-1.10.2.tar.gz 1485529 diff --git a/dev-libs/pwlib/files/digest-pwlib-1.10.2-r1 b/dev-libs/pwlib/files/digest-pwlib-1.10.2-r1 deleted file mode 100644 index 08b9c85b04b3..000000000000 --- a/dev-libs/pwlib/files/digest-pwlib-1.10.2-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 05ad5b279ed2053eb7ef0befff9166d0 pwlib-1.10.2.tar.gz 1485529 -RMD160 d0af8b73131773eb95bd89bf03e024ba861f7982 pwlib-1.10.2.tar.gz 1485529 -SHA256 a2981bee47971405098d39e9d518dcaeea84ccf9b49d46c2f8c35a84a8338e61 pwlib-1.10.2.tar.gz 1485529 diff --git a/dev-libs/pwlib/files/digest-pwlib-1.10.4 b/dev-libs/pwlib/files/digest-pwlib-1.10.4 deleted file mode 100644 index f573b78d338f..000000000000 --- a/dev-libs/pwlib/files/digest-pwlib-1.10.4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 a9b71fec93079ff15374b26db71defab pwlib-1.10.4.tar.gz 2047300 -RMD160 7f1326d6ac1ef17306cd233241151f924fa218bb pwlib-1.10.4.tar.gz 2047300 -SHA256 33a368df5a9156401a8a5190ebd5a6aac489ab2dae3eec1ff6f442f59681dd3d pwlib-1.10.4.tar.gz 2047300 diff --git a/dev-libs/pwlib/files/digest-pwlib-1.6.3-r3 b/dev-libs/pwlib/files/digest-pwlib-1.6.3-r3 deleted file mode 100644 index 683a25073422..000000000000 --- a/dev-libs/pwlib/files/digest-pwlib-1.6.3-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c190324ded05c349cf50b0d37fe0c8a1 pwlib-1.6.3.tar.gz 1158037 -RMD160 a8f52e7825106475ad23a312e38e7ab8ebcc929b pwlib-1.6.3.tar.gz 1158037 -SHA256 c371238a4719c9fe53bf6b1a89f490fdc6b5ea834c610b88f7e944c681179d03 pwlib-1.6.3.tar.gz 1158037 diff --git a/dev-libs/pwlib/files/digest-pwlib-1.6.6-r2 b/dev-libs/pwlib/files/digest-pwlib-1.6.6-r2 deleted file mode 100644 index 0f8f9298ebea..000000000000 --- a/dev-libs/pwlib/files/digest-pwlib-1.6.6-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c3ae07b03cd48d57cd9d6ec346182ed4 pwlib-v1_6_6-src.tar.gz 1583087 -RMD160 b090e96c53dbdc8dc16609af88cbfbb847851b5e pwlib-v1_6_6-src.tar.gz 1583087 -SHA256 9033dab99896900c738d5d0b4761ecbbae42de81f11cec7761cee7cf399a9e22 pwlib-v1_6_6-src.tar.gz 1583087 diff --git a/dev-libs/pwlib/files/digest-pwlib-1.8.3-r1 b/dev-libs/pwlib/files/digest-pwlib-1.8.3-r1 deleted file mode 100644 index 5fa190c1257f..000000000000 --- a/dev-libs/pwlib/files/digest-pwlib-1.8.3-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 082e0ca640c3dd81c637b6d6a3c9b4b3 pwlib-v1_8_3-src-tar.gz 1900922 -RMD160 1ce2544ef631c8344543e62988f97022c998bb05 pwlib-v1_8_3-src-tar.gz 1900922 -SHA256 0b6b1409b021a67cc2cbf6aad2ccb2b9a074119cd58c2d8af44d0cc7f93ef34e pwlib-v1_8_3-src-tar.gz 1900922 diff --git a/dev-libs/pwlib/files/digest-pwlib-1.8.4 b/dev-libs/pwlib/files/digest-pwlib-1.8.4 deleted file mode 100644 index 54e0c712389d..000000000000 --- a/dev-libs/pwlib/files/digest-pwlib-1.8.4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 fc638a64216b7751271c539ee4ccd0a8 pwlib-1.8.4.tar.gz 1382438 -RMD160 3848d47d3cb903444759ecf41c5fc4c716fadc8c pwlib-1.8.4.tar.gz 1382438 -SHA256 08f204423cc4112794e6f031ba0b908c0d90cbefb58e83ea7c4b4e55643ebf01 pwlib-1.8.4.tar.gz 1382438 diff --git a/dev-libs/pwlib/files/digest-pwlib-1.8.7 b/dev-libs/pwlib/files/digest-pwlib-1.8.7 deleted file mode 100644 index 9a11033fa691..000000000000 --- a/dev-libs/pwlib/files/digest-pwlib-1.8.7 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ba4fddd6cb8d4420cc18f308ccf48e00 pwlib-1.8.7.tar.gz 1900458 -RMD160 b968571a6ffeb162e4b426e1588c82b490b8d7dc pwlib-1.8.7.tar.gz 1900458 -SHA256 120e95ba090f0c8fa8768e8241b98a711e88973cb625288c2616092061d08ff7 pwlib-1.8.7.tar.gz 1900458 diff --git a/dev-libs/pwlib/files/pwlib-1.6.3-dyn-esd.patch b/dev-libs/pwlib/files/pwlib-1.6.3-dyn-esd.patch deleted file mode 100644 index 638fd78c9536..000000000000 --- a/dev-libs/pwlib/files/pwlib-1.6.3-dyn-esd.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- make/unix.mak 2004-11-16 11:32:34.000000000 +1100 -+++ make/unix.mak.N 2005-07-27 14:12:35.000000000 +1000 -@@ -928,7 +928,7 @@ - # define ESDDIR variables if installed - ifdef ESDDIR - STDCCFLAGS += -I$(ESDDIR)/include -DUSE_ESD=1 --ENDLDLIBS += $(ESDDIR)/lib/libesd.a # to avoid name conflicts -+ENDLDLIBS += -lesd # to avoid name conflicts - HAS_ESD = 1 - endif - diff --git a/dev-libs/pwlib/files/pwlib-1.6.6-alsa_dmix.diff b/dev-libs/pwlib/files/pwlib-1.6.6-alsa_dmix.diff deleted file mode 100644 index 2d1ded99770d..000000000000 --- a/dev-libs/pwlib/files/pwlib-1.6.6-alsa_dmix.diff +++ /dev/null @@ -1,259 +0,0 @@ -diff -ru pwlib-orig/plugins/sound_alsa/sound_alsa.cxx pwlib/plugins/sound_alsa/sound_alsa.cxx ---- pwlib-orig/plugins/sound_alsa/sound_alsa.cxx 2004-03-13 13:36:14.000000000 +0100 -+++ pwlib/plugins/sound_alsa/sound_alsa.cxx 2004-10-21 18:33:38.562610536 +0200 -@@ -28,6 +28,21 @@ - * Contributor(s): / - * - * $Log: sound_alsa.cxx,v $ -+ * Revision 1.21 2004/10/18 11:43:39 dsandras -+ * Use Capture instead of Mic when changing the volume. Use the correct mixer when using the Default device. -+ * -+ * Revision 1.20 2004/10/14 19:30:16 dsandras -+ * Removed DMIX and DSNOOP plugins and added support for DEFAULT as it is the correcti way to do things. -+ * -+ * Revision 1.19 2004/08/30 21:09:41 dsandras -+ * Added DSNOOP plugin support. -+ * -+ * Revision 1.18 2004/05/14 10:15:26 dominance -+ * Fixes direct opening of sound output devices. The list of devices does no longer return NULL in that case. Patch provided by Julien Puydt <julien.puydt@laposte.net>. -+ * -+ * Revision 1.17 2004/04/03 10:33:45 dsandras -+ * Use PStringToOrdinal to store the detected devices, that fixes problems if there is a discontinuity in the succession of soundcard ID's. For example the user has card ID 1 and 3, but not 2. -+ * - * Revision 1.16 2004/03/13 12:36:14 dsandras - * Added support for DMIX plugin output. - * -@@ -81,8 +96,8 @@ - PCREATE_SOUND_PLUGIN(ALSA, PSoundChannelALSA) - - --static PStringArray playback_devices; --static PStringArray capture_devices; -+static PStringToOrdinal playback_devices; -+static PStringToOrdinal capture_devices; - - /////////////////////////////////////////////////////////////////////////////// - -@@ -119,8 +134,9 @@ - } - - --PStringArray PSoundChannelALSA::GetDeviceNames (Directions dir) -+void PSoundChannelALSA::UpdateDictionary (Directions dir) - { -+ - int card = -1, dev = -1; - - snd_ctl_t *handle = NULL; -@@ -134,12 +150,12 @@ - if (dir == Recorder) { - - stream = SND_PCM_STREAM_CAPTURE; -- capture_devices = PStringArray (); -+ capture_devices = PStringToOrdinal (); - } - else { - - stream = SND_PCM_STREAM_PLAYBACK; -- playback_devices = PStringArray (); -+ playback_devices = PStringToOrdinal (); - } - - snd_ctl_card_info_alloca (&info); -@@ -148,7 +164,7 @@ - /* No sound card found */ - if (snd_card_next (&card) < 0 || card < 0) { - -- return PStringArray (); -+ return; - } - - -@@ -176,13 +192,11 @@ - snd_card_get_name (card, &name); - if (dir == Recorder) { - -- if (capture_devices.GetStringsIndex (name) == P_MAX_INDEX) -- capture_devices.AppendString (name); -+ capture_devices.SetAt (name, card); - } - else { - -- if (playback_devices.GetStringsIndex (name) == P_MAX_INDEX) -- playback_devices.AppendString (name); -+ playback_devices.SetAt (name, card); - } - - free (name); -@@ -193,17 +207,27 @@ - snd_ctl_close(handle); - snd_card_next (&card); - } -+} - -- -- if (dir == Recorder) -- return capture_devices; -- else { -+PStringArray PSoundChannelALSA::GetDeviceNames (Directions dir) -+{ -+ PStringArray devices; -+ PStringToOrdinal devices_dict; - -- if (playback_devices.GetSize () > 0) -- playback_devices += "DMIX Plugin"; -+ if (dir == Recorder) -+ devices_dict = capture_devices; -+ else -+ devices_dict = playback_devices; -+ -+ UpdateDictionary (dir); -+ -+ if (devices_dict.GetSize () > 0) -+ devices += "Default"; -+ -+ for (PINDEX j = 0 ; j < devices_dict.GetSize () ; j++) -+ devices += devices_dict.GetKeyAt (j); - -- return playback_devices; -- } -+ return devices; - } - - -@@ -223,7 +247,7 @@ - unsigned _bitsPerSample) - { - PString real_device_name; -- PINDEX i = 0; -+ POrdinalKey *i = NULL; - snd_pcm_stream_t stream; - - Close(); -@@ -236,21 +260,31 @@ - stream = SND_PCM_STREAM_PLAYBACK; - - /* Open in NONBLOCK mode */ -- if (_dir != Recorder && _device == "DMIX Plugin") { -+ if (_device == "Default") { - -- real_device_name = "plug:dmix"; -+ real_device_name = "default"; -+ card_nr = -2; - } -- else if ((i = (_dir == Recorder) ? capture_devices.GetStringsIndex (_device) : playback_devices.GetStringsIndex (_device)) != P_MAX_INDEX) { -+ else { -+ -+ if ((_dir == Recorder && capture_devices.IsEmpty ()) -+ || (_dir == Player && playback_devices.IsEmpty ())) -+ UpdateDictionary (_dir); -+ -+ i = (_dir == Recorder) ? capture_devices.GetAt (_device) : playback_devices.GetAt (_device); - -- real_device_name = "plughw:" + PString (i); -- card_nr = i; -+ if (i) { -+ -+ real_device_name = "plughw:" + PString (*i); -+ card_nr = *i; -+ } -+ else { -+ -+ PTRACE (1, "ALSA\tDevice not found"); -+ return FALSE; -+ } - } -- else { - -- PTRACE (1, "ALSA\tDevice unavailable"); -- return FALSE; -- } -- - if (snd_pcm_open (&os_handle, real_device_name, stream, SND_PCM_NONBLOCK) < 0) { - - PTRACE (1, "ALSA\tOpen Failed"); -@@ -735,7 +769,7 @@ - snd_mixer_elem_t *elem; - snd_mixer_selem_id_t *sid; - -- const char *play_mix_name = (direction == Player) ? "PCM": "Mic"; -+ const char *play_mix_name = (direction == Player) ? "PCM": "Capture"; - PString card_name; - - long pmin = 0, pmax = 0; -@@ -744,7 +778,10 @@ - if (!os_handle) - return FALSE; - -- card_name = "hw:" + PString (card_nr); -+ if (card_nr == -2) -+ card_name = "default"; -+ else -+ card_name = "hw:" + PString (card_nr); - - //allocate simple id - snd_mixer_selem_id_alloca (&sid); -@@ -796,23 +833,39 @@ - return FALSE; - } - -- snd_mixer_selem_get_playback_volume_range (elem, &pmin, &pmax); - - if (set) { -- -- vol = (set_vol * (pmax?pmax:31)) / 100; -- snd_mixer_selem_set_playback_volume (elem, -- SND_MIXER_SCHN_FRONT_LEFT, vol); -- snd_mixer_selem_set_playback_volume (elem, -- SND_MIXER_SCHN_FRONT_RIGHT, vol); - -+ if (direction == Player) { -+ -+ snd_mixer_selem_get_playback_volume_range (elem, &pmin, &pmax); -+ vol = (set_vol * (pmax?pmax:31)) / 100; -+ snd_mixer_selem_set_playback_volume_all (elem, vol); -+ } -+ else { -+ -+ snd_mixer_selem_get_capture_volume_range (elem, &pmin, &pmax); -+ vol = (set_vol * (pmax?pmax:31)) / 100; -+ snd_mixer_selem_set_capture_volume_all (elem, vol); -+ } - PTRACE (4, "Set volume to " << vol); - } - else { - -- snd_mixer_selem_get_playback_volume (elem, -- SND_MIXER_SCHN_FRONT_LEFT, &vol); -+ if (direction == Player) { -+ -+ snd_mixer_selem_get_playback_volume_range (elem, &pmin, &pmax); -+ snd_mixer_selem_get_playback_volume (elem, SND_MIXER_SCHN_FRONT_LEFT, -+ &vol); -+ } -+ else { -+ -+ snd_mixer_selem_get_capture_volume_range (elem, &pmin, &pmax); -+ snd_mixer_selem_get_capture_volume (elem, SND_MIXER_SCHN_FRONT_LEFT, -+ &vol); -+ } - get_vol = (vol * 100) / (pmax?pmax:31); -+ - PTRACE (4, "Got volume " << vol); - } - -Only in pwlib/plugins/sound_alsa: .sound_alsa.cxx-patch.swp -diff -ru pwlib-orig/plugins/sound_alsa/sound_alsa.h pwlib/plugins/sound_alsa/sound_alsa.h ---- pwlib-orig/plugins/sound_alsa/sound_alsa.h 2003-12-28 16:10:35.000000000 +0100 -+++ pwlib/plugins/sound_alsa/sound_alsa.h 2004-10-21 18:35:51.559391952 +0200 -@@ -89,7 +89,8 @@ - BOOL IsOpen() const; - - private: -- -+ -+ static void UpdateDictionary(PSoundChannel::Directions); - BOOL Volume (BOOL, unsigned, unsigned &); - PSoundChannel::Directions direction; - PString device; - diff --git a/dev-libs/pwlib/files/pwlib-1.6.6-ieee1394dc-fix.diff b/dev-libs/pwlib/files/pwlib-1.6.6-ieee1394dc-fix.diff deleted file mode 100644 index 25c9e10383c5..000000000000 --- a/dev-libs/pwlib/files/pwlib-1.6.6-ieee1394dc-fix.diff +++ /dev/null @@ -1,197 +0,0 @@ -=================================================================== -RCS file: /cvsroot/openh323/pwlib/plugins/vidinput_dc/video4dc1394.cxx,v -retrieving revision 1.1 -retrieving revision 1.5 -diff -u -r1.1 -r1.5 ---- openh323/pwlib/plugins/vidinput_dc/video4dc1394.cxx 2003/12/17 15:40:56 1.1 -+++ openh323/pwlib/plugins/vidinput_dc/video4dc1394.cxx 2004/06/15 23:55:50 1.5 -@@ -413,7 +425,7 @@ - else if (supported_framerates & (1U << (31-0))) - framerate = FRAMERATE_1_875; - else { -- PTRACE(1, "No supported frame rate??!!" << supported_framerates); -+ PTRACE(1, "Frame rate " << supported_framerates << " is not supported"); - return FALSE; - } - -@@ -423,7 +435,11 @@ - FORMAT_VGA_NONCOMPRESSED, - dc1394_mode, - P_DC1394_DEFAULT_SPEED, -- framerate, 4, 1, deviceName, -+ framerate, 4, 1, -+#ifdef NEW_DC_API -+ 1, -+#endif -+ deviceName, - &camera)!=DC1394_SUCCESS) || - (!UseDMA && dc1394_setup_capture(handle,camera_nodes[channelNumber], - 0, /* channel of IEEE 1394 */ -=================================================================== -RCS file: /cvsroot/openh323/pwlib/plugins/configure.in,v -retrieving revision 1.6 -retrieving revision 1.7 -diff -u -r1.6 -r1.7 ---- openh323/pwlib/plugins/configure.in 2004/02/04 02:34:38 1.6 -+++ openh323/pwlib/plugins/configure.in 2004/06/15 23:55:50 1.7 -@@ -134,6 +134,35 @@ - if test "${DC1394HDR:-unset}" != "unset" -a ${RAW1394HDR:-unset} != "unset"; then - AC_SUBST(HAS_DC1394, 1) - AC_MSG_RESULT(yes) -+ AC_MSG_CHECKING(if dc1394_dma_setup_capture has 12 parms) -+ AC_COMPILE_IFELSE([[ -+#include "libdc1394/dc1394_control.h" -+int main(int ac,char **av) -+{ -+ raw1394handle_t handle; -+ nodeid_t node; -+ int channel; -+ int format; -+ int mode; -+ int speed; -+ int frame_rate; -+ int num_dma_buffers; -+ int do_extra_buffering; -+ int drop_frames; -+ const char *dma_device_file; -+ dc1394_cameracapture *camera; -+ dc1394_dma_setup_capture(handle, node, channel, format, mode, speed, frame_rate, num_dma_buffers, -+ do_extra_buffering, drop_frames, dma_device_file, camera); -+ return 0; -+} -+]],NEW_DC_API=1, NEW_DC_API=0) -+ if test "$NEW_DC_API" = "1" ; then -+ AC_SUBST(DC_CFLAGS, -DNEW_DC_API) -+ AC_MSG_RESULT(yes) -+ else -+ AC_SUBST(DC_CFLAGS) -+ AC_MSG_RESULT(no) -+ fi - else - AC_MSG_RESULT(no) - fi -@@ -146,5 +175,6 @@ - dnl output header file - - AC_CONFIG_FILES(Makefile) -+AC_CONFIG_FILES(vidinput_dc/Makefile) - - AC_OUTPUT() -=================================================================== -RCS file: /cvsroot/openh323/pwlib/plugins/configure,v -retrieving revision 1.3 -retrieving revision 1.4 -diff -u -r1.3 -r1.4 ---- openh323/pwlib/plugins/configure 2004/02/04 02:34:37 1.3 -+++ openh323/pwlib/plugins/configure 2004/06/15 23:55:50 1.4 -@@ -308,7 +308,7 @@ - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT PWLIBDIR PWINSTDIR INSTALLPREFIX LIBDIR CC CFLAGS ac_ct_CC CPP EGREP HAS_ALSA HAS_OSS HAS_V4L HAS_BSDVIDEOCAP HAS_AVC1394 HAS_DC1394 LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT PWLIBDIR PWINSTDIR INSTALLPREFIX LIBDIR CC CFLAGS ac_ct_CC CPP EGREP HAS_ALSA HAS_OSS HAS_V4L HAS_BSDVIDEOCAP HAS_AVC1394 HAS_DC1394 DC_CFLAGS LIBOBJS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -4567,6 +4567,61 @@ - - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 -+ echo "$as_me:$LINENO: checking if dc1394_dma_setup_capture has 12 parms" >&5 -+echo $ECHO_N "checking if dc1394_dma_setup_capture has 12 parms... $ECHO_C" >&6 -+ cat >conftest.$ac_ext <<_ACEOF -+ -+#include "libdc1394/dc1394_control.h" -+int main(int ac,char **av) -+{ -+ raw1394handle_t handle; -+ nodeid_t node; -+ int channel; -+ int format; -+ int mode; -+ int speed; -+ int frame_rate; -+ int num_dma_buffers; -+ int do_extra_buffering; -+ int drop_frames; -+ const char *dma_device_file; -+ dc1394_cameracapture *camera; -+ dc1394_dma_setup_capture(handle, node, channel, format, mode, speed, frame_rate, num_dma_buffers, -+ do_extra_buffering, drop_frames, dma_device_file, camera); -+ return 0; -+} -+ -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ NEW_DC_API=1 -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+NEW_DC_API=0 -+fi -+rm -f conftest.$ac_objext conftest.$ac_ext -+ if test "$NEW_DC_API" = "1" ; then -+ DC_CFLAGS=-DNEW_DC_API -+ -+ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 -+ else -+ -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+ fi - else - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 -@@ -4578,6 +4633,8 @@ - - ac_config_files="$ac_config_files Makefile" - -+ ac_config_files="$ac_config_files vidinput_dc/Makefile" -+ - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -5129,6 +5186,7 @@ - case "$ac_config_target" in - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; -+ "vidinput_dc/Makefile" ) CONFIG_FILES="$CONFIG_FILES vidinput_dc/Makefile" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 - echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; -@@ -5234,6 +5292,7 @@ - s,@HAS_BSDVIDEOCAP@,$HAS_BSDVIDEOCAP,;t t - s,@HAS_AVC1394@,$HAS_AVC1394,;t t - s,@HAS_DC1394@,$HAS_DC1394,;t t -+s,@DC_CFLAGS@,$DC_CFLAGS,;t t - s,@LIBOBJS@,$LIBOBJS,;t t - s,@LTLIBOBJS@,$LTLIBOBJS,;t t - CEOF ---- openh323/pwlib/plugins/vidinput_dc/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ openh323/pwlib/plugins/vidinput_dc/Makefile.in 2004-08-30 03:08:49.095486368 +0200 -@@ -0,0 +1,12 @@ -+ifndef PWLIBDIR -+PWLIBDIR = $(HOME)/pwlib -+endif -+ -+PLUGIN_NAME = dc -+PLUGIN_FAMILY = device/videoinput -+PLUGIN_LIBS = -lraw1394 -ldv -ldc1394_control -+PLUGIN_SOURCES = video4dc1394.cxx -+ -+CFLAGS = @DC_CFLAGS@ -+ -+include ../../make/plugins.mak diff --git a/dev-libs/pwlib/files/pwlib-1.8.4-gcc4.diff b/dev-libs/pwlib/files/pwlib-1.8.4-gcc4.diff deleted file mode 100644 index e15465854342..000000000000 --- a/dev-libs/pwlib/files/pwlib-1.8.4-gcc4.diff +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur pwlib-1.8.4/include/ptlib/pprocess.h pwlib-1.8.4-gcc4/include/ptlib/pprocess.h ---- pwlib-1.8.4/include/ptlib/pprocess.h 2004-06-30 14:17:04.000000000 +0200 -+++ pwlib-1.8.4-gcc4/include/ptlib/pprocess.h 2005-09-06 15:06:16.032949750 +0200 -@@ -249,6 +249,7 @@ - #include <ptlib/syncpoint.h> - #include <ptlib/pfactory.h> - -+class PHouseKeepingThread; - - /**Create a process. - This macro is used to create the components necessary for a user PWLib -@@ -752,10 +753,10 @@ - - PArgList arguments; - // The list of arguments -- -+ public: - PTimerList timers; - // List of active timers in system -- -+ private: - PTime programStartTime; - // time at which process was intantiated, i.e. started - -diff -Naur pwlib-1.8.4/include/ptlib/timer.h pwlib-1.8.4-gcc4/include/ptlib/timer.h ---- pwlib-1.8.4/include/ptlib/timer.h 2003-09-17 11:01:00.000000000 +0200 -+++ pwlib-1.8.4-gcc4/include/ptlib/timer.h 2005-09-06 15:06:16.036950000 +0200 -@@ -123,6 +123,7 @@ - #endif - - class PThread; -+class PTimerList; - - #include <ptlib/notifier.h> - -diff -Naur pwlib-1.8.4/include/ptlib/unix/ptlib/pprocess.h pwlib-1.8.4-gcc4/include/ptlib/unix/ptlib/pprocess.h ---- pwlib-1.8.4/include/ptlib/unix/ptlib/pprocess.h 2004-05-23 23:11:39.000000000 +0200 -+++ pwlib-1.8.4-gcc4/include/ptlib/unix/ptlib/pprocess.h 2005-09-06 15:06:16.036950000 +0200 -@@ -171,6 +171,7 @@ - PDICTIONARY(ThreadDict, POrdinalKey, PThread); - ThreadDict activeThreads; - PMutex threadMutex; -+ public: - int timerChangePipe[2]; - PHouseKeepingThread * housekeepingThread; - diff --git a/dev-libs/pwlib/files/pwlib-1.8.7-gcc-4.1-v4l2.patch b/dev-libs/pwlib/files/pwlib-1.8.7-gcc-4.1-v4l2.patch deleted file mode 100644 index f54466217ed5..000000000000 --- a/dev-libs/pwlib/files/pwlib-1.8.7-gcc-4.1-v4l2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/vidinput_v4l2/vidinput_v4l2.cxx.old 2006-06-06 21:34:31.000000000 +0200 -+++ plugins/vidinput_v4l2/vidinput_v4l2.cxx 2006-06-06 21:35:17.000000000 +0200 -@@ -74,7 +74,7 @@ - - protected: - -- virtual PString V4L2Names::BuildUserFriendly(PString devname); -+ virtual PString BuildUserFriendly(PString devname); - - enum KernelVersionEnum { - K2_4, diff --git a/dev-libs/pwlib/files/pwlib-1.8.7-gcc41.patch b/dev-libs/pwlib/files/pwlib-1.8.7-gcc41.patch deleted file mode 100644 index ad0c1ba74cc7..000000000000 --- a/dev-libs/pwlib/files/pwlib-1.8.7-gcc41.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -ur pwlib-1.8.7-orig/include/ptclib/vxml.h pwlib-1.8.7/include/ptclib/vxml.h ---- pwlib-1.8.7-orig/include/ptclib/vxml.h 2006-05-01 13:16:53.000000000 -0400 -+++ pwlib-1.8.7/include/ptclib/vxml.h 2006-05-01 13:20:30.000000000 -0400 -@@ -366,7 +366,7 @@ - - virtual PString GetVar(const PString & str) const; - virtual void SetVar(const PString & ostr, const PString & val); -- virtual PString PVXMLSession::EvaluateExpr(const PString & oexpr); -+ virtual PString EvaluateExpr(const PString & oexpr); - - virtual BOOL RetreiveResource(const PURL & url, PString & contentType, PFilePath & fn, BOOL useCache = TRUE); - -diff -ur pwlib-1.8.7-orig/include/ptlib/pstring.h pwlib-1.8.7/include/ptlib/pstring.h ---- pwlib-1.8.7-orig/include/ptlib/pstring.h 2006-05-01 13:16:53.000000000 -0400 -+++ pwlib-1.8.7/include/ptlib/pstring.h 2006-05-01 13:17:25.000000000 -0400 -@@ -3182,5 +3182,10 @@ - int lastError; - }; - -+PString psprintf( -+ const char * cfmt, /// C string for output format. -+ ... /// Extra parameters for #sprintf()# call. -+ ); -+ - - // End Of File /////////////////////////////////////////////////////////////// -diff -ur pwlib-1.8.7-orig/src/ptlib/unix/svcproc.cxx pwlib-1.8.7/src/ptlib/unix/svcproc.cxx ---- pwlib-1.8.7-orig/src/ptlib/unix/svcproc.cxx 2006-05-01 13:16:53.000000000 -0400 -+++ pwlib-1.8.7/src/ptlib/unix/svcproc.cxx 2006-05-01 13:26:51.000000000 -0400 -@@ -279,6 +279,8 @@ - #include <sys/resource.h> - #endif - -+extern void PXSignalHandler(int sig); -+ - #define new PNEW - - |