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

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

Browse Source
This commit is contained in:
OBS User unknown 2008-09-24 15:41:21 +00:00 committed by Git OBS Bridge
parent ff34c470ce
commit 298ed5cdf4
3 changed files with 122 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
xine-lib-1.1.15-ffmpeg.diff Normal file
View File

@ -0,0 +1,26 @@
diff -ur xine-lib-1.1.15.orig/src/combined/ffmpeg/ff_audio_decoder.c xine-lib-1.1.15/src/combined/ffmpeg/ff_audio_decoder.c
--- xine-lib-1.1.15.orig/src/combined/ffmpeg/ff_audio_decoder.c 2008-07-16 01:13:03.000000000 +0200
+++ xine-lib-1.1.15/src/combined/ffmpeg/ff_audio_decoder.c 2008-09-14 13:28:20.000000000 +0200
@@ -322,7 +322,7 @@
if (!this->output_open) {
if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) {
- avcodec_decode_audio (this->context,
+ avcodec_decode_audio2 (this->context,
(int16_t *)this->decode_buffer,
&decode_buffer_size,
&this->buf[0],
diff -ur xine-lib-1.1.15.orig/src/combined/ffmpeg/ffmpeg_decoder.h xine-lib-1.1.15/src/combined/ffmpeg/ffmpeg_decoder.h
--- xine-lib-1.1.15.orig/src/combined/ffmpeg/ffmpeg_decoder.h 2008-05-19 16:15:42.000000000 +0200
+++ xine-lib-1.1.15/src/combined/ffmpeg/ffmpeg_decoder.h 2008-09-14 13:28:20.000000000 +0200
@@ -33,6 +33,10 @@
# include "../../libffmpeg/libavcodec/avcodec.h"
#endif
+#if LIBAVCODEC_VERSION_MAJOR > 51
+#define bits_per_sample bits_per_coded_sample
+#endif
+
typedef struct ff_codec_s {
uint32_t type;
enum CodecID id;

6
xine-lib.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Sep 17 09:47:23 CEST 2008 - lnussel@suse.de
- add some more obsoletes/provides for legacy packman packages
- fix build with newer ffmpeg releases
-------------------------------------------------------------------
Thu Sep 4 14:56:47 CEST 2008 - lnussel@suse.de

219
xine-lib.spec
View File

@ -43,7 +43,12 @@ Name: xine-lib
BuildRequires: ImageMagick-devel alsa-devel flac-devel giflib-devel
BuildRequires: glib2-devel gnutls-devel gtk2-devel imlib2-devel krb5-devel
BuildRequires: libcdio-devel libdrm-devel libmng-devel libsmbclient
BuildRequires: libsmbclient-devel libtheora-devel libvorbis-devel lirc-devel
BuildRequires: libsmbclient-devel libtheora-devel libvorbis-devel
%if %suse_version >= 1030
BuildRequires: lirc-devel
%else
BuildRequires: lirc
%endif
BuildRequires: readline-devel speex-devel update-desktop-files vcdimager-devel
%if !%{with distributable}
# those requiremens are optional but internal copies are likely old
@ -74,13 +79,17 @@ BuildRequires: gnome-vfs2-devel
BuildRequires: libjack-devel
%endif
%if %{with directfb}
%if %suse_version >= 1020
BuildRequires: DirectFB-devel
%else
BuildRequires: DirectFB
%endif
%endif
%if %{with modplug}
BuildRequires: libmodplug
%endif
Version: 1.1.15
Release: 16
Release: 17
%define abiversion 1.24
Summary: Video Player with Plug-Ins
Group: Productivity/Multimedia/Video/Players
@ -111,26 +120,25 @@ Patch73: xine-lib-assert.patch
Patch74: xine-configure.diff
# *** Only working for noncrippled source
Patch80: xine-lib-various-noncrippled.diff
# ffmpeg api change
Patch81: xine-lib-1.1.15-ffmpeg.diff
%description
Xine is a video player with a graphical front-end that supports a large
number of file formats (VCD and MPEG2, for example) using plug-ins.
Several plug-ins are included. Others can be installed after Xine
installation. Xine supports stereo sound using OSS and AC5.1 using
Alsa.
xine is a free multimedia player. It plays back CDs, DVDs, and VCDs. It
also decodes multimedia files like AVI, MOV, WMV, and MP3 from local
disk drives, and displays multimedia streamed over the Internet. It
interprets many of the most common multimedia formats available - and
some of the most uncommon formats, too.
This version of Xine may lack certain features because of legal
The libxine1 package may lack certain features because of legal
requirements (potential patent violation). See
http://www.opensuse.org/XINE#Legal_Matters
More information about Xine plug-ins can be found at
http://www.xinehq.de/
http://www.opensuse.org/xine#Legal_Matters
Authors:
--------
Guenter Bartsch <guenter@sourceforge.net>
Guenter Bartsch
%package -n libxine1
Summary: Video Player with Plug-Ins
@ -149,50 +157,39 @@ Recommends: libxine1-codecs < %{version}-%{release}
Recommends: opensuse-codecs-installer
%description -n libxine1
Xine is a video player with a graphical front-end that supports a large
number of file formats (VCD and MPEG2, for example) using plug-ins.
Several plug-ins are included. Others can be installed after Xine
installation. Xine supports stereo sound using OSS and AC5.1 using
Alsa.
xine is a free multimedia player. It plays back CDs, DVDs, and VCDs. It
also decodes multimedia files like AVI, MOV, WMV, and MP3 from local
disk drives, and displays multimedia streamed over the Internet. It
interprets many of the most common multimedia formats available - and
some of the most uncommon formats, too.
This version of Xine may lack certain features because of legal
The libxine1 package may lack certain features because of legal
requirements (potential patent violation). See
http://www.opensuse.org/XINE#Legal_Matters
More information about Xine plug-ins can be found at
http://www.xinehq.de/
http://www.opensuse.org/xine#Legal_Matters
Authors:
--------
Guenter Bartsch <guenter@sourceforge.net>
Guenter Bartsch
%package -n libxine-devel
License: GPL v2 or later
Summary: Development environment for Xine-based media players
Summary: Development environment for xine-based media players
Group: Development/Libraries/C and C++
Requires: glibc-devel freetype2-devel zlib-devel libxine1 = %{version}
Obsoletes: libxine1-devel < %{version}-%{release}
Provides: libxine1-devel = %{version}-%{release}
Obsoletes: xine-devel < %{version}-%{release}
Provides: xine-devel = %{version}-%{release}
Obsoletes: xine-lib-devel < %{version}-%{release}
Provides: xine-lib-devel = %{version}-%{release}
%description -n libxine-devel
This package contains all necessary include files, libraries and
configuration files needed to compile applications that use the Xine
configuration files needed to compile applications that use the xine
media player.
Xine is a video player which supports a large number of file formats
(i.e., VCD, MPEG2) using plug-ins. Several plug-ins are included.
Others can be post-installed. Supports stereo sound using OSS and AC5.1
using Alsa.
This version of xine may lack certain features because of legal
requirements (potential patent violation). See also
http://www.opensuse.org/XINE#Legal_Matters
More information about Xine plug-ins can be found at
http://www.xinehq.de/
Authors:
@ -203,15 +200,13 @@ Authors:
%package -n libxine1-pulse
License: GPL v2 or later
Summary: Optional Xine plugins
Summary: pulseaudio plugin for xine
Group: Productivity/Multimedia/Video/Players
Requires: libxine1 = %{version}
Supplements: packageand(libpulse0:libxine1)
%description -n libxine1-pulse
The package contains less often needed xine plugins with extra
dependencies. For example to use aRts or esd audio output or visual
output via SDL or aalib.
xine sound output plugin for the pulseaudio soundserver
@ -229,24 +224,21 @@ Group: Productivity/Multimedia/Video/Players
Requires: libxine1 = %{version}
%description -n libxine1-sdl
Xine is a video player with a graphical front-end that supports a large
number of file formats (VCD and MPEG2, for example) using plug-ins.
Several plug-ins are included. Others can be installed after Xine
installation. Xine supports stereo sound using OSS and AC5.1 using
Alsa.
xine is a free multimedia player. It plays back CDs, DVDs, and VCDs. It
also decodes multimedia files like AVI, MOV, WMV, and MP3 from local
disk drives, and displays multimedia streamed over the Internet. It
interprets many of the most common multimedia formats available - and
some of the most uncommon formats, too.
This version of Xine may lack certain features because of legal
The libxine1 package may lack certain features because of legal
requirements (potential patent violation). See
http://www.opensuse.org/XINE#Legal_Matters
More information about Xine plug-ins can be found at
http://www.xinehq.de/
http://www.opensuse.org/xine#Legal_Matters
Authors:
--------
Guenter Bartsch <guenter@sourceforge.net>
Guenter Bartsch
%endif
%if %{with arts}
@ -258,24 +250,21 @@ Group: Productivity/Multimedia/Video/Players
Requires: libxine1 = %{version}
%description -n libxine1-arts
Xine is a video player with a graphical front-end that supports a large
number of file formats (VCD and MPEG2, for example) using plug-ins.
Several plug-ins are included. Others can be installed after Xine
installation. Xine supports stereo sound using OSS and AC5.1 using
Alsa.
xine is a free multimedia player. It plays back CDs, DVDs, and VCDs. It
also decodes multimedia files like AVI, MOV, WMV, and MP3 from local
disk drives, and displays multimedia streamed over the Internet. It
interprets many of the most common multimedia formats available - and
some of the most uncommon formats, too.
This version of Xine may lack certain features because of legal
The libxine1 package may lack certain features because of legal
requirements (potential patent violation). See
http://www.opensuse.org/XINE#Legal_Matters
More information about Xine plug-ins can be found at
http://www.xinehq.de/
http://www.opensuse.org/xine#Legal_Matters
Authors:
--------
Guenter Bartsch <guenter@sourceforge.net>
Guenter Bartsch
%endif
%if %{with aalib}
@ -287,24 +276,21 @@ Group: Productivity/Multimedia/Video/Players
Requires: libxine1 = %{version}
%description -n libxine1-aa
Xine is a video player with a graphical front-end that supports a large
number of file formats (VCD and MPEG2, for example) using plug-ins.
Several plug-ins are included. Others can be installed after Xine
installation. Xine supports stereo sound using OSS and AC5.1 using
Alsa.
xine is a free multimedia player. It plays back CDs, DVDs, and VCDs. It
also decodes multimedia files like AVI, MOV, WMV, and MP3 from local
disk drives, and displays multimedia streamed over the Internet. It
interprets many of the most common multimedia formats available - and
some of the most uncommon formats, too.
This version of Xine may lack certain features because of legal
The libxine1 package may lack certain features because of legal
requirements (potential patent violation). See
http://www.opensuse.org/XINE#Legal_Matters
More information about Xine plug-ins can be found at
http://www.xinehq.de/
http://www.opensuse.org/xine#Legal_Matters
Authors:
--------
Guenter Bartsch <guenter@sourceforge.net>
Guenter Bartsch
%endif
%if %{with esd}
@ -316,53 +302,39 @@ Group: Productivity/Multimedia/Video/Players
Requires: libxine1 = %{version}
%description -n libxine1-esd
Xine is a video player with a graphical front-end that supports a large
number of file formats (VCD and MPEG2, for example) using plug-ins.
Several plug-ins are included. Others can be installed after Xine
installation. Xine supports stereo sound using OSS and AC5.1 using
Alsa.
xine is a free multimedia player. It plays back CDs, DVDs, and VCDs. It
also decodes multimedia files like AVI, MOV, WMV, and MP3 from local
disk drives, and displays multimedia streamed over the Internet. It
interprets many of the most common multimedia formats available - and
some of the most uncommon formats, too.
This version of Xine may lack certain features because of legal
The libxine1 package may lack certain features because of legal
requirements (potential patent violation). See
http://www.opensuse.org/XINE#Legal_Matters
More information about Xine plug-ins can be found at
http://www.xinehq.de/
http://www.opensuse.org/xine#Legal_Matters
Authors:
--------
Guenter Bartsch <guenter@sourceforge.net>
Guenter Bartsch
%endif
%if %{with jack}
%package -n libxine1-jack
License: GPL v2 or later; Public Domain, Freeware
Summary: Video Player with Plug-Ins
Summary: jack plugin for xine
Group: Productivity/Multimedia/Video/Players
Requires: libxine1 = %{version}
%description -n libxine1-jack
Xine is a video player with a graphical front-end that supports a large
number of file formats (VCD and MPEG2, for example) using plug-ins.
Several plug-ins are included. Others can be installed after Xine
installation. Xine supports stereo sound using OSS and AC5.1 using
Alsa.
This version of Xine may lack certain features because of legal
requirements (potential patent violation). See
http://www.opensuse.org/XINE#Legal_Matters
More information about Xine plug-ins can be found at
http://www.xinehq.de/
xine sound output plugin for the jack soundserver
Authors:
--------
Guenter Bartsch <guenter@sourceforge.net>
Guenter Bartsch
%endif
%if %{with directfb}
@ -374,39 +346,34 @@ Group: Productivity/Multimedia/Video/Players
Requires: libxine1 = %{version}
%description -n libxine1-directfb
Xine is a video player with a graphical front-end that supports a large
number of file formats (VCD and MPEG2, for example) using plug-ins.
Several plug-ins are included. Others can be installed after Xine
installation. Xine supports stereo sound using OSS and AC5.1 using
Alsa.
xine is a free multimedia player. It plays back CDs, DVDs, and VCDs. It
also decodes multimedia files like AVI, MOV, WMV, and MP3 from local
disk drives, and displays multimedia streamed over the Internet. It
interprets many of the most common multimedia formats available - and
some of the most uncommon formats, too.
This version of Xine may lack certain features because of legal
The libxine1 package may lack certain features because of legal
requirements (potential patent violation). See
http://www.opensuse.org/XINE#Legal_Matters
More information about Xine plug-ins can be found at
http://www.xinehq.de/
http://www.opensuse.org/xine#Legal_Matters
Authors:
--------
Guenter Bartsch <guenter@sourceforge.net>
Guenter Bartsch
%endif
%if %{with gnome_vfs}
%package -n libxine1-gnome-vfs
License: GPL v2 or later
Summary: Optional Xine plugins
Summary: gnome-vfs plugin for xine
Group: Productivity/Multimedia/Video/Players
Requires: libxine1 = %{version}
Supplements: packageand(gnome-vfs2:libxine1)
%description -n libxine1-gnome-vfs
The package contains less often needed xine plugins with extra
dependencies. For example to use aRts or esd audio output or visual
output via SDL or aalib.
gnome-vfs xine input plugin
@ -420,7 +387,7 @@ Authors:
%package -n libxine1-codecs
License: GPL v2 or later; Public Domain, Freeware
# these libs are possibly illegal and may not work without libdvdcss anyway
Summary: Video Player with Plug-Ins
Summary: additional codecs for xine
Group: Productivity/Multimedia/Video/Players
Requires: libxine1 = %{version}
Obsoletes: xine-mad
@ -436,24 +403,14 @@ Obsoletes: libxine1-w32dll < %{version}-%{release}
Recommends: libdvdcss >= 1.2.6
%description -n libxine1-codecs
Xine is a video player with a graphical front-end that supports a large
number of file formats (VCD and MPEG2, for example) using plug-ins.
Several plug-ins are included. Others can be installed after Xine
installation. Xine supports stereo sound using OSS and AC5.1 using
Alsa.
This version of Xine may lack certain features because of legal
requirements (potential patent violation). See
http://www.opensuse.org/XINE#Legal_Matters
More information about Xine plug-ins can be found at
http://www.xinehq.de/
additional codecs required for xine to be able to play back DVDs, DVB,
DivX etc.
Authors:
--------
Guenter Bartsch <guenter@sourceforge.net>
Guenter Bartsch
%endif
@ -502,6 +459,7 @@ sed -i 's|^noinst_HEADERS = input_vdr.h|xineinclude_HEADERS = input_vdr.h|' src/
# Only apply to uncrippled source
%if !%{with distributable}
%patch80
%patch81 -p1
%endif
%patch72 -p1
%patch73 -p1
@ -828,6 +786,9 @@ rm -rf %{buildroot}
%endif
%changelog
* Wed Sep 17 2008 lnussel@suse.de
- add some more obsoletes/provides for legacy packman packages
- fix build with newer ffmpeg releases
* Thu Sep 04 2008 lnussel@suse.de
- split and rename package to adhere to library package conventions
* Tue Aug 26 2008 lnussel@suse.de