diff --git a/xine-lib-1.2.10.tar.xz b/xine-lib-1.2.10.tar.xz new file mode 100644 index 0000000..bc07176 --- /dev/null +++ b/xine-lib-1.2.10.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9cb3f069d3c1ffb7456ea91a936a85bbb07ac2ab7be1e9d0d2c94ffe4110dc57 +size 5226116 diff --git a/xine-lib-1.2.9.tar.xz b/xine-lib-1.2.9.tar.xz deleted file mode 100644 index bfc7487..0000000 --- a/xine-lib-1.2.9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32b34e8049feb762d75a551d5d2cdb56c396fdd83e35b9b7de5fd08e498e948d -size 5180452 diff --git a/xine-lib-ImageMagick7.patch b/xine-lib-ImageMagick7.patch deleted file mode 100644 index ba3158b..0000000 --- a/xine-lib-ImageMagick7.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/video_dec/image.c -+++ b/src/video_dec/image.c -@@ -37,7 +37,7 @@ - #define LOG - */ - --#include -+#include - #ifdef PACKAGE_NAME - #undef PACKAGE_BUGREPORT - #undef PACKAGE_NAME diff --git a/xine-lib-a52dec.patch b/xine-lib-a52dec.patch deleted file mode 100644 index cd4d74a..0000000 --- a/xine-lib-a52dec.patch +++ /dev/null @@ -1,16 +0,0 @@ -From: Dave Plater -Date: 2018-01-23 14:27:22 +0200 -Subject: input: Adapt a52_init () to new a52dec api - -xine-lib uses wrong prototype for a52_init. ---- a/src/audio_dec/xine_a52_decoder.c -+++ b/src/audio_dec/xine_a52_decoder.c -@@ -715,7 +715,7 @@ static audio_decoder_t *open_plugin (aud - capabilities themselves? - */ - #warning "Enabling all external liba52 capabilities." -- a52_init (0xFFFFFFFF) -+ a52_init () - #else - a52_init (xine_mm_accel()) - #endif diff --git a/xine-lib-alsa.patch b/xine-lib-alsa.patch deleted file mode 100644 index 5919bfa..0000000 --- a/xine-lib-alsa.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/audio_out/audio_alsa_out.c -+++ b/src/audio_out/audio_alsa_out.c -@@ -44,7 +44,7 @@ - - #define ALSA_PCM_NEW_HW_PARAMS_API - #define ALSA_PCM_NEW_SW_PARAMS_API --#include -+#include - - #include - #include diff --git a/xine-lib-contrib.patch b/xine-lib-contrib.patch deleted file mode 100644 index 8e2bdd4..0000000 --- a/xine-lib-contrib.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/contrib/Makefile.am -+++ b/contrib/Makefile.am -@@ -1,6 +1,13 @@ --SUBDIRS = libmpcdec libxdg-basedir libdca nosefart gsm610 libmad a52dec \ -- libfaad -- -+# one line to simplify further tweaking -+SUBDIRS = \ -+ a52dec \ -+ gsm610 \ -+ libdca \ -+ libfaad \ -+ libmad \ -+ libmpcdec \ -+ libxdg-basedir \ -+ nosefart - - if BUILD_DHA_KMOD - SUBDIRS += libdha diff --git a/xine-lib-theora.patch b/xine-lib-theora.patch index 9da6d2f..2f34da7 100644 --- a/xine-lib-theora.patch +++ b/xine-lib-theora.patch @@ -1,11 +1,13 @@ ---- a/src/xine-engine/buffer_types.c -+++ b/src/xine-engine/buffer_types.c -@@ -586,6 +586,8 @@ static const video_db_t video_db[] = { - }, - { - { -+ ME_FOURCC('t','h','e','o'), -+ ME_FOURCC('T','H','E','O'), - 0, - }, - BUF_VIDEO_THEORA, +Index: xine-lib-1.2.10/src/xine-engine/buffer_types.c +=================================================================== +--- xine-lib-1.2.10.orig/src/xine-engine/buffer_types.c 2020-01-25 12:58:18.799239039 +0200 ++++ xine-lib-1.2.10/src/xine-engine/buffer_types.c 2020-01-25 13:10:17.475944459 +0200 +@@ -248,6 +248,8 @@ static const uint32_t sorted_video_4ccs[ + BE_FOURCC('S', 'N', 'O', 'W'), BUF_VIDEO_SNOW, + BE_FOURCC('S', 'V', 'Q', '1'), BUF_VIDEO_SORENSON_V1, + BE_FOURCC('S', 'V', 'Q', '3'), BUF_VIDEO_SORENSON_V3, ++ BE_FOURCC('t', 'h', 'e', 'o'), BUF_VIDEO_THEORA, ++ BE_FOURCC('T', 'H', 'E', 'O'), BUF_VIDEO_THEORA, + BE_FOURCC('T', 'M', '2', '0'), BUF_VIDEO_DUCKTM2, + BE_FOURCC('U', '2', '6', '3'), BUF_VIDEO_H263, + BE_FOURCC('U', 'C', 'O', 'D'), BUF_VIDEO_UCOD, diff --git a/xine-lib-v4l-2.6.38.patch b/xine-lib-v4l-2.6.38.patch index b3348ea..69db4d3 100644 --- a/xine-lib-v4l-2.6.38.patch +++ b/xine-lib-v4l-2.6.38.patch @@ -1,6 +1,8 @@ ---- a/m4/input.m4 -+++ b/m4/input.m4 -@@ -97,7 +97,7 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ +Index: xine-lib-1.2.10/m4/input.m4 +=================================================================== +--- xine-lib-1.2.10.orig/m4/input.m4 2019-12-13 22:47:50.000000000 +0200 ++++ xine-lib-1.2.10/m4/input.m4 2020-01-25 12:34:03.983185893 +0200 +@@ -105,7 +105,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.]) ---- a/src/input/input_v4l.c -+++ b/src/input/input_v4l.c +Index: xine-lib-1.2.10/src/input/input_v4l.c +=================================================================== +--- xine-lib-1.2.10.orig/src/input/input_v4l.c 2019-12-13 22:47:50.000000000 +0200 ++++ xine-lib-1.2.10/src/input/input_v4l.c 2020-01-25 12:34:03.983185893 +0200 @@ -47,7 +47,7 @@ */ #define _LINUX_TIME_H diff --git a/xine-lib.changes b/xine-lib.changes index 81a6a0e..23682fa 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,3 +1,63 @@ +------------------------------------------------------------------- +Sun Jan 26 14:11:29 UTC 2020 - Dave Plater + +- Update to version 1.2.10 and remove incorporated patches: + xine-lib-contrib.patch, xine-lib-alsa.patch, xine-lib-a52dec.patch + and xine-lib-ImageMagick7.patch. +- Upstream changes: + *Add (xcb)xv yuy2 emulation. + *Add libavcodec v58 compatibility. + *Add avio seek support. + *Add libdav1d, libaom and lavc AV1 video decoders. + *Add libvpx multithreading. + *Add libpng decoder. + *Add a52 double and fixed point modes. + *Add Opus audio support to ogg demuxer. + *Add AV1 video support to matroska demuxer. + *Add ivf demuxer. + *Add mpeg-ts split payload support. + *Add TLS support using gnutls or OpenSSL. + *Add ftp input plugin (ftp://) with TLS support (ftpes://) + *Add tls:// input plugin (raw TLS over TCP). + *Add libnfs NFS input plugin. + *Add ftp/http seek support. + *Add scp forward seek support. + *Add mp4 http streaming support (plain and fragment modes). + *Add HLS streaming support. + *Add HTTP 1.1 support. + *Add OpenGL EGL and Wayland support. + *Add side stream feature. + *Optimize OSD. + *Optimize output layers. + *Optimize decoder threads. + *Optimize event handling. + *Optimize stream info. + *Optimize TCP/TLS/HTTP network input. + *Optimize network buffering control. + *Alsa/oss startup optimization. + *Optimize input_stdin_fifo. + *Optimize internal liba52. + *Optimize user seek. + *Better support for audio out drivers that cannot resume after pause. + *Better support for mpeg pts jumps. + *Better bluray seek. + *XML parser fixes. + *Fix midstream audio mode switch. + *Fix FLAC audio playback via ffmpeg. + *Fix ffmpeg mpeg1/2 video. + *Fix/optimize mpeg, mpeg-ts, qt, flv, matroska, real & asf demuxers. + *Fix network seek. + *Fix/optimize audio CD. + *Fix DVD (occasional crashes, damaged video after a DVD had been + played). + *Fix opengl2 freeze after X server failure. + *Fix tvtime deinterlacer crash. + *Fix/optimize overlay. + *Fix/optimize old VDR plugin. + *Fix xine-ui freeze when opening a playlist while paused. + *Security fixes. + *More error handling instead of aborting. + ------------------------------------------------------------------- Sat Apr 13 20:02:32 UTC 2019 - olaf@aepfle.de diff --git a/xine-lib.spec b/xine-lib.spec index 13d4287..e6535a3 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -54,6 +54,7 @@ BuildRequires: libtool BuildRequires: libv4l-devel >= 0.8.4 BuildRequires: libvorbis-devel BuildRequires: lirc-devel +BuildRequires: perl BuildRequires: readline-devel BuildRequires: speex-devel BuildRequires: update-desktop-files @@ -92,9 +93,9 @@ BuildRequires: SDL-devel BuildRequires: libjack-devel %endif BuildRequires: libmodplug-devel -Version: 1.2.9 +Version: 1.2.10 Release: 0 -%define abiversion 2.7 +%define abiversion 2.8 Summary: Video Player with Plug-Ins License: GPL-2.0-or-later AND SUSE-Public-Domain Group: Productivity/Multimedia/Video/Players @@ -106,8 +107,8 @@ Source1: baselibs.conf Patch0: xine-lib-libdvdread_udf.diff Patch1: xine-lib-v4l-2.6.38.patch -Patch2: xine-lib-contrib.patch -Patch3: xine-lib-alsa.patch +#Patch2: xine-lib-contrib.patch +#Patch3: xine-lib-alsa.patch # Add theora FOURCC to libxine I found an avi container that xine wouldn't play. Patch4: xine-lib-theora.patch # This should be fixed upstream, but this patch will not work for them. @@ -115,9 +116,9 @@ Patch4: xine-lib-theora.patch # include wand/MagickWand.h for ImageMagick-6 and MagickWand/MagickWand.h for # ImageMagick-7. Including wand/MagickWand.h will work for us also for # ImageMagick-7, because we package wand/ symlink to ./MagickWand/MagickWand.h -Patch8: xine-lib-ImageMagick7.patch +#Patch8: xine-lib-ImageMagick7.patch # PATCH-FIX-UPSTREAM xine-lib-a52dec.patch davejplater@gmail.com -- Change in a52dec api. -Patch6: xine-lib-a52dec.patch +#Patch6: xine-lib-a52dec.patch %description

Great video and multimediaplayer, supports DVD, MPEG, AVI, DivX, VCD, Quicktime ...

You need a frontend for xine-lib like xine-ui, gxine, kaffeine or totem.

Since 1-rc6 the package number is reduced, all you may miss, is in the base package

If you want to play css encrypted Video-DVD's, you need to install libdvdcss.

@@ -394,20 +395,19 @@ EOF # NOTE: the perl do_nukeentry has stopped working with the latest perl # I've left it here hoping someone will fix it. Thanks # Don't forget to remove xine-lib-nukefaadetc.patch when the perl scripts are functioning again. -%if 1 == 0 + 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 } -%else -do_nukeentry() { + +do_nukeentrynp() { for i in ${2};do cat ${1}|grep -v ${i} >${1}n;mv ${1}n ${1} done } -%endif # $1: files $2: entries $3: prefix $4: postfix do_nukeline() { for d in $1 ; do @@ -427,10 +427,11 @@ popd >/dev/null # combined/ffmpeg echo 1>&2 "Crippling..." -c_subdirs="faad planar dxr3 asf dmx_video libdts libfaad libffmpeg libspucc libspudec libspudvb libw32dll input/vcd" +c_subdirs="faad planar dxr3 asf dmx_video libdts libfaad libffmpeg libspucc libspudec libspudvb libw32dll" c_demuxers="group_video.c demux_elem.c 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_input="xineplug_inp_mms.la input_mms.c mms.c mmsh.c ../demuxers/asfheader.c mms.h mmsh.h" c_libxineadec="xineplug_decode_gsm610.la xineplug_decode_nsf.la gsm610.c nsf.c gsm610 nosefart" +c_post="planar pp_module PLANAR" do_nukeentry src/Makefile.am "$c_subdirs" do_nukeentry configure.ac "$c_subdirs" "src/" "/[a-zA-Z0-9_./]*Makefile" @@ -445,9 +446,9 @@ do_remove src/input "$c_input" #do_remove src/audio_dec "$c_audiodec" #do_nukeentry src/combined/Makefile.am "ffmpeg" #do_remove src/combined "ffmpeg" -do_nukeentry src/post/Makefile.am "planar" +do_nukeentrynp src/post/Makefile.am "$c_post" #do_nukeline src/post/planar/planar.c "pp_init_plugin pp_special_info" -do_remove src/post/planar "*" +do_remove src/post "planar" sed -i 's@libfaad@@g' contrib/Makefile.am %endif @@ -460,10 +461,13 @@ test -x "$(type -p gcc-7)" && export CC="$_" test -x "$(type -p gcc-8)" && export CC="$_" echo 'AC_DEFUN([AC_REQUIRE_AUX_FILE])dnl' >> acinclude.m4 -if [ ! -f configure ]; then - NO_CONFIGURE=1 ./autogen.sh -fi -AUTOPOINT=true autoreconf -fi +#rm -f configure +#if [ ! -f configure ]; then +./autogen.sh noconfig +#else +#AUTOPOINT=true autoreconf -fi +#fi + %configure \ --disable-rpath \ --docdir=%{_defaultdocdir}/xine \ @@ -480,6 +484,8 @@ AUTOPOINT=true autoreconf -fi --disable-vdpau \ --disable-dxr3 \ --disable-asf \ +%else + --enable-dxr3 \ %endif %ifarch %{ix86} --with-w32-path=/usr/lib/win32 \ @@ -504,14 +510,21 @@ rm -f files %ifarch %{ix86} mkdir -p %{buildroot}/usr/lib/win32 %endif +%if %{with distributable} +rm -rf %{buildroot}%{_libdir}/xine/plugins/%{abiversion}/post +rm -f %{buildroot}%{_libdir}/xine/plugins/%{abiversion}/xineplug_dmx_video.so +%endif # # big plugin sorting -# + # cat > plugins << EOF # these plugins do not have legal problems +xineplug_tls_gnutls xineplug_ao_out_alsa xineplug_ao_out_oss xineplug_vo_out_fb +xineplug_vo_gl_egl_x11 +xineplug_vo_gl_glx xineplug_vo_out_opengl xineplug_vo_out_opengl2 xineplug_vo_out_xshm @@ -523,6 +536,7 @@ xineplug_decode_mad xineplug_decode_a52 %if %{without distributable} xineplug_vo_out_vdpau +xineplug_vo_gl_egl_wl %endif xineplug_inp_dvb xineplug_inp_dvd @@ -535,6 +549,7 @@ xineplug_inp_pvr xineplug_inp_rtp #New in 1.2.7 xineplug_decode_rawvideo +xineplug_decode_libpng %if %{without distributable} xineplug_decode_vdpau post/xineplug_post_audio_filters @@ -625,9 +640,7 @@ xineplug_decode_gsm610 xineplug_decode_qt xineplug_decode_w32dll %endif -xineplug_decode_dxr3_video -xineplug_vo_out_dxr3 -xineplug_decode_dxr3_spu +xineplug_dxr3 xineplug_vo_out_vaapi # unfortunately using external ffmpeg links the planar post # processing plugin against ffmpeg libs @@ -663,9 +676,6 @@ rm -f %{buildroot}%{_libdir}/libxine* %endif rm -rf %{buildroot}%{_mandir}/man5 -%clean -rm -rf %{buildroot} - %if %{without onlynondistributable} %post -n libxine2 -p /sbin/ldconfig