Hello community, here is the log from the commit of package libpt2 for openSUSE:Factory checked in at 2012-06-06 10:28:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpt2 (Old) and /work/SRC/openSUSE:Factory/.libpt2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libpt2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libpt2/libpt2.changes 2012-03-29 14:01:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libpt2.new/libpt2.changes 2012-06-06 10:28:56.000000000 +0200 @@ -1,0 +2,19 @@ +Fri May 18 19:06:25 UTC 2012 - [email protected] + +- Update to 2.10.5: + + Numours changes, please see changelogfile. +- Add new subpackage: libpt-plugins-pulse. Brings PulseAudio + support to libpt. New BuildRequires added pkgconfig(libpulse) due + to this. +- Enable build of avc plugin. + +------------------------------------------------------------------- +Thu Apr 19 03:00:40 CEST 2012 - [email protected] + +- Update to 2.10.4: + + Numours changes, please see changelogfile. +- Drop libpt2-2.6.7-missing_links.patch, libpt2-gcc47.patch, + ptlib-pkg_config.patch, fixed upstream. +- Add libpt2-fix-avc-plugin + +------------------------------------------------------------------- Old: ---- libpt2-2.6.7-missing_links.patch libpt2-gcc47.patch ptlib-2.6.7.tar.bz2 ptlib-pkg_config.patch New: ---- libpt2-fix-avc-plugin.patch ptlib-2.10.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpt2.spec ++++++ --- /var/tmp/diff_new_pack.ODC1qQ/_old 2012-06-06 10:29:00.000000000 +0200 +++ /var/tmp/diff_new_pack.ODC1qQ/_new 2012-06-06 10:29:00.000000000 +0200 @@ -16,29 +16,25 @@ # -%define build_avc 0 +%define build_avc 1 %define build_dc 0 # Video4Linux is obsolete on Kernel 3.0, which we have after openSUSE 11.4 %define build_v4l 0%{?suse_version} <= 1140 Name: libpt2 %define _name ptlib -Version: 2.6.7 +Version: 2.10.5 Release: 0 # FIXME: when upgrading, check if the dc plugin builds with the current version of libdc1394 -%define _version 2_6_7 +%define _version 2_10_5 Summary: Portable Windows Library from Equivalence Pty. Ltd. version 2 License: MPL-1.0 Group: System/Libraries Url: http://www.opalvoip.org/ # https://sourceforge.net/projects/opalvoip Source: %{_name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM %{_name}-pkg_config.patch sf#3041093 [email protected] -- Put extra libraries in Libs.private and remove unneeded cflags -Patch0: %{_name}-pkg_config.patch -# PATCH-FIX-UPSTREAM %{_name}-missing_links.patch sf#3082616 [email protected] -- Link plugins against main library -Patch1: %{name}-2.6.7-missing_links.patch -# PATCH-FIX-UPSTREAM libpt2-gcc47.patch sf#3505516 [email protected] -- Fix build with gcc 4.7 -Patch2: libpt2-gcc47.patch +# PATCH-MISSING-TAG libpt2-fix-avc-plugin.patch [email protected] -- Fix build for avc-plugin. +Patch1: libpt2-fix-avc-plugin.patch BuildRequires: SDL-devel BuildRequires: bison BuildRequires: esound-devel @@ -58,6 +54,7 @@ %endif BuildRequires: openldap2-devel BuildRequires: pkg-config +BuildRequires: pkgconfig(libpulse) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -161,20 +158,35 @@ cameras) for %{name}. %endif +%package -n libpt%{_version}-plugins-pulse + +Summary: Pulseaudio support for %{name} +Group: System/Libraries +Requires: libpt%{_version} = %{version} +# No idea about why this provides is here. Feel free to remove it if you think +# is the best thing to do... or to add an explanation about why it is useful. +Provides: libpt2-audio-plugin +Supplements: libpt2 +Supplements: packageand(libpt2:pulseaudio) + +%description -n libpt%{_version}-plugins-pulse +This plugin enables pulseaudio support for %{name}. + %prep %setup -q -n %{_name}-%{version} -%patch0 -%patch1 -%patch2 -p1 +%patch1 -p1 %build %configure \ --enable-esd \ --enable-oss \ + --enable-pulse \ %if %{build_v4l} --enable-v4l \ %endif +%if %{build_avc} --enable-avc +%endif make %{?_smp_mflags} V=1 %install @@ -237,4 +249,8 @@ %{_libdir}/%{_name}-%{version}/devices/videoinput/v4l_pwplugin.so %endif +%files -n libpt%{_version}-plugins-pulse +%defattr(-,root,root) +%{_libdir}/%{_name}-%{version}/devices/sound/pulse_pwplugin.so + %changelog ++++++ libpt2-fix-avc-plugin.patch ++++++ From: Jeff Mahoney <[email protected]> Subject: libpt2: Build/API fixes for AVC plugins It builds. I have no way to test it. Signed-off-by: Jeff Mahoney <[email protected]> --- plugins/vidinput_avc/vidinput_avc.cxx | 20 +++++++++++++------- plugins/vidinput_avc/vidinput_avc.h | 7 ++++++- 2 files changed, 19 insertions(+), 8 deletions(-) --- a/plugins/vidinput_avc/vidinput_avc.cxx +++ b/plugins/vidinput_avc/vidinput_avc.cxx @@ -163,7 +163,8 @@ PBoolean PVideoInputDevice_1394AVC::Star if (!IsOpen()) return PFalse; if (IsCapturing()) return PTrue; - if (raw1394_set_iso_handler(handle, 63, &RawISOHandler)!= NULL) { + if (raw1394_iso_recv_init(handle, &RAWISOHandler, 2048, RAW_BUFFER_SIZE, 63, + RAW1394_DMA_BUFFERFILL, -1)) { PTRACE (3, "Cannot set_iso_handler"); return PFalse; } @@ -371,14 +372,15 @@ PBoolean PVideoInputDevice_1394AVC::GetF BYTE * capture_buffer_end = capture_buffer; // this starts the bytes' rain - if (raw1394_start_iso_rcv(handle, 63) < 0) { + if (raw1394_iso_recv_start(handle, -1, 0, 0) < 0) { PTRACE(3, "Cannot receive data on channel 63"); return PFalse; } // calling the raw1394 event manager, to get a frame: while(!frame_complete) { raw1394_loop_iterate(handle); - if (*(uint32_t *)raw_buffer >= 492) { + uint32_t *lenp = (uint32_t *)raw_buffer; + if (*lenp >= 492) { if (!found_first_frame) { if (raw_buffer[16] == 0x1f && raw_buffer[17] == 0x07) found_first_frame = PTrue; @@ -415,7 +417,7 @@ PBoolean PVideoInputDevice_1394AVC::GetF } } // stops the bytes from coming at us! - raw1394_stop_iso_rcv(handle, 63); + raw1394_iso_stop(handle); dv_decoder_t *dv; dv = dv_decoder_new(PTrue, PFalse, PFalse); @@ -500,12 +502,16 @@ PBoolean PVideoInputDevice_1394AVC::SetF } -int RawISOHandler (raw1394handle_t handle, int channel, size_t length, u_int32_t * data) +enum raw1394_iso_disposition +RAWISOHandler(raw1394handle_t handle, unsigned char *data, unsigned int length, + unsigned char channel, unsigned char tag, unsigned char sy, + unsigned int cycle, unsigned int dropped) { if (length < RAW_BUFFER_SIZE) { - *(u_int32_t *) raw_buffer = length; + uint32_t *lenp = (uint32_t *)raw_buffer; + *lenp = length; memcpy (raw_buffer + 4, data, length); } - return 0; + return RAW1394_ISO_OK; } // End Of File /////////////////////////////////////////////////////////////// --- a/plugins/vidinput_avc/vidinput_avc.h +++ b/plugins/vidinput_avc/vidinput_avc.h @@ -224,7 +224,12 @@ class PVideoInputDevice_1394AVC : public PBoolean SetupHandle(); }; -int RawISOHandler (raw1394handle_t handle, int channel, size_t length, u_int32_t * data); +extern "C" { +enum raw1394_iso_disposition +RAWISOHandler(raw1394handle_t handle, unsigned char *data, unsigned int lenth, + unsigned char channel, unsigned char tag, unsigned char sy, + unsigned int cycle, unsigned int dropped); +}; #endif ++++++ ptlib-2.6.7.tar.bz2 -> ptlib-2.10.5.tar.bz2 ++++++ ++++ 517562 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
