rpms/xmms2-freeworld/devel xmms2-ffmpeg.patch, 1.3, 1.4 xmms2-freeworld.spec, 1.16, 1.17
Author: leigh123linux
Update of /cvs/free/rpms/xmms2-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29268
Modified Files:
xmms2-ffmpeg.patch xmms2-freeworld.spec
Log Message:
* Mon Dec 09 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 0.8-11
- fix ffmpeg compile error
xmms2-ffmpeg.patch:
avcodec.c | 9 +++++----
avcodec_compat.h | 18 ++++++++++++++++++
2 files changed, 23 insertions(+), 4 deletions(-)
Index: xmms2-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/xmms2-freeworld/devel/xmms2-ffmpeg.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmms2-ffmpeg.patch 2 Nov 2012 01:50:27 -0000 1.3
+++ xmms2-ffmpeg.patch 9 Dec 2013 11:33:10 -0000 1.4
@@ -1,6 +1,14 @@
diff -rupN xmms2-0.8DrO_o.old/src/plugins/avcodec/avcodec.c
xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c
--- xmms2-0.8DrO_o.old/src/plugins/avcodec/avcodec.c 2011-10-20 15:26:08.000000000 -0400
+++ xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c 2012-11-01 21:36:57.426070895 -0400
+@@ -27,6 +27,7 @@
+ #include "avcodec_compat.h"
+
+ #define AVCODEC_BUFFER_SIZE 16384
++#define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+
+ typedef struct {
+ AVCodecContext *codecctx;
@@ -200,7 +200,7 @@ xmms_avcodec_init (xmms_xform_t *xform)
}
}
@@ -19,6 +27,24 @@
XMMS_DBG ("Opening decoder '%s' failed", codec->name);
goto err;
} else {
+@@ -263,7 +264,7 @@ xmms_avcodec_read (xmms_xform_t *xform,
+ xmms_error_t *error)
+ {
+ xmms_avcodec_data_t *data;
+- char outbuf[AVCODEC_MAX_AUDIO_FRAME_SIZE];
++ char outbuf[MAX_AUDIO_FRAME_SIZE];
+ gint outbufsize, bytes_read = 0;
+ guint size;
+
+@@ -371,7 +372,7 @@ static gint64
+ xmms_avcodec_seek (xmms_xform_t *xform, gint64 samples, xmms_xform_seek_mode_t whence,
xmms_error_t *err)
+ {
+ xmms_avcodec_data_t *data;
+- char outbuf[AVCODEC_MAX_AUDIO_FRAME_SIZE];
++ char outbuf[MAX_AUDIO_FRAME_SIZE];
+ gint outbufsize, bytes_read = 0;
+ gint64 ret = -1;
+
diff -rupN xmms2-0.8DrO_o.old/src/plugins/avcodec/avcodec_compat.h
xmms2-0.8DrO_o/src/plugins/avcodec/avcodec_compat.h
--- xmms2-0.8DrO_o.old/src/plugins/avcodec/avcodec_compat.h 2011-10-20 15:26:08.000000000
-0400
+++ xmms2-0.8DrO_o/src/plugins/avcodec/avcodec_compat.h 2012-11-01 21:35:50.276405569
-0400
Index: xmms2-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/xmms2-freeworld/devel/xmms2-freeworld.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xmms2-freeworld.spec 8 Dec 2013 20:07:39 -0000 1.16
+++ xmms2-freeworld.spec 9 Dec 2013 11:33:10 -0000 1.17
@@ -3,7 +3,7 @@
Name: xmms2-freeworld
Summary: Plugins for XMMS2 that cannot be included in Fedora
Version: 0.8
-Release: 10%{?dist}
+Release: 11%{?dist}
License: LGPLv2+ and GPL+ and BSD
Group: Applications/Multimedia
# Fedora's xmms2 has to use a sanitized tarball, we don't.
@@ -208,6 +208,9 @@
%{_libdir}/xmms2/libxmms_mp4.so
%changelog
+* Mon Dec 09 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 0.8-11
+- fix ffmpeg compile error
+
* Sun Dec 08 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.8-10
- Rebuilt