forked from pool/xine-lib
Accepting request 486895 from home:plater
Update to 1.2.8 OBS-URL: https://build.opensuse.org/request/show/486895 OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=95
This commit is contained in:
Git OBS Bridge
parent
a01dfce95f
commit
c2f5d2c231
@ -1,101 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# The following source parts of xine-lib may not be distributed for legal
|
||||
# reasons.
|
||||
# Thus we have to cripple the source tree in a way that it still builds.
|
||||
|
||||
#
|
||||
# Helpers
|
||||
#
|
||||
|
||||
# $1: files $2: entries $3: prefix $4: postfix
|
||||
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
|
||||
}
|
||||
|
||||
# $1: files $2: entries $3: prefix $4: postfix
|
||||
do_nukeline() {
|
||||
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_./]).*$||mg }; print' $d
|
||||
done
|
||||
}
|
||||
|
||||
# $1: dir $2: files/dirs
|
||||
do_remove() {
|
||||
pushd "$1" >/dev/null || exit 1
|
||||
rm -rf $2
|
||||
popd >/dev/null
|
||||
}
|
||||
|
||||
#
|
||||
# Main
|
||||
#
|
||||
|
||||
# Find source tarball + unpack
|
||||
|
||||
tmp="/`mktemp -d`"
|
||||
trap 'rm -rf $tmp; echo 1>&2 "$0 failed"' EXIT
|
||||
test -d "$tmp" -a -w "$tmp" || exit
|
||||
tarsource="`echo xine-lib-*[0-9].tar.xz`"
|
||||
if [ ! -s "$tarsource" ] ; then
|
||||
echo "Error: cannot find source tarball"
|
||||
exit 1
|
||||
fi
|
||||
tarbase="${tarsource%.tar.xz}"
|
||||
tardest="$tarbase-crippled.tar.xz"
|
||||
|
||||
rm -rf xine-lib-*-crippled.tar.xz
|
||||
echo 1>&2 "Unpacking..."
|
||||
tar -C "$tmp" -xJf $tarsource || exit 1
|
||||
|
||||
pushd $tmp/$tarbase >/dev/null || exit 1
|
||||
|
||||
#
|
||||
# Cripple source
|
||||
#
|
||||
# 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_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/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/combined/Makefile.am "ffmpeg"
|
||||
#do_remove src/combined "ffmpeg"
|
||||
do_nukeentry src/post/planar/Makefile.am "pp\.c \S*/libpostproc/libpostprocess\.la"
|
||||
do_nukeline src/post/planar/planar.c "pp_init_plugin pp_special_info"
|
||||
do_remove src/post/planar "pp.c"
|
||||
|
||||
echo 1>&2 "Autotools..."
|
||||
autoreconf -fi || exit 1
|
||||
|
||||
#
|
||||
# Create new (crippled) source tarball
|
||||
#
|
||||
|
||||
popd >/dev/null
|
||||
|
||||
tar --owner=root --group=root -C $tmp -cJf $tardest $tarbase || exit 1
|
||||
rm -rf $tmp
|
||||
|
||||
echo 1>&2 ""
|
||||
echo 1>&2 "Successfully crippled tarball. :-("
|
||||
echo 1>&2 ""
|
||||
|
||||
rm -rf $tmp
|
||||
trap - EXIT
|
||||
exit 0
|
||||
#EOF
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:49e856b05f76d9f09bdb8434a59b197046d64cd4ce168079211946ff657d282a
|
||||
size 4883872
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bd041d738817c7c0c6392a3c0e5bda5a664a47e035135b5a449364f8c9b6a005
|
||||
size 5020964
|
||||
3
xine-lib-1.2.8.tar.xz
Normal file
3
xine-lib-1.2.8.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f1b299a71dcae075bf6792e7b5a2020ed5ac8c46ad5091e004ce266aac40e8a6
|
||||
size 5151580
|
||||
@ -1,44 +0,0 @@
|
||||
Index: src/combined/ffmpeg/ff_audio_decoder.c
|
||||
===================================================================
|
||||
--- src/combined/ffmpeg/ff_audio_decoder.c.orig
|
||||
+++ src/combined/ffmpeg/ff_audio_decoder.c
|
||||
@@ -590,7 +590,7 @@ static int ff_audio_decode (ff_audio_dec
|
||||
int got_frame;
|
||||
float gain = this->class->gain;
|
||||
if (!this->av_frame)
|
||||
- this->av_frame = avcodec_alloc_frame ();
|
||||
+ this->av_frame = av_frame_alloc ();
|
||||
|
||||
consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt);
|
||||
if ((consumed >= 0) && got_frame) {
|
||||
@@ -1071,7 +1071,7 @@ static void ff_audio_reset (audio_decode
|
||||
/* try to reset the wma decoder */
|
||||
if( this->decoder_ok ) {
|
||||
#if AVAUDIO > 3
|
||||
- avcodec_free_frame (&this->av_frame);
|
||||
+ av_frame_free (&this->av_frame);
|
||||
#endif
|
||||
pthread_mutex_lock (&ffmpeg_lock);
|
||||
avcodec_close (this->context);
|
||||
@@ -1105,7 +1105,7 @@ static void ff_audio_dispose (audio_deco
|
||||
|
||||
if( this->context && this->decoder_ok ) {
|
||||
#if AVAUDIO > 3
|
||||
- avcodec_free_frame (&this->av_frame);
|
||||
+ av_frame_free (&this->av_frame);
|
||||
#endif
|
||||
pthread_mutex_lock (&ffmpeg_lock);
|
||||
avcodec_close (this->context);
|
||||
Index: src/combined/ffmpeg/ff_video_decoder.c
|
||||
===================================================================
|
||||
--- src/combined/ffmpeg/ff_video_decoder.c.orig
|
||||
+++ src/combined/ffmpeg/ff_video_decoder.c
|
||||
@@ -2523,7 +2523,7 @@ static video_decoder_t *ff_video_open_pl
|
||||
this->stream = stream;
|
||||
this->class = (ff_video_class_t *) class_gen;
|
||||
|
||||
- this->av_frame = avcodec_alloc_frame();
|
||||
+ this->av_frame = av_frame_alloc();
|
||||
this->context = avcodec_alloc_context();
|
||||
this->context->opaque = this;
|
||||
#if AVPALETTE == 1
|
||||
@ -1,51 +0,0 @@
|
||||
--- src/combined/ffmpeg/ff_audio_decoder.c.orig 2014-06-09 18:08:42.000000000 +0200
|
||||
+++ src/combined/ffmpeg/ff_audio_decoder.c 2016-02-26 14:31:45.000000000 +0100
|
||||
@@ -593,7 +593,7 @@
|
||||
int got_frame;
|
||||
float gain = this->class->gain;
|
||||
if (!this->av_frame)
|
||||
- this->av_frame = avcodec_alloc_frame ();
|
||||
+ this->av_frame = av_frame_alloc ();
|
||||
|
||||
consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt);
|
||||
if ((consumed >= 0) && got_frame) {
|
||||
@@ -1071,7 +1071,7 @@
|
||||
/* try to reset the wma decoder */
|
||||
if( this->decoder_ok ) {
|
||||
#if AVAUDIO > 3
|
||||
- avcodec_free_frame (&this->av_frame);
|
||||
+ av_frame_free (&this->av_frame);
|
||||
#endif
|
||||
pthread_mutex_lock (&ffmpeg_lock);
|
||||
avcodec_close (this->context);
|
||||
@@ -1106,7 +1106,7 @@
|
||||
|
||||
if( this->context && this->decoder_ok ) {
|
||||
#if AVAUDIO > 3
|
||||
- avcodec_free_frame (&this->av_frame);
|
||||
+ av_frame_free (&this->av_frame);
|
||||
#endif
|
||||
pthread_mutex_lock (&ffmpeg_lock);
|
||||
avcodec_close (this->context);
|
||||
--- src/combined/ffmpeg/ff_video_decoder.c.orig 2014-06-24 18:21:06.000000000 +0200
|
||||
+++ src/combined/ffmpeg/ff_video_decoder.c 2016-02-26 14:31:45.000000000 +0100
|
||||
@@ -2526,7 +2526,7 @@
|
||||
this->stream = stream;
|
||||
this->class = (ff_video_class_t *) class_gen;
|
||||
|
||||
- this->av_frame = avcodec_alloc_frame();
|
||||
+ this->av_frame = av_frame_alloc();
|
||||
this->context = avcodec_alloc_context();
|
||||
this->context->opaque = this;
|
||||
#if AVPALETTE == 1
|
||||
--- src/dxr3/ffmpeg_encoder.c.orig 2014-03-13 05:06:09.000000000 +0200
|
||||
+++ src/dxr3/ffmpeg_encoder.c 2016-02-26 14:31:45.000000000 +0100
|
||||
@@ -164,7 +164,7 @@
|
||||
"dxr3_mpeg_encoder: Couldn't start the ffmpeg library\n");
|
||||
return 0;
|
||||
}
|
||||
- this->picture = avcodec_alloc_frame();
|
||||
+ this->picture = av_frame_alloc();
|
||||
if (!this->picture) {
|
||||
xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
|
||||
"dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n");
|
||||
@ -5,10 +5,11 @@
|
||||
# Parent 07c29261ed98fdb710a241c6711dac0215b6074a
|
||||
Fix playback of DVDs with a broken UDF file system (aka DVD-Movie-Protect).
|
||||
|
||||
diff -r 07c29261ed98 -r 100241ff36f0 src/input/libdvdnav/dvd_udf.c
|
||||
--- a/src/input/libdvdnav/dvd_udf.c Thu Jan 31 22:02:04 2008 +0000
|
||||
+++ b/src/input/libdvdnav/dvd_udf.c Tue Feb 05 11:48:02 2008 +0100
|
||||
@@ -38,9 +38,15 @@
|
||||
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
|
||||
@@ -38,10 +38,16 @@
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
#include <inttypes.h>
|
||||
@ -18,13 +19,14 @@ diff -r 07c29261ed98 -r 100241ff36f0 src/input/libdvdnav/dvd_udf.c
|
||||
|
||||
#include "dvd_reader.h"
|
||||
#include "dvd_udf.h"
|
||||
+
|
||||
|
||||
+#include "ifo_types.h"
|
||||
+#include "ifo_read.h"
|
||||
|
||||
+
|
||||
/* Private but located in/shared with dvd_reader.c */
|
||||
extern int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number,
|
||||
@@ -774,7 +780,9 @@ static int UDFFindPartition( dvd_reader_
|
||||
size_t block_count, unsigned char *data,
|
||||
@@ -779,7 +785,9 @@ static int UDFFindPartition( dvd_reader_
|
||||
return part->valid;
|
||||
}
|
||||
|
||||
@ -35,7 +37,7 @@ diff -r 07c29261ed98 -r 100241ff36f0 src/input/libdvdnav/dvd_udf.c
|
||||
uint32_t *filesize )
|
||||
{
|
||||
uint8_t LogBlock_base[ DVD_VIDEO_LB_LEN + 2048 ];
|
||||
@@ -856,6 +864,84 @@ uint32_t UDFFindFile( dvd_reader_t *devi
|
||||
@@ -861,6 +869,84 @@ uint32_t UDFFindFile( dvd_reader_t *devi
|
||||
return partition.Start + File.Location;
|
||||
}
|
||||
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
# HG changeset patch
|
||||
# User Dominique Leuenberger <dimstar@opensuse.org>
|
||||
# Date 1468914700 -7200
|
||||
# Tue Jul 19 09:51:40 2016 +0200
|
||||
# Node ID 434e1ff5323789560c210b0b417844b8ab232ab0
|
||||
# Parent 24fc93301077a2317d1d6deda3b7d895e6754e26
|
||||
build: Fix linking with new xcb versions
|
||||
|
||||
As we make use of specific xcb and xcb_shm functions, it is our sole responsibility
|
||||
to ensure we link against the right libs. Expecting xcb-shape to bring in all the
|
||||
dependencies for us is wrong (and no longer works in all cases)
|
||||
|
||||
diff -r 24fc93301077 -r 434e1ff53237 m4/video_out.m4
|
||||
--- a/m4/video_out.m4 Tue Jun 07 19:33:35 2016 +0200
|
||||
+++ b/m4/video_out.m4 Tue Jul 19 09:51:40 2016 +0200
|
||||
@@ -305,7 +305,7 @@
|
||||
dnl xcb
|
||||
XINE_ARG_WITH([xcb], [Enable support for XCB video out plugins])
|
||||
if test x"$with_xcb" != x"no"; then
|
||||
- PKG_CHECK_MODULES([XCB], [xcb-shape >= 1.0], [have_xcb=yes], [have_xcb=no])
|
||||
+ PKG_CHECK_MODULES([XCB], [xcb xcb-shape >= 1.0], [have_xcb=yes], [have_xcb=no])
|
||||
if test x"$hard_enable_xcb" = x"yes" && test x"$have_xcb" != x"yes"; then
|
||||
AC_MSG_ERROR([XCB support requested, but XCB not found])
|
||||
elif test x"$have_xcb" = x"yes"; then
|
||||
diff -r 24fc93301077 -r 434e1ff53237 src/video_out/Makefile.am
|
||||
--- a/src/video_out/Makefile.am Tue Jun 07 19:33:35 2016 +0200
|
||||
+++ b/src/video_out/Makefile.am Tue Jul 19 09:51:40 2016 +0200
|
||||
@@ -147,7 +147,7 @@
|
||||
xineplug_vo_out_xcbshm_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBSHM_CFLAGS) $(AVUTIL_CFLAGS)
|
||||
|
||||
xineplug_vo_out_xcbxv_la_SOURCES = video_out_xcbxv.c $(XCBOSD)
|
||||
-xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS) $(XCB_LIBS)
|
||||
+xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS) $(XCB_LIBS) $(XCBSHM_LIBS)
|
||||
xineplug_vo_out_xcbxv_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBXV_CFLAGS)
|
||||
|
||||
xineplug_vo_out_xshm_la_SOURCES = video_out_xshm.c $(X11OSD)
|
||||
@ -1,6 +1,8 @@
|
||||
--- m4/input.m4 2014-02-26 16:49:10.000000000 +0100
|
||||
+++ m4/input.m4 2014-04-11 23:22:34.923765318 +0200
|
||||
@@ -96,7 +96,7 @@
|
||||
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], [
|
||||
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.])
|
||||
--- src/input/input_v4l.c 2014-03-11 14:28:30.000000000 +0100
|
||||
+++ src/input/input_v4l.c 2014-04-11 23:22:34.926765238 +0200
|
||||
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
|
||||
@@ -47,7 +47,7 @@
|
||||
*/
|
||||
#define _LINUX_TIME_H
|
||||
|
||||
@ -1,3 +1,58 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Apr 9 14:25:06 UTC 2017 - davejplater@gmail.com
|
||||
|
||||
- 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.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 28 07:52:49 UTC 2017 - pgajdos@suse.com
|
||||
|
||||
|
||||
123
xine-lib.spec
123
xine-lib.spec
@ -77,6 +77,8 @@ BuildRequires: speex-devel
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: vcdimager-devel
|
||||
BuildRequires: xorg-x11-devel
|
||||
BuildRequires: pkgconfig(dvdnav)
|
||||
BuildRequires: pkgconfig(vpx)
|
||||
%if %{with ffmpeg}
|
||||
BuildRequires: pkgconfig(libavcodec)
|
||||
BuildRequires: pkgconfig(libavformat)
|
||||
@ -119,34 +121,25 @@ BuildRequires: DirectFB-devel
|
||||
%if %{with modplug}
|
||||
BuildRequires: libmodplug-devel
|
||||
%endif
|
||||
Version: 1.2.6
|
||||
Version: 1.2.8
|
||||
Release: 0
|
||||
%define abiversion 2.5
|
||||
%define abiversion 2.6
|
||||
Summary: Video Player with Plug-Ins
|
||||
License: GPL-2.0+ and SUSE-Public-Domain
|
||||
Group: Productivity/Multimedia/Video/Players
|
||||
Url: http://www.xine-project.org/home
|
||||
Url: https://www.xine-project.org/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%if %{with distributable}
|
||||
Source: xine-lib-%{version}-crippled.tar.xz
|
||||
%else
|
||||
Source: http://downloads.sourceforge.net/project/xine/xine-lib/%{version}/xine-lib-%{version}.tar.xz
|
||||
%endif
|
||||
Source: http://sourceforge.net/projects/xine/files/%{name}/%{version}/%{name}-%{version}.tar.xz
|
||||
Source1: baselibs.conf
|
||||
Source99: precheckin_cripple_tarball.sh
|
||||
|
||||
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.
|
||||
Patch7: xine-lib-crippled-ffmpeg3.0.patch
|
||||
Patch2: xine-lib-without-ffmpeg.patch
|
||||
Patch5: xine-lib-ffmpeg3.0.patch
|
||||
Patch3: fix-non-x86-build.diff
|
||||
# Add theora FOURCC to libxine I found an avi container that xine wouldn't play.
|
||||
Patch4: xine-lib-theora.patch
|
||||
# PATCH-FIX-UPSTREAM xine-lib-link-xcb.patch https://bugs.xine-project.org/show_bug.cgi?id=573 dimstar@opensuse.org -- Look for xcb, not xcb-shape
|
||||
Patch6: xine-lib-link-xcb.patch
|
||||
# This should be fixed upstream, but this patch will not work for them.
|
||||
# wand/magick_wand.h is already deprecated even in ImageMagick-6; package should
|
||||
# include wand/MagickWand.h for ImageMagick-6 and MagickWand/MagickWand.h for
|
||||
@ -523,23 +516,74 @@ modplug: %{with modplug}
|
||||
+++++++++++++++++++++++++'
|
||||
EOF
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%if %{with distributable}
|
||||
# Taken from precheckin_cripple_tarball.sh
|
||||
# $1: files $2: entries $3: prefix $4: postfix
|
||||
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
|
||||
}
|
||||
|
||||
# $1: files $2: entries $3: prefix $4: postfix
|
||||
do_nukeline() {
|
||||
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_./]).*$||mg }; print' $d
|
||||
done
|
||||
}
|
||||
|
||||
# $1: dir $2: files/dirs
|
||||
do_remove() {
|
||||
pushd "$1" >/dev/null || exit 1
|
||||
rm -rf $2
|
||||
popd >/dev/null
|
||||
}
|
||||
|
||||
# Cripple source
|
||||
#
|
||||
# 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_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/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/combined/Makefile.am "ffmpeg"
|
||||
#do_remove src/combined "ffmpeg"
|
||||
do_nukeentry src/post/planar/Makefile.am "pp\.c \S*/libpostproc/libpostprocess\.la"
|
||||
do_nukeline src/post/planar/planar.c "pp_init_plugin pp_special_info"
|
||||
do_remove src/post/planar "pp.c"
|
||||
|
||||
%endif
|
||||
|
||||
%patch0 -p0
|
||||
%patch1
|
||||
%if %{with distributable} && %{with ffmpeg}
|
||||
%patch7
|
||||
#%%patch7
|
||||
%else
|
||||
%if !%{with ffmpeg}
|
||||
%patch2
|
||||
rm -rf src/combined/ffmpeg configure
|
||||
%else
|
||||
%patch5
|
||||
#%%patch5
|
||||
%endif
|
||||
%endif
|
||||
%ifnarch %ix86 x86_64
|
||||
%patch3
|
||||
%endif
|
||||
%patch4
|
||||
%patch6 -p1
|
||||
#%%patch6 -p1
|
||||
%patch8 -p1
|
||||
|
||||
rm -f m4/libtool15.m4
|
||||
@ -582,11 +626,14 @@ AUTOPOINT=true autoreconf -fi
|
||||
--disable-a52dec \
|
||||
--disable-vdpau \
|
||||
--disable-dxr3 \
|
||||
--disable-asf \
|
||||
%endif
|
||||
%ifarch %{ix86}
|
||||
--with-w32-path=/usr/lib/win32 \
|
||||
%endif
|
||||
--with-pic
|
||||
--with-pic \
|
||||
--with-external-dvdnav
|
||||
# --disable-libxine-builtins
|
||||
# --with-install-plugins-helper=${_prefix}/lib/opensuse-codecs-installer
|
||||
echo $CFLAGS
|
||||
make %{?jobs:-j%{jobs}} V=1
|
||||
@ -600,6 +647,7 @@ LIB="%{buildroot}%{_libdir}/xine/plugins/%{abiversion}"
|
||||
rm %{buildroot}%{_defaultdocdir}/xine/README.{irix,solaris,WIN32}
|
||||
# remove .la files, they are evil
|
||||
rm %{buildroot}%{_libdir}/*.la
|
||||
rm -f files
|
||||
%ifarch %{ix86}
|
||||
mkdir -p %{buildroot}/usr/lib/win32
|
||||
%endif
|
||||
@ -609,11 +657,8 @@ rm %{buildroot}%{_libdir}/*.la
|
||||
cat > plugins << EOF
|
||||
# these plugins do not have legal problems
|
||||
xineplug_ao_out_alsa
|
||||
xineplug_ao_out_file
|
||||
xineplug_ao_out_none
|
||||
xineplug_ao_out_oss
|
||||
xineplug_vo_out_fb
|
||||
xineplug_vo_out_none
|
||||
xineplug_vo_out_opengl
|
||||
xineplug_vo_out_opengl2
|
||||
xineplug_vo_out_xshm
|
||||
@ -628,20 +673,21 @@ xineplug_inp_dvb
|
||||
xineplug_inp_dvd
|
||||
xineplug_inp_v4l
|
||||
xineplug_inp_v4l2
|
||||
xineplug_inp_file
|
||||
xineplug_inp_http
|
||||
xineplug_inp_net
|
||||
xineplug_inp_pnm
|
||||
xineplug_inp_cdda
|
||||
xineplug_inp_smb
|
||||
xineplug_inp_stdin_fifo
|
||||
xineplug_inp_rtsp
|
||||
xineplug_inp_pvr
|
||||
xineplug_inp_rtp
|
||||
xineplug_inp_test
|
||||
xineplug_decode_bitplane
|
||||
xineplug_decode_rgb
|
||||
xineplug_decode_yuv
|
||||
#New in 1.2.7
|
||||
xineplug_decode_rawvideo
|
||||
%if !%{with distributable}
|
||||
xineplug_decode_vdpau
|
||||
%endif
|
||||
xineplug_dmx_video
|
||||
#end new
|
||||
xineplug_decode_lpcm
|
||||
xineplug_decode_real
|
||||
xineplug_decode_mpc
|
||||
@ -649,27 +695,18 @@ xineplug_decode_gdk_pixbuf
|
||||
xineplug_decode_spucmml
|
||||
xineplug_decode_spuhdmv
|
||||
xineplug_decode_libjpeg
|
||||
# requires ImageMagick
|
||||
xineplug_decode_image
|
||||
xineplug_dmx_yuv_frames
|
||||
xineplug_dmx_real
|
||||
xineplug_decode_libvpx
|
||||
xineplug_dmx_audio
|
||||
xineplug_dmx_iff
|
||||
xineplug_dmx_avi
|
||||
xineplug_dmx_flv
|
||||
xineplug_dmx_image
|
||||
xineplug_dmx_matroska
|
||||
xineplug_dmx_fli
|
||||
xineplug_dmx_nsv
|
||||
xineplug_dmx_mng
|
||||
xineplug_dmx_pva
|
||||
xineplug_dmx_qt
|
||||
xineplug_dmx_rawdv
|
||||
xineplug_dmx_games
|
||||
xineplug_dmx_slave
|
||||
xineplug_dmx_modplug
|
||||
xineplug_dmx_playlist
|
||||
xineplug_dmx_vc1_es
|
||||
xineplug_flac
|
||||
xineplug_sputext
|
||||
xineplug_xiph
|
||||
@ -730,13 +767,6 @@ xineplug_decode_spudvb
|
||||
xineplug_inp_vcd
|
||||
xineplug_inp_vcdo
|
||||
xineplug_decode_mpeg2
|
||||
#xineplug_decode_mpeg2new
|
||||
xineplug_dmx_mpeg
|
||||
xineplug_dmx_mpeg_block
|
||||
xineplug_dmx_mpeg_ts
|
||||
xineplug_dmx_mpeg_elem
|
||||
xineplug_dmx_mpeg_pes
|
||||
xineplug_dmx_yuv4mpeg2
|
||||
# these plugins do have legal problems
|
||||
xineplug_decode_a52
|
||||
xineplug_decode_dts
|
||||
@ -761,11 +791,6 @@ xineplug_decode_w32dll
|
||||
xineplug_decode_dxr3_video
|
||||
xineplug_vo_out_dxr3
|
||||
xineplug_decode_dxr3_spu
|
||||
xineplug_decode_vdpau_h264
|
||||
xineplug_decode_vdpau_h264_alter
|
||||
xineplug_decode_vdpau_mpeg12
|
||||
xineplug_decode_vdpau_mpeg4
|
||||
xineplug_decode_vdpau_vc1
|
||||
xineplug_vo_out_vaapi
|
||||
# unfortunately using external ffmpeg links the planar post
|
||||
# processing plugin against ffmpeg libs
|
||||
|
||||
Loading…
Reference in New Issue
Block a user