rpms/xine-lib-extras-freeworld/F-9 xine-lib-1.1.16-internal_ffmpeg.patch, NONE, 1.1 xine-lib-extras-freeworld.spec, 1.6, 1.7 xine-lib-1.1.16-ffmpeg_api.patch, 1.1, NONE
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/xine-lib-extras-freeworld/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14010
Modified Files:
xine-lib-extras-freeworld.spec
Added Files:
xine-lib-1.1.16-internal_ffmpeg.patch
Removed Files:
xine-lib-1.1.16-ffmpeg_api.patch
Log Message:
* Sun Jan 18 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-3
- drop deepbind patch
- --with-external-libfaad
* Thu Jan 08 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-2
- drop ffmpeg_api patch (not needed)
- internal_ffmpeg patch
xine-lib-1.1.16-internal_ffmpeg.patch:
--- NEW FILE xine-lib-1.1.16-internal_ffmpeg.patch ---
# HG changeset patch
# User Darren Salt <linux(a)youmustbejoking.demon.co.uk>
# Date 1231451064 0
# Node ID c20ec3a8802d8f71d4ad9dc26a413716efe2d71a
# Parent 894298041810085fcdf52f6e7bd8a7202ca77735
Fix build with libavcodec < 51.68.0.
This covers the internal snapshot and the version in Debian lenny.
--- a/src/combined/ffmpeg/ff_video_decoder.c Wed Jan 07 18:28:36 2009 +0000
+++ b/src/combined/ffmpeg/ff_video_decoder.c Thu Jan 08 21:44:24 2009 +0000
@@ -58,6 +58,12 @@
#define ENABLE_DIRECT_RENDERING
+/* reordered_opaque appeared in libavcodec 51.68.0 */
+#define AVCODEC_HAS_REORDERED_OPAQUE
+#if LIBAVCODEC_VERSION_INT < 0x334400
+# undef AVCODEC_HAS_REORDERED_OPAQUE
+#endif
+
typedef struct ff_video_decoder_s ff_video_decoder_t;
typedef struct ff_video_class_s {
@@ -78,9 +84,11 @@ struct ff_video_decoder_s {
xine_stream_t *stream;
int64_t pts;
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
uint64_t pts_tag_mask;
uint64_t pts_tag;
int pts_tag_counter;
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
int video_step;
uint8_t decoder_ok:1;
@@ -609,10 +617,6 @@ static void ff_convert_frame(ff_video_de
su = this->av_frame->data[1];
sv = this->av_frame->data[2];
- /* Some segfaults & heap corruption have been observed with img->height,
- * so we use this->bih.biHeight instead (which is the displayed height)
- */
-
if (this->context->pix_fmt == PIX_FMT_YUV410P) {
yuv9_to_yv12(
@@ -633,7 +637,7 @@ static void ff_convert_frame(ff_video_de
img->pitches[2],
/* width x height */
img->width,
- this->bih.biHeight);
+ img->height);
} else if (this->context->pix_fmt == PIX_FMT_YUV411P) {
@@ -655,7 +659,7 @@ static void ff_convert_frame(ff_video_de
img->pitches[2],
/* width x height */
img->width,
- this->bih.biHeight);
+ img->height);
} else if (this->context->pix_fmt == PIX_FMT_RGBA32) {
@@ -663,7 +667,7 @@ static void ff_convert_frame(ff_video_de
uint32_t *argb_pixels;
uint32_t argb;
- for(y = 0; y < this->bih.biHeight; y++) {
+ for(y = 0; y < img->height; y++) {
argb_pixels = (uint32_t *)sy;
for(x = 0; x < img->width; x++) {
uint8_t r, g, b;
@@ -691,7 +695,7 @@ static void ff_convert_frame(ff_video_de
uint8_t *src;
uint16_t pixel16;
- for(y = 0; y < this->bih.biHeight; y++) {
+ for(y = 0; y < img->height; y++) {
src = sy;
for(x = 0; x < img->width; x++) {
uint8_t r, g, b;
@@ -720,7 +724,7 @@ static void ff_convert_frame(ff_video_de
uint8_t *src;
uint16_t pixel16;
- for(y = 0; y < this->bih.biHeight; y++) {
+ for(y = 0; y < img->height; y++) {
src = sy;
for(x = 0; x < img->width; x++) {
uint8_t r, g, b;
@@ -748,7 +752,7 @@ static void ff_convert_frame(ff_video_de
int x, plane_ptr = 0;
uint8_t *src;
- for(y = 0; y < this->bih.biHeight; y++) {
+ for(y = 0; y < img->height; y++) {
src = sy;
for(x = 0; x < img->width; x++) {
uint8_t r, g, b;
@@ -772,7 +776,7 @@ static void ff_convert_frame(ff_video_de
int x, plane_ptr = 0;
uint8_t *src;
- for(y = 0; y < this->bih.biHeight; y++) {
+ for(y = 0; y < img->height; y++) {
src = sy;
for(x = 0; x < img->width; x++) {
uint8_t r, g, b;
@@ -815,7 +819,7 @@ static void ff_convert_frame(ff_video_de
v_palette[x] = COMPUTE_V(r, g, b);
}
- for(y = 0; y < this->bih.biHeight; y++) {
+ for(y = 0; y < img->height; y++) {
src = sy;
for(x = 0; x < img->width; x++) {
pixel = *src++;
@@ -832,7 +836,7 @@ static void ff_convert_frame(ff_video_de
} else {
- for (y = 0; y < this->bih.biHeight; y++) {
+ for (y=0; y<img->height; y++) {
xine_fast_memcpy (dy, sy, img->width);
dy += img->pitches[0];
@@ -840,7 +844,7 @@ static void ff_convert_frame(ff_video_de
sy += this->av_frame->linesize[0];
}
- for (y = 0; y < this->bih.biHeight / 2; y++) {
+ for (y=0; y<(img->height/2); y++) {
if (this->context->pix_fmt != PIX_FMT_YUV444P) {
@@ -1181,6 +1185,7 @@ static void ff_handle_mpeg12_buffer (ff_
}
}
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
static uint64_t ff_tag_pts(ff_video_decoder_t *this, uint64_t pts)
{
return pts | this->pts_tag;
@@ -1217,6 +1222,7 @@ static void ff_check_pts_tagging(ff_vide
}
}
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
uint8_t *chunk_buf = this->buf;
AVRational avr00 = {0, 1};
@@ -1241,12 +1247,14 @@ static void ff_handle_buffer (ff_video_d
this->size = 0;
}
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
if (this->size == 0) {
/* take over pts when we are about to buffer a frame */
this->av_frame->reordered_opaque = ff_tag_pts(this, this->pts);
this->context->reordered_opaque = ff_tag_pts(this, this->pts);
this->pts = 0;
}
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
/* data accumulation */
if (buf->size > 0) {
@@ -1301,8 +1309,10 @@ static void ff_handle_buffer (ff_video_d
&got_picture, &chunk_buf[offset],
this->size);
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
/* reset consumed pts value */
this->context->reordered_opaque = ff_tag_pts(this, 0);
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
lprintf("consumed size: %d, got_picture: %d\n", len, got_picture);
if ((len <= 0) || (len > this->size)) {
@@ -1320,10 +1330,12 @@ static void ff_handle_buffer (ff_video_d
memmove (this->buf, &chunk_buf[offset], this->size);
chunk_buf = this->buf;
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
/* take over pts for next access unit */
this->av_frame->reordered_opaque = ff_tag_pts(this, this->pts);
this->context->reordered_opaque = ff_tag_pts(this, this->pts);
this->pts = 0;
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
}
}
}
@@ -1418,9 +1430,14 @@ static void ff_handle_buffer (ff_video_d
ff_convert_frame(this, img);
}
+#ifndef AVCODEC_HAS_REORDERED_OPAQUE
+ img->pts = this->pts;
+ this->pts = 0;
+#else /* AVCODEC_HAS_REORDERED_OPAQUE */
img->pts = ff_untag_pts(this, this->av_frame->reordered_opaque);
ff_check_pts_tagging(this, this->av_frame->reordered_opaque); /* only check for valid frames */
this->av_frame->reordered_opaque = 0;
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
/* workaround for weird 120fps streams */
if( video_step_to_use == 750 ) {
@@ -1460,8 +1477,13 @@ static void ff_handle_buffer (ff_video_d
this->output_format,
VO_BOTH_FIELDS|this->frame_flags);
/* set PTS to allow early syncing */
+#ifndef AVCODEC_HAS_REORDERED_OPAQUE
+ img->pts = this->pts;
+ this->pts = 0;
+#else /* AVCODEC_HAS_REORDERED_OPAQUE */
img->pts = ff_untag_pts(this, this->av_frame->reordered_opaque);
this->av_frame->reordered_opaque = 0;
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
img->duration = video_step_to_use;
@@ -1547,9 +1569,11 @@ static void ff_reset (video_decoder_t *t
if (this->is_mpeg12)
mpeg_parser_reset(this->mpeg_parser);
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
this->pts_tag_mask = 0;
this->pts_tag = 0;
this->pts_tag_counter = 0;
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
}
static void ff_discontinuity (video_decoder_t *this_gen) {
@@ -1558,6 +1582,7 @@ static void ff_discontinuity (video_deco
lprintf ("ff_discontinuity\n");
this->pts = 0;
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
/*
* there is currently no way to reset all the pts which are stored in the decoder.
* therefore, we add a unique tag (generated from pts_tag_counter) to pts (see
@@ -1588,6 +1613,7 @@ static void ff_discontinuity (video_deco
counter_mask <<= 1;
}
}
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
}
static void ff_dispose (video_decoder_t *this_gen) {
Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-9/xine-lib-extras-freeworld.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xine-lib-extras-freeworld.spec 8 Jan 2009 15:23:23 -0000 1.6
+++ xine-lib-extras-freeworld.spec 18 Jan 2009 22:15:19 -0000 1.7
@@ -5,12 +5,13 @@
%if 0%{?fedora} > 6
%define _with_external_ffmpeg --with-external-ffmpeg
+%define _with_external_libfaad --with-external-libfaad
%endif
Name: xine-lib-extras-freeworld
Summary: Extra codecs for the Xine multimedia library
Version: 1.1.16
-Release: 1%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
@@ -19,11 +20,15 @@
Patch0: xine-lib-1.1.3-optflags.patch
Patch6: xine-lib-1.1.1-deepbind-939.patch
-Patch100: xine-lib-1.1.16-ffmpeg_api.patch
+# http://hg.debian.org/hg/xine-lib/xine-lib?cmd=changeset;node=c20ec3a8802d...
+Patch100: xine-lib-1.1.16-internal_ffmpeg.patch
BuildRequires: pkgconfig
BuildRequires: zlib-devel
BuildRequires: gawk
+%if 0%{?_with_external_libfaad:1}
+BuildRequires: faad2-devel
+%endif
%if 0%{?_with_external_ffmpeg:1}
BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804
# HACKS to workaround missing deps in ffmpeg-devel
@@ -65,10 +70,10 @@
touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
%patch0 -p1 -b .optflags
touch -r m4/optimizations.m4.stamp m4/optimizations.m4
-# Patch1 needed at least when compiling with external ffmpeg, #939.
-%patch6 -p1 -b .deepbind
+# when compiling with external ffmpeg and internal libfaad #939.
+#patch6 -p1 -b .deepbind
-%patch100 -p1 -b .ffmpeg_api
+%patch100 -p1 -b .internal_ffmpeg
# Avoid standard rpaths on lib64 archs:
sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -185,6 +190,14 @@
%changelog
+* Sun Jan 18 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-3
+- drop deepbind patch
+- --with-external-libfaad
+
+* Thu Jan 08 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-2
+- drop ffmpeg_api patch (not needed)
+- internal_ffmpeg patch
+
* Wed Jan 07 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-1
- xine-lib-1.1.16
--- xine-lib-1.1.16-ffmpeg_api.patch DELETED ---
15 years, 10 months
rpms/xine-lib-extras-freeworld/F-10 xine-lib-1.1.16-internal_ffmpeg.patch, NONE, 1.1 xine-lib-extras-freeworld.spec, 1.8, 1.9 xine-lib-1.1.16-ffmpeg_api.patch, 1.1, NONE
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/xine-lib-extras-freeworld/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13268
Modified Files:
xine-lib-extras-freeworld.spec
Added Files:
xine-lib-1.1.16-internal_ffmpeg.patch
Removed Files:
xine-lib-1.1.16-ffmpeg_api.patch
Log Message:
* Sun Jan 18 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-3
- drop deepbind patch
- --with-external-libfaad
* Thu Jan 08 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-2
- drop ffmpeg_api patch (not needed)
- internal_ffmpeg patch
xine-lib-1.1.16-internal_ffmpeg.patch:
--- NEW FILE xine-lib-1.1.16-internal_ffmpeg.patch ---
# HG changeset patch
# User Darren Salt <linux(a)youmustbejoking.demon.co.uk>
# Date 1231451064 0
# Node ID c20ec3a8802d8f71d4ad9dc26a413716efe2d71a
# Parent 894298041810085fcdf52f6e7bd8a7202ca77735
Fix build with libavcodec < 51.68.0.
This covers the internal snapshot and the version in Debian lenny.
--- a/src/combined/ffmpeg/ff_video_decoder.c Wed Jan 07 18:28:36 2009 +0000
+++ b/src/combined/ffmpeg/ff_video_decoder.c Thu Jan 08 21:44:24 2009 +0000
@@ -58,6 +58,12 @@
#define ENABLE_DIRECT_RENDERING
+/* reordered_opaque appeared in libavcodec 51.68.0 */
+#define AVCODEC_HAS_REORDERED_OPAQUE
+#if LIBAVCODEC_VERSION_INT < 0x334400
+# undef AVCODEC_HAS_REORDERED_OPAQUE
+#endif
+
typedef struct ff_video_decoder_s ff_video_decoder_t;
typedef struct ff_video_class_s {
@@ -78,9 +84,11 @@ struct ff_video_decoder_s {
xine_stream_t *stream;
int64_t pts;
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
uint64_t pts_tag_mask;
uint64_t pts_tag;
int pts_tag_counter;
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
int video_step;
uint8_t decoder_ok:1;
@@ -609,10 +617,6 @@ static void ff_convert_frame(ff_video_de
su = this->av_frame->data[1];
sv = this->av_frame->data[2];
- /* Some segfaults & heap corruption have been observed with img->height,
- * so we use this->bih.biHeight instead (which is the displayed height)
- */
-
if (this->context->pix_fmt == PIX_FMT_YUV410P) {
yuv9_to_yv12(
@@ -633,7 +637,7 @@ static void ff_convert_frame(ff_video_de
img->pitches[2],
/* width x height */
img->width,
- this->bih.biHeight);
+ img->height);
} else if (this->context->pix_fmt == PIX_FMT_YUV411P) {
@@ -655,7 +659,7 @@ static void ff_convert_frame(ff_video_de
img->pitches[2],
/* width x height */
img->width,
- this->bih.biHeight);
+ img->height);
} else if (this->context->pix_fmt == PIX_FMT_RGBA32) {
@@ -663,7 +667,7 @@ static void ff_convert_frame(ff_video_de
uint32_t *argb_pixels;
uint32_t argb;
- for(y = 0; y < this->bih.biHeight; y++) {
+ for(y = 0; y < img->height; y++) {
argb_pixels = (uint32_t *)sy;
for(x = 0; x < img->width; x++) {
uint8_t r, g, b;
@@ -691,7 +695,7 @@ static void ff_convert_frame(ff_video_de
uint8_t *src;
uint16_t pixel16;
- for(y = 0; y < this->bih.biHeight; y++) {
+ for(y = 0; y < img->height; y++) {
src = sy;
for(x = 0; x < img->width; x++) {
uint8_t r, g, b;
@@ -720,7 +724,7 @@ static void ff_convert_frame(ff_video_de
uint8_t *src;
uint16_t pixel16;
- for(y = 0; y < this->bih.biHeight; y++) {
+ for(y = 0; y < img->height; y++) {
src = sy;
for(x = 0; x < img->width; x++) {
uint8_t r, g, b;
@@ -748,7 +752,7 @@ static void ff_convert_frame(ff_video_de
int x, plane_ptr = 0;
uint8_t *src;
- for(y = 0; y < this->bih.biHeight; y++) {
+ for(y = 0; y < img->height; y++) {
src = sy;
for(x = 0; x < img->width; x++) {
uint8_t r, g, b;
@@ -772,7 +776,7 @@ static void ff_convert_frame(ff_video_de
int x, plane_ptr = 0;
uint8_t *src;
- for(y = 0; y < this->bih.biHeight; y++) {
+ for(y = 0; y < img->height; y++) {
src = sy;
for(x = 0; x < img->width; x++) {
uint8_t r, g, b;
@@ -815,7 +819,7 @@ static void ff_convert_frame(ff_video_de
v_palette[x] = COMPUTE_V(r, g, b);
}
- for(y = 0; y < this->bih.biHeight; y++) {
+ for(y = 0; y < img->height; y++) {
src = sy;
for(x = 0; x < img->width; x++) {
pixel = *src++;
@@ -832,7 +836,7 @@ static void ff_convert_frame(ff_video_de
} else {
- for (y = 0; y < this->bih.biHeight; y++) {
+ for (y=0; y<img->height; y++) {
xine_fast_memcpy (dy, sy, img->width);
dy += img->pitches[0];
@@ -840,7 +844,7 @@ static void ff_convert_frame(ff_video_de
sy += this->av_frame->linesize[0];
}
- for (y = 0; y < this->bih.biHeight / 2; y++) {
+ for (y=0; y<(img->height/2); y++) {
if (this->context->pix_fmt != PIX_FMT_YUV444P) {
@@ -1181,6 +1185,7 @@ static void ff_handle_mpeg12_buffer (ff_
}
}
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
static uint64_t ff_tag_pts(ff_video_decoder_t *this, uint64_t pts)
{
return pts | this->pts_tag;
@@ -1217,6 +1222,7 @@ static void ff_check_pts_tagging(ff_vide
}
}
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
uint8_t *chunk_buf = this->buf;
AVRational avr00 = {0, 1};
@@ -1241,12 +1247,14 @@ static void ff_handle_buffer (ff_video_d
this->size = 0;
}
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
if (this->size == 0) {
/* take over pts when we are about to buffer a frame */
this->av_frame->reordered_opaque = ff_tag_pts(this, this->pts);
this->context->reordered_opaque = ff_tag_pts(this, this->pts);
this->pts = 0;
}
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
/* data accumulation */
if (buf->size > 0) {
@@ -1301,8 +1309,10 @@ static void ff_handle_buffer (ff_video_d
&got_picture, &chunk_buf[offset],
this->size);
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
/* reset consumed pts value */
this->context->reordered_opaque = ff_tag_pts(this, 0);
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
lprintf("consumed size: %d, got_picture: %d\n", len, got_picture);
if ((len <= 0) || (len > this->size)) {
@@ -1320,10 +1330,12 @@ static void ff_handle_buffer (ff_video_d
memmove (this->buf, &chunk_buf[offset], this->size);
chunk_buf = this->buf;
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
/* take over pts for next access unit */
this->av_frame->reordered_opaque = ff_tag_pts(this, this->pts);
this->context->reordered_opaque = ff_tag_pts(this, this->pts);
this->pts = 0;
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
}
}
}
@@ -1418,9 +1430,14 @@ static void ff_handle_buffer (ff_video_d
ff_convert_frame(this, img);
}
+#ifndef AVCODEC_HAS_REORDERED_OPAQUE
+ img->pts = this->pts;
+ this->pts = 0;
+#else /* AVCODEC_HAS_REORDERED_OPAQUE */
img->pts = ff_untag_pts(this, this->av_frame->reordered_opaque);
ff_check_pts_tagging(this, this->av_frame->reordered_opaque); /* only check for valid frames */
this->av_frame->reordered_opaque = 0;
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
/* workaround for weird 120fps streams */
if( video_step_to_use == 750 ) {
@@ -1460,8 +1477,13 @@ static void ff_handle_buffer (ff_video_d
this->output_format,
VO_BOTH_FIELDS|this->frame_flags);
/* set PTS to allow early syncing */
+#ifndef AVCODEC_HAS_REORDERED_OPAQUE
+ img->pts = this->pts;
+ this->pts = 0;
+#else /* AVCODEC_HAS_REORDERED_OPAQUE */
img->pts = ff_untag_pts(this, this->av_frame->reordered_opaque);
this->av_frame->reordered_opaque = 0;
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
img->duration = video_step_to_use;
@@ -1547,9 +1569,11 @@ static void ff_reset (video_decoder_t *t
if (this->is_mpeg12)
mpeg_parser_reset(this->mpeg_parser);
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
this->pts_tag_mask = 0;
this->pts_tag = 0;
this->pts_tag_counter = 0;
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
}
static void ff_discontinuity (video_decoder_t *this_gen) {
@@ -1558,6 +1582,7 @@ static void ff_discontinuity (video_deco
lprintf ("ff_discontinuity\n");
this->pts = 0;
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
/*
* there is currently no way to reset all the pts which are stored in the decoder.
* therefore, we add a unique tag (generated from pts_tag_counter) to pts (see
@@ -1588,6 +1613,7 @@ static void ff_discontinuity (video_deco
counter_mask <<= 1;
}
}
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
}
static void ff_dispose (video_decoder_t *this_gen) {
Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-10/xine-lib-extras-freeworld.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xine-lib-extras-freeworld.spec 8 Jan 2009 14:48:17 -0000 1.8
+++ xine-lib-extras-freeworld.spec 18 Jan 2009 22:03:56 -0000 1.9
@@ -5,12 +5,13 @@
%if 0%{?fedora} > 6
%define _with_external_ffmpeg --with-external-ffmpeg
+%define _with_external_libfaad --with-external-libfaad
%endif
Name: xine-lib-extras-freeworld
Summary: Extra codecs for the Xine multimedia library
Version: 1.1.16
-Release: 1%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
@@ -19,11 +20,15 @@
Patch0: xine-lib-1.1.3-optflags.patch
Patch6: xine-lib-1.1.1-deepbind-939.patch
-Patch100: xine-lib-1.1.16-ffmpeg_api.patch
+# http://hg.debian.org/hg/xine-lib/xine-lib?cmd=changeset;node=c20ec3a8802d...
+Patch100: xine-lib-1.1.16-internal_ffmpeg.patch
BuildRequires: pkgconfig
BuildRequires: zlib-devel
BuildRequires: gawk
+%if 0%{?_with_external_libfaad:1}
+BuildRequires: faad2-devel
+%endif
%if 0%{?_with_external_ffmpeg:1}
BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804
# HACKS to workaround missing deps in ffmpeg-devel
@@ -65,10 +70,10 @@
touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
%patch0 -p1 -b .optflags
touch -r m4/optimizations.m4.stamp m4/optimizations.m4
-# Patch1 needed at least when compiling with external ffmpeg, #939.
-%patch6 -p1 -b .deepbind
+# when compiling with external ffmpeg and internal libfaad #939.
+#patch6 -p1 -b .deepbind
-%patch100 -p1 -b .ffmpeg_api
+%patch100 -p1 -b .internal_ffmpeg
# Avoid standard rpaths on lib64 archs:
sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -185,6 +190,14 @@
%changelog
+* Sun Jan 18 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-3
+- drop deepbind patch
+- --with-external-libfaad
+
+* Thu Jan 08 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-2
+- drop ffmpeg_api patch (not needed)
+- internal_ffmpeg patch
+
* Wed Jan 07 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-1
- xine-lib-1.1.16
--- xine-lib-1.1.16-ffmpeg_api.patch DELETED ---
15 years, 10 months
rpms/xine-lib-extras-freeworld/devel xine-lib-1.1.16-internal_ffmpeg.patch, NONE, 1.1
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/xine-lib-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9369
Added Files:
xine-lib-1.1.16-internal_ffmpeg.patch
Log Message:
import
xine-lib-1.1.16-internal_ffmpeg.patch:
--- NEW FILE xine-lib-1.1.16-internal_ffmpeg.patch ---
# HG changeset patch
# User Darren Salt <linux(a)youmustbejoking.demon.co.uk>
# Date 1231451064 0
# Node ID c20ec3a8802d8f71d4ad9dc26a413716efe2d71a
# Parent 894298041810085fcdf52f6e7bd8a7202ca77735
Fix build with libavcodec < 51.68.0.
This covers the internal snapshot and the version in Debian lenny.
--- a/src/combined/ffmpeg/ff_video_decoder.c Wed Jan 07 18:28:36 2009 +0000
+++ b/src/combined/ffmpeg/ff_video_decoder.c Thu Jan 08 21:44:24 2009 +0000
@@ -58,6 +58,12 @@
#define ENABLE_DIRECT_RENDERING
+/* reordered_opaque appeared in libavcodec 51.68.0 */
+#define AVCODEC_HAS_REORDERED_OPAQUE
+#if LIBAVCODEC_VERSION_INT < 0x334400
+# undef AVCODEC_HAS_REORDERED_OPAQUE
+#endif
+
typedef struct ff_video_decoder_s ff_video_decoder_t;
typedef struct ff_video_class_s {
@@ -78,9 +84,11 @@ struct ff_video_decoder_s {
xine_stream_t *stream;
int64_t pts;
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
uint64_t pts_tag_mask;
uint64_t pts_tag;
int pts_tag_counter;
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
int video_step;
uint8_t decoder_ok:1;
@@ -609,10 +617,6 @@ static void ff_convert_frame(ff_video_de
su = this->av_frame->data[1];
sv = this->av_frame->data[2];
- /* Some segfaults & heap corruption have been observed with img->height,
- * so we use this->bih.biHeight instead (which is the displayed height)
- */
-
if (this->context->pix_fmt == PIX_FMT_YUV410P) {
yuv9_to_yv12(
@@ -633,7 +637,7 @@ static void ff_convert_frame(ff_video_de
img->pitches[2],
/* width x height */
img->width,
- this->bih.biHeight);
+ img->height);
} else if (this->context->pix_fmt == PIX_FMT_YUV411P) {
@@ -655,7 +659,7 @@ static void ff_convert_frame(ff_video_de
img->pitches[2],
/* width x height */
img->width,
- this->bih.biHeight);
+ img->height);
} else if (this->context->pix_fmt == PIX_FMT_RGBA32) {
@@ -663,7 +667,7 @@ static void ff_convert_frame(ff_video_de
uint32_t *argb_pixels;
uint32_t argb;
- for(y = 0; y < this->bih.biHeight; y++) {
+ for(y = 0; y < img->height; y++) {
argb_pixels = (uint32_t *)sy;
for(x = 0; x < img->width; x++) {
uint8_t r, g, b;
@@ -691,7 +695,7 @@ static void ff_convert_frame(ff_video_de
uint8_t *src;
uint16_t pixel16;
- for(y = 0; y < this->bih.biHeight; y++) {
+ for(y = 0; y < img->height; y++) {
src = sy;
for(x = 0; x < img->width; x++) {
uint8_t r, g, b;
@@ -720,7 +724,7 @@ static void ff_convert_frame(ff_video_de
uint8_t *src;
uint16_t pixel16;
- for(y = 0; y < this->bih.biHeight; y++) {
+ for(y = 0; y < img->height; y++) {
src = sy;
for(x = 0; x < img->width; x++) {
uint8_t r, g, b;
@@ -748,7 +752,7 @@ static void ff_convert_frame(ff_video_de
int x, plane_ptr = 0;
uint8_t *src;
- for(y = 0; y < this->bih.biHeight; y++) {
+ for(y = 0; y < img->height; y++) {
src = sy;
for(x = 0; x < img->width; x++) {
uint8_t r, g, b;
@@ -772,7 +776,7 @@ static void ff_convert_frame(ff_video_de
int x, plane_ptr = 0;
uint8_t *src;
- for(y = 0; y < this->bih.biHeight; y++) {
+ for(y = 0; y < img->height; y++) {
src = sy;
for(x = 0; x < img->width; x++) {
uint8_t r, g, b;
@@ -815,7 +819,7 @@ static void ff_convert_frame(ff_video_de
v_palette[x] = COMPUTE_V(r, g, b);
}
- for(y = 0; y < this->bih.biHeight; y++) {
+ for(y = 0; y < img->height; y++) {
src = sy;
for(x = 0; x < img->width; x++) {
pixel = *src++;
@@ -832,7 +836,7 @@ static void ff_convert_frame(ff_video_de
} else {
- for (y = 0; y < this->bih.biHeight; y++) {
+ for (y=0; y<img->height; y++) {
xine_fast_memcpy (dy, sy, img->width);
dy += img->pitches[0];
@@ -840,7 +844,7 @@ static void ff_convert_frame(ff_video_de
sy += this->av_frame->linesize[0];
}
- for (y = 0; y < this->bih.biHeight / 2; y++) {
+ for (y=0; y<(img->height/2); y++) {
if (this->context->pix_fmt != PIX_FMT_YUV444P) {
@@ -1181,6 +1185,7 @@ static void ff_handle_mpeg12_buffer (ff_
}
}
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
static uint64_t ff_tag_pts(ff_video_decoder_t *this, uint64_t pts)
{
return pts | this->pts_tag;
@@ -1217,6 +1222,7 @@ static void ff_check_pts_tagging(ff_vide
}
}
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
static void ff_handle_buffer (ff_video_decoder_t *this, buf_element_t *buf) {
uint8_t *chunk_buf = this->buf;
AVRational avr00 = {0, 1};
@@ -1241,12 +1247,14 @@ static void ff_handle_buffer (ff_video_d
this->size = 0;
}
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
if (this->size == 0) {
/* take over pts when we are about to buffer a frame */
this->av_frame->reordered_opaque = ff_tag_pts(this, this->pts);
this->context->reordered_opaque = ff_tag_pts(this, this->pts);
this->pts = 0;
}
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
/* data accumulation */
if (buf->size > 0) {
@@ -1301,8 +1309,10 @@ static void ff_handle_buffer (ff_video_d
&got_picture, &chunk_buf[offset],
this->size);
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
/* reset consumed pts value */
this->context->reordered_opaque = ff_tag_pts(this, 0);
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
lprintf("consumed size: %d, got_picture: %d\n", len, got_picture);
if ((len <= 0) || (len > this->size)) {
@@ -1320,10 +1330,12 @@ static void ff_handle_buffer (ff_video_d
memmove (this->buf, &chunk_buf[offset], this->size);
chunk_buf = this->buf;
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
/* take over pts for next access unit */
this->av_frame->reordered_opaque = ff_tag_pts(this, this->pts);
this->context->reordered_opaque = ff_tag_pts(this, this->pts);
this->pts = 0;
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
}
}
}
@@ -1418,9 +1430,14 @@ static void ff_handle_buffer (ff_video_d
ff_convert_frame(this, img);
}
+#ifndef AVCODEC_HAS_REORDERED_OPAQUE
+ img->pts = this->pts;
+ this->pts = 0;
+#else /* AVCODEC_HAS_REORDERED_OPAQUE */
img->pts = ff_untag_pts(this, this->av_frame->reordered_opaque);
ff_check_pts_tagging(this, this->av_frame->reordered_opaque); /* only check for valid frames */
this->av_frame->reordered_opaque = 0;
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
/* workaround for weird 120fps streams */
if( video_step_to_use == 750 ) {
@@ -1460,8 +1477,13 @@ static void ff_handle_buffer (ff_video_d
this->output_format,
VO_BOTH_FIELDS|this->frame_flags);
/* set PTS to allow early syncing */
+#ifndef AVCODEC_HAS_REORDERED_OPAQUE
+ img->pts = this->pts;
+ this->pts = 0;
+#else /* AVCODEC_HAS_REORDERED_OPAQUE */
img->pts = ff_untag_pts(this, this->av_frame->reordered_opaque);
this->av_frame->reordered_opaque = 0;
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
img->duration = video_step_to_use;
@@ -1547,9 +1569,11 @@ static void ff_reset (video_decoder_t *t
if (this->is_mpeg12)
mpeg_parser_reset(this->mpeg_parser);
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
this->pts_tag_mask = 0;
this->pts_tag = 0;
this->pts_tag_counter = 0;
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
}
static void ff_discontinuity (video_decoder_t *this_gen) {
@@ -1558,6 +1582,7 @@ static void ff_discontinuity (video_deco
lprintf ("ff_discontinuity\n");
this->pts = 0;
+#ifdef AVCODEC_HAS_REORDERED_OPAQUE
/*
* there is currently no way to reset all the pts which are stored in the decoder.
* therefore, we add a unique tag (generated from pts_tag_counter) to pts (see
@@ -1588,6 +1613,7 @@ static void ff_discontinuity (video_deco
counter_mask <<= 1;
}
}
+#endif /* AVCODEC_HAS_REORDERED_OPAQUE */
}
static void ff_dispose (video_decoder_t *this_gen) {
15 years, 10 months
rpms/xine-lib-extras-freeworld/devel xine-lib-extras-freeworld.spec, 1.17, 1.18
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/xine-lib-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8772
Modified Files:
xine-lib-extras-freeworld.spec
Log Message:
* Sun Jan 18 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-3
- drop deepbind patch
- --with-external-libfaad
Index: xine-lib-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/devel/xine-lib-extras-freeworld.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xine-lib-extras-freeworld.spec 8 Jan 2009 19:54:13 -0000 1.17
+++ xine-lib-extras-freeworld.spec 18 Jan 2009 20:50:21 -0000 1.18
@@ -5,12 +5,13 @@
%if 0%{?fedora} > 6
%define _with_external_ffmpeg --with-external-ffmpeg
+%define _with_external_libfaad --with-external-libfaad
%endif
Name: xine-lib-extras-freeworld
Summary: Extra codecs for the Xine multimedia library
Version: 1.1.16
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
@@ -19,10 +20,15 @@
Patch0: xine-lib-1.1.3-optflags.patch
Patch6: xine-lib-1.1.1-deepbind-939.patch
+# http://hg.debian.org/hg/xine-lib/xine-lib?cmd=changeset;node=c20ec3a8802d...
+Patch100: xine-lib-1.1.16-internal_ffmpeg.patch
BuildRequires: pkgconfig
BuildRequires: zlib-devel
BuildRequires: gawk
+%if 0%{?_with_external_libfaad:1}
+BuildRequires: faad2-devel
+%endif
%if 0%{?_with_external_ffmpeg:1}
BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804
# HACKS to workaround missing deps in ffmpeg-devel
@@ -64,8 +70,10 @@
touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
%patch0 -p1 -b .optflags
touch -r m4/optimizations.m4.stamp m4/optimizations.m4
-# Patch1 needed at least when compiling with external ffmpeg, #939.
-%patch6 -p1 -b .deepbind
+# when compiling with external ffmpeg and internal libfaad #939.
+#patch6 -p1 -b .deepbind
+
+%patch100 -p1 -b .internal_ffmpeg
# Avoid standard rpaths on lib64 archs:
sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -182,8 +190,13 @@
%changelog
+* Sun Jan 18 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-3
+- drop deepbind patch
+- --with-external-libfaad
+
* Thu Jan 08 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-2
- drop ffmpeg_api patch (not needed)
+- internal_ffmpeg patch
* Wed Jan 07 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-1
- xine-lib-1.1.16
15 years, 10 months
rpms/desmume/F-9 desmume-0.9-dontlookinbuilddir.patch, NONE, 1.1 desmume-0.9-nobuggytoolsmenu.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 desmume.spec, 1.2, 1.3 sources, 1.2, 1.3 desmume-0.7.0-dontlookinbuilddir.patch, 1.1, NONE desmume-0.7.0-nobuggytoolsmenu.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/desmume/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31878
Modified Files:
.cvsignore desmume.spec sources
Added Files:
desmume-0.9-dontlookinbuilddir.patch
desmume-0.9-nobuggytoolsmenu.patch
Removed Files:
desmume-0.7.0-dontlookinbuilddir.patch
desmume-0.7.0-nobuggytoolsmenu.patch
Log Message:
* Sun Jan 04 2009 Andrea Musuruane <musuruan(a)gmail.com> 0.9-1
- Updated to upstream version 0.9
desmume-0.9-dontlookinbuilddir.patch:
--- NEW FILE desmume-0.9-dontlookinbuilddir.patch ---
diff -durN desmume-0.9.orig/src/gtk-glade/main.cpp desmume-0.9/src/gtk-glade/main.cpp
--- desmume-0.9.orig/src/gtk-glade/main.cpp 2008-12-30 21:36:06.000000000 +0100
+++ desmume-0.9/src/gtk-glade/main.cpp 2009-01-04 17:30:47.000000000 +0100
@@ -239,11 +239,6 @@
{
gchar *path;
- /* looking in uninstalled (aka building) dir first */
- path = g_build_filename (GLADEUI_UNINSTALLED_DIR, filename, NULL);
- if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) return path;
- g_free (path);
-
/* looking in installed dir */
path = g_build_filename (DATADIR, filename, NULL);
if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) return path;
desmume-0.9-nobuggytoolsmenu.patch:
--- NEW FILE desmume-0.9-nobuggytoolsmenu.patch ---
diff -durN desmume-0.9.orig/src/gtk/main.cpp desmume-0.9/src/gtk/main.cpp
--- desmume-0.9.orig/src/gtk/main.cpp 2008-12-30 21:35:35.000000000 +0100
+++ desmume-0.9/src/gtk/main.cpp 2009-01-04 17:35:24.000000000 +0100
@@ -1705,20 +1705,6 @@
#endif
- /** Menu "Outils" **/
-
- pMenu = gtk_menu_new();
-
- for(i = 0; i < dTools_list_size; i++) {
- pMenuItem = gtk_menu_item_new_with_label(dTools_list[i]->name);
- g_signal_connect(G_OBJECT(pMenuItem), "activate", G_CALLBACK(Start_dTool), GINT_TO_POINTER(i));
- gtk_menu_shell_append(GTK_MENU_SHELL(pMenu), pMenuItem);
- }
-
- pMenuItem = gtk_menu_item_new_with_label("Tools");
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(pMenuItem), pMenu);
- gtk_menu_shell_append(GTK_MENU_SHELL(pMenuBar), pMenuItem);
-
/** Menu "Help" **/
pMenu = gtk_menu_new();
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/desmume/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 14 Jul 2008 14:15:49 -0000 1.2
+++ .cvsignore 18 Jan 2009 17:52:38 -0000 1.3
@@ -1,2 +1,2 @@
-desmume-0.8.tar.gz
+desmume-0.9.tar.gz
desmume-man-pages-0.7.3.tar.gz
Index: desmume.spec
===================================================================
RCS file: /cvs/free/rpms/desmume/F-9/desmume.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- desmume.spec 30 Jul 2008 05:02:44 -0000 1.2
+++ desmume.spec 18 Jan 2009 17:52:38 -0000 1.3
@@ -1,6 +1,6 @@
Name: desmume
-Version: 0.8
-Release: 2%{?dist}
+Version: 0.9
+Release: 1%{?dist}
Summary: A Nintendo DS emulator
Group: Applications/Emulators
@@ -8,10 +8,8 @@
URL: http://desmume.org/
Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
Source1: desmume-man-pages-0.7.3.tar.gz
-Patch0: desmume-0.7.0-dontlookinbuilddir.patch
-Patch1: desmume-0.7.0-nobuggytoolsmenu.patch
-# The following files were not found in the official 0.7.3 release
-#Patch2: desmume-0.7.3-debian.patch
+Patch0: %{name}-0.9-dontlookinbuilddir.patch
+Patch1: %{name}-0.9-nobuggytoolsmenu.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtkglext-devel
@@ -54,19 +52,29 @@
%ifarch x86_64
%patch1 -p1
%endif
-#%patch2 -p1
+
+# Fix end-of-line encoding
+sed -i 's/\r//' ChangeLog AUTHORS
+
+# Fix file encoding
+for txtfile in ChangeLog AUTHORS
+do
+ iconv --from=ISO-8859-1 --to=UTF-8 $txtfile > tmp
+ touch -r $txtfile tmp
+ mv tmp $txtfile
+done
# Fix premissions
-chmod 644 src/*.{c,h}
-chmod 644 src/gtk-glade/*.{c,h}
-chmod 644 src/gtk-glade/dTools/*.{c,h}
+chmod 644 src/*.{cpp,h}
+chmod 644 src/gtk-glade/*.{cpp,h}
+chmod 644 src/gtk-glade/dTools/*.{cpp,h}
# Fix glade path
sed -i 's|gladedir = $(datadir)/desmume/glade|gladedir = $(datadir)/desmume-glade/|g' src/gtk-glade/Makefile.{am,in}
# We need a different icon for desmume-glade
cp -a src/gtk/DeSmuME.xpm src/gtk-glade/DeSmuME-glade.xpm
-sed -i 's|Icon=DeSmuME.xpm|Icon=DeSmuME-glade.xpm|g' src/gtk-glade/desmume-glade.desktop.in
+sed -i 's|Icon=DeSmuME.xpm|Icon=DeSmuME-glade.xpm|g' src/gtk-glade/desmume-glade.desktop
# Fix gettext package name
sed -i 's|GETTEXT_PACKAGE=desmume|GETTEXT_PACKAGE=desmume-glade|g' configure{,.ac}
@@ -103,8 +111,6 @@
--remove-key Version \
--remove-category GNOME \
--remove-category GTK \
- --remove-category Application \
- --add-category Emulator \
--dir %{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -114,8 +120,6 @@
--remove-key Version \
--remove-category GNOME \
--remove-category GTK \
- --remove-category Application \
- --add-category Emulator \
--dir %{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/%{name}-glade.desktop
@@ -181,6 +185,9 @@
%changelog
+* Sun Jan 04 2009 Andrea Musuruane <musuruan(a)gmail.com> 0.9-1
+- Updated to upstream version 0.9
+
* Wed Jul 30 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-2
- rebuild for buildsys cflags issue
Index: sources
===================================================================
RCS file: /cvs/free/rpms/desmume/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 14 Jul 2008 14:15:49 -0000 1.2
+++ sources 18 Jan 2009 17:52:38 -0000 1.3
@@ -1,2 +1,2 @@
-d8bf49dfd8d571af3a16be105c70dfda desmume-0.8.tar.gz
+e48a01c7fc7dc083006e4756f1054621 desmume-0.9.tar.gz
64cb8e6288b7490f097e20fb262f0e97 desmume-man-pages-0.7.3.tar.gz
--- desmume-0.7.0-dontlookinbuilddir.patch DELETED ---
--- desmume-0.7.0-nobuggytoolsmenu.patch DELETED ---
15 years, 10 months
rpms/wl-kmod/devel wl-kmod.spec,1.18,1.19
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30056
Modified Files:
wl-kmod.spec
Log Message:
* Sun Jan 18 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.12-1.2
- rebuild for latest Fedora kernel;
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wl-kmod.spec 11 Jan 2009 10:49:03 -0000 1.18
+++ wl-kmod.spec 18 Jan 2009 17:24:59 -0000 1.19
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.10.27.12
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -80,6 +80,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Jan 18 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.12-1.2
+- rebuild for latest Fedora kernel;
+
* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.12-1.1
- rebuild for latest Fedora kernel;
15 years, 10 months
rpms/slmodem-kmod/devel slmodem-kmod.spec,1.16,1.17
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/slmodem-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29934
Modified Files:
slmodem-kmod.spec
Log Message:
* Sun Jan 18 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.9.11-26.16
- rebuild for latest Fedora kernel;
Index: slmodem-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/slmodem-kmod/devel/slmodem-kmod.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- slmodem-kmod.spec 11 Jan 2009 10:48:48 -0000 1.16
+++ slmodem-kmod.spec 18 Jan 2009 17:24:06 -0000 1.17
@@ -12,7 +12,7 @@
Name: slmodem-kmod
Version: 2.9.11
-Release: 26%{?dist}.15
+Release: 26%{?dist}.16
Summary: Proprietary SmartLink softmodem kernel drivers
Group: System Environment/Kernel
@@ -102,6 +102,9 @@
%changelog
+* Sun Jan 18 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.9.11-26.16
+- rebuild for latest Fedora kernel;
+
* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.9.11-26.15
- rebuild for latest Fedora kernel;
15 years, 10 months
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.23,1.24
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29813
Modified Files:
nvidia-kmod.spec
Log Message:
* Sun Jan 18 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.22-1.2
- rebuild for latest Fedora kernel;
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- nvidia-kmod.spec 11 Jan 2009 10:48:33 -0000 1.23
+++ nvidia-kmod.spec 18 Jan 2009 17:23:06 -0000 1.24
@@ -8,7 +8,7 @@
Name: nvidia-kmod
Version: 180.22
# Taken over by kmodtool
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -94,6 +94,9 @@
%changelog
+* Sun Jan 18 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.22-1.2
+- rebuild for latest Fedora kernel;
+
* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.22-1.1
- rebuild for latest Fedora kernel;
15 years, 10 months
rpms/nvidia-beta-kmod/devel nvidia-beta-kmod.spec,1.14,1.15
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/nvidia-beta-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29692
Modified Files:
nvidia-beta-kmod.spec
Log Message:
* Sun Jan 18 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.11.02-1.5
- rebuild for latest Fedora kernel;
Index: nvidia-beta-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-beta-kmod/devel/nvidia-beta-kmod.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nvidia-beta-kmod.spec 11 Jan 2009 10:48:18 -0000 1.14
+++ nvidia-beta-kmod.spec 18 Jan 2009 17:22:01 -0000 1.15
@@ -8,7 +8,7 @@
Name: nvidia-beta-kmod
Version: 180.11.02
# Taken over by kmodtool
-Release: 1%{?dist}.4
+Release: 1%{?dist}.5
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -91,6 +91,9 @@
%changelog
+* Sun Jan 18 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.11.02-1.5
+- rebuild for latest Fedora kernel;
+
* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.11.02-1.4
- rebuild for latest Fedora kernel;
15 years, 10 months