Accepting request 764912 from home:olh:branches:multimedia:xine

- Package xineplug_post_tvtime also on arm64
- Remove disabled esd support
- Remove disabled directfb support
- Remove disabled aalib support
- Remove disabled gnome_vfs support
- Use gcc8 in SLE_12
- Use plain configure macro
- Fix opensuse.org XINE URL
- Use without instead of !with distributable/onlynondistributable/ffmpeg/sdl
- Remove disabled code for sle10
- Remove conditional for ffmpeg because it always exists
- Remove unused xine-lib-without-ffmpeg.patch
- Remove unused xine-lib-nukefaadetc.patch, use sed instead
- Adjust all patches for autosetup:
  xine-lib-libdvdread_udf.diff
  xine-lib-v4l-2.6.38.patch
  xine-lib-alsa.patch
  xine-lib-theora.patch
  xine-lib-ImageMagick7.patch
  xine-lib-a52dec.patch

OBS-URL: https://build.opensuse.org/request/show/764912
OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=121
This commit is contained in:
Dave Plater 2020-01-16 15:00:02 +00:00 committed by Git OBS Bridge
parent ba26390236
commit 408d7fe683
10 changed files with 86 additions and 313 deletions

View File

@ -1,8 +1,6 @@
Index: xine-lib-1.2.6/src/video_dec/image.c
===================================================================
--- xine-lib-1.2.6.orig/src/video_dec/image.c 2013-09-18 12:04:54.000000000 +0200
+++ xine-lib-1.2.6/src/video_dec/image.c 2017-03-28 09:22:17.137733960 +0200
@@ -39,7 +39,7 @@
--- a/src/video_dec/image.c
+++ b/src/video_dec/image.c
@@ -37,7 +37,7 @@
#define LOG
*/

View File

@ -3,10 +3,8 @@ 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
--- 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?
*/

19
xine-lib-contrib.patch Normal file
View File

@ -0,0 +1,19 @@
--- 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

View File

@ -5,10 +5,8 @@
# Parent 07c29261ed98fdb710a241c6711dac0215b6074a
Fix playback of DVDs with a broken UDF file system (aka DVD-Movie-Protect).
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
--- a/src/input/libdvdnav/dvd_udf.c
+++ b/src/input/libdvdnav/dvd_udf.c
@@ -38,10 +38,16 @@
#include <sys/stat.h>
#include <unistd.h>

View File

@ -1,11 +0,0 @@
Index: contrib/Makefile.am
===================================================================
--- contrib/Makefile.am.orig 2018-01-11 14:49:46.000000000 +0200
+++ contrib/Makefile.am 2018-12-29 14:25:07.143736494 +0200
@@ -1,5 +1,4 @@
-SUBDIRS = libmpcdec libxdg-basedir libdca nosefart gsm610 libmad a52dec \
- libfaad
+SUBDIRS = libmpcdec libxdg-basedir libdca nosefart gsm610 libmad a52dec
if BUILD_DHA_KMOD

View File

@ -1,8 +1,6 @@
Index: src/xine-engine/buffer_types.c
===================================================================
--- src/xine-engine/buffer_types.c.orig 2012-02-05 21:17:03.000000000 +0200
+++ src/xine-engine/buffer_types.c 2012-07-16 15:39:19.681795420 +0200
@@ -585,6 +585,8 @@ static const video_db_t video_db[] = {
--- 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[] = {
},
{
{

View File

@ -1,8 +1,6 @@
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], [
--- a/m4/input.m4
+++ b/m4/input.m4
@@ -97,7 +97,7 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [
XINE_ARG_ENABLE([v4l], [Enable Video4Linux support])
if test x"$enable_v4l" != x"no"; then
have_v4l=yes
@ -11,10 +9,8 @@ Index: m4/input.m4
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.])
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
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -47,7 +47,7 @@
*/
#define _LINUX_TIME_H

View File

@ -1,57 +0,0 @@
Index: m4/decoders.m4
===================================================================
--- m4/decoders.m4.orig
+++ m4/decoders.m4
@@ -85,9 +85,7 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [
AM_CONDITIONAL([WITH_EXTERNAL_FAAD], [test x"$have_external_faad" = x"yes"])
dnl ffmpeg external version required
- PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.68.0])
PKG_CHECK_MODULES([AVUTIL], [libavutil >= 49.6.0])
- PKG_CHECK_MODULES([FFMPEG_POSTPROC], [libpostproc])
AC_DEFINE([HAVE_FFMPEG], 1, [Define this if you have ffmpeg library])
dnl Check presence of ffmpeg/avutil.h to see if it's old or new
Index: src/audio_dec/Makefile.am
===================================================================
--- src/audio_dec/Makefile.am.orig
+++ src/audio_dec/Makefile.am
@@ -49,7 +49,6 @@ $(top_builddir)/contrib/gsm610/libgsm610
xineplug_LTLIBRARIES = \
xineplug_decode_gsm610.la \
xineplug_decode_lpcm.la \
- xineplug_decode_dvaudio.la \
$(musepack_module) \
$(dts_module) \
$(mad_module) \
@@ -87,7 +86,3 @@ xineplug_decode_faad_la_SOURCES = xine_f
xineplug_decode_faad_la_DEPENDENCIES = $(FAAD_DEPS)
xineplug_decode_faad_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) $(FAAD_LIBS) -lm
xineplug_decode_faad_la_CFLAGS = $(FAAD_CFLAGS)
-
-xineplug_decode_dvaudio_la_SOURCES = ff_dvaudio_decoder.c
-xineplug_decode_dvaudio_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
-xineplug_decode_dvaudio_la_CPPFLAGS = $(AM_CPPFLAGS) $(FFMPEG_CFLAGS)
Index: src/combined/Makefile.am
===================================================================
--- src/combined/Makefile.am.orig
+++ src/combined/Makefile.am
@@ -1,5 +1,5 @@
include $(top_srcdir)/misc/Makefile.quiet
-SUBDIRS = ffmpeg
+#SUBDIRS = ffmpeg
include $(top_builddir)/misc/Makefile.plugins
include $(top_srcdir)/misc/Makefile.common
Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -1285,7 +1285,6 @@ src/Makefile
src/audio_out/Makefile
src/audio_dec/Makefile
src/combined/Makefile
-src/combined/ffmpeg/Makefile
src/demuxers/Makefile
src/input/Makefile

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Sat Apr 13 20:02:32 UTC 2019 - olaf@aepfle.de
- Package xineplug_post_tvtime also on arm64
- Remove disabled esd support
- Remove disabled directfb support
- Remove disabled aalib support
- Remove disabled gnome_vfs support
- Use gcc8 in SLE_12
- Use plain configure macro
- Fix opensuse.org XINE URL
- Use without instead of !with distributable/onlynondistributable/ffmpeg/sdl
- Remove disabled code for sle10
- Remove conditional for ffmpeg because it always exists
- Remove unused xine-lib-without-ffmpeg.patch
- Remove unused xine-lib-nukefaadetc.patch, use sed instead
- Adjust all patches for autosetup:
xine-lib-libdvdread_udf.diff
xine-lib-v4l-2.6.38.patch
xine-lib-alsa.patch
xine-lib-theora.patch
xine-lib-ImageMagick7.patch
xine-lib-a52dec.patch
-------------------------------------------------------------------
Tue Mar 26 07:03:44 UTC 2019 - olaf@aepfle.de

View File

@ -30,23 +30,10 @@ Name: xine-lib
BuildRequires: gcc
BuildRequires: pkgconfig(libmpeg2)
%else
# Leap 42.3+
%if 0%{?leap_version} >= 420300
BuildRequires: cpp7
BuildRequires: gcc7
#!Buildignore: libgcc_s1
%else
# Leap 42.2
BuildRequires: gcc5
BuildRequires: gcc8
%endif
%endif
%bcond_without ffmpeg
%bcond_without sdl
%bcond_with aalib
%bcond_with esd
%bcond_without jack
%bcond_with gnome_vfs
%bcond_with directfb
#
BuildRequires: ImageMagick-devel
BuildRequires: alsa-devel
@ -85,16 +72,12 @@ BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xv)
BuildRequires: pkgconfig(xvmc)
BuildRequires: pkgconfig(zlib)
%if %{with ffmpeg}
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libbluray) >= 0.2.1
BuildRequires: pkgconfig(libbluray)
BuildRequires: pkgconfig(libpostproc)
%else
BuildRequires: libavutil-devel
%endif
%if !%{with distributable}
%if %{without distributable}
BuildRequires: libfaad-devel
BuildRequires: pkgconfig(libdts)
BuildRequires: pkgconfig(libva)
@ -105,22 +88,9 @@ BuildRequires: libpulse-devel
%if %{with sdl}
BuildRequires: SDL-devel
%endif
%if %{with aalib}
BuildRequires: aalib-devel
BuildRequires: libcaca-devel
%endif
%if %{with esd}
BuildRequires: esound-devel
%endif
%if %{with gnome_vfs}
BuildRequires: gnome-vfs2-devel
%endif
%if %{with jack}
BuildRequires: libjack-devel
%endif
%if %{with directfb}
BuildRequires: DirectFB-devel
%endif
BuildRequires: libmodplug-devel
Version: 1.2.9
Release: 0
@ -136,8 +106,7 @@ Source1: baselibs.conf
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.
Patch2: xine-lib-without-ffmpeg.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
@ -149,10 +118,6 @@ Patch4: xine-lib-theora.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
%if %{with distributable}
#PATCH-Workaround xine-lib-nukefaadetc.patch davejplater@gmail.com - supliment do_nukeentry().
Patch7: xine-lib-nukefaadetc.patch
%endif
%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>
@ -185,7 +150,7 @@ Alsa.
%if %{with distributable}
This version of xine may lack certain features because of legal
requirements (potential patent violation). See also
http://www.opensuse.org/XINE#Legal_Matters
http://en.opensuse.org/XINE#Legal_Matters
%endif
More information about xine plug-ins can be found at
@ -205,7 +170,7 @@ Stereosound via OSS und AC5.1 per Alsa.
%if %{with distributable}
Diese xine-Version lässt eventuell einige Funktione aus rechtlichen
Gründen vermissen (mögliche Patentverletzungen). Siehe dazu
http://www.opensuse.org/XINE#Legal_Matters
http://en.opensuse.org/XINE#Legal_Matters
%endif
Weitere Informationen über xine Plugins finden Sie unter
@ -244,7 +209,7 @@ using Alsa.
%if %{with distributable}
This version of xine may lack certain features because of legal
requirements (potential patent violation). See also
http://www.opensuse.org/XINE#Legal_Matters
http://en.opensuse.org/XINE#Legal_Matters
%endif
More information about xine plug-ins can be found at
@ -268,7 +233,7 @@ Stereosound via OSS und AC5.1 per Alsa.
%if %{with distributable}
Diese xine-Version lässt eventuell einige Funktione aus rechtlichen
Gründen vermissen (mögliche Patentverletzungen). Siehe dazu
http://www.opensuse.org/XINE#Legal_Matters
http://en.opensuse.org/XINE#Legal_Matters
%endif
Weitere Informationen über xine Plugins finden Sie unter
@ -330,59 +295,6 @@ Autoren:
Guenter Bartsch <guenter@sourceforge.net>
%endif
%if %{with aalib}
%package -n libxine2-aa
Summary: Aalib and libcaca plugin for xine
License: GPL-2.0-or-later AND SUSE-Public-Domain
Group: Productivity/Multimedia/Video/Players
Requires: libxine2 = %{version}
%description -n libxine2-aa
aalib and libcaca xine video-output plugin
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
%description -n libxine2-aa -l de
aalib und libcaca xine Video-Ausgabeplugin
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
%endif
%if %{with esd}
%package -n libxine2-esd
Summary: Esd plugin for xine
License: GPL-2.0-or-later AND SUSE-Public-Domain
Group: Productivity/Multimedia/Video/Players
Requires: libxine2 = %{version}
%description -n libxine2-esd
libxine sound output plugin for the esound soundserver
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
%description -n libxine2-esd -l de
libxine Soundausgabeplugin für den esound Soundserver
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
%endif
%if %{with jack}
@ -411,49 +323,8 @@ Autoren:
Guenter Bartsch <guenter@sourceforge.net>
%endif
%if %{with directfb}
%package -n libxine2-directfb
Summary: Directfb plugin for xine
License: GPL-2.0-or-later AND SUSE-Public-Domain
Group: Productivity/Multimedia/Video/Players
Requires: libxine2 = %{version}
%description -n libxine2-directfb
Directfb xine video-output plugin
Authors:
--------
Guenter Bartsch <guenter@users.sourceforge.net>
%description -n libxine2-directfb -l de
Directfb xine Video-Ausgabeplugin
Autoren:
--------
Guenter Bartsch <guenter@sourceforge.net>
%endif
%if %{with gnome_vfs}
%package -n libxine2-gnome-vfs
Summary: Gnome-vfs plugin for xine
License: GPL-2.0-or-later AND SUSE-Public-Domain
Group: Productivity/Multimedia/Video/Players
Requires: libxine2 = %{version}
%description -n libxine2-gnome-vfs
Input plugin which enables xine to use Gnome-vfs
%description -n libxine2-gnome-vfs -l de
Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen
%endif
%if !%{with distributable}
%if %{without distributable}
%package -n libxine2-codecs
# these libs are possibly illegal and may not work without libdvdcss anyway
@ -496,32 +367,30 @@ Autoren:
%endif
%prep
rm -rf contrib
%if %{with distributable} && %{with onlynondistributable}
%error need --without distributable for --with onlynondistributable
%endif
%autosetup -p1
%build
cat <<EOF
+++ rpm build options +++'
Distributable version: %{with distributable}
%if !%{with distributable}
%if %{without distributable}
Codecs package only: %{with onlynondistributable}
%endif
%if %{with ffmpeg}
External ffmpeg: 1
%endif
Pulseaudio: %{with pulseaudio}
SDL: %{with sdl}
aalib: %{with aalib}
esd: %{with esd}
aalib: 0
esd: 0
jack: %{with jack}
gnome_vfs: %{with gnome_vfs}
directfb: %{with directfb}
gnome_vfs: 0
directfb: 0
modplug: %{with modplug}
+++++++++++++++++++++++++'
EOF
%setup -q
%if %{with distributable}
%patch7
# Taken from precheckin_cripple_tarball.sh
# $1: files $2: entries $3: prefix $4: postfix
# NOTE: the perl do_nukeentry has stopped working with the latest perl
@ -581,47 +450,24 @@ do_remove src/input "$c_input"
do_nukeentry src/post/Makefile.am "planar"
#do_nukeline src/post/planar/planar.c "pp_init_plugin pp_special_info"
do_remove src/post/planar "*"
sed -i 's@libfaad@@g' contrib/Makefile.am
%endif
%patch0 -p0
%patch1
%if %{with distributable} && %{with ffmpeg}
#%%patch7
%else
%if !%{with ffmpeg}
%patch2
rm -rf src/combined/ffmpeg configure
%else
#%%patch5
%endif
%endif
%patch3 -p1
%patch4
%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="%{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-7)" && export CC=gcc-7
test -x "$(type -p cpp-7)" && export CPP=cpp-7
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
# # hack for sles10
## rm m4/gettext.m4 m4/intl.m4
## sed -i -e '/AM_GNU_GETTEXT_VERSION/s/0\.16\.1/0.14/' configure.ac
if [ ! -f configure ]; then
NO_CONFIGURE=1 ./autogen.sh
fi
AUTOPOINT=true autoreconf -fi
%configure --prefix=/usr \
--libdir=%{_libdir} \
--mandir=%{_mandir} \
%configure \
--disable-rpath \
--docdir=%{_defaultdocdir}/xine \
--enable-antialiasing \
@ -629,8 +475,7 @@ AUTOPOINT=true autoreconf -fi
--with-freetype \
--enable-v4l \
--enable-modplug \
%{?with_directfb:--enable-directfb} \
%if !%{with sdl}
%if %{without sdl}
--without-sdl \
%endif
%if %{with distributable}
@ -679,7 +524,7 @@ xineplug_vo_out_xcbxv
xineplug_vo_out_raw
xineplug_decode_mad
xineplug_decode_a52
%if !%{with distributable}
%if %{without distributable}
xineplug_vo_out_vdpau
%endif
xineplug_inp_dvb
@ -693,13 +538,13 @@ xineplug_inp_pvr
xineplug_inp_rtp
#New in 1.2.7
xineplug_decode_rawvideo
%if !%{with distributable}
%if %{without distributable}
xineplug_decode_vdpau
post/xineplug_post_audio_filters
post/xineplug_post_goom
post/xineplug_post_mosaico
post/xineplug_post_switch
%ifarch %ix86 x86_64 %arm
%ifarch %ix86 x86_64 %arm aarch64
post/xineplug_post_tvtime
%endif
post/xineplug_post_visualizations
@ -750,25 +595,12 @@ vidix/unichrome_vid
.pulse
xineplug_ao_out_pulseaudio
#
.esd
xineplug_ao_out_esd
#
.jack
xineplug_ao_out_jack
#
.aalib
xineplug_vo_out_aa
xineplug_vo_out_caca
#
.sdl
xineplug_vo_out_sdl
#
.gnome-vfs
xineplug_inp_gnome_vfs
#
.directfb
xineplug_vo_out_directfb
xineplug_vo_out_xdirectfb
#
.codecs
# libmad and MPEG related plugins
@ -837,7 +669,7 @@ rm -rf %{buildroot}%{_mandir}/man5
%clean
rm -rf %{buildroot}
%if !%{with onlynondistributable}
%if %{without onlynondistributable}
%post -n libxine2 -p /sbin/ldconfig
@ -857,7 +689,7 @@ rm -rf %{buildroot}
%doc %{_mandir}/man1/xine-list-*.gz
#%%doc %%{_mandir}/man5/xine.*
%{_defaultdocdir}/xine
%if !%{with distributable}
%if %{without distributable}
%dir %{_libdir}/xine/plugins/%{abiversion}/post
%endif
%{_libdir}/xine/plugins/%{abiversion}/mime.types
@ -879,35 +711,13 @@ rm -rf %{buildroot}
%defattr(-,root,root,0755)
%endif
%if %{with esd}
%files -n libxine2-esd -f files.esd
%defattr(-,root,root,0755)
%endif
%if %{with jack}
%files -n libxine2-jack -f files.jack
%defattr(-,root,root,0755)
%endif
%if %{with aalib}
%files -n libxine2-aa -f files.aalib
%defattr(-,root,root,0755)
%endif
%if %{with directfb}
%files -n libxine2-directfb -f files.directfb
%defattr(-,root,root,0755)
%endif
%if %{with gnome_vfs}
%files -n libxine2-gnome-vfs -f files.gnome-vfs
%defattr(-,root,root,0755)
%endif
%files -n libxine-devel
%defattr(-,root,root)
@ -921,7 +731,7 @@ rm -rf %{buildroot}
%endif
# onlynondistributable
%if !%{with distributable}
%if %{without distributable}
%files -n libxine2-codecs -f files.codecs
%defattr(-,root,root)