Hello community, here is the log from the commit of package xine-lib for openSUSE:Factory checked in at 2017-05-27 13:12:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xine-lib (Old) and /work/SRC/openSUSE:Factory/.xine-lib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xine-lib" Sat May 27 13:12:57 2017 rev:66 rq:486896 version:1.2.8 Changes: -------- --- /work/SRC/openSUSE:Factory/xine-lib/xine-lib.changes 2017-04-03 11:05:15.338430752 +0200 +++ /work/SRC/openSUSE:Factory/.xine-lib.new/xine-lib.changes 2017-05-27 13:12:58.773188069 +0200 @@ -1,0 +2,55 @@ +Sun Apr 9 14:25:06 UTC 2017 - [email protected] + +- Update to release 1.2.8 +- Remove patches fixed upstream: + xine-lib-crippled-ffmpeg3.0.patch, xine-lib-ffmpeg3.0.patch and + xine-lib-link-xcb.patch. +- Removed precheckin_cripple_tarball.sh and integrated it into the + spec file. +- Upstream changes: + * Add HEVC to QT demuxer. + * Add libOpenHEVC decoder. + * Add h.265/HEVC decoding to VAAPI. + * Detach VAAPI video out from ffmpeg. + * VAAPI fixes. + * Improved Matroska compatibility (TrueHD and PCM sound, + HDMV/Text subtitles). + * Add faad LATM support. + * Add faad preamp gain control and channel mixer. + * Update/fix internal libfaad. + * Integrate 6 basic plugins into libxine. + * ffmpeg fixes and optimizations. + * Use external libdvdnav by default. + * Optimize video out. + * AVFormat demuxer fixes. + * (XCB)XV video out fixes. + * Lots of small fixes and optimizations. + * Build fixes (newer automake, xcb, libdvdcss, dxr3, make dist, + 32+64bit dual install, gcc 4.x with GNU ld 2.26 ...). + * Better C++ compatibility. + * Add support for avi WAVE_FORMAT_EXTENSIBLE. + * Add "Time Domain Audio Analyzer" Visualization Post Plugin. + * Add support for compressed HDMV PGS subtitles in Matroska. + * Add HW accelerated OSD for Raspberry Pi. + * Add simple deep color (9/10bit) support via ffmpeg. + * Join 15 video demuxers into a single multiplugin lib. + * Join 5 vdpau decoders into a single multiplugin lib. + * Join 3 raw video decoders into a single multiplugin lib. + * Make ffmpeg/postproc optional. + * Log individual items when loading multiplugin libs. + * Improved qt/mp4 edit list handling. + * Detect mp3 files with large id3v2 tags. + * Auto recover from temporary DVB signal loss. + * Fix demuxing low framerate mp4. + * DVB AAC sound compatibility fix. + * ffmpeg audio downmix level fix and optimization. + * ffmpeg multithreading fixes. + * ffmpeg compatibility fixes. + * BluRay subtitle fixes. + * Various small fixes. + * OpenGL(2) video out fixes and optimizations. + * Fix some issues with heavy stream seeking. + * Build fixes, including missing vcd libs and much less warnings. + * Code simplifications. + +------------------------------------------------------------------- Old: ---- precheckin_cripple_tarball.sh xine-lib-1.2.6-crippled.tar.xz xine-lib-1.2.6.tar.xz xine-lib-crippled-ffmpeg3.0.patch xine-lib-ffmpeg3.0.patch xine-lib-link-xcb.patch New: ---- xine-lib-1.2.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xine-lib.spec ++++++ --- /var/tmp/diff_new_pack.AmqGvM/_old 2017-05-27 13:12:59.609069892 +0200 +++ /var/tmp/diff_new_pack.AmqGvM/_new 2017-05-27 13:12:59.613069326 +0200 @@ -77,6 +77,8 @@ BuildRequires: update-desktop-files BuildRequires: vcdimager-devel BuildRequires: xorg-x11-devel +BuildRequires: pkgconfig(dvdnav) +BuildRequires: pkgconfig(vpx) %if %{with ffmpeg} BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) @@ -119,34 +121,25 @@ %if %{with modplug} BuildRequires: libmodplug-devel %endif -Version: 1.2.6 +Version: 1.2.8 Release: 0 -%define abiversion 2.5 +%define abiversion 2.6 Summary: Video Player with Plug-Ins License: GPL-2.0+ and SUSE-Public-Domain Group: Productivity/Multimedia/Video/Players -Url: http://www.xine-project.org/home +Url: https://www.xine-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %{with distributable} -Source: xine-lib-%{version}-crippled.tar.xz -%else -Source: http://downloads.sourceforge.net/project/xine/xine-lib/%{version}/xine-lib-%{version}.tar.xz -%endif +Source: http://sourceforge.net/projects/xine/files/%{name}/%{version}/%{name}-%{version}.tar.xz Source1: baselibs.conf -Source99: precheckin_cripple_tarball.sh Patch0: xine-lib-libdvdread_udf.diff Patch1: xine-lib-v4l-2.6.38.patch # PATCH allow ffmpeg in openSUSE versions that have ffmpeg and still use the crippled tar ball to build with ffmpeg3. -Patch7: xine-lib-crippled-ffmpeg3.0.patch Patch2: xine-lib-without-ffmpeg.patch -Patch5: xine-lib-ffmpeg3.0.patch Patch3: fix-non-x86-build.diff # Add theora FOURCC to libxine I found an avi container that xine wouldn't play. Patch4: xine-lib-theora.patch -# PATCH-FIX-UPSTREAM xine-lib-link-xcb.patch https://bugs.xine-project.org/show_bug.cgi?id=573 [email protected] -- Look for xcb, not xcb-shape -Patch6: xine-lib-link-xcb.patch # This should be fixed upstream, but this patch will not work for them. # wand/magick_wand.h is already deprecated even in ImageMagick-6; package should # include wand/MagickWand.h for ImageMagick-6 and MagickWand/MagickWand.h for @@ -523,23 +516,74 @@ +++++++++++++++++++++++++' EOF %setup -q -%patch0 -p1 +%if %{with distributable} +# Taken from precheckin_cripple_tarball.sh +# $1: files $2: entries $3: prefix $4: postfix +do_nukeentry() { +for d in $1 ; do + perl -i -e 'undef $/; $_=<>; for $e (qw|'"$2"'|) { s|(?<=[^-a-zA-Z0-9_./])'"$3"'$e'"$4"'(?=[^-a-zA-Z0-9_./])||g }; print' $d +done +} + +# $1: files $2: entries $3: prefix $4: postfix +do_nukeline() { +for d in $1 ; do + perl -i -e 'undef $/; $_=<>; for $e (qw|'"$2"'|) { s|^.*(?<=[^-a-zA-Z0-9_./])'"$3"'$e'"$4"'(?=[^-a-zA-Z0-9_./]).*$||mg }; print' $d +done +} + +# $1: dir $2: files/dirs +do_remove() { +pushd "$1" >/dev/null || exit 1 +rm -rf $2 +popd >/dev/null +} + +# Cripple source +# +# combined/ffmpeg +echo 1>&2 "Crippling..." + +c_subdirs="dxr3 liba52 libdts libfaad libffmpeg libmad libmpeg2 libspucc libspudec libspudvb libw32dll input/vcd" +c_demuxers="xineplug_dmx_asf.la asfheader.h asfheader.c demux_asf.c xineplug_dmx_mpeg.la demux_mpeg.c xineplug_dmx_mpeg_block.la demux_mpeg_block.c xineplug_dmx_mpeg_ts.la demux_ts.c xineplug_dmx_mpeg_elem.la demux_elem.c xineplug_dmx_mpeg_pes.la demux_mpeg_pes.c xineplug_dmx_yuv4mpeg2.la demux_yuv4mpeg2.c" +c_input="xineplug_inp_mms.la input_mms.c mms.c mmsh.c ../demuxers/asfheader.c mms.h mmsh.h xineplug_inp_vcdo.la input_vcd.c vcd" +c_libxineadec="xineplug_decode_gsm610.la xineplug_decode_nsf.la gsm610.c nsf.c gsm610 nosefart" +c_audiodec="xineplug_decode_a52.la xineplug_decode_mad.la xine_a52_decoder.c xine_mad_decoder.c" + +do_nukeentry src/Makefile.am "$c_subdirs" +do_nukeentry configure.ac "$c_subdirs" "src/" "/[a-zA-Z0-9_./]*Makefile" +do_remove src "$c_subdirs" +#do_nukeentry src/demuxers/Makefile.am "$c_demuxers" +#do_remove src/demuxers "$c_demuxers" +do_nukeentry src/input/Makefile.am "$c_input" +do_remove src/input "$c_input" +do_nukeentry src/audio_dec/Makefile.am "$c_audiodec" +do_remove src/audio_dec "$c_audiodec" +#do_nukeentry src/combined/Makefile.am "ffmpeg" +#do_remove src/combined "ffmpeg" +do_nukeentry src/post/planar/Makefile.am "pp\.c \S*/libpostproc/libpostprocess\.la" +do_nukeline src/post/planar/planar.c "pp_init_plugin pp_special_info" +do_remove src/post/planar "pp.c" + +%endif + +%patch0 -p0 %patch1 %if %{with distributable} && %{with ffmpeg} -%patch7 +#%%patch7 %else %if !%{with ffmpeg} %patch2 rm -rf src/combined/ffmpeg configure %else -%patch5 +#%%patch5 %endif %endif %ifnarch %ix86 x86_64 %patch3 %endif %patch4 -%patch6 -p1 +#%%patch6 -p1 %patch8 -p1 rm -f m4/libtool15.m4 @@ -582,11 +626,14 @@ --disable-a52dec \ --disable-vdpau \ --disable-dxr3 \ + --disable-asf \ %endif %ifarch %{ix86} --with-w32-path=/usr/lib/win32 \ %endif - --with-pic + --with-pic \ + --with-external-dvdnav +# --disable-libxine-builtins # --with-install-plugins-helper=${_prefix}/lib/opensuse-codecs-installer echo $CFLAGS make %{?jobs:-j%{jobs}} V=1 @@ -600,6 +647,7 @@ rm %{buildroot}%{_defaultdocdir}/xine/README.{irix,solaris,WIN32} # remove .la files, they are evil rm %{buildroot}%{_libdir}/*.la +rm -f files %ifarch %{ix86} mkdir -p %{buildroot}/usr/lib/win32 %endif @@ -609,11 +657,8 @@ cat > plugins << EOF # these plugins do not have legal problems xineplug_ao_out_alsa -xineplug_ao_out_file -xineplug_ao_out_none xineplug_ao_out_oss xineplug_vo_out_fb -xineplug_vo_out_none xineplug_vo_out_opengl xineplug_vo_out_opengl2 xineplug_vo_out_xshm @@ -628,20 +673,21 @@ xineplug_inp_dvd xineplug_inp_v4l xineplug_inp_v4l2 -xineplug_inp_file xineplug_inp_http xineplug_inp_net xineplug_inp_pnm xineplug_inp_cdda xineplug_inp_smb -xineplug_inp_stdin_fifo xineplug_inp_rtsp xineplug_inp_pvr xineplug_inp_rtp -xineplug_inp_test -xineplug_decode_bitplane -xineplug_decode_rgb -xineplug_decode_yuv +#New in 1.2.7 +xineplug_decode_rawvideo +%if !%{with distributable} +xineplug_decode_vdpau +%endif +xineplug_dmx_video +#end new xineplug_decode_lpcm xineplug_decode_real xineplug_decode_mpc @@ -649,27 +695,18 @@ xineplug_decode_spucmml xineplug_decode_spuhdmv xineplug_decode_libjpeg -# requires ImageMagick xineplug_decode_image -xineplug_dmx_yuv_frames -xineplug_dmx_real +xineplug_decode_libvpx xineplug_dmx_audio -xineplug_dmx_iff -xineplug_dmx_avi -xineplug_dmx_flv xineplug_dmx_image -xineplug_dmx_matroska xineplug_dmx_fli xineplug_dmx_nsv xineplug_dmx_mng xineplug_dmx_pva -xineplug_dmx_qt -xineplug_dmx_rawdv xineplug_dmx_games xineplug_dmx_slave xineplug_dmx_modplug xineplug_dmx_playlist -xineplug_dmx_vc1_es xineplug_flac xineplug_sputext xineplug_xiph @@ -730,13 +767,6 @@ xineplug_inp_vcd xineplug_inp_vcdo xineplug_decode_mpeg2 -#xineplug_decode_mpeg2new -xineplug_dmx_mpeg -xineplug_dmx_mpeg_block -xineplug_dmx_mpeg_ts -xineplug_dmx_mpeg_elem -xineplug_dmx_mpeg_pes -xineplug_dmx_yuv4mpeg2 # these plugins do have legal problems xineplug_decode_a52 xineplug_decode_dts @@ -761,11 +791,6 @@ xineplug_decode_dxr3_video xineplug_vo_out_dxr3 xineplug_decode_dxr3_spu -xineplug_decode_vdpau_h264 -xineplug_decode_vdpau_h264_alter -xineplug_decode_vdpau_mpeg12 -xineplug_decode_vdpau_mpeg4 -xineplug_decode_vdpau_vc1 xineplug_vo_out_vaapi # unfortunately using external ffmpeg links the planar post # processing plugin against ffmpeg libs ++++++ xine-lib-1.2.6-crippled.tar.xz -> xine-lib-1.2.8.tar.xz ++++++ ++++ 257730 lines of diff (skipped) ++++++ xine-lib-libdvdread_udf.diff ++++++ --- /var/tmp/diff_new_pack.AmqGvM/_old 2017-05-27 13:13:01.260836364 +0200 +++ /var/tmp/diff_new_pack.AmqGvM/_new 2017-05-27 13:13:01.260836364 +0200 @@ -5,10 +5,11 @@ # 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 @@ +Index: src/input/libdvdnav/dvd_udf.c +=================================================================== +--- src/input/libdvdnav/dvd_udf.c.orig 2017-02-21 13:13:13.000000000 +0200 ++++ src/input/libdvdnav/dvd_udf.c 2017-04-09 12:18:04.684166526 +0200 +@@ -38,10 +38,16 @@ #include <sys/stat.h> #include <unistd.h> #include <inttypes.h> @@ -18,13 +19,14 @@ #include "dvd_reader.h" #include "dvd_udf.h" -+ + +#include "ifo_types.h" +#include "ifo_read.h" - ++ /* Private but located in/shared with dvd_reader.c */ 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, +@@ -779,7 +785,9 @@ static int UDFFindPartition( dvd_reader_ return part->valid; } @@ -35,7 +37,7 @@ uint32_t *filesize ) { uint8_t LogBlock_base[ DVD_VIDEO_LB_LEN + 2048 ]; -@@ -856,6 +864,84 @@ uint32_t UDFFindFile( dvd_reader_t *devi +@@ -861,6 +869,84 @@ uint32_t UDFFindFile( dvd_reader_t *devi return partition.Start + File.Location; } ++++++ xine-lib-v4l-2.6.38.patch ++++++ --- /var/tmp/diff_new_pack.AmqGvM/_old 2017-05-27 13:13:01.276834102 +0200 +++ /var/tmp/diff_new_pack.AmqGvM/_new 2017-05-27 13:13:01.276834102 +0200 @@ -1,6 +1,8 @@ ---- m4/input.m4 2014-02-26 16:49:10.000000000 +0100 -+++ m4/input.m4 2014-04-11 23:22:34.923765318 +0200 -@@ -96,7 +96,7 @@ +Index: m4/input.m4 +=================================================================== +--- m4/input.m4.orig 2017-02-21 13:13:13.000000000 +0200 ++++ m4/input.m4 2017-04-09 12:27:06.317839771 +0200 +@@ -96,7 +96,7 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ XINE_ARG_ENABLE([v4l], [Enable Video4Linux support]) if test x"$enable_v4l" != x"no"; then have_v4l=yes @@ -9,8 +11,10 @@ AC_CHECK_HEADERS([asm/types.h]) if test x"$hard_enable_v4l" = x"yes" && test x"$have_v4l" != x"yes"; then AC_MSG_ERROR([Video4Linux support requested, but prerequisite headers not found.]) ---- src/input/input_v4l.c 2014-03-11 14:28:30.000000000 +0100 -+++ src/input/input_v4l.c 2014-04-11 23:22:34.926765238 +0200 +Index: src/input/input_v4l.c +=================================================================== +--- src/input/input_v4l.c.orig 2017-02-21 13:13:13.000000000 +0200 ++++ src/input/input_v4l.c 2017-04-09 12:27:06.317839771 +0200 @@ -47,7 +47,7 @@ */ #define _LINUX_TIME_H
