Hello community, here is the log from the commit of package libunicap for openSUSE:Factory checked in at Tue Oct 11 18:21:02 CEST 2011.
-------- --- openSUSE:Factory/libunicap/libunicap.changes 2011-09-23 02:11:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/libunicap/libunicap.changes 2011-10-11 11:26:03.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Oct 11 10:48:45 UTC 2011 - [email protected] + +- Add a patch to not used the reserved keyword "private". This + prevents C++ programs from building against this library + See: https://bugs.launchpad.net/unicap/+bug/656229 + https://bugs.launchpad.net/unicap/+bug/658739 +- Removed deprecated %clean macro +- Did some trivial spec file cleanups + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libunicap_0912_fixPrivate.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libunicap.spec ++++++ --- /var/tmp/diff_new_pack.4l6wZS/_old 2011-10-11 18:20:58.000000000 +0200 +++ /var/tmp/diff_new_pack.4l6wZS/_new 2011-10-11 18:20:58.000000000 +0200 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %define _use_internal_dependency_generator 0 %{expand:%%define prev__find_provides %{__find_provides}} %define __find_provides sh %{SOURCE1} %{prev__find_provides} @@ -34,6 +33,8 @@ Source2: baselibs.conf # PATCH-FIX-OPENSUSE openSUSE puts the videodev headers somewhere different in 12.1 Patch1: libunicap-0.9.12-find_videodev.patch +# PATCH-FIX-UPSTREAM uses the reserved keyword "private" https://bugs.launchpad.net/unicap/+bug/656229 +Patch2: libunicap_0912_fixPrivate.patch BuildRequires: alsa-lib-devel BuildRequires: gettext BuildRequires: gtk-doc >= 1.4 @@ -66,7 +67,6 @@ %package -n libunicap2 - Summary: Library to access different kinds of (video) capture devices Group: Hardware/Camera Provides: unicap = %{version} @@ -80,7 +80,6 @@ %package devel - Summary: Development files for the unicap library Group: Development/Libraries/C and C++ Requires: libunicap2 = %{version} @@ -96,6 +95,7 @@ %if 0%{?suse_version} >= 1210 %patch1 %endif +%patch2 -p 1 %build %configure --disable-rpath --enable-gtk-doc --enable-libv4l @@ -108,11 +108,7 @@ %find_lang unicap -%clean -rm -rf %{buildroot} - %post -n libunicap2 -p /sbin/ldconfig - %postun -n libunicap2 -p /sbin/ldconfig %files -n libunicap2 -f unicap.lang @@ -124,9 +120,9 @@ %files devel %defattr(-,root,root) +%{_datadir}/gtk-doc/html/* %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %{_includedir}/unicap -%{_datadir}/gtk-doc/html/* %changelog ++++++ libunicap_0912_fixPrivate.patch ++++++ --- libunicap-0.9.12/include/unicap.h.old +++ libunicap-0.9.12/include/unicap.h @@ -215,7 +215,7 @@ unicap_buffer_flags_t flags; - unicap_data_buffer_private_t *private; + unicap_data_buffer_private_t *private_buffer; }; typedef struct _unicap_data_buffer_t unicap_data_buffer_t; --- libunicap-0.9.12/src/unicap.c.old +++ libunicap-0.9.12/src/unicap.c @@ -1467,7 +1467,7 @@ buffer->buffer_size = buffer->format.buffer_size; buffer->data = malloc( buffer->buffer_size ); unicap_copy_format( &buffer->format, format ); - buffer->private = NULL; + buffer->private_buffer = NULL; return buffer; } @@ -1475,28 +1475,28 @@ void unicap_data_buffer_init( unicap_data_buffer_t *buffer, unicap_format_t *format, unicap_data_buffer_init_data_t *init_data ) { unicap_copy_format( &buffer->format, format ); - buffer->private = malloc( sizeof( unicap_data_buffer_private_t ) ); - sem_init( &buffer->private->lock, 0, 1 ); - buffer->private->ref_count = 0; - buffer->private->free_func = init_data->free_func; - buffer->private->free_func_data = init_data->free_func_data; - buffer->private->ref_func = init_data->ref_func; - buffer->private->ref_func_data = init_data->ref_func_data; - buffer->private->unref_func = init_data->unref_func; - buffer->private->unref_func_data = init_data->unref_func_data; + buffer->private_buffer = malloc( sizeof( unicap_data_buffer_private_t ) ); + sem_init( &buffer->private_buffer->lock, 0, 1 ); + buffer->private_buffer->ref_count = 0; + buffer->private_buffer->free_func = init_data->free_func; + buffer->private_buffer->free_func_data = init_data->free_func_data; + buffer->private_buffer->ref_func = init_data->ref_func; + buffer->private_buffer->ref_func_data = init_data->ref_func_data; + buffer->private_buffer->unref_func = init_data->unref_func; + buffer->private_buffer->unref_func_data = init_data->unref_func_data; } void unicap_data_buffer_free( unicap_data_buffer_t *buffer ) { - sem_wait( &buffer->private->lock ); - if( buffer->private->ref_count > 0 ){ - TRACE( "freeing a buffer with refcount = %d!!!\n", buffer->private.refcount ); + sem_wait( &buffer->private_buffer->lock ); + if( buffer->private_buffer->ref_count > 0 ){ + TRACE( "freeing a buffer with refcount = %d!!!\n", buffer->private_buffer.refcount ); } - if( buffer->private->free_func ){ - buffer->private->free_func( buffer, buffer->private->free_func_data ); + if( buffer->private_buffer->free_func ){ + buffer->private_buffer->free_func( buffer, buffer->private_buffer->free_func_data ); } - sem_destroy( &buffer->private->lock ); + sem_destroy( &buffer->private_buffer->lock ); if (buffer->data) free( buffer->data ); free( buffer ); @@ -1504,9 +1504,9 @@ unicap_status_t unicap_data_buffer_ref( unicap_data_buffer_t *buffer ) { - sem_wait( &buffer->private->lock ); - buffer->private->ref_count++; - sem_post( &buffer->private->lock ); + sem_wait( &buffer->private_buffer->lock ); + buffer->private_buffer->ref_count++; + sem_post( &buffer->private_buffer->lock ); return STATUS_SUCCESS; } @@ -1514,36 +1514,36 @@ unicap_status_t unicap_data_buffer_unref( unicap_data_buffer_t *buffer ) { unicap_status_t status = STATUS_SUCCESS; - sem_wait( &buffer->private->lock ); - if( buffer->private->ref_count > 0 ){ - buffer->private->ref_count--; - if (buffer->private->unref_func){ - buffer->private->unref_func (buffer, buffer->private->unref_func_data); + sem_wait( &buffer->private_buffer->lock ); + if( buffer->private_buffer->ref_count > 0 ){ + buffer->private_buffer->ref_count--; + if (buffer->private_buffer->unref_func){ + buffer->private_buffer->unref_func (buffer, buffer->private_buffer->unref_func_data); } - if (buffer->private->ref_count == 0 ){ + if (buffer->private_buffer->ref_count == 0 ){ unicap_data_buffer_free( buffer ); } }else{ TRACE( "unref of a buffer with refcount <= 0!" ); status = STATUS_FAILURE; } - sem_post (&buffer->private->lock); + sem_post (&buffer->private_buffer->lock); return status; } unsigned int unicap_data_buffer_get_refcount( unicap_data_buffer_t *buffer ) { - return buffer->private->ref_count; + return buffer->private_buffer->ref_count; } void *unicap_data_buffer_set_user_data( unicap_data_buffer_t *buffer, void *data ) { - void *old_data = buffer->private->user_data; - buffer->private->user_data = data; + void *old_data = buffer->private_buffer->user_data; + buffer->private_buffer->user_data = data; return old_data; } void *unicap_data_buffer_get_user_data( unicap_data_buffer_t *buffer ) { - return buffer->private->user_data; + return buffer->private_buffer->user_data; } continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
