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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xine-lib?expand=0&rev=8

Browse Source
This commit is contained in:
OBS User unknown 2008-05-17 00:58:11 +00:00 committed by Git OBS Bridge
parent f17f56753b
commit bd48573eed
10 changed files with 66 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3a74748c5feb9f3043d52fe64a872b4bc5a087af7fb1e4c88eccd54bb6958c7c
size 22824
oid sha256:688f2e99785c07468fa13f51a2c0be08682c5627036ba29f44f8c86f1221867a
size 22841

27
xine-lib-1.1.11.1-CVE-2008-1686-speex.diff
View File

@ -1,27 +0,0 @@
Index: xine-lib-1.1.11.1/src/libxineadec/xine_speex_decoder.c
===================================================================
--- xine-lib-1.1.11.1.orig/src/libxineadec/xine_speex_decoder.c
+++ xine-lib-1.1.11.1/src/libxineadec/xine_speex_decoder.c
@@ -204,7 +204,7 @@ static void speex_decode_data (audio_dec
if (!this->st) {
SpeexMode * spx_mode;
SpeexHeader * spx_header;
- int modeID;
+ unsigned int modeID;
int bitrate;
speex_bits_init (&this->bits);
@@ -216,7 +216,12 @@ static void speex_decode_data (audio_dec
return;
}
- modeID = spx_header->mode;
+ modeID = (unsigned int)spx_header->mode;
+ if (modeID >= SPEEX_NB_MODES) {
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, LOG_MODULE ": invalid mode ID %u\n", modeID);
+ return;
+ }
+
spx_mode = (SpeexMode *) speex_mode_list[modeID];
if (spx_mode->bitstream_version != spx_header->mode_bitstream_version) {

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

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

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

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

40
xine-lib-1.1.7-install-plugins-helper.diff
View File

@ -1,8 +1,8 @@
Index: xine-lib-1.1.11/configure.ac
Index: xine-lib-1.1.12/configure.ac
===================================================================
--- xine-lib-1.1.11.orig/configure.ac
+++ xine-lib-1.1.11/configure.ac
@@ -2545,6 +2545,28 @@ fi
--- xine-lib-1.1.12.orig/configure.ac
+++ xine-lib-1.1.12/configure.ac
@@ -2560,6 +2560,28 @@ fi
AM_CONDITIONAL(HAVE_W32DLL, test "x$enable_w32dll" != "xno")
@ -31,10 +31,10 @@ Index: xine-lib-1.1.11/configure.ac
dnl ---------------------------------------------
dnl some include paths ( !!! DO NOT REMOVE !!! )
Index: xine-lib-1.1.11/src/xine-engine/xine.c
Index: xine-lib-1.1.12/src/xine-engine/xine.c
===================================================================
--- xine-lib-1.1.11.orig/src/xine-engine/xine.c
+++ xine-lib-1.1.11/src/xine-engine/xine.c
--- xine-lib-1.1.12.orig/src/xine-engine/xine.c
+++ xine-lib-1.1.12/src/xine-engine/xine.c
@@ -1780,6 +1780,15 @@ void xine_init (xine_t *this) {
0, NULL, this);
@ -51,10 +51,10 @@ Index: xine-lib-1.1.11/src/xine-engine/xine.c
* keep track of all opened streams
*/
this->streams = xine_list_new();
Index: xine-lib-1.1.11/src/xine-engine/video_decoder.c
Index: xine-lib-1.1.12/src/xine-engine/video_decoder.c
===================================================================
--- xine-lib-1.1.11.orig/src/xine-engine/video_decoder.c
+++ xine-lib-1.1.11/src/xine-engine/video_decoder.c
--- xine-lib-1.1.12.orig/src/xine-engine/video_decoder.c
+++ xine-lib-1.1.12/src/xine-engine/video_decoder.c
@@ -37,6 +37,7 @@
#include "xine_internal.h"
@ -74,10 +74,10 @@ Index: xine-lib-1.1.11/src/xine-engine/video_decoder.c
}
if (stream->video_decoder_plugin)
Index: xine-lib-1.1.11/src/xine-engine/audio_decoder.c
Index: xine-lib-1.1.12/src/xine-engine/audio_decoder.c
===================================================================
--- xine-lib-1.1.11.orig/src/xine-engine/audio_decoder.c
+++ xine-lib-1.1.11/src/xine-engine/audio_decoder.c
--- xine-lib-1.1.12.orig/src/xine-engine/audio_decoder.c
+++ xine-lib-1.1.12/src/xine-engine/audio_decoder.c
@@ -41,6 +41,7 @@
#include "xine_internal.h"
@ -97,10 +97,10 @@ Index: xine-lib-1.1.11/src/xine-engine/audio_decoder.c
}
if (audio_type != stream->audio_type) {
Index: xine-lib-1.1.11/src/xine-engine/Makefile.am
Index: xine-lib-1.1.12/src/xine-engine/Makefile.am
===================================================================
--- xine-lib-1.1.11.orig/src/xine-engine/Makefile.am
+++ xine-lib-1.1.11/src/xine-engine/Makefile.am
--- xine-lib-1.1.12.orig/src/xine-engine/Makefile.am
+++ xine-lib-1.1.12/src/xine-engine/Makefile.am
@@ -19,7 +19,7 @@ libxine_la_SOURCES = xine.c metronom.c 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 \
@ -120,10 +120,10 @@ Index: xine-lib-1.1.11/src/xine-engine/Makefile.am
noinst_HEADERS = bswap.h ffmpeg_bswap.h
Index: xine-lib-1.1.11/src/xine-engine/install_plugins_helper.h
Index: xine-lib-1.1.12/src/xine-engine/install_plugins_helper.h
===================================================================
--- /dev/null
+++ xine-lib-1.1.11/src/xine-engine/install_plugins_helper.h
+++ xine-lib-1.1.12/src/xine-engine/install_plugins_helper.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2007 Sascha Sommer
@ -160,10 +160,10 @@ Index: xine-lib-1.1.11/src/xine-engine/install_plugins_helper.h
+
+
+#endif
Index: xine-lib-1.1.11/src/xine-engine/install_plugins_helper.c
Index: xine-lib-1.1.12/src/xine-engine/install_plugins_helper.c
===================================================================
--- /dev/null
+++ xine-lib-1.1.11/src/xine-engine/install_plugins_helper.c
+++ xine-lib-1.1.12/src/xine-engine/install_plugins_helper.c
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2007 Sascha Sommer

6
xine-lib-demuxcheckfor_mad_ffmpeg-LOCAL.diff
View File

@ -2,7 +2,7 @@ Index: src/xine-engine/load_plugins.c
===================================================================
--- src/xine-engine/load_plugins.c.orig
+++ src/xine-engine/load_plugins.c
@@ -2401,9 +2401,19 @@ char *xine_get_file_extensions (xine_t *
@@ -2431,9 +2431,19 @@ char *xine_get_file_extensions (xine_t *
plugin_node_t *node;
char *str;
int list_id, list_size;
@ -22,7 +22,7 @@ Index: src/xine-engine/load_plugins.c
/* calc length of output */
len = 0;
@@ -2417,7 +2427,8 @@ char *xine_get_file_extensions (xine_t *
@@ -2447,7 +2457,8 @@ char *xine_get_file_extensions (xine_t *
cls = (demux_class_t *)node->plugin_class;
@ -32,7 +32,7 @@ Index: src/xine-engine/load_plugins.c
len += strlen(exts) + 1;
}
}
@@ -2437,7 +2448,8 @@ char *xine_get_file_extensions (xine_t *
@@ -2467,7 +2478,8 @@ char *xine_get_file_extensions (xine_t *
cls = (demux_class_t *)node->plugin_class;

12
xine-lib-ffmpeg-nopic.diff
View File

@ -1,12 +0,0 @@
--- src/libffmpeg/libavcodec/i386/Makefile.am.orig 2007-11-12 20:06:38.000000000 +0100
+++ src/libffmpeg/libavcodec/i386/Makefile.am 2007-11-12 20:17:10.000000000 +0100
@@ -9,7 +9,8 @@ CFLAGS := `echo @CFLAGS@ | sed -e 's/-fu
AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil -I$(top_srcdir)/src/libffmpeg -I$(top_builddir)/src/libffmpeg
# Avoid "can't find register" failures with -O1 and higher
-dsputil_mmx.o dsputil_mmx.lo: CFLAGS=$(shell echo @CFLAGS@ | sed -e 's/-funroll-loops//g; s/$$/ -Os/')
+# Don't do -fPIC on i386
+dsputil_mmx.o dsputil_mmx.lo: CFLAGS=$(shell echo @CFLAGS@ | sed -e 's/-funroll-loops//g; s/$$/ -Os -prefer-non-pic/')
# Avoid errors on (at least) amd64 with -O0
fdct_mmx.o fdct_mmx.lo: CFLAGS=`echo @CFLAGS@ | sed -e 's/^/-Os /; s/-O0\?\s/-Os /g'`

10
xine-lib-mjpegplugin.diff
View File

@ -2,7 +2,7 @@ Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -1070,6 +1070,28 @@ AC_SUBST([SDL_CFLAGS])
@@ -1075,6 +1075,28 @@ AC_SUBST([SDL_CFLAGS])
AC_SUBST([SDL_LIBS])
dnl ---------------------------------------------
@ -31,7 +31,7 @@ Index: configure.ac
dnl check for Libstk
dnl ---------------------------------------------
@@ -2731,6 +2753,7 @@ src/libxineadec/Makefile
@@ -2746,6 +2768,7 @@ src/libxineadec/Makefile
src/libxineadec/gsm610/Makefile
src/libxineadec/nosefart/Makefile
src/libreal/Makefile
@ -39,7 +39,7 @@ Index: configure.ac
src/post/Makefile
src/post/planar/Makefile
src/post/goom/Makefile
@@ -2918,6 +2941,9 @@ echo ""
@@ -2933,6 +2956,9 @@ echo ""
dnl audio decoders
echo " * audio decoder plugins:"
echo " - GSM 06.10 - linear PCM"
@ -1228,7 +1228,7 @@ Index: configure
===================================================================
--- configure.orig
+++ configure
@@ -53851,6 +53851,7 @@ echo ""
@@ -53975,6 +53975,7 @@ echo ""
echo " * video decoder plugins:"
echo " - MPEG 1,2 - Amiga Bitplane"
echo " - Raw RGB - Raw YUV"
@ -1240,7 +1240,7 @@ Index: src/Makefile.in
===================================================================
--- src/Makefile.in.orig
+++ src/Makefile.in
@@ -399,6 +399,7 @@ SUBDIRS = \
@@ -400,6 +400,7 @@ SUBDIRS = \
libreal \
libfaad \
libmusepack \

15
xine-lib.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed May 14 16:26:18 CEST 2008 - mhopf@suse.de
- Update to 1.1.12: (fixes bnc#379499)
* Fixed and improved the PulseAudio driver.
* Fixed a regression in 1.1.11.1 which broke Quicktime container handling.
* And another, this time in the Matroska demuxer.
* Added a tool to assist with generating front ends' desktop files. It
lists MIME types & filename extensions known to the installed xine-lib.
* Various Real codec improvements, including:
- RV20 no longer causes segfaults (observed on amd64);
- Cook is now handled by ffmpeg.
* Added a video output plugin intended for passing raw data to the front end.
-------------------------------------------------------------------
Fri Apr 18 15:07:47 CEST 2008 - lnussel@suse.de

29
xine-lib.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package xine-lib (Version 1.1.11.1)
# spec file for package xine-lib (Version 1.1.12)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -33,9 +33,9 @@ BuildRequires: ImageMagick-devel SDL-devel aalib-devel arts-devel cdparanoia cu
BuildRequires: mad-devel
%endif
Recommends: opensuse-codecs-installer
Version: 1.1.11.1
Release: 8
%define abiversion 1.20
Version: 1.1.12
Release: 1
%define abiversion 1.21
Summary: Video Player with Plug-Ins
Group: Productivity/Multimedia/Video/Players
License: GPL v2 or later; Public Domain, Freeware
@ -52,7 +52,6 @@ Source13: lcd.tar.bz2
Source99: precheckin_cripple_tarball.sh
# *** xine-lib: Bugfixes
Patch26: xine-lib-doc-fix-X11R6.diff
Patch27: xine-lib-1.1.11.1-CVE-2008-1686-speex.diff
Patch28: xine-lib-CVE-2008-1878.diff
# *** Addons
Patch50: vdr-xine-0.8.2.diff.bz2
@ -65,7 +64,6 @@ Patch72: xine-lib-1.1.7-install-plugins-helper.diff
Patch73: xine-lib-assert.patch
# *** Only working for noncrippled source
Patch80: xine-lib-various-noncrippled.diff
Patch81: xine-lib-ffmpeg-nopic.diff
%description
Xine is a video player with a graphical front-end that supports a large
@ -182,14 +180,9 @@ sed -i 's|^noinst_HEADERS = input_vdr.h|xineinclude_HEADERS = input_vdr.h|' src/
# Only apply to uncrippled source
%if %BUILD_XINE > 0
%patch80
# dirty hack - won't compile with gcc 4.3 without
%ifarch %ix86
%patch81
%endif
%endif
%patch72 -p1
%patch73 -p1
%patch27 -p1
%patch28 -p1
%build
@ -253,6 +246,7 @@ xineplug_vo_out_xv
xineplug_vo_out_xcbshm
xineplug_vo_out_xcbxv
%endif
xineplug_vo_out_raw
xineplug_inp_dvb
xineplug_inp_dvd
xineplug_inp_v4l
@ -403,6 +397,7 @@ echo "/usr/share/xine/mad" >> files.internal
%files -n xine-lib -f files
%defattr(-,root,root)
%_bindir/xine-list-1.1
%ifarch %ix86
%dir /usr/lib/win32
%endif
@ -412,6 +407,7 @@ echo "/usr/share/xine/mad" >> files.internal
%dir /usr/share/xine
%dir /usr/share/xine/libxine1
%_libdir/libxine.so.*
%doc %_mandir/man1/xine-list-1.1.1.gz
%_defaultdocdir/xine
%_libdir/xine/plugins/%abiversion/post
%_libdir/xine/plugins/%abiversion/vidix
@ -452,6 +448,17 @@ echo "/usr/share/xine/mad" >> files.internal
%endif
%changelog
* Wed May 14 2008 mhopf@suse.de
- Update to 1.1.12: (fixes bnc#379499)
* Fixed and improved the PulseAudio driver.
* Fixed a regression in 1.1.11.1 which broke Quicktime container handling.
* And another, this time in the Matroska demuxer.
* Added a tool to assist with generating front ends' desktop files. It
lists MIME types & filename extensions known to the installed xine-lib.
* Various Real codec improvements, including:
- RV20 no longer causes segfaults (observed on amd64);
- Cook is now handled by ffmpeg.
* Added a video output plugin intended for passing raw data to the front end.
* Fri Apr 18 2008 lnussel@suse.de
- fix overflow in nsf demuxer (bnc#380772, CVE-2008-1878)
* Thu Apr 17 2008 lnussel@suse.de