rpms/xorg-x11-drv-nvidia/F-10 xorg-x11-drv-nvidia.spec, 1.9, 1.10 sources, 1.4, 1.5
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16764
Modified Files:
xorg-x11-drv-nvidia.spec sources
Log Message:
Update to 180.22 (stable)
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-10/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xorg-x11-drv-nvidia.spec 2 Dec 2008 18:54:06 -0000 1.9
+++ xorg-x11-drv-nvidia.spec 8 Jan 2009 23:45:06 -0000 1.10
@@ -7,8 +7,8 @@
%endif
Name: xorg-x11-drv-nvidia
-Version: 177.82
-Release: 2%{?dist}
+Version: 180.22
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -195,6 +195,12 @@
ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so.1
ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so
+# This is 180.xx adds - vdpau libs and headers
+ln -s libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libvdpau_nvidia.so
+ln -s libvdpau.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libvdpau.so.1
+ln -s libvdpau.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libvdpau.so
+ln -s libvdpau_trace.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libvdpau_trace.so
+
# X configuration script
install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display
@@ -263,6 +269,9 @@
%dir %{nvidialibdir}/tls
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%{nvidialibdir}/*.so.*
+%{nvidialibdir}/libGLcore.so
+%{nvidialibdir}/libvdpau_nvidia.so
+%{nvidialibdir}/libvdpau_trace.so
%{nvidialibdir}/tls/*.so.*
%files devel
@@ -270,13 +279,29 @@
%dir %{_includedir}/nvidia
%dir %{_includedir}/nvidia/GL
%dir %{_includedir}/nvidia/cuda
+%dir %{_includedir}/nvidia/vdpau
%{_includedir}/nvidia/GL/*.h
%{_includedir}/nvidia/cuda/*.h
-%{nvidialibdir}/libXvMCNVIDIA.a
-%{nvidialibdir}/*.so
+%{_includedir}/nvidia/vdpau/*.h
+%exclude %{nvidialibdir}/libXvMCNVIDIA.a
+%{nvidialibdir}/libcuda.so
+%{nvidialibdir}/libGL.so
+%{nvidialibdir}/libvdpau.so
+%{nvidialibdir}/libXvMCNVIDIA.so
%changelog
+* Thu Jan 8 2009 kwizart < kwizart at gmail.com > - 180.22-1
+- Update to 180.22 (stable)
+
+* Sat Dec 28 2008 kwizart < kwizart at gmail.com > - 180.18-1
+- Update to 180.18 (beta)
+
+* Wed Dec 17 2008 kwizart < kwizart at gmail.com > - 180.16-1
+- Update to 180.16 (beta)
+- Exclude libXvMCNVIDIA.a
+- More accurate -devel subpackage.
+
* Tue Dec 2 2008 Stewart Adam <s.adam at diffingo.com> - 177.82-2
- Fix upgrade path for nvidia-newest (bz#191)
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 13 Nov 2008 09:05:11 -0000 1.4
+++ sources 8 Jan 2009 23:45:06 -0000 1.5
@@ -1,2 +1,2 @@
-882f34a662f0175682fdc4a9bec909ba NVIDIA-Linux-x86-177.82-pkg0.run
-6a6d04411529c8d7616deee3d68c5346 NVIDIA-Linux-x86_64-177.82-pkg0.run
+265a984e973bcf5a7c2feeba4b0927a9 NVIDIA-Linux-x86-180.22-pkg0.run
+91a40e758b06429453d780932f51d6d9 NVIDIA-Linux-x86_64-180.22-pkg0.run
15 years, 10 months
rpms/nvidia-kmod/F-10 sources,1.4,1.5 nvidia-kmod.spec,1.15,1.16
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15215
Modified Files:
sources nvidia-kmod.spec
Log Message:
Update to 180.22 (stable)
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-10/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 13 Nov 2008 09:35:25 -0000 1.4
+++ sources 8 Jan 2009 23:21:40 -0000 1.5
@@ -1 +1 @@
-d5df90ad29e8a73723cb9553c4c4b0c1 nvidia-kmod-data-177.82.tar.bz2
+3de8fe5b407a2b1858414c98ab9d0346 nvidia-kmod-data-180.22.tar.bz2
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-10/nvidia-kmod.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nvidia-kmod.spec 20 Dec 2008 08:03:36 -0000 1.15
+++ nvidia-kmod.spec 8 Jan 2009 23:21:40 -0000 1.16
@@ -3,12 +3,12 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
Name: nvidia-kmod
-Version: 177.82
+Version: 180.22
# Taken over by kmodtool
-Release: 1%{?dist}.7
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -94,6 +94,9 @@
%changelog
+* Thu Jan 8 2009 kwizart < kwizart at gmail.com > - 180.22-1
+- Update to 180.22 (stable)
+
* Sat Dec 20 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 177.82-1.7
- rebuild for latest Fedora kernel;
15 years, 10 months
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.20,1.21
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13466
Modified Files:
nvidia-kmod.spec
Log Message:
newest
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nvidia-kmod.spec 8 Jan 2009 22:48:38 -0000 1.20
+++ nvidia-kmod.spec 8 Jan 2009 22:49:31 -0000 1.21
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#define buildforkernels newest
+%define buildforkernels newest
Name: nvidia-kmod
Version: 180.22
15 years, 10 months
rpms/nvidia-kmod/devel nvidia-kmod.spec, 1.19, 1.20 sources, 1.6, 1.7 .cvsignore, 1.6, 1.7
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13108
Modified Files:
nvidia-kmod.spec sources .cvsignore
Log Message:
- Update to 180.22 (stable)
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nvidia-kmod.spec 4 Jan 2009 09:47:23 -0000 1.19
+++ nvidia-kmod.spec 8 Jan 2009 22:48:38 -0000 1.20
@@ -3,12 +3,12 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
Name: nvidia-kmod
-Version: 180.18
+Version: 180.22
# Taken over by kmodtool
-Release: 1%{?dist}.2
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -94,6 +94,9 @@
%changelog
+* Thu Jan 8 2009 kwizart < kwizart at gmail.com > - 180.22-1
+- Update to 180.22 (stable)
+
* Sun Jan 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 180.18-1.2
- rebuild for latest Fedora kernel;
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 27 Dec 2008 23:21:11 -0000 1.6
+++ sources 8 Jan 2009 22:48:38 -0000 1.7
@@ -1 +1 @@
-9907379664deccdfe358127577829fff nvidia-kmod-data-180.18.tar.bz2
+3de8fe5b407a2b1858414c98ab9d0346 nvidia-kmod-data-180.22.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 27 Dec 2008 23:21:11 -0000 1.6
+++ .cvsignore 8 Jan 2009 22:48:38 -0000 1.7
@@ -1 +1 @@
-nvidia-kmod-data-180.18.tar.bz2
+nvidia-kmod-data-180.22.tar.bz2
15 years, 10 months
rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec, 1.11, 1.12 sources, 1.6, 1.7 .cvsignore, 1.6, 1.7
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11691
Modified Files:
xorg-x11-drv-nvidia.spec sources .cvsignore
Log Message:
Update to 180.22 (stable) featuring vdpau
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-nvidia.spec 27 Dec 2008 23:13:14 -0000 1.11
+++ xorg-x11-drv-nvidia.spec 8 Jan 2009 22:21:43 -0000 1.12
@@ -7,7 +7,7 @@
%endif
Name: xorg-x11-drv-nvidia
-Version: 180.18
+Version: 180.22
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -291,6 +291,9 @@
%changelog
+* Thu Jan 8 2009 kwizart < kwizart at gmail.com > - 180.22-1
+- Update to 180.22 (stable)
+
* Sat Dec 28 2008 kwizart < kwizart at gmail.com > - 180.18-1
- Update to 180.18 (beta)
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 27 Dec 2008 23:13:14 -0000 1.6
+++ sources 8 Jan 2009 22:21:43 -0000 1.7
@@ -1,2 +1,2 @@
-a02b0669dbee6731bbc5954636c2e308 NVIDIA-Linux-x86_64-180.18-pkg0.run
-47975dac9787cdbfbca392824c85c31e NVIDIA-Linux-x86-180.18-pkg0.run
+265a984e973bcf5a7c2feeba4b0927a9 NVIDIA-Linux-x86-180.22-pkg0.run
+91a40e758b06429453d780932f51d6d9 NVIDIA-Linux-x86_64-180.22-pkg0.run
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 27 Dec 2008 23:13:14 -0000 1.6
+++ .cvsignore 8 Jan 2009 22:21:43 -0000 1.7
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-180.18-pkg0.run
-NVIDIA-Linux-x86-180.18-pkg0.run
+NVIDIA-Linux-x86-180.22-pkg0.run
+NVIDIA-Linux-x86_64-180.22-pkg0.run
15 years, 10 months
rpms/xine-lib-extras-freeworld/EL-5 xine-lib-1.1.16-internal_ffmpeg.patch, NONE, 1.1 xine-lib-extras-freeworld.spec, 1.8, 1.9
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/xine-lib-extras-freeworld/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10543
Modified Files:
xine-lib-extras-freeworld.spec
Added Files:
xine-lib-1.1.16-internal_ffmpeg.patch
Log Message:
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/EL-5/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 16:24:30 -0000 1.8
+++ xine-lib-extras-freeworld.spec 8 Jan 2009 22:02:38 -0000 1.9
@@ -4,13 +4,13 @@
%define abiver 1.25
%if 0%{?fedora} > 6
-%define _with_external_ffmpeg --with-external-ffmpeg
+#define _with_external_ffmpeg --with-external-ffmpeg
%endif
Name: xine-lib-extras-freeworld
Summary: Extra codecs for the Xine multimedia library
Version: 1.1.16
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
@@ -19,7 +19,8 @@
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
@@ -68,7 +69,7 @@
# Patch1 needed at least when compiling with external ffmpeg, #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 +186,10 @@
%changelog
+* 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/mplayer/devel .cvsignore, 1.8, 1.9 mplayer-nodvdcss.patch, 1.1, 1.2 mplayer-x86_32-compile.patch, 1.3, 1.4 mplayer.spec, 1.13, 1.14 sources, 1.9, 1.10
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9543
Modified Files:
.cvsignore mplayer-nodvdcss.patch mplayer-x86_32-compile.patch
mplayer.spec sources
Log Message:
* Wed Jan 07 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.105.20090107svn
- 20090107 snapshot
- dropped .sh extension from shell scripts in %{_bindir}
- BR: yasm for more asm-optimized routines
- rebased patches
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 18 Dec 2008 19:32:41 -0000 1.8
+++ .cvsignore 8 Jan 2009 21:45:06 -0000 1.9
@@ -1,2 +1,2 @@
-mplayer-export-2008-12-18.tar.bz2
+mplayer-export-2009-01-07.tar.bz2
Blue-1.7.tar.bz2
mplayer-nodvdcss.patch:
Index: mplayer-nodvdcss.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-nodvdcss.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mplayer-nodvdcss.patch 16 Oct 2008 20:03:52 -0000 1.1
+++ mplayer-nodvdcss.patch 8 Jan 2009 21:45:06 -0000 1.2
@@ -1,7 +1,7 @@
-diff -up mplayer-export-2008-09-03/configure.nodvdcss mplayer-export-2008-09-03/configure
---- mplayer-export-2008-09-03/configure.nodvdcss 2008-10-16 21:22:23.000000000 +0200
-+++ mplayer-export-2008-09-03/configure 2008-10-16 21:30:47.000000000 +0200
-@@ -589,7 +589,7 @@ _dvdnavconfig=dvdnav-config
+diff -up mplayer-export-2009-01-07/configure.nodvdcss mplayer-export-2009-01-07/configure
+--- mplayer-export-2009-01-07/configure.nodvdcss 2009-01-07 00:27:10.000000000 +0100
++++ mplayer-export-2009-01-07/configure 2009-01-07 00:27:10.000000000 +0100
+@@ -617,7 +617,7 @@ _dvdnavconfig=dvdnav-config
_dvdreadconfig=dvdread-config
_dvdread=auto
_dvdread_internal=auto
@@ -10,9 +10,9 @@
_xanim=auto
_real=auto
_live=auto
-diff -up mplayer-export-2008-09-03/Makefile.nodvdcss mplayer-export-2008-09-03/Makefile
---- mplayer-export-2008-09-03/Makefile.nodvdcss 2008-10-16 21:22:23.000000000 +0200
-+++ mplayer-export-2008-09-03/Makefile 2008-10-16 21:27:12.000000000 +0200
+diff -up mplayer-export-2009-01-07/Makefile.nodvdcss mplayer-export-2009-01-07/Makefile
+--- mplayer-export-2009-01-07/Makefile.nodvdcss 2009-01-07 00:27:10.000000000 +0100
++++ mplayer-export-2009-01-07/Makefile 2009-01-07 00:27:10.000000000 +0100
@@ -336,11 +336,6 @@ SRCS_COMMON-$(LIBDCA) +=
SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \
libmpcodecs/vd_libdv.c \
@@ -25,15 +25,15 @@
SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \
-@@ -677,7 +672,6 @@ DIRS = . \
- libavcodec/sparc \
+@@ -732,7 +727,6 @@ DIRS = . \
+ libavcodec/x86 \
libavformat \
libavutil \
- libdvdcss \
libdvdread \
libfaad2 \
libmenu \
-@@ -783,7 +777,6 @@ codec-cfg.d: codecs.conf.h
+@@ -838,7 +832,6 @@ codec-cfg.d: codecs.conf.h
mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplayer-rc.o stream/network.d stream/stream_cddb.d: version.h
$(DEPS): help_mp.h
mplayer-x86_32-compile.patch:
Index: mplayer-x86_32-compile.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-x86_32-compile.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mplayer-x86_32-compile.patch 18 Dec 2008 19:32:41 -0000 1.3
+++ mplayer-x86_32-compile.patch 8 Jan 2009 21:45:06 -0000 1.4
@@ -1,11 +1,11 @@
-diff -up mplayer-export-2008-12-18/libavcodec/Makefile.compile mplayer-export-2008-12-18/libavcodec/Makefile
---- mplayer-export-2008-12-18/libavcodec/Makefile.compile 2008-12-17 01:54:54.000000000 +0100
-+++ mplayer-export-2008-12-18/libavcodec/Makefile 2008-12-18 19:44:49.000000000 +0100
-@@ -505,3 +505,7 @@ include $(SUBDIR)../subdir.mak
+diff -up mplayer-export-2009-01-07/libavcodec/Makefile.compile mplayer-export-2009-01-07/libavcodec/Makefile
+--- mplayer-export-2009-01-07/libavcodec/Makefile.compile 2009-01-06 23:01:57.000000000 +0100
++++ mplayer-export-2009-01-07/libavcodec/Makefile 2009-01-08 21:32:58.000000000 +0100
+@@ -511,3 +511,7 @@ include $(SUBDIR)../subdir.mak
$(SUBDIR)dct-test$(EXESUF): $(SUBDIR)fdctref.o $(SUBDIR)aandcttab.o
$(SUBDIR)fft-test$(EXESUF): $(SUBDIR)fdctref.o
+ifeq ($(ARCH_X86_32),yes)
-+$(SUBDIR)i386/snowdsp_mmx.o: CFLAGS += -fomit-frame-pointer
++$(SUBDIR)x86/snowdsp_mmx.o: CFLAGS += -fomit-frame-pointer
+$(SUBDIR)h264.o: CFLAGS += -fomit-frame-pointer
+endif
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mplayer.spec 6 Jan 2009 22:09:52 -0000 1.13
+++ mplayer.spec 8 Jan 2009 21:45:06 -0000 1.14
@@ -1,12 +1,12 @@
%define codecdir %{_libdir}/codecs
-%define pre 20081218svn
+%define pre 20090107svn
%define svn 1
-%define svnbuild 2008-12-18
+%define svnbuild 2009-01-07
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.0
-Release: 0.104.%{pre}%{?dist}
+Release: 0.105.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -68,6 +68,7 @@
BuildRequires: twolame-devel
BuildRequires: x264-devel >= 0.0.0-0.14.20080613
BuildRequires: xvidcore-devel >= 0.9.2
+BuildRequires: yasm
%{?_with_arts:BuildRequires: arts-devel}
%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
%{?_with_directfb:BuildRequires: directfb-devel}
@@ -346,8 +347,11 @@
%changelog
-* ??? Jan ?? 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.105.???
+* Wed Jan 07 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.105.20090107svn
+- 20090107 snapshot
- dropped .sh extension from shell scripts in %%{_bindir}
+- BR: yasm for more asm-optimized routines
+- rebased patches
* Thu Dec 18 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.104.20081218svn
- 20081218 snapshot
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 18 Dec 2008 19:32:41 -0000 1.9
+++ sources 8 Jan 2009 21:45:06 -0000 1.10
@@ -1,2 +1,2 @@
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
-a1034c489750f70af6e7696a0cd509c7 mplayer-export-2008-12-18.tar.bz2
+e4ad749b4ad4d824fef4a333a0ef0680 mplayer-export-2009-01-07.tar.bz2
15 years, 10 months
rpms/xine-lib-extras-freeworld/devel xine-lib-extras-freeworld.spec, 1.16, 1.17
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/xine-lib-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3587
Modified Files:
xine-lib-extras-freeworld.spec
Log Message:
* Thu Jan 08 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-2
- drop ffmpeg_api patch (not needed)
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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xine-lib-extras-freeworld.spec 7 Jan 2009 20:21:15 -0000 1.16
+++ xine-lib-extras-freeworld.spec 8 Jan 2009 19:54:13 -0000 1.17
@@ -10,7 +10,7 @@
Name: xine-lib-extras-freeworld
Summary: Extra codecs for the Xine multimedia library
Version: 1.1.16
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
@@ -19,7 +19,6 @@
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
BuildRequires: pkgconfig
BuildRequires: zlib-devel
@@ -68,8 +67,6 @@
# Patch1 needed at least when compiling with external ffmpeg, #939.
%patch6 -p1 -b .deepbind
-%patch100 -p1 -b .ffmpeg_api
-
# Avoid standard rpaths on lib64 archs:
sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -185,6 +182,9 @@
%changelog
+* Thu Jan 08 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-2
+- drop ffmpeg_api patch (not needed)
+
* Wed Jan 07 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.1.16-1
- xine-lib-1.1.16
15 years, 10 months
rpms/gecko-mediaplayer/F-9 gecko-mediaplayer-0.9.3-console.patch, NONE, 1.1 gecko-mediaplayer.spec, 1.10, 1.11
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31587
Modified Files:
gecko-mediaplayer.spec
Added Files:
gecko-mediaplayer-0.9.3-console.patch
Log Message:
* Thu Jan 8 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-2
- Added patch fixing rpmfusion bug #290 from SVN
gecko-mediaplayer-0.9.3-console.patch:
--- NEW FILE gecko-mediaplayer-0.9.3-console.patch ---
Index: src/plugin_setup.cpp
===================================================================
--- src/plugin_setup.cpp (wersja 262)
+++ src/plugin_setup.cpp (wersja 263)
@@ -42,7 +42,7 @@
void new_instance(nsPluginInstance * instance, nsPluginCreateData * parameters)
{
- gint i;
+ gint i,j;
gint newwindow = 0;
gint loop = 0;
gboolean autohref = FALSE;
@@ -71,6 +71,11 @@
if (g_ascii_strcasecmp(parameters->argn[i], "console") == 0) {
instance->console = g_strdup(parameters->argv[i]);
+ for (j = 0; j < strlen(instance->console); j++) {
+ if (!g_ascii_isalnum(instance->console[j])) {
+ instance->console[j] = 'a';
+ }
+ }
}
if (g_ascii_strcasecmp(parameters->argn[i], "controls") == 0) {
Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/F-9/gecko-mediaplayer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gecko-mediaplayer.spec 3 Jan 2009 08:59:54 -0000 1.10
+++ gecko-mediaplayer.spec 8 Jan 2009 18:35:13 -0000 1.11
@@ -1,12 +1,13 @@
Name: gecko-mediaplayer
Version: 0.9.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Gnome MPlayer browser plugin
Group: Applications/Multimedia
License: GPLv2+
URL: http://code.google.com/p/gecko-mediaplayer/
Source0: http://gecko-mediaplayer.googlecode.com/files/%{name}-%{version}.tar.gz
+Patch0: gecko-mediaplayer-0.9.3-console.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-glib-devel
@@ -32,6 +33,7 @@
%prep
%setup -q
+%patch0 -p0 -b .console
%build
@@ -95,6 +97,9 @@
%changelog
+* Thu Jan 8 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-2
+- Added patch fixing rpmfusion bug #290 from SVN
+
* Sat Jan 3 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.3-1
- Updated to 0.9.3
15 years, 10 months