Author: rdieter Update of /cvs/free/rpms/xine-lib-extras-freeworld/F-10 In directory se02.es.rpmfusion.net:/tmp/cvs-serv18076 Modified Files: .cvsignore sources xine-lib-extras-freeworld.spec Added Files: xine-lib-1.1.16-ffmpeg_api.patch Log Message: * Wed Jan 07 2009 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 1.1.16-1 - xine-lib-1.1.16 xine-lib-1.1.16-ffmpeg_api.patch: --- NEW FILE xine-lib-1.1.16-ffmpeg_api.patch --- diff -up xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c.ffmpeg_api xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c --- xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c.ffmpeg_api 2009-01-07 10:14:32.000000000 -0600 +++ xine-lib-1.1.16/src/combined/ffmpeg/ff_audio_decoder.c 2009-01-07 12:04:34.000000000 -0600 @@ -271,7 +271,11 @@ static void ff_audio_decode_data (audio_ * bits/sample for some codecs (e.g. MS ADPCM) */ this->audio_bits = 16; +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) this->context->bits_per_sample = this->audio_bits; +#else + this->context->bits_per_coded_sample = this->audio_bits; +#endif this->context->sample_rate = this->audio_sample_rate; this->context->channels = this->audio_channels; this->context->codec_id = this->codec->id; @@ -329,7 +333,11 @@ static void ff_audio_decode_data (audio_ &decode_buffer_size, &this->buf[0], this->size); +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) this->audio_bits = this->context->bits_per_sample; +#else + this->audio_bits = this->context->bits_per_coded_sample; +#endif this->audio_sample_rate = this->context->sample_rate; this->audio_channels = this->context->channels; if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) diff -up xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c.ffmpeg_api xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c --- xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c.ffmpeg_api 2009-01-07 10:14:32.000000000 -0600 +++ xine-lib-1.1.16/src/combined/ffmpeg/ff_video_decoder.c 2009-01-07 11:58:03.000000000 -0600 @@ -946,7 +946,11 @@ static void ff_handle_header_buffer (ff_ this->context->extradata_size); } +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) this->context->bits_per_sample = this->bih.biBitCount; +#else + this->context->bits_per_coded_sample = this->bih.biBitCount; +#endif } else { Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-10/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Aug 2008 18:13:13 -0000 1.3 +++ .cvsignore 8 Jan 2009 14:48:17 -0000 1.4 @@ -1 +1 @@ -xine-lib-1.1.15.tar.bz2 +xine-lib-1.1.16.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-10/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Aug 2008 18:13:13 -0000 1.3 +++ sources 8 Jan 2009 14:48:17 -0000 1.4 @@ -1 +1 @@ -42a2b4893b7f892eb334de2fc36d49c8 xine-lib-1.1.15.tar.bz2 +acd1a210c5a6444e8fd44696469352bb xine-lib-1.1.16.tar.bz2 Index: xine-lib-extras-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-10/xine-lib-extras-freeworld.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xine-lib-extras-freeworld.spec 25 Sep 2008 12:35:01 -0000 1.7 +++ xine-lib-extras-freeworld.spec 8 Jan 2009 14:48:17 -0000 1.8 @@ -1,7 +1,7 @@ # TODO: # - external dvdnav - not compatible as of 1.1.11 and 4.1.1 -%define abiver 1.24 +%define abiver 1.25 %if 0%{?fedora} > 6 %define _with_external_ffmpeg --with-external-ffmpeg @@ -9,21 +9,26 @@ Name: xine-lib-extras-freeworld Summary: Extra codecs for the Xine multimedia library -Version: 1.1.15 -Release: 4%{?dist} +Version: 1.1.16 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2 -Patch0: xine-lib-1.1.3-optflags.patch -Patch6: xine-lib-1.1.1-deepbind-939.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: xine-lib-1.1.3-optflags.patch +Patch6: xine-lib-1.1.1-deepbind-939.patch +Patch100: xine-lib-1.1.16-ffmpeg_api.patch + BuildRequires: pkgconfig BuildRequires: zlib-devel BuildRequires: gawk -# External libs -%{?_with_external_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804} +%if 0%{?_with_external_ffmpeg:1} +BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804 +# HACKS to workaround missing deps in ffmpeg-devel +# BuildRequires: dirac-devel libraw1394-devel libtheora-devel libvorbis-devel +%endif BuildRequires: a52dec-devel BuildRequires: libmad-devel BuildRequires: libdca-devel @@ -60,9 +65,11 @@ touch -r m4/optimizations.m4 m4/optimizations.m4.stamp %patch0 -p1 -b .optflags touch -r m4/optimizations.m4.stamp m4/optimizations.m4 -# Patch6 needed at least when compiling with external ffmpeg, #939. +# Patch1 needed at least when compiling with external ffmpeg, #939. %patch6 -p1 -b .deepbind +%patch100 -p1 -b .ffmpeg_api + # Avoid standard rpaths on lib64 archs: sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure @@ -109,18 +116,19 @@ rm -rf %{buildroot}%{_libdir}/lib* rm -rf %{buildroot}%{_libdir}/pkgconfig +#xineplug_dmx_mpeg +#xineplug_dmx_mpeg_block +#xineplug_dmx_mpeg_ts +#xineplug_dmx_mpeg_elem +#xineplug_dmx_mpeg_pes +#xineplug_dmx_yuv4mpeg2 + # Plugins - credits go to the SuSE RPM maintainer, congrats cat > plugins << EOF # # libmad and MPEG related plugins xineplug_decode_mad xineplug_decode_mpeg2 -xineplug_dmx_mpeg -xineplug_dmx_mpeg_block -xineplug_dmx_mpeg_ts -xineplug_dmx_mpeg_elem -xineplug_dmx_mpeg_pes -xineplug_dmx_yuv4mpeg2 xineplug_inp_vcd xineplug_inp_vcdo # @@ -177,6 +185,12 @@ %changelog +* Wed Jan 07 2009 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 1.1.16-1 +- xine-lib-1.1.16 + +* Wed Dec 17 2008 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 1.1.15-5 +- ffmpeg bits_per_sample patch + * Thu Sep 25 2008 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 1.1.15-4 - Obsoletes: xine-lib-moles < 1.1.15-2