Accepting request 44427 from multimedia:xine
Copy from multimedia:xine/xine-lib based on submit request 44427 from user lnussel OBS-URL: https://build.opensuse.org/request/show/44427 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xine-lib?expand=0&rev=34
This commit is contained in:
OBS User autobuild
Git OBS Bridge
commit
a8e75cd42c
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4f5782201f9335d4578878d137f9acc6e350852627487633c8b5d8d02fe87e20
|
||||
size 24876
|
||||
oid sha256:11bfc74fa458ab6e76b7504db5e368809e511ff2d0ead06536e38f54985d0173
|
||||
size 24886
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
diff -ur xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
|
||||
--- xine-lib-1.1.18.orig/configure.ac 2010-02-24 21:37:21.487134132 +0100
|
||||
+++ xine-lib-1.1.18/configure.ac 2010-02-24 21:40:15.697916133 +0100
|
||||
@@ -119,6 +119,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-26 00:57:13.155035643 +0200
|
||||
+++ xine-lib-1.1.19/configure.ac 2010-07-26 01:00:45.468785507 +0200
|
||||
@@ -120,6 +120,7 @@
|
||||
dnl ---------------------------------------------
|
||||
|
||||
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
|
||||
|
||||
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.
|
||||
|
||||
@ -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.
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:25b45a277f068b816fb65f9655235ee51c2c3d4875670ab6d82adbc77f223ef0
|
||||
size 5116260
|
||||
@ -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
11
xine-lib-1.1.19-assert.patch
Normal 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
3
xine-lib-1.1.19-crippled.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9b4c2394433f1549e7e7219740df1c5c77b3c6c1f73a7886cc18fc63ef1d5464
|
||||
size 5120937
|
||||
@ -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
|
||||
--- xine-lib-1.1.18.orig/src/xine-engine/load_plugins.c 2010-01-14 23:17:56.000000000 +0100
|
||||
+++ xine-lib-1.1.18/src/xine-engine/load_plugins.c 2010-02-24 21:54:02.396132130 +0100
|
||||
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
|
||||
@@ -2508,9 +2508,18 @@
|
||||
|
||||
plugin_catalog_t *catalog = self->plugin_catalog;
|
||||
@ -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
|
||||
--- xine-lib-1.1.18.orig/src/xine-engine/audio_out.c 2010-02-23 22:59:05.000000000 +0100
|
||||
+++ xine-lib-1.1.18/src/xine-engine/audio_out.c 2010-02-24 20:52:10.870884193 +0100
|
||||
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
|
||||
@@ -1156,8 +1156,17 @@
|
||||
|
||||
/*
|
||||
@ -1,7 +1,7 @@
|
||||
diff -ur xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
|
||||
--- xine-lib-1.1.18.orig/configure.ac 2010-02-22 21:03:51.000000000 +0100
|
||||
+++ xine-lib-1.1.18/configure.ac 2010-02-24 20:47:41.959133782 +0100
|
||||
@@ -2381,10 +2381,13 @@
|
||||
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 @@
|
||||
mips-*)
|
||||
AC_DEFINE_UNQUOTED(FPM_MIPS,,[Define to select libmad fixed point arithmetic implementation])
|
||||
;;
|
||||
@ -1,7 +1,7 @@
|
||||
diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
|
||||
--- xine-lib-1.1.18.orig/configure.ac 2010-02-24 22:24:29.445882777 +0100
|
||||
+++ xine-lib-1.1.18/configure.ac 2010-02-24 22:26:25.554146234 +0100
|
||||
@@ -2631,6 +2631,28 @@
|
||||
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 @@
|
||||
|
||||
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 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
|
||||
--- xine-lib-1.1.18.orig/src/xine-engine/audio_decoder.c 2010-01-14 23:17:55.000000000 +0100
|
||||
+++ xine-lib-1.1.18/src/xine-engine/audio_decoder.c 2010-02-24 22:26:25.555133914 +0100
|
||||
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
|
||||
@@ -41,6 +41,7 @@
|
||||
|
||||
#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) {
|
||||
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
|
||||
--- 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.18/src/xine-engine/install_plugins_helper.c 2010-02-24 22:26:25.556133119 +0100
|
||||
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
|
||||
@@ -0,0 +1,106 @@
|
||||
+/*
|
||||
+ * 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
|
||||
--- 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.18/src/xine-engine/install_plugins_helper.h 2010-02-24 22:26:25.556133119 +0100
|
||||
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
|
||||
@@ -0,0 +1,35 @@
|
||||
+/*
|
||||
+ * 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
|
||||
diff -uNr xine-lib-1.1.18.orig/src/xine-engine/Makefile.am xine-lib-1.1.18/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.18/src/xine-engine/Makefile.am 2010-02-24 22:26:25.556133119 +0100
|
||||
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
|
||||
@@ -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 \
|
||||
@ -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
|
||||
|
||||
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
|
||||
--- xine-lib-1.1.18.orig/src/xine-engine/video_decoder.c 2010-02-23 23:27:15.000000000 +0100
|
||||
+++ xine-lib-1.1.18/src/xine-engine/video_decoder.c 2010-02-24 22:26:25.557133929 +0100
|
||||
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 @@
|
||||
|
||||
#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>
|
||||
|
||||
#define SPU_SLEEP_INTERVAL (90000/2)
|
||||
@@ -376,6 +377,10 @@
|
||||
@@ -380,6 +381,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,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)
|
||||
diff -uNr xine-lib-1.1.18.orig/src/xine-engine/xine.c xine-lib-1.1.18/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.18/src/xine-engine/xine.c 2010-02-24 22:26:25.559133664 +0100
|
||||
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 @@
|
||||
0, NULL, this);
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
diff -uNr xine-lib-1.1.18.orig/configure xine-lib-1.1.18/configure
|
||||
--- xine-lib-1.1.18.orig/configure 2010-02-23 23:50:53.000000000 +0100
|
||||
+++ xine-lib-1.1.18/configure 2010-02-24 21:28:13.318884098 +0100
|
||||
@@ -33611,6 +33611,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 @@
|
||||
echo " * video decoder plugins:"
|
||||
echo " - MPEG 1,2 - Amiga Bitplane"
|
||||
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
|
||||
echo " - ffmpeg (external library):"
|
||||
else
|
||||
diff -uNr xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
|
||||
--- xine-lib-1.1.18.orig/configure.ac 2010-02-24 21:24:46.643882529 +0100
|
||||
+++ xine-lib-1.1.18/configure.ac 2010-02-24 21:28:13.320882133 +0100
|
||||
@@ -1104,6 +1104,28 @@
|
||||
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
|
||||
@@ -1109,6 +1109,28 @@
|
||||
AC_SUBST([SDL_LIBS])
|
||||
|
||||
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 ---------------------------------------------
|
||||
|
||||
@@ -2817,6 +2839,7 @@
|
||||
@@ -2831,6 +2853,7 @@
|
||||
src/libxineadec/gsm610/Makefile
|
||||
src/libxineadec/nosefart/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/planar/Makefile
|
||||
src/post/goom/Makefile
|
||||
@@ -3007,6 +3030,9 @@
|
||||
@@ -3024,6 +3047,9 @@
|
||||
dnl audio decoders
|
||||
echo " * audio decoder plugins:"
|
||||
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
|
||||
if test "x$with_external_ffmpeg" = "xyes"; then
|
||||
echo " - ffmpeg (external library):"
|
||||
else
|
||||
diff -uNr xine-lib-1.1.18.orig/src/Makefile.am xine-lib-1.1.18/src/Makefile.am
|
||||
--- xine-lib-1.1.18.orig/src/Makefile.am 2010-02-24 21:24:46.643882529 +0100
|
||||
+++ xine-lib-1.1.18/src/Makefile.am 2010-02-24 21:28:13.321884189 +0100
|
||||
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
|
||||
@@ -27,6 +27,7 @@
|
||||
libreal \
|
||||
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 \
|
||||
combined \
|
||||
vdr
|
||||
diff -uNr xine-lib-1.1.18.orig/src/Makefile.in xine-lib-1.1.18/src/Makefile.in
|
||||
--- xine-lib-1.1.18.orig/src/Makefile.in 2010-02-23 23:50:35.000000000 +0100
|
||||
+++ xine-lib-1.1.18/src/Makefile.in 2010-02-24 21:28:13.321884189 +0100
|
||||
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 @@
|
||||
libreal \
|
||||
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 \
|
||||
combined
|
||||
|
||||
diff -uNr xine-lib-1.1.18.orig/src/mjpeg/Makefile.am xine-lib-1.1.18/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.18/src/mjpeg/Makefile.am 2010-02-24 21:28:13.323883132 +0100
|
||||
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
|
||||
@@ -0,0 +1,9 @@
|
||||
+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_LDFLAGS = $(xineplug_ldflags)
|
||||
+endif
|
||||
diff -uNr xine-lib-1.1.18.orig/src/mjpeg/Makefile.in xine-lib-1.1.18/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.18/src/mjpeg/Makefile.in 2010-02-24 21:28:13.324882254 +0100
|
||||
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
|
||||
@@ -0,0 +1,751 @@
|
||||
+# Makefile.in generated by automake 1.10 from Makefile.am.
|
||||
+# @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.
|
||||
+# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
+.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
|
||||
--- xine-lib-1.1.18.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
|
||||
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
|
||||
@@ -0,0 +1,397 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2007 Marcus Meissner
|
||||
3
xine-lib-1.1.19.tar.bz2
Normal file
3
xine-lib-1.1.19.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6277c6c5343ad45027492d0b3437f1894b3d34fd9b292638da2bf4ae749d8774
|
||||
size 7531642
|
||||
@ -2,7 +2,7 @@ Index: src/input/input_dvd.c
|
||||
===================================================================
|
||||
--- src/input/input_dvd.c.orig
|
||||
+++ 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)
|
||||
{
|
||||
@ -16,7 +16,7 @@ Index: src/input/input_dvd.c
|
||||
|
||||
/* FIXME: we temporarily special-case "dvd:/" for compatibility;
|
||||
* 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);
|
||||
} else {
|
||||
/* use default DVD device */
|
||||
@ -24,7 +24,7 @@ Index: src/input/input_dvd.c
|
||||
xine_cfg_entry_t raw_device;
|
||||
if (xine_config_lookup_entry(this->stream->xine,
|
||||
"media.dvd.raw_device", &raw_device))
|
||||
@@ -1411,6 +1415,23 @@
|
||||
@@ -1417,6 +1421,23 @@
|
||||
intended_dvd_device = class->dvd_device;
|
||||
}
|
||||
|
||||
@ -48,7 +48,7 @@ Index: src/input/input_dvd.c
|
||||
/* attempt to open DVD */
|
||||
if (this->opened) {
|
||||
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) {
|
||||
@ -61,7 +61,7 @@ Index: src/input/input_dvd.c
|
||||
|
||||
char *locator, *locator_orig;
|
||||
char *title_part;
|
||||
@@ -1483,6 +1507,23 @@
|
||||
@@ -1489,6 +1513,23 @@
|
||||
|
||||
trace_print("Called\n");
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@ Index: doc/faq/faq.sgml
|
||||
===================================================================
|
||||
--- doc/faq/faq.sgml.orig
|
||||
+++ doc/faq/faq.sgml
|
||||
@@ -455,12 +455,12 @@
|
||||
@@ -413,12 +413,12 @@
|
||||
<para>
|
||||
If you want to have Xv support compiled in, make sure you either have
|
||||
a shared Xv library on your system, e.g.
|
||||
|
||||
@ -1,5 +1,38 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 3 13:14:49 UTC 2010 - lnussel@suse.de
|
||||
|
||||
- remove unneeded libcdio-mini-devel buildignore again
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- buildignore libcdio-mini-devel
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Mar 7 01:00:00 CET 2010 - Manfred.Tremmel@iiv.de
|
||||
|
||||
- update to 1.1.18.1
|
||||
* Oops. compat.c (for DXR3 support) was omitted.
|
||||
* Fix up V4L/V4L2 compilation. Some non-Linux have V4L2 but not V4L.
|
||||
@ -8,6 +41,7 @@ Sun Mar 7 01:00:00 CET 2010 - Manfred.Tremmel@iiv.de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 24 23:14:00 CET 2010 - Manfred.Tremmel@iiv.de
|
||||
|
||||
- update to 1.1.18
|
||||
* Bump the FLAC decoder's priority above ffmpegaudio. This should fix
|
||||
various problems with FLAC playback.
|
||||
@ -46,6 +80,7 @@ Wed Dec 16 11:16:46 CET 2009 - meissner@suse.de
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 01 21:14:00 CEST 2009 - Manfred.Tremmel@iiv.de
|
||||
|
||||
- update to 1.1.17
|
||||
* Add support for Matroska SIMPLEBLOCK.
|
||||
* Add support for sndio (OpenBSD sound API).
|
||||
@ -75,7 +110,6 @@ Mon Dec 01 21:14:00 CEST 2009 - Manfred.Tremmel@iiv.de
|
||||
the default configuration.
|
||||
* Handle VC1 extradata requirement (should fix playback).
|
||||
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 18 15:11:00 UTC 2009 - lnussel@suse.de
|
||||
|
||||
|
||||
209
xine-lib.spec
209
xine-lib.spec
@ -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.
|
||||
#
|
||||
@ -100,22 +100,22 @@ BuildRequires: DirectFB
|
||||
%if %{with modplug}
|
||||
BuildRequires: libmodplug-devel
|
||||
%endif
|
||||
Version: 1.1.18.1
|
||||
Version: 1.1.19
|
||||
Release: 1
|
||||
# bug437293
|
||||
%ifarch ppc64
|
||||
Obsoletes: xine-lib-64bit
|
||||
%endif
|
||||
%define abiversion 1.28
|
||||
%define abiversion 1.29
|
||||
Summary: Video Player with Plug-Ins
|
||||
Group: Productivity/Multimedia/Video/Players
|
||||
License: GPLv2+ ; Public Domain, Freeware
|
||||
Url: http://xine.sourceforge.net
|
||||
License: GPLv2+
|
||||
Url: http://www.xine-project.org/home
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if %{with distributable}
|
||||
Source: xine-lib-%{version}-crippled.tar.bz2
|
||||
%else
|
||||
Source: xine-lib-%{version}.tar.bz2
|
||||
Source: http://downloads.sourceforge.net/project/xine/xine-lib/%{version}/xine-lib-%{version}.tar.bz2
|
||||
%endif
|
||||
Source2: baselibs.conf
|
||||
Source10: README.SuSE
|
||||
@ -206,6 +206,7 @@ http://www.opensuse.org/XINE#Legal_Matters
|
||||
%endif
|
||||
More information about xine plug-ins can be found at
|
||||
http://www.xine-project.org/home
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Guenter Bartsch <guenter@sourceforge.net>
|
||||
@ -242,6 +243,7 @@ http://www.opensuse.org/XINE#Legal_Matters
|
||||
%endif
|
||||
Weitere Informationen über xine Plugins finden Sie unter
|
||||
http://www.xine-project.org/home
|
||||
|
||||
Autoren:
|
||||
--------
|
||||
Guenter Bartsch <guenter@sourceforge.net>
|
||||
@ -309,6 +311,7 @@ http://www.opensuse.org/XINE#Legal_Matters
|
||||
%endif
|
||||
More information about xine plug-ins can be found at
|
||||
http://www.xine-project.org/home
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Guenter Bartsch <guenter@users.sourceforge.net>
|
||||
@ -359,9 +362,11 @@ http://www.opensuse.org/XINE#Legal_Matters
|
||||
%endif
|
||||
Weitere Informationen über xine Plugins finden Sie unter
|
||||
http://www.xine-project.org/home
|
||||
|
||||
Autoren:
|
||||
--------
|
||||
Guenter Bartsch <guenter@sourceforge.net>
|
||||
|
||||
%if %{with pulseaudio}
|
||||
|
||||
%package -n libxine1-pulse
|
||||
@ -374,33 +379,13 @@ Supplements: packageand(libpulse0:libxine1)
|
||||
%description -n libxine1-pulse
|
||||
xine sound output plugin for the pulseaudio soundserver
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
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
|
||||
xine sound output plugin for the pulseaudio soundserver
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Guenter Bartsch <guenter@users.sourceforge.net>
|
||||
|
||||
xine Soundausgabeplugin für den Pulseaudio Soundserver
|
||||
|
||||
|
||||
|
||||
Autoren:
|
||||
--------
|
||||
Guenter Bartsch <guenter@sourceforge.net>
|
||||
@ -417,38 +402,19 @@ Requires: libxine1 = %{version}
|
||||
%description -n libxine1-sdl
|
||||
SDL xine video output plugin
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Guenter Bartsch <guenter@users.sourceforge.net>
|
||||
|
||||
SDL xine Video-Ausgabeplugin
|
||||
|
||||
|
||||
|
||||
Autoren:
|
||||
--------
|
||||
Guenter Bartsch <guenter@sourceforge.net>
|
||||
|
||||
%description -n libxine1-sdl -l de
|
||||
SDL xine video output plugin
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Guenter Bartsch <guenter@users.sourceforge.net>
|
||||
|
||||
SDL xine Video-Ausgabeplugin
|
||||
|
||||
|
||||
|
||||
Autoren:
|
||||
--------
|
||||
Guenter Bartsch <guenter@sourceforge.net>
|
||||
|
||||
%endif
|
||||
|
||||
%if %{with arts}
|
||||
|
||||
%package -n libxine1-arts
|
||||
@ -460,38 +426,19 @@ Requires: libxine1 = %{version}
|
||||
%description -n libxine1-arts
|
||||
xine sound output plugin for the arts soundserver
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
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
|
||||
xine sound output plugin for the arts soundserver
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Guenter Bartsch <guenter@users.sourceforge.net>
|
||||
|
||||
xine Soundausgabeplugin für den arts Soundserver
|
||||
|
||||
|
||||
|
||||
Autoren:
|
||||
--------
|
||||
Guenter Bartsch <guenter@sourceforge.net>
|
||||
|
||||
%endif
|
||||
|
||||
%if %{with aalib}
|
||||
|
||||
%package -n libxine1-aa
|
||||
@ -503,35 +450,14 @@ Requires: libxine1 = %{version}
|
||||
%description -n libxine1-aa
|
||||
aalib and libcaca xine video-output plugin
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Guenter Bartsch <guenter@users.sourceforge.net>
|
||||
|
||||
|
||||
aalib und libcaca xine Video Ausgabeplugin
|
||||
|
||||
|
||||
|
||||
Autoren:
|
||||
--------
|
||||
Guenter Bartsch <guenter@sourceforge.net>
|
||||
|
||||
%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
|
||||
|
||||
|
||||
|
||||
Autoren:
|
||||
--------
|
||||
Guenter Bartsch <guenter@sourceforge.net>
|
||||
@ -548,35 +474,13 @@ Requires: libxine1 = %{version}
|
||||
%description -n libxine1-esd
|
||||
libxine sound output plugin for the esound soundserver
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Guenter Bartsch <guenter@users.sourceforge.net>
|
||||
|
||||
|
||||
libxine Soundausgabeplugin für den esound Soundserver
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Guenter Bartsch <guenter@users.sourceforge.net>
|
||||
|
||||
%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
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Guenter Bartsch <guenter@users.sourceforge.net>
|
||||
@ -593,38 +497,19 @@ Requires: libxine1 = %{version}
|
||||
%description -n libxine1-jack
|
||||
xine sound output plugin for the jack soundserver
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
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
|
||||
xine sound output plugin for the jack soundserver
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Guenter Bartsch <guenter@users.sourceforge.net>
|
||||
|
||||
xine Soundausgabeplugin für den jack Soundserver
|
||||
|
||||
|
||||
|
||||
Autoren:
|
||||
--------
|
||||
Guenter Bartsch <guenter@sourceforge.net>
|
||||
|
||||
%endif
|
||||
|
||||
%if %{with directfb}
|
||||
|
||||
%package -n libxine1-directfb
|
||||
@ -636,38 +521,19 @@ Requires: libxine1 = %{version}
|
||||
%description -n libxine1-directfb
|
||||
Directfb xine video-output plugin
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Guenter Bartsch <guenter@users.sourceforge.net>
|
||||
|
||||
Directfb xine Video-Ausgabeplugin
|
||||
|
||||
|
||||
|
||||
Autoren:
|
||||
--------
|
||||
Guenter Bartsch <guenter@sourceforge.net>
|
||||
|
||||
%description -n libxine1-directfb -l de
|
||||
Directfb xine video-output plugin
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Guenter Bartsch <guenter@users.sourceforge.net>
|
||||
|
||||
Directfb xine Video-Ausgabeplugin
|
||||
|
||||
|
||||
|
||||
Autoren:
|
||||
--------
|
||||
Guenter Bartsch <guenter@sourceforge.net>
|
||||
|
||||
%endif
|
||||
|
||||
%if %{with gnome_vfs}
|
||||
|
||||
%package -n libxine1-gnome-vfs
|
||||
@ -680,38 +546,19 @@ Supplements: packageand(gnome-vfs2:libxine1)
|
||||
%description -n libxine1-gnome-vfs
|
||||
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
|
||||
|
||||
|
||||
|
||||
Autoren:
|
||||
--------
|
||||
Guenter Bartsch <guenter@sourceforge.net>
|
||||
|
||||
%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
|
||||
|
||||
|
||||
|
||||
Autoren:
|
||||
--------
|
||||
Guenter Bartsch <guenter@sourceforge.net>
|
||||
|
||||
%endif
|
||||
|
||||
%if !%{with distributable}
|
||||
|
||||
%package -n libxine1-codecs
|
||||
@ -743,40 +590,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
|
||||
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
|
||||
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
|
||||
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
|
||||
Medienverainten abspielen. Weitere Informationtne über xine Plugins
|
||||
finden Sie unter
|
||||
http://www.xine-project.org/home
|
||||
|
||||
|
||||
|
||||
Autoren:
|
||||
--------
|
||||
Guenter Bartsch <guenter@sourceforge.net>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user