rpm/xine-lib
SHA256
1
0
Fork 0
forked from pool/xine-lib
Code Pull Requests 1 Activity

xine-lib: update to 1.1.19

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=34
This commit is contained in:
Manfred Tremmel 2010-07-25 23:54:41 +00:00 committed by Git OBS Bridge
parent 381ecc39ea
commit 3af5e3b306
17 changed files with 124 additions and 288 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 version https://git-lfs.github.com/spec/v1
oid sha256:4f5782201f9335d4578878d137f9acc6e350852627487633c8b5d8d02fe87e20 oid sha256:11bfc74fa458ab6e76b7504db5e368809e511ff2d0ead06536e38f54985d0173
size 24876 size 24886

10
xine-configure.diff
View File

@ -1,7 +1,7 @@
diff -ur xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac diff -ur xine-lib-1.1.19.orig/configure.ac xine-lib-1.1.19/configure.ac
--- xine-lib-1.1.18.orig/configure.ac 2010-02-24 21:37:21.487134132 +0100 --- xine-lib-1.1.19.orig/configure.ac 2010-07-26 00:57:13.155035643 +0200
+++ xine-lib-1.1.18/configure.ac 2010-02-24 21:40:15.697916133 +0100 +++ xine-lib-1.1.19/configure.ac 2010-07-26 01:00:45.468785507 +0200
@@ -119,6 +119,7 @@ @@ -120,6 +120,7 @@
dnl --------------------------------------------- dnl ---------------------------------------------
AC_PROG_CC AC_PROG_CC
@ -9,5 +9,3 @@ diff -ur xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
AM_PROG_AS AM_PROG_AS
case "$host_os" in case "$host_os" in
Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.c.
Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.h.

13
xine-lib-1.1.18.1-assert.patch
View File

@ -1,13 +0,0 @@
diff -ur xine-lib-1.1.18.orig/src/audio_out/audio_alsa_out.c xine-lib-1.1.18/src/audio_out/audio_alsa_out.c
--- xine-lib-1.1.18.orig/src/audio_out/audio_alsa_out.c 2010-01-14 23:17:54.000000000 +0100
+++ xine-lib-1.1.18/src/audio_out/audio_alsa_out.c 2010-02-24 21:38:21.022134045 +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
Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.c.
Nur in xine-lib-1.1.18/src/xine-engine: install_plugins_helper.h.

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

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

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

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

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

@ -0,0 +1,11 @@
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 Normal file
View File

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

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

@ -1,6 +1,6 @@
diff -ur xine-lib-1.1.18.orig/src/xine-engine/load_plugins.c xine-lib-1.1.18/src/xine-engine/load_plugins.c 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.18.orig/src/xine-engine/load_plugins.c 2010-01-14 23:17:56.000000000 +0100 --- xine-lib-1.1.19.orig/src/xine-engine/load_plugins.c 2010-03-09 23:17:05.000000000 +0100
+++ xine-lib-1.1.18/src/xine-engine/load_plugins.c 2010-02-24 21:54:02.396132130 +0100 +++ xine-lib-1.1.19/src/xine-engine/load_plugins.c 2010-07-26 01:24:26.098035179 +0200
@@ -2508,9 +2508,18 @@ @@ -2508,9 +2508,18 @@
plugin_catalog_t *catalog = self->plugin_catalog; plugin_catalog_t *catalog = self->plugin_catalog;

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

@ -1,6 +1,6 @@
diff -ur xine-lib-1.1.18.orig/src/xine-engine/audio_out.c xine-lib-1.1.18/src/xine-engine/audio_out.c 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.18.orig/src/xine-engine/audio_out.c 2010-02-23 22:59:05.000000000 +0100 --- xine-lib-1.1.19.orig/src/xine-engine/audio_out.c 2010-07-21 19:43:52.000000000 +0200
+++ xine-lib-1.1.18/src/xine-engine/audio_out.c 2010-02-24 20:52:10.870884193 +0100 +++ xine-lib-1.1.19/src/xine-engine/audio_out.c 2010-07-26 00:34:13.178049961 +0200
@@ -1156,8 +1156,17 @@ @@ -1156,8 +1156,17 @@
/* /*

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

@ -1,7 +1,7 @@
diff -ur xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac diff -ur xine-lib-1.1.19.orig/configure.ac xine-lib-1.1.19/configure.ac
--- xine-lib-1.1.18.orig/configure.ac 2010-02-22 21:03:51.000000000 +0100 --- xine-lib-1.1.19.orig/configure.ac 2010-07-25 16:37:30.000000000 +0200
+++ xine-lib-1.1.18/configure.ac 2010-02-24 20:47:41.959133782 +0100 +++ xine-lib-1.1.19/configure.ac 2010-07-26 00:30:47.254790180 +0200
@@ -2381,10 +2381,13 @@ @@ -2395,10 +2395,13 @@
mips-*) mips-*)
AC_DEFINE_UNQUOTED(FPM_MIPS,,[Define to select libmad fixed point arithmetic implementation]) AC_DEFINE_UNQUOTED(FPM_MIPS,,[Define to select libmad fixed point arithmetic implementation])
;; ;;

46
xine-lib-1.1.18.1-install-plugins-helper.diff → xine-lib-1.1.19-install-plugins-helper.diff
View File

@ -1,7 +1,7 @@
diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac diff -urN xine-lib-1.1.19.orig/configure.ac xine-lib-1.1.19/configure.ac
--- xine-lib-1.1.18.orig/configure.ac 2010-02-24 22:24:29.445882777 +0100 --- xine-lib-1.1.19.orig/configure.ac 2010-07-26 00:48:39.267784541 +0200
+++ xine-lib-1.1.18/configure.ac 2010-02-24 22:26:25.554146234 +0100 +++ xine-lib-1.1.19/configure.ac 2010-07-26 00:54:10.464784907 +0200
@@ -2631,6 +2631,28 @@ @@ -2645,6 +2645,28 @@
AM_CONDITIONAL(HAVE_W32DLL, test "x$enable_w32dll" != "xno") AM_CONDITIONAL(HAVE_W32DLL, test "x$enable_w32dll" != "xno")
@ -30,9 +30,9 @@ diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
dnl --------------------------------------------- dnl ---------------------------------------------
dnl some include paths ( !!! DO NOT REMOVE !!! ) dnl some include paths ( !!! DO NOT REMOVE !!! )
diff -uNr xine-lib-1.1.18.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.18/src/xine-engine/audio_decoder.c 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.18.orig/src/xine-engine/audio_decoder.c 2010-01-14 23:17:55.000000000 +0100 --- xine-lib-1.1.19.orig/src/xine-engine/audio_decoder.c 2010-07-21 19:43:52.000000000 +0200
+++ xine-lib-1.1.18/src/xine-engine/audio_decoder.c 2010-02-24 22:26:25.555133914 +0100 +++ xine-lib-1.1.19/src/xine-engine/audio_decoder.c 2010-07-26 00:54:10.465817774 +0200
@@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
#include "xine_internal.h" #include "xine_internal.h"
@ -52,9 +52,9 @@ diff -uNr xine-lib-1.1.18.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.18/s
} }
if (audio_type != stream->audio_type) { if (audio_type != stream->audio_type) {
diff -uNr xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.c xine-lib-1.1.18/src/xine-engine/install_plugins_helper.c 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.18.orig/src/xine-engine/install_plugins_helper.c 1970-01-01 01:00:00.000000000 +0100 --- 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.18/src/xine-engine/install_plugins_helper.c 2010-02-24 22:26:25.556133119 +0100 +++ xine-lib-1.1.19/src/xine-engine/install_plugins_helper.c 2010-07-26 00:54:10.465817774 +0200
@@ -0,0 +1,106 @@ @@ -0,0 +1,106 @@
+/* +/*
+ * Copyright (C) 2007 Sascha Sommer + * Copyright (C) 2007 Sascha Sommer
@ -162,9 +162,9 @@ diff -uNr xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.c xine-lib
+ } + }
+} +}
+ +
diff -uNr xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.h xine-lib-1.1.18/src/xine-engine/install_plugins_helper.h 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.18.orig/src/xine-engine/install_plugins_helper.h 1970-01-01 01:00:00.000000000 +0100 --- 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.18/src/xine-engine/install_plugins_helper.h 2010-02-24 22:26:25.556133119 +0100 +++ xine-lib-1.1.19/src/xine-engine/install_plugins_helper.h 2010-07-26 00:54:10.465817774 +0200
@@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
+/* +/*
+ * Copyright (C) 2007 Sascha Sommer + * Copyright (C) 2007 Sascha Sommer
@ -201,9 +201,9 @@ diff -uNr xine-lib-1.1.18.orig/src/xine-engine/install_plugins_helper.h xine-lib
+ +
+ +
+#endif +#endif
diff -uNr xine-lib-1.1.18.orig/src/xine-engine/Makefile.am xine-lib-1.1.18/src/xine-engine/Makefile.am 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.18.orig/src/xine-engine/Makefile.am 2010-01-21 00:45:27.000000000 +0100 --- xine-lib-1.1.19.orig/src/xine-engine/Makefile.am 2010-01-21 00:45:27.000000000 +0100
+++ xine-lib-1.1.18/src/xine-engine/Makefile.am 2010-02-24 22:26:25.556133119 +0100 +++ xine-lib-1.1.19/src/xine-engine/Makefile.am 2010-07-26 00:54:10.465817774 +0200
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
video_overlay.c osd.c scratch.c demux.c vo_scale.c \ video_overlay.c osd.c scratch.c demux.c vo_scale.c \
xine_interface.c post.c tvmode.c broadcaster.c io_helper.c \ xine_interface.c post.c tvmode.c broadcaster.c io_helper.c \
@ -223,9 +223,9 @@ diff -uNr xine-lib-1.1.18.orig/src/xine-engine/Makefile.am xine-lib-1.1.18/src/x
noinst_HEADERS = bswap.h ffmpeg_bswap.h noinst_HEADERS = bswap.h ffmpeg_bswap.h
diff -uNr xine-lib-1.1.18.orig/src/xine-engine/video_decoder.c xine-lib-1.1.18/src/xine-engine/video_decoder.c 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.18.orig/src/xine-engine/video_decoder.c 2010-02-23 23:27:15.000000000 +0100 --- xine-lib-1.1.19.orig/src/xine-engine/video_decoder.c 2010-07-21 19:43:52.000000000 +0200
+++ xine-lib-1.1.18/src/xine-engine/video_decoder.c 2010-02-24 22:26:25.557133929 +0100 +++ xine-lib-1.1.19/src/xine-engine/video_decoder.c 2010-07-26 00:54:10.466785270 +0200
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
#include "xine_internal.h" #include "xine_internal.h"
@ -234,7 +234,7 @@ diff -uNr xine-lib-1.1.18.orig/src/xine-engine/video_decoder.c xine-lib-1.1.18/s
#include <sched.h> #include <sched.h>
#define SPU_SLEEP_INTERVAL (90000/2) #define SPU_SLEEP_INTERVAL (90000/2)
@@ -376,6 +377,10 @@ @@ -380,6 +381,10 @@
stream->video_decoder_plugin = _x_get_video_decoder (stream, streamtype); 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)); _x_stream_info_set(stream, XINE_STREAM_INFO_VIDEO_HANDLED, (stream->video_decoder_plugin != NULL));
@ -245,9 +245,9 @@ diff -uNr xine-lib-1.1.18.orig/src/xine-engine/video_decoder.c xine-lib-1.1.18/s
} }
if (stream->video_decoder_plugin) if (stream->video_decoder_plugin)
diff -uNr xine-lib-1.1.18.orig/src/xine-engine/xine.c xine-lib-1.1.18/src/xine-engine/xine.c 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.18.orig/src/xine-engine/xine.c 2010-02-24 22:24:02.482882309 +0100 --- xine-lib-1.1.19.orig/src/xine-engine/xine.c 2010-07-26 00:41:44.729784581 +0200
+++ xine-lib-1.1.18/src/xine-engine/xine.c 2010-02-24 22:26:25.559133664 +0100 +++ xine-lib-1.1.19/src/xine-engine/xine.c 2010-07-26 00:54:10.467798861 +0200
@@ -1810,6 +1810,15 @@ @@ -1810,6 +1810,15 @@
0, NULL, this); 0, NULL, this);

52
xine-lib-1.1.18.1-mjpegplugin.diff → xine-lib-1.1.19-mjpegplugin.diff
View File

@ -1,7 +1,7 @@
diff -uNr xine-lib-1.1.18.orig/configure xine-lib-1.1.18/configure diff -urN xine-lib-1.1.19.orig/configure xine-lib-1.1.19/configure
--- xine-lib-1.1.18.orig/configure 2010-02-23 23:50:53.000000000 +0100 --- xine-lib-1.1.19.orig/configure 2010-07-25 16:40:24.000000000 +0200
+++ xine-lib-1.1.18/configure 2010-02-24 21:28:13.318884098 +0100 +++ xine-lib-1.1.19/configure 2010-07-26 00:46:26.524784958 +0200
@@ -33611,6 +33611,7 @@ @@ -33677,6 +33677,7 @@
echo " * video decoder plugins:" echo " * video decoder plugins:"
echo " - MPEG 1,2 - Amiga Bitplane" echo " - MPEG 1,2 - Amiga Bitplane"
echo " - Raw RGB - Raw YUV" echo " - Raw RGB - Raw YUV"
@ -9,10 +9,10 @@ diff -uNr xine-lib-1.1.18.orig/configure xine-lib-1.1.18/configure
if test "x$with_external_ffmpeg" = "xyes"; then if test "x$with_external_ffmpeg" = "xyes"; then
echo " - ffmpeg (external library):" echo " - ffmpeg (external library):"
else else
diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac diff -urN xine-lib-1.1.19.orig/configure.ac xine-lib-1.1.19/configure.ac
--- xine-lib-1.1.18.orig/configure.ac 2010-02-24 21:24:46.643882529 +0100 --- xine-lib-1.1.19.orig/configure.ac 2010-07-26 00:41:44.720048157 +0200
+++ xine-lib-1.1.18/configure.ac 2010-02-24 21:28:13.320882133 +0100 +++ xine-lib-1.1.19/configure.ac 2010-07-26 00:46:26.537784872 +0200
@@ -1104,6 +1104,28 @@ @@ -1109,6 +1109,28 @@
AC_SUBST([SDL_LIBS]) AC_SUBST([SDL_LIBS])
dnl --------------------------------------------- dnl ---------------------------------------------
@ -41,7 +41,7 @@ diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
dnl check for Libstk dnl check for Libstk
dnl --------------------------------------------- dnl ---------------------------------------------
@@ -2817,6 +2839,7 @@ @@ -2831,6 +2853,7 @@
src/libxineadec/gsm610/Makefile src/libxineadec/gsm610/Makefile
src/libxineadec/nosefart/Makefile src/libxineadec/nosefart/Makefile
src/libreal/Makefile src/libreal/Makefile
@ -49,7 +49,7 @@ diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
src/post/Makefile src/post/Makefile
src/post/planar/Makefile src/post/planar/Makefile
src/post/goom/Makefile src/post/goom/Makefile
@@ -3007,6 +3030,9 @@ @@ -3024,6 +3047,9 @@
dnl audio decoders dnl audio decoders
echo " * audio decoder plugins:" echo " * audio decoder plugins:"
echo " - GSM 06.10 - linear PCM" echo " - GSM 06.10 - linear PCM"
@ -58,10 +58,10 @@ diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
+fi +fi
if test "x$with_external_ffmpeg" = "xyes"; then if test "x$with_external_ffmpeg" = "xyes"; then
echo " - ffmpeg (external library):" echo " - ffmpeg (external library):"
else echo " - Windows Media Audio v1/v2/Pro"
diff -uNr xine-lib-1.1.18.orig/src/Makefile.am xine-lib-1.1.18/src/Makefile.am diff -urN xine-lib-1.1.19.orig/src/Makefile.am xine-lib-1.1.19/src/Makefile.am
--- xine-lib-1.1.18.orig/src/Makefile.am 2010-02-24 21:24:46.643882529 +0100 --- xine-lib-1.1.19.orig/src/Makefile.am 2010-07-26 00:41:44.720048157 +0200
+++ xine-lib-1.1.18/src/Makefile.am 2010-02-24 21:28:13.321884189 +0100 +++ xine-lib-1.1.19/src/Makefile.am 2010-07-26 00:46:26.538786101 +0200
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
libreal \ libreal \
libfaad \ libfaad \
@ -70,9 +70,9 @@ diff -uNr xine-lib-1.1.18.orig/src/Makefile.am xine-lib-1.1.18/src/Makefile.am
post \ post \
combined \ combined \
vdr vdr
diff -uNr xine-lib-1.1.18.orig/src/Makefile.in xine-lib-1.1.18/src/Makefile.in diff -urN xine-lib-1.1.19.orig/src/Makefile.in xine-lib-1.1.19/src/Makefile.in
--- xine-lib-1.1.18.orig/src/Makefile.in 2010-02-23 23:50:35.000000000 +0100 --- xine-lib-1.1.19.orig/src/Makefile.in 2010-07-25 16:40:01.000000000 +0200
+++ xine-lib-1.1.18/src/Makefile.in 2010-02-24 21:28:13.321884189 +0100 +++ xine-lib-1.1.19/src/Makefile.in 2010-07-26 00:46:26.539796410 +0200
@@ -453,6 +453,7 @@ @@ -453,6 +453,7 @@
libreal \ libreal \
libfaad \ libfaad \
@ -81,9 +81,9 @@ diff -uNr xine-lib-1.1.18.orig/src/Makefile.in xine-lib-1.1.18/src/Makefile.in
post \ post \
combined combined
diff -uNr xine-lib-1.1.18.orig/src/mjpeg/Makefile.am xine-lib-1.1.18/src/mjpeg/Makefile.am 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.18.orig/src/mjpeg/Makefile.am 1970-01-01 01:00:00.000000000 +0100 --- xine-lib-1.1.19.orig/src/mjpeg/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ xine-lib-1.1.18/src/mjpeg/Makefile.am 2010-02-24 21:28:13.323883132 +0100 +++ xine-lib-1.1.19/src/mjpeg/Makefile.am 2010-07-26 00:46:26.539796410 +0200
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
+include $(top_srcdir)/misc/Makefile.common +include $(top_srcdir)/misc/Makefile.common
+ +
@ -94,9 +94,9 @@ diff -uNr xine-lib-1.1.18.orig/src/mjpeg/Makefile.am xine-lib-1.1.18/src/mjpeg/M
+xineplug_decode_mjpeg_la_CFLAGS = $(VISIBILITY_FLAG) +xineplug_decode_mjpeg_la_CFLAGS = $(VISIBILITY_FLAG)
+xineplug_decode_mjpeg_la_LDFLAGS = $(xineplug_ldflags) +xineplug_decode_mjpeg_la_LDFLAGS = $(xineplug_ldflags)
+endif +endif
diff -uNr xine-lib-1.1.18.orig/src/mjpeg/Makefile.in xine-lib-1.1.18/src/mjpeg/Makefile.in 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.18.orig/src/mjpeg/Makefile.in 1970-01-01 01:00:00.000000000 +0100 --- xine-lib-1.1.19.orig/src/mjpeg/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ xine-lib-1.1.18/src/mjpeg/Makefile.in 2010-02-24 21:28:13.324882254 +0100 +++ xine-lib-1.1.19/src/mjpeg/Makefile.in 2010-07-26 00:46:26.540794705 +0200
@@ -0,0 +1,751 @@ @@ -0,0 +1,751 @@
+# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am.
+# @configure_input@ +# @configure_input@
@ -849,9 +849,9 @@ diff -uNr xine-lib-1.1.18.orig/src/mjpeg/Makefile.in xine-lib-1.1.18/src/mjpeg/M
+# Tell versions [3.59,3.63) of GNU make to not export all variables. +# 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. +# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT: +.NOEXPORT:
diff -uNr xine-lib-1.1.18.orig/src/mjpeg/xine_mjpeg_decoder.c xine-lib-1.1.18/src/mjpeg/xine_mjpeg_decoder.c 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.18.orig/src/mjpeg/xine_mjpeg_decoder.c 1970-01-01 01:00:00.000000000 +0100 --- xine-lib-1.1.19.orig/src/mjpeg/xine_mjpeg_decoder.c 1970-01-01 01:00:00.000000000 +0100
+++ xine-lib-1.1.18/src/mjpeg/xine_mjpeg_decoder.c 2010-02-24 21:28:13.325884030 +0100 +++ xine-lib-1.1.19/src/mjpeg/xine_mjpeg_decoder.c 2010-07-26 00:46:26.541784690 +0200
@@ -0,0 +1,397 @@ @@ -0,0 +1,397 @@
+/* +/*
+ * Copyright (C) 2007 Marcus Meissner + * Copyright (C) 2007 Marcus Meissner

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

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

10
xine-lib-crippled-LOCAL.diff
View File

@ -2,7 +2,7 @@ Index: src/input/input_dvd.c
=================================================================== ===================================================================
--- src/input/input_dvd.c.orig --- src/input/input_dvd.c.orig
+++ src/input/input_dvd.c +++ src/input/input_dvd.c
@@ -1387,7 +1387,12 @@ @@ -1393,7 +1393,12 @@
static int dvd_parse_try_open(dvd_input_plugin_t *this, const char *locator) static int dvd_parse_try_open(dvd_input_plugin_t *this, const char *locator)
{ {
@ -16,7 +16,7 @@ Index: src/input/input_dvd.c
/* FIXME: we temporarily special-case "dvd:/" for compatibility; /* FIXME: we temporarily special-case "dvd:/" for compatibility;
* actually "dvd:/" should play a DVD image stored in /, but for * actually "dvd:/" should play a DVD image stored in /, but for
@@ -1403,7 +1408,6 @@ @@ -1409,7 +1414,6 @@
xine_setenv("DVDCSS_RAW_DEVICE", "", 1); xine_setenv("DVDCSS_RAW_DEVICE", "", 1);
} else { } else {
/* use default DVD device */ /* use default DVD device */
@ -24,7 +24,7 @@ Index: src/input/input_dvd.c
xine_cfg_entry_t raw_device; xine_cfg_entry_t raw_device;
if (xine_config_lookup_entry(this->stream->xine, if (xine_config_lookup_entry(this->stream->xine,
"media.dvd.raw_device", &raw_device)) "media.dvd.raw_device", &raw_device))
@@ -1411,6 +1415,23 @@ @@ -1417,6 +1421,23 @@
intended_dvd_device = class->dvd_device; intended_dvd_device = class->dvd_device;
} }
@ -48,7 +48,7 @@ Index: src/input/input_dvd.c
/* attempt to open DVD */ /* attempt to open DVD */
if (this->opened) { if (this->opened) {
if (intended_dvd_device == this->current_dvd_device) { if (intended_dvd_device == this->current_dvd_device) {
@@ -1473,8 +1494,11 @@ @@ -1479,8 +1500,11 @@
} }
static int dvd_plugin_open (input_plugin_t *this_gen) { static int dvd_plugin_open (input_plugin_t *this_gen) {
@ -61,7 +61,7 @@ Index: src/input/input_dvd.c
char *locator, *locator_orig; char *locator, *locator_orig;
char *title_part; char *title_part;
@@ -1483,6 +1507,23 @@ @@ -1489,6 +1513,23 @@
trace_print("Called\n"); trace_print("Called\n");

2
xine-lib-doc-fix-X11R6.diff
View File

@ -2,7 +2,7 @@ Index: doc/faq/faq.sgml
=================================================================== ===================================================================
--- doc/faq/faq.sgml.orig --- doc/faq/faq.sgml.orig
+++ doc/faq/faq.sgml +++ doc/faq/faq.sgml
@@ -455,12 +455,12 @@ @@ -413,12 +413,12 @@
<para> <para>
If you want to have Xv support compiled in, make sure you either have If you want to have Xv support compiled in, make sure you either have
a shared Xv library on your system, e.g. a shared Xv library on your system, e.g.

21
xine-lib.changes
View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Mon Jul 26 01:00:00 CET 2010 - Manfred.Tremmel@iiv.de
- update to 1.1.19
* Handle odd widths properly (for ffmpeg-decoded video).
* Make buildable with current (external) libdvdnav & libdvdread.
* Fix V4L2 check.
* Add support for Ogg tag 'DISCNUMBER' and ID3 tag 'TPOS'.
* Add support for EAC3.
* Recognise video/mp2t and video/mp2p.
* TTA fixes.
* Add support for Xv gamma adjustment.
* Better recovery from ALSA-reported errors.
* Report stream buffer stats to the application.
* Recognise and handle the WebM container format.
(VP8 video is not yet supported.)
* Recognise ScreamTracker 2 & 3 files.
* Fix playback of the first file handled by the modplug demuxer.
* Refuse to build with known-broken libmodplug (0.8.8).
http://bugs.debian.org/588465
* Fix a potential freeing of unallocated memory.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 26 11:39:27 CEST 2010 - ro@suse.de Mon Apr 26 11:39:27 CEST 2010 - ro@suse.de

211
xine-lib.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package xine-lib (Version 1.1.18.1) # spec file for package xine-lib (Version 1.1.19)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -101,17 +101,17 @@ BuildRequires: DirectFB
%if %{with modplug} %if %{with modplug}
BuildRequires: libmodplug-devel BuildRequires: libmodplug-devel
%endif %endif
Version: 1.1.18.1 Version: 1.1.19
Release: 1 Release: 1
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
Obsoletes: xine-lib-64bit Obsoletes: xine-lib-64bit
%endif %endif
%define abiversion 1.28 %define abiversion 1.29
Summary: Video Player with Plug-Ins Summary: Video Player with Plug-Ins
Group: Productivity/Multimedia/Video/Players Group: Productivity/Multimedia/Video/Players
License: GPLv2+ ; Public Domain, Freeware License: GPLv2+ ; Public Domain, Freeware
Url: http://xine.sourceforge.net Url: http://www.xine-project.org/home
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with distributable} %if %{with distributable}
Source: xine-lib-%{version}-crippled.tar.bz2 Source: xine-lib-%{version}-crippled.tar.bz2
@ -207,6 +207,7 @@ http://www.opensuse.org/XINE#Legal_Matters
%endif %endif
More information about xine plug-ins can be found at More information about xine plug-ins can be found at
http://www.xine-project.org/home http://www.xine-project.org/home
Authors: Authors:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
@ -243,6 +244,7 @@ http://www.opensuse.org/XINE#Legal_Matters
%endif %endif
Weitere Informationen über xine Plugins finden Sie unter Weitere Informationen über xine Plugins finden Sie unter
http://www.xine-project.org/home http://www.xine-project.org/home
Autoren: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
@ -310,6 +312,7 @@ http://www.opensuse.org/XINE#Legal_Matters
%endif %endif
More information about xine plug-ins can be found at More information about xine plug-ins can be found at
http://www.xine-project.org/home http://www.xine-project.org/home
Authors: Authors:
-------- --------
Guenter Bartsch <guenter@users.sourceforge.net> Guenter Bartsch <guenter@users.sourceforge.net>
@ -360,9 +363,12 @@ http://www.opensuse.org/XINE#Legal_Matters
%endif %endif
Weitere Informationen über xine Plugins finden Sie unter Weitere Informationen über xine Plugins finden Sie unter
http://www.xine-project.org/home http://www.xine-project.org/home
Autoren: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
%if %{with pulseaudio} %if %{with pulseaudio}
%package -n libxine1-pulse %package -n libxine1-pulse
@ -375,33 +381,13 @@ Supplements: packageand(libpulse0:libxine1)
%description -n libxine1-pulse %description -n libxine1-pulse
xine sound output plugin for the pulseaudio soundserver xine sound output plugin for the pulseaudio soundserver
Authors: Authors:
-------- --------
Guenter Bartsch <guenter@users.sourceforge.net> Guenter Bartsch <guenter@users.sourceforge.net>
xine Soundausgabeplugin für den Pulseaudio Soundserver
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
%description -n libxine1-pulse -l de %description -n libxine1-pulse -l de
xine sound output plugin for the pulseaudio soundserver
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
xine Soundausgabeplugin für den Pulseaudio Soundserver xine Soundausgabeplugin für den Pulseaudio Soundserver
Autoren: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
@ -418,40 +404,20 @@ Requires: libxine1 = %{version}
%description -n libxine1-sdl %description -n libxine1-sdl
SDL xine video output plugin SDL xine video output plugin
Authors: Authors:
-------- --------
Guenter Bartsch <guenter@users.sourceforge.net> Guenter Bartsch <guenter@users.sourceforge.net>
SDL xine Video-Ausgabeplugin
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
%description -n libxine1-sdl -l de %description -n libxine1-sdl -l de
SDL xine video output plugin
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
SDL xine Video-Ausgabeplugin SDL xine Video-Ausgabeplugin
Autoren: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
%endif %endif
%if %{with arts}
%if %{with arts}
%package -n libxine1-arts %package -n libxine1-arts
License: GPLv2+ ; Public Domain, Freeware License: GPLv2+ ; Public Domain, Freeware
Summary: Arts plugin for xine Summary: Arts plugin for xine
@ -461,40 +427,20 @@ Requires: libxine1 = %{version}
%description -n libxine1-arts %description -n libxine1-arts
xine sound output plugin for the arts soundserver xine sound output plugin for the arts soundserver
Authors: Authors:
-------- --------
Guenter Bartsch <guenter@users.sourceforge.net> Guenter Bartsch <guenter@users.sourceforge.net>
xine Soundausgabeplugin für den arts Soundserver
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
%description -n libxine1-arts -l de %description -n libxine1-arts -l de
xine sound output plugin for the arts soundserver
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
xine Soundausgabeplugin für den arts Soundserver xine Soundausgabeplugin für den arts Soundserver
Autoren: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
%endif %endif
%if %{with aalib}
%if %{with aalib}
%package -n libxine1-aa %package -n libxine1-aa
License: GPLv2+ ; Public Domain, Freeware License: GPLv2+ ; Public Domain, Freeware
Summary: Aalib and libcaca plugin for xine Summary: Aalib and libcaca plugin for xine
@ -504,35 +450,14 @@ Requires: libxine1 = %{version}
%description -n libxine1-aa %description -n libxine1-aa
aalib and libcaca xine video-output plugin aalib and libcaca xine video-output plugin
Authors: Authors:
-------- --------
Guenter Bartsch <guenter@users.sourceforge.net> Guenter Bartsch <guenter@users.sourceforge.net>
aalib und libcaca xine Video Ausgabeplugin
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
%description -n libxine1-aa -l de %description -n libxine1-aa -l de
aalib and libcaca xine video-output plugin
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
aalib und libcaca xine Video Ausgabeplugin aalib und libcaca xine Video Ausgabeplugin
Autoren: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
@ -549,35 +474,13 @@ Requires: libxine1 = %{version}
%description -n libxine1-esd %description -n libxine1-esd
libxine sound output plugin for the esound soundserver libxine sound output plugin for the esound soundserver
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
libxine Soundausgabeplugin für den esound Soundserver
Authors: Authors:
-------- --------
Guenter Bartsch <guenter@users.sourceforge.net> Guenter Bartsch <guenter@users.sourceforge.net>
%description -n libxine1-esd -l de %description -n libxine1-esd -l de
libxine sound output plugin for the esound soundserver
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
libxine Soundausgabeplugin für den esound Soundserver libxine Soundausgabeplugin für den esound Soundserver
Authors: Authors:
-------- --------
Guenter Bartsch <guenter@users.sourceforge.net> Guenter Bartsch <guenter@users.sourceforge.net>
@ -594,40 +497,20 @@ Requires: libxine1 = %{version}
%description -n libxine1-jack %description -n libxine1-jack
xine sound output plugin for the jack soundserver xine sound output plugin for the jack soundserver
Authors: Authors:
-------- --------
Guenter Bartsch <guenter@users.sourceforge.net> Guenter Bartsch <guenter@users.sourceforge.net>
xine Soundausgabeplugin für den jack Soundserver
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
%description -n libxine1-jack -l de %description -n libxine1-jack -l de
xine sound output plugin for the jack soundserver
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
xine Soundausgabeplugin für den jack Soundserver xine Soundausgabeplugin für den jack Soundserver
Autoren: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
%endif %endif
%if %{with directfb}
%if %{with directfb}
%package -n libxine1-directfb %package -n libxine1-directfb
License: GPLv2+ ; Public Domain, Freeware License: GPLv2+ ; Public Domain, Freeware
Summary: Directfb plugin for xine Summary: Directfb plugin for xine
@ -637,40 +520,20 @@ Requires: libxine1 = %{version}
%description -n libxine1-directfb %description -n libxine1-directfb
Directfb xine video-output plugin Directfb xine video-output plugin
Authors: Authors:
-------- --------
Guenter Bartsch <guenter@users.sourceforge.net> Guenter Bartsch <guenter@users.sourceforge.net>
Directfb xine Video-Ausgabeplugin
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
%description -n libxine1-directfb -l de %description -n libxine1-directfb -l de
Directfb xine video-output plugin
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
Directfb xine Video-Ausgabeplugin Directfb xine Video-Ausgabeplugin
Autoren: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
%endif %endif
%if %{with gnome_vfs}
%if %{with gnome_vfs}
%package -n libxine1-gnome-vfs %package -n libxine1-gnome-vfs
License: GPLv2+ ; Public Domain, Freeware License: GPLv2+ ; Public Domain, Freeware
Summary: Gnome-vfs plugin for xine Summary: Gnome-vfs plugin for xine
@ -681,40 +544,20 @@ Supplements: packageand(gnome-vfs2:libxine1)
%description -n libxine1-gnome-vfs %description -n libxine1-gnome-vfs
Input plugin which enables xine to use Gnome-vfs Input plugin which enables xine to use Gnome-vfs
Authors: Authors:
-------- --------
Guenter Bartsch <guenter@users.sourceforge.net> Guenter Bartsch <guenter@users.sourceforge.net>
Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
%description -n libxine1-gnome-vfs -l de %description -n libxine1-gnome-vfs -l de
Input plugin which enables xine to use Gnome-vfs
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen
Autoren: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
%endif %endif
%if !%{with distributable}
%if !%{with distributable}
%package -n libxine1-codecs %package -n libxine1-codecs
License: GPLv2+ ; Public Domain, Freeware License: GPLv2+ ; Public Domain, Freeware
# these libs are possibly illegal and may not work without libdvdcss anyway # these libs are possibly illegal and may not work without libdvdcss anyway
@ -744,40 +587,16 @@ With these xine plug-ins, you can watch DVDs and all other kind of
media using xine. More information about xine plug-ins can be found at media using xine. More information about xine plug-ins can be found at
http://www.xine-project.org/home http://www.xine-project.org/home
Authors: Authors:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
Mit diesem xine Plugins können Sie DVDs und alle von xine unterstützten
Medienverainten abspielen. Weitere Informationtne über xine Plugins
finden Sie unter
http://www.xine-project.org/home
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
%description -n libxine1-codecs -l de %description -n libxine1-codecs -l de
With these xine plug-ins, you can watch DVDs and all other kind of
media using xine. More information about xine plug-ins can be found at
http://www.xine-project.org/home
Authors:
--------
Guenter Bartsch <guenter@sourceforge.net>
Mit diesem xine Plugins können Sie DVDs und alle von xine unterstützten Mit diesem xine Plugins können Sie DVDs und alle von xine unterstützten
Medienverainten abspielen. Weitere Informationtne über xine Plugins Medienverainten abspielen. Weitere Informationtne über xine Plugins
finden Sie unter finden Sie unter
http://www.xine-project.org/home http://www.xine-project.org/home
Autoren: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>