Accepting request 568582 from multimedia:xine
Update to 1.2.9 OBS-URL: https://build.opensuse.org/request/show/568582 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xine-lib?expand=0&rev=69
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
a1d78fa64d
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f1b299a71dcae075bf6792e7b5a2020ed5ac8c46ad5091e004ce266aac40e8a6
|
||||
size 5151580
|
||||
3
xine-lib-1.2.9.tar.xz
Normal file
3
xine-lib-1.2.9.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:32b34e8049feb762d75a551d5d2cdb56c396fdd83e35b9b7de5fd08e498e948d
|
||||
size 5180452
|
||||
18
xine-lib-a52dec.patch
Normal file
18
xine-lib-a52dec.patch
Normal file
@ -0,0 +1,18 @@
|
||||
From: Dave Plater <davejplater@gmail.com>
|
||||
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.
|
||||
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
|
||||
@ -1,3 +1,91 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 23 12:38:21 UTC 2018 - davejplater@gmail.com
|
||||
|
||||
- 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.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 22 15:36:18 UTC 2018 - crrodriguez@opensuse.org
|
||||
|
||||
- Cleanup buildrequires so neither Mesa-devel nor xorg-x11-devel
|
||||
meta/mega packages are required anymore.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 15 06:43:14 UTC 2017 - olaf@aepfle.de
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package xine-lib
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -29,25 +29,25 @@ 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
|
||||
#
|
||||
BuildRequires: ImageMagick-devel
|
||||
BuildRequires: Mesa-devel
|
||||
BuildRequires: alsa-devel
|
||||
BuildRequires: flac-devel
|
||||
BuildRequires: giflib-devel
|
||||
@ -70,9 +70,20 @@ BuildRequires: readline-devel
|
||||
BuildRequires: speex-devel
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: vcdimager-devel
|
||||
BuildRequires: xorg-x11-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)
|
||||
BuildRequires: pkgconfig(xcb-shm)
|
||||
BuildRequires: pkgconfig(xcb-xv)
|
||||
BuildRequires: pkgconfig(xext)
|
||||
BuildRequires: pkgconfig(xv)
|
||||
BuildRequires: pkgconfig(xvmc)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
%if %{with ffmpeg}
|
||||
BuildRequires: pkgconfig(libavcodec)
|
||||
BuildRequires: pkgconfig(libavformat)
|
||||
@ -87,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
|
||||
@ -111,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
|
||||
@ -136,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>
|
||||
@ -531,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"
|
||||
@ -570,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
|
||||
@ -607,8 +618,6 @@ AUTOPOINT=true autoreconf -fi
|
||||
%endif
|
||||
%if %{with distributable}
|
||||
--disable-faad \
|
||||
--disable-mad \
|
||||
--disable-a52dec \
|
||||
--disable-vdpau \
|
||||
--disable-dxr3 \
|
||||
--disable-asf \
|
||||
@ -651,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
|
||||
@ -658,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
|
||||
@ -747,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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user