rpms/vlc/devel vlc.spec,1.67,1.68
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13648
Modified Files:
vlc.spec
Log Message:
Fix for faac and other comments
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- vlc.spec 25 Oct 2009 16:41:04 -0000 1.67
+++ vlc.spec 25 Oct 2009 16:55:51 -0000 1.68
@@ -42,7 +42,7 @@
BuildRequires: dbus-devel
BuildRequires: dirac-devel >= 1.0.0
%{!?_without_directfb:BuildRequires: directfb-devel}
-BuildRequires: faac-devel
+%{?_with_faac:BuildRequires: faac-devel}
BuildRequires: faad2-devel
BuildRequires: ffmpeg-devel >= 0.4.9-0
BuildRequires: flac-devel
@@ -264,7 +264,6 @@
%if 0%{?live555_date:1}
--with-live555-tree=live \
%endif
-%{?_with_dc1394:--enable-dc1394} \
--enable-dv \
--enable-opencv \
--enable-pvr \
@@ -273,6 +272,7 @@
--enable-wma-fixed \
--enable-shine \
--enable-faad \
+%{!?_with_faac:--disable-faac} \
--enable-twolame \
--enable-real \
--enable-realrtsp \
@@ -532,6 +532,8 @@
%changelog
* Sun Oct 25 2009 kwizart < kwizart at gmail.com > - 1.0.3.0.1_rc
- Update to 1.0.3-rc
+- Update bugfix to 20091025
+- Clean dc1394 sub-package
* Thu Oct 16 2009 kwizart < kwizart at gmail.com > - 1.0.2-2
- Update to 1.0-bugfix 20091016
14 years, 6 months
rpms/vlc/devel vlc-1.0-bugfix-20091025.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 sources, 1.26, 1.27 vlc.spec, 1.66, 1.67 vlc-1.0-bugfix-20091016.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12468/devel
Modified Files:
.cvsignore sources vlc.spec
Added Files:
vlc-1.0-bugfix-20091025.patch
Removed Files:
vlc-1.0-bugfix-20091016.patch
Log Message:
Update to 1.0.3-rc
vlc-1.0-bugfix-20091025.patch:
--- NEW FILE vlc-1.0-bugfix-20091025.patch ---
diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index 1461302..745da6e 100644
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -421,6 +421,8 @@ static int Open( vlc_object_t *p_this )
else
p_sys->i_read_once = DVB_READ_ONCE_START;
+ free( p_access->psz_demux );
+ p_access->psz_demux = strdup( "ts" );
return VLC_SUCCESS;
}
diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 895d528..5c38426 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -506,7 +506,6 @@ void TimeLabel::setCaching( float f_cache )
{
QString amount;
amount.setNum( (int)(100 * f_cache) );
- msg_Dbg( p_intf, "New caching: %d", (int)(100*f_cache));
setText( "Buff: " + amount + "%" );
}
diff --git a/src/config/file.c b/src/config/file.c
index 01c0332..e2c92ec 100644
--- a/src/config/file.c
+++ b/src/config/file.c
@@ -117,6 +117,9 @@ static FILE *config_OpenConfigFile( vlc_object_t *p_obj )
}
free( psz_readme );
}
+ /* Remove the old configuration file so that --reset-config
+ * can work properly. */
+ unlink( psz_old );
}
free( psz_old );
}
diff --git a/src/input/clock.c b/src/input/clock.c
index dc010e5..a26b9c4 100644
--- a/src/input/clock.c
+++ b/src/input/clock.c
@@ -86,6 +86,19 @@
* my dice --Meuuh */
#define CR_MEAN_PTS_GAP (300000)
+/* Rate (in 1/256) at which we will read faster to try to increase our
+ * internal buffer (if we control the pace of the source).
+ */
+#define CR_BUFFERING_RATE (48)
+
+/* Extra internal buffer value (in CLOCK_FREQ)
+ * It is 60s max, remember as it is limited by the size it takes by es_out.c
+ * it can be really large.
+ */
+//#define CR_BUFFERING_TARGET (60000000)
+/* Due to some problems in es_out, we cannot use a large value yet */
+#define CR_BUFFERING_TARGET (100000)
+
/*****************************************************************************
* Structures
*****************************************************************************/
@@ -123,6 +136,9 @@ static inline clock_point_t clock_point_Create( mtime_t i_stream, mtime_t i_syst
}
/* */
+#define INPUT_CLOCK_LATE_COUNT (3)
+
+/* */
struct input_clock_t
{
/* */
@@ -139,10 +155,20 @@ struct input_clock_t
/* Maximal timestamp returned by input_clock_ConvertTS (in system unit) */
mtime_t i_ts_max;
+ /* Amount of extra buffering expressed in stream clock */
+ mtime_t i_buffering_duration;
+
/* Clock drift */
mtime_t i_next_drift_update;
average_t drift;
+ /* Late statistics */
+ struct
+ {
+ mtime_t pi_value[INPUT_CLOCK_LATE_COUNT];
+ unsigned i_index;
+ } late;
+
/* Current modifiers */
int i_rate;
mtime_t i_pts_delay;
@@ -153,6 +179,8 @@ struct input_clock_t
static mtime_t ClockStreamToSystem( input_clock_t *, mtime_t i_stream );
static mtime_t ClockSystemToStream( input_clock_t *, mtime_t i_system );
+static mtime_t ClockGetTsOffset( input_clock_t * );
+
/*****************************************************************************
* input_clock_New: create a new clock
*****************************************************************************/
@@ -170,9 +198,15 @@ input_clock_t *input_clock_New( int i_rate )
cl->i_ts_max = VLC_TS_INVALID;
+ cl->i_buffering_duration = 0;
+
cl->i_next_drift_update = VLC_TS_INVALID;
AvgInit( &cl->drift, 10 );
+ cl->late.i_index = 0;
+ for( int i = 0; i < INPUT_CLOCK_LATE_COUNT; i++ )
+ cl->late.pi_value[i] = 0;
+
cl->i_rate = i_rate;
cl->i_pts_delay = 0;
cl->b_paused = false;
@@ -197,8 +231,9 @@ void input_clock_Delete( input_clock_t *cl )
* i_ck_stream: date in stream clock
* i_ck_system: date in system clock
*****************************************************************************/
-void input_clock_Update( input_clock_t *cl,
- vlc_object_t *p_log, bool b_can_pace_control,
+void input_clock_Update( input_clock_t *cl, vlc_object_t *p_log,
+ bool *pb_late,
+ bool b_can_pace_control, bool b_buffering_allowed,
mtime_t i_ck_stream, mtime_t i_ck_system )
{
bool b_reset_reference = false;
@@ -226,6 +261,8 @@ void input_clock_Update( input_clock_t *cl,
msg_Warn( p_log, "feeding synchro with a new reference point trying to recover from clock gap" );
b_reset_reference= true;
}
+
+ /* */
if( b_reset_reference )
{
cl->i_next_drift_update = VLC_TS_INVALID;
@@ -237,6 +274,8 @@ void input_clock_Update( input_clock_t *cl,
__MAX( cl->i_ts_max + CR_MEAN_PTS_GAP, i_ck_system ) );
}
+ /* Compute the drift between the stream clock and the system clock
+ * when we don't control the source pace */
if( !b_can_pace_control && cl->i_next_drift_update < i_ck_system )
{
const mtime_t i_converted = ClockSystemToStream( cl, i_ck_system );
@@ -245,8 +284,39 @@ void input_clock_Update( input_clock_t *cl,
cl->i_next_drift_update = i_ck_system + CLOCK_FREQ/5; /* FIXME why that */
}
+
+ /* Update the extra buffering value */
+ if( !b_can_pace_control || b_reset_reference )
+ {
+ cl->i_buffering_duration = 0;
+ }
+ else if( b_buffering_allowed )
+ {
+ /* Try to bufferize more than necessary by reading
+ * CR_BUFFERING_RATE/256 faster until we have CR_BUFFERING_TARGET.
+ */
+ const mtime_t i_duration = __MAX( i_ck_stream - cl->last.i_stream, 0 );
+
+ cl->i_buffering_duration += ( i_duration * CR_BUFFERING_RATE + 255 ) / 256;
+ if( cl->i_buffering_duration > CR_BUFFERING_TARGET )
+ cl->i_buffering_duration = CR_BUFFERING_TARGET;
+ }
+ //fprintf( stderr, "input_clock_Update: %d :: %lld\n", b_buffering_allowed, cl->i_buffering_duration/1000 );
+
+ /* */
cl->last = clock_point_Create( i_ck_stream, i_ck_system );
+ /* It does not take the decoder latency into account but it is not really
+ * the goal of the clock here */
+ const mtime_t i_system_expected = ClockStreamToSystem( cl, i_ck_stream + AvgGet( &cl->drift ) );
+ const mtime_t i_late = ( i_ck_system - cl->i_pts_delay ) - i_system_expected;
+ *pb_late = i_late > 0;
+ if( i_late > 0 )
+ {
+ cl->late.pi_value[cl->late.i_index] = i_late;
+ cl->late.i_index = ( cl->late.i_index + 1 ) % INPUT_CLOCK_LATE_COUNT;
+ }
+
vlc_mutex_unlock( &cl->lock );
}
@@ -271,13 +341,12 @@ void input_clock_ChangeRate( input_clock_t *cl, int i_rate )
{
vlc_mutex_lock( &cl->lock );
- /* Move the reference point */
if( cl->b_has_reference )
{
- cl->last.i_system = ClockStreamToSystem( cl, cl->last.i_stream );
- cl->ref = cl->last;
+ /* Move the reference point (as if we were playing at the new rate
+ * from the start */
+ cl->ref.i_system = cl->last.i_system - (cl->last.i_system - cl->ref.i_system) * i_rate / cl->i_rate;
}
-
cl->i_rate = i_rate;
vlc_mutex_unlock( &cl->lock );
@@ -318,7 +387,7 @@ mtime_t input_clock_GetWakeup( input_clock_t *cl )
/* Synchronized, we can wait */
if( cl->b_has_reference )
- i_wakeup = ClockStreamToSystem( cl, cl->last.i_stream );
+ i_wakeup = ClockStreamToSystem( cl, cl->last.i_stream + AvgGet( &cl->drift ) - cl->i_buffering_duration );
vlc_mutex_unlock( &cl->lock );
@@ -332,8 +401,6 @@ int input_clock_ConvertTS( input_clock_t *cl,
int *pi_rate, mtime_t *pi_ts0, mtime_t *pi_ts1,
mtime_t i_ts_bound )
{
- mtime_t i_pts_delay;
-
assert( pi_ts0 );
vlc_mutex_lock( &cl->lock );
@@ -350,27 +417,30 @@ int input_clock_ConvertTS( input_clock_t *cl,
}
/* */
+ const mtime_t i_ts_buffering = cl->i_buffering_duration * cl->i_rate / INPUT_RATE_DEFAULT;
+ const mtime_t i_ts_delay = cl->i_pts_delay + ClockGetTsOffset( cl );
+
+ /* */
if( *pi_ts0 > VLC_TS_INVALID )
{
*pi_ts0 = ClockStreamToSystem( cl, *pi_ts0 + AvgGet( &cl->drift ) );
if( *pi_ts0 > cl->i_ts_max )
cl->i_ts_max = *pi_ts0;
- *pi_ts0 += cl->i_pts_delay;
+ *pi_ts0 += i_ts_delay;
}
/* XXX we do not ipdate i_ts_max on purpose */
if( pi_ts1 && *pi_ts1 > VLC_TS_INVALID )
{
*pi_ts1 = ClockStreamToSystem( cl, *pi_ts1 + AvgGet( &cl->drift ) ) +
- cl->i_pts_delay;
+ i_ts_delay;
}
- i_pts_delay = cl->i_pts_delay;
vlc_mutex_unlock( &cl->lock );
/* Check ts validity */
if( i_ts_bound != INT64_MAX &&
- *pi_ts0 > VLC_TS_INVALID && *pi_ts0 >= mdate() + cl->i_pts_delay + i_ts_bound )
+ *pi_ts0 > VLC_TS_INVALID && *pi_ts0 >= mdate() + i_ts_delay + i_ts_buffering + i_ts_bound )
return VLC_EGENERIC;
return VLC_SUCCESS;
@@ -417,7 +487,7 @@ void input_clock_ChangeSystemOrigin( input_clock_t *cl, mtime_t i_system )
vlc_mutex_lock( &cl->lock );
assert( cl->b_has_reference );
- const mtime_t i_offset = i_system - cl->ref.i_system;
+ const mtime_t i_offset = i_system - cl->ref.i_system - ClockGetTsOffset( cl );
cl->ref.i_system += i_offset;
cl->last.i_system += i_offset;
@@ -431,6 +501,24 @@ void input_clock_SetJitter( input_clock_t *cl,
{
vlc_mutex_lock( &cl->lock );
+ /* Update late observations */
+ const mtime_t i_delay_delta = i_pts_delay - cl->i_pts_delay;
+ mtime_t pi_late[INPUT_CLOCK_LATE_COUNT];
+ for( int i = 0; i < INPUT_CLOCK_LATE_COUNT; i++ )
+ pi_late[i] = __MAX( cl->late.pi_value[(cl->late.i_index + 1 + i)%INPUT_CLOCK_LATE_COUNT] - i_delay_delta, 0 );
+
+ for( int i = 0; i < INPUT_CLOCK_LATE_COUNT; i++ )
+ cl->late.pi_value[i] = 0;
+ cl->late.i_index = 0;
+
+ for( int i = 0; i < INPUT_CLOCK_LATE_COUNT; i++ )
+ {
+ if( pi_late[i] <= 0 )
+ continue;
+ cl->late.pi_value[cl->late.i_index] = pi_late[i];
+ cl->late.i_index = ( cl->late.i_index + 1 ) % INPUT_CLOCK_LATE_COUNT;
+ }
+
/* TODO always save the value, and when rebuffering use the new one if smaller
* TODO when increasing -> force rebuffering
*/
@@ -447,6 +535,28 @@ void input_clock_SetJitter( input_clock_t *cl,
vlc_mutex_unlock( &cl->lock );
}
+mtime_t input_clock_GetJitter( input_clock_t *cl )
+{
+ vlc_mutex_lock( &cl->lock );
+
+#if INPUT_CLOCK_LATE_COUNT != 3
+# error "unsupported INPUT_CLOCK_LATE_COUNT"
+#endif
+ /* Find the median of the last late values
+ * It works pretty well at rejecting bad values
+ *
+ * XXX we only increase pts_delay over time, decreasing it is
+ * not that easy if we want to be robust.
+ */
+ const mtime_t *p = cl->late.pi_value;
+ mtime_t i_late_median = p[0] + p[1] + p[2] - __MIN(__MIN(p[0],p[1]),p[2]) - __MAX(__MAX(p[0],p[1]),p[2]);
+ mtime_t i_pts_delay = cl->i_pts_delay ;
+
+ vlc_mutex_unlock( &cl->lock );
+
+ return i_pts_delay + i_late_median;
+}
+
/*****************************************************************************
* ClockStreamToSystem: converts a movie clock to system date
*****************************************************************************/
@@ -471,6 +581,15 @@ static mtime_t ClockSystemToStream( input_clock_t *cl, mtime_t i_system )
cl->ref.i_stream;
}
+/**
+ * It returns timestamp display offset due to ref/last modfied on rate changes
+ * It ensures that currently converted dates are not changed.
+ */
+static mtime_t ClockGetTsOffset( input_clock_t *cl )
+{
+ return cl->i_pts_delay * ( cl->i_rate - INPUT_RATE_DEFAULT ) / INPUT_RATE_DEFAULT;
+}
+
/*****************************************************************************
* Long term average helpers
*****************************************************************************/
diff --git a/src/input/clock.h b/src/input/clock.h
index 1384793..ff50c82 100644
--- a/src/input/clock.h
+++ b/src/input/clock.h
@@ -52,9 +52,15 @@ void input_clock_Delete( input_clock_t * );
/**
* This function will update a input_clock_t with a new clock reference point.
+ * It will also tell if the clock point is late regarding our buffering.
+ *
+ * \param b_buffering_allowed tells if we are allowed to bufferize more data in
+ * advanced (if possible).
*/
void input_clock_Update( input_clock_t *, vlc_object_t *p_log,
- bool b_can_pace_control, mtime_t i_clock, mtime_t i_system );
+ bool *pb_late,
+ bool b_can_pace_control, bool b_buffering_allowed,
+ mtime_t i_clock, mtime_t i_system );
/**
* This function will reset the drift of a input_clock_t.
*
@@ -119,5 +125,11 @@ int input_clock_GetState( input_clock_t *,
void input_clock_SetJitter( input_clock_t *,
mtime_t i_pts_delay, int i_cr_average );
+/**
+ * This function returns an estimation of the pts_delay needed to avoid rebufferization.
+ * XXX in the current implementation, the pts_delay will never be decreased.
+ */
+mtime_t input_clock_GetJitter( input_clock_t * );
+
#endif
diff --git a/src/input/decoder.c b/src/input/decoder.c
index b110a1e..c0e9fb5 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -386,7 +386,11 @@ void input_DecoderDecode( decoder_t *p_dec, block_t *p_block, bool b_do_pace )
if( !p_owner->b_buffering )
block_FifoPace( p_owner->p_fifo, 10, SIZE_MAX );
}
+#ifdef __arm__
else if( block_FifoSize( p_owner->p_fifo ) > 50000000 /* 50 MB */ )
+#else
+ else if( block_FifoSize( p_owner->p_fifo ) > 400000000 /* 400 MB, ie ~ 50mb/s for 60s */ )
+#endif
{
/* FIXME: ideally we would check the time amount of data
* in the FIFO instead of its size. */
@@ -633,6 +637,13 @@ bool input_DecoderHasFormatChanged( decoder_t *p_dec, es_format_t *p_fmt, vlc_me
return b_changed;
}
+size_t input_DecoderGetFifoSize( decoder_t *p_dec )
+{
+ decoder_owner_sys_t *p_owner = p_dec->p_owner;
+
+ return block_FifoSize( p_owner->p_fifo );
+}
+
/*****************************************************************************
* Internal functions
*****************************************************************************/
diff --git a/src/input/decoder.h b/src/input/decoder.h
index d47119d..fe99b42 100644
--- a/src/input/decoder.h
+++ b/src/input/decoder.h
@@ -99,4 +99,9 @@ void input_DecoderFrameNext( decoder_t *p_dec, mtime_t *pi_duration );
*/
bool input_DecoderHasFormatChanged( decoder_t *p_dec, es_format_t *p_fmt, vlc_meta_t **pp_meta );
+/**
+ * This function returns the current size in bytes of the decoder fifo
+ */
+size_t input_DecoderGetFifoSize( decoder_t *p_dec );
+
#endif
diff --git a/src/input/es_out.c b/src/input/es_out.c
index b67aa36..6f12b18 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -186,6 +186,7 @@ static void EsOutDecodersChangePause( es_out_t *out, bool b_paused, mtime_t i_da
static void EsOutProgramChangePause( es_out_t *out, bool b_paused, mtime_t i_date );
static void EsOutProgramsChangeRate( es_out_t *out );
static void EsOutDecodersStopBuffering( es_out_t *out, bool b_forced );
+
static char *LanguageGetName( const char *psz_code );
static char *LanguageGetCode( const char *psz_lang );
static char **LanguageSplit( const char *psz_langs );
@@ -585,9 +586,7 @@ static void EsOutChangeRate( es_out_t *out, int i_rate )
es_out_sys_t *p_sys = out->p_sys;
p_sys->i_rate = i_rate;
-
- if( !p_sys->b_paused )
- EsOutProgramsChangeRate( out );
+ EsOutProgramsChangeRate( out );
}
static void EsOutChangePosition( es_out_t *out )
@@ -719,6 +718,32 @@ static void EsOutDecodersChangePause( es_out_t *out, bool b_paused, mtime_t i_da
}
}
}
+
+static bool EsOutIsExtraBufferingAllowed( es_out_t *out )
+{
+ es_out_sys_t *p_sys = out->p_sys;
+
+ size_t i_size = 0;
+ for( int i = 0; i < p_sys->i_es; i++ )
+ {
+ es_out_id_t *p_es = p_sys->es[i];
+
+ if( p_es->p_dec )
+ i_size += input_DecoderGetFifoSize( p_es->p_dec );
+ if( p_es->p_dec_record )
+ i_size += input_DecoderGetFifoSize( p_es->p_dec_record );
+ }
+ //fprintf( stderr, "----- EsOutIsExtraBufferingAllowed =% 5d kbytes -- ", i_size / 1024 );
+
+ /* TODO maybe we want to be able to tune it ? */
+#if defined(OPTIMIZE_MEMORY)
+ const size_t i_level_high = 500000; /* 0.5 Mbytes */
+#else
+ const size_t i_level_high = 10000000; /* 10 Mbytes */
+#endif
+ return i_size < i_level_high;
+}
+
static void EsOutProgramChangePause( es_out_t *out, bool b_paused, mtime_t i_date )
{
es_out_sys_t *p_sys = out->p_sys;
@@ -1360,6 +1385,58 @@ static void EsOutProgramUpdateScrambled( es_out_t *p_out, es_out_pgrm_t *p_pgrm
input_SendEventProgramScrambled( p_input, p_pgrm->i_id, b_scrambled );
}
+static void EsOutMeta( es_out_t *p_out, const vlc_meta_t *p_meta )
+{
+ es_out_sys_t *p_sys = p_out->p_sys;
+ input_thread_t *p_input = p_sys->p_input;
+
+ input_item_t *p_item = input_GetItem( p_input );
+
+ char *psz_title = NULL;
+ char *psz_arturl = input_item_GetArtURL( p_item );
+
+ vlc_mutex_lock( &p_item->lock );
+
+ if( vlc_meta_Get( p_meta, vlc_meta_Title ) && !p_item->b_fixed_name )
+ psz_title = strdup( vlc_meta_Get( p_meta, vlc_meta_Title ) );
+
+ vlc_meta_Merge( p_item->p_meta, p_meta );
+
+ if( !psz_arturl || *psz_arturl == '\0' )
+ {
+ const char *psz_tmp = vlc_meta_Get( p_item->p_meta, vlc_meta_ArtworkURL );
+ if( psz_tmp )
+ psz_arturl = strdup( psz_tmp );
+ }
+ vlc_mutex_unlock( &p_item->lock );
+
+ if( psz_arturl && *psz_arturl )
+ {
+ input_item_SetArtURL( p_item, psz_arturl );
+
+ if( !strncmp( psz_arturl, "attachment://", strlen("attachment") ) )
+ {
+ /* Don't look for art cover if sout
+ * XXX It can change when sout has meta data support */
+ if( p_out->b_sout && !p_input->b_preparsing )
+ input_item_SetArtURL( p_item, "" );
+ else
+ input_ExtractAttachmentAndCacheArt( p_input );
+ }
+ }
+ free( psz_arturl );
+
+ if( psz_title )
+ {
+ input_item_SetName( p_item, psz_title );
+ free( psz_title );
+ }
+ input_item_SetPreparsed( p_item, true );
+
+ input_SendEventMeta( p_input );
+ /* TODO handle sout meta ? */
+}
+
/* EsOutAdd:
* Add an es_out
*/
@@ -2226,6 +2303,7 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
int i_group = 0;
int64_t i_pcr;
+ /* Search program */
if( i_query == ES_OUT_SET_PCR )
{
p_pgrm = p_sys->p_pgrm;
@@ -2247,14 +2325,42 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
return VLC_EGENERIC;
}
- /* search program
- * TODO do not use mdate() but proper stream acquisition date */
+ /* TODO do not use mdate() but proper stream acquisition date */
+ bool b_late;
input_clock_Update( p_pgrm->p_clock, VLC_OBJECT(p_sys->p_input),
- p_sys->p_input->p->b_can_pace_control || p_sys->b_buffering, i_pcr, mdate() );
- /* Check buffering state on master clock update */
- if( p_sys->b_buffering && p_pgrm == p_sys->p_pgrm )
- EsOutDecodersStopBuffering( out, false );
+ &b_late,
+ p_sys->p_input->p->b_can_pace_control || p_sys->b_buffering,
+ EsOutIsExtraBufferingAllowed( out ),
+ i_pcr, mdate() );
+ if( p_pgrm == p_sys->p_pgrm )
+ {
+ if( p_sys->b_buffering )
+ {
+ /* Check buffering state on master clock update */
+ EsOutDecodersStopBuffering( out, false );
+ }
+ else if( b_late )
+ {
+ mtime_t i_pts_delay = input_clock_GetJitter( p_pgrm->p_clock );
+
+ /* Avoid dangerously high value */
+ const mtime_t i_pts_delay_max = 30000000;
+ if( i_pts_delay > i_pts_delay_max )
+ i_pts_delay = __MAX( i_pts_delay_max, p_sys->i_pts_delay );
+
+ /* Force a rebufferization when we are too late */
+ msg_Err( p_sys->p_input,
+ "ES_OUT_SET_(GROUP_)PCR is called too late, increasing pts_delay to %d ms",
+ (int)(i_pts_delay/1000) );
+
+ /* It is not really good, as we throw away already buffered data
+ * TODO have a mean to correctly reenter bufferization */
+ es_out_Control( out, ES_OUT_RESET_PCR );
+
+ es_out_Control( out, ES_OUT_SET_JITTER, i_pts_delay, p_sys->i_cr_average );
+ }
+ }
return VLC_SUCCESS;
}
@@ -2361,6 +2467,14 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
return EsOutProgramDel( out, i_group );
}
+ case ES_OUT_SET_META:
+ {
+ const vlc_meta_t *p_meta = va_arg( args, const vlc_meta_t * );
+
+ EsOutMeta( out, p_meta );
+ return VLC_SUCCESS;
+ }
+
case ES_OUT_GET_WAKE_UP:
{
mtime_t *pi_wakeup = (mtime_t*)va_arg( args, mtime_t* );
diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c
index a48d365..19f4d21 100644
--- a/src/input/es_out_timeshift.c
+++ b/src/input/es_out_timeshift.c
@@ -599,6 +599,7 @@ static int ControlLocked( es_out_t *p_out, int i_query, va_list args )
case ES_OUT_SET_GROUP_EPG:
case ES_OUT_SET_ES_SCRAMBLED_STATE:
case ES_OUT_DEL_GROUP:
+ case ES_OUT_SET_META:
case ES_OUT_SET_ES:
case ES_OUT_RESTART_ES:
case ES_OUT_SET_ES_DEFAULT:
@@ -1315,9 +1316,11 @@ static int CmdInitControl( ts_cmd_t *p_cmd, int i_query, va_list args, bool b_co
case ES_OUT_RESET_PCR: /* no arg */
break;
+ case ES_OUT_SET_META: /* arg1=const vlc_meta_t* */
case ES_OUT_SET_GROUP_META: /* arg1=int i_group arg2=vlc_meta_t* */
{
- p_cmd->control.int_meta.i_int = (int)va_arg( args, int );
+ if( i_query == ES_OUT_SET_GROUP_META )
+ p_cmd->control.int_meta.i_int = (int)va_arg( args, int );
vlc_meta_t *p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t * );
if( b_copy )
@@ -1459,6 +1462,9 @@ static int CmdExecuteControl( es_out_t *p_out, ts_cmd_t *p_cmd )
return es_out_Control( p_out, i_query, p_cmd->control.es_bool.p_es->p_es,
p_cmd->control.es_bool.b_bool );
+ case ES_OUT_SET_META: /* arg1=const vlc_meta_t* */
+ return es_out_Control( p_out, i_query, p_cmd->control.int_meta.p_meta );
+
/* Modified control */
case ES_OUT_SET_ES: /* arg1= es_out_id_t* */
case ES_OUT_RESTART_ES: /* arg1= es_out_id_t* */
@@ -1488,7 +1494,8 @@ static int CmdExecuteControl( es_out_t *p_out, ts_cmd_t *p_cmd )
}
static void CmdCleanControl( ts_cmd_t *p_cmd )
{
- if( p_cmd->control.i_query == ES_OUT_SET_GROUP_META &&
+ if( ( p_cmd->control.i_query == ES_OUT_SET_GROUP_META ||
+ p_cmd->control.i_query == ES_OUT_SET_META ) &&
p_cmd->control.int_meta.p_meta )
{
vlc_meta_Delete( p_cmd->control.int_meta.p_meta );
diff --git a/src/input/input.c b/src/input/input.c
index be4eb7b..d003625 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -763,7 +763,7 @@ static void MainLoop( input_thread_t *p_input )
* is paused -> this may cause problem with some of them
* The same problem can be seen when seeking while paused */
b_paused = p_input->p->i_state == PAUSE_S &&
- !es_out_GetBuffering( p_input->p->p_es_out );
+ ( !es_out_GetBuffering( p_input->p->p_es_out ) || p_input->p->input.b_eof );
if( !b_paused )
{
@@ -773,7 +773,7 @@ static void MainLoop( input_thread_t *p_input )
i_wakeup = es_out_GetWakeup( p_input->p->p_es_out );
}
- else if( !p_input->b_eof && !es_out_GetEmpty( p_input->p->p_es_out ) )
+ else if( !es_out_GetEmpty( p_input->p->p_es_out ) )
{
msg_Dbg( p_input, "waiting decoder fifos to empty" );
i_wakeup = mdate() + INPUT_IDLE_SLEEP;
@@ -816,13 +816,9 @@ static void MainLoop( input_thread_t *p_input )
i_statistic_update = i_current + INT64_C(1000000);
}
- /* Check if i_wakeup is still valid */
+ /* Update the wakeup time */
if( i_wakeup != 0 )
- {
- mtime_t i_new_wakeup = es_out_GetWakeup( p_input->p->p_es_out );
- if( !i_new_wakeup )
- i_wakeup = 0;
- }
+ i_wakeup = es_out_GetWakeup( p_input->p->p_es_out );
} while( i_current < i_wakeup );
}
@@ -1668,9 +1664,8 @@ static bool Control( input_thread_t *p_input,
int64_t i_length;
/* Emulate it with a SET_POS */
- demux_Control( p_input->p->input.p_demux,
- DEMUX_GET_LENGTH, &i_length );
- if( i_length > 0 )
+ if( !demux_Control( p_input->p->input.p_demux,
+ DEMUX_GET_LENGTH, &i_length ) && i_length > 0 )
{
double f_pos = (double)i_time / (double)i_length;
i_ret = demux_Control( p_input->p->input.p_demux,
@@ -2430,8 +2425,9 @@ static int InputSourceInit( input_thread_t *p_input,
if( in->p_demux )
{
/* Get infos from access_demux */
- demux_Control( in->p_demux,
- DEMUX_GET_PTS_DELAY, &in->i_pts_delay );
+ int i_ret = demux_Control( in->p_demux,
+ DEMUX_GET_PTS_DELAY, &in->i_pts_delay );
+ assert( !i_ret );
in->i_pts_delay = __MAX( 0, __MIN( in->i_pts_delay, INPUT_PTS_DELAY_MAX ) );
@@ -2885,54 +2881,8 @@ static void InputMetaUser( input_thread_t *p_input, vlc_meta_t *p_meta )
*****************************************************************************/
static void InputUpdateMeta( input_thread_t *p_input, vlc_meta_t *p_meta )
{
- input_item_t *p_item = p_input->p->p_item;
-
- char *psz_title = NULL;
- char *psz_arturl = input_item_GetArtURL( p_item );
-
- vlc_mutex_lock( &p_item->lock );
-
- if( vlc_meta_Get( p_meta, vlc_meta_Title ) && !p_item->b_fixed_name )
- psz_title = strdup( vlc_meta_Get( p_meta, vlc_meta_Title ) );
-
- vlc_meta_Merge( p_item->p_meta, p_meta );
-
+ es_out_ControlSetMeta( p_input->p->p_es_out, p_meta );
vlc_meta_Delete( p_meta );
-
- if( !psz_arturl || *psz_arturl == '\0' )
- {
- const char *psz_tmp = vlc_meta_Get( p_item->p_meta, vlc_meta_ArtworkURL );
- if( psz_tmp )
- psz_arturl = strdup( psz_tmp );
- }
- vlc_mutex_unlock( &p_item->lock );
-
- if( psz_arturl && *psz_arturl )
- {
- input_item_SetArtURL( p_item, psz_arturl );
-
- if( !strncmp( psz_arturl, "attachment://", strlen("attachment") ) )
- {
- /* Don't look for art cover if sout
- * XXX It can change when sout has meta data support */
- if( p_input->p->p_sout && !p_input->b_preparsing )
- input_item_SetArtURL( p_item, "" );
- else
- input_ExtractAttachmentAndCacheArt( p_input );
- }
- }
- free( psz_arturl );
-
- if( psz_title )
- {
- input_item_SetName( p_item, psz_title );
- free( psz_title );
- }
- input_item_SetPreparsed( p_item, true );
-
- input_SendEventMeta( p_input );
-
- /** \todo handle sout meta */
}
static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_attachment,
diff --git a/share/lua/playlist/youtube.lua b/share/lua/playlist/youtube.lua
index 238d3eb..9b165e0 100644
--- a/share/lua/playlist/youtube.lua
+++ b/share/lua/playlist/youtube.lua
@@ -1,7 +1,7 @@
--[[
$Id$
- Copyright © 2007 the VideoLAN team
+ Copyright © 2007-2009 the VideoLAN team
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -74,7 +74,8 @@ function parse()
end
-- OLD: var swfArgs = {hl:'en',BASE_YT_URL:'http://youtube.com/',video_id:'XPJ7d8dq0t8',l:'292',t:'OEgsToPDskLFdOYrrlDm3FQPoQBYaCP1',sk:'0gnr-AE6QZJEZmCMd3lq_AC'};
-- NEW: var swfArgs = { "BASE_YT_URL": "http://youtube.com", "video_id": "OHVvVmUNBFc", "l": 88, "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA", "tk": "mEL4E7PqHeaZp5OG19NQThHt9mXJU4PbRTOw6lz9osHi4Hixp7RE1w=="};
- if string.match( line, "swfArgs" ) and string.match( line, "video_id" ) then
+ -- NEWER: 'SWF_ARGS': { [a lot of stuff...], "video_id": "OHVvVmUNBFc", "sk": "WswKuJzDBsdD6oG3IakCXgC", "t": "OEgsToPDskK3zO44y0QN8Fr5ZSAZwCQp", "plid": "AARGnwWMrmGkbpOxAAAA4AT4IAA"};
+ if ( string.match( line, "SWF_ARGS" ) or string.match( line, "swfArgs" ) ) and string.match( line, "video_id" ) then
if string.match( line, "BASE_YT_URL" ) then
_,_,base_yt_url = string.find( line, "\"BASE_YT_URL\": \"(.-)\"" )
end
diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h
index 043e557..fdde1c9 100644
--- a/include/vlc_es_out.h
+++ b/include/vlc_es_out.h
@@ -90,6 +90,9 @@ enum es_out_query_e
* XXX You SHALL call ES_OUT_RESET_PCR before any other es_out_Control/Send calls. */
ES_OUT_GET_EMPTY, /* arg1=bool* res=cannot fail */
+ /* Set global meta data (The vlc_meta_t is not modified nor released) */
+ ES_OUT_SET_META, /* arg1=const vlc_meta_t * */
+
/* First value usable for private control */
ES_OUT_PRIVATE_START = 0x10000,
};
@@ -145,6 +148,11 @@ static inline void es_out_Delete( es_out_t *p_out )
p_out->pf_destroy( p_out );
}
+static inline int es_out_ControlSetMeta( es_out_t *out, const vlc_meta_t *p_meta )
+{
+ return es_out_Control( out, ES_OUT_SET_META, p_meta );
+}
+
/**
* @}
*/
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore 19 Sep 2009 22:19:30 -0000 1.22
+++ .cvsignore 25 Oct 2009 16:41:04 -0000 1.23
@@ -1 +1 @@
-vlc-1.0.2.tar.bz2
+vlc-1.0.3-rc.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources 20 Sep 2009 21:42:04 -0000 1.26
+++ sources 25 Oct 2009 16:41:04 -0000 1.27
@@ -1 +1 @@
-69d4e30fe4fc2691780fbeacd40359d2 vlc-1.0.2.tar.bz2
+a83fc8d8a4bc804b27da6bd60b091967 vlc-1.0.3-rc.tar.bz2
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- vlc.spec 16 Oct 2009 10:10:22 -0000 1.66
+++ vlc.spec 25 Oct 2009 16:41:04 -0000 1.67
@@ -1,14 +1,14 @@
# TODO: libdc1394(juju), modularization (vlc-plugin-foo)
#global live555_date 2009.07.28
-#global vlc_rc -rc4
+%global vlc_rc -rc
%global vlc_bootstrap 1
Summary: Multi-platform MPEG, DVD, and DivX player
Name: vlc
-Version: 1.0.2
-Release: 2%{?dist}
+Version: 1.0.3
+Release: 0.1_rc%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -22,7 +22,7 @@
Patch2: 0002-Default-aout-for-pulse.patch
Patch3: 300_all_pic.patch
Patch4: 310_all_mmx_pic.patch
-Patch5: vlc-1.0-bugfix-20091016.patch
+Patch5: vlc-1.0-bugfix-20091025.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -217,16 +217,6 @@
JACK audio plugin for the VLC media player.
-%{?_with_dc1394:
-%package plugin-dc1394
-Summary: VLC Media Player Plugins for dc1394
-Group: Applications/Multimedia
-Requires: %{name}-core%{_isa} = %{version}
-
-%description plugin-dc1394
-VLC plugin for libdc1394
-}
-
%prep
%setup -q -n %{name}-%{version}%{?vlc_rc}
%if 0%{?live555_date:1}
@@ -244,7 +234,7 @@
rm modules/access/videodev2.h
ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h
%if 0%{?vlc_bootstrap:1}
-rm aclocal.m4 m4/lib*.m4 m4/lt*.m4
+rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
./bootstrap
%endif
@@ -502,9 +492,6 @@
%exclude %{_libdir}/vlc/audio_output/libjack_plugin.so
%exclude %{_libdir}/vlc/audio_output/libportaudio_plugin.so
%exclude %{_libdir}/vlc/audio_output/libpulse_plugin.so
-%{?_with_dc1394:
-%exclude %{_libdir}/vlc/access/libdc1394_plugin.so
-}
%{_libdir}/vlc/
%{_mandir}/man1/vlc*.1*
@@ -524,12 +511,6 @@
%{_libdir}/vlc/video_output/libsvgalib_plugin.so
%endif
-%{?_with_dc1394:
-%files plugin-dc1394
-%defattr(-,root,root,-)
-%{_libdir}/vlc/access/libdc1394_plugin.so
-}
-
%files devel
%defattr(-,root,root,-)
%doc HACKING
@@ -549,6 +530,9 @@
%changelog
+* Sun Oct 25 2009 kwizart < kwizart at gmail.com > - 1.0.3.0.1_rc
+- Update to 1.0.3-rc
+
* Thu Oct 16 2009 kwizart < kwizart at gmail.com > - 1.0.2-2
- Update to 1.0-bugfix 20091016
- Rebuild for x264/ffmpeg
--- vlc-1.0-bugfix-20091016.patch DELETED ---
14 years, 6 months
rpms/smc/devel .cvsignore, 1.4, 1.5 smc.spec, 1.9, 1.10 sources, 1.4, 1.5 smc-1.5-boost-1.36.patch, 1.3, NONE
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/smc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2725
Modified Files:
.cvsignore smc.spec sources
Removed Files:
smc-1.5-boost-1.36.patch
Log Message:
* Sun Oct 25 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.9-1
- New upstream release 1.9
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/smc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 15 Apr 2009 09:16:03 -0000 1.4
+++ .cvsignore 25 Oct 2009 13:57:32 -0000 1.5
@@ -1 +1 @@
-smc-1.8.tar.bz2
+smc-1.9.tar.bz2
Index: smc.spec
===================================================================
RCS file: /cvs/free/rpms/smc/devel/smc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- smc.spec 24 Oct 2009 11:43:06 -0000 1.9
+++ smc.spec 25 Oct 2009 13:57:32 -0000 1.10
@@ -1,6 +1,6 @@
Name: smc
-Version: 1.8
-Release: 3%{?dist}
+Version: 1.9
+Release: 1%{?dist}
Summary: 2D platform game that uses OpenGL in a style similar to Super Mario
Group: Amusements/Games
License: GPLv3
@@ -8,7 +8,6 @@
Source0: http://downloads.sourceforge.net/smclone/%{name}-%{version}.tar.bz2
Source1: smc.sh
Source2: dochelper.pl
-Patch0: smc-1.5-boost-1.36.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: boost-devel >= 1.31
BuildRequires: cegui-devel >= 0.5
@@ -31,7 +30,6 @@
%prep
%setup -q
-%patch0 -p1
#Fix EOL chars
sed -i 's/\r//' docs/style.css docs/*.html docs/*.txt
@@ -109,6 +107,9 @@
%changelog
+* Sun Oct 25 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.9-1
+- New upstream release 1.9
+
* Sat Oct 24 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.8-3
- rebuild for new libboost
Index: sources
===================================================================
RCS file: /cvs/free/rpms/smc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 15 Apr 2009 09:16:03 -0000 1.4
+++ sources 25 Oct 2009 13:57:32 -0000 1.5
@@ -1 +1 @@
-448efe236ae6031dcf08761496d469ad smc-1.8.tar.bz2
+75ab7826303c49aec25b052a8b90287f smc-1.9.tar.bz2
--- smc-1.5-boost-1.36.patch DELETED ---
14 years, 6 months
rpms/gstreamer-plugins-bad/devel gstreamer-plugins-bad.spec, 1.26, 1.27
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-plugins-bad/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2588
Modified Files:
gstreamer-plugins-bad.spec
Log Message:
* Sun Oct 25 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.13-10
- Disable faac AAC (MPEG 2 / 4 audio) encode plugin as faac was moved to
non free (rf 898)
Index: gstreamer-plugins-bad.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-bad/devel/gstreamer-plugins-bad.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gstreamer-plugins-bad.spec 20 Oct 2009 06:29:53 -0000 1.26
+++ gstreamer-plugins-bad.spec 25 Oct 2009 13:54:43 -0000 1.27
@@ -7,7 +7,7 @@
Summary: GStreamer streaming media framework "bad" plug-ins
Name: gstreamer-plugins-bad
Version: 0.10.13
-Release: 9%{?dist}
+Release: 10%{?dist}
# The freeze and nfs plugins are LGPLv2 (only)
License: LGPLv2+ and LGPLv2
Group: Applications/Multimedia
@@ -28,7 +28,6 @@
BuildRequires: liboil-devel
BuildRequires: directfb-devel
BuildRequires: libdca-devel
-BuildRequires: faac-devel
BuildRequires: faad2-devel
BuildRequires: gsm-devel
BuildRequires: libmpcdec-devel
@@ -126,15 +125,14 @@
%build
# Disable ladspa, selector & mpegdemux, they are patched into Fedora's packages
-# Disable amrwb as it does not belong in rpmfusion-free
-# Disable libmimic plugin until libmimic is reviewed
-# Disable other farsight plugins, they are patched into Fedora's packages
+# Disable amrwb and faac as they do not belong in rpmfusion-free
+# Disable farsight plugins, they are patched into Fedora's packages
%configure \
--with-package-name="gst-plugins-bad rpmfusion rpm" \
--with-package-origin="http://rpmfusion.org/" \
--enable-debug --disable-static --enable-gtk-doc --enable-experimental \
--disable-ladspa --disable-mpegdemux --disable-selector \
- --disable-amrwb \
+ --disable-amrwb --disable-faac \
--disable-valve --disable-dtmf --disable-autoconvert \
--disable-liveadder --disable-rtpmux --disable-rtpmanager
# Don't use rpath!
@@ -225,7 +223,6 @@
%{_libdir}/gstreamer-%{majorminor}/libgstdfbvideosink.so
%{_libdir}/gstreamer-%{majorminor}/libgstdirac.so
%{_libdir}/gstreamer-%{majorminor}/libgstdtsdec.so
-%{_libdir}/gstreamer-%{majorminor}/libgstfaac.so
%{_libdir}/gstreamer-%{majorminor}/libgstfaad.so
%{_libdir}/gstreamer-%{majorminor}/libgstgsm.so
%{_libdir}/gstreamer-%{majorminor}/libgstjp2k.so
@@ -271,6 +268,10 @@
%changelog
+* Sun Oct 25 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.13-10
+- Disable faac AAC (MPEG 2 / 4 audio) encode plugin as faac was moved to
+ non free (rf 898)
+
* Tue Oct 20 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.10.13-9
- disable libgstneonhttpsrc
14 years, 6 months
rpms/fakenes/devel fakenes-0.5.9-beta3-gcc43.patch, NONE, 1.1 fakenes-0.5.9-beta3-openal-build.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 fakenes-0.5.8-driver-switch.patch, 1.1, 1.2 fakenes.spec, 1.6, 1.7 sources, 1.2, 1.3 fakenes-0.5.8-alutinit.patch, 1.1, NONE
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/fakenes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31766
Modified Files:
.cvsignore fakenes-0.5.8-driver-switch.patch fakenes.spec
sources
Added Files:
fakenes-0.5.9-beta3-gcc43.patch
fakenes-0.5.9-beta3-openal-build.patch
Removed Files:
fakenes-0.5.8-alutinit.patch
Log Message:
* Sun Oct 25 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.9-0.1.beta3
- New upstream release 0.5.9-beta3
fakenes-0.5.9-beta3-gcc43.patch:
--- NEW FILE fakenes-0.5.9-beta3-gcc43.patch ---
--- fakenes-0.5.9-beta3/src/audio.cpp~ 2007-06-22 04:26:25.000000000 +0200
+++ fakenes-0.5.9-beta3/src/audio.cpp 2009-10-25 10:45:45.000000000 +0100
@@ -7,6 +7,7 @@
You must read and accept the license prior to use. */
#include <allegro.h>
+#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <vector>
--- fakenes-0.5.9-beta3/src/audio.cpp~ 2009-10-25 10:50:09.000000000 +0100
+++ fakenes-0.5.9-beta3/src/audio.cpp 2009-10-25 10:50:40.000000000 +0100
@@ -6,14 +6,16 @@
This is free software. See 'LICENSE' for details.
You must read and accept the license prior to use. */
+/* This includes c++ <vector> which uses min and max internally, which get
+ defined as macros in allegro.h, so include this before allegro.h */
+#include "audio_int.h"
#include <allegro.h>
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <vector>
#include "apu.h"
#include "audio.h"
-#include "audio_int.h"
#include "audiolib.h"
#include "common.h"
#include "debug.h"
--- fakenes-0.5.9-beta3/src/audiolib.cpp~ 2007-06-16 21:27:27.000000000 +0200
+++ fakenes-0.5.9-beta3/src/audiolib.cpp 2009-10-25 10:51:01.000000000 +0100
@@ -6,11 +6,13 @@
This is free software. See 'LICENSE' for details.
You must read and accept the license prior to use. */
+/* This includes c++ <vector> which uses min and max internally, which get
+ defined as macros in allegro.h, so include this before allegro.h */
+#include "audio_int.h"
#include <allegro.h>
#include <cstdlib>
#include <cstring>
#include "audio.h"
-#include "audio_int.h"
#include "audiolib.h"
#include "common.h"
#include "debug.h"
fakenes-0.5.9-beta3-openal-build.patch:
--- NEW FILE fakenes-0.5.9-beta3-openal-build.patch ---
diff -up fakenes-0.5.9-beta3/build/openal.cbd~ fakenes-0.5.9-beta3/build/openal.cbd
--- fakenes-0.5.9-beta3/build/openal.cbd~ 2007-06-14 12:29:07.000000000 +0200
+++ fakenes-0.5.9-beta3/build/openal.cbd 2009-10-25 11:07:36.000000000 +0100
@@ -23,7 +23,7 @@ CFLAGS += ' -DUSE_OPENAL'
# --
do ifplat unix
- LDFLAGS += ' `openal-config --libs`'
+ LDFLAGS += ' `pkg-config openal --libs`'
else
LDFLAGS += ' -lOpenAL32'
done
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/fakenes/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 24 Jul 2008 11:29:16 -0000 1.2
+++ .cvsignore 25 Oct 2009 13:06:47 -0000 1.3
@@ -1 +1 @@
-fakenes-0.5.8.tar.bz2
+fakenes-0.5.9-beta3.tar.gz
fakenes-0.5.8-driver-switch.patch:
Index: fakenes-0.5.8-driver-switch.patch
===================================================================
RCS file: /cvs/free/rpms/fakenes/devel/fakenes-0.5.8-driver-switch.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fakenes-0.5.8-driver-switch.patch 24 Jul 2008 11:29:16 -0000 1.1
+++ fakenes-0.5.8-driver-switch.patch 25 Oct 2009 13:06:47 -0000 1.2
@@ -1,10 +1,12 @@
---- fakenes-0.5.8/src/gui.c.driver 2006-04-26 15:20:24.000000000 +0200
-+++ fakenes-0.5.8/src/gui.c 2006-08-11 22:30:57.000000000 +0200
-@@ -237,55 +237,58 @@
- TOGGLE_MENU_ITEM(audio_channels_menu_extended_2, dsp_get_channel_enabled (APU_CHANNEL_EXTRA_2));
- TOGGLE_MENU_ITEM(audio_channels_menu_extended_3, dsp_get_channel_enabled (APU_CHANNEL_EXTRA_3));
+diff -ur fakenes-0.5.9-beta3/src/gui.c fakenes-0.5.9-beta3.new/src/gui.c
+--- fakenes-0.5.9-beta3/src/gui.c 2007-06-25 18:43:10.000000000 +0200
++++ fakenes-0.5.9-beta3.new/src/gui.c 2009-10-25 10:38:18.000000000 +0100
+@@ -206,55 +206,59 @@
+ TOGGLE_MENU_ITEM(audio_output_buffer_menu_175ms, (audio_options.buffer_length_ms_hint == 175));
+ TOGGLE_MENU_ITEM(audio_output_buffer_menu_200ms, (audio_options.buffer_length_ms_hint == 200));
-+ TOGGLE_MENU_ITEM(video_driver_menu_automatic, (menu_video_driver == GFX_AUTODETECT));
++ TOGGLE_MENU_ITEM(video_driver_menu_safe, (menu_video_driver == GFX_SAFE));
++ TOGGLE_MENU_ITEM(video_driver_menu_automatic, (menu_video_driver == GFX_AUTODETECT));
+
#ifdef ALLEGRO_DOS
@@ -82,33 +84,79 @@
#endif /* USE_ALLEGROGL */
---- fakenes-0.5.8/src/video.c.driver 2006-04-24 22:27:32.000000000 +0200
-+++ fakenes-0.5.8/src/video.c 2006-08-11 22:29:11.000000000 +0200
-@@ -62,7 +62,13 @@
+@@ -2562,6 +2562,7 @@ static int video_menu_color (void)
+ return (D_CLOSE); \
+ }
+
++DRIVER_MENU_HANDLER(safe, GFX_SAFE)
+ DRIVER_MENU_HANDLER(automatic, GFX_AUTODETECT)
+
+ #ifdef ALLEGRO_DOS
+diff -ur fakenes-0.5.9-beta3/src/include/gui/menus.h fakenes-0.5.9-beta3.new/src/include/gui/menus.h
+--- fakenes-0.5.9-beta3/src/include/gui/menus.h 2007-06-19 10:20:26.000000000 +0200
++++ fakenes-0.5.9-beta3.new/src/include/gui/menus.h 2009-10-25 10:36:00.000000000 +0100
+@@ -582,6 +582,7 @@
+
+ #endif /* !ALLEGRO_UNIX */
+
++DEFINE_MENU_CALLBACK(video_driver_menu_safe);
+ DEFINE_MENU_CALLBACK(video_driver_menu_automatic);
+
+ #ifdef USE_ALLEGROGL
+@@ -594,6 +595,7 @@
+
+ static const MENU video_driver_menu_base[] =
+ {
++ { "&Safe", video_driver_menu_safe, NULL, 0, NULL },
+ { "&Automatic", video_driver_menu_automatic, NULL, 0, NULL },
+ MENU_SPLITTER,
+
+diff -ur fakenes-0.5.9-beta3/src/include/video.h fakenes-0.5.9-beta3.new/src/include/video.h
+--- fakenes-0.5.9-beta3/src/include/video.h 2007-06-21 23:39:36.000000000 +0200
++++ fakenes-0.5.9-beta3.new/src/include/video.h 2009-10-25 10:31:20.000000000 +0100
+@@ -50,7 +50,7 @@
+ extern BOOL video_force_fullscreen;
+ extern int video_cached_color_depth; /* Read only. */
+
+-extern int video_driver;
++extern int menu_video_driver;
+
+ extern BITMAP *base_video_buffer;
+ extern BITMAP *video_buffer;
+Only in fakenes-0.5.9-beta3.new/src/include: video.h~
+diff -ur fakenes-0.5.9-beta3/src/video.c fakenes-0.5.9-beta3.new/src/video.c
+--- fakenes-0.5.9-beta3/src/video.c 2007-06-21 23:39:36.000000000 +0200
++++ fakenes-0.5.9-beta3.new/src/video.c 2009-10-25 10:39:47.000000000 +0100
+@@ -62,14 +62,21 @@
BOOL video_force_fullscreen = FALSE;
int video_cached_color_depth = 0; /* Read only. */
--int video_driver = 0;
+/* 2 versions of video driver "video_driver" contains the one actually used,
-+ "menu_video_driver" contains the one configured by the user from the
-+ menu, this can be different from the one actually used, because hot
-+ switching between regular allegro drivers and alleggl drivers is not
-+ supported. */
-+static int video_driver = 0;
-+int menu_video_driver = 0;
++ "menu_video_driver" contains the one configured by the user from the
++ menu, this can be different from the one actually used, because hot
++ switching between regular allegro drivers and alleggl drivers is not
++ supported. */
+ #ifdef ALLEGRO_DOS
+ /* We use autodetect under DOS because I think the safe driver defaults to like 320x200 or something which is too small
+ for the new GUI even with the smallest font. */
+-int video_driver = GFX_AUTODETECT;
++static int video_driver = GFX_AUTODETECT;
++int menu_video_driver = GFX_AUTODETECT;
+ #else
+ /* Under Windowed operating systems, resolutions above or equal to 640x480 are always present and therefor we can go ahead
+ and use the safe driver for better compatibility without hampering the GUI at the same time. */
+-int video_driver = GFX_SAFE;
++static int video_driver = GFX_SAFE;
++int menu_video_driver = GFX_SAFE;
+ #endif
BITMAP *base_video_buffer = NULL;
- BITMAP *video_buffer = NULL;
-@@ -139,6 +145,7 @@
- int width, height;
- int result;
- const CHAR *font_file;
-+ static BOOL firsttime = TRUE;
-
- log_printf ("VIDEO: Entering video_init().");
-
-@@ -152,7 +159,15 @@
+@@ -143,9 +150,19 @@
+ void video_load_config (void)
+ {
++ static BOOL firsttime = TRUE;
++
log_printf ("VIDEO: Loading configuration.");
- video_driver = get_config_id ("video", "driver", video_driver);
@@ -124,8 +172,8 @@
screen_width = get_config_int ("video", "screen_width", screen_width);
screen_height = get_config_int ("video", "screen_height", screen_height);
color_depth = get_config_int ("video", "color_depth", color_depth);
-@@ -576,7 +591,7 @@
-
+@@ -169,7 +186,7 @@
+ {
log_printf ("VIDEO: Saving configuration.");
- set_config_id ("video", "driver", video_driver);
@@ -133,7 +181,47 @@
set_config_int ("video", "screen_width", screen_width);
set_config_int ("video", "screen_height", screen_height);
set_config_int ("video", "color_depth", color_depth);
-@@ -1639,13 +1654,29 @@
+@@ -191,7 +208,7 @@
+
+ int video_init (void)
+ {
+- int driver;
++ int driver = video_driver;
+ int width, height;
+ int result;
+ const CHAR *font_file;
+@@ -222,11 +239,13 @@
+ else
+ has_desktop = FALSE;
+
+- /* We want to switch from the safe driver to an automatic driver when entering fullscreen modes. */
+- if((video_driver == GFX_SAFE) && video_force_fullscreen)
+- driver = GFX_AUTODETECT;
+-
+- if(video_driver == GFX_AUTODETECT ) {
++ if(video_driver == GFX_SAFE) {
++ /* We want to switch from the safe driver to an automatic driver when entering fullscreen modes. */
++ if(video_force_fullscreen)
++ driver = GFX_AUTODETECT_FULLSCREEN;
++ else
++ driver = GFX_SAFE;
++ } else { /* video_driver == GFX_AUTODETECT */
+ /* Determine which automatic driver to use. */
+ if(video_force_fullscreen)
+ driver = GFX_AUTODETECT_FULLSCREEN;
+@@ -235,11 +254,7 @@
+ else
+ driver = GFX_AUTODETECT;
+ }
+- else
+- driver = video_driver;
+ }
+- else
+- driver = video_driver;
+
+ #ifdef USE_ALLEGROGL
+
+@@ -1644,13 +1659,29 @@
void video_set_driver (int driver)
{
int old_driver;
@@ -165,26 +253,17 @@
old_driver = gfx_driver -> id;
-@@ -1673,6 +1704,11 @@
+@@ -1678,6 +1709,13 @@
preserve_video_buffer = FALSE;
preserve_palette = FALSE;
+
-+ if (video_driver == GFX_AUTODETECT)
-+ menu_video_driver = GFX_AUTODETECT;
++ if (video_driver == GFX_SAFE)
++ menu_video_driver = GFX_SAFE;
++ else if (video_driver == GFX_AUTODETECT)
++ menu_video_driver = GFX_AUTODETECT;
+ else
-+ menu_video_driver = gfx_driver -> id;
++ menu_video_driver = gfx_driver -> id;
}
---- fakenes-0.5.8/src/include/video.h.driver 2006-04-24 02:54:48.000000000 +0200
-+++ fakenes-0.5.8/src/include/video.h 2006-08-11 22:29:11.000000000 +0200
-@@ -49,7 +49,7 @@
- BOOL video_force_fullscreen;
- int video_cached_color_depth; /* Read only. */
-
--int video_driver;
-+int menu_video_driver;
-
- BITMAP *base_video_buffer;
- BITMAP *video_buffer;
Index: fakenes.spec
===================================================================
RCS file: /cvs/free/rpms/fakenes/devel/fakenes.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fakenes.spec 24 Oct 2009 11:39:41 -0000 1.6
+++ fakenes.spec 25 Oct 2009 13:06:47 -0000 1.7
@@ -1,15 +1,18 @@
+%define beta beta3
+
Name: fakenes
-Version: 0.5.8
-Release: 9%{?dist}
+Version: 0.5.9
+Release: 0.1.%{beta}%{?dist}
Summary: Nintendo Entertainment System emulator
Group: Amusements/Games
License: Artistic
URL: http://fakenes.sourceforge.net/
-Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{beta}.tar.gz
Source1: %{name}.desktop
Patch0: fakenes-0.5.8-menu-exit.patch
Patch1: fakenes-0.5.8-driver-switch.patch
-Patch2: fakenes-0.5.8-alutinit.patch
+Patch2: fakenes-0.5.9-beta3-gcc43.patch
+Patch3: fakenes-0.5.9-beta3-openal-build.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: allegro-devel alleggl-devel zlib-devel openal-devel
BuildRequires: libGLU-devel freealut-devel desktop-file-utils
@@ -24,10 +27,11 @@
%prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{beta}
%patch0 -p1 -z .menu
%patch1 -p1 -z .driver
-%patch2 -p1 -z .alutinit
+%patch2 -p1 -z .gcc43
+%patch3 -p1 -z .openal-build
sed -i 's/\r//' docs/faq.html
@@ -72,6 +76,9 @@
%changelog
+* Sun Oct 25 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.5.9-0.1.beta3
+- New upstream release 0.5.9-beta3
+
* Sat Oct 24 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.5.8-9
- rebuild for new openal
Index: sources
===================================================================
RCS file: /cvs/free/rpms/fakenes/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 24 Jul 2008 11:29:16 -0000 1.2
+++ sources 25 Oct 2009 13:06:47 -0000 1.3
@@ -1 +1 @@
-bc2650c42c63f18326d03e932245a787 fakenes-0.5.8.tar.bz2
+48330653c50747d082ee13958cbf2a2c fakenes-0.5.9-beta3.tar.gz
--- fakenes-0.5.8-alutinit.patch DELETED ---
14 years, 6 months
rpms/faac/devel faac.spec,1.7,1.8
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/faac/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27066/devel
Modified Files:
faac.spec
Log Message:
Rebuild for nonfree and install with -p
Index: faac.spec
===================================================================
RCS file: /cvs/nonfree/rpms/faac/devel/faac.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- faac.spec 7 Apr 2009 16:48:10 -0000 1.7
+++ faac.spec 25 Oct 2009 11:50:52 -0000 1.8
@@ -1,6 +1,6 @@
Name: faac
Version: 1.28
-Release: 1%{?dist}.1
+Release: 2%{?dist}
Summary: Encoder and encoding library for MPEG2/4 AAC
Group: Applications/Multimedia
@@ -52,7 +52,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%clean
@@ -78,6 +78,10 @@
%{_includedir}/*.h
%changelog
+* Sun Oct 25 2009 kwizart < kwizart at gmail.com > - 1.28-2
+- Install with -p
+- Moved in nonfree
+
* Tue Apr 07 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.28-1.1
- rebuild
14 years, 6 months
rpms/ffmpeg/F-11 ffmpeg-snapshot.sh,1.2,1.3
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21104
Modified Files:
ffmpeg-snapshot.sh
Log Message:
libswscale is svn extern, so keep that in sync when generating the snapshot
Index: ffmpeg-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-11/ffmpeg-snapshot.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ffmpeg-snapshot.sh 5 Sep 2008 15:17:52 -0000 1.2
+++ ffmpeg-snapshot.sh 24 Oct 2009 15:27:00 -0000 1.3
@@ -17,6 +17,9 @@
cd "$tmp"
svn checkout -r {$svn} svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-$svn
cd ffmpeg-$svn
+pushd libswscale
+svn update -r {$svn} libswscale
+popd
./version.sh . version.h
find . -type d -name .svn -print0 | xargs -0r rm -rf
sed -i -e '/^\.PHONY: version\.h$/d' Makefile
14 years, 6 months
rpms/realcrypt/devel realcrypt.spec,1.1,1.2
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/realcrypt/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20623/devel
Modified Files:
realcrypt.spec
Log Message:
Index: realcrypt.spec
===================================================================
RCS file: /cvs/nonfree/rpms/realcrypt/devel/realcrypt.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- realcrypt.spec 19 Jul 2009 12:44:42 -0000 1.1
+++ realcrypt.spec 24 Oct 2009 15:20:35 -0000 1.2
@@ -1,7 +1,7 @@
Name: realcrypt
Summary: Cross platform disk encryption software
Version: 6.2a
-Release: 8%{?dist}
+Release: 9%{?dist}
License: TrueCrypt License Version 2.7
Group: Applications/File
URL: http://www.truecrypt.org/
@@ -142,6 +142,9 @@
%changelog
+* Sat Oct 24 2009 Leigh Scott <leigh123linux(a)googlemail.com> - 6.2a-9
+- bump tag to fix cvs problem
+
* Sun Jul 12 2009 Leigh Scott <leigh123linux(a)googlemail.com> - 6.2a-8
- replace README.txt
- fix for help menu (link to rpmfusion wiki)
14 years, 6 months
rpms/php-pecl-pdflib/devel .cvsignore, 1.3, 1.4 php-pecl-pdflib.spec, 1.5, 1.6 sources, 1.3, 1.4
by Remi Collet
Author: remi
Update of /cvs/nonfree/rpms/php-pecl-pdflib/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14685
Modified Files:
.cvsignore php-pecl-pdflib.spec sources
Log Message:
update sources and bump release
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/php-pecl-pdflib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 21 Mar 2009 15:41:48 -0000 1.3
+++ .cvsignore 24 Oct 2009 13:42:52 -0000 1.4
@@ -1 +1 @@
-pdflib-2.1.6.tgz
+pdflib-2.1.7.tgz
Index: php-pecl-pdflib.spec
===================================================================
RCS file: /cvs/nonfree/rpms/php-pecl-pdflib/devel/php-pecl-pdflib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-pecl-pdflib.spec 14 Jul 2009 06:42:03 -0000 1.5
+++ php-pecl-pdflib.spec 24 Oct 2009 13:42:52 -0000 1.6
@@ -8,7 +8,7 @@
Summary(fr): Extension pour générer des fichiers PDF
Name: php-pecl-pdflib
Version: 2.1.7
-Release: 1%{?dist}
+Release: 2%{?dist}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/pdflib
@@ -104,6 +104,9 @@
%changelog
+* Sat Oct 24 2009 Remi Collet <rpmfusion(a)FamilleCollet.com> 2.1.7-2
+- rebuild
+
* Tue Jul 14 2009 Remi Collet <rpmfusion(a)FamilleCollet.com> 2.1.7-1
- update to 2.1.7, rebuild against php 5.3.0
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/php-pecl-pdflib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 21 Mar 2009 15:41:48 -0000 1.3
+++ sources 24 Oct 2009 13:42:52 -0000 1.4
@@ -1 +1 @@
-278fbed59d1c24b034fdbed2de04081e pdflib-2.1.6.tgz
+02323827f244d7d7db645b1d3874f980 pdflib-2.1.7.tgz
14 years, 6 months
rpms/wl-kmod/devel wl-kmod.spec,1.42,1.43
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9219
Modified Files:
wl-kmod.spec
Log Message:
* Sat Oct 24 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.91.9.3-3.2
- rebuild for new kernels
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- wl-kmod.spec 21 Oct 2009 07:27:27 -0000 1.42
+++ wl-kmod.spec 24 Oct 2009 12:08:29 -0000 1.43
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.10.91.9.3
-Release: 3%{?dist}.1
+Release: 3%{?dist}.2
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -82,6 +82,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Oct 24 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.91.9.3-3.2
+- rebuild for new kernels
+
* Wed Oct 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.91.9.3-3.1
- rebuild for new kernels
14 years, 6 months
