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

Accepting request 36468 from multimedia:xine

Browse Source 
Copy from multimedia:xine/xine-lib based on submit request 36468 from user coolo

OBS-URL: https://build.opensuse.org/request/show/36468
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xine-lib?expand=0&rev=31
This commit is contained in:
OBS User autobuild 2010-04-01 01:28:37 +00:00 committed by Git OBS Bridge
commit 5435a4edd6
18 changed files with 179 additions and 501 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:ffd45aca1ab74ad3743d704b048203832464247e26276445eaa9b26f3235e287 oid sha256:4f5782201f9335d4578878d137f9acc6e350852627487633c8b5d8d02fe87e20
size 24533 size 24876

11
vdr-xine-SUSE.diff
View File

@ -1,11 +1,6 @@
The vdr plugin is patched to use /var/lib/vdr-xine for fifos and so diff -ur xine-lib-1.1.18.orig/src/vdr/input_vdr.c xine-lib-1.1.18/src/vdr/input_vdr.c
needs the part here. Don't remove this patch. --- xine-lib-1.1.18.orig/src/vdr/input_vdr.c 2010-02-24 21:01:43.658883179 +0100
+++ xine-lib-1.1.18/src/vdr/input_vdr.c 2010-02-24 21:02:59.800133025 +0100
Signed-off-by: Ludwig Nussel <ludwig.nussel@suse.de>
Index: xine-lib-1.1.9/src/vdr/input_vdr.c
===================================================================
--- xine-lib-1.1.9.orig/src/vdr/input_vdr.c
+++ xine-lib-1.1.9/src/vdr/input_vdr.c
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@

9
xine-configure.diff
View File

@ -1,6 +1,7 @@
--- xine-lib-1.1.12/configure.ac diff -ur xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
+++ xine-lib-1.1.12/configure.ac --- xine-lib-1.1.18.orig/configure.ac 2010-02-24 21:37:21.487134132 +0100
@@ -118,6 +118,7 @@ dnl Check for programs. +++ xine-lib-1.1.18/configure.ac 2010-02-24 21:40:15.697916133 +0100
@@ -119,6 +119,7 @@
dnl --------------------------------------------- dnl ---------------------------------------------
AC_PROG_CC AC_PROG_CC
@ -8,3 +9,5 @@
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.

10
xine-lib-1.1.17-assert.patch
View File

@ -1,10 +0,0 @@
--- xine-lib-1.1.16.3.orig/src/audio_out/audio_alsa_out.c 2008-06-25 15:04:09.000000000 +0200
+++ xine-lib-1.1.16.3/src/audio_out/audio_alsa_out.c 2009-11-14 10:52:16.423781020 +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.17-crippled.tar.bz2
View File

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

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

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

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

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

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

19
xine-lib-1.1.17-demuxcheckfor_mad_ffmpeg.patch → xine-lib-1.1.18.1-demuxcheckfor_mad_ffmpeg.patch
View File

@ -1,16 +1,7 @@
From 8861e0d755127fde4b57d32561491853e49a0edc Mon Sep 17 00:00:00 2001 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
From: Ludwig Nussel <lnussel@suse.de> --- xine-lib-1.1.18.orig/src/xine-engine/load_plugins.c 2010-01-14 23:17:56.000000000 +0100
Date: Fri, 25 Jul 2008 15:07:23 +0200 +++ xine-lib-1.1.18/src/xine-engine/load_plugins.c 2010-02-24 21:54:02.396132130 +0100
Subject: [PATCH] xine-lib-demuxcheckfor_mad_ffmpeg-LOCAL.diff @@ -2508,9 +2508,18 @@
===================================================================
---
src/xine-engine/load_plugins.c | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
--- xine-lib-1.1.16.3.orig/src/xine-engine/load_plugins.c 2009-02-10 18:21:07.000000000 +0100
+++ xine-lib-1.1.16.3/src/xine-engine/load_plugins.c 2009-11-14 11:00:26.719796977 +0100
@@ -2487,9 +2487,18 @@
plugin_catalog_t *catalog = self->plugin_catalog; plugin_catalog_t *catalog = self->plugin_catalog;
int list_id; int list_id;
@ -29,7 +20,7 @@ Subject: [PATCH] xine-lib-demuxcheckfor_mad_ffmpeg-LOCAL.diff
/* calc length of output string and create an array of strings to /* calc length of output string and create an array of strings to
concatenate */ concatenate */
size_t len = 0; size_t len = 0;
@@ -2501,7 +2510,13 @@ @@ -2522,7 +2531,13 @@
if (node->plugin_class || _load_plugin_class(self, node, NULL)) { if (node->plugin_class || _load_plugin_class(self, node, NULL)) {
demux_class_t *const cls = (demux_class_t *)node->plugin_class; demux_class_t *const cls = (demux_class_t *)node->plugin_class;
if( (extensions[list_id] = cls->get_extensions(cls)) != NULL ) if( (extensions[list_id] = cls->get_extensions(cls)) != NULL )

9
xine-lib-1.1.17-glitch-free-pulseaudio.patch → xine-lib-1.1.18.1-glitch-free-pulseaudio.patch
View File

@ -1,8 +1,7 @@
Index: xine-lib-1.1.17/src/xine-engine/audio_out.c 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.17.orig/src/xine-engine/audio_out.c +++ xine-lib-1.1.18/src/xine-engine/audio_out.c 2010-02-24 20:52:10.870884193 +0100
+++ xine-lib-1.1.17/src/xine-engine/audio_out.c @@ -1156,8 +1156,17 @@
@@ -1156,8 +1156,17 @@ static void *ao_loop (void *this_gen) {
/* /*
* calculate gap: * calculate gap:

18
xine-lib-1.1.17-ia64-is-not-alpha.diff → xine-lib-1.1.18.1-ia64-is-not-alpha.diff
View File

@ -1,17 +1,7 @@
From c781f4b2e726fa3fabf8cc0cdd592f617ae799e2 Mon Sep 17 00:00:00 2001 diff -ur xine-lib-1.1.18.orig/configure.ac xine-lib-1.1.18/configure.ac
From: Ludwig Nussel <ludwig.nussel@suse.de> --- xine-lib-1.1.18.orig/configure.ac 2010-02-22 21:03:51.000000000 +0100
Date: Fri, 25 Jul 2008 16:58:56 +0200 +++ xine-lib-1.1.18/configure.ac 2010-02-24 20:47:41.959133782 +0100
Subject: [PATCH] ia64 is not alpha @@ -2381,10 +2381,13 @@
---
configure.ac | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
Index: xine-lib-1.1.16.3/configure.ac
===================================================================
--- xine-lib-1.1.16.3.orig/configure.ac 2009-04-02 20:44:45.000000000 +0200
+++ xine-lib-1.1.16.3/configure.ac 2009-11-14 10:45:11.618782275 +0100
@@ -2328,10 +2328,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])
;; ;;

61
xine-lib-1.1.17-install-plugins-helper.diff → xine-lib-1.1.18.1-install-plugins-helper.diff
View File

@ -1,8 +1,7 @@
Index: xine-lib-1.1.17/configure.ac 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.17.orig/configure.ac +++ xine-lib-1.1.18/configure.ac 2010-02-24 22:26:25.554146234 +0100
+++ xine-lib-1.1.17/configure.ac @@ -2631,6 +2631,28 @@
@@ -2613,6 +2613,28 @@ fi
AM_CONDITIONAL(HAVE_W32DLL, test "x$enable_w32dll" != "xno") AM_CONDITIONAL(HAVE_W32DLL, test "x$enable_w32dll" != "xno")
@ -31,10 +30,9 @@ Index: xine-lib-1.1.17/configure.ac
dnl --------------------------------------------- dnl ---------------------------------------------
dnl some include paths ( !!! DO NOT REMOVE !!! ) dnl some include paths ( !!! DO NOT REMOVE !!! )
Index: xine-lib-1.1.17/src/xine-engine/audio_decoder.c 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.17.orig/src/xine-engine/audio_decoder.c +++ xine-lib-1.1.18/src/xine-engine/audio_decoder.c 2010-02-24 22:26:25.555133914 +0100
+++ xine-lib-1.1.17/src/xine-engine/audio_decoder.c
@@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
#include "xine_internal.h" #include "xine_internal.h"
@ -43,7 +41,7 @@ Index: xine-lib-1.1.17/src/xine-engine/audio_decoder.c
static void *audio_decoder_loop (void *stream_gen) { static void *audio_decoder_loop (void *stream_gen) {
@@ -341,6 +342,10 @@ static void *audio_decoder_loop (void *s @@ -341,6 +342,10 @@
_x_stream_info_set(stream, XINE_STREAM_INFO_AUDIO_HANDLED, _x_stream_info_set(stream, XINE_STREAM_INFO_AUDIO_HANDLED,
(stream->audio_decoder_plugin != NULL)); (stream->audio_decoder_plugin != NULL));
@ -54,10 +52,9 @@ Index: xine-lib-1.1.17/src/xine-engine/audio_decoder.c
} }
if (audio_type != stream->audio_type) { if (audio_type != stream->audio_type) {
Index: xine-lib-1.1.17/src/xine-engine/install_plugins_helper.c 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
--- /dev/null +++ xine-lib-1.1.18/src/xine-engine/install_plugins_helper.c 2010-02-24 22:26:25.556133119 +0100
+++ xine-lib-1.1.17/src/xine-engine/install_plugins_helper.c
@@ -0,0 +1,106 @@ @@ -0,0 +1,106 @@
+/* +/*
+ * Copyright (C) 2007 Sascha Sommer + * Copyright (C) 2007 Sascha Sommer
@ -165,10 +162,9 @@ Index: xine-lib-1.1.17/src/xine-engine/install_plugins_helper.c
+ } + }
+} +}
+ +
Index: xine-lib-1.1.17/src/xine-engine/install_plugins_helper.h 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
--- /dev/null +++ xine-lib-1.1.18/src/xine-engine/install_plugins_helper.h 2010-02-24 22:26:25.556133119 +0100
+++ xine-lib-1.1.17/src/xine-engine/install_plugins_helper.h
@@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
+/* +/*
+ * Copyright (C) 2007 Sascha Sommer + * Copyright (C) 2007 Sascha Sommer
@ -205,11 +201,10 @@ Index: xine-lib-1.1.17/src/xine-engine/install_plugins_helper.h
+ +
+ +
+#endif +#endif
Index: xine-lib-1.1.17/src/xine-engine/Makefile.am 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.17.orig/src/xine-engine/Makefile.am +++ xine-lib-1.1.18/src/xine-engine/Makefile.am 2010-02-24 22:26:25.556133119 +0100
+++ xine-lib-1.1.17/src/xine-engine/Makefile.am @@ -19,7 +19,7 @@
@@ -19,7 +19,7 @@ libxine_la_SOURCES = xine.c metronom.c c
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 \
input_rip.c input_cache.c info_helper.c refcounter.c \ input_rip.c input_cache.c info_helper.c refcounter.c \
@ -218,7 +213,7 @@ Index: xine-lib-1.1.17/src/xine-engine/Makefile.am
# FIXME: these are currently unused: # FIXME: these are currently unused:
EXTRA_DIST = lrb.c lrb.h accel_xvmc.h EXTRA_DIST = lrb.c lrb.h accel_xvmc.h
@@ -39,7 +39,8 @@ xineinclude_HEADERS = buffer.h metronom @@ -39,7 +39,8 @@
audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \ audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \
video_overlay.h osd.h scratch.h xine_plugin.h xineintl.h \ video_overlay.h osd.h scratch.h xine_plugin.h xineintl.h \
plugin_catalog.h audio_decoder.h video_decoder.h post.h \ plugin_catalog.h audio_decoder.h video_decoder.h post.h \
@ -228,10 +223,9 @@ Index: xine-lib-1.1.17/src/xine-engine/Makefile.am
noinst_HEADERS = bswap.h ffmpeg_bswap.h noinst_HEADERS = bswap.h ffmpeg_bswap.h
Index: xine-lib-1.1.17/src/xine-engine/video_decoder.c 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.17.orig/src/xine-engine/video_decoder.c +++ xine-lib-1.1.18/src/xine-engine/video_decoder.c 2010-02-24 22:26:25.557133929 +0100
+++ xine-lib-1.1.17/src/xine-engine/video_decoder.c
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
#include "xine_internal.h" #include "xine_internal.h"
@ -240,7 +234,7 @@ Index: xine-lib-1.1.17/src/xine-engine/video_decoder.c
#include <sched.h> #include <sched.h>
#define SPU_SLEEP_INTERVAL (90000/2) #define SPU_SLEEP_INTERVAL (90000/2)
@@ -376,6 +377,10 @@ static void *video_decoder_loop (void *s @@ -376,6 +377,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));
@ -251,11 +245,10 @@ Index: xine-lib-1.1.17/src/xine-engine/video_decoder.c
} }
if (stream->video_decoder_plugin) if (stream->video_decoder_plugin)
Index: xine-lib-1.1.17/src/xine-engine/xine.c 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.17.orig/src/xine-engine/xine.c +++ xine-lib-1.1.18/src/xine-engine/xine.c 2010-02-24 22:26:25.559133664 +0100
+++ xine-lib-1.1.17/src/xine-engine/xine.c @@ -1810,6 +1810,15 @@
@@ -1809,6 +1809,15 @@ void xine_init (xine_t *this) {
0, NULL, this); 0, NULL, this);
/* /*

69
xine-lib-1.1.17-mjpegplugin.diff → xine-lib-1.1.18.1-mjpegplugin.diff
View File

@ -1,8 +1,7 @@
Index: xine-lib-1.1.17/configure 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.17.orig/configure +++ xine-lib-1.1.18/configure 2010-02-24 21:28:13.318884098 +0100
+++ xine-lib-1.1.17/configure @@ -33611,6 +33611,7 @@
@@ -48965,6 +48965,7 @@ echo ""
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"
@ -10,11 +9,10 @@ Index: xine-lib-1.1.17/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
Index: xine-lib-1.1.17/configure.ac 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.17.orig/configure.ac +++ xine-lib-1.1.18/configure.ac 2010-02-24 21:28:13.320882133 +0100
+++ xine-lib-1.1.17/configure.ac @@ -1104,6 +1104,28 @@
@@ -1086,6 +1086,28 @@ AC_SUBST([SDL_CFLAGS])
AC_SUBST([SDL_LIBS]) AC_SUBST([SDL_LIBS])
dnl --------------------------------------------- dnl ---------------------------------------------
@ -43,15 +41,15 @@ Index: xine-lib-1.1.17/configure.ac
dnl check for Libstk dnl check for Libstk
dnl --------------------------------------------- dnl ---------------------------------------------
@@ -2799,6 +2821,7 @@ src/libxineadec/Makefile @@ -2817,6 +2839,7 @@
src/libxineadec/gsm610/Makefile
src/libxineadec/nosefart/Makefile
src/libreal/Makefile src/libreal/Makefile
+src/mjpeg/Makefile +src/mjpeg/Makefile
src/post/Makefile src/post/Makefile
src/post/planar/Makefile src/post/planar/Makefile
src/post/goom/Makefile src/post/goom/Makefile
@@ -2989,6 +3012,9 @@ echo "" @@ -3007,6 +3030,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"
@ -61,34 +59,31 @@ Index: xine-lib-1.1.17/configure.ac
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
Index: xine-lib-1.1.17/src/Makefile.am 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.17.orig/src/Makefile.am +++ xine-lib-1.1.18/src/Makefile.am 2010-02-24 21:28:13.321884189 +0100
+++ xine-lib-1.1.17/src/Makefile.am @@ -27,6 +27,7 @@
@@ -27,6 +27,7 @@ SUBDIRS = \
libreal \ libreal \
\ libfaad \
libmusepack \ libmusepack \
+ mjpeg \ + mjpeg \
post \ post \
combined \ combined \
vdr vdr
Index: xine-lib-1.1.17/src/Makefile.in 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.17.orig/src/Makefile.in +++ xine-lib-1.1.18/src/Makefile.in 2010-02-24 21:28:13.321884189 +0100
+++ xine-lib-1.1.17/src/Makefile.in @@ -453,6 +453,7 @@
@@ -450,6 +450,7 @@ SUBDIRS = \
libreal \ libreal \
\ libfaad \
libmusepack \ libmusepack \
+ mjpeg \ + mjpeg \
post \ post \
combined combined
Index: xine-lib-1.1.17/src/mjpeg/Makefile.am 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
--- /dev/null +++ xine-lib-1.1.18/src/mjpeg/Makefile.am 2010-02-24 21:28:13.323883132 +0100
+++ xine-lib-1.1.17/src/mjpeg/Makefile.am
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
+include $(top_srcdir)/misc/Makefile.common +include $(top_srcdir)/misc/Makefile.common
+ +
@ -99,10 +94,9 @@ Index: xine-lib-1.1.17/src/mjpeg/Makefile.am
+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
Index: xine-lib-1.1.17/src/mjpeg/Makefile.in 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
--- /dev/null +++ xine-lib-1.1.18/src/mjpeg/Makefile.in 2010-02-24 21:28:13.324882254 +0100
+++ xine-lib-1.1.17/src/mjpeg/Makefile.in
@@ -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@
@ -855,10 +849,9 @@ Index: xine-lib-1.1.17/src/mjpeg/Makefile.in
+# 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:
Index: xine-lib-1.1.17/src/mjpeg/xine_mjpeg_decoder.c 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
--- /dev/null +++ xine-lib-1.1.18/src/mjpeg/xine_mjpeg_decoder.c 2010-02-24 21:28:13.325884030 +0100
+++ xine-lib-1.1.17/src/mjpeg/xine_mjpeg_decoder.c
@@ -0,0 +1,397 @@ @@ -0,0 +1,397 @@
+/* +/*
+ * Copyright (C) 2007 Marcus Meissner + * Copyright (C) 2007 Marcus Meissner

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

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

24
xine-lib-libdvdread_udf.diff
View File

@ -1,14 +1,7 @@
# HG changeset patch diff -ur xine-lib-1.1.18.orig/src/input/libdvdnav/dvd_udf.c xine-lib-1.1.18/src/input/libdvdnav/dvd_udf.c
# User Tobias Rautenkranz <mail@tobias.rautenkranz.ch> --- xine-lib-1.1.18.orig/src/input/libdvdnav/dvd_udf.c 2009-11-30 21:57:20.000000000 +0100
# Date 1202208482 -3600 +++ xine-lib-1.1.18/src/input/libdvdnav/dvd_udf.c 2010-02-24 21:12:36.032882913 +0100
# Node ID 100241ff36f0730a15018a58456fb86eb590bf18 @@ -38,10 +38,16 @@
# Parent 07c29261ed98fdb710a241c6711dac0215b6074a
Fix playback of DVDs with a broken UDF file system (aka DVD-Movie-Protect).
diff -r 07c29261ed98 -r 100241ff36f0 src/input/libdvdnav/dvd_udf.c
--- a/src/input/libdvdnav/dvd_udf.c Thu Jan 31 22:02:04 2008 +0000
+++ b/src/input/libdvdnav/dvd_udf.c Tue Feb 05 11:48:02 2008 +0100
@@ -38,9 +38,15 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include <inttypes.h> #include <inttypes.h>
@ -18,13 +11,14 @@ diff -r 07c29261ed98 -r 100241ff36f0 src/input/libdvdnav/dvd_udf.c
#include "dvd_reader.h" #include "dvd_reader.h"
#include "dvd_udf.h" #include "dvd_udf.h"
+
+#include "ifo_types.h" +#include "ifo_types.h"
+#include "ifo_read.h" +#include "ifo_read.h"
+
/* Private but located in/shared with dvd_reader.c */ /* Private but located in/shared with dvd_reader.c */
extern int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number, extern int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number,
@@ -774,7 +780,9 @@ static int UDFFindPartition( dvd_reader_ size_t block_count, unsigned char *data,
@@ -774,7 +780,9 @@
return part->valid; return part->valid;
} }
@ -35,7 +29,7 @@ diff -r 07c29261ed98 -r 100241ff36f0 src/input/libdvdnav/dvd_udf.c
uint32_t *filesize ) uint32_t *filesize )
{ {
uint8_t LogBlock_base[ DVD_VIDEO_LB_LEN + 2048 ]; uint8_t LogBlock_base[ DVD_VIDEO_LB_LEN + 2048 ];
@@ -856,6 +864,84 @@ uint32_t UDFFindFile( dvd_reader_t *devi @@ -856,6 +864,84 @@
return partition.Start + File.Location; return partition.Start + File.Location;
} }

2
xine-lib-various-noncrippled.diff
View File

@ -2,7 +2,7 @@ Index: src/libw32dll/wine/ldt_keeper.c
=================================================================== ===================================================================
--- src/libw32dll/wine/ldt_keeper.c.orig --- src/libw32dll/wine/ldt_keeper.c.orig
+++ src/libw32dll/wine/ldt_keeper.c +++ src/libw32dll/wine/ldt_keeper.c
@@ -77,6 +77,10 @@ int modify_ldt(int func, void *ptr, unsi @@ -77,6 +77,10 @@
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

31
xine-lib.changes
View File

@ -1,3 +1,34 @@
-------------------------------------------------------------------
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.
* Fix a size check (wrong variable, causing int/ptr comparison) in rmff.c.
* Fix build with the old, outdated and deprecated internal ffmpeg.
-------------------------------------------------------------------
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.
* Build fix (undefined symbol) for when using older ffmpeg.
* TTA demuxer fixes; allow seeking.
* More meta-information tags.
Only the Ogg demuxer knows about these at present.
* Added basic support for .qtl (Quicktime media link).
* "Fixed" playback of 24-bit FLAC.
* Fixed playback of 24-bit LPCM.
* Work around an ffmpeg bug concerning Sorenson Video 3.
* Flash audio bug fixes, mostly concerning AAC.
* Fix DXR3 support for newer versions of the em8300 driver.
* Added support for WMA Pro.
-------------------------------------------------------------------
Wed Feb 03 21:03:00 CET 2010 - Manfred.Tremmel@iiv.de
- patches can't be build to work with crippled and non crippled tarball
with fuzz=0, added "-F2" for patch 50 and 61 to fix this
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 1 12:37:47 UTC 2010 - jengelh@medozas.de Mon Feb 1 12:37:47 UTC 2010 - jengelh@medozas.de

388
xine-lib.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package xine-lib (Version 1.1.17) # spec file for package xine-lib (Version 1.1.18.1)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -28,7 +28,7 @@ Name: xine-lib
# default for buildservice is no patented codecs # default for buildservice is no patented codecs
%bcond_without distributable %bcond_without distributable
%bcond_with onlynondistributable %bcond_with onlynondistributable
%if %suse_version >= 1100 %if 0%{suse_version} >= 1100
%bcond_without pulseaudio %bcond_without pulseaudio
%else %else
%bcond_with pulseaudio %bcond_with pulseaudio
@ -40,7 +40,7 @@ Name: xine-lib
%bcond_with jack %bcond_with jack
%bcond_without gnome_vfs %bcond_without gnome_vfs
%bcond_with directfb %bcond_with directfb
%if %suse_version > 1110 %if 0%{suse_version} > 1110
%bcond_without modplug %bcond_without modplug
%else %else
%bcond_with modplug %bcond_with modplug
@ -54,7 +54,10 @@ BuildRequires: libcdio-devel libdrm-devel libmng-devel libsmbclient
BuildRequires: Mesa-devel libsmbclient-devel libtheora-devel libvorbis-devel BuildRequires: Mesa-devel libsmbclient-devel libtheora-devel libvorbis-devel
BuildRequires: readline-devel update-desktop-files vcdimager-devel BuildRequires: readline-devel update-desktop-files vcdimager-devel
BuildRequires: speex-devel BuildRequires: speex-devel
%if %suse_version >= 1030 %if 0%{suse_version} >= 1110
BuildRequires: libv4l-devel
%endif
%if 0%{suse_version} >= 1030
BuildRequires: lirc-devel BuildRequires: lirc-devel
%else %else
BuildRequires: lirc BuildRequires: lirc
@ -88,7 +91,7 @@ BuildRequires: gnome-vfs2-devel
BuildRequires: libjack-devel BuildRequires: libjack-devel
%endif %endif
%if %{with directfb} %if %{with directfb}
%if %suse_version >= 1020 %if 0%{suse_version} >= 1020
BuildRequires: DirectFB-devel BuildRequires: DirectFB-devel
%else %else
BuildRequires: DirectFB BuildRequires: DirectFB
@ -97,13 +100,13 @@ BuildRequires: DirectFB
%if %{with modplug} %if %{with modplug}
BuildRequires: libmodplug-devel BuildRequires: libmodplug-devel
%endif %endif
Version: 1.1.17 Version: 1.1.18.1
Release: 2 Release: 1
# bug437293 # bug437293
%ifarch ppc64 %ifarch ppc64
Obsoletes: xine-lib-64bit Obsoletes: xine-lib-64bit
%endif %endif
%define abiversion 1.27 %define abiversion 1.28
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
@ -155,6 +158,7 @@ Group: Productivity/Multimedia/Video/Players
License: GPLv2+ License: GPLv2+
Provides: xine-lib = %{version}-%{release} Provides: xine-lib = %{version}-%{release}
Obsoletes: xine-lib < %{version}-%{release} Obsoletes: xine-lib < %{version}-%{release}
Provides: xine-extra = %{version}-%{release}
Obsoletes: xine-extra < %{version}-%{release} Obsoletes: xine-extra < %{version}-%{release}
Provides: libxine1-syncfb = %{version}-%{release} Provides: libxine1-syncfb = %{version}-%{release}
Obsoletes: libxine1-syncfb < %{version}-%{release} Obsoletes: libxine1-syncfb < %{version}-%{release}
@ -380,22 +384,6 @@ xine Soundausgabeplugin für den Pulseaudio Soundserver
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
xine sound output plugin for the pulseaudio soundserver
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
xine Soundausgabeplugin für den Pulseaudio Soundserver
Autoren: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
@ -413,22 +401,6 @@ xine Soundausgabeplugin für den Pulseaudio Soundserver
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
xine sound output plugin for the pulseaudio soundserver
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
xine Soundausgabeplugin für den Pulseaudio Soundserver
Autoren: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
@ -455,22 +427,6 @@ SDL xine Video-Ausgabeplugin
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
SDL xine video output plugin
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
SDL xine Video-Ausgabeplugin
Autoren: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
@ -488,22 +444,6 @@ SDL xine Video-Ausgabeplugin
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
SDL xine video output plugin
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
SDL xine Video-Ausgabeplugin
Autoren: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
@ -534,38 +474,6 @@ Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
xine sound output plugin for the arts soundserver
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
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>
xine sound output plugin for the arts soundserver
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
%description -n libxine1-arts -l de %description -n libxine1-arts -l de
xine sound output plugin for the arts soundserver xine sound output plugin for the arts soundserver
@ -583,38 +491,6 @@ Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
xine sound output plugin for the arts soundserver
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
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>
xine sound output plugin for the arts soundserver
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
%endif %endif
%if %{with aalib} %if %{with aalib}
@ -634,30 +510,13 @@ Authors:
Guenter Bartsch <guenter@users.sourceforge.net> Guenter Bartsch <guenter@users.sourceforge.net>
aalib and libcaca xine video-output plugin aalib und libcaca xine Video Ausgabeplugin
Authors: Autoren:
-------- --------
Guenter Bartsch <guenter@users.sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
aalib and libcaca xine video-output plugin
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
aalib and libcaca xine video-output plugin
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
%description -n libxine1-aa -l de %description -n libxine1-aa -l de
aalib and libcaca xine video-output plugin aalib and libcaca xine video-output plugin
@ -669,30 +528,13 @@ Authors:
Guenter Bartsch <guenter@users.sourceforge.net> Guenter Bartsch <guenter@users.sourceforge.net>
aalib and libcaca xine video-output plugin aalib und libcaca xine Video Ausgabeplugin
Authors: Autoren:
-------- --------
Guenter Bartsch <guenter@users.sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
aalib and libcaca xine video-output plugin
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
aalib and libcaca xine video-output plugin
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
%endif %endif
%if %{with esd} %if %{with esd}
@ -712,28 +554,9 @@ Authors:
-------- --------
Guenter Bartsch <guenter@users.sourceforge.net> Guenter Bartsch <guenter@users.sourceforge.net>
libxine Soundausgabeplugin für den esound Soundserver
libxine sound output plugin for the esound soundserver
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
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
libxine sound output plugin for the esound soundserver
Authors: Authors:
@ -749,28 +572,9 @@ Authors:
-------- --------
Guenter Bartsch <guenter@users.sourceforge.net> Guenter Bartsch <guenter@users.sourceforge.net>
libxine Soundausgabeplugin für den esound Soundserver
libxine sound output plugin for the esound soundserver
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
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
libxine sound output plugin for the esound soundserver
Authors: Authors:
@ -799,22 +603,6 @@ xine Soundausgabeplugin für den jack Soundserver
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
xine sound output plugin for the jack soundserver
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
xine Soundausgabeplugin für den jack Soundserver
Autoren: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
@ -832,22 +620,6 @@ xine Soundausgabeplugin für den jack Soundserver
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
xine sound output plugin for the jack soundserver
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
xine Soundausgabeplugin für den jack Soundserver
Autoren: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
@ -874,22 +646,6 @@ Directfb xine Video-Ausgabeplugin
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
Directfb xine video-output plugin
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
Directfb xine Video-Ausgabeplugin
Autoren: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
@ -907,22 +663,6 @@ Directfb xine Video-Ausgabeplugin
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
Directfb xine video-output plugin
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
Directfb xine Video-Ausgabeplugin
Autoren: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
@ -950,22 +690,6 @@ Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
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: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
@ -983,22 +707,6 @@ Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
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: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
@ -1048,26 +756,6 @@ http://www.xine-project.org/home
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
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: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
@ -1089,26 +777,6 @@ http://www.xine-project.org/home
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
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: Autoren:
-------- --------
Guenter Bartsch <guenter@sourceforge.net> Guenter Bartsch <guenter@sourceforge.net>
@ -1140,10 +808,20 @@ EOF
%patch26 %patch26
%patch28 -p1 %patch28 -p1
%patch31 -p1 %patch31 -p1
%if 0%{suse_version} >= 1110
# set fuzzy=2 to get patch work with crippled and noncrippled tarball
%patch50 -p1 -F2
%else
%patch50 -p1 %patch50 -p1
%endif
%patch51 -p1 %patch51 -p1
sed -i 's|^noinst_HEADERS = input_vdr.h|xineinclude_HEADERS = input_vdr.h|' src/vdr/Makefile.am sed -i 's|^noinst_HEADERS = input_vdr.h|xineinclude_HEADERS = input_vdr.h|' src/vdr/Makefile.am
%if 0%{suse_version} >= 1110
# set fuzzy=2 to get patch work with crippled and noncrippled tarball
%patch61 -p1 -F2
%else
%patch61 -p1 %patch61 -p1
%endif
%patch62 -p1 %patch62 -p1
#sed -i 's|^ac_config_files="|ac_config_files="src/vdr/Makefile src/mjpeg/Makefile|' configure #sed -i 's|^ac_config_files="|ac_config_files="src/vdr/Makefile src/mjpeg/Makefile|' configure
%if %{with distributable} %if %{with distributable}
@ -1197,6 +875,11 @@ AUTOPOINT=true autoreconf -fi
%endif %endif
%ifarch %{ix86} %ifarch %{ix86}
--with-w32-path=/usr/lib/win32 \ --with-w32-path=/usr/lib/win32 \
%endif
%if 0%{suse_version} >= 1110
--enable-v4l --enable-libv4l \
%else
--disable-v4l --disable-libv4l \
%endif %endif
--with-install-plugins-helper=${_prefix}/lib/opensuse-codecs-installer --with-install-plugins-helper=${_prefix}/lib/opensuse-codecs-installer
%if 0%{?suse_version} < 1110 %if 0%{?suse_version} < 1110
@ -1244,7 +927,11 @@ xineplug_vo_out_xcbxv
xineplug_vo_out_raw xineplug_vo_out_raw
xineplug_inp_dvb xineplug_inp_dvb
xineplug_inp_dvd xineplug_inp_dvd
%if 0%{suse_version} >= 1110
xineplug_inp_v4l xineplug_inp_v4l
xineplug_inp_v4l2
xineplug_inp_pvr
%endif
xineplug_inp_file xineplug_inp_file
xineplug_inp_http xineplug_inp_http
xineplug_inp_net xineplug_inp_net
@ -1253,7 +940,6 @@ xineplug_inp_cdda
xineplug_inp_smb xineplug_inp_smb
xineplug_inp_stdin_fifo xineplug_inp_stdin_fifo
xineplug_inp_rtsp xineplug_inp_rtsp
xineplug_inp_pvr
xineplug_inp_rtp xineplug_inp_rtp
xineplug_decode_bitplane xineplug_decode_bitplane
xineplug_decode_rgb xineplug_decode_rgb