From a6ee8845e1a4ad2067e4462cc65565467a7609eb Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Oct 04 2010 21:16:30 +0000 Subject: Upgrade to 0.9.10 --- diff --git a/.gitignore b/.gitignore index 0a9ba89..603183a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libucil-0.9.8.tar.gz +libucil-0.9.10.tar.gz diff --git a/libucil-0.9.8-alsa.patch b/libucil-0.9.8-alsa.patch deleted file mode 100644 index 24f2c3d..0000000 --- a/libucil-0.9.8-alsa.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/ucil_theora.c b/src/ucil_theora.c -index 1af19d4..3f6e1ca 100644 ---- a/src/ucil_theora.c -+++ b/src/ucil_theora.c -@@ -1524,6 +1524,12 @@ ucil_theora_video_file_object_t *ucil_theora_create_video_filev( const char *pat - return NULL; - } - vobj->audio_data = ucil_alsa_init( vobj->audio_card, vobj->audio_rate ); -+ if( !vobj->audio_data ) -+ { -+ /* the error message has been already emitted */ -+ free( vobj ); -+ return NULL; -+ } - - vorbis_info_init( &vobj->vi ); - if( vorbis_encode_init( &vobj->vi, 2, vobj->audio_rate, -1, vobj->vorbis_bitrate, -1 ) ) -@@ -1540,6 +1546,12 @@ ucil_theora_video_file_object_t *ucil_theora_create_video_filev( const char *pat - else if( vobj->audio ) - { - vobj->audio_data = ucil_alsa_init( vobj->audio_card, vobj->audio_rate ); -+ if( !vobj->audio_data ) -+ { -+ /* the error message has been already emitted */ -+ free( vobj ); -+ return NULL; -+ } - } - - #endif diff --git a/libucil-0.9.8-bz632439.patch b/libucil-0.9.8-bz632439.patch deleted file mode 100644 index b51434e..0000000 --- a/libucil-0.9.8-bz632439.patch +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file 'libucil/src/ucil_rawavi.c' ---- libucil/src/ucil_rawavi.c 2010-01-16 22:51:48 +0000 -+++ libucil/src/ucil_rawavi.c 2010-08-28 09:16:53 +0000 -@@ -561,7 +561,7 @@ - memcpy( &dst_buffer->fill_time, &buffer->fill_time, sizeof( struct timeval ) ); - buffer->flags &= ~UNICAP_FLAGS_BUFFER_LOCKED; - sem_wait( &vobj->lock ); -- g_queue_push_tail( vobj->full_queue, buffer ); -+ g_queue_push_tail( vobj->full_queue, dst_buffer ); - sem_post( &vobj->lock ); - } - - diff --git a/libucil-0.9.8-segv.patch b/libucil-0.9.8-segv.patch deleted file mode 100644 index 5089258..0000000 --- a/libucil-0.9.8-segv.patch +++ /dev/null @@ -1,43 +0,0 @@ - src/ucil_theora.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/ucil_theora.c b/src/ucil_theora.c -index 3f6e1ca..0919a97 100644 ---- a/src/ucil_theora.c -+++ b/src/ucil_theora.c -@@ -518,7 +518,7 @@ static void fill_frames( ucil_theora_video_file_object_t *vobj, unicap_data_buff - { - unicap_data_buffer_t *last_data_buffer; - -- last_data_buffer = (unicap_data_buffer_t *)vobj->last_frame; -+ last_data_buffer = vobj->last_frame; - if( vobj->downsize > 1 || vobj->requires_resizing_frames ) - { - yuv->y = ds_y_buffer; -@@ -690,7 +690,7 @@ static void *ucil_theora_encode_thread( ucil_theora_video_file_object_t *vobj ) - double streampos; - struct timeval streamtime; - -- last_data_buffer = (unicap_data_buffer_t *)vobj->last_frame->data; -+ last_data_buffer = vobj->last_frame; - if( vobj->downsize > 1 || vobj->requires_resizing_frames ) - { - yuv.y = ds_y_buffer; -@@ -807,7 +807,7 @@ static void *ucil_theora_encode_thread( ucil_theora_video_file_object_t *vobj ) - { - unicap_data_buffer_t *last_data_buffer; - -- last_data_buffer = (unicap_data_buffer_t *)vobj->last_frame->data; -+ last_data_buffer = vobj->last_frame; - last_data_buffer->flags &= ~UNICAP_FLAGS_BUFFER_LOCKED; - sem_wait( &vobj->lock ); - g_queue_push_head( vobj->empty_queue, vobj->last_frame ); -@@ -911,7 +911,7 @@ static void *ucil_theora_encode_thread( ucil_theora_video_file_object_t *vobj ) - } - #endif - -- last_data_buffer = (unicap_data_buffer_t *)vobj->last_frame->data; -+ last_data_buffer = vobj->last_frame; - if( vobj->downsize > 1 || vobj->requires_resizing_frames ) - { - yuv.y = ds_y_buffer; diff --git a/libucil.spec b/libucil.spec index 0d7df56..a55a85d 100644 --- a/libucil.spec +++ b/libucil.spec @@ -1,23 +1,14 @@ Summary: Library to render text and graphic overlays onto video images Name: libucil -Version: 0.9.8 -Release: 6%{?dist} +Version: 0.9.10 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.unicap-imaging.org/ Source0: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz -# Fix commited in upstream r62 -Patch0: libucil-0.9.8-alsa.patch - -# Part of the fix commited in upstream r61 -Patch1: libucil-0.9.8-segv.patch - -# upstream patch for #632439 -Patch2: libucil-0.9.8-bz632439.patch - # check return value of theora_encode_init() (#627890) -Patch3: libucil-0.9.8-bz627890.patch +Patch0: libucil-0.9.8-bz627890.patch BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext, gtk-doc >= 1.4 BuildRequires: libunicap-devel, glib2-devel, pango-devel, alsa-lib-devel @@ -45,16 +36,9 @@ documentation of the library, too. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %configure --disable-rpath --enable-gtk-doc - -# uncomment to turn off optimizations -#find -name Makefile | xargs sed -i s/-O2/-O0/ - make %{?_smp_mflags} %install @@ -84,7 +68,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/%{name} %changelog -* Wed Sep 29 2010 jkeating - 0.9.8-6 +* Mon Oct 04 2020 Robert Scheck 0.9.10-1 +- Upgrade to 0.9.10 + +* Wed Sep 29 2010 Jesse Keating 0.9.8-6 - Rebuilt for gcc bug 634757 * Wed Sep 15 2010 Kamil Dudka 0.9.8-5 diff --git a/sources b/sources index 078abb8..3360c3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -be48e766945a9a54bdf50fc0bbe39200 libucil-0.9.8.tar.gz +986adfd387d64726acd0267565ff9431 libucil-0.9.10.tar.gz