Merge branch 'el6' into el5
Conflicts: .gitignore branch sources xine-lib-1.1.4-optflags.patch xine-lib-cleanup-sources.sh xine-lib.spec
This commit is contained in:
Rex Dieter
commit
59c6e57f67
7
.gitignore
vendored
7
.gitignore
vendored
@ -1,2 +1,5 @@
|
||||
xine-lib-1.1.16.3-autotools.patch.bz2
|
||||
xine-lib-1.1.16.3-pruned.tar.bz2
|
||||
xine-lib-1.1.19-autotools.patch.bz2
|
||||
xine-lib-1.1.19-pruned.tar.bz2
|
||||
/xine-lib-1.1.20-pruned.tar.xz
|
||||
/xine-lib-1.1.20.1-pruned.tar.xz
|
||||
/xine-lib-1.1.21-pruned.tar.xz
|
||||
|
||||
3
sources
3
sources
@ -1,2 +1 @@
|
||||
e50122a9323107564d58056b35256610 xine-lib-1.1.16.3-autotools.patch.bz2
|
||||
0cac86b7d74c1dcaa22f5a8cbc5ef578 xine-lib-1.1.16.3-pruned.tar.bz2
|
||||
1568a378a732bd9b69d418674ad4165c xine-lib-1.1.21-pruned.tar.xz
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
--- xine-lib-1.1.1/src/xine-engine/load_plugins.c.~1~ 2005-09-19 09:14:02.000000000 -0700
|
||||
+++ xine-lib-1.1.1/src/xine-engine/load_plugins.c 2006-04-22 23:07:33.000000000 -0700
|
||||
@@ -591,7 +591,7 @@ static void collect_plugins(xine_t *this
|
||||
printf("load_plugins: %s not cached\n", str);
|
||||
#endif
|
||||
|
||||
- if(!info && (lib = dlopen (str, RTLD_LAZY | RTLD_GLOBAL)) == NULL) {
|
||||
+ if(!info && (lib = dlopen (str, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)) == NULL) {
|
||||
const char *error = dlerror();
|
||||
/* too noisy -- but good to catch unresolved references */
|
||||
xprintf(this, XINE_VERBOSITY_LOG,
|
||||
@@ -649,7 +649,7 @@ static int _load_plugin_class(xine_t *th
|
||||
/* load the dynamic library if needed */
|
||||
if (!node->file->lib_handle) {
|
||||
lprintf("dlopen %s\n", filename);
|
||||
- if ((lib = dlopen (filename, RTLD_LAZY | RTLD_GLOBAL)) == NULL) {
|
||||
+ if ((lib = dlopen (filename, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)) == NULL) {
|
||||
const char *error = dlerror();
|
||||
|
||||
xine_log (this, XINE_LOG_PLUGIN,
|
||||
@ -1,27 +0,0 @@
|
||||
--- src/video_out/video_out_caca.c Tue Nov 18 21:13:55 2008 +0100
|
||||
+++ src/video_out/video_out_caca.c Mon Nov 10 16:33:51 2008 +0100
|
||||
@@ -276,7 +276,6 @@ static int caca_redraw_needed (vo_driver
|
||||
|
||||
static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *visual_gen) {
|
||||
caca_class_t *class = (caca_class_t *) class_gen;
|
||||
- caca_display_t *dp = (caca_display_t *)visual_gen;
|
||||
caca_driver_t *this;
|
||||
|
||||
this = calloc(1, sizeof (caca_driver_t));
|
||||
@@ -301,13 +300,8 @@ static vo_driver_t *open_plugin (video_d
|
||||
this->yuv2rgb_factory = yuv2rgb_factory_init(MODE_32_RGB, 0, NULL);
|
||||
this->yuv2rgb_factory->set_csc_levels(this->yuv2rgb_factory, 0, 128, 128);
|
||||
|
||||
- if (dp) {
|
||||
- this->cv = caca_get_canvas(dp);
|
||||
- this->dp = dp;
|
||||
- } else {
|
||||
- this->cv = cucul_create_canvas(0, 0);
|
||||
- this->dp = caca_create_display(this->cv);
|
||||
- }
|
||||
+ this->cv = cucul_create_canvas(0, 0);
|
||||
+ this->dp = caca_create_display(this->cv);
|
||||
|
||||
caca_refresh_display(this->dp);
|
||||
return &this->vo_driver;
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
diff -up xine-lib-1.1.16.3/src/demuxers/demux_mod.c.mod_mimetypes_typo xine-lib-1.1.16.3/src/demuxers/demux_mod.c
|
||||
--- xine-lib-1.1.16.3/src/demuxers/demux_mod.c.mod_mimetypes_typo 2009-03-25 14:28:40.000000000 -0500
|
||||
+++ xine-lib-1.1.16.3/src/demuxers/demux_mod.c 2009-04-10 10:15:04.000000000 -0500
|
||||
@@ -387,11 +387,11 @@ static const char *get_mimetypes (demux_
|
||||
"audio/x-s3m: s3m: ScreamTracker 3 Module;"
|
||||
"audio/s3m: s3m: ScreamTracker 3 Module;"
|
||||
"application/playerpro: 669: 669 Tracker Module;"
|
||||
- "application/adrift; amf: ADRIFT Module File;"
|
||||
- "audio/med; med; Amiga MED/OctaMED Tracker Module Sound File;"
|
||||
- "audio/x-amf; amf: ADRIFT Module File;"
|
||||
- "audio/x-xm; xm: FastTracker II Audio;"
|
||||
- "audio/xm; xm: FastTracker II Audio;";
|
||||
+ "application/adrift: amf: ADRIFT Module File;"
|
||||
+ "audio/med: med: Amiga MED/OctaMED Tracker Module Sound File;"
|
||||
+ "audio/x-amf: amf: ADRIFT Module File;"
|
||||
+ "audio/x-xm: xm: FastTracker II Audio;"
|
||||
+ "audio/xm: xm: FastTracker II Audio;";
|
||||
}
|
||||
|
||||
static void class_dispose (demux_class_t *this_gen) {
|
||||
@ -1,7 +1,7 @@
|
||||
diff -uNr xine-lib-1.1.15.orig/src/xine-engine/audio_out.c xine-lib-1.1.15/src/xine-engine/audio_out.c
|
||||
--- xine-lib-1.1.15.orig/src/xine-engine/audio_out.c 2008-07-10 18:19:10.000000000 +0200
|
||||
+++ xine-lib-1.1.15/src/xine-engine/audio_out.c 2009-01-10 21:57:20.000000000 +0100
|
||||
@@ -1151,8 +1151,17 @@
|
||||
diff -up xine-lib-1.1.17/src/xine-engine/audio_out.c.avsync_hack xine-lib-1.1.17/src/xine-engine/audio_out.c
|
||||
--- xine-lib-1.1.17/src/xine-engine/audio_out.c.avsync_hack 2009-11-30 19:33:30.000000000 -0600
|
||||
+++ xine-lib-1.1.17/src/xine-engine/audio_out.c 2009-12-02 09:07:37.622805780 -0600
|
||||
@@ -1156,8 +1156,17 @@ static void *ao_loop (void *this_gen) {
|
||||
|
||||
/*
|
||||
* calculate gap:
|
||||
17
xine-lib-1.1.19-no_autopoint.patch
Normal file
17
xine-lib-1.1.19-no_autopoint.patch
Normal file
@ -0,0 +1,17 @@
|
||||
diff -up xine-lib-1.1.17/autogen.sh.no_autopoint xine-lib-1.1.17/autogen.sh
|
||||
--- xine-lib-1.1.17/autogen.sh.no_autopoint 2009-10-09 09:33:31.000000000 -0500
|
||||
+++ xine-lib-1.1.17/autogen.sh 2009-12-02 09:15:48.534555467 -0600
|
||||
@@ -229,10 +229,10 @@ run_aclocal () {
|
||||
echo
|
||||
fi
|
||||
|
||||
- echo $_echo_n " + Running autopoint: $_echo_c"
|
||||
+ #echo $_echo_n " + Running autopoint: $_echo_c"
|
||||
|
||||
- autopoint
|
||||
- echo "done."
|
||||
+ #autopoint
|
||||
+ #echo "done."
|
||||
|
||||
echo $_echo_n " + Running aclocal: $_echo_c"
|
||||
|
||||
32
xine-lib-1.1.21-samba4.patch
Normal file
32
xine-lib-1.1.21-samba4.patch
Normal file
@ -0,0 +1,32 @@
|
||||
diff -ur xine-lib-1.1.21/configure.ac xine-lib-1.1.21-samba4/configure.ac
|
||||
--- xine-lib-1.1.21/configure.ac 2012-07-16 21:42:38.000000000 +0200
|
||||
+++ xine-lib-1.1.21-samba4/configure.ac 2013-02-12 15:44:33.000000000 +0100
|
||||
@@ -1698,12 +1698,10 @@
|
||||
[with_samba=$enableval], [with_samba=yes])
|
||||
|
||||
if test "x$with_samba" = "xyes"; then
|
||||
- AC_CHECK_LIB(smbclient, smbc_init,
|
||||
- [ AC_CHECK_HEADER(libsmbclient.h,
|
||||
- [ have_libsmbclient=yes
|
||||
- LIBSMBCLIENT_LIBS="-lsmbclient" ],
|
||||
- AC_MSG_RESULT([*** All libsmbclient dependent parts will be disabled ***]))],
|
||||
- AC_MSG_RESULT([*** All libsmbclient dependent parts will be disabled ***]))
|
||||
+ PKG_CHECK_MODULES([LIBSMBCLIENT], [smbclient],
|
||||
+ [have_libsmbclient=yes],
|
||||
+ AC_MSG_RESULT(*** All libsmbclient dependent parts will be disabled ***))
|
||||
+ AC_SUBST(LIBSMBCLIENT_CFLAGS)
|
||||
AC_SUBST(LIBSMBCLIENT_LIBS)
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_LIBSMBCLIENT, test "x$have_libsmbclient" = "xyes")
|
||||
diff -ur xine-lib-1.1.21/src/input/Makefile.am xine-lib-1.1.21-samba4/src/input/Makefile.am
|
||||
--- xine-lib-1.1.21/src/input/Makefile.am 2012-07-16 21:42:38.000000000 +0200
|
||||
+++ xine-lib-1.1.21-samba4/src/input/Makefile.am 2013-02-12 15:46:45.000000000 +0100
|
||||
@@ -150,7 +150,7 @@
|
||||
|
||||
xineplug_inp_smb_la_SOURCES = input_smb.c
|
||||
xineplug_inp_smb_la_LIBADD = $(XINE_LIB) $(LIBSMBCLIENT_LIBS) $(LTLIBINTL)
|
||||
-xineplug_inp_smb_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
|
||||
+xineplug_inp_smb_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) $(LIBSMBCLIENT_CFLAGS)
|
||||
xineplug_inp_smb_la_LDFLAGS = $(xineplug_ldflags)
|
||||
|
||||
xineplug_inp_pvr_la_SOURCES = input_pvr.c
|
||||
@ -9,14 +9,3 @@
|
||||
archopt_val=
|
||||
|
||||
case "$host_or_hostalias" in
|
||||
--- xine-lib-1.1.4/configure~ 2007-01-30 23:02:56.000000000 +0200
|
||||
+++ xine-lib-1.1.4/configure 2007-01-30 23:03:40.000000000 +0200
|
||||
@@ -47754,7 +47754,7 @@
|
||||
|
||||
DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
|
||||
|
||||
- if test x"$sarchopt" != "xno"; then
|
||||
+ if false ; then
|
||||
archopt_val=
|
||||
|
||||
case "$host_or_hostalias" in
|
||||
|
||||
@ -6,9 +6,9 @@ if [ -z "$1" -o $# -ne 1 ]; then
|
||||
fi
|
||||
|
||||
version=$1
|
||||
tarball="xine-lib-$version.tar.bz2"
|
||||
tarball="xine-lib-$version.tar.xz"
|
||||
dir="xine-lib-$version"
|
||||
modtarball="xine-lib-$version-pruned.tar.bz2"
|
||||
modtarball="xine-lib-$version-pruned.tar.xz"
|
||||
|
||||
|
||||
if [ ! -f $tarball ]; then
|
||||
@ -18,7 +18,7 @@ fi
|
||||
|
||||
echo "Uncompressing $tarball..."
|
||||
rm -rf $dir
|
||||
tar -xjf $tarball
|
||||
tar -xJf $tarball
|
||||
cd $dir
|
||||
|
||||
rmpluglib()
|
||||
@ -30,7 +30,7 @@ rmpluglib()
|
||||
}
|
||||
|
||||
# Main libraries
|
||||
for remove in libfaad libffmpeg libmad libmpeg2 dxr3 liba52 libdts; do
|
||||
for remove in libfaad libffmpeg libmad libmpeg2 libmpeg2new dxr3 liba52 libdts; do
|
||||
echo "removing src/$remove..."
|
||||
rm -rf src/$remove
|
||||
sed -i -e "/$remove/d" src/Makefile.am
|
||||
@ -44,11 +44,14 @@ for remove in ffmpeg; do
|
||||
rmpluglib combined ffmpeg
|
||||
done
|
||||
# Input plugins
|
||||
for p in dvd vcd mms; do
|
||||
# DVD reading (dvd input plugin) has now been in Fedora for a while (libdvdread,
|
||||
# libdvdnav), the xine-lib code only wraps those libraries. (Decrypting and
|
||||
# decoding are of course still separate and forbidden in Fedora.)
|
||||
for p in vcd mms; do
|
||||
echo "removing $p input plugin..."
|
||||
# Remove sources
|
||||
for sourcefile in `awk '/^xineplug_inp_'$p'_la_SOURCES/ { $1=""; $2=""; print $0}' src/input/Makefile.am`; do
|
||||
if [ "`grep -c $sourcefile src/input/Makefile.am`" -le 1 ]; then # if this file is only used for this plugin
|
||||
if [ "`grep -v '^EXTRA_DIST = ' src/input/Makefile.am | grep -c $sourcefile`" -le 1 ]; then # if this file is only used for this plugin
|
||||
rm -f src/input/$sourcefile
|
||||
fi
|
||||
done
|
||||
@ -76,10 +79,12 @@ sed -i -e '/^xineplug_decode_nsf_la/,/^\s*$/d' \
|
||||
-e 's/ nosefart//' \
|
||||
src/libxineadec/Makefile.am
|
||||
sed -i -e '/nosefart\/Makefile/d' configure.ac
|
||||
# Patches for forbidden libraries
|
||||
rm -fv misc/lib*.patch win32/scripts/*.patch
|
||||
|
||||
# All clean !
|
||||
|
||||
cd ..
|
||||
echo "Generating $modtarball..."
|
||||
tar -cjf $modtarball $dir
|
||||
tar -cJf $modtarball $dir
|
||||
rm -rf $dir
|
||||
|
||||
@ -1,132 +0,0 @@
|
||||
# HG changeset patch
|
||||
# User Miguel Freitas <miguelfreitas@users.sourceforge.net>
|
||||
# Date 1234834587 10800
|
||||
# Node ID 2208e465026c1e54318d36dad8ca180d52fcc318
|
||||
# Parent 24a9b3d531419405f71dbcf96da93876769eb990
|
||||
Protect audio loop so it cannot write to a paused device (fix
|
||||
pause/resume freeze with pulseaudio).
|
||||
|
||||
diff -r 24a9b3d53141 -r 2208e465026c src/xine-engine/audio_out.c
|
||||
--- a/src/xine-engine/audio_out.c Fri Feb 13 18:01:29 2009 +0000
|
||||
+++ b/src/xine-engine/audio_out.c Mon Feb 16 22:36:27 2009 -0300
|
||||
@@ -243,6 +243,7 @@
|
||||
audio_fifo_t *free_fifo;
|
||||
audio_fifo_t *out_fifo;
|
||||
int64_t last_audio_vpts;
|
||||
+ pthread_mutex_t current_speed_lock;
|
||||
uint32_t current_speed; /* the current playback speed */
|
||||
/* FIXME: replace all this->clock->speed with this->current_speed. we should make
|
||||
* sure nobody will change speed without going through xine.c:set_speed_internal */
|
||||
@@ -1040,6 +1041,7 @@
|
||||
* we must process/free buffers otherwise the entire engine will stop.
|
||||
*/
|
||||
|
||||
+ pthread_mutex_lock(&this->current_speed_lock);
|
||||
if ( this->audio_loop_running &&
|
||||
(this->clock->speed == XINE_SPEED_PAUSE ||
|
||||
(this->clock->speed != XINE_FINE_SPEED_NORMAL &&
|
||||
@@ -1055,6 +1057,7 @@
|
||||
_x_refcounter_dec(in_buf->stream->refcounter);
|
||||
fifo_append (this->free_fifo, in_buf);
|
||||
in_buf = NULL;
|
||||
+ pthread_mutex_unlock(&this->current_speed_lock);
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -1065,6 +1068,7 @@
|
||||
}
|
||||
|
||||
lprintf ("loop:pause: I feel sleepy (%d buffers).\n", this->out_fifo->num_buffers);
|
||||
+ pthread_mutex_unlock(&this->current_speed_lock);
|
||||
xine_usec_sleep (10000);
|
||||
lprintf ("loop:pause: I wake up.\n");
|
||||
continue;
|
||||
@@ -1274,6 +1278,7 @@
|
||||
fifo_append (this->free_fifo, in_buf);
|
||||
in_buf = NULL;
|
||||
}
|
||||
+ pthread_mutex_unlock(&this->current_speed_lock);
|
||||
|
||||
/* Give other threads a chance to use functions which require this->driver_lock to
|
||||
* be available. This is needed when using NPTL on Linux (and probably PThreads
|
||||
@@ -1684,6 +1689,7 @@
|
||||
free (this->frame_buf[1]);
|
||||
free (this->zero_space);
|
||||
|
||||
+ pthread_mutex_destroy(&this->current_speed_lock);
|
||||
pthread_mutex_destroy(&this->flush_audio_driver_lock);
|
||||
pthread_cond_destroy(&this->flush_audio_driver_reached);
|
||||
|
||||
@@ -1910,8 +1916,15 @@
|
||||
if (value != XINE_FINE_SPEED_NORMAL && value != XINE_SPEED_PAUSE && !this->slow_fast_audio )
|
||||
this->ao.control(&this->ao, AO_CTRL_FLUSH_BUFFERS, NULL);
|
||||
|
||||
- this->ao.control(&this->ao,
|
||||
- (value == XINE_SPEED_PAUSE) ? AO_CTRL_PLAY_PAUSE : AO_CTRL_PLAY_RESUME, NULL);
|
||||
+ if( value == XINE_SPEED_PAUSE ) {
|
||||
+ /* current_speed_lock is here to make sure the ao_loop will pause in a safe place.
|
||||
+ * that is, we cannot pause writing to device, filling gaps etc. */
|
||||
+ pthread_mutex_lock(&this->current_speed_lock);
|
||||
+ this->ao.control(&this->ao, AO_CTRL_PLAY_PAUSE, NULL);
|
||||
+ pthread_mutex_unlock(&this->current_speed_lock);
|
||||
+ } else {
|
||||
+ this->ao.control(&this->ao, AO_CTRL_PLAY_RESUME, NULL);
|
||||
+ }
|
||||
this->current_speed = value;
|
||||
if( this->slow_fast_audio )
|
||||
ao_update_resample_factor(this);
|
||||
@@ -2056,6 +2069,7 @@
|
||||
this->driver = driver;
|
||||
this->xine = xine;
|
||||
this->clock = xine->clock;
|
||||
+ this->current_speed = xine->clock->speed;
|
||||
this->streams = xine_list_new();
|
||||
|
||||
/* warning: driver_lock is a recursive mutex. it must NOT be
|
||||
@@ -2087,6 +2101,7 @@
|
||||
this->discard_buffers = 0;
|
||||
this->zero_space = calloc (1, ZERO_BUF_SIZE * 4 * 6); /* MAX as 32bit, 6 channels. */
|
||||
|
||||
+ pthread_mutex_init( &this->current_speed_lock, NULL );
|
||||
pthread_mutex_init( &this->flush_audio_driver_lock, NULL );
|
||||
pthread_cond_init( &this->flush_audio_driver_reached, NULL );
|
||||
|
||||
diff -r 24a9b3d53141 -r 2208e465026c src/xine-engine/xine.c
|
||||
--- a/src/xine-engine/xine.c Fri Feb 13 18:01:29 2009 +0000
|
||||
+++ b/src/xine-engine/xine.c Mon Feb 16 22:36:27 2009 -0300
|
||||
@@ -330,17 +330,20 @@
|
||||
|
||||
static void set_speed_internal (xine_stream_t *stream, int speed) {
|
||||
xine_t *xine = stream->xine;
|
||||
+ int old_speed = xine->clock->speed;
|
||||
|
||||
- if (xine->clock->speed != XINE_SPEED_PAUSE && speed == XINE_SPEED_PAUSE)
|
||||
+ if (old_speed != XINE_SPEED_PAUSE && speed == XINE_SPEED_PAUSE)
|
||||
/* get all decoder and post threads in a state where they agree to be blocked */
|
||||
xine->port_ticket->revoke(xine->port_ticket, 0);
|
||||
|
||||
- if (xine->clock->speed == XINE_SPEED_PAUSE && speed != XINE_SPEED_PAUSE)
|
||||
+ if (old_speed == XINE_SPEED_PAUSE && speed != XINE_SPEED_PAUSE)
|
||||
/* all decoder and post threads may continue now */
|
||||
xine->port_ticket->issue(xine->port_ticket, 0);
|
||||
|
||||
- stream->xine->clock->set_fine_speed (stream->xine->clock, speed);
|
||||
-
|
||||
+ if (old_speed != XINE_SPEED_PAUSE && speed == XINE_SPEED_PAUSE)
|
||||
+ /* set master clock so audio_out loop can pause in a safe place */
|
||||
+ stream->xine->clock->set_fine_speed (stream->xine->clock, speed);
|
||||
+
|
||||
/* see coment on audio_out loop about audio_paused */
|
||||
if( stream->audio_out ) {
|
||||
xine->port_ticket->acquire(xine->port_ticket, 1);
|
||||
@@ -350,6 +353,10 @@
|
||||
|
||||
xine->port_ticket->release(xine->port_ticket, 1);
|
||||
}
|
||||
+
|
||||
+ if (old_speed == XINE_SPEED_PAUSE || speed != XINE_SPEED_PAUSE)
|
||||
+ /* master clock is set after resuming the audio device (audio_out loop may continue) */
|
||||
+ stream->xine->clock->set_fine_speed (stream->xine->clock, speed);
|
||||
}
|
||||
|
||||
|
||||
451
xine-lib.spec
451
xine-lib.spec
@ -1,10 +1,8 @@
|
||||
# TODO, sometime, maybe:
|
||||
# - libstk: http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog
|
||||
# - drop the opengl video out plugin?
|
||||
# http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html
|
||||
# - deprecate ESD support?
|
||||
|
||||
%define plugin_abi 1.26
|
||||
%define plugin_abi 1.30
|
||||
%define codecdir %{_libdir}/codecs
|
||||
|
||||
%ifarch %{ix86}
|
||||
@ -13,65 +11,91 @@
|
||||
%define have_vidix 0
|
||||
%endif # ix86
|
||||
|
||||
%if 0%{?fedora} <= 9
|
||||
%define old_caca 1
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora}
|
||||
%define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1}
|
||||
%define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
|
||||
%define with_xcb %{?_without_xcb:0}%{!?_without_xcb:1}
|
||||
%define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1}
|
||||
# FIXME: libmodplug-0.8.8.5-1 regressed (pkgconfig --cflags dropped -I/usr/include/libmodplug), and now FTBFS
|
||||
#define _enable_modplug --enable-modplug
|
||||
%else
|
||||
%define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0}
|
||||
%define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
|
||||
%define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0}
|
||||
%define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0}
|
||||
%endif # Fedora
|
||||
|
||||
%if 0%{?fedora} > 8
|
||||
%ifarch %{arm}
|
||||
%define _without_directfb 1
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} > 14
|
||||
%define _disable_v4l1 1
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} > 16
|
||||
%define _without_esound 1
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} > 16
|
||||
%define bluray 1
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} > 19
|
||||
%define _without_directfb 1
|
||||
%endif
|
||||
|
||||
%define _enable_xvmc --enable-xvmc
|
||||
%if 0%{?rhel} > 5
|
||||
%ifarch ppc64
|
||||
%undefine _enable_xvmc
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} > 8 || 0%{?rhel} > 5
|
||||
%define _enable_v4l --enable-v4l --enable-libv4l
|
||||
%define _without_arts --without-arts
|
||||
%define _with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
|
||||
%define _with_xcb 1
|
||||
%define _with_smbclient 1
|
||||
%endif
|
||||
|
||||
Summary: A multimedia engine
|
||||
Name: xine-lib
|
||||
Version: 1.1.16.3
|
||||
Release: 2%{?dist}.1
|
||||
Version: 1.1.21
|
||||
Release: 10%{?dist}
|
||||
License: GPLv2+
|
||||
Group: System Environment/Libraries
|
||||
URL: http://xinehq.de/
|
||||
URL: http://www.xine-project.org/
|
||||
# The tarball is generated from the upstream tarball using
|
||||
# the script in SOURCE1. It prunes potentially patented code
|
||||
#Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2
|
||||
Source0: %{name}-%{version}-pruned.tar.bz2
|
||||
Source1: %{name}-cleanup-sources.sh
|
||||
Source2: %{name}-mk-autotools-patch.sh
|
||||
# autotools patch created with source2
|
||||
Patch0: %{name}-%{version}-autotools.patch.bz2
|
||||
#Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.xz
|
||||
Source0: xine-lib-%{version}-pruned.tar.xz
|
||||
Source1: xine-lib-cleanup-sources.sh
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Patch1: %{name}-1.1.4-optflags.patch
|
||||
Patch6: %{name}-1.1.1-deepbind-939.patch
|
||||
Patch7: %{name}-1.1.16-old-caca.patch
|
||||
Patch0: xine-lib-1.1.19-no_autopoint.patch
|
||||
Patch1: xine-lib-1.1.4-optflags.patch
|
||||
# http://bugzilla.redhat.com/470568
|
||||
Patch8: xine-lib-1.1.15-avsync_hack.patch
|
||||
Patch2: xine-lib-1.1.17-avsync_hack.patch
|
||||
# http://bugzilla.redhat.com/477226
|
||||
Patch9: xine-lib-1.1.16.2-multilib.patch
|
||||
## upstreamable patches
|
||||
Patch50: xine-lib-1.1.16.3-mod_mimetypes_typo.patch
|
||||
## upstream patches
|
||||
Patch3: xine-lib-1.1.16.2-multilib.patch
|
||||
# find the Samba 4 libsmbclient.h using pkg-config (#909825)
|
||||
Patch4: xine-lib-1.1.21-samba4.patch
|
||||
|
||||
Provides: xine-lib(plugin-abi) = %{plugin_abi}
|
||||
%if "%{?_isa}" != "%{nil}"
|
||||
Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}
|
||||
%endif
|
||||
%{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}}
|
||||
|
||||
# DVD plugin moved from there
|
||||
Conflicts: xine-lib-extras-freeworld < 1.1.21-3
|
||||
|
||||
BuildRequires: autoconf automake libtool
|
||||
# X11
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: libXv-devel
|
||||
BuildRequires: libXinerama-devel
|
||||
BuildRequires: libXvMC-devel
|
||||
%{?_enable_xvmc:BuildRequires: libXvMC-devel}
|
||||
BuildRequires: libGLU-devel
|
||||
%if %{with_xcb}
|
||||
%if 0%{?_enable_v4l:1}
|
||||
BuildRequires: libv4l-devel
|
||||
%endif
|
||||
%if 0%{?_with_xcb}
|
||||
BuildRequires: libxcb-devel
|
||||
%endif # xcb
|
||||
%endif
|
||||
# Video
|
||||
BuildRequires: SDL-devel
|
||||
BuildRequires: libtheora-devel
|
||||
@ -79,50 +103,53 @@ BuildRequires: libmng-devel
|
||||
%if %{with_aalib}
|
||||
BuildRequires: aalib-devel >= 1.4
|
||||
%endif # aalib
|
||||
%if 0%{?old_caca}
|
||||
BuildRequires: libcaca-devel >= 0.99
|
||||
%else
|
||||
BuildRequires: libcaca-devel >= 0.99-0.5.beta14
|
||||
%endif
|
||||
%if 0%{!?_without_directfb:1}
|
||||
BuildRequires: directfb-devel
|
||||
%endif # directfb
|
||||
%if 0%{!?_without_imagemagick:1}
|
||||
BuildRequires: ImageMagick-devel >= 6.2.4.6-1
|
||||
%endif # imagemagick
|
||||
%if 0%{?_with_freetype:1}
|
||||
BuildRequires: fontconfig-devel
|
||||
%endif # freetype
|
||||
# Audio
|
||||
BuildRequires: alsa-lib-devel >= 0.9.0
|
||||
%if 0%{!?_without_esound:1}
|
||||
BuildRequires: esound-devel
|
||||
%endif # esound
|
||||
BuildRequires: flac-devel
|
||||
BuildRequires: jack-audio-connection-kit-devel
|
||||
%if 0%{?_enable_modplug:1}
|
||||
BuildRequires: libmodplug-devel
|
||||
%endif
|
||||
BuildRequires: libmpcdec-devel
|
||||
BuildRequires: libvorbis-devel
|
||||
%if %{with_pa}
|
||||
BuildRequires: pulseaudio-lib-devel
|
||||
%endif # pa
|
||||
BuildRequires: speex-devel
|
||||
%if 0%{?_without_arts:1}
|
||||
Obsoletes: xine-lib-arts < %{version}-%{release}
|
||||
%else
|
||||
BuildRequires: arts-devel
|
||||
%endif
|
||||
BuildRequires: wavpack-devel
|
||||
# CDs
|
||||
BuildRequires: libcdio-devel
|
||||
# Other
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: gnome-vfs2-devel
|
||||
%if 0%{?_with_pa}
|
||||
BuildRequires: pkgconfig(libpulse)
|
||||
%endif
|
||||
BuildRequires: gtk2-devel
|
||||
%if 0%{?fedora} > 6 || 0%{?rhel} > 5
|
||||
BuildRequires: libsmbclient-devel
|
||||
%else
|
||||
BuildRequires: samba-common
|
||||
%if 0%{?_with_smbclient}
|
||||
BuildRequires: pkgconfig(smbclient)
|
||||
%endif
|
||||
BuildRequires: libdvdnav-devel
|
||||
BuildRequires: libdvdread-devel
|
||||
%if 0%{?bluray}
|
||||
BuildRequires: libbluray-devel
|
||||
%endif
|
||||
|
||||
%if 0%{?_without_arts:1}
|
||||
# Dropped in Fedora 9
|
||||
Obsoletes: xine-lib-arts < %{version}-%{release}
|
||||
%endif
|
||||
|
||||
# Included in main package since Fedora 12
|
||||
%if 0%{?fedora} > 11
|
||||
Obsoletes: xine-lib-pulseaudio < 1.1.16.3-5
|
||||
Provides: xine-lib-pulseaudio = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%description
|
||||
This package contains the Xine library. It can be used to play back
|
||||
@ -133,86 +160,60 @@ common multimedia formats available - and some uncommon formats, too.
|
||||
%package devel
|
||||
Summary: Xine library development files
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
Requires: zlib-devel
|
||||
|
||||
%description devel
|
||||
This package contains development files for %{name}.
|
||||
|
||||
%package arts
|
||||
Summary: aRts plugin for %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
#Requires: xine-lib(plugin-abi) = %{plugin_abi}
|
||||
# -arts was split off the -extras subpackage at 1.1.7-3
|
||||
Obsoletes: xine-lib-extras < 1.1.7-3
|
||||
|
||||
%description arts
|
||||
This package contains the aRts plugin for %{name}.
|
||||
|
||||
%package pulseaudio
|
||||
Summary: Pulseaudio plugin for %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
# -pulseaudio was split off -extras at 1.1.11.1-2
|
||||
#Obsoletes: xine-lib-extras < 1.1.11.1-2
|
||||
|
||||
%description pulseaudio
|
||||
This package contains the pulseaudio plugin for %{name}.
|
||||
|
||||
|
||||
%package extras
|
||||
Summary: Additional plugins for %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
#Requires: xine-lib(plugin-abi) = %{plugin_abi}
|
||||
|
||||
%description extras
|
||||
This package contains extra plugins for %{name}:
|
||||
%if 0%{!?_without_esound:1}
|
||||
- EsounD
|
||||
%endif # esound
|
||||
- JACK
|
||||
- GDK-Pixbuf
|
||||
- GNOME VFS
|
||||
- SMB
|
||||
- SDL
|
||||
%if %{with_aalib}
|
||||
- AA-lib
|
||||
%endif # aalib
|
||||
- Libcaca
|
||||
%if 0%{!?_without_imagemagick:1}
|
||||
- Image decoding
|
||||
%endif # imagemagick
|
||||
%if 0%{!?_without_directfb:1}
|
||||
- DirectFB output
|
||||
%endif # directfb
|
||||
|
||||
%if ! 0%{?_without_arts:1}
|
||||
%package arts
|
||||
Summary: aRts plugin for %{name}
|
||||
Group: System Environment/Libraries
|
||||
BuildRequires: arts-devel
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
#Requires: xine-lib(plugin-abi) = %{plugin_abi}
|
||||
# -arts was split off the -extras subpackage at 1.1.7-3
|
||||
Obsoletes: xine-lib-extras < 1.1.7-3
|
||||
%description arts
|
||||
This package contains the aRts plugin for %{name}.
|
||||
%endif
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%if 0%{?old_caca}
|
||||
sed -i -e 's/caca >= 0\.99beta14 cucul >= 0\.99beta14/caca cucul/g' configure.ac
|
||||
%endif
|
||||
%patch0 -p1 -b .autotools
|
||||
touch -r configure.ac aclocal.m4
|
||||
touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
|
||||
%patch0 -p1 -b .no_autopoint
|
||||
# extra work for to omit old libtool-related crud
|
||||
rm -f configure ltmain.sh libtool m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4
|
||||
%patch1 -p1 -b .optflags
|
||||
touch -r m4/optimizations.m4.stamp m4/optimizations.m4
|
||||
# needed at least when compiling with external ffmpeg and internal faad livna bug#939.
|
||||
# see also http://bugzilla.redhat.com/480504 for side-effects
|
||||
#patch6 -p1 -b .deepbind
|
||||
%patch2 -p1 -b .avsync_hack
|
||||
%patch3 -p1 -b .multilib
|
||||
%patch4 -p1 -b .samba4
|
||||
|
||||
%if 0%{?old_caca}
|
||||
sed -i -e 's/caca >= 0\.99beta14 cucul >= 0\.99beta14/caca cucul/g' configure
|
||||
%patch7 -p0 -b .old-caca
|
||||
%endif
|
||||
|
||||
%patch8 -p1 -b .avsync_hack
|
||||
%patch9 -p1 -b .multilib
|
||||
%patch50 -p1 -b .mod_mimetypes_typo
|
||||
|
||||
# Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex )
|
||||
#sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
|
||||
./autogen.sh noconfig
|
||||
|
||||
|
||||
%build
|
||||
@ -227,26 +228,28 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
|
||||
%if 0%{!?_without_directfb:1}
|
||||
--enable-directfb \
|
||||
%endif # directfb
|
||||
%{?_enable_modplug}%{!?_enable_modplug:--disable-modplug} \
|
||||
%{?_enable_v4l}%{!?_enable_v4l:--disable-v4l --disable-libv4l} \
|
||||
%{?_enable_xvmc}%{!?_enable_xvmc:--disable-xvmc} \
|
||||
--disable-gnomevfs \
|
||||
--disable-a52dec \
|
||||
--disable-mad \
|
||||
--disable-vcd \
|
||||
--disable-asf \
|
||||
--disable-faad \
|
||||
%if 0%{?_with_freetype:1}
|
||||
%if 0%{?_with_antialiasing:1}
|
||||
--enable-antialiasing \
|
||||
--with-caca \
|
||||
%endif # antialiasing
|
||||
--with-freetype \
|
||||
--with-fontconfig \
|
||||
%endif # freetype
|
||||
--with-caca \
|
||||
--with-external-ffmpeg \
|
||||
--with-external-dvdnav \
|
||||
%{?_with_xcb:--with-xcb}%{!?with_xcb:--without-xcb} \
|
||||
--with-xv-path=%{_libdir} \
|
||||
--with-libflac \
|
||||
--with-external-libmpcdec \
|
||||
%if 0%{?_without_imagemagick:1}
|
||||
--without-imagemagick \
|
||||
%endif # imagemagick
|
||||
%if 0%{?_without_esound:1}
|
||||
--without-esound \
|
||||
%endif
|
||||
%{!?_without_arts:--with-arts} %{?_without_arts} \
|
||||
--with-wavpack \
|
||||
--with-real-codecs-path=%{codecdir} \
|
||||
@ -270,6 +273,12 @@ rm -Rf $RPM_BUILD_ROOT%{_libdir}/libxine.la __docs/README \
|
||||
# Directory for binary codecs
|
||||
mkdir -p $RPM_BUILD_ROOT%{codecdir}
|
||||
|
||||
# unpackaged files
|
||||
%if 0%{?_disable_v4l1:1}
|
||||
rm -fv $RPM_BUILD_ROOT%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so
|
||||
rm -fv $RPM_BUILD_ROOT%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so
|
||||
%endif
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
@ -320,11 +329,14 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_file.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_none.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_oss.so
|
||||
%if 0%{?_with_pa:1}
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so
|
||||
%endif
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_bitplane.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gsm610.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_lpcm.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_mpc.so
|
||||
%ifarch %ix86
|
||||
%ifarch %{ix86}
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_qt.so
|
||||
%endif # ix86
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_real.so
|
||||
@ -334,10 +346,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spucc.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spucmml.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spudvb.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spuhdmv.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_sputext.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_theora.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_vorbis.so
|
||||
%ifarch %ix86
|
||||
%ifarch %{ix86}
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_w32dll.so
|
||||
%endif # ix86
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_yuv.so
|
||||
@ -366,17 +379,26 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_yuv_frames.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_yuv4mpeg2.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_flac.so
|
||||
%if 0%{?bluray}
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_bluray.so
|
||||
%endif
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_cdda.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_dvb.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_dvd.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_file.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_http.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_net.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pnm.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtp.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtsp.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_stdin_fifo.so
|
||||
%if 0%{?_enable_v4l:1}
|
||||
%if ! 0%{?_disable_v4l1:1}
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so
|
||||
%endif
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l2.so
|
||||
%endif
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_fb.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_none.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_opengl.so
|
||||
@ -385,14 +407,16 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%if %{have_vidix}
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_vidix.so
|
||||
%endif # vidix
|
||||
%if %{with_xcb}
|
||||
%if 0%{?_with_xcb}
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbshm.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbxv.so
|
||||
%endif # xcb
|
||||
%endif
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xshm.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xv.so
|
||||
%if 0%{?_enable_xvmc:1}
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xvmc.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xxmc.so
|
||||
%endif
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_wavpack.so
|
||||
|
||||
%if 0%{!?_without_arts:1}
|
||||
@ -401,22 +425,17 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_arts.so
|
||||
%endif
|
||||
|
||||
%if %{with_pa}
|
||||
%files pulseaudio
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so
|
||||
%endif
|
||||
|
||||
%files extras
|
||||
%defattr(-,root,root,-)
|
||||
%if 0%{!?_without_esound:1}
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_esd.so
|
||||
%endif # esound
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_jack.so
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gdk_pixbuf.so
|
||||
%if 0%{!?_without_imagemagick:1}
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_image.so
|
||||
%endif # imagemagick
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_gnome_vfs.so
|
||||
%if 0%{?_with_smbclient}
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_smb.so
|
||||
%endif
|
||||
%if %{with_aalib}
|
||||
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_aa.so
|
||||
%endif # aalib
|
||||
@ -442,6 +461,122 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Aug 26 2014 Rex Dieter <rdieter@fedoraproject.org> - 1.1.21-10
|
||||
- add conditionals to support el5/el6, fix/cleanup other conditionals
|
||||
- omit libmodplug support (for now, FTBFS)
|
||||
|
||||
* Sat Aug 31 2013 Till Maas <opensource@till.name> - 1.1.21-9
|
||||
- Disable directfb support for Fedora 20 and newer, because it was retired
|
||||
|
||||
* Tue Aug 27 2013 Jon Ciesla <limburgher@gmail.com> - 1.1.21-8
|
||||
- libmng rebuild.
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.21-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Sat Mar 30 2013 Kevin Fenzi <kevin@scrye.com> - 1.1.21-6
|
||||
- Rebuild for broken deps in rawhide
|
||||
|
||||
* Tue Feb 12 2013 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.1.21-5
|
||||
- find the Samba 4 libsmbclient.h using pkg-config, fixes FTBFS (#909825)
|
||||
|
||||
* Mon Sep 17 2012 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.1.21-4
|
||||
- rebuild for new directfb
|
||||
|
||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.21-3.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Sat Jul 21 2012 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.1.21-2.1
|
||||
- disable libbluray support on F16, libbluray too old
|
||||
|
||||
* Mon Jul 16 2012 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.1.21-2
|
||||
- do not remove DVD plugin, not encumbered (only uses libdvdread/libdvdnav)
|
||||
|
||||
* Tue Jun 12 2012 Xavier Bachelot <xavier@bachelot.org> 1.1.21-1
|
||||
- Update to 1.1.21.
|
||||
- Enable libbluray support.
|
||||
|
||||
* Sat Mar 10 2012 Rex Dieter <rdieter@fedoraproject.org> 1.1.20.1-3
|
||||
- rebuild (ImageMagick)
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.20.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Tue Jan 03 2012 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.1.20.1-1
|
||||
- update to 1.1.20.1 (bugfix release)
|
||||
- drop upstreamed link-libdvdread patch
|
||||
|
||||
* Sun Nov 20 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.1.20-1
|
||||
- update to 1.1.20 (#753758)
|
||||
- use .xz tarball
|
||||
- drop old conditionals
|
||||
- drop ESD (esound) support on F17+ (native PulseAudio just works)
|
||||
- drop autotools patch, run autogen.sh in %%prep instead
|
||||
- drop unused deepbind patch
|
||||
- drop xvmclib_header patch, fixed upstream
|
||||
- use the system libdvdnav (and libdvdread) instead of the bundled one
|
||||
- fix system libdvdnav support to also link libdvdread
|
||||
- plugin ABI is now 1.30
|
||||
|
||||
* Fri Jul 15 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.1.19-7
|
||||
- rebuild for new DirectFB (1.5.0)
|
||||
|
||||
* Mon Feb 14 2011 Rex Dieter <rdieter@fedoraproject.org> 1.1.19-6
|
||||
- split v4l, libv4l handling
|
||||
- omit v4l(1) bits (f15+)
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.19-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Mon Jan 24 2011 Rex Dieter <rdieter@fedoraproject.org> - 1.1.19-4
|
||||
- xvmclib header changes, fixes ftbfs (#635653,#661071)
|
||||
|
||||
* Sun Nov 28 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1.1.19-3
|
||||
- rebuild for new directfb (1.4.11)
|
||||
|
||||
* Wed Sep 15 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.1.19-2
|
||||
- rebuild (ImageMagick)
|
||||
|
||||
* Sun Jul 25 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.1.19-1
|
||||
- 1.1.19
|
||||
|
||||
* Mon Jul 19 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.1.18.1-3
|
||||
- no directfb on arm (yet)
|
||||
|
||||
* Tue Jun 1 2010 Ville Skyttä <ville.skytta@iki.fi> - 1.1.18.1-2
|
||||
- Rebuild.
|
||||
|
||||
* Sun Mar 07 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.1.18.1-1
|
||||
- xine-lib-1.1.18.1
|
||||
|
||||
* Sun Mar 07 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.1.18-2
|
||||
- rebuild (ImageMagick)
|
||||
|
||||
* Wed Feb 24 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.1.18-1
|
||||
- xine-lib-1.1.18, plugin-abi 1.28 (#567913)
|
||||
|
||||
* Sat Dec 12 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.17-3
|
||||
- bump flac_decoder priority (rh#301861,xine#225)
|
||||
|
||||
* Mon Dec 07 2009 Bastien Nocera <bnocera@redhat.com> 1.1.17-2
|
||||
- Remove gnome-vfs2 plugin, it's mostly useless
|
||||
|
||||
* Wed Dec 02 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.17-1
|
||||
- xine-lib-1.1.17, plugin-abi 1.27
|
||||
|
||||
* Sun Nov 29 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.16.3-5
|
||||
- move -pulseaudio into main pkg (f12+)
|
||||
- update URL
|
||||
|
||||
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.16.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Thu Jul 02 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.16.3-3
|
||||
- rebuild (DirectFB)
|
||||
|
||||
* Fri Apr 17 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.16.3-2.1
|
||||
- drop old_caca hacks/patches (F-9)
|
||||
|
||||
* Fri Apr 10 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.1.16.3-2
|
||||
- fix modtracker mimetypes
|
||||
|
||||
@ -513,10 +648,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
* Thu Apr 24 2008 Rex Dieter <rdieter@fedoraproject.org> - 1.1.12-2
|
||||
- CVE-2008-1878
|
||||
|
||||
* Wed Apr 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.12-1
|
||||
* Wed Apr 16 2008 Ville Skyttä <ville.skytta@iki.fi> - 1.1.12-1
|
||||
- 1.1.12 (plugin ABI 1.21); qt, mkv, and pulseaudio patches applied upstream.
|
||||
|
||||
* Wed Apr 9 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11.1-3
|
||||
* Wed Apr 9 2008 Ville Skyttä <ville.skytta@iki.fi> - 1.1.11.1-3
|
||||
- Apply upstream fixes for Quicktime (#441705) and Matroska regressions
|
||||
introduced in 1.1.11.1.
|
||||
|
||||
@ -524,12 +659,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
- pulse-rework2 patch (#439731)
|
||||
- -pulseaudio subpkg (#439731)
|
||||
|
||||
* Sun Mar 30 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11.1-1
|
||||
* Sun Mar 30 2008 Ville Skyttä <ville.skytta@iki.fi> - 1.1.11.1-1
|
||||
- 1.1.11.1 (security update, #438663, CVE-2008-1482).
|
||||
- Provide versioned xine-lib(plugin-abi) so 3rd party packages installing
|
||||
plugins can use it instead of requiring a version of xine-lib.
|
||||
|
||||
* Wed Mar 19 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11-1
|
||||
* Wed Mar 19 2008 Ville Skyttä <ville.skytta@iki.fi> - 1.1.11-1
|
||||
- 1.1.11 (security update, #438182, CVE-2008-0073).
|
||||
- Drop jack and wavpack build conditionals.
|
||||
- Specfile cleanups.
|
||||
@ -537,37 +672,37 @@ rm -rf $RPM_BUILD_ROOT
|
||||
* Fri Mar 7 2008 Rex Dieter <rdieter@fedoraproject.org> - 1.1.10.1-1.1
|
||||
- xcb support for f7+ (#373411)
|
||||
|
||||
* Fri Feb 8 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10.1-1
|
||||
* Fri Feb 8 2008 Ville Skyttä <ville.skytta@iki.fi> - 1.1.10.1-1
|
||||
- 1.1.10.1 (security update, #431541).
|
||||
|
||||
* Sun Jan 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-2
|
||||
* Sun Jan 27 2008 Ville Skyttä <ville.skytta@iki.fi> - 1.1.10-2
|
||||
- Include spu, spucc, and spucmml decoders (#213597).
|
||||
|
||||
* Sun Jan 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-1
|
||||
* Sun Jan 27 2008 Ville Skyttä <ville.skytta@iki.fi> - 1.1.10-1
|
||||
- 1.1.10 (security update).
|
||||
|
||||
* Mon Jan 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9.1-3
|
||||
* Mon Jan 21 2008 Ville Skyttä <ville.skytta@iki.fi> - 1.1.9.1-3
|
||||
- Fix version number in libxine.pc (#429487).
|
||||
|
||||
* Sun Jan 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9.1-2
|
||||
* Sun Jan 20 2008 Ville Skyttä <ville.skytta@iki.fi> - 1.1.9.1-2
|
||||
- Disable upstream "discard buffers on ao close" 1.1.9 changeset (#429182).
|
||||
|
||||
* Sat Jan 12 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9.1-1
|
||||
* Sat Jan 12 2008 Ville Skyttä <ville.skytta@iki.fi> - 1.1.9.1-1
|
||||
- 1.1.9.1 (security update).
|
||||
|
||||
* Sun Jan 6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9-1
|
||||
* Sun Jan 6 2008 Ville Skyttä <ville.skytta@iki.fi> - 1.1.9-1
|
||||
- 1.1.9.
|
||||
|
||||
* Thu Sep 27 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-6
|
||||
* Thu Sep 27 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1.8-6
|
||||
- Enable wavpack support by default for all distros.
|
||||
|
||||
* Sun Sep 23 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-5
|
||||
* Sun Sep 23 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1.8-5
|
||||
- Enable JACK support by default for all distros.
|
||||
|
||||
* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-4
|
||||
* Wed Sep 19 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1.8-4
|
||||
- Fix "--without wavpack" build.
|
||||
|
||||
* Sat Sep 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-3
|
||||
* Sat Sep 15 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1.8-3
|
||||
- Move XCB plugins to the main package.
|
||||
- Make aalib, caca, pulseaudio, jack, and wavpack support optional at build
|
||||
time in preparation for the first EPEL build.
|
||||
@ -576,63 +711,63 @@ rm -rf $RPM_BUILD_ROOT
|
||||
- remove the dependency from -extras to -arts, and use Obsoletes to
|
||||
provide an upgrade path
|
||||
|
||||
* Thu Aug 30 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-1
|
||||
* Thu Aug 30 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1.8-1
|
||||
- 1.1.8, "open" patch applied upstream.
|
||||
- Build XCB plugins by default for Fedora 8+ only.
|
||||
|
||||
* Sat Aug 25 2007 Aurelien Bompard <abompard@fedoraproject.org> 1.1.7-3
|
||||
- Split the aRts plugin into its own subpackage
|
||||
|
||||
* Tue Aug 14 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.7-2
|
||||
* Tue Aug 14 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1.7-2
|
||||
- Include XCB output plugins (in -extras at least for now).
|
||||
- Protect "open" with glibc 2.6.90 and -D_FORTIFY_SOURCE=2.
|
||||
- Clean up %%configure options.
|
||||
- License: GPLv2+
|
||||
|
||||
* Thu Jun 7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.7-1
|
||||
* Thu Jun 7 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1.7-1
|
||||
- 1.1.7.
|
||||
|
||||
* Wed Jun 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 1.1.6-3
|
||||
- respin (for libmpcdec)
|
||||
|
||||
* Wed Apr 25 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.6-2
|
||||
* Wed Apr 25 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1.6-2
|
||||
- Make Real codec search path /usr/lib(64)/codecs again (#237743).
|
||||
|
||||
* Wed Apr 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.6-1
|
||||
* Wed Apr 18 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1.6-1
|
||||
- 1.1.6.
|
||||
|
||||
* Wed Apr 11 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.5-1
|
||||
* Wed Apr 11 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1.5-1
|
||||
- 1.1.5.
|
||||
- Include GSM 06.10 decoder (#228186).
|
||||
- Re-enable CACA support.
|
||||
|
||||
* Sun Apr 8 2007 Ville Skyttä <ville.skytta at iki.fi>
|
||||
* Sun Apr 8 2007 Ville Skyttä <ville.skytta@iki.fi>
|
||||
- Exclude vidix dir on systems that don't have vidix.
|
||||
- Specfile cleanups.
|
||||
|
||||
* Mon Mar 26 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-4
|
||||
* Mon Mar 26 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1.4-4
|
||||
- Add PulseAudio support (in -extras, #234035/Jost Diederichs).
|
||||
- Adjust Samba build dependencies to work for both <= and > FC6.
|
||||
- Add --with freetype and --with antialiasing build time options,
|
||||
default disabled, and an upstream patch for FreeType memory leak (#233194).
|
||||
|
||||
* Sat Mar 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-3
|
||||
* Sat Mar 10 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1.4-3
|
||||
- Apply upstream fix for CVE-2007-1246.
|
||||
|
||||
* Wed Feb 14 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-2
|
||||
* Wed Feb 14 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1.4-2
|
||||
- Rebuild.
|
||||
|
||||
* Wed Jan 31 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-1
|
||||
* Wed Jan 31 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1.4-1
|
||||
- 1.1.4, with wavpack and system libmpcdec support.
|
||||
|
||||
* Thu Jan 18 2007 Aurelien Bompard <abompard@fedoraproject.org> 1.1.3-4
|
||||
- rebuild
|
||||
|
||||
* Wed Jan 3 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.3-3
|
||||
* Wed Jan 3 2007 Ville Skyttä <ville.skytta@iki.fi> - 1.1.3-3
|
||||
- Fix libflac decoder with FLAC < 1.1.3 (#220961).
|
||||
- Apply upstream patch for FLAC >= 1.1.3.
|
||||
|
||||
* Sun Dec 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.3-2
|
||||
* Sun Dec 17 2006 Ville Skyttä <ville.skytta@iki.fi> - 1.1.3-2
|
||||
- Don't run autotools during build.
|
||||
|
||||
* Mon Dec 04 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.1.3-1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user