diff --git a/xine-lib-1.2.8.tar.xz b/xine-lib-1.2.8.tar.xz deleted file mode 100644 index 66db392..0000000 --- a/xine-lib-1.2.8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f1b299a71dcae075bf6792e7b5a2020ed5ac8c46ad5091e004ce266aac40e8a6 -size 5151580 diff --git a/xine-lib-1.2.9.tar.xz b/xine-lib-1.2.9.tar.xz new file mode 100644 index 0000000..bfc7487 --- /dev/null +++ b/xine-lib-1.2.9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32b34e8049feb762d75a551d5d2cdb56c396fdd83e35b9b7de5fd08e498e948d +size 5180452 diff --git a/xine-lib-a52dec.patch b/xine-lib-a52dec.patch new file mode 100644 index 0000000..89c29b6 --- /dev/null +++ b/xine-lib-a52dec.patch @@ -0,0 +1,13 @@ +Index: src/audio_dec/xine_a52_decoder.c +=================================================================== +--- src/audio_dec/xine_a52_decoder.c.orig 2018-01-11 14:49:47.000000000 +0200 ++++ src/audio_dec/xine_a52_decoder.c 2018-01-23 11:15:30.340612335 +0200 +@@ -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.spec b/xine-lib.spec index 7e8d0b6..8224ab9 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -29,20 +29,21 @@ Name: xine-lib %if 0%{?suse_version} > 1320 BuildRequires: gcc %else -# Leap 42.2+ / SLE12SP2Backports -%if 0%{?sle_version} == 120200 -BuildRequires: gcc6 +# Leap 42.3+ +%if 0%{?leap_version} >= 420300 +BuildRequires: cpp7 +BuildRequires: gcc7 #!Buildignore: libgcc_s1 %else -# Leap 42.1 +# Leap 42.2 BuildRequires: gcc5 %endif %endif %bcond_without ffmpeg -%bcond_with sdl +%bcond_without sdl %bcond_with aalib %bcond_with esd -%bcond_with jack +%bcond_without jack %bcond_without gnome_vfs %bcond_with directfb # @@ -72,6 +73,8 @@ BuildRequires: vcdimager-devel BuildRequires: pkgconfig(dvdnav) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(liba52) +BuildRequires: pkgconfig(mad) BuildRequires: pkgconfig(vpx) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb-shape) @@ -95,7 +98,6 @@ BuildRequires: libfaad-devel BuildRequires: pkgconfig(libdts) BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(libva-glx) -BuildRequires: pkgconfig(mad) BuildRequires: pkgconfig(vdpau) %endif BuildRequires: libpulse-devel @@ -119,9 +121,9 @@ BuildRequires: libjack-devel BuildRequires: DirectFB-devel %endif BuildRequires: libmodplug-devel -Version: 1.2.8 +Version: 1.2.9 Release: 0 -%define abiversion 2.6 +%define abiversion 2.7 Summary: Video Player with Plug-Ins License: GPL-2.0+ and SUSE-Public-Domain Group: Productivity/Multimedia/Video/Players @@ -144,6 +146,8 @@ Patch4: xine-lib-theora.patch # 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 +# PATCH-FIX-UPSTREAM xine-lib-a52dec.patch davejplater@gmail.com -- Change in a52dec api. +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.
@@ -539,21 +543,20 @@ popd >/dev/null # 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_subdirs="dxr3 libdts libfaad libffmpeg libmpeg2 libspucc libspudec libspudvb libw32dll input/vcd" +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_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/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/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" @@ -578,18 +581,18 @@ rm -rf src/combined/ffmpeg configure %patch3 %endif %patch4 -#%%patch6 -p1 +%patch6 %patch8 -p1 rm -f m4/libtool15.m4 sed -i -e 's|/tmp/vdr-xine|/var/lib/vdr-xine|g' src/vdr/input_vdr.c %build -export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fno-force-addr `pkg-config --cflags smbclient`" +export CFLAGS="%{optflags} -fno-strict-aliasing -fno-force-addr `pkg-config --cflags smbclient`" export CCASFLAGS=-Wa,--noexecstack test -x "$(type -p gcc-5)" && export CC=gcc-5 -test -x "$(type -p gcc-6)" && export CC=gcc-6 test -x "$(type -p gcc-7)" && export CC=gcc-7 +test -x "$(type -p cpp-7)" && export CPP=cpp-7 echo 'AC_DEFUN([AC_REQUIRE_AUX_FILE])dnl' >> acinclude.m4 # # hack for sles10 ## rm m4/gettext.m4 m4/intl.m4 @@ -615,8 +618,6 @@ AUTOPOINT=true autoreconf -fi %endif %if %{with distributable} --disable-faad \ - --disable-mad \ - --disable-a52dec \ --disable-vdpau \ --disable-dxr3 \ --disable-asf \ @@ -659,6 +660,8 @@ xineplug_vo_out_xv xineplug_vo_out_xcbshm xineplug_vo_out_xcbxv xineplug_vo_out_raw +xineplug_decode_mad +xineplug_decode_a52 %if !%{with distributable} xineplug_vo_out_vdpau %endif @@ -666,12 +669,9 @@ xineplug_inp_dvb xineplug_inp_dvd xineplug_inp_v4l xineplug_inp_v4l2 -xineplug_inp_http -xineplug_inp_net -xineplug_inp_pnm +xineplug_inp_network xineplug_inp_cdda xineplug_inp_smb -xineplug_inp_rtsp xineplug_inp_pvr xineplug_inp_rtp #New in 1.2.7 @@ -755,13 +755,11 @@ xineplug_vo_out_xdirectfb # .codecs # libmad and MPEG related plugins -xineplug_decode_mad xineplug_decode_spudvb xineplug_inp_vcd xineplug_inp_vcdo xineplug_decode_mpeg2 # these plugins do have legal problems -xineplug_decode_a52 xineplug_decode_dts xineplug_decode_faad xineplug_decode_ff