pool/xine-lib
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xine-lib: update to 1.1.20

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=46
This commit is contained in:
Manfred Tremmel 2011-11-13 17:30:15 +00:00 committed by Git OBS Bridge
parent 81affbcd88
commit b02551bb01
16 changed files with 102 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vdr-xine-0.9.3.diff.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:11bfc74fa458ab6e76b7504db5e368809e511ff2d0ead06536e38f54985d0173
size 24886
oid sha256:3ea7e34360650470f5da0164b6817e5301d60f337331e5e316752d3e1792c71b
size 24923

11
xine-lib-1.1.19-assert.patch
View File

@ -1,11 +0,0 @@
diff -ur xine-lib-1.1.19.orig/src/audio_out/audio_alsa_out.c xine-lib-1.1.19/src/audio_out/audio_alsa_out.c
--- xine-lib-1.1.19.orig/src/audio_out/audio_alsa_out.c 2010-04-11 16:57:37.000000000 +0200
+++ xine-lib-1.1.19/src/audio_out/audio_alsa_out.c 2010-07-26 00:57:55.476784389 +0200
@@ -41,6 +41,7 @@
#ifdef HAVE_ALLOCA_H
#include <alloca.h>
#endif
+#include <assert.h>
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API

3
xine-lib-1.1.19-crippled.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9b4c2394433f1549e7e7219740df1c5c77b3c6c1f73a7886cc18fc63ef1d5464
size 5120937

241
xine-lib-1.1.19-ffmpeg_abi_change.diff
View File

@ -1,241 +0,0 @@
diff -ur xine-lib-1.1.19.orig/src/combined/ffmpeg/ff_audio_decoder.c xine-lib-1.1.19/src/combined/ffmpeg/ff_audio_decoder.c
--- xine-lib-1.1.19.orig/src/combined/ffmpeg/ff_audio_decoder.c 2010-03-23 16:41:49.000000000 +0100
+++ xine-lib-1.1.19/src/combined/ffmpeg/ff_audio_decoder.c 2011-05-17 20:23:15.000000000 +0200
@@ -46,6 +46,12 @@
#define AUDIOBUFSIZE (64 * 1024)
+#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
+# define AVAUDIO 3
+#else
+# define AVAUDIO 2
+#endif
+
typedef struct {
audio_decoder_class_t decoder_class;
} ff_audio_class_t;
@@ -255,6 +261,9 @@
buf->decoder_info[2]);
} else if (!(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
+#if AVAUDIO > 2
+ AVPacket avpkt;
+#endif
if( !this->decoder_ok ) {
if ( ! this->context || ! this->codec ) {
@@ -286,11 +295,21 @@
if (!this->output_open) {
if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) {
decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+#if AVAUDIO > 2
+ av_init_packet (&avpkt);
+ avpkt.data = (uint8_t *)&this->buf[0];
+ avpkt.size = this->size;
+ avpkt.flags = AV_PKT_FLAG_KEY;
+ avcodec_decode_audio3 (this->context,
+ (int16_t *)this->decode_buffer,
+ &decode_buffer_size, &avpkt);
+#else
avcodec_decode_audio2 (this->context,
(int16_t *)this->decode_buffer,
&decode_buffer_size,
&this->buf[0],
this->size);
+#endif
this->audio_bits = this->context->bits_per_sample;
this->audio_sample_rate = this->context->sample_rate;
this->audio_channels = this->context->channels;
@@ -311,12 +330,21 @@
offset = 0;
while (this->size>0) {
decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+#if AVAUDIO > 2
+ av_init_packet (&avpkt);
+ avpkt.data = (uint8_t *)&this->buf[offset];
+ avpkt.size = this->size;
+ avpkt.flags = AV_PKT_FLAG_KEY;
+ bytes_consumed = avcodec_decode_audio3 (this->context,
+ (int16_t *)this->decode_buffer,
+ &decode_buffer_size, &avpkt);
+#else
bytes_consumed = avcodec_decode_audio2 (this->context,
(int16_t *)this->decode_buffer,
&decode_buffer_size,
&this->buf[offset],
this->size);
-
+#endif
if (bytes_consumed<0) {
xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
"ffmpeg_audio_dec: error decompressing audio frame\n");
diff -ur xine-lib-1.1.19.orig/src/combined/ffmpeg/ff_video_decoder.c xine-lib-1.1.19/src/combined/ffmpeg/ff_video_decoder.c
--- xine-lib-1.1.19.orig/src/combined/ffmpeg/ff_video_decoder.c 2010-03-10 20:07:15.000000000 +0100
+++ xine-lib-1.1.19/src/combined/ffmpeg/ff_video_decoder.c 2011-05-17 20:23:15.000000000 +0200
@@ -58,6 +58,14 @@
#define ENABLE_DIRECT_RENDERING
+#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
+# define AVVIDEO 2
+#else
+# define AVVIDEO 1
+# define pp_context pp_context_t
+# define pp_mode pp_mode_t
+#endif
+
/* reordered_opaque appeared in libavcodec 51.68.0 */
#define AVCODEC_HAS_REORDERED_OPAQUE
#if LIBAVCODEC_VERSION_INT < 0x334400
@@ -116,8 +124,8 @@
int pp_quality;
int pp_flags;
- pp_context_t *pp_context;
- pp_mode_t *pp_mode;
+ pp_context *our_context;
+ pp_mode *our_mode;
/* mpeg-es parsing */
mpeg_parser_t *mpeg_parser;
@@ -444,23 +452,23 @@
this->pp_quality = this->class->pp_quality;
if(this->pp_available && this->pp_quality) {
- if(!this->pp_context && this->context)
- this->pp_context = pp_get_context(this->context->width, this->context->height,
+ if(!this->our_context && this->context)
+ this->our_context = pp_get_context(this->context->width, this->context->height,
this->pp_flags);
- if(this->pp_mode)
- pp_free_mode(this->pp_mode);
+ if(this->our_mode)
+ pp_free_mode(this->our_mode);
- this->pp_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a",
+ this->our_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a",
this->pp_quality);
} else {
- if(this->pp_mode) {
- pp_free_mode(this->pp_mode);
- this->pp_mode = NULL;
+ if(this->our_mode) {
+ pp_free_mode(this->our_mode);
+ this->our_mode = NULL;
}
- if(this->pp_context) {
- pp_free_context(this->pp_context);
- this->pp_context = NULL;
+ if(this->our_context) {
+ pp_free_context(this->our_context);
+ this->our_context = NULL;
}
}
}
@@ -1055,12 +1063,26 @@
}
/* skip decoding b frames if too late */
+#if AVVIDEO > 1
+ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT;
+#else
this->context->hurry_up = (this->skipframes > 0);
+#endif
lprintf("avcodec_decode_video: size=%d\n", this->mpeg_parser->buffer_size);
+#if AVVIDEO > 1
+ AVPacket avpkt;
+ av_init_packet(&avpkt);
+ avpkt.data = (uint8_t *)this->mpeg_parser->chunk_buffer;
+ avpkt.size = this->mpeg_parser->buffer_size;
+ avpkt.flags = AV_PKT_FLAG_KEY;
+ len = avcodec_decode_video2 (this->context, this->av_frame,
+ &got_picture, &avpkt);
+#else
len = avcodec_decode_video (this->context, this->av_frame,
&got_picture, this->mpeg_parser->chunk_buffer,
this->mpeg_parser->buffer_size);
+#endif
lprintf("avcodec_decode_video: decoded_size=%d, got_picture=%d\n",
len, got_picture);
len = current - buf->content - offset;
@@ -1112,7 +1134,13 @@
} else {
- if (this->context->hurry_up) {
+ if (
+#if AVVIDEO > 1
+ this->context->skip_frame != AVDISCARD_DEFAULT
+#else
+ this->context->hurry_up
+#endif
+ ) {
/* skipped frame, output a bad frame */
img = this->stream->video_out->get_frame (this->stream->video_out,
this->bih.biWidth,
@@ -1304,13 +1332,25 @@
got_picture = 0;
} else {
/* skip decoding b frames if too late */
+#if AVVIDEO > 1
+ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT;
+#else
this->context->hurry_up = (this->skipframes > 0);
-
+#endif
lprintf("buffer size: %d\n", this->size);
+#if AVVIDEO > 1
+ AVPacket avpkt;
+ av_init_packet(&avpkt);
+ avpkt.data = (uint8_t *)&chunk_buf[offset];
+ avpkt.size = this->size;
+ avpkt.flags = AV_PKT_FLAG_KEY;
+ len = avcodec_decode_video2 (this->context, this->av_frame,
+ &got_picture, &avpkt);
+#else
len = avcodec_decode_video (this->context, this->av_frame,
&got_picture, &chunk_buf[offset],
this->size);
-
+#endif
#ifdef AVCODEC_HAS_REORDERED_OPAQUE
/* reset consumed pts value */
this->context->reordered_opaque = ff_tag_pts(this, 0);
@@ -1432,7 +1472,7 @@
img->base, img->pitches,
img->width, img->height,
this->av_frame->qscale_table, this->av_frame->qstride,
- this->pp_mode, this->pp_context,
+ this->our_mode, this->our_context,
this->av_frame->pict_type);
} else if (!this->av_frame->opaque) {
@@ -1676,11 +1716,11 @@
free(this->buf);
this->buf = NULL;
- if(this->pp_context)
- pp_free_context(this->pp_context);
+ if(this->our_context)
+ pp_free_context(this->our_context);
- if(this->pp_mode)
- pp_free_mode(this->pp_mode);
+ if(this->our_mode)
+ pp_free_mode(this->our_mode);
mpeg_parser_dispose(this->mpeg_parser);
@@ -1721,8 +1761,8 @@
this->aspect_ratio = 0;
this->pp_quality = 0;
- this->pp_context = NULL;
- this->pp_mode = NULL;
+ this->our_context = NULL;
+ this->our_mode = NULL;
this->mpeg_parser = NULL;

17
xine-lib-1.1.19-xvmc.patch
View File

@ -1,17 +0,0 @@
Quoting ChangeLog of X11's videoproto package:
vldXvMC.h: stop uselessly including XvMClib.h
--- src/video_out/xxmc.h
+++ src/video_out/xxmc.h
@@ -77,10 +77,10 @@
#include <X11/extensions/XShm.h>
#include <X11/extensions/Xv.h>
#include <X11/extensions/Xvlib.h>
+#include <X11/extensions/XvMClib.h>
#ifdef HAVE_VLDXVMC
#include <X11/extensions/vldXvMC.h>
#else
- #include <X11/extensions/XvMClib.h>
#include <X11/extensions/XvMC.h>
#endif

3
xine-lib-1.1.19.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6277c6c5343ad45027492d0b3437f1894b3d34fd9b292638da2bf4ae749d8774
size 7531642

11
xine-lib-1.1.20-assert.patch Normal file
View File

@ -0,0 +1,11 @@
diff -ur xine-lib-1.1.20.orig/src/audio_out/audio_alsa_out.c xine-lib-1.1.20/src/audio_out/audio_alsa_out.c
--- xine-lib-1.1.20.orig/src/audio_out/audio_alsa_out.c 2011-10-04 23:42:53.000000000 +0200
+++ xine-lib-1.1.20/src/audio_out/audio_alsa_out.c 2011-11-13 17:54:44.276984269 +0100
@@ -41,6 +41,7 @@
#ifdef HAVE_ALLOCA_H
#include <alloca.h>
#endif
+#include <assert.h>
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API

3
xine-lib-1.1.20-crippled.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b1fd9c6fd22507b07972a590c6f2dd58c5f86f17ab55da5b5b0393d18b8385d4
size 5119599

6
xine-lib-1.1.19-demuxcheckfor_mad_ffmpeg.patch → xine-lib-1.1.20-demuxcheckfor_mad_ffmpeg.patch
View File

@ -1,6 +1,6 @@
diff -ur xine-lib-1.1.19.orig/src/xine-engine/load_plugins.c xine-lib-1.1.19/src/xine-engine/load_plugins.c
--- xine-lib-1.1.19.orig/src/xine-engine/load_plugins.c 2010-03-09 23:17:05.000000000 +0100
+++ xine-lib-1.1.19/src/xine-engine/load_plugins.c 2010-07-26 01:24:26.098035179 +0200
diff -ur xine-lib-1.1.20.orig/src/xine-engine/load_plugins.c xine-lib-1.1.20/src/xine-engine/load_plugins.c
--- xine-lib-1.1.20.orig/src/xine-engine/load_plugins.c 2011-10-16 20:59:32.000000000 +0200
+++ xine-lib-1.1.20/src/xine-engine/load_plugins.c 2011-11-13 18:08:39.357570472 +0100
@@ -2508,9 +2508,18 @@
plugin_catalog_t *catalog = self->plugin_catalog;

6
xine-lib-1.1.19-glitch-free-pulseaudio.patch → xine-lib-1.1.20-glitch-free-pulseaudio.patch
View File

@ -1,6 +1,6 @@
diff -ur xine-lib-1.1.19.orig/src/xine-engine/audio_out.c xine-lib-1.1.19/src/xine-engine/audio_out.c
--- xine-lib-1.1.19.orig/src/xine-engine/audio_out.c 2010-07-21 19:43:52.000000000 +0200
+++ xine-lib-1.1.19/src/xine-engine/audio_out.c 2010-07-26 00:34:13.178049961 +0200
diff -ur xine-lib-1.1.20.orig/src/xine-engine/audio_out.c xine-lib-1.1.20/src/xine-engine/audio_out.c
--- xine-lib-1.1.20.orig/src/xine-engine/audio_out.c 2010-08-16 18:36:37.000000000 +0200
+++ xine-lib-1.1.20/src/xine-engine/audio_out.c 2011-11-13 17:23:52.677415436 +0100
@@ -1156,8 +1156,17 @@
/*

8
xine-lib-1.1.19-ia64-is-not-alpha.diff → xine-lib-1.1.20-ia64-is-not-alpha.diff
View File

@ -1,7 +1,7 @@
diff -ur xine-lib-1.1.19.orig/configure.ac xine-lib-1.1.19/configure.ac
--- xine-lib-1.1.19.orig/configure.ac 2010-07-25 16:37:30.000000000 +0200
+++ xine-lib-1.1.19/configure.ac 2010-07-26 00:30:47.254790180 +0200
@@ -2395,10 +2395,13 @@
diff -ur xine-lib-1.1.20.orig/configure.ac xine-lib-1.1.20/configure.ac
--- xine-lib-1.1.20.orig/configure.ac 2011-11-13 02:36:20.000000000 +0100
+++ xine-lib-1.1.20/configure.ac 2011-11-13 17:19:36.819687116 +0100
@@ -2407,10 +2407,13 @@
mips-*)
AC_DEFINE_UNQUOTED(FPM_MIPS,,[Define to select libmad fixed point arithmetic implementation])
;;

54
xine-lib-1.1.19-install-plugins-helper.diff → xine-lib-1.1.20-install-plugins-helper.diff
View File

@ -1,7 +1,7 @@
diff -urN xine-lib-1.1.19.orig/configure.ac xine-lib-1.1.19/configure.ac
--- xine-lib-1.1.19.orig/configure.ac 2010-07-26 00:48:39.267784541 +0200
+++ xine-lib-1.1.19/configure.ac 2010-07-26 00:54:10.464784907 +0200
@@ -2645,6 +2645,28 @@
diff -uNr xine-lib-1.1.20.orig/configure.ac xine-lib-1.1.20/configure.ac
--- xine-lib-1.1.20.orig/configure.ac 2011-11-13 17:46:57.513129735 +0100
+++ xine-lib-1.1.20/configure.ac 2011-11-13 17:40:51.572377268 +0100
@@ -2657,6 +2657,28 @@
AM_CONDITIONAL(HAVE_W32DLL, test "x$enable_w32dll" != "xno")
@ -30,9 +30,9 @@ diff -urN xine-lib-1.1.19.orig/configure.ac xine-lib-1.1.19/configure.ac
dnl ---------------------------------------------
dnl some include paths ( !!! DO NOT REMOVE !!! )
diff -urN xine-lib-1.1.19.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.19/src/xine-engine/audio_decoder.c
--- xine-lib-1.1.19.orig/src/xine-engine/audio_decoder.c 2010-07-21 19:43:52.000000000 +0200
+++ xine-lib-1.1.19/src/xine-engine/audio_decoder.c 2010-07-26 00:54:10.465817774 +0200
diff -uNr xine-lib-1.1.20.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.20/src/xine-engine/audio_decoder.c
--- xine-lib-1.1.20.orig/src/xine-engine/audio_decoder.c 2011-11-13 17:46:57.513129735 +0100
+++ xine-lib-1.1.20/src/xine-engine/audio_decoder.c 2011-10-04 23:42:53.000000000 +0200
@@ -41,6 +41,7 @@
#include "xine_internal.h"
@ -41,7 +41,7 @@ diff -urN xine-lib-1.1.19.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.19/s
static void *audio_decoder_loop (void *stream_gen) {
@@ -341,6 +342,10 @@
@@ -344,6 +345,10 @@
_x_stream_info_set(stream, XINE_STREAM_INFO_AUDIO_HANDLED,
(stream->audio_decoder_plugin != NULL));
@ -52,9 +52,9 @@ diff -urN xine-lib-1.1.19.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.19/s
}
if (audio_type != stream->audio_type) {
diff -urN xine-lib-1.1.19.orig/src/xine-engine/install_plugins_helper.c xine-lib-1.1.19/src/xine-engine/install_plugins_helper.c
--- xine-lib-1.1.19.orig/src/xine-engine/install_plugins_helper.c 1970-01-01 01:00:00.000000000 +0100
+++ xine-lib-1.1.19/src/xine-engine/install_plugins_helper.c 2010-07-26 00:54:10.465817774 +0200
diff -uNr xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.c xine-lib-1.1.20/src/xine-engine/install_plugins_helper.c
--- xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.c 2011-11-13 17:46:57.513129735 +0100
+++ xine-lib-1.1.20/src/xine-engine/install_plugins_helper.c 1970-01-01 01:00:00.000000000 +0100
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2007 Sascha Sommer
@ -162,9 +162,9 @@ diff -urN xine-lib-1.1.19.orig/src/xine-engine/install_plugins_helper.c xine-lib
+ }
+}
+
diff -urN xine-lib-1.1.19.orig/src/xine-engine/install_plugins_helper.h xine-lib-1.1.19/src/xine-engine/install_plugins_helper.h
--- xine-lib-1.1.19.orig/src/xine-engine/install_plugins_helper.h 1970-01-01 01:00:00.000000000 +0100
+++ xine-lib-1.1.19/src/xine-engine/install_plugins_helper.h 2010-07-26 00:54:10.465817774 +0200
diff -uNr xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.h xine-lib-1.1.20/src/xine-engine/install_plugins_helper.h
--- xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.h 2011-11-13 17:46:57.513129735 +0100
+++ xine-lib-1.1.20/src/xine-engine/install_plugins_helper.h 1970-01-01 01:00:00.000000000 +0100
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2007 Sascha Sommer
@ -201,9 +201,9 @@ diff -urN xine-lib-1.1.19.orig/src/xine-engine/install_plugins_helper.h xine-lib
+
+
+#endif
diff -urN xine-lib-1.1.19.orig/src/xine-engine/Makefile.am xine-lib-1.1.19/src/xine-engine/Makefile.am
--- xine-lib-1.1.19.orig/src/xine-engine/Makefile.am 2010-01-21 00:45:27.000000000 +0100
+++ xine-lib-1.1.19/src/xine-engine/Makefile.am 2010-07-26 00:54:10.465817774 +0200
diff -uNr xine-lib-1.1.20.orig/src/xine-engine/Makefile.am xine-lib-1.1.20/src/xine-engine/Makefile.am
--- xine-lib-1.1.20.orig/src/xine-engine/Makefile.am 2011-11-13 17:46:57.513129735 +0100
+++ xine-lib-1.1.20/src/xine-engine/Makefile.am 2011-10-04 23:42:53.000000000 +0200
@@ -19,7 +19,7 @@
video_overlay.c osd.c scratch.c demux.c vo_scale.c \
xine_interface.c post.c tvmode.c broadcaster.c io_helper.c \
@ -221,12 +221,12 @@ diff -urN xine-lib-1.1.19.orig/src/xine-engine/Makefile.am xine-lib-1.1.19/src/x
+ io_helper.h broadcaster.h info_helper.h refcounter.h alphablend.h \
+ install_plugins_helper.h
noinst_HEADERS = bswap.h ffmpeg_bswap.h
noinst_HEADERS = bswap.h ffmpeg_bswap.h xine_private.h
diff -urN xine-lib-1.1.19.orig/src/xine-engine/video_decoder.c xine-lib-1.1.19/src/xine-engine/video_decoder.c
--- xine-lib-1.1.19.orig/src/xine-engine/video_decoder.c 2010-07-21 19:43:52.000000000 +0200
+++ xine-lib-1.1.19/src/xine-engine/video_decoder.c 2010-07-26 00:54:10.466785270 +0200
@@ -37,6 +37,7 @@
diff -uNr xine-lib-1.1.20.orig/src/xine-engine/video_decoder.c xine-lib-1.1.20/src/xine-engine/video_decoder.c
--- xine-lib-1.1.20.orig/src/xine-engine/video_decoder.c 2011-11-13 17:46:57.517129699 +0100
+++ xine-lib-1.1.20/src/xine-engine/video_decoder.c 2011-11-08 21:26:43.000000000 +0100
@@ -38,6 +38,7 @@
#include "xine_internal.h"
#include "xineutils.h"
@ -234,7 +234,7 @@ diff -urN xine-lib-1.1.19.orig/src/xine-engine/video_decoder.c xine-lib-1.1.19/s
#include <sched.h>
#define SPU_SLEEP_INTERVAL (90000/2)
@@ -380,6 +381,10 @@
@@ -408,6 +409,10 @@
stream->video_decoder_plugin = _x_get_video_decoder (stream, streamtype);
_x_stream_info_set(stream, XINE_STREAM_INFO_VIDEO_HANDLED, (stream->video_decoder_plugin != NULL));
@ -245,10 +245,10 @@ diff -urN xine-lib-1.1.19.orig/src/xine-engine/video_decoder.c xine-lib-1.1.19/s
}
if (stream->video_decoder_plugin)
diff -urN xine-lib-1.1.19.orig/src/xine-engine/xine.c xine-lib-1.1.19/src/xine-engine/xine.c
--- xine-lib-1.1.19.orig/src/xine-engine/xine.c 2010-07-26 00:41:44.729784581 +0200
+++ xine-lib-1.1.19/src/xine-engine/xine.c 2010-07-26 00:54:10.467798861 +0200
@@ -1810,6 +1810,15 @@
diff -uNr xine-lib-1.1.20.orig/src/xine-engine/xine.c xine-lib-1.1.20/src/xine-engine/xine.c
--- xine-lib-1.1.20.orig/src/xine-engine/xine.c 2011-11-13 17:46:57.517129699 +0100
+++ xine-lib-1.1.20/src/xine-engine/xine.c 2011-11-13 17:35:47.579072679 +0100
@@ -1816,6 +1816,15 @@
0, NULL, this);
/*

50
xine-lib-1.1.19-mjpegplugin.diff → xine-lib-1.1.20-mjpegplugin.diff
View File

@ -1,7 +1,7 @@
diff -urN xine-lib-1.1.19.orig/configure xine-lib-1.1.19/configure
--- xine-lib-1.1.19.orig/configure 2010-07-25 16:40:24.000000000 +0200
+++ xine-lib-1.1.19/configure 2010-07-26 00:46:26.524784958 +0200
@@ -33677,6 +33677,7 @@
diff -uNr xine-lib-1.1.20.orig/configure xine-lib-1.1.20/configure
--- xine-lib-1.1.20.orig/configure 2011-11-13 02:37:22.000000000 +0100
+++ xine-lib-1.1.20/configure 2011-11-13 17:40:51.568377304 +0100
@@ -34954,6 +34954,7 @@
echo " * video decoder plugins:"
echo " - MPEG 1,2 - Amiga Bitplane"
echo " - Raw RGB - Raw YUV"
@ -9,9 +9,9 @@ diff -urN xine-lib-1.1.19.orig/configure xine-lib-1.1.19/configure
if test "x$with_external_ffmpeg" = "xyes"; then
echo " - ffmpeg (external library):"
else
diff -urN xine-lib-1.1.19.orig/configure.ac xine-lib-1.1.19/configure.ac
--- xine-lib-1.1.19.orig/configure.ac 2010-07-26 00:41:44.720048157 +0200
+++ xine-lib-1.1.19/configure.ac 2010-07-26 00:46:26.537784872 +0200
diff -uNr xine-lib-1.1.20.orig/configure.ac xine-lib-1.1.20/configure.ac
--- xine-lib-1.1.20.orig/configure.ac 2011-11-13 17:38:54.705413389 +0100
+++ xine-lib-1.1.20/configure.ac 2011-11-13 17:40:51.572377268 +0100
@@ -1109,6 +1109,28 @@
AC_SUBST([SDL_LIBS])
@ -41,7 +41,7 @@ diff -urN xine-lib-1.1.19.orig/configure.ac xine-lib-1.1.19/configure.ac
dnl check for Libstk
dnl ---------------------------------------------
@@ -2831,6 +2853,7 @@
@@ -2845,6 +2867,7 @@
src/libxineadec/gsm610/Makefile
src/libxineadec/nosefart/Makefile
src/libreal/Makefile
@ -49,7 +49,7 @@ diff -urN xine-lib-1.1.19.orig/configure.ac xine-lib-1.1.19/configure.ac
src/post/Makefile
src/post/planar/Makefile
src/post/goom/Makefile
@@ -3024,6 +3047,9 @@
@@ -3063,6 +3086,9 @@
dnl audio decoders
echo " * audio decoder plugins:"
echo " - GSM 06.10 - linear PCM"
@ -59,9 +59,9 @@ diff -urN xine-lib-1.1.19.orig/configure.ac xine-lib-1.1.19/configure.ac
if test "x$with_external_ffmpeg" = "xyes"; then
echo " - ffmpeg (external library):"
echo " - Windows Media Audio v1/v2/Pro"
diff -urN xine-lib-1.1.19.orig/src/Makefile.am xine-lib-1.1.19/src/Makefile.am
--- xine-lib-1.1.19.orig/src/Makefile.am 2010-07-26 00:41:44.720048157 +0200
+++ xine-lib-1.1.19/src/Makefile.am 2010-07-26 00:46:26.538786101 +0200
diff -uNr xine-lib-1.1.20.orig/src/Makefile.am xine-lib-1.1.20/src/Makefile.am
--- xine-lib-1.1.20.orig/src/Makefile.am 2011-11-13 17:38:54.705413389 +0100
+++ xine-lib-1.1.20/src/Makefile.am 2011-11-13 17:40:51.572377268 +0100
@@ -27,6 +27,7 @@
libreal \
libfaad \
@ -70,10 +70,10 @@ diff -urN xine-lib-1.1.19.orig/src/Makefile.am xine-lib-1.1.19/src/Makefile.am
post \
combined \
vdr
diff -urN xine-lib-1.1.19.orig/src/Makefile.in xine-lib-1.1.19/src/Makefile.in
--- xine-lib-1.1.19.orig/src/Makefile.in 2010-07-25 16:40:01.000000000 +0200
+++ xine-lib-1.1.19/src/Makefile.in 2010-07-26 00:46:26.539796410 +0200
@@ -453,6 +453,7 @@
diff -uNr xine-lib-1.1.20.orig/src/Makefile.in xine-lib-1.1.20/src/Makefile.in
--- xine-lib-1.1.20.orig/src/Makefile.in 2011-11-13 02:37:24.000000000 +0100
+++ xine-lib-1.1.20/src/Makefile.in 2011-11-13 17:40:51.572377268 +0100
@@ -460,6 +460,7 @@
libreal \
libfaad \
libmusepack \
@ -81,9 +81,9 @@ diff -urN xine-lib-1.1.19.orig/src/Makefile.in xine-lib-1.1.19/src/Makefile.in
post \
combined
diff -urN xine-lib-1.1.19.orig/src/mjpeg/Makefile.am xine-lib-1.1.19/src/mjpeg/Makefile.am
--- xine-lib-1.1.19.orig/src/mjpeg/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ xine-lib-1.1.19/src/mjpeg/Makefile.am 2010-07-26 00:46:26.539796410 +0200
diff -uNr xine-lib-1.1.20.orig/src/mjpeg/Makefile.am xine-lib-1.1.20/src/mjpeg/Makefile.am
--- xine-lib-1.1.20.orig/src/mjpeg/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ xine-lib-1.1.20/src/mjpeg/Makefile.am 2011-11-13 17:40:51.572377268 +0100
@@ -0,0 +1,9 @@
+include $(top_srcdir)/misc/Makefile.common
+
@ -94,9 +94,9 @@ diff -urN xine-lib-1.1.19.orig/src/mjpeg/Makefile.am xine-lib-1.1.19/src/mjpeg/M
+xineplug_decode_mjpeg_la_CFLAGS = $(VISIBILITY_FLAG)
+xineplug_decode_mjpeg_la_LDFLAGS = $(xineplug_ldflags)
+endif
diff -urN xine-lib-1.1.19.orig/src/mjpeg/Makefile.in xine-lib-1.1.19/src/mjpeg/Makefile.in
--- xine-lib-1.1.19.orig/src/mjpeg/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ xine-lib-1.1.19/src/mjpeg/Makefile.in 2010-07-26 00:46:26.540794705 +0200
diff -uNr xine-lib-1.1.20.orig/src/mjpeg/Makefile.in xine-lib-1.1.20/src/mjpeg/Makefile.in
--- xine-lib-1.1.20.orig/src/mjpeg/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ xine-lib-1.1.20/src/mjpeg/Makefile.in 2011-11-13 17:40:51.572377268 +0100
@@ -0,0 +1,751 @@
+# Makefile.in generated by automake 1.10 from Makefile.am.
+# @configure_input@
@ -849,9 +849,9 @@ diff -urN xine-lib-1.1.19.orig/src/mjpeg/Makefile.in xine-lib-1.1.19/src/mjpeg/M
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -urN xine-lib-1.1.19.orig/src/mjpeg/xine_mjpeg_decoder.c xine-lib-1.1.19/src/mjpeg/xine_mjpeg_decoder.c
--- xine-lib-1.1.19.orig/src/mjpeg/xine_mjpeg_decoder.c 1970-01-01 01:00:00.000000000 +0100
+++ xine-lib-1.1.19/src/mjpeg/xine_mjpeg_decoder.c 2010-07-26 00:46:26.541784690 +0200
diff -uNr xine-lib-1.1.20.orig/src/mjpeg/xine_mjpeg_decoder.c xine-lib-1.1.20/src/mjpeg/xine_mjpeg_decoder.c
--- xine-lib-1.1.20.orig/src/mjpeg/xine_mjpeg_decoder.c 1970-01-01 01:00:00.000000000 +0100
+++ xine-lib-1.1.20/src/mjpeg/xine_mjpeg_decoder.c 2011-11-13 17:40:51.572377268 +0100
@@ -0,0 +1,397 @@
+/*
+ * Copyright (C) 2007 Marcus Meissner

3
xine-lib-1.1.20.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:735e5281c532c13a5cc46c077a9997ab692e834069de83105936410dfdb72bc5
size 7585795

18
xine-lib.changes
View File

@ -1,4 +1,22 @@
-------------------------------------------------------------------
Sun Nov 13 16:58:00 UTC 2011 - Manfred.Tremmel@iiv.de
- update to 1.1.20
* Imagine that there's a large poppy here.
* Ensure that file and socket descriptors are marked as CLOEXEC.
* Enable FFmpeg's support for AAC LATM audio.
* Fix build-time check for dvdnav.
* Allow use of GraphicsMagick instead of ImageMagick.
* Fix build on Debian GNU/kFreeBSD (broken in 1.1.19).
* Add a Japanese translation from Takeshi Hamasaki.
* Czech translation update.
* New MinGW-w64 port, various portability fixes.
* MinGW port updates.
* Possibility to disable HW acceleration in directx video output.
* Header stripping support in Matroska demuxer.
* Update nosefart to 2.7-mls (stability with corrupted NSF files).
* Add .ass extension to be recognized as subtitle file. [Bug #123]
-------------------------------------------------------------------
Sun Nov 6 03:48:03 UTC 2011 - reddwarf@opensuse.org
- Fix Packman build: since /usr/share/xine/mad is no longer needed

10
xine-lib.spec
View File

@ -104,13 +104,13 @@ BuildRequires: DirectFB
%if %{with modplug}
BuildRequires: libmodplug-devel
%endif
Version: 1.1.19
Release: 7
Version: 1.1.20
Release: 0
# bug437293
%ifarch ppc64
Obsoletes: xine-lib-64bit
%endif
%define abiversion 1.29
%define abiversion 1.30
Summary: Video Player with Plug-Ins
Group: Productivity/Multimedia/Video/Players
License: GPLv2+
@ -128,7 +128,6 @@ Source99: precheckin_cripple_tarball.sh
Patch26: xine-lib-doc-fix-X11R6.diff
Patch28: xine-lib-%{version}-ia64-is-not-alpha.diff
Patch31: xine-lib-%{version}-glitch-free-pulseaudio.patch
Patch32: http://repos.archlinux.org/wsvn/packages/xine-lib/trunk/xine-lib-1.1.19-xvmc.patch
# *** Addons
Patch50: vdr-xine-0.9.3.diff.bz2
Patch51: vdr-xine-SUSE.diff
@ -143,7 +142,6 @@ Patch74: xine-configure.diff
Patch75: xine-lib-v4l-2.6.38.patch
# *** Only working for noncrippled source
Patch80: xine-lib-various-noncrippled.diff
Patch81: xine-lib-%{version}-ffmpeg_abi_change.diff
%description
xine is a free multimedia player. It plays back CDs, DVDs, and VCDs. It
@ -638,7 +636,6 @@ EOF
%patch26
%patch28 -p1
%patch31 -p1
%patch32 -p0
%if 0%{suse_version} >= 1110
# set fuzzy=2 to get patch work with crippled and noncrippled tarball
%patch50 -p1 -F2
@ -662,7 +659,6 @@ sed -i 's|^noinst_HEADERS = input_vdr.h|xineinclude_HEADERS = input_vdr.h|' src/
%else
# Only apply to uncrippled source
%patch80
%patch81 -p1
%endif
%patch72 -p1
%patch73 -p1