Accepting request 568572 from home:plater

- Update to release 1.2.9 and add xine-lib-a52dec.patch.
- Moved xineplug_decode_mad and xineplug_decode_a52 into the main
  package as they are now unrestricted.
- Enabled sdl and jack subpackages.
- Upstream changes:
 * Add LIBXINE_VERBOSITY environment var override.
 * Add auto gapless switch. Play clips to their very end when that
   is likely what the user wants.
 * Add video single step feature.
 * Add generic keyframe index feature.
 * Add x32 (x86 32 on 64bit) support.
 * Add some more debug logging.
 * Join 4 network input plugins into a single file.
 * Matroska fixes.
 * Build fixes.
 * Directx2 audio fixes.
 * VAAPI fixes.
 * XCB video fixes and optimizations.
 * Return driver held video frames on shutdown properly.
 * FAAD audio compatibility fixes.
 * Fix VP9 playback.
 * Fix post filtering crash.
 * Make xml parser thread safe.
 * More user configuration safety.
 * Inline assembly fixes.
 * Failed memory allocation safety fixes.
 * Memory leak fixes.
 * Debug and LOG build fixes.
 * Again, lots of small fixes and optimizations.
 * Better multiengine client safety.
 * Hide yuv2rgb implementation details.
 * Use a single libyuv2rgb copy in both engine and plugins.
 * Minor ffmpeg optimization.
 * Lift a few video engine handbrakes. Less CPU load, fewer frame
   drops, faster seeking.
 * Optimize audio engine.
 * Optimize demux buffering system.
 * Optimize metronom clock.
 * Optimize port tickets.
 * Optimize sse/mmx2 memcpy.
 * Code simplification and cleanup.
 * Update german translation. * Add LIBXINE_VERBOSITY environment var override.
 * Add auto gapless switch. Play clips to their very end when that
   is likely what the user wants.
 * Add video single step feature.
 * Add generic keyframe index feature.
 * Add x32 (x86 32 on 64bit) support.
 * Add some more debug logging.
 * Join 4 network input plugins into a single file.
 * Matroska fixes.
 * Build fixes.
 * Directx2 audio fixes.
 * VAAPI fixes.
 * XCB video fixes and optimizations.
 * Return driver held video frames on shutdown properly.
 * FAAD audio compatibility fixes.
 * Fix VP9 playback.
 * Fix post filtering crash.
 * Make xml parser thread safe.
 * More user configuration safety.
 * Inline assembly fixes.
 * Failed memory allocation safety fixes.
 * Memory leak fixes.
 * Debug and LOG build fixes.
 * Again, lots of small fixes and optimizations.
 * Better multiengine client safety.
 * Hide yuv2rgb implementation details.
 * Use a single libyuv2rgb copy in both engine and plugins.
 * Minor ffmpeg optimization.
 * Lift a few video engine handbrakes. Less CPU load, fewer frame
   drops, faster seeking.
 * Optimize audio engine.
 * Optimize demux buffering system.
 * Optimize metronom clock.
 * Optimize port tickets.
 * Optimize sse/mmx2 memcpy.
 * Code simplification and cleanup.
 * Update german translation.
- Cleanup buildrequires so neither Mesa-devel nor xorg-x11-devel 
  meta/mega packages are required anymore.
- Build unconditionally with modplug and pulseaudio
- Remove dependency to gcc5
- Use simple bcond for ffmpeg
- 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.
- fix build with ImageMagick 7
  + xine-lib-ImageMagick7.patch
- Fixed build in Leap:42.2 by building with gcc5.
- Removed conditinals for old openSUSE versions from spec file.
- Modified pre checkin script to enable build with the ffmpeg libs
  that are in the distribution.
- Added xine-lib-crippled-ffmpeg3.0.patch to enable leap and above
  to build with ffmpeg3.
- Removed unused build flags.
- Accept any ffmpeg version in BuildRequires
- Add xine-lib-link-xcb.patch: fix linking of libxcb. As our code
  uses the functions, we must not rely on 3rd parties to hopefully
  bring the right libraries to link.
  https://bugs.xine-project.org/show_bug.cgi?id=573
- Drop libsmbclient BuildRequires: requiring a library to build is
  in any case wrong. It's the responsibility of a -devel package to
  pull in the real libraries.
- Added xine-lib-ffmpeg3.0.patch to build against ffmpeg-3.0
  libraries on PMBS.
- Add pkgconfig(libva-glx) to BuildRequires because it's a separate
  package for openSUSE > 13.2.
- Replace implicit Requires from old ffmpeg with BuildRequires to
  fix build in packman
- update to 1.2.6
  * Add libmmal video output plugin for Raspberry Pi.
  * Add libmmal HW video decoder plugin for Raspberry Pi.
  * Add overlay colormatrix support.
  * Add "sqare monitor pixels" config option.
  * Add VAAPI colormatrix and fullrange video support.
  * Add "radeonhd" XV colormatrix support.
  * Add Opus audio support.
  * Update german translation.
  * Optimize OpenGL2 video out.
  * Optimize raw RGB video decoder.
  * Fix multithread ffmpeg video decoding.
  * Fix/optimize DVB subtitles.
  * Fix external text subtitles.
  * BSD build fixes.
  * Clang build fixes.
  * Build optimization fixes (aliasing).
  * AVformat demux build fix.
  * More safety on memory allocation failure.
  * Fix detection of and compilation with libcaca 0.99 beta 19.
- use the xz compressed tarball provided by upstream and change
  precheckin_cripple_tarball.sh accordingly
- should fix boo#913588
- update to 1.2.5
  * Update german translation.
  * Add bass downmix support to AC3 decoder.
  * Add experimental YCgCo colorspace support.
  * Add avformat demux plugin.
    - Support for new formats and protocols.
    - Proper rtsp support (with avformat+rtsp://, rtsp+tcp:// and rtsp+http:// mrls).
    - by default native xine demux plugins are probed first.
      This can be overridden in config, by selecting demuxer in mrl (#demux:avformat),
      or by using "avformat+" mrl prefix.
  * Add avio (libavformat) input plugin:
    - Support for new protocols (https://, ftp://, sftp://, ...).
    - Support for seekable http streams (with "avio+http://" mrl).
    - By default native xine input plugins are used. This can be overridden in config or by using "avio+" mrl prefix.
  * Recognise & use HEVC/H.265. (ffmpeg)
  * Add support for HEVC/H.265 to the mpeg-ts demuxer.
  * Add support for HEVC/H.265 and VP9 to the matroska demuxer.
  * Add VP8/VP9 decoder using libvpx.
  * Modernise Quicktime demuxer:
    - Multiple user selectable audio traks.
    - Support AC3, EAC3, vorbis, Purevoice audio.
    - Support ISO fragment media files.
    - More safety on broken files.
    - Slightly faster.
  * Recognise & use ADPCM G.726 and ATRAC3. (ffmpeg/libva)
  * Build fixes.
  * Fix HDMV subtitle channel.
  * FFmpeg compatibility fixes.
  * Some colour format conversion fixes.
  * Fix RealVideo re-ordered PTS: pass through, let the decoder re-order it.
  * Fix some problems with COOK audio.
- from 1.2.4
  * Some VAAPI plugin fixes (build, image size changes).
  * ffmpeg multi-channel playback fixes:
    - Handle channel configuration changes sooner.
    - Generic layout if none provided; follow user changes.
    - Defer opening output if nothing to play.
    - Don't re-open with identical settings.
    - Don't use the bits-per-sample value (may not match decoder output).
  * ffmpeg video fixes:
    - Default to square pixels, avoiding black bars & unnecessary scaling.
    - Avoid CODEC_FLAG_EMU_EDGE (and some possible segfaults).
    - Use MPEG2VIDEO.
  * OpenGL2 output: don't render into invalid drawable.
  * Fix a possible xine_play() hang related to display locking.
  * FLV demuxer rewrite:
    - Improved metadata parsing.
    - PTS/DTS fixes.
    - Large file support on 32-bit.
    - Much improved seeking.
    - Much optimisation.
    - More codecs supported.
  * audio_out speed control fixes.
  * Optimised RGB→YUY2 conversion.
  * Avoid a possible performance penalty where AVX-optimised memcpy is used.
  * Add BD-J (BluRay Java) support with ARGB overlay capable video drivers (opengl2, vaapi, vdpau)
  * Add support for theora 4:2:2 and 4:4:4 pixel formats
- Removed xine-lib-missing-include-1.2.3.patch, the missing file is now included in the upstream tarball
- detect smbclient
- update to 1.2.3
  * Add VAAPI HW decoding support
  * Add OpenGL 2.0 output plugin
  * Add crop support to XShm output plugins
  * Add color matrix and full range support to OpenGL/Xv/XShm output plugins
  * Add test image generator input plugin
  * Add fast libjpeg based JPEG decoder
  * Add max. Xv image size detection to Xv video output plugin
  * Fix crash when trying to display too large jpeg image with Xv output plugin
  * Fix possible crash when stopping playback with deinterlacing enabled
  * Support large PAT in MPEG TS
  * Handle EAC3 audio (via ffmpeg)
- update license to new format
- Added xine-lib-theora.patch to add fourcc code to xine
- fix build for non-x86 architectures (disable deinterlace plugin)
- don't include .la files in libxine-devel to avoid bogus libtool errors
- provide and obsolete xine-devel and xine-lib for backward compat
- update to 1.2.2
  * Fix musepack decoder compilation if libmpcdec headers aren't available.
  * Configure tests for xinerama & VideoCD support now soft-fail properly.
  * The DVB plugin is working again.
  * OpenGL OSD fix.
  * YUV conversion MMX/SSE optimisations.
  * YUV420 H.264 is playable now; YUVJ444P is correctly handled.
  * Support FLAC in Matroska; support BMP.
  * Various build fixes for Windows.
- updated crippled version, removed mad and a52dec
- Remove dependency from libxine-devel to libffmpeg-devel
- update to 1.2.1
  * The "I'm at Tyneside LUG" release.
  * Enable PulseAudio, JACK and VDPAU on the Hurd.
  * Rewrite of VDPAU OSD handling.
  * sndio plugin is now buildable.
  * Various bug fixes.
- first build of xine-lib-12 for packman

OBS-URL: https://build.opensuse.org/request/show/568572
OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=105

xine-lib-1.2.8.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1b299a71dcae075bf6792e7b5a2020ed5ac8c46ad5091e004ce266aac40e8a6
-size 5151580

xine-lib-1.2.9.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:32b34e8049feb762d75a551d5d2cdb56c396fdd83e35b9b7de5fd08e498e948d
+size 5180452

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

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
 <p>Great video and multimediaplayer, supports DVD, MPEG, AVI, DivX, VCD, Quicktime ...</p><p>You need a frontend for xine-lib like <a href=http://packman.links2linux.de/package/xine-ui>xine-ui</a>, <a href=http://packman.links2linux.de/package/gxine>gxine</a>, <a href=http://packman.links2linux.de/package/kaffeine>kaffeine</a> or <a href=http://packman.links2linux.de/package/totem>totem</a>.</p><p>Since 1-rc6 the package number is reduced, all you may miss, is in the base package</p><p>If you want to play css encrypted Video-DVD's, you need to install <a href=http://packman.links2linux.de/package/libdvdcss2>libdvdcss</a>.</p>
@@ -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