From 371c629f8b170ffcdcbe76906dadda5869962044de11f7a5f74f287412d21796 Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Sat, 26 May 2012 21:05:10 +0000 Subject: [PATCH] - update to 1.2.1 * The "I'm at Tyneside LUG" release. * Enable PulseAudio, JACK and VDPAU on the Hurd. * Rewrite of VDPAU OSD handling. * sndio plugin is now buildable. * Various bug fixes. - first build of xine-lib-12 for packman OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=56 --- README.SuSE | 26 - baselibs.conf | 2 +- precheckin_cripple_tarball.sh | 6 +- vdr-xine-0.9.3.diff.bz2 | 3 - vdr-xine-SUSE.diff | 12 - xine-configure.diff | 11 - xine-lib-1.1.20.1-assert.patch | 11 - xine-lib-1.1.20.1-crippled.tar.bz2 | 3 - ...ib-1.1.20.1-demuxcheckfor_mad_ffmpeg.patch | 37 - ...-lib-1.1.20.1-glitch-free-pulseaudio.patch | 22 - xine-lib-1.1.20.1-ia64-is-not-alpha.diff | 18 - xine-lib-1.1.20.1-install-plugins-helper.diff | 266 --- xine-lib-1.1.20.1-mjpegplugin.diff | 1252 ------------- xine-lib-1.1.20.1-zlib-hg10322.diff | 51 - xine-lib-1.1.20.1.tar.bz2 | 3 - xine-lib-1.2.1-crippled.tar.bz2 | 3 + xine-lib-1.2.1.tar.bz2 | 3 + xine-lib-crippled-LOCAL.diff | 87 - xine-lib-doc-fix-X11R6.diff | 35 - xine-lib-ffmpeg11.patch | 388 ++++ xine-lib-libdvdread_udf.diff | 24 +- xine-lib-v4l-2.6.38.patch | 26 +- xine-lib-various-noncrippled.diff | 15 - xine-lib-without-ffmpeg.patch | 32 + xine-lib.changes | 1587 +---------------- xine-lib.spec | 569 ++---- 26 files changed, 654 insertions(+), 3838 deletions(-) delete mode 100644 README.SuSE delete mode 100644 vdr-xine-0.9.3.diff.bz2 delete mode 100644 vdr-xine-SUSE.diff delete mode 100644 xine-configure.diff delete mode 100644 xine-lib-1.1.20.1-assert.patch delete mode 100644 xine-lib-1.1.20.1-crippled.tar.bz2 delete mode 100644 xine-lib-1.1.20.1-demuxcheckfor_mad_ffmpeg.patch delete mode 100644 xine-lib-1.1.20.1-glitch-free-pulseaudio.patch delete mode 100644 xine-lib-1.1.20.1-ia64-is-not-alpha.diff delete mode 100644 xine-lib-1.1.20.1-install-plugins-helper.diff delete mode 100644 xine-lib-1.1.20.1-mjpegplugin.diff delete mode 100644 xine-lib-1.1.20.1-zlib-hg10322.diff delete mode 100644 xine-lib-1.1.20.1.tar.bz2 create mode 100644 xine-lib-1.2.1-crippled.tar.bz2 create mode 100644 xine-lib-1.2.1.tar.bz2 delete mode 100644 xine-lib-crippled-LOCAL.diff delete mode 100644 xine-lib-doc-fix-X11R6.diff create mode 100644 xine-lib-ffmpeg11.patch delete mode 100644 xine-lib-various-noncrippled.diff create mode 100644 xine-lib-without-ffmpeg.patch diff --git a/README.SuSE b/README.SuSE deleted file mode 100644 index 6d4fa40..0000000 --- a/README.SuSE +++ /dev/null @@ -1,26 +0,0 @@ -For legal reasons this version of xine has limited functionality. Here is -a list of what has been disabled: - -AC3 and AC4.1 sound decoding. Probably patented. Maybe legal if it is not labeled as XX-Y. -ASF parsing. Patented. -Closed Captioning Decoder (EIA-608). Probably patented. -GSM 610 decoding. Patented. -MPEG-4 (FFMPEG) codecs. Patented. -MS Video-1. Used in AVI and ASF. AVI is okay, ASF is not. -Sorenson video codec. Reverse engineering, no legal expertise. -Direct Hardware Access. Uncertain legal status. - -Freeware Advanced Audio Decoder. No legal expertise. -Interplay DPCM Audio Decoder. No legal expertise. -Interplay MVE File Video Decoder. No legal expertise. -NES Music File Format. No legal expertise. -Origin's Wing Commander III MVE format. No legal expertise. -SPU DVD subtitles. No legal expertise. - -CSS decoding needs extra library (libdvdcss), which is not part of SuSE Linux - -Advanced users can build an RPM package and install also the additional -"libxine1-codecs" rpm, which contains all protected codecs. - -See also -http://www.opensuse.org/XINE#Legal_Matters diff --git a/baselibs.conf b/baselibs.conf index 066e309..b583a14 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libxine1 +libxine2 diff --git a/precheckin_cripple_tarball.sh b/precheckin_cripple_tarball.sh index b46f36b..70ab12a 100644 --- a/precheckin_cripple_tarball.sh +++ b/precheckin_cripple_tarball.sh @@ -58,13 +58,11 @@ pushd $tmp/$tarbase >/dev/null || exit 1 echo 1>&2 "Crippling..." -c_subdirs="dxr3 liba52 libdts libfaad libffmpeg libmad libmpeg2 libspucc libspudec libspudvb libw32dll input/vcd libxineadec/gsm610 libxineadec/nosefart combined/ffmpeg" +c_subdirs="dxr3 liba52 libdts libfaad libffmpeg libmad libmpeg2 libspucc libspudec libspudvb libw32dll input/vcd combined/ffmpeg" 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" -cp src/libffmpeg/libavcodec/libpostproc/mangle.h src/post/deinterlace/plugins/ - do_nukeentry src/Makefile.am "$c_subdirs" do_nukeentry configure.ac "$c_subdirs" "src/" "/[a-zA-Z0-9_./]*Makefile" do_remove src "$c_subdirs" @@ -72,8 +70,6 @@ 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/libxineadec/Makefile.am "$c_libxineadec" -do_remove src/libxineadec "$c_libxineadec" 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" diff --git a/vdr-xine-0.9.3.diff.bz2 b/vdr-xine-0.9.3.diff.bz2 deleted file mode 100644 index 806981e..0000000 --- a/vdr-xine-0.9.3.diff.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ea7e34360650470f5da0164b6817e5301d60f337331e5e316752d3e1792c71b -size 24923 diff --git a/vdr-xine-SUSE.diff b/vdr-xine-SUSE.diff deleted file mode 100644 index 171d5e7..0000000 --- a/vdr-xine-SUSE.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur xine-lib-1.1.18.orig/src/vdr/input_vdr.c xine-lib-1.1.18/src/vdr/input_vdr.c ---- xine-lib-1.1.18.orig/src/vdr/input_vdr.c 2010-02-24 21:01:43.658883179 +0100 -+++ xine-lib-1.1.18/src/vdr/input_vdr.c 2010-02-24 21:02:59.800133025 +0100 -@@ -51,7 +51,7 @@ - - - #define VDR_MAX_NUM_WINDOWS 16 --#define VDR_ABS_FIFO_DIR "/tmp/vdr-xine" -+#define VDR_ABS_FIFO_DIR "/var/lib/vdr-xine" - - #define BUF_SIZE 1024 - diff --git a/xine-configure.diff b/xine-configure.diff deleted file mode 100644 index 309e99c..0000000 --- a/xine-configure.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur xine-lib-1.1.19.orig/configure.ac xine-lib-1.1.19/configure.ac ---- xine-lib-1.1.19.orig/configure.ac 2010-07-26 00:57:13.155035643 +0200 -+++ xine-lib-1.1.19/configure.ac 2010-07-26 01:00:45.468785507 +0200 -@@ -120,6 +120,7 @@ - dnl --------------------------------------------- - - AC_PROG_CC -+AC_PROG_CXX - AM_PROG_AS - - case "$host_os" in diff --git a/xine-lib-1.1.20.1-assert.patch b/xine-lib-1.1.20.1-assert.patch deleted file mode 100644 index db6a909..0000000 --- a/xine-lib-1.1.20.1-assert.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur xine-lib-1.1.20.orig/src/audio_out/audio_alsa_out.c xine-lib-1.1.20/src/audio_out/audio_alsa_out.c ---- xine-lib-1.1.20.orig/src/audio_out/audio_alsa_out.c 2011-10-04 23:42:53.000000000 +0200 -+++ xine-lib-1.1.20/src/audio_out/audio_alsa_out.c 2011-11-13 17:54:44.276984269 +0100 -@@ -41,6 +41,7 @@ - #ifdef HAVE_ALLOCA_H - #include - #endif -+#include - - #define ALSA_PCM_NEW_HW_PARAMS_API - #define ALSA_PCM_NEW_SW_PARAMS_API diff --git a/xine-lib-1.1.20.1-crippled.tar.bz2 b/xine-lib-1.1.20.1-crippled.tar.bz2 deleted file mode 100644 index 24f2cca..0000000 --- a/xine-lib-1.1.20.1-crippled.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e9dfef3f52098bf49341600bac23b5da6cbdb77e3172a5a3086dafe4fbf93f7 -size 5146365 diff --git a/xine-lib-1.1.20.1-demuxcheckfor_mad_ffmpeg.patch b/xine-lib-1.1.20.1-demuxcheckfor_mad_ffmpeg.patch deleted file mode 100644 index c7d1e71..0000000 --- a/xine-lib-1.1.20.1-demuxcheckfor_mad_ffmpeg.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -ur xine-lib-1.1.20.orig/src/xine-engine/load_plugins.c xine-lib-1.1.20/src/xine-engine/load_plugins.c ---- xine-lib-1.1.20.orig/src/xine-engine/load_plugins.c 2011-10-16 20:59:32.000000000 +0200 -+++ xine-lib-1.1.20/src/xine-engine/load_plugins.c 2011-11-13 18:08:39.357570472 +0100 -@@ -2508,9 +2508,18 @@ - - plugin_catalog_t *catalog = self->plugin_catalog; - int list_id; -+ int havempgdecoder = 0; -+ const char * const * p; - - pthread_mutex_lock (&catalog->lock); - -+ _build_list_typed_plugins(&catalog, catalog->plugin_lists[PLUGIN_AUDIO_DECODER - 1]); -+ for (p = catalog->ids; p && *p; p++) { -+ if (strcmp (*p, "mad") == 0 || strcmp (*p, "ffmpegaudio") == 0) { -+ havempgdecoder = 1; -+ break; -+ } -+ } - /* calc length of output string and create an array of strings to - concatenate */ - size_t len = 0; -@@ -2522,7 +2531,13 @@ - if (node->plugin_class || _load_plugin_class(self, node, NULL)) { - demux_class_t *const cls = (demux_class_t *)node->plugin_class; - if( (extensions[list_id] = cls->get_extensions(cls)) != NULL ) -- len += strlen(extensions[list_id]) +1; -+ { -+ if(havempgdecoder || !strstr(extensions[list_id], "mp3")) { -+ len += strlen(extensions[list_id]) +1; -+ } else { -+ extensions[list_id] = NULL; -+ } -+ } - } - } - diff --git a/xine-lib-1.1.20.1-glitch-free-pulseaudio.patch b/xine-lib-1.1.20.1-glitch-free-pulseaudio.patch deleted file mode 100644 index 814bbe5..0000000 --- a/xine-lib-1.1.20.1-glitch-free-pulseaudio.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ur xine-lib-1.1.20.orig/src/xine-engine/audio_out.c xine-lib-1.1.20/src/xine-engine/audio_out.c ---- xine-lib-1.1.20.orig/src/xine-engine/audio_out.c 2010-08-16 18:36:37.000000000 +0200 -+++ xine-lib-1.1.20/src/xine-engine/audio_out.c 2011-11-13 17:23:52.677415436 +0100 -@@ -1156,8 +1156,17 @@ - - /* - * calculate gap: -+ * -+ * HACK (rwa): If we have no video stream we do not need an AV sync and so -+ * we assume a gap of 0. This seems to avoid the skips in the -+ * first seconds when playing audio-only via the "glitch-free" -+ * pulseaudio server. - */ -- gap = in_buf->vpts - hw_vpts; -+ if (in_buf && in_buf->stream && in_buf->stream->video_decoder_plugin) { -+ gap = in_buf->vpts - hw_vpts; -+ } else { -+ gap = 0; -+ } - lprintf ("hw_vpts : %" PRId64 " buffer_vpts : %" PRId64 " gap : %" PRId64 "\n", - hw_vpts, in_buf->vpts, gap); - diff --git a/xine-lib-1.1.20.1-ia64-is-not-alpha.diff b/xine-lib-1.1.20.1-ia64-is-not-alpha.diff deleted file mode 100644 index 42d3037..0000000 --- a/xine-lib-1.1.20.1-ia64-is-not-alpha.diff +++ /dev/null @@ -1,18 +0,0 @@ -diff -ur xine-lib-1.1.20.orig/configure.ac xine-lib-1.1.20/configure.ac ---- xine-lib-1.1.20.orig/configure.ac 2011-11-13 02:36:20.000000000 +0100 -+++ xine-lib-1.1.20/configure.ac 2011-11-13 17:19:36.819687116 +0100 -@@ -2407,10 +2407,13 @@ - mips-*) - AC_DEFINE_UNQUOTED(FPM_MIPS,,[Define to select libmad fixed point arithmetic implementation]) - ;; -- alphaev56-* | alpha* | ia64-* | hppa*-linux-*) -+ alphaev56-* | alpha* | hppa*-linux-*) - AC_DEFINE_UNQUOTED(FPM_64BIT,,[Define to select libmad fixed point arithmetic implementation]) - AC_DEFINE_UNQUOTED(ARCH_ALPHA,,[Define this if you're running Alpha architecture]) - ;; -+ ia64-*) -+ AC_DEFINE_UNQUOTED(FPM_64BIT,,[Define to select libmad fixed point arithmetic implementation]) -+ ;; - armv4l-*-linux*) - AC_DEFINE_UNQUOTED(FPM_ARM,,[Define to select libmad fixed point arithmetic implementation]) - AC_DEFINE_UNQUOTED(ARCH_ARM,,[Define this if you're running ARM architecture]) diff --git a/xine-lib-1.1.20.1-install-plugins-helper.diff b/xine-lib-1.1.20.1-install-plugins-helper.diff deleted file mode 100644 index c7f1b12..0000000 --- a/xine-lib-1.1.20.1-install-plugins-helper.diff +++ /dev/null @@ -1,266 +0,0 @@ -diff -uNr xine-lib-1.1.20.orig/configure.ac xine-lib-1.1.20/configure.ac ---- xine-lib-1.1.20.orig/configure.ac 2011-11-13 17:46:57.513129735 +0100 -+++ xine-lib-1.1.20/configure.ac 2011-11-13 17:40:51.572377268 +0100 -@@ -2657,6 +2657,28 @@ - - AM_CONDITIONAL(HAVE_W32DLL, test "x$enable_w32dll" != "xno") - -+dnl --------------------------------------------- -+dnl let distro override plugin install helper path -+dnl --------------------------------------------- -+AC_ARG_WITH(install-plugins-helper, -+ AC_HELP_STRING([--with-install-plugins-helper], -+ [specify path of helper script to call to install plugins]), -+ [ -+ case "${withval}" in -+ yes) AC_MSG_ERROR(bad value ${withval} for --with-install-plugins-helper) ;; -+ no) AC_MSG_ERROR(bad value ${withval} for --with-install-plugins-helper) ;; -+ *) XINE_INSTALL_PLUGINS_HELPER="${withval}" ;; -+ esac -+ ], -+ [ -+ dnl Default value -+ XINE_INSTALL_PLUGINS_HELPER="`makeexpand "${libexecdir}/xine-install-plugins-helper"`" -+ ] -+) -+AC_MSG_NOTICE(Using $XINE_INSTALL_PLUGINS_HELPER as plugin install helper) -+AC_DEFINE_UNQUOTED(XINE_INSTALL_PLUGINS_HELPER, "$XINE_INSTALL_PLUGINS_HELPER", -+ [plugin install helper script]) -+AC_SUBST(XINE_INSTALL_PLUGINS_HELPER) - - dnl --------------------------------------------- - dnl some include paths ( !!! DO NOT REMOVE !!! ) -diff -uNr xine-lib-1.1.20.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.20/src/xine-engine/audio_decoder.c ---- xine-lib-1.1.20.orig/src/xine-engine/audio_decoder.c 2011-11-13 17:46:57.513129735 +0100 -+++ xine-lib-1.1.20/src/xine-engine/audio_decoder.c 2011-10-04 23:42:53.000000000 +0200 -@@ -41,6 +41,7 @@ - - #include "xine_internal.h" - #include "xineutils.h" -+#include "install_plugins_helper.h" - - static void *audio_decoder_loop (void *stream_gen) { - -@@ -344,6 +345,10 @@ - - _x_stream_info_set(stream, XINE_STREAM_INFO_AUDIO_HANDLED, - (stream->audio_decoder_plugin != NULL)); -+ -+ if(buf->type != buftype_unknown && !stream->audio_decoder_plugin) -+ _x_install_plugins_helper(stream,"decoder-audio", buf->type, _x_buf_audio_name( buf->type )); -+ - } - - if (audio_type != stream->audio_type) { -diff -uNr xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.c xine-lib-1.1.20/src/xine-engine/install_plugins_helper.c ---- xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.c 2011-11-13 17:46:57.513129735 +0100 -+++ xine-lib-1.1.20/src/xine-engine/install_plugins_helper.c 1970-01-01 01:00:00.000000000 +0100 -@@ -0,0 +1,106 @@ -+/* -+ * Copyright (C) 2007 Sascha Sommer -+ * -+ * This file is part of xine, a free video player. -+ * -+ * xine is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * xine is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -+ * -+ * helper functions to query the internet for additional plugins -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+#include -+#include -+#include -+ -+#include "install_plugins_helper.h" -+ -+#define PROCNAME_LEN 100 -+ -+static const char * -+get_helper(xine_stream_t *stream) -+{ -+ const char *helper; -+ -+ helper = getenv("XINE_INSTALL_PLUGINS_HELPER"); -+ if (helper == NULL) -+ helper = XINE_INSTALL_PLUGINS_HELPER; -+ -+ xine_log (stream->xine, XINE_LOG_MSG, -+ _("Using plugin install helper '%s'"), helper); -+ -+ return helper; -+} -+ -+static void -+get_procname(char* procname, size_t len) -+{ -+ char name[100]; -+ FILE* fp; -+ size_t pos = 0; -+ snprintf(name, sizeof(name), "/proc/%u/cmdline", getpid()); -+ -+ fp = fopen(name,"rb"); -+ if(fp){ -+ while(fp && !feof(fp) && pos < sizeof(name)-1){ -+ procname[pos] = fgetc(fp); -+ if(procname[pos] == ' ') /* ignore arguments */ -+ break; -+ if(procname[pos] == '/') /* ignore the path to the executable */ -+ pos = 0; -+ else -+ ++pos; -+ } -+ fclose(fp); -+ } -+ procname[pos] = '\0'; -+} -+ -+ -+void _x_install_plugins_helper(xine_stream_t* stream,char* plugin_type, uint32_t id, char* plugin_desc) -+{ -+ xine_cfg_entry_t cfgentry; -+ char* helper = get_helper(stream); -+ FILE* fp; -+ -+ if(helper && xine_config_lookup_entry(stream->xine, "media.plugins_helper", &cfgentry) && cfgentry.num_value -+ && (fp = fopen(helper,"rb") )) { -+ char procname[PROCNAME_LEN]; -+// char* procname = getenv("_"); /* might deliver /opt/kde3/bin/start_kdeinit_wrapper etc... */ -+ pid_t pid; -+ fclose(fp); -+ get_procname(procname,PROCNAME_LEN); -+ pid = fork(); -+ if(pid == 0) { -+ size_t len = 5 + strlen(XINE_VERSION) + 1 + strlen(procname) + 1 + strlen(plugin_desc) + 1 + strlen(plugin_type) + 1 + 100 + 1; -+ char* str = calloc(1,len + 1); -+ if(str){ -+ snprintf(str,len,"xine|%s|%s|%s|%s=%u",XINE_VERSION,procname,plugin_desc,plugin_type,id); -+ if(execl(helper,"xine-install-plugins-helper",str, NULL) == -1) -+ xine_log(stream->xine, XINE_LOG_MSG, -+ _("Couldn't start plugins_helper")); -+ free(str); -+ } -+ }else if(pid < 0){ -+ xine_log(stream->xine, XINE_LOG_MSG, -+ _("Couldn't fork")); -+ }else{ -+ waitpid(pid, NULL, 0); -+ } -+ } -+} -+ -diff -uNr xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.h xine-lib-1.1.20/src/xine-engine/install_plugins_helper.h ---- xine-lib-1.1.20.orig/src/xine-engine/install_plugins_helper.h 2011-11-13 17:46:57.513129735 +0100 -+++ xine-lib-1.1.20/src/xine-engine/install_plugins_helper.h 1970-01-01 01:00:00.000000000 +0100 -@@ -0,0 +1,35 @@ -+/* -+ * Copyright (C) 2007 Sascha Sommer -+ * -+ * This file is part of xine, a free video player. -+ * -+ * xine is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * xine is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -+ * -+ * helper functions to query the internet for additional codecs -+ */ -+ -+#ifndef PLUGINS_HELPER_H -+#define PLUGINS_HELPER_H -+ -+#include -+#include "xine_internal.h" -+ -+/* -+ * execute install plugins helper -+ */ -+void _x_install_plugins_helper(xine_stream_t *stream, char* plugin_type, uint32_t type, char* plugin_desc) XINE_PROTECTED; -+ -+ -+#endif -diff -uNr xine-lib-1.1.20.orig/src/xine-engine/Makefile.am xine-lib-1.1.20/src/xine-engine/Makefile.am ---- xine-lib-1.1.20.orig/src/xine-engine/Makefile.am 2011-11-13 17:46:57.513129735 +0100 -+++ xine-lib-1.1.20/src/xine-engine/Makefile.am 2011-10-04 23:42:53.000000000 +0200 -@@ -19,7 +19,7 @@ - video_overlay.c osd.c scratch.c demux.c vo_scale.c \ - xine_interface.c post.c tvmode.c broadcaster.c io_helper.c \ - input_rip.c input_cache.c info_helper.c refcounter.c \ -- alphablend.c -+ alphablend.c install_plugins_helper.c - - # FIXME: these are currently unused: - EXTRA_DIST = lrb.c lrb.h accel_xvmc.h -@@ -39,7 +39,8 @@ - audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \ - video_overlay.h osd.h scratch.h xine_plugin.h xineintl.h \ - plugin_catalog.h audio_decoder.h video_decoder.h post.h \ -- io_helper.h broadcaster.h info_helper.h refcounter.h alphablend.h -+ io_helper.h broadcaster.h info_helper.h refcounter.h alphablend.h \ -+ install_plugins_helper.h - - noinst_HEADERS = bswap.h ffmpeg_bswap.h xine_private.h - -diff -uNr xine-lib-1.1.20.orig/src/xine-engine/video_decoder.c xine-lib-1.1.20/src/xine-engine/video_decoder.c ---- xine-lib-1.1.20.orig/src/xine-engine/video_decoder.c 2011-11-13 17:46:57.517129699 +0100 -+++ xine-lib-1.1.20/src/xine-engine/video_decoder.c 2011-11-08 21:26:43.000000000 +0100 -@@ -38,6 +38,7 @@ - - #include "xine_internal.h" - #include "xineutils.h" -+#include "install_plugins_helper.h" - #include - - #define SPU_SLEEP_INTERVAL (90000/2) -@@ -408,6 +409,10 @@ - stream->video_decoder_plugin = _x_get_video_decoder (stream, streamtype); - - _x_stream_info_set(stream, XINE_STREAM_INFO_VIDEO_HANDLED, (stream->video_decoder_plugin != NULL)); -+ if(buf->type != buftype_unknown && !stream->video_decoder_plugin) -+ _x_install_plugins_helper(stream,"decoder-video", buf->type, _x_buf_video_name( buf->type )); -+ -+ - } - - if (stream->video_decoder_plugin) -diff -uNr xine-lib-1.1.20.orig/src/xine-engine/xine.c xine-lib-1.1.20/src/xine-engine/xine.c ---- xine-lib-1.1.20.orig/src/xine-engine/xine.c 2011-11-13 17:46:57.517129699 +0100 -+++ xine-lib-1.1.20/src/xine-engine/xine.c 2011-11-13 17:35:47.579072679 +0100 -@@ -1816,6 +1816,15 @@ - 0, NULL, this); - - /* -+ * enable/disable option for the plugins helper -+ */ -+ this->config->register_bool(this->config, -+ "media.plugins_helper", 1, -+ _("Run plugins helper"), -+ _("Searches the internet for missing plugins"), -+ 0, NULL, this); -+ -+ /* - * keep track of all opened streams - */ - this->streams = xine_list_new(); diff --git a/xine-lib-1.1.20.1-mjpegplugin.diff b/xine-lib-1.1.20.1-mjpegplugin.diff deleted file mode 100644 index 9d73eee..0000000 --- a/xine-lib-1.1.20.1-mjpegplugin.diff +++ /dev/null @@ -1,1252 +0,0 @@ -diff -uNr xine-lib-1.1.20.orig/configure xine-lib-1.1.20/configure ---- xine-lib-1.1.20.orig/configure 2011-11-13 02:37:22.000000000 +0100 -+++ xine-lib-1.1.20/configure 2011-11-13 17:40:51.568377304 +0100 -@@ -34954,6 +34954,7 @@ - echo " * video decoder plugins:" - echo " - MPEG 1,2 - Amiga Bitplane" - echo " - Raw RGB - Raw YUV" -+echo " - Motion JPEG" - if test "x$with_external_ffmpeg" = "xyes"; then - echo " - ffmpeg (external library):" - else -diff -uNr xine-lib-1.1.20.orig/configure.ac xine-lib-1.1.20/configure.ac ---- xine-lib-1.1.20.orig/configure.ac 2011-11-13 17:38:54.705413389 +0100 -+++ xine-lib-1.1.20/configure.ac 2011-11-13 17:40:51.572377268 +0100 -@@ -1109,6 +1109,28 @@ - AC_SUBST([SDL_LIBS]) - - dnl --------------------------------------------- -+dnl check for libjpeg -+dnl --------------------------------------------- -+ -+AC_ARG_ENABLE([jpeg], -+ AC_HELP_STRING([--disable-jpeg], [do not build JPEG support]), -+ [with_jpeg=$enableval], [with_jpeg=yes]) -+ -+if test "x$with_jpeg" = "xyes"; then -+ AC_CHECK_HEADERS(jpeglib.h, -+ [ -+ AC_CHECK_LIB(jpeg,jpeg_start_decompress, -+ [ -+ AC_DEFINE(HAVE_JPEG,1,[Define this if you have libjpeg library installed]) -+ ]) -+ ]) -+else -+ no_sdl=yes -+fi -+AM_CONDITIONAL(HAVE_JPEG, [test x"$with_jpeg" == x"yes"]) -+ -+ -+dnl --------------------------------------------- - dnl check for Libstk - dnl --------------------------------------------- - -@@ -2845,6 +2867,7 @@ - src/libxineadec/gsm610/Makefile - src/libxineadec/nosefart/Makefile - src/libreal/Makefile -+src/mjpeg/Makefile - src/post/Makefile - src/post/planar/Makefile - src/post/goom/Makefile -@@ -3063,6 +3086,9 @@ - dnl audio decoders - echo " * audio decoder plugins:" - echo " - GSM 06.10 - linear PCM" -+if test x"$with_jpeg" == x"yes"; then -+ echo " - Motion JPEG (libjpeg based)" -+fi - if test "x$with_external_ffmpeg" = "xyes"; then - echo " - ffmpeg (external library):" - echo " - Windows Media Audio v1/v2/Pro" -diff -uNr xine-lib-1.1.20.orig/src/Makefile.am xine-lib-1.1.20/src/Makefile.am ---- xine-lib-1.1.20.orig/src/Makefile.am 2011-11-13 17:38:54.705413389 +0100 -+++ xine-lib-1.1.20/src/Makefile.am 2011-11-13 17:40:51.572377268 +0100 -@@ -27,6 +27,7 @@ - libreal \ - libfaad \ - libmusepack \ -+ mjpeg \ - post \ - combined \ - vdr -diff -uNr xine-lib-1.1.20.orig/src/Makefile.in xine-lib-1.1.20/src/Makefile.in ---- xine-lib-1.1.20.orig/src/Makefile.in 2011-11-13 02:37:24.000000000 +0100 -+++ xine-lib-1.1.20/src/Makefile.in 2011-11-13 17:40:51.572377268 +0100 -@@ -460,6 +460,7 @@ - libreal \ - libfaad \ - libmusepack \ -+ mjpeg \ - post \ - combined - -diff -uNr xine-lib-1.1.20.orig/src/mjpeg/Makefile.am xine-lib-1.1.20/src/mjpeg/Makefile.am ---- xine-lib-1.1.20.orig/src/mjpeg/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.20/src/mjpeg/Makefile.am 2011-11-13 17:40:51.572377268 +0100 -@@ -0,0 +1,9 @@ -+include $(top_srcdir)/misc/Makefile.common -+ -+if HAVE_JPEG -+xineplug_LTLIBRARIES = xineplug_decode_mjpeg.la -+xineplug_decode_mjpeg_la_SOURCES = xine_mjpeg_decoder.c -+xineplug_decode_mjpeg_la_LIBADD = $(XINE_LIB) -ljpeg -+xineplug_decode_mjpeg_la_CFLAGS = $(VISIBILITY_FLAG) -+xineplug_decode_mjpeg_la_LDFLAGS = $(xineplug_ldflags) -+endif -diff -uNr xine-lib-1.1.20.orig/src/mjpeg/Makefile.in xine-lib-1.1.20/src/mjpeg/Makefile.in ---- xine-lib-1.1.20.orig/src/mjpeg/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.20/src/mjpeg/Makefile.in 2011-11-13 17:40:51.572377268 +0100 -@@ -0,0 +1,751 @@ -+# Makefile.in generated by automake 1.10 from Makefile.am. -+# @configure_input@ -+ -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+# This Makefile.in is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. -+ -+@SET_MAKE@ -+ -+VPATH = @srcdir@ -+pkgdatadir = $(datadir)/@PACKAGE@ -+pkglibdir = $(libdir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c -+INSTALL_HEADER = $(INSTALL_DATA) -+transform = $(program_transform_name) -+NORMAL_INSTALL = : -+PRE_INSTALL = : -+POST_INSTALL = : -+NORMAL_UNINSTALL = : -+PRE_UNINSTALL = : -+POST_UNINSTALL = : -+build_triplet = @build@ -+host_triplet = @host@ -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ -+ $(top_srcdir)/misc/Makefile.common -+subdir = src/mjpeg -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/m4/_xine.m4 $(top_srcdir)/m4/aa.m4 \ -+ $(top_srcdir)/m4/arts.m4 $(top_srcdir)/m4/attributes.m4 \ -+ $(top_srcdir)/m4/directx.m4 $(top_srcdir)/m4/dl.m4 \ -+ $(top_srcdir)/m4/dvdnav.m4 $(top_srcdir)/m4/gas.m4 \ -+ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ -+ $(top_srcdir)/m4/ioctl_request.m4 $(top_srcdir)/m4/irixal.m4 \ -+ $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/lib-ld.m4 \ -+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ -+ $(top_srcdir)/m4/libFLAC.m4 $(top_srcdir)/m4/libfame.m4 \ -+ $(top_srcdir)/m4/libtool15.m4 $(top_srcdir)/m4/nls.m4 \ -+ $(top_srcdir)/m4/opengl.m4 $(top_srcdir)/m4/optimizations.m4 \ -+ $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ -+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/pthreads.m4 \ -+ $(top_srcdir)/m4/symbol.m4 $(top_srcdir)/m4/xv.m4 \ -+ $(top_srcdir)/configure.ac -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -+am__vpath_adj = case $$p in \ -+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -+ *) f=$$p;; \ -+ esac; -+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -+am__installdirs = "$(DESTDIR)$(xineplugdir)" -+xineplugLTLIBRARIES_INSTALL = $(INSTALL) -+LTLIBRARIES = $(xineplug_LTLIBRARIES) -+xineplug_decode_mjpeg_la_DEPENDENCIES = $(XINE_LIB) -+am__xineplug_decode_mjpeg_la_SOURCES_DIST = xine_mjpeg_decoder.c -+am_xineplug_decode_mjpeg_la_OBJECTS = xineplug_decode_mjpeg_la-xine_mjpeg_decoder.lo -+xineplug_decode_mjpeg_la_OBJECTS = \ -+ $(am_xineplug_decode_mjpeg_la_OBJECTS) -+xineplug_decode_mjpeg_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ -+ $(xineplug_decode_mjpeg_la_CFLAGS) $(CFLAGS) \ -+ $(xineplug_decode_mjpeg_la_LDFLAGS) $(LDFLAGS) -o $@ -+am_xineplug_decode_mjpeg_la_rpath = -rpath \ -+ $(xineplugdir) -+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(xineplug_decode_mjpeg_la_SOURCES) -+DIST_SOURCES = $(am__xineplug_decode_mjpeg_la_SOURCES_DIST) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+AAINFO = @AAINFO@ -+AALIB_CFLAGS = @AALIB_CFLAGS@ -+AALIB_CONFIG = @AALIB_CONFIG@ -+AALIB_LIBS = @AALIB_LIBS@ -+ACLOCAL = @ACLOCAL@ -+ACLOCAL_DIR = @ACLOCAL_DIR@ -+ALSA_CFLAGS = @ALSA_CFLAGS@ -+ALSA_LIBS = @ALSA_LIBS@ -+AMTAR = @AMTAR@ -+AR = @AR@ -+ARTS_CFLAGS = @ARTS_CFLAGS@ -+ARTS_CONFIG = @ARTS_CONFIG@ -+ARTS_LIBS = @ARTS_LIBS@ -+AS = @AS@ -+ASFLAGS = @ASFLAGS@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ -+AWK = @AWK@ -+CACA_CFLAGS = @CACA_CFLAGS@ -+CACA_LIBS = @CACA_LIBS@ -+CC = @CC@ -+CCAS = @CCAS@ -+CCASDEPMODE = @CCASDEPMODE@ -+CCASFLAGS = @CCASFLAGS@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ -+CXX = @CXX@ -+CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DEBUG_CFLAGS = @DEBUG_CFLAGS@ -+DEFS = @DEFS@ -+DEPCOMP = @DEPCOMP@ -+DEPDIR = @DEPDIR@ -+DEPMOD = @DEPMOD@ -+DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@ -+DIRECTFB_LIBS = @DIRECTFB_LIBS@ -+DIRECTX_AUDIO_LIBS = @DIRECTX_AUDIO_LIBS@ -+DIRECTX_CPPFLAGS = @DIRECTX_CPPFLAGS@ -+DIRECTX_VIDEO_LIBS = @DIRECTX_VIDEO_LIBS@ -+DLLTOOL = @DLLTOOL@ -+DVDNAV_CFLAGS = @DVDNAV_CFLAGS@ -+DVDNAV_CONFIG = @DVDNAV_CONFIG@ -+DVDNAV_LIBS = @DVDNAV_LIBS@ -+DYNAMIC_LD_LIBS = @DYNAMIC_LD_LIBS@ -+ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+ESD_CFLAGS = @ESD_CFLAGS@ -+ESD_LIBS = @ESD_LIBS@ -+EXEEXT = @EXEEXT@ -+EXTRA_X_CFLAGS = @EXTRA_X_CFLAGS@ -+EXTRA_X_LIBS = @EXTRA_X_LIBS@ -+FFMPEG_CFLAGS = @FFMPEG_CFLAGS@ -+FFMPEG_LIBS = @FFMPEG_LIBS@ -+FFMPEG_POSTPROC_CFLAGS = @FFMPEG_POSTPROC_CFLAGS@ -+FFMPEG_POSTPROC_LIBS = @FFMPEG_POSTPROC_LIBS@ -+FIG2DEV = @FIG2DEV@ -+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ -+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ -+FT2_CFLAGS = @FT2_CFLAGS@ -+FT2_LIBS = @FT2_LIBS@ -+FUSIONSOUND_CFLAGS = @FUSIONSOUND_CFLAGS@ -+FUSIONSOUND_LIBS = @FUSIONSOUND_LIBS@ -+GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@ -+GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@ -+GLU_LIBS = @GLU_LIBS@ -+GMSGFMT = @GMSGFMT@ -+GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@ -+GNOME_VFS_LIBS = @GNOME_VFS_LIBS@ -+GOOM_LIBS = @GOOM_LIBS@ -+GREP = @GREP@ -+HAVE_BSDI_CDROM = @HAVE_BSDI_CDROM@ -+HAVE_DARWIN_CDROM = @HAVE_DARWIN_CDROM@ -+HAVE_FREEBSD_CDROM = @HAVE_FREEBSD_CDROM@ -+HAVE_LINUX_CDROM = @HAVE_LINUX_CDROM@ -+HAVE_SOLARIS_CDROM = @HAVE_SOLARIS_CDROM@ -+HAVE_WIN32_CDROM = @HAVE_WIN32_CDROM@ -+IMPURE_TEXT_LDFLAGS = @IMPURE_TEXT_LDFLAGS@ -+INCLUDES = @INCLUDES@ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+INTLLIBS = @INTLLIBS@ -+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ -+IRIXAL_CFLAGS = @IRIXAL_CFLAGS@ -+IRIXAL_LIBS = @IRIXAL_LIBS@ -+IRIXAL_STATIC_LIB = @IRIXAL_STATIC_LIB@ -+JACK_CFLAGS = @JACK_CFLAGS@ -+JACK_LIBS = @JACK_LIBS@ -+KSTAT_LIBS = @KSTAT_LIBS@ -+LDFLAGS = @LDFLAGS@ -+LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@ -+LIBCDIO_LIBS = @LIBCDIO_LIBS@ -+LIBDTS_CFLAGS = @LIBDTS_CFLAGS@ -+LIBDTS_LIBS = @LIBDTS_LIBS@ -+LIBFAME_CFLAGS = @LIBFAME_CFLAGS@ -+LIBFAME_CONFIG = @LIBFAME_CONFIG@ -+LIBFAME_LIBS = @LIBFAME_LIBS@ -+LIBFFMPEG_CPPFLAGS = @LIBFFMPEG_CPPFLAGS@ -+LIBFLAC_CFLAGS = @LIBFLAC_CFLAGS@ -+LIBFLAC_LIBS = @LIBFLAC_LIBS@ -+LIBICONV = @LIBICONV@ -+LIBINTL = @LIBINTL@ -+LIBISO9660_LIBS = @LIBISO9660_LIBS@ -+LIBMAD_CFLAGS = @LIBMAD_CFLAGS@ -+LIBMAD_LIBS = @LIBMAD_LIBS@ -+LIBMODPLUG_CFLAGS = @LIBMODPLUG_CFLAGS@ -+LIBMODPLUG_LIBS = @LIBMODPLUG_LIBS@ -+LIBMPEG2_CFLAGS = @LIBMPEG2_CFLAGS@ -+LIBNAME = @LIBNAME@ -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ -+LIBSMBCLIENT_LIBS = @LIBSMBCLIENT_LIBS@ -+LIBSTK_CFLAGS = @LIBSTK_CFLAGS@ -+LIBSTK_LIBS = @LIBSTK_LIBS@ -+LIBTOOL = @LIBTOOL@ -+LIBTOOL_DEPS = @LIBTOOL_DEPS@ -+LIBVCDINFO_CFLAGS = @LIBVCDINFO_CFLAGS@ -+LIBVCDINFO_LIBS = @LIBVCDINFO_LIBS@ -+LIBVCD_CFLAGS = @LIBVCD_CFLAGS@ -+LIBVCD_LIBS = @LIBVCD_LIBS@ -+LIBVCD_SYSDEP = @LIBVCD_SYSDEP@ -+LINUX_CDROM_TIMEOUT = @LINUX_CDROM_TIMEOUT@ -+LINUX_INCLUDE = @LINUX_INCLUDE@ -+LN_S = @LN_S@ -+LTLIBICONV = @LTLIBICONV@ -+LTLIBINTL = @LTLIBINTL@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAKEINFO = @MAKEINFO@ -+mkdir_p = @mkdir_p@ -+MKINSTALLDIRS = @MKINSTALLDIRS@ -+MKNOD = @MKNOD@ -+MLIB_CFLAGS = @MLIB_CFLAGS@ -+MLIB_LIBS = @MLIB_LIBS@ -+MNG_LIBS = @MNG_LIBS@ -+MSGFMT = @MSGFMT@ -+MSGMERGE = @MSGMERGE@ -+NET_LIBS = @NET_LIBS@ -+NOUNDEF = @NOUNDEF@ -+OBJC = @OBJC@ -+OBJCDEPMODE = @OBJCDEPMODE@ -+OBJCFLAGS = @OBJCFLAGS@ -+OBJDUMP = @OBJDUMP@ -+OBJEXT = @OBJEXT@ -+OPENGL_CFLAGS = @OPENGL_CFLAGS@ -+OPENGL_LIBS = @OPENGL_LIBS@ -+PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PASS1_CFLAGS = @PASS1_CFLAGS@ -+PASS2_CFLAGS = @PASS2_CFLAGS@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ -+PKG_CONFIG = @PKG_CONFIG@ -+POSUB = @POSUB@ -+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -+PTHREAD_LIBS = @PTHREAD_LIBS@ -+PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@ -+PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@ -+RANLIB = @RANLIB@ -+RT_LIBS = @RT_LIBS@ -+SDL_CFLAGS = @SDL_CFLAGS@ -+SDL_LIBS = @SDL_LIBS@ -+SET_MAKE = @SET_MAKE@ -+SGMLTOOLS = @SGMLTOOLS@ -+SHELL = @SHELL@ -+SPEC_VERSION = @SPEC_VERSION@ -+SPEEX_CFLAGS = @SPEEX_CFLAGS@ -+SPEEX_LIBS = @SPEEX_LIBS@ -+STATIC = @STATIC@ -+STRINGS = @STRINGS@ -+STRIP = @STRIP@ -+SUNDGA_CFLAGS = @SUNDGA_CFLAGS@ -+SUNDGA_LIBS = @SUNDGA_LIBS@ -+TAR_NAME = @TAR_NAME@ -+THEORA_CFLAGS = @THEORA_CFLAGS@ -+THEORA_LIBS = @THEORA_LIBS@ -+USE_NLS = @USE_NLS@ -+VERSION = @VERSION@ -+VISIBILITY_FLAG = @VISIBILITY_FLAG@ -+VORBIS_CFLAGS = @VORBIS_CFLAGS@ -+VORBIS_LIBS = @VORBIS_LIBS@ -+W32_NO_OPTIMIZE = @W32_NO_OPTIMIZE@ -+WAND_CFLAGS = @WAND_CFLAGS@ -+WAND_LIBS = @WAND_LIBS@ -+WAVPACK_CFLAGS = @WAVPACK_CFLAGS@ -+WAVPACK_LIBS = @WAVPACK_LIBS@ -+WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ -+XCBSHM_CFLAGS = @XCBSHM_CFLAGS@ -+XCBSHM_LIBS = @XCBSHM_LIBS@ -+XCBXV_CFLAGS = @XCBXV_CFLAGS@ -+XCBXV_LIBS = @XCBXV_LIBS@ -+XCB_CFLAGS = @XCB_CFLAGS@ -+XCB_LIBS = @XCB_LIBS@ -+XGETTEXT = @XGETTEXT@ -+XINERAMA_CFLAGS = @XINERAMA_CFLAGS@ -+XINERAMA_LIBS = @XINERAMA_LIBS@ -+XINE_ACFLAGS = @XINE_ACFLAGS@ -+XINE_BIN_AGE = @XINE_BIN_AGE@ -+XINE_BUILD_CC = @XINE_BUILD_CC@ -+XINE_BUILD_DATE = @XINE_BUILD_DATE@ -+XINE_BUILD_OS = @XINE_BUILD_OS@ -+XINE_CONFIG_PREFIX = @XINE_CONFIG_PREFIX@ -+XINE_DATADIR = @XINE_DATADIR@ -+XINE_FONTDIR = @XINE_FONTDIR@ -+XINE_FONTPATH = @XINE_FONTPATH@ -+XINE_IFACE_AGE = @XINE_IFACE_AGE@ -+XINE_LOCALEDIR = @XINE_LOCALEDIR@ -+XINE_LOCALEPATH = @XINE_LOCALEPATH@ -+XINE_LT_AGE = @XINE_LT_AGE@ -+XINE_LT_CURRENT = @XINE_LT_CURRENT@ -+XINE_LT_REVISION = @XINE_LT_REVISION@ -+XINE_MAJOR = @XINE_MAJOR@ -+XINE_MINOR = @XINE_MINOR@ -+XINE_PLUGINDIR = @XINE_PLUGINDIR@ -+XINE_PLUGINPATH = @XINE_PLUGINPATH@ -+XINE_SCRIPTPATH = @XINE_SCRIPTPATH@ -+XINE_SUB = @XINE_SUB@ -+XMKMF = @XMKMF@ -+XVMC_LIBS = @XVMC_LIBS@ -+XV_CFLAGS = @XV_CFLAGS@ -+XV_LIBS = @XV_LIBS@ -+XXMC_LIBS = @XXMC_LIBS@ -+X_CFLAGS = @X_CFLAGS@ -+X_EXTRA_LIBS = @X_EXTRA_LIBS@ -+X_LIBS = @X_LIBS@ -+X_PRE_LIBS = @X_PRE_LIBS@ -+ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@ -+ZLIB_LIBS = @ZLIB_LIBS@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_OBJC = @ac_ct_OBJC@ -+am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ -+am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+builddir = @builddir@ -+datadir = @datadir@ -+datarootdir = @datarootdir@ -+docdir = @docdir@ -+dvidir = @dvidir@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+htmldir = @htmldir@ -+includedir = @includedir@ -+infodir = @infodir@ -+install_sh = @install_sh@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localedir = @localedir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+mkdir_p = @mkdir_p@ -+oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+psdir = @psdir@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ -+w32_path = @w32_path@ -+XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la -+xineincludedir = $(includedir)/xine -+xineplugdir = $(XINE_PLUGINDIR) -+xineplug_ldflags = $(NOUNDEF) -avoid-version -module -+xinepostdir = $(XINE_PLUGINDIR)/post -+vidixdir = $(XINE_PLUGINDIR)/vidix -+xineplug_LTLIBRARIES = xineplug_decode_mjpeg.la -+xineplug_decode_mjpeg_la_SOURCES = xine_mjpeg_decoder.c -+xineplug_decode_mjpeg_la_LIBADD = $(XINE_LIB) -ljpeg -+xineplug_decode_mjpeg_la_CFLAGS = $(VISIBILITY_FLAG) -+xineplug_decode_mjpeg_la_LDFLAGS = $(xineplug_ldflags) -+all: all-am -+ -+.SUFFIXES: -+.SUFFIXES: .c .lo .o .obj -+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/misc/Makefile.common $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -+ && exit 0; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/mjpeg/Makefile'; \ -+ cd $(top_srcdir) && \ -+ $(AUTOMAKE) --foreign src/mjpeg/Makefile -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+install-xineplugLTLIBRARIES: $(xineplug_LTLIBRARIES) -+ @$(NORMAL_INSTALL) -+ test -z "$(xineplugdir)" || $(mkdir_p) "$(DESTDIR)$(xineplugdir)" -+ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ -+ if test -f $$p; then \ -+ f=$(am__strip_dir) \ -+ echo " $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(xineplugdir)/$$f'"; \ -+ $(LIBTOOL) --mode=install $(xineplugLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(xineplugdir)/$$f"; \ -+ else :; fi; \ -+ done -+ -+uninstall-xineplugLTLIBRARIES: -+ @$(NORMAL_UNINSTALL) -+ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ -+ p=$(am__strip_dir) \ -+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(xineplugdir)/$$p'"; \ -+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(xineplugdir)/$$p"; \ -+ done -+ -+clean-xineplugLTLIBRARIES: -+ -test -z "$(xineplug_LTLIBRARIES)" || rm -f $(xineplug_LTLIBRARIES) -+ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ -+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -+ test "$$dir" != "$$p" || dir=.; \ -+ echo "rm -f \"$${dir}/so_locations\""; \ -+ rm -f "$${dir}/so_locations"; \ -+ done -+xineplug_decode_mjpeg.la: $(xineplug_decode_mjpeg_la_OBJECTS) $(xineplug_decode_mjpeg_la_DEPENDENCIES) -+ $(xineplug_decode_mjpeg_la_LINK) $(am_xineplug_decode_mjpeg_la_rpath) $(xineplug_decode_mjpeg_la_OBJECTS) $(xineplug_decode_mjpeg_la_LIBADD) $(LIBS) -+ -+mostlyclean-compile: -+ -rm -f *.$(OBJEXT) -+ -+distclean-compile: -+ -rm -f *.tab.c -+ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xineplug_decode_mjpeg_la-xine_mjpeg_decoder.Plo@am__quote@ -+ -+.c.o: -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< -+ -+.c.obj: -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -+ -+.c.lo: -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -+ -+xineplug_decode_mjpeg_la-xine_mjpeg_decoder.lo: xine_mjpeg_decoder.c -+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xineplug_decode_mjpeg_la_CFLAGS) $(CFLAGS) -MT xineplug_decode_mjpeg_la-xine_mjpeg_decoder.lo -MD -MP -MF $(DEPDIR)/xineplug_decode_mjpeg_la-xine_mjpeg_decoder.Tpo -c -o xineplug_decode_mjpeg_la-xine_mjpeg_decoder.lo `test -f 'xine_mjpeg_decoder.c' || echo '$(srcdir)/'`xine_mjpeg_decoder.c -+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xineplug_decode_mjpeg_la-xine_mjpeg_decoder.Tpo $(DEPDIR)/xineplug_decode_mjpeg_la-xine_mjpeg_decoder.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xine_mjpeg_decoder.c' object='xineplug_decode_mjpeg_la-xine_mjpeg_decoder.lo' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xineplug_decode_mjpeg_la_CFLAGS) $(CFLAGS) -c -o xineplug_decode_mjpeg_la-xine_mjpeg_decoder.lo `test -f 'xine_mjpeg_decoder.c' || echo '$(srcdir)/'`xine_mjpeg_decoder.c -+ -+mostlyclean-libtool: -+ -rm -f *.lo -+ -+clean-libtool: -+ -rm -rf .libs _libs -+ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ mkid -fID $$unique -+tags: TAGS -+ -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$tags $$unique; \ -+ fi -+ctags: CTAGS -+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ tags=; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) ' { files[$$0] = 1; } \ -+ END { for (i in files) print i; }'`; \ -+ test -z "$(CTAGS_ARGS)$$tags$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$tags $$unique -+ -+GTAGS: -+ here=`$(am__cd) $(top_builddir) && pwd` \ -+ && cd $(top_srcdir) \ -+ && gtags -i $(GTAGS_ARGS) $$here -+ -+distclean-tags: -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+ -+distdir: $(DISTFILES) -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(mkdir_p) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -+ if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -+ fi; \ -+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -+ else \ -+ test -f $(distdir)/$$file \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ -+ fi; \ -+ done -+check-am: all-am -+check: check-am -+all-am: Makefile $(LTLIBRARIES) -+installdirs: -+ for dir in "$(DESTDIR)$(xineplugdir)"; do \ -+ test -z "$$dir" || $(mkdir_p) "$$dir"; \ -+ done -+install: install-am -+install-exec: install-exec-am -+install-data: install-data-am -+uninstall: uninstall-am -+ -+install-am: all-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ -+installcheck: installcheck-am -+install-strip: -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+ -+clean-generic: -+ -+distclean-generic: -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+clean: clean-am -+ -+clean-am: clean-generic clean-libtool clean-xineplugLTLIBRARIES \ -+ mostlyclean-am -+ -+distclean: distclean-am -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-tags -+ -+dvi: dvi-am -+ -+dvi-am: -+ -+html: html-am -+ -+info: info-am -+ -+info-am: -+ -+install-data-am: install-xineplugLTLIBRARIES -+ @$(NORMAL_INSTALL) -+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook -+ -+install-dvi: install-dvi-am -+ -+install-exec-am: -+ -+install-html: install-html-am -+ -+install-info: install-info-am -+ -+install-man: -+ -+install-pdf: install-pdf-am -+ -+install-ps: install-ps-am -+ -+installcheck-am: -+ -+maintainer-clean: maintainer-clean-am -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool -+ -+pdf: pdf-am -+ -+pdf-am: -+ -+ps: ps-am -+ -+ps-am: -+ -+uninstall-am: uninstall-xineplugLTLIBRARIES -+ @$(NORMAL_INSTALL) -+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook -+ -+.MAKE: install-am install-data-am install-strip uninstall-am -+ -+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-xineplugLTLIBRARIES ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am \ -+ install-data-hook install-dvi install-dvi-am install-exec \ -+ install-exec-am install-html install-html-am install-info \ -+ install-info-am install-man install-pdf install-pdf-am \ -+ install-ps install-ps-am install-strip \ -+ install-xineplugLTLIBRARIES installcheck installcheck-am \ -+ installdirs maintainer-clean maintainer-clean-generic \ -+ mostlyclean mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -+ uninstall-am uninstall-hook uninstall-xineplugLTLIBRARIES -+ -+ -+$(XINE_LIB): -+ @cd $(top_srcdir)/src/xine-engine && $(MAKE) -+ -+install-data-hook: -+ @if test $$MAKELEVEL -le 4 ; then \ -+ if test -x "$(top_srcdir)/post-install.sh" ; then \ -+ $(top_srcdir)/post-install.sh ; \ -+ fi; \ -+ fi; \ -+ if test -x /usr/bin/chcon -a "`id -u`" -eq 0; then \ -+ list='$(xineplug_LTLIBRARIES)'; \ -+ for p in $$list; do \ -+ p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \ -+ echo " chcon system_u:object_r:texrel_shlib_t $(DESTDIR)$(xineplugdir)/$$p"; \ -+ chcon system_u:object_r:texrel_shlib_t $(DESTDIR)$(xineplugdir)/$$p || :; \ -+ done; \ -+ list='$(xinepost_LTLIBRARIES)'; \ -+ for p in $$list; do \ -+ p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \ -+ echo " chcon system_u:object_r:texrel_shlib_t $(DESTDIR)$(xinepostdir)/$$p"; \ -+ chcon system_u:object_r:texrel_shlib_t $(DESTDIR)$(xinepostdir)/$$p || :; \ -+ done; \ -+ fi -+ -+pass1: -+ @$(MAKE) MULTIPASS_CFLAGS="$(PASS1_CFLAGS)" -+ -+pass2: -+ @$(MAKE) MULTIPASS_CFLAGS="$(PASS2_CFLAGS)" -+ -+debug: -+ @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" -+ -+install-debug: debug -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ @list='$(SUBDIRS)'; for subdir in $$list; do \ -+ (cd $$subdir && $(MAKE) $@) || exit; \ -+ done; -+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook -+ -+uninstall-hook: -+ @list='$(xineplug_LTLIBRARIES)'; for p in $$list; do \ -+ p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(xineplugdir)/$$p"; \ -+ rm -f $(DESTDIR)$(xineplugdir)/$$p; \ -+ done; -+ @list='$(xinepost_LTLIBRARIES)'; for p in $$list; do \ -+ p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(xinepostdir)/$$p"; \ -+ rm -f $(DESTDIR)$(xinepostdir)/$$p; \ -+ done; -+ @list='$(vidix_LTLIBRARIES)'; for p in $$list; do \ -+ p="`echo $$p | sed -e 's/\.la$$/\.so/g;s|^.*/||'`"; \ -+ echo " rm -f $(DESTDIR)$(vidixdir)/$$p"; \ -+ rm -f $(DESTDIR)$(vidixdir)/$$p; \ -+ done; -+ -+mostlyclean-generic: -+ -rm -f *~ \#* .*~ .\#* -+ -+maintainer-clean-generic: -+ -@echo "This command is intended for maintainers to use;" -+ -@echo "it deletes files that may require special tools to rebuild." -+ -rm -f Makefile.in -+# Tell versions [3.59,3.63) of GNU make to not export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: -diff -uNr xine-lib-1.1.20.orig/src/mjpeg/xine_mjpeg_decoder.c xine-lib-1.1.20/src/mjpeg/xine_mjpeg_decoder.c ---- xine-lib-1.1.20.orig/src/mjpeg/xine_mjpeg_decoder.c 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.20/src/mjpeg/xine_mjpeg_decoder.c 2011-11-13 17:40:51.572377268 +0100 -@@ -0,0 +1,397 @@ -+/* -+ * Copyright (C) 2007 Marcus Meissner -+ * -+ * This file is part of xine, a free video player. -+ * -+ * xine is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * xine is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA -+ * -+ * $Id: xine_decoder.c,v 1.57 2006/07/10 22:08:29 dgp85 Exp $ -+ * -+ * stuff needed to turn libjpeg into a xine video decoder. -+ */ -+ -+#include -+#include -+#include -+#include -+ -+#include -+ -+#define LOG_MODULE "mjpeg_decoder" -+#define LOG_VERBOSE -+ -+#include "config.h" -+#include "xine_internal.h" -+#include "video_out.h" -+#include "buffer.h" -+#include "xineutils.h" -+ -+static const uint8_t default_dht[420] = { -+ /* DHT(Define Huffman Table) */ -+ 0xFF,0xC4, -+ 0x01,0xA2, -+ 0x00,0x00,0x01,0x05,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00, -+ 0x00,0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x01,0x00,0x03, -+ 0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x01, -+ 0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x10,0x00,0x02,0x01,0x03,0x03, -+ 0x02,0x04,0x03,0x05,0x05,0x04,0x04,0x00,0x00,0x01,0x7D,0x01,0x02,0x03,0x00,0x04, -+ 0x11,0x05,0x12,0x21,0x31,0x41,0x06,0x13,0x51,0x61,0x07,0x22,0x71,0x14,0x32,0x81, -+ 0x91,0xA1,0x08,0x23,0x42,0xB1,0xC1,0x15,0x52,0xD1,0xF0,0x24,0x33,0x62,0x72,0x82, -+ 0x09,0x0A,0x16,0x17,0x18,0x19,0x1A,0x25,0x26,0x27,0x28,0x29,0x2A,0x34,0x35,0x36, -+ 0x37,0x38,0x39,0x3A,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x53,0x54,0x55,0x56, -+ 0x57,0x58,0x59,0x5A,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x73,0x74,0x75,0x76, -+ 0x77,0x78,0x79,0x7A,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x92,0x93,0x94,0x95, -+ 0x96,0x97,0x98,0x99,0x9A,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xB2,0xB3, -+ 0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA, -+ 0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7, -+ 0xE8,0xE9,0xEA,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0x11,0x00,0x02, -+ 0x01,0x02,0x04,0x04,0x03,0x04,0x07,0x05,0x04,0x04,0x00,0x01,0x02,0x77,0x00,0x01, -+ 0x02,0x03,0x11,0x04,0x05,0x21,0x31,0x06,0x12,0x41,0x51,0x07,0x61,0x71,0x13,0x22, -+ 0x32,0x81,0x08,0x14,0x42,0x91,0xA1,0xB1,0xC1,0x09,0x23,0x33,0x52,0xF0,0x15,0x62, -+ 0x72,0xD1,0x0A,0x16,0x24,0x34,0xE1,0x25,0xF1,0x17,0x18,0x19,0x1A,0x26,0x27,0x28, -+ 0x29,0x2A,0x35,0x36,0x37,0x38,0x39,0x3A,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A, -+ 0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A, -+ 0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89, -+ 0x8A,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7, -+ 0xA8,0xA9,0xAA,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xC2,0xC3,0xC4,0xC5, -+ 0xC6,0xC7,0xC8,0xC9,0xCA,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xE2,0xE3, -+ 0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA -+}; -+ -+ -+typedef struct { -+ video_decoder_class_t decoder_class; -+} mjpeg_class_t; -+ -+typedef struct mjpeg_decoder_s { -+ video_decoder_t video_decoder; -+ -+ xine_stream_t *xstream; -+ -+ int64_t pts; -+ -+ xine_bmiheader bih; -+ -+ int output_sampling_rate; -+ int output_open; -+ int output_mode; -+ -+ uint8_t *buffer; -+ int bytes_in_buffer; -+ int maxbytes_in_buffer; -+ int skip_frames; -+ -+ -+ struct jpeg_decompress_struct jd; -+ struct jpeg_error_mgr jerr; -+ struct jpeg_source_mgr jsm; -+} mjpeg_decoder_t; -+ -+/* For the JPEG decompressor source manager. */ -+static void _jpeg_init_source(j_decompress_ptr cinfo) { } -+ -+static boolean _jpeg_fill_input_buffer(j_decompress_ptr cinfo) { -+ fprintf(stderr, "_jpeg_fill_input_buffer(): should not get here.\n"); -+ return FALSE; -+} -+ -+static void _jpeg_skip_input_data(j_decompress_ptr cinfo,long num_bytes) { -+ fprintf(stderr, "_jpeg_skip_input_data(): Skipping %ld bytes...\n", num_bytes); -+ cinfo->src->next_input_byte += num_bytes; -+ cinfo->src->bytes_in_buffer -= num_bytes; -+} -+ -+static boolean _jpeg_resync_to_restart(j_decompress_ptr cinfo, int desired) { -+ fprintf(stderr, "_jpeg_resync_to_restart(desired=%d): Should not get here.\n",desired); -+ return FALSE; -+} -+static void _jpeg_term_source(j_decompress_ptr cinfo) { } -+ -+ -+static void mjpeg_reset (video_decoder_t *this_gen) { -+ mjpeg_decoder_t *this = (mjpeg_decoder_t *) this_gen; -+ -+ this->pts = 0; -+ this->bytes_in_buffer = 0; -+ this->skip_frames = 0; -+} -+ -+static void mjpeg_flush (video_decoder_t *this_gen) { -+ mjpeg_decoder_t *this = (mjpeg_decoder_t *) this_gen; -+ -+ this->bytes_in_buffer = 0; -+ -+ lprintf ("flush\n"); -+} -+ -+static void mjpeg_discontinuity (video_decoder_t *this_gen) { -+ mjpeg_decoder_t *this = (mjpeg_decoder_t *) this_gen; -+ -+ this->bytes_in_buffer = 0; -+ this->pts = 0; -+} -+ -+static void mjpeg_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { -+ struct vo_frame_s *frame; -+ mjpeg_decoder_t *this = (mjpeg_decoder_t *) this_gen; -+ int i, ret, havedht, offsetdqt; -+ uint8_t *cursamprow; -+ int minscanline=1000; -+ -+#if 0 -+ fprintf (stderr, "decode data, decoder_flags: %x (", buf->decoder_flags); -+#define X(x) if (BUF_FLAG_##x & buf->decoder_flags) fprintf (stderr,"BUF_FLAG_"#x", "); -+X(FRAME_START); -+X(FRAME_END); -+X(HEADER); -+X(PREVIEW); -+X(END_USER); -+X(END_STREAM); -+X(FRAMERATE); -+X(SEEK); -+X(SPECIAL); -+X(STDHEADER); -+X(ASPECT); -+#undef X -+ fprintf (stderr, ")\n"); -+#endif -+ -+ if (buf->decoder_flags & BUF_FLAG_HEADER) { -+ if (buf->decoder_flags & BUF_FLAG_STDHEADER) { -+ memcpy ( &this->bih, buf->content, sizeof(xine_bmiheader) ); -+ /* FIXME: handle extra data? */ -+#if 0 -+ fprintf (stderr,"stdheader:\n"); -+ fprintf (stderr,"Height: %d\n",this->bih.biHeight); -+ fprintf (stderr,"Width: %d\n",this->bih.biWidth); -+#endif -+ /* the others are not terribly interesting for JPEG */ -+ return; -+ } -+ fprintf (stderr,"Non STD-header handling not done yet.\n"); -+ return; -+ } -+ -+ while (buf->size>this->maxbytes_in_buffer - this->bytes_in_buffer) { -+ uint8_t *newbuf; -+ newbuf = realloc (this->buffer, this->maxbytes_in_buffer*2); -+ if (!newbuf) { -+ return; /* Hmm. Not good. */ -+ } -+ this->maxbytes_in_buffer *= 2; -+ this->buffer = newbuf; -+ } -+ xine_fast_memcpy (&this->buffer[this->bytes_in_buffer], -+ buf->content, buf->size); -+ this->bytes_in_buffer += buf->size; -+ -+ if (!(buf->decoder_flags & BUF_FLAG_FRAME_END)) -+ return; -+ -+ /* OK - Decode! */ -+ -+ if (this->skip_frames > 0) { -+ this->skip_frames--; -+ this->bytes_in_buffer = 0; -+ return; -+ } -+ -+ havedht = 0; offsetdqt = 0; -+ for (i=0;ibytes_in_buffer;i++) { -+ if (this->buffer[i] != 0xff) -+ continue; -+ i++; -+ if (i==this->bytes_in_buffer) break; -+ if (this->buffer[i] == 0xdb)/* DQT */ -+ offsetdqt = i-1; -+ if (this->buffer[i] == 0xc4) /* DHT */ -+ havedht = 1; -+ if (this->buffer[i] == 0xc0) /* SOF */ -+ break; -+ } -+ if (!havedht) { -+ /* FIXME: we could inject this more directly into libjpeg. -+ * Find out sometime how to... -+ */ -+ while (this->maxbytes_in_buffer - this->bytes_in_buffer < sizeof(default_dht)) { -+ uint8_t *newbuf; -+ newbuf = realloc (this->buffer, this->maxbytes_in_buffer*2); -+ if (!newbuf) { -+ /* Umm. how to handle out of memory situation here */ -+ return; -+ } -+ this->maxbytes_in_buffer *= 2; -+ this->buffer = newbuf; -+ } -+ memmove (this->buffer+offsetdqt+sizeof(default_dht), this->buffer+offsetdqt, this->bytes_in_buffer-offsetdqt); -+ memcpy (this->buffer+offsetdqt, default_dht, sizeof(default_dht)); -+ this->bytes_in_buffer += sizeof(default_dht); -+ } -+ -+ this->jsm.next_input_byte = this->buffer; -+ this->jsm.bytes_in_buffer = this->bytes_in_buffer; -+ -+ ret = jpeg_read_header(&this->jd,TRUE); -+ this->jd.out_color_space = JCS_YCbCr; -+ jpeg_start_decompress(&this->jd); -+ if (ret != JPEG_HEADER_OK) { -+ fprintf(stderr, "Jpeg image in stream has bad format, read header returned %d.\n",ret); -+ this->bytes_in_buffer = 0; -+ return; -+ } -+ -+ /* I am not fully sure we can assume that we get 4:1:1 YUV output. -+ * But I think we do with JCS_YCbCr. -+ */ -+ frame = this->xstream->video_out->get_frame (this->xstream->video_out, -+ this->jd.output_width, -+ this->jd.output_height, -+ (1.00*this->jd.output_width)/this->jd.output_height, -+ XINE_IMGFMT_YV12, -+ 0 -+ ); -+ -+ cursamprow = calloc(1,this->jd.output_width*this->jd.output_components); -+ while (this->jd.output_scanline < this->jd.output_height) { -+ uint8_t *y,*u,*v; -+ int i, curscanline; -+ int x = jpeg_read_scanlines(&this->jd,&cursamprow,1); -+ -+ /* it occasionaly starts at 1 and goes to height+1 for curious reasons */ -+ if (minscanline > this->jd.output_scanline) { -+ minscanline = this->jd.output_scanline; -+ if (minscanline) fprintf (stderr,"minscanline %d\n", minscanline); -+ } -+ curscanline = this->jd.output_scanline-minscanline; -+ if (x != 1) { -+ fprintf(stderr, "failed to read current scanline?\n"); -+ break; -+ } -+ y = frame->base[0]+frame->pitches[0]*curscanline; -+ u = frame->base[1]+frame->pitches[1]*(curscanline/2); -+ v = frame->base[2]+frame->pitches[2]*(curscanline/2); -+ for (i=0;ijd.output_width;i++) { -+ y[i] = cursamprow[i*3+0]; -+ u[i/2] = cursamprow[i*3+1]; -+ v[i/2] = cursamprow[i*3+2]; -+ } -+ } -+ free (cursamprow); -+ -+ frame->pts = buf->pts; -+ frame->duration = buf->decoder_info[0]; -+ this->skip_frames = frame->draw(frame,this->xstream); -+ frame->drawn = 1; -+ frame->free(frame); -+ jpeg_finish_decompress(&this->jd); -+ this->bytes_in_buffer = 0; -+} -+ -+static void mjpeg_dispose (video_decoder_t *this_gen) { -+ mjpeg_decoder_t *this = (mjpeg_decoder_t *) this_gen; -+ -+ jpeg_destroy_decompress(&this->jd); -+ if (this->output_open) { -+ this->xstream->video_out->close (this->xstream->video_out, this->xstream); -+ this->output_open = 0; -+ } -+ if (this->buffer) free (this->buffer); -+ this->buffer = NULL; -+ free (this_gen); -+} -+ -+static video_decoder_t *open_plugin (video_decoder_class_t *class_gen, xine_stream_t *stream) { -+ mjpeg_decoder_t *this ; -+ -+ this = (mjpeg_decoder_t *) xine_xmalloc (sizeof (mjpeg_decoder_t)); -+ -+ this->video_decoder.decode_data = mjpeg_decode_data; -+ this->video_decoder.reset = mjpeg_reset; -+ this->video_decoder.flush = mjpeg_flush; -+ this->video_decoder.discontinuity = mjpeg_discontinuity; -+ this->video_decoder.dispose = mjpeg_dispose; -+ -+ this->output_open = 0; -+ this->bytes_in_buffer = 0; -+ this->skip_frames = 0; -+ this->xstream = stream; -+ -+ this->maxbytes_in_buffer = 16384; -+ this->buffer = malloc(this->maxbytes_in_buffer); -+ -+ this->jd.err = jpeg_std_error(&this->jerr); -+ jpeg_create_decompress(&this->jd); -+ -+ this->jsm.init_source = _jpeg_init_source; -+ this->jsm.fill_input_buffer = _jpeg_fill_input_buffer; -+ this->jsm.skip_input_data = _jpeg_skip_input_data; -+ this->jsm.resync_to_restart = _jpeg_resync_to_restart; -+ this->jsm.term_source = _jpeg_term_source; -+ this->jd.src = &this->jsm; -+ -+ stream->video_out->open(stream->video_out, stream); -+#if 0 -+ caps = stream->video_out->get_capabilities (stream->video_out); -+ fprintf (stderr, "video out caps: %x\n", caps); -+#endif -+ return &this->video_decoder; -+} -+ -+/* -+ * mjpeg plugin class -+ */ -+ -+static char *get_identifier (video_decoder_class_t *this) { -+ return "mjpeg"; -+} -+ -+static char *get_description (video_decoder_class_t *this) { -+ return "libjpeg based mjpeg video decoder plugin"; -+} -+ -+static void dispose_class (video_decoder_class_t *this) { -+ free (this); -+} -+ -+static void *init_plugin (xine_t *xine, void *data) { -+ -+ mjpeg_class_t *this; -+ -+ this = (mjpeg_class_t *) xine_xmalloc (sizeof (mjpeg_class_t)); -+ -+ this->decoder_class.open_plugin = open_plugin; -+ this->decoder_class.get_identifier = get_identifier; -+ this->decoder_class.get_description = get_description; -+ this->decoder_class.dispose = dispose_class; -+ -+ return this; -+} -+ -+static uint32_t video_types[] = { -+ BUF_VIDEO_JPEG, -+ BUF_VIDEO_MJPEG, -+ 0 -+}; -+ -+static const decoder_info_t dec_info_video = { -+ video_types, /* supported types */ -+ 7 /* priority */ -+}; -+ -+const plugin_info_t xine_plugin_info[] EXPORTED = { -+ /* type, API, "name", version, special_info, init_function */ -+ { PLUGIN_VIDEO_DECODER, 18, "mjpeg", XINE_VERSION_CODE, &dec_info_video, init_plugin }, -+ { PLUGIN_NONE, 0, "", 0, NULL, NULL } -+}; diff --git a/xine-lib-1.1.20.1-zlib-hg10322.diff b/xine-lib-1.1.20.1-zlib-hg10322.diff deleted file mode 100644 index a2006c0..0000000 --- a/xine-lib-1.1.20.1-zlib-hg10322.diff +++ /dev/null @@ -1,51 +0,0 @@ - -# HG changeset patch -# User Ulrich Müller -# Date 1327945720 0 -# Node ID 24d09421ed09d3a78efeab5c9b8ab31daaaba4fd -# Parent da296856c52e654cf599248de3a01bb754363c79 -Compile failure in osd.c with sys-libs/zlib-1.2.6 - -diff -r da296856c52e -r 24d09421ed09 misc/xine-fontconv.c ---- a/misc/xine-fontconv.c Wed Jan 18 22:01:28 2012 +0000 -+++ b/misc/xine-fontconv.c Mon Jan 30 17:48:40 2012 +0000 -@@ -109,7 +109,7 @@ - osd_font_t font; - - --static int gzwrite_i16(gzFile *fp, uint16_t number) { -+static int gzwrite_i16(gzFile fp, uint16_t number) { - return gzputc(fp, number & 0xFF) != -1 && - gzputc(fp, (number >> 8) & 0xFF) != -1; - } -@@ -341,7 +341,7 @@ - - char filename[1024]; - FT_Bitmap *out_bitmap; -- gzFile *fp; -+ gzFile fp; - int error; - int error_counter; - int glyph_index; -diff -r da296856c52e -r 24d09421ed09 src/xine-engine/osd.c ---- a/src/xine-engine/osd.c Wed Jan 18 22:01:28 2012 +0000 -+++ b/src/xine-engine/osd.c Mon Jan 30 17:48:40 2012 +0000 -@@ -650,7 +650,7 @@ - osd->display_y = y; - } - --static uint16_t gzread_i16(gzFile *fp) { -+static uint16_t gzread_i16(gzFile fp) { - uint16_t ret; - ret = gzgetc(fp); - ret |= (gzgetc(fp)<<8); -@@ -663,7 +663,7 @@ - - static int osd_renderer_load_font(osd_renderer_t *this, char *filename) { - -- gzFile *fp; -+ gzFile fp; - osd_font_t *font = NULL; - int i, ret = 0; - - diff --git a/xine-lib-1.1.20.1.tar.bz2 b/xine-lib-1.1.20.1.tar.bz2 deleted file mode 100644 index d000cd4..0000000 --- a/xine-lib-1.1.20.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:adabf74df5506cb1a8020597214b1f40e563b8fe89d6f223d14bcd6d9e5e8111 -size 7569871 diff --git a/xine-lib-1.2.1-crippled.tar.bz2 b/xine-lib-1.2.1-crippled.tar.bz2 new file mode 100644 index 0000000..b2ccb7a --- /dev/null +++ b/xine-lib-1.2.1-crippled.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45c777dc737a04a46744590c066f58f7d8cb696c29ba6e175ea0f0d4e3f8cdba +size 6148636 diff --git a/xine-lib-1.2.1.tar.bz2 b/xine-lib-1.2.1.tar.bz2 new file mode 100644 index 0000000..195411e --- /dev/null +++ b/xine-lib-1.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62bd77e72d69a888ddf0a1fc4edd7752bfcd081bb00f71fb928d3a2d6b4dd8e5 +size 6197175 diff --git a/xine-lib-crippled-LOCAL.diff b/xine-lib-crippled-LOCAL.diff deleted file mode 100644 index 8464cba..0000000 --- a/xine-lib-crippled-LOCAL.diff +++ /dev/null @@ -1,87 +0,0 @@ -Index: src/input/input_dvd.c -=================================================================== ---- src/input/input_dvd.c.orig -+++ src/input/input_dvd.c -@@ -1393,7 +1393,12 @@ - - static int dvd_parse_try_open(dvd_input_plugin_t *this, const char *locator) - { -- const char *intended_dvd_device; -+ const char *intended_dvd_device; -+ dvd_input_class_t *class = (dvd_input_class_t *) -+ this->input_plugin.input_class; -+ xine_sarray_t **plgs = class->xine->plugin_catalog->plugin_lists; -+ plugin_node_t *node; -+ int i; - - /* FIXME: we temporarily special-case "dvd:/" for compatibility; - * actually "dvd:/" should play a DVD image stored in /, but for -@@ -1409,7 +1414,6 @@ - xine_setenv("DVDCSS_RAW_DEVICE", "", 1); - } else { - /* use default DVD device */ -- dvd_input_class_t *class = (dvd_input_class_t*)this->input_plugin.input_class; - xine_cfg_entry_t raw_device; - if (xine_config_lookup_entry(this->stream->xine, - "media.dvd.raw_device", &raw_device)) -@@ -1417,6 +1421,23 @@ - intended_dvd_device = class->dvd_device; - } - -+ for (i = 0; (node = xine_sarray_get (plgs[PLUGIN_VIDEO_DECODER-1], i)); i++) -+ if (strcmp (node->info->id, "mpeg2") == 0) -+ break; -+ if (node) -+ for (i = 0; (node = xine_sarray_get (plgs[PLUGIN_SPU_DECODER-1], i)); i++) -+ if (strcmp (node->info->id, "spudec") == 0) -+ break; -+ if (! node) { -+ _x_message (this->stream, XINE_MSG_GENERAL_WARNING, -+ "This version of Xine lacks support for playing DVD discs " -+ "for legal reasons.\n" -+ "Please go to http://www.opensuse.org/XINE#Legal_Matters " -+ "for further details.", -+ NULL); -+ return 0; -+ } -+ - /* attempt to open DVD */ - if (this->opened) { - if (intended_dvd_device == this->current_dvd_device) { -@@ -1479,8 +1500,11 @@ - } - - static int dvd_plugin_open (input_plugin_t *this_gen) { -- dvd_input_plugin_t *this = (dvd_input_plugin_t*)this_gen; -+ dvd_input_plugin_t *this = (dvd_input_plugin_t*)this_gen; - dvd_input_class_t *class = (dvd_input_class_t*)this_gen->input_class; -+ xine_sarray_t **plgs = class->xine->plugin_catalog->plugin_lists; -+ plugin_node_t *node; -+ int i; - - char *locator, *locator_orig; - char *title_part; -@@ -1489,6 +1513,23 @@ - - trace_print("Called\n"); - -+ for (i = 0; (node = xine_sarray_get (plgs[PLUGIN_VIDEO_DECODER-1], i)); i++) -+ if (strcmp (node->info->id, "mpeg2") == 0) -+ break; -+ if (node) -+ for (i = 0; (node = xine_sarray_get (plgs[PLUGIN_SPU_DECODER-1], i)); i++) -+ if (strcmp (node->info->id, "spudec") == 0) -+ break; -+ if (! node) { -+ _x_message (this->stream, XINE_MSG_GENERAL_WARNING, -+ "This version of Xine lacks support for playing DVD discs " -+ "for legal reasons.\n" -+ "Please go to http://www.opensuse.org/XINE#Legal_Matters " -+ "for further details.", -+ NULL); -+ return 0; -+ } -+ - /* we already checked the "dvd:/" MRL before */ - locator_orig = locator = strdup (this->mrl + (sizeof("dvd:") - 1)); - diff --git a/xine-lib-doc-fix-X11R6.diff b/xine-lib-doc-fix-X11R6.diff deleted file mode 100644 index c0d30dd..0000000 --- a/xine-lib-doc-fix-X11R6.diff +++ /dev/null @@ -1,35 +0,0 @@ -Index: doc/faq/faq.sgml -=================================================================== ---- doc/faq/faq.sgml.orig -+++ doc/faq/faq.sgml -@@ -413,12 +413,12 @@ - - If you want to have Xv support compiled in, make sure you either have - a shared Xv library on your system, e.g. -- ls /usr/X11R6/lib/libXv* -+ ls /usr/lib/libXv* - should give you some .so libs, like this: - --   /usr/X11R6/lib/libXv.a --   /usr/X11R6/lib/libXv.so --   /usr/X11R6/lib/libXv.so.1 -+   /usr/lib/libXv.a -+   /usr/lib/libXv.so -+   /usr/lib/libXv.so.1 - - - Alternatively you need to have libtool 1.4 or newer installed, then -Index: doc/README_xxmc.html -=================================================================== ---- doc/README_xxmc.html.orig -+++ doc/README_xxmc.html -@@ -69,8 +69,7 @@ - installing - Make sure you have the XvMC wrapper installed. The wrapper will try to - figure out at run-time what xvmc-hardware specific driver to load. If --it fails it will open the file /etc/X11/XvMCConfig --or /usr/X11R6/lib/X11/XvMCConfig -+it fails it will open the file /usr/lib/X11/XvMCConfig - and try to load the hardware-specific library mentioned in that file. - If you downloaded the XvMC wrapper from the unichrome site, the default - XvMCConfig will make the XvMC wrapper try to load the Nvidia XvMC diff --git a/xine-lib-ffmpeg11.patch b/xine-lib-ffmpeg11.patch new file mode 100644 index 0000000..4608074 --- /dev/null +++ b/xine-lib-ffmpeg11.patch @@ -0,0 +1,388 @@ +diff -uNr xine-lib-1.2.1.orig/src/combined/ffmpeg/ffmpeg_compat.h xine-lib-1.2.1/src/combined/ffmpeg/ffmpeg_compat.h +--- xine-lib-1.2.1.orig/src/combined/ffmpeg/ffmpeg_compat.h 2012-02-04 01:41:43.000000000 +0100 ++++ xine-lib-1.2.1/src/combined/ffmpeg/ffmpeg_compat.h 2012-02-09 21:00:25.000000000 +0100 +@@ -91,5 +91,9 @@ + # define AVAUDIO 2 + #endif + ++/* AVFrame.age */ ++#if !(LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MAJOR >= 28 && LIBAVCODEC_VERSION_MICRO >= 1) ++# define AVFRAMEAGE 1 ++#endif + + #endif /* XINE_AVCODEC_COMPAT_H */ +diff -uNr xine-lib-1.2.1.orig/src/combined/ffmpeg/ff_video_decoder.c xine-lib-1.2.1/src/combined/ffmpeg/ff_video_decoder.c +--- xine-lib-1.2.1.orig/src/combined/ffmpeg/ff_video_decoder.c 2012-02-04 01:41:43.000000000 +0100 ++++ xine-lib-1.2.1/src/combined/ffmpeg/ff_video_decoder.c 2012-05-10 21:50:50.000000000 +0200 +@@ -68,6 +68,7 @@ + int thread_count; + int8_t skip_loop_filter_enum; + int8_t choose_speed_over_accuracy; ++ uint8_t enable_dri; + + xine_t *xine; + } ff_video_class_t; +@@ -92,7 +93,7 @@ + uint8_t is_mpeg12:1; + uint8_t pp_available:1; + uint8_t yuv_init:1; +- uint8_t is_direct_rendering_disabled:1; ++ uint8_t is_direct_rendering_disabled:1; /* used only to avoid flooding log */ + uint8_t cs_convert_init:1; + uint8_t assume_bad_field_picture:1; + +@@ -127,13 +128,45 @@ + + yuv_planes_t yuv; + ++#ifdef AVPaletteControl + AVPaletteControl palette_control; ++#endif ++ ++ int color_matrix, full2mpeg; ++ unsigned char ytab[256], ctab[256]; + + #ifdef LOG + enum PixelFormat debug_fmt; + #endif + }; + ++static void ff_check_colorspace (ff_video_decoder_t *this) { ++ int i, cm; ++ ++ cm = this->context->colorspace << 1; ++ /* ffmpeg bug: color_range not set by svq3 decoder */ ++ i = this->context->pix_fmt; ++ if (cm && ((i == PIX_FMT_YUVJ420P) || (i == PIX_FMT_YUVJ444P) || ++ (this->context->color_range == AVCOL_RANGE_JPEG))) ++ cm |= 1; ++ ++ /* report changes of colorspyce and/or color range */ ++ if (cm != this->color_matrix) { ++ this->color_matrix = cm; ++ xprintf (this->stream->xine, XINE_VERBOSITY_LOG, ++ "ffmpeg_video_dec: color matrix #%d\n", cm >> 1); ++ ++ this->full2mpeg = 0; ++ if (cm & 1) { ++ /* sigh. fall back to manual conversion */ ++ this->full2mpeg = 1; ++ for (i = 0; i < 256; i++) { ++ this->ytab[i] = (219 * i + 127) / 255 + 16; ++ this->ctab[i] = 112 * (i - 128) / 127 + 128; ++ } ++ } ++ } ++} + + static void set_stream_info(ff_video_decoder_t *this) { + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->bih.biWidth); +@@ -149,6 +182,8 @@ + int width = context->width; + int height = context->height; + ++ ff_check_colorspace (this); ++ + if (!this->bih.biWidth || !this->bih.biHeight) { + this->bih.biWidth = width; + this->bih.biHeight = height; +@@ -163,7 +198,8 @@ + + avcodec_align_dimensions(context, &width, &height); + +- if( this->context->pix_fmt != PIX_FMT_YUV420P && this->context->pix_fmt != PIX_FMT_YUVJ420P ) { ++ if (this->full2mpeg || (this->context->pix_fmt != PIX_FMT_YUV420P && ++ this->context->pix_fmt != PIX_FMT_YUVJ420P)) { + if (!this->is_direct_rendering_disabled) { + xprintf(this->stream->xine, XINE_VERBOSITY_LOG, + _("ffmpeg_video_dec: unsupported frame format, DR1 disabled.\n")); +@@ -195,6 +231,8 @@ + } + } + ++ this->is_direct_rendering_disabled = 0; ++ + img = this->stream->video_out->get_frame (this->stream->video_out, + width, + height, +@@ -215,7 +253,9 @@ + /* We should really keep track of the ages of xine frames (see + * avcodec_default_get_buffer in libavcodec/utils.c) + * For the moment tell ffmpeg that every frame is new (age = bignumber) */ ++#ifdef AVFRAMEAGE + av_frame->age = 256*256*256*64; ++#endif + + av_frame->type= FF_BUFFER_TYPE_USER; + +@@ -309,7 +349,7 @@ + + /* Some codecs (eg rv10) copy flags in init so it's necessary to set + * this flag here in case we are going to use direct rendering */ +- if(this->codec->capabilities & CODEC_CAP_DR1 && this->codec->id != CODEC_ID_H264) { ++ if(this->codec->capabilities & CODEC_CAP_DR1 && this->class->enable_dri) { + this->context->flags |= CODEC_FLAG_EMU_EDGE; + } + +@@ -320,6 +360,13 @@ + if (this->class->choose_speed_over_accuracy) + this->context->flags2 |= CODEC_FLAG2_FAST; + ++#ifdef DEPRECATED_AVCODEC_THREAD_INIT ++ if (this->class->thread_count > 1) { ++ if (this->codec->id != CODEC_ID_SVQ3) ++ this->context->thread_count = this->class->thread_count; ++ } ++#endif ++ + pthread_mutex_lock(&ffmpeg_lock); + if (avcodec_open (this->context, this->codec) < 0) { + pthread_mutex_unlock(&ffmpeg_lock); +@@ -347,14 +394,13 @@ + } + } + ++#ifndef DEPRECATED_AVCODEC_THREAD_INIT + if (this->class->thread_count > 1) { + if (this->codec->id != CODEC_ID_SVQ3 +-#ifndef DEPRECATED_AVCODEC_THREAD_INIT +- && avcodec_thread_init(this->context, this->class->thread_count) != -1 +-#endif +- ) ++ && avcodec_thread_init(this->context, this->class->thread_count) != -1) + this->context->thread_count = this->class->thread_count; + } ++#endif + + this->context->skip_loop_filter = skip_loop_filter_enum_values[this->class->skip_loop_filter_enum]; + +@@ -383,7 +429,7 @@ + /* enable direct rendering by default */ + this->output_format = XINE_IMGFMT_YV12; + #ifdef ENABLE_DIRECT_RENDERING +- if( this->codec->capabilities & CODEC_CAP_DR1 && this->codec->id != CODEC_ID_H264 ) { ++ if( this->codec->capabilities & CODEC_CAP_DR1 && this->class->enable_dri ) { + this->context->get_buffer = get_buffer; + this->context->release_buffer = release_buffer; + xprintf(this->stream->xine, XINE_VERBOSITY_LOG, +@@ -442,6 +488,12 @@ + class->pp_quality = entry->num_value; + } + ++static void dri_cb(void *user_data, xine_cfg_entry_t *entry) { ++ ff_video_class_t *class = (ff_video_class_t *) user_data; ++ ++ class->enable_dri = entry->num_value; ++} ++ + static void pp_change_quality (ff_video_decoder_t *this) { + this->pp_quality = this->class->pp_quality; + +@@ -542,6 +594,8 @@ + printf ("frame format == %08x\n", this->debug_fmt = this->context->pix_fmt); + #endif + ++ ff_check_colorspace (this); ++ + dy = img->base[0]; + du = img->base[1]; + dv = img->base[2]; +@@ -772,54 +826,91 @@ + + } else { + +- for (y = 0; y < this->bih.biHeight; y++) { +- xine_fast_memcpy (dy, sy, img->width); +- +- dy += img->pitches[0]; +- +- sy += this->av_frame->linesize[0]; +- } +- +- for (y = 0; y < this->bih.biHeight / 2; y++) { ++ int subsamph = (this->context->pix_fmt == PIX_FMT_YUV444P) ++ || (this->context->pix_fmt == PIX_FMT_YUVJ444P); ++ int subsampv = (this->context->pix_fmt != PIX_FMT_YUV420P) ++ && (this->context->pix_fmt != PIX_FMT_YUVJ420P); ++ ++ if (this->full2mpeg) { ++ ++ uint8_t *ytab = this->ytab; ++ uint8_t *ctab = this->ctab; ++ uint8_t *p, *q; ++ int x; ++ ++ for (y = 0; y < this->bih.biHeight; y++) { ++ p = sy; ++ q = dy; ++ for (x = img->width; x > 0; x--) *q++ = ytab[*p++]; ++ dy += img->pitches[0]; ++ sy += this->av_frame->linesize[0]; ++ } + +- if (this->context->pix_fmt != PIX_FMT_YUV444P) { ++ for (y = 0; y < this->bih.biHeight / 2; y++) { ++ if (!subsamph) { ++ p = su, q = du; ++ for (x = img->width / 2; x > 0; x--) *q++ = ctab[*p++]; ++ p = sv, q = dv; ++ for (x = img->width / 2; x > 0; x--) *q++ = ctab[*p++]; ++ } else { ++ p = su, q = sv; ++ for (x = img->width / 2; x > 0; x--) {*q++ = ctab[*p]; p += 2;} ++ p = sv, q = dv; ++ for (x = img->width / 2; x > 0; x--) {*q++ = ctab[*p]; p += 2;} ++ } ++ du += img->pitches[1]; ++ dv += img->pitches[2]; ++ if (subsampv) { ++ su += 2 * this->av_frame->linesize[1]; ++ sv += 2 * this->av_frame->linesize[2]; ++ } else { ++ su += this->av_frame->linesize[1]; ++ sv += this->av_frame->linesize[2]; ++ } ++ } + +- xine_fast_memcpy (du, su, img->width/2); +- xine_fast_memcpy (dv, sv, img->width/2); ++ } else { + +- } else { ++ for (y = 0; y < this->bih.biHeight; y++) { ++ xine_fast_memcpy (dy, sy, img->width); ++ dy += img->pitches[0]; ++ sy += this->av_frame->linesize[0]; ++ } + +- int x; +- uint8_t *src; +- uint8_t *dst; +- +- /* subsample */ +- +- src = su; dst = du; +- for (x=0; x<(img->width/2); x++) { +- *dst = *src; +- dst++; +- src += 2; ++ for (y = 0; y < this->bih.biHeight / 2; y++) { ++ if (!subsamph) { ++ xine_fast_memcpy (du, su, img->width/2); ++ xine_fast_memcpy (dv, sv, img->width/2); ++ } else { ++ int x; ++ uint8_t *src; ++ uint8_t *dst; ++ src = su; ++ dst = du; ++ for (x = 0; x < (img->width / 2); x++) { ++ *dst = *src; ++ dst++; ++ src += 2; ++ } ++ src = sv; ++ dst = dv; ++ for (x = 0; x < (img->width / 2); x++) { ++ *dst = *src; ++ dst++; ++ src += 2; ++ } + } +- src = sv; dst = dv; +- for (x=0; x<(img->width/2); x++) { +- *dst = *src; +- dst++; +- src += 2; ++ du += img->pitches[1]; ++ dv += img->pitches[2]; ++ if (subsampv) { ++ su += 2*this->av_frame->linesize[1]; ++ sv += 2*this->av_frame->linesize[2]; ++ } else { ++ su += this->av_frame->linesize[1]; ++ sv += this->av_frame->linesize[2]; + } +- + } + +- du += img->pitches[1]; +- dv += img->pitches[2]; +- +- if (this->context->pix_fmt != PIX_FMT_YUV420P) { +- su += 2*this->av_frame->linesize[1]; +- sv += 2*this->av_frame->linesize[2]; +- } else { +- su += this->av_frame->linesize[1]; +- sv += this->av_frame->linesize[2]; +- } + } + } + } +@@ -1023,7 +1114,9 @@ + memcpy(this->context->extradata, buf->decoder_info_ptr[2], + buf->decoder_info[2]); + +- } else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) { ++ } ++#ifdef AVPaletteControl ++ else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) { + unsigned int i; + + palette_entry_t *demuxer_palette; +@@ -1042,7 +1135,9 @@ + } + decoder_palette->palette_changed = 1; + +- } else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) { ++ } ++#endif ++ else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) { + int i; + + lprintf("BUF_SPECIAL_RV_CHUNK_TABLE\n"); +@@ -1504,8 +1599,8 @@ + img->duration = video_step_to_use; + + /* additionally crop away the extra pixels due to adjusting frame size above */ +- img->crop_right = this->crop_right + (img->width - this->bih.biWidth); +- img->crop_bottom = this->crop_bottom + (img->height - this->bih.biHeight); ++ img->crop_right = img->width - this->bih.biWidth; ++ img->crop_bottom = img->height - this->bih.biHeight; + + /* transfer some more frame settings for deinterlacing */ + img->progressive_frame = !this->av_frame->interlaced_frame; +@@ -1536,8 +1631,8 @@ + img->duration = video_step_to_use; + + /* additionally crop away the extra pixels due to adjusting frame size above */ +- img->crop_right = ((this->bih.biWidth <= 0) ? 0 : this->crop_right) + (img->width - this->bih.biWidth); +- img->crop_bottom = ((this->bih.biHeight <= 0) ? 0 : this->crop_bottom) + (img->height - this->bih.biHeight); ++ img->crop_right = this->bih.biWidth <= 0 ? 0 : (img->width - this->bih.biWidth); ++ img->crop_bottom = this->bih.biHeight <= 0 ? 0 : (img->height - this->bih.biHeight); + + img->bad_frame = 1; + this->skipframes = img->draw(img, this->stream); +@@ -1758,7 +1853,9 @@ + this->av_frame = avcodec_alloc_frame(); + this->context = avcodec_alloc_context(); + this->context->opaque = this; ++#ifdef AVPaletteControl + this->context->palctrl = NULL; ++#endif + + this->decoder_ok = 0; + this->decoder_init_mode = 1; +@@ -1839,6 +1936,12 @@ + "A change of this setting will take effect with playing the next stream."), + 10, choose_speed_over_accuracy_cb, this); + ++ this->enable_dri = xine->config->register_bool(config, "video.processing.ffmpeg_direct_rendering", 1, ++ _("Enable direct rendering"), ++ _("Disable direct rendering if you are experiencing lock-ups with\n" ++ "streams with lot of reference frames."), ++ 10, dri_cb, this); ++ + return this; + } + diff --git a/xine-lib-libdvdread_udf.diff b/xine-lib-libdvdread_udf.diff index e31125c..562065f 100644 --- a/xine-lib-libdvdread_udf.diff +++ b/xine-lib-libdvdread_udf.diff @@ -1,7 +1,14 @@ -diff -ur xine-lib-1.1.18.orig/src/input/libdvdnav/dvd_udf.c xine-lib-1.1.18/src/input/libdvdnav/dvd_udf.c ---- xine-lib-1.1.18.orig/src/input/libdvdnav/dvd_udf.c 2009-11-30 21:57:20.000000000 +0100 -+++ xine-lib-1.1.18/src/input/libdvdnav/dvd_udf.c 2010-02-24 21:12:36.032882913 +0100 -@@ -38,10 +38,16 @@ +# HG changeset patch +# User Tobias Rautenkranz +# Date 1202208482 -3600 +# Node ID 100241ff36f0730a15018a58456fb86eb590bf18 +# 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 @@ #include #include #include @@ -11,14 +18,13 @@ diff -ur xine-lib-1.1.18.orig/src/input/libdvdnav/dvd_udf.c xine-lib-1.1.18/src/ #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, - size_t block_count, unsigned char *data, -@@ -774,7 +780,9 @@ +@@ -774,7 +780,9 @@ static int UDFFindPartition( dvd_reader_ return part->valid; } @@ -29,7 +35,7 @@ diff -ur xine-lib-1.1.18.orig/src/input/libdvdnav/dvd_udf.c xine-lib-1.1.18/src/ uint32_t *filesize ) { uint8_t LogBlock_base[ DVD_VIDEO_LB_LEN + 2048 ]; -@@ -856,6 +864,84 @@ +@@ -856,6 +864,84 @@ uint32_t UDFFindFile( dvd_reader_t *devi return partition.Start + File.Location; } diff --git a/xine-lib-v4l-2.6.38.patch b/xine-lib-v4l-2.6.38.patch index ad7c85c..6dbed18 100644 --- a/xine-lib-v4l-2.6.38.patch +++ b/xine-lib-v4l-2.6.38.patch @@ -1,16 +1,16 @@ ---- configure.ac.orig 2011-07-07 10:45:26.462089794 +0200 -+++ configure.ac 2011-07-07 10:46:04.415089790 +0200 -@@ -682,7 +682,7 @@ - have_v4l=no - have_v4l2=no - if test "x$enable_v4l" != "xno"; then -- AC_CHECK_HEADERS([linux/videodev.h], [have_v4l=yes], []) -+ AC_CHECK_HEADERS([libv4l1-videodev.h], [have_v4l=yes], []) - AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h sys/videodev2.h], [have_v4l2=yes], []) - AC_CHECK_HEADERS([asm/types.h]) - if test "x$enable_v4l" = "xyes" && test "x$have_v4l$have_v4l2" = "xnono"; then ---- src/input/input_v4l.c 2010-03-09 23:17:05.000000000 +0100 -+++ src/input/input_v4l.c 2011-07-07 10:46:27.694089788 +0200 +--- m4/input.m4 2010-03-21 00:29:58.000000000 +0100 ++++ m4/input.m4 2011-11-16 15:59:40.674878245 +0100 +@@ -92,7 +92,7 @@ + XINE_ARG_ENABLE([v4l], [Enable Video4Linux support]) + if test x"$enable_v4l" != x"no"; then + have_v4l=yes +- AC_CHECK_HEADERS([linux/videodev.h], , [have_v4l=no]) ++ AC_CHECK_HEADERS([libv4l1-videodev.h], , [have_v4l=no]) + 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 2011-10-05 22:44:39.000000000 +0200 ++++ src/input/input_v4l.c 2011-11-16 15:35:43.075546420 +0100 @@ -47,7 +47,7 @@ */ #define _LINUX_TIME_H diff --git a/xine-lib-various-noncrippled.diff b/xine-lib-various-noncrippled.diff deleted file mode 100644 index 08f9401..0000000 --- a/xine-lib-various-noncrippled.diff +++ /dev/null @@ -1,15 +0,0 @@ -Index: src/libw32dll/wine/ldt_keeper.c -=================================================================== ---- src/libw32dll/wine/ldt_keeper.c.orig -+++ src/libw32dll/wine/ldt_keeper.c -@@ -77,6 +77,10 @@ - #ifdef __cplusplus - } - #endif -+#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) -+#define modify_ldt_ldt_s user_desc -+#endif - #else - #if defined(__NetBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) - #include diff --git a/xine-lib-without-ffmpeg.patch b/xine-lib-without-ffmpeg.patch new file mode 100644 index 0000000..9a20a50 --- /dev/null +++ b/xine-lib-without-ffmpeg.patch @@ -0,0 +1,32 @@ +diff -uNr xine-lib-1.2.1.orig/m4/decoders.m4 xine-lib-1.2.1/m4/decoders.m4 +--- xine-lib-1.2.1.orig/m4/decoders.m4 2012-02-04 01:41:43.000000000 +0100 ++++ xine-lib-1.2.1/m4/decoders.m4 2012-05-21 22:46:39.470861703 +0200 +@@ -85,9 +85,7 @@ + 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 +diff -uNr xine-lib-1.2.1.orig/src/audio_dec/Makefile.am xine-lib-1.2.1/src/audio_dec/Makefile.am +--- xine-lib-1.2.1.orig/src/audio_dec/Makefile.am 2012-02-04 01:41:43.000000000 +0100 ++++ xine-lib-1.2.1/src/audio_dec/Makefile.am 2012-05-22 20:37:48.863941984 +0200 +@@ -49,7 +49,6 @@ + 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_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) diff --git a/xine-lib.changes b/xine-lib.changes index b45740f..3c6cb24 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,1586 +1,15 @@ ------------------------------------------------------------------- -Tue May 15 20:51:22 UTC 2012 - seife+obs@b1-systems.com +Sat Feb 04 19:40:00 UTC 2012 - Manfred.Tremmel@iiv.de -- fix build for > 12.1: patch for new zlib; work around autoconf - (?) issue with empty directories on x86_64 - -------------------------------------------------------------------- -Thu Feb 23 12:51:27 UTC 2012 - coolo@suse.com - -- buildrequire xorg-x11-devel to get all X11 libs (better safe - than sorry) - -------------------------------------------------------------------- -Mon Feb 13 10:57:56 UTC 2012 - coolo@suse.com - -- patch license to follow spdx.org standard - -------------------------------------------------------------------- -Mon Dec 02 22:51:00 UTC 2011 - Manfred.Tremmel@iiv.de - -- update to 1.1.20.1 +- update to 1.2.1 + * The "I'm at Tyneside LUG" release. + * Enable PulseAudio, JACK and VDPAU on the Hurd. + * Rewrite of VDPAU OSD handling. + * sndio plugin is now buildable. * Various bug fixes. - * Use the current ImageMagick API (if using ImageMagick). - * Fix PVR plugin input building (needs V4L2). - * Fixes related to unknown audio & subtitle languages. - * Memory leak fixes. ------------------------------------------------------------------- -Sat Nov 19 15:41:25 UTC 2011 - coolo@suse.com +Fri Jan 06 11:06:00 UTC 2012 - Manfred.Tremmel@iiv.de -- add libtool as buildrequire to avoid implicit dependency - -------------------------------------------------------------------- -Sun Nov 13 16:58:00 UTC 2011 - Manfred.Tremmel@iiv.de - -- update to 1.1.20 - * Imagine that there's a large poppy here. - * Ensure that file and socket descriptors are marked as CLOEXEC. - * Enable FFmpeg's support for AAC LATM audio. - * Fix build-time check for dvdnav. - * Allow use of GraphicsMagick instead of ImageMagick. - * Fix build on Debian GNU/kFreeBSD (broken in 1.1.19). - * Add a Japanese translation from Takeshi Hamasaki. - * Czech translation update. - * New MinGW-w64 port, various portability fixes. - * MinGW port updates. - * Possibility to disable HW acceleration in directx video output. - * Header stripping support in Matroska demuxer. - * Update nosefart to 2.7-mls (stability with corrupted NSF files). - * Add .ass extension to be recognized as subtitle file. [Bug #123] -------------------------------------------------------------------- -Sun Nov 6 03:48:03 UTC 2011 - reddwarf@opensuse.org - -- Fix Packman build: since /usr/share/xine/mad is no longer needed - don't create it - -------------------------------------------------------------------- -Fri Oct 21 09:04:30 UTC 2011 - lnussel@suse.de - -- fix build: /usr/share/xine/mad is no longer needed - -------------------------------------------------------------------- -Thu Jul 7 08:49:59 UTC 2011 - idonmez@novell.com - -- Add xine-lib-v4l-2.6.38.patch: use the new v4l interface - -------------------------------------------------------------------- -Sat May 28 17:09:00 CET 2011 - Manfred.Tremmel@iiv.de - -- included a patch to build against new ffmpeg abi - -------------------------------------------------------------------- -Thu Nov 18 10:04:52 UTC 2010 - coolo@novell.com - -- add patch from arch linux to fix build with newer xorg - -------------------------------------------------------------------- -Tue Aug 3 13:14:49 UTC 2010 - lnussel@suse.de - -- remove unneeded libcdio-mini-devel buildignore again - -------------------------------------------------------------------- -Mon Jul 26 01:00:00 CET 2010 - Manfred.Tremmel@iiv.de - -- update to 1.1.19 - * Handle odd widths properly (for ffmpeg-decoded video). - * Make buildable with current (external) libdvdnav & libdvdread. - * Fix V4L2 check. - * Add support for Ogg tag 'DISCNUMBER' and ID3 tag 'TPOS'. - * Add support for EAC3. - * Recognise video/mp2t and video/mp2p. - * TTA fixes. - * Add support for Xv gamma adjustment. - * Better recovery from ALSA-reported errors. - * Report stream buffer stats to the application. - * Recognise and handle the WebM container format. - (VP8 video is not yet supported.) - * Recognise ScreamTracker 2 & 3 files. - * Fix playback of the first file handled by the modplug demuxer. - * Refuse to build with known-broken libmodplug (0.8.8). - http://bugs.debian.org/588465 - * Fix a potential freeing of unallocated memory. - -------------------------------------------------------------------- -Mon Apr 26 11:39:27 CEST 2010 - ro@suse.de - -- buildignore libcdio-mini-devel - -------------------------------------------------------------------- -Sun Mar 7 01:00:00 CET 2010 - Manfred.Tremmel@iiv.de - -- update to 1.1.18.1 - * Oops. compat.c (for DXR3 support) was omitted. - * Fix up V4L/V4L2 compilation. Some non-Linux have V4L2 but not V4L. - * Fix a size check (wrong variable, causing int/ptr comparison) in rmff.c. - * Fix build with the old, outdated and deprecated internal ffmpeg. - -------------------------------------------------------------------- -Wed Feb 24 23:14:00 CET 2010 - Manfred.Tremmel@iiv.de - -- update to 1.1.18 - * Bump the FLAC decoder's priority above ffmpegaudio. This should fix - various problems with FLAC playback. - * Build fix (undefined symbol) for when using older ffmpeg. - * TTA demuxer fixes; allow seeking. - * More meta-information tags. - Only the Ogg demuxer knows about these at present. - * Added basic support for .qtl (Quicktime media link). - * "Fixed" playback of 24-bit FLAC. - * Fixed playback of 24-bit LPCM. - * Work around an ffmpeg bug concerning Sorenson Video 3. - * Flash audio bug fixes, mostly concerning AAC. - * Fix DXR3 support for newer versions of the em8300 driver. - * Added support for WMA Pro. - -------------------------------------------------------------------- -Wed Feb 03 21:03:00 CET 2010 - Manfred.Tremmel@iiv.de - -- patches can't be build to work with crippled and non crippled tarball - with fuzz=0, added "-F2" for patch 50 and 61 to fix this - -------------------------------------------------------------------- -Mon Feb 1 12:37:47 UTC 2010 - jengelh@medozas.de - -- package baselibs.conf - -------------------------------------------------------------------- -Fri Jan 8 12:28:04 CET 2010 - ro@suse.de - -- rediffed again - -------------------------------------------------------------------- -Wed Dec 16 11:16:46 CET 2009 - meissner@suse.de - -- rediffed for fuzz=0 - -------------------------------------------------------------------- -Mon Dec 01 21:14:00 CEST 2009 - Manfred.Tremmel@iiv.de - -- update to 1.1.17 - * Add support for Matroska SIMPLEBLOCK. - * Add support for sndio (OpenBSD sound API). - * Correct invalid MIME info in the MOD demuxer. - * Fix a resource leak in libdvdnav. - * Properly NUL-terminate when reading ID3v2.2 tag content. - * Fix handling of the length of UTF-16 content sourced from, e.g., ID3 tags. - * Make ~/.xine/catalog.cache writing safer: write a new file & atomically - replace the old one. - * Initial parsing of Xing header LAME extension. - * Fixes for gapless playback. - * Added padding delay to the first and last frames (MPEG audio). - * Fixed buggy discontinuity handling when playing short streams and using the gapless switch. The current time should not be used here. - * Added audio padding handling. (New buffer flag for this.) - * Fix seeking in large raw DV files. - * Ported to new libmpcdec API (retaining build compat. with the old API). - * Cope with CDDB return code 211 (multiple entries). - * Allow reading of non-block-sized chunks from audio CDs. - * Add a user agent & protocol hack ("qthttp://...") to allow direct - viewing of Apple film trailers. - * Fixed int-to-float conversion in the JACK output plugin. - * Work around MOD files with reported length == 0. - * Reworked Matroska demuxer. Now reads files created by mkvmerge 2.7.0. - * Support BluRay/HDMV streams & subtitles. - * The XML parser & lexer code now has re-entrancy. - * Fixed a bug which prevented "dvb://" (no channel specified) working with - the default configuration. - * Handle VC1 extradata requirement (should fix playback). - -------------------------------------------------------------------- -Wed Nov 18 15:11:00 UTC 2009 - lnussel@suse.de - -- enable libmodplug on >= 11.2 - -------------------------------------------------------------------- -Sat Nov 14 15:31:00 CEST 2009 - Manfred.Tremmel@iiv.de - -- merged packman and openSUSE package -- update to 1.1.16.3 - * Security fixes: - - Fix another possible int overflow in the 4XM demuxer. - (ref. TKADV2009-004, CVE-2009-0385) - - Fix an integer overflow in the Quicktime demuxer. - * Enable libmpeg2new (if configured with --enable-libmpeg2new). - This is not yet production code; the old mpeg2 decoder remains the default. - * Add support for OpenBSD. - * Fix a build failure on *BSD due to some rather useful GNUisms. - * Protect audio loop so it cannot write to a paused device (fix - pause/resume freeze with pulseaudio). - * Fix build with libavutil >= 50.0.0. - * Fix segfaults when playing VCDs. - * Fix calculation of frame duration for ffmpeg-decoded formats. - * Don't assume that ID3v2 tags with no content mean "end of ID3 data". -- changes from 1.1.16.1 to 1.1.16.2: - * Build fixes related to ImageMagick 6.4 & later. - * Fix an error in Matroska PTS calculation. - * Some front ends hang due to the hang fixes in 1.1.16. Fix this by - removing a break statement. - * Fix broken size checks in various input plugins (ref. CVE-2008-5239). - * More malloc checking (ref. CVE-2008-5240). - * Fix race conditions in gapless_switch (ref. kde bug #180339) - * Fix a possible integer overflow in the 4XM demuxer. - (TKADV2009-004, CVE-2009-0385) - -------------------------------------------------------------------- -Tue Sep 29 18:01:00 CEST 2009 - meissner@suse.de - -- trying to fix timing issue in MJPEG plugin. bnc#327569 - -------------------------------------------------------------------- -Fri Sep 25 15:19:17 CEST 2009 - meissner@suse.de - -- Made my xine MJPEG plugin more stable. bnc#327569 - (still crashes in XShm mode, but this might be due to XShm) - -------------------------------------------------------------------- -Fri Mar 6 19:25:25 CET 2009 - mhopf@suse.de - -- Updated security fix for 4xm demuxer (TKADV2009-004, bnc#473825) - -------------------------------------------------------------------- -Tue Feb 17 11:50:57 CET 2009 - lnussel@suse.de - -- fix libtool breakage on older distributions with hack - -------------------------------------------------------------------- -Tue Feb 10 16:45:05 CET 2009 - mhopf@suse.de - -- Security fix for 4xm demuxer (TKADV2009-004, bnc#473825) - -------------------------------------------------------------------- -Tue Jan 27 19:27:37 CET 2009 - mhopf@suse.de - -- Update to 1.1.16.1: - - * Security fixes: - - Heap overflow in Quicktime atom parsing. (CVE-2008-5234) - - Multiple buffer overflows. (CVE-2008-5236) - - Multiple integer overflows. (CVE-2008-5237) - - Unchecked or incompletely-checked read function results. (CVE-2008-5239) - - Unchecked malloc using untrusted values. (CVE-2008-5240, CVE-2008-5242) - - Integer underflow in qt compressed atom handling. (CVE-2008-5241) - - Buffer indexing using untrusted or unchecked values. (CVE-2008-5243) - - Integer overflows in the ffmpeg audio decoder and the CDDA server. - - Heap buffer overflow in the ffmpeg video decoder. - - Avoid segfault on invalid track type in Matroska files. - - Avoid underflow (compressed atoms) in the Qt demuxer. - * Fix reported compilation failures (with C++ programs). - * Fix CDDB access in 64-bit builds. - * Fix seeking FLV clips that don't specify the movie length in the headers. - * Support H.264 and AAC streams within FLV. - * Fix timing issues (broken audio) on mingw. - * Add ID3 tag TDRC to replace/complement the deprecated tag TYER. - * Add a new meta-tag, "Composer", and use it in the FLAC demuxer. - * Correct AAC channel ordering for multi-channel audio, at least for FLAC - when using ALSA or PulseAudio. (Needs a proper fix.) - * Add position-based seeking independent from seekpoints. - * Fix some XCB Xv attribute configuration breakage. - * Add a configuration option for Xv bicubic filtering, implemented in - xf86-video-ati 6.9.1. - * Recognise Xv "blitter" adaptors for port selection purposes. - NOTE: you will need to remove ~/.xine/catalog.cache when upgrading from - xine-lib 1.1.15 or older if you wish to use this extra option. - * Fix MMS media requests where the URI contains %-encoded characters. - * Fix two hangs related to stopping playback of broken audio streams where - no audio data is sent to the output thread. - * Fix WAV demuxer to send the last frames when they don't fit perfectly into - the buffer - * Fix build with older ffmpeg, both internal and in Debian 5.0. - * Add version check for CACA library and disable CACA plugin if needed - * Fix playback of some H.264 files (broken in 1.1.16). - * Various other build & bug fixes. - * Some FAQ list updates. - -------------------------------------------------------------------- -Wed Jan 7 12:34:56 CET 2009 - olh@suse.de - -- obsolete old -XXbit packages (bnc#437293) - -------------------------------------------------------------------- -Thu Nov 27 14:14:59 CET 2008 - ro@suse.de - -- update baselibs.conf - -------------------------------------------------------------------- -Thu Nov 13 11:27:31 CET 2008 - lnussel@suse.de - -- explicitly require Mesa-devel - -------------------------------------------------------------------- -Tue Oct 21 12:10:59 CEST 2008 - lnussel@suse.de - -- fix build with newer autoconf - -------------------------------------------------------------------- -Wed Sep 17 09:47:23 CEST 2008 - lnussel@suse.de - -- add some more obsoletes/provides for legacy packman packages -- fix build with newer ffmpeg releases - -------------------------------------------------------------------- -Thu Sep 4 14:56:47 CEST 2008 - lnussel@suse.de - -- split and rename package to adhere to library package conventions - -------------------------------------------------------------------- -Tue Aug 26 11:15:41 CEST 2008 - lnussel@suse.de - -- remove fuzzy hunk from xine-lib-1.1.15-cpp-compilation.diff to fix - build on older distributions - -------------------------------------------------------------------- -Fri Aug 22 14:51:08 CEST 2008 - lnussel@suse.de - -- Update to 1.1.15: - - * Security fixes: - - Fix crashes with various corrupted media files, including Ogg. - (CVE-2008-3231) - This includes a libfaad update from the 1.2 branch. - - Delay V4L video frame preallocation until we know how large they'll be. - - Fix an exploitable ID3 heap buffer overflow. - - Check for possible buffer overflow attempts in the Real demuxer. - - Use size_t for data length variables where there may be int overflows. - - Add some checks for memory allocation failures. - * Use external ffmpeg and libfaad by default. - * V4L: Don't segfault if asked for an input that doesn't exist. - * Recognise AMR audio (normally found in 3GP files). - * Recognise Snow video. - * Xv deinterlacing didn't take the size of the deinterlaced image into - account; on some chipsets, this would cause image corruption, while on - others, there would be no problem. - * V4L: only try and set the tuner if we're going to use it. Setting the tuner - when using baseband video (CVBS, S-Video) breaks the input. - * Fix crashes with MP3 files with metadata consisting only of separators. -- move extra skins to xine-ui package -- use external faad and ffmpeg libraries - -------------------------------------------------------------------- -Fri Aug 1 20:03:30 CEST 2008 - mhopf@suse.de - -- Verify whether the visual is direct rendering capable before actually - activating the opengl plugin (bnc #402687) - -------------------------------------------------------------------- -Fri Jul 25 14:55:37 CEST 2008 - lnussel@suse.de - -- Update to 1.1.14: - - * DVB changes: - - Reacquire PIDs whenever a PMT is parsed. (Some channels' PIDs are - changed on a regular basis.) - - Recognise more stream formats (as defined in the broadcast PMT). - - Allow automatic detection of more DVB tuning parameters. - - Allow the GUI to be disabled. - - Allow configuration of the location of channels.conf. - * V4L: allow TV standard selection. - * Allow input plugins to report MIME type information. - This is used for demuxer plugin selection immediately before testing the - filename extension (so it won't work when demuxer selection is done by - stream content only). [Bug #120] - * Allow input plugins to ask for a specific demuxer, overriding the normal - demuxer selection methods. (Most won't need this.) - * The Xv and XxMC video output plugins now support Xv port selection via - two methods: port number and port type (currently "any", "overlay" and - "textured video"). Port number takes precedence; the plugins will fall - back on another port of the same type (if a type was specified) then on - whatever they can find. - XvMC does not support port selection at present. - (Backported from the 1.2 branch.) - * Fix MPEG TS audio stream problems introduced in 1.1.13. - * Add basic aspect ratio detection for Windows Media Video streams. - -- Update to 1.1.13: - * Security fixes: - - Buffer overflow in the NSF demuxer which may allow remote attackers to - cause a denial of service (crash) or possibly execute arbitrary code - via an NSF file with a long title or copyright message. (CVE-2008-1878) - - For extra safety against possible Integer overflows like the ones found - in CVE-2008-1482, backport more calloc usage from 1.2 branch. - * Improved JACK output plugin. - * Added MIME types and .mpp for musepack. - * Fixed display of some MJPEG streams (YUVJ420P). - * Deprecate xine_xmalloc() function, see src/xine-utils/utils.c for more - information about the reason. - * Provide a useful implementation of xine_register_log_cb(). - -------------------------------------------------------------------- -Thu Jun 19 11:15:33 CEST 2008 - schwab@suse.de - -- Remove local libtool macros and run autoreconf. - -------------------------------------------------------------------- -Wed May 14 16:26:18 CEST 2008 - mhopf@suse.de - -- Update to 1.1.12: (fixes bnc#379499) - - * Fixed and improved the PulseAudio driver. - * Fixed a regression in 1.1.11.1 which broke Quicktime container handling. - * And another, this time in the Matroska demuxer. - * Added a tool to assist with generating front ends' desktop files. It - lists MIME types & filename extensions known to the installed xine-lib. - * Various Real codec improvements, including: - - RV20 no longer causes segfaults (observed on amd64); - - Cook is now handled by ffmpeg. - * Added a video output plugin intended for passing raw data to the front end. - -------------------------------------------------------------------- -Fri Apr 18 15:07:47 CEST 2008 - lnussel@suse.de - -- fix overflow in nsf demuxer (bnc#380772, CVE-2008-1878) - -------------------------------------------------------------------- -Thu Apr 17 10:48:56 CEST 2008 - lnussel@suse.de - -- Update to vdr-xine-0.8.2 - * bugfix release -- don't use %run_ldconfig anymore -- don't install non-Linux READMEs - -------------------------------------------------------------------- -Tue Apr 15 17:01:11 CEST 2008 - lnussel@suse.de - -- fix insufficient bounds checking in speex decoder (bnc#379106, - CVE-2008-1686) - -------------------------------------------------------------------- -Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de - -- added baselibs.conf file to build xxbit packages - for multilib support - -------------------------------------------------------------------- -Mon Mar 31 12:25:04 CEST 2008 - mhopf@suse.de - -- Update to 1.1.11.1: - * Added a few more memory allocation checks to the above demuxers. - * WAV file playback fix: don't assume that the first chunk is "fmt ". - * Don't try to play partial 24-bit AIFF frames (decoder would lose data). - * Fixed AIFF comment chunk handling and sample rate reading. - * LPCM fixes: input over-reading, conversion of 24-bit samples. -- Updated precheckin_cripple_tarball.sh - -------------------------------------------------------------------- -Tue Mar 25 19:26:50 CET 2008 - mhopf@suse.de - -- Security fix for bnc#372877: integer overflows in malloc - CVE-2008-1482 -- Added missing aalib-devel dependency. - -------------------------------------------------------------------- -Wed Mar 19 16:42:18 CET 2008 - mhopf@suse.de - -- Update to 1.1.11: - * Security fixes: - - Array Indexing Vulnerability in sdpplin_parse(). (CVE-2008-0073) - * Reworked the plugin directory naming so that external plugins don't have - to be rebuilt for every release. We now use a naming scheme based on the - API/ABI versioning, checking older directories - with this release, the - plugin directory name is 1.20, and if this gets bumped to 1.21 in a - future release, 1.20 will still be available for external plugins. - (Any directories not 1.* won't be looked in.) - * Made the version parsing much more reliable; it wasn't properly coping - with four-part version numbers. This affects any program whose build - scripts use xine-lib's automake macros. - * Fixed an off-by-one in the FLAC security fix patch. This breakage was - causing failure to play some files. - * Support 16-bit big-endian DTS audio. - * Improved frame snapshot API. (ABI extension.) - * Re-add support for # (stream parameter separator) in raw filenames, - without the bugs found in the original implementation. - (This is a convenience feature for users only. Front ends which rely on - it for functions like subtitle file detection must instead use file:// - MRLs; if they don't, we consider them to be buggy.) - * Fixed long delay when closing stream on dual core systems [Bug #33] - -------------------------------------------------------------------- -Mon Mar 10 13:28:58 CET 2008 - lnussel@suse.de - -- get rid of nosrc so a debuginfo package get created (bnc#284030) - -------------------------------------------------------------------- -Fri Feb 15 10:34:49 CET 2008 - lnussel@suse.de - -- Update to 1.1.10.1: - * Security fix: Array index vulnerability which may allow remote - attackers to execute arbitrary code via a crafted FLAC tag, - causing a stack buffer overflow. (CVE-2008-0486) - * Fix a RealPlayer codec detection bug. - * Improve detection of MP3 streams with ID3v2 tags. Don't trust the tag - size. - -------------------------------------------------------------------- -Tue Jan 29 11:57:55 CET 2008 - lnussel@suse.de - -- Update to 1.1.10: Maintenance release with security fix - * Security fixes: - - Buffer overflow which allows a remote attacker to execute arbitrary - code or crash the client program via a crafted ASF header. - (Related to CVE-2006-1664) - * Update Ogg and Annodex mimetypes and extensions. - * Change the default v4l device paths to /dev/video0 and /dev/radio0. - * Fix support for subtitles with schemes (e.g. http://), partly broken - since 1.1.8. - * Unescape the filename in "#save:". This allows filenames to contain ';' - etc. without ambiguity, e.g. "#save:foo%3B1.ts" -> "foo;1.ts", but front - end authors should be careful with xine-lib older than 1.1.10. - * Backported xine-config & libxine.pc from 1.2. - Consequently, xine-config now requires pkg-config. - * Don't discard audio samples forever. Fixed streaming playback. - * Fix a possible crash on channel change in the DVB plugin. - * Flash video demuxer improvements and bug fixes. - * Make the V4L ALSA audio input device configurable. -- stick with xine-lib instead of xine-base - -------------------------------------------------------------------- -Tue Jan 29 10:07:18 CET 2008 - lnussel@suse.de - -- fix build on older distros and x86_64 - -------------------------------------------------------------------- -Thu Jan 24 11:58:23 CET 2008 - mhopf@suse.de - -- Add mad-devel only if building uncrippled. - -------------------------------------------------------------------- -Tue Jan 22 18:52:52 CET 2008 - mhopf@suse.de - -- Move source package to xine-base: - - Build xine-internal depending on define in top of specfile - - Make package distributable for inclusion in openSUSE. -- xine-internal now created by additional xine-base-internal package. - -------------------------------------------------------------------- -Fri Jan 11 17:58:16 CET 2008 - mhopf@suse.de - -- Update to 1.1.9.1: Security fix - Buffer overflow in RTSP header-handling code. (CVE-2008-0225) - -------------------------------------------------------------------- -Thu Jan 10 11:38:30 CET 2008 - lnussel@suse.de - -- fix path to vdr-xine fifos - -------------------------------------------------------------------- -Mon Jan 7 20:32:07 CET 2008 - mhopf@suse.de - -- Update to 1.1.9: Maintenance release - - * Fix dvd://.../title[.chapter] handling. - * Many DVB fixes. - * Fix incorrect H.264 detection on successive MPEG1/2 B frames. - * Add UI option to configure FFmpeg's video decoder thread count. - * Improve syncing of audio and video in the presence of bad frames. - * Improve handling of invalid or unknown frame sizes. - * Fixes in Flash video, Real demuxer, sputext, subtitle rendering. - * Fixes in XML, UTF-8, URL, filename handling. - * Crash, deadlock, and build fixes. - * Nicer wakeup behaviour, using select instead of nanosleep (800 -> 100 - wakeups/s). - * Fix ALSA sample loss on close. - * Updated translations. - * Detect corrupted or broken seek tables in CBR MP3 files. [Bug #3] - -- Update to vdr-xine-0.8.1 - -------------------------------------------------------------------- -Tue Nov 13 15:21:55 CET 2007 - mhopf@suse.de - -- Workarounds to compile with gcc 4.3 - -------------------------------------------------------------------- -Wed Oct 31 02:16:27 CET 2007 - ro@suse.de - -- include assert.h for alsa source - -------------------------------------------------------------------- -Fri Oct 19 15:21:26 CEST 2007 - lnussel@suse.de - -- Update to vdr-xine-0.7.12 - -------------------------------------------------------------------- -Tue Aug 28 17:22:46 CEST 2007 - mhopf@suse.de - -- Installing input_vdr.h again (304220). - -------------------------------------------------------------------- -Tue Aug 28 14:35:59 CEST 2007 - mhopf@suse.de - -- Fixed DVB issues (305265). -- Updated to 1.1.8 - mostly Bugfixes: - - * Fix an audio resampling problem which was causing regular clicking. - * Fix a crash with "dvb:/". - * DVB subtitle fixes: deadlock prevention, thread leakage, spec compliance. - * Allow the DVB input plugin to timeout if it is receiving no signal. - * Fix handling of multiple MPEG TS audio streams & subtitle languages. - * Clean up "%" unescaping in MRLs; correctly handle "%" in DVD and VCD MRLs. - * Fix some memory leaks in the Vorbis decoder and video overlays. - * Fix a problem with the goom plugin which could cause it to stop working. - * Various small video frame-handling bug fixes. - - * Send a channel-changed event to the frontend when receiving the SYNC - string from last.fm streaming server. - * Add colouring for bold & italic in text subtitles. - * Simple scaling of subtitles to fit the frame width (intended to cope - with common DVB resolutions such as 544x576). - * Add options to control bob deinterlacing in the XxMC video output plugin. - -------------------------------------------------------------------- -Sat Aug 18 15:02:14 CEST 2007 - ssommer@suse.de - -- Recommend and use opensuse-codecs-installer - -------------------------------------------------------------------- -Mon Jul 2 18:10:21 CEST 2007 - mhopf@suse.de - -- Fixed MJPG decoder linkage. -- Finally removed obsolete vdr-xine-lib-0.7.10-noncrippled.diff. - -------------------------------------------------------------------- -Thu Jun 28 13:56:38 CEST 2007 - meissner@suse.de - -- added motion jpeg decoder plugin so we can play - movies captured by digital camera even on the crippled - version. - -------------------------------------------------------------------- -Tue Jun 12 15:30:33 CEST 2007 - mhopf@suse.de - -- Fixed precheckin_cripple_tarball.sh -- Updated to 1.1.7: - - * Support for libdca. - * handle disappearing audio devices (typically USB). - * Fixed VCD playback (broken since 1.1.4). - * Various other minor fixes and improvements. - -------------------------------------------------------------------- -Thu Apr 26 11:03:04 CEST 2007 - lnussel@suse.de - -- fix build on 10.2 by excluding xcb plugins from file list - -------------------------------------------------------------------- -Wed Apr 18 14:21:53 CEST 2007 - mhopf@suse.de - -- Updated to 1.1.6: - - * 1.1.5 had a few problems with CD audio and DVD playback. - * Split the DirectFB plugin into X11 and non-X versions. - * Fixed the XcbXv plugin - an empty plugin would be built if "old" Xv - isn't detected. - * Reworked the channels.conf file handling in the DVB plugin. - * Fixed a CDDA-related crash and a DVD-related hang. - -------------------------------------------------------------------- -Mon Apr 16 11:59:58 CEST 2007 - mhopf@suse.de - -- Updated to 1.1.5: - - * Security fixes. - * Improved PulseAudio plugin. - * Added XCB-based output plugins (Xv and XShm). - * Fix race condition in alsa audio out driver. - * Fixed a crash in the eq2 plugin. - * Fixed content type detection for AAC. - * Parse ID3v2 tags on AAC and FLAC files, as well as mp3 files. - * Priority of the AAC encoder is now lower than anything else. - * Relicense the xine-lib XML parser under the GNU LGPL. - * Spanish translation updated by Carlos E. Robinson M. - * Don't leave libstk support to be detected automagically. - * Cleaned up Real binary codecs support. - * Avoid a possible floating-point exception when starting stream playback. - * Now xine can play correctly media on HTTP servers reporting status codes - but no status message. - * Wave files with 24-bit integer PCM streams now should play correctly. - * Added centre-cutout (4:3 in 16:9) to the expand plugin. - * Fix support of block devices for AC3 and DTS demuxers. - * Fix amp muting when level is still at 100. - * Create at least a 1x1 shared image when the first frame is skipped. - * Send an event when the amp level is modified. - * Add support for H.264 video stream in PES packets. - * Support multiple audio PID in MPEG TS. - * Multiple platform fixes. - -------------------------------------------------------------------- -Wed Mar 28 20:10:09 CEST 2007 - mhopf@suse.de - -- Distributed source tarball is now crippled. - Call precheckin_cripple_tarball.sh for new xine-lib tarballs. -- Major build update. - -------------------------------------------------------------------- -Wed Mar 14 15:19:49 CET 2007 - mhopf@suse.de - -- Security fix for #254374: DSO loader buffer overflow. - CVE-2007-1387 -- BuildRequires fix (libcdio). - -------------------------------------------------------------------- -Tue Feb 27 14:56:51 CET 2007 - sbrabec@suse.cz - -- Reduced BuildRequires. - -------------------------------------------------------------------- -Wed Jan 31 15:59:59 CET 2007 - mhopf@suse.de - -- Update to xine-lib-1.1.4 -- Update to vdr-xine-0.7.10 -- Fixed some new(?) installation failures -- xineplug_flac has to be triggered on configure manually now. - -------------------------------------------------------------------- -Thu Jan 18 13:08:32 CET 2007 - mhopf@suse.de - -- Fix comparing char* pointer with a string literal. - -------------------------------------------------------------------- -Fri Dec 8 16:06:45 CET 2006 - mhopf@suse.de - -- Update to xine-lib 1.1.3 -- Fixed several strncat() and dubious postincrements. - -------------------------------------------------------------------- -Thu Nov 30 12:11:22 CET 2006 - mhopf@suse.de - -- Security fix for #224813: Potential buffer overflow for real media. - SF tracker #1603458: - https://sf.net/tracker/index.php?func=detail&aid=1603458&group_id=9655&atid=109655 - -------------------------------------------------------------------- -Tue Nov 21 18:04:49 CET 2006 - mhopf@suse.de - -- Security fix for #222892: Insufficient validation of AVI headers. - CVE-2006-4799 and CVE-2006-4800. - -------------------------------------------------------------------- -Tue Oct 17 00:16:17 CEST 2006 - ro@suse.de - -- remove DirectFB from BuildRequires (unused) - -------------------------------------------------------------------- -Thu Oct 12 18:46:41 CEST 2006 - mhopf@suse.de - -- Hotfix for automake-less patch. - -------------------------------------------------------------------- -Wed Oct 11 15:23:14 CEST 2006 - mhopf@suse.de - -- Missed spu detection in one place. -- Fixed for building w/o automake. -- Spec file cleanup. - -------------------------------------------------------------------- -Tue Oct 10 18:59:14 CEST 2006 - mhopf@suse.de - -- Fixed detection of crippled package for DVD playback (mpeg2 + spu). - -------------------------------------------------------------------- -Wed Sep 27 13:05:28 CEST 2006 - lnussel@suse.de - -- build xine-ui in separate package - -------------------------------------------------------------------- -Mon Sep 11 20:04:53 CEST 2006 - mhopf@suse.de - -- Fixed VDR plugin build. - -------------------------------------------------------------------- -Fri Aug 11 16:35:05 CEST 2006 - mhopf@suse.de - -- Fixed X11R6 paths in docs. - -------------------------------------------------------------------- -Tue Aug 8 21:16:35 CEST 2006 - mhopf@suse.de - -- Fixes for compatibility to X.org 7.1 -- Cleaned up web references (codec crippled xine + base url) -- Improved author lists -- Removed unnecessary autoreconf for libs. -- Added plugins that are finnally building on ppc64 (+s390?) -- More cleanup - -------------------------------------------------------------------- -Thu Jul 13 13:16:32 CEST 2006 - mhopf@suse.de - -- Update to xine-lib-1.1.2 -- Update to vdr-xine-0.7.9 -- Cleanup, renamed several patches. - -------------------------------------------------------------------- -Thu Jul 6 20:24:27 CEST 2006 - mhopf@suse.de - -- Security fix for #190398: Buffer overflow in libmms. -- xine-devel Requires: xine-lib now. - -------------------------------------------------------------------- -Wed Jun 21 17:59:30 CEST 2006 - mhopf@suse.de - -- Update po/Makefile.in.in for updated autotools. - -------------------------------------------------------------------- -Mon Jun 19 11:22:53 CEST 2006 - schwab@suse.de - -- Work around broken use of configure substitutions. - -------------------------------------------------------------------- -Tue Jun 6 17:50:30 CEST 2006 - mhopf@suse.de - -- Improved fix for #180850: Use correct buffer size. - -------------------------------------------------------------------- -Thu Jun 1 17:29:40 CEST 2006 - mhopf@suse.de - -- Security fix for #180850: Buffer overflow in HTTP input plugin. - -------------------------------------------------------------------- -Wed May 17 13:51:45 CEST 2006 - schwab@suse.de - -- Fix unaligned access. - -------------------------------------------------------------------- -Sun May 14 19:26:12 CEST 2006 - schwab@suse.de - -- Fix undefined symbol [#173413]. -- Fix misuses of sprintf. -- Ensure non-executable stack. - -------------------------------------------------------------------- -Thu Apr 20 17:45:27 CEST 2006 - mhopf@suse.de - -- Security fix for #167276: http://open-security.org/advisories/16 - -------------------------------------------------------------------- -Thu Apr 20 14:16:16 CEST 2006 - meissner@suse.de - -- Removed -U_FORTIFY_SOURCE. Verified xine --keymap working. - -------------------------------------------------------------------- -Tue Apr 11 11:30:58 CEST 2006 - mhopf@suse.de - -- Security fix for http://www.xfocus.org/advisories/200603/11.html, - as far as xine is affected. - -------------------------------------------------------------------- -Thu Mar 30 13:13:02 CEST 2006 - mhopf@suse.de - -- Fix for #157854: Check for mad and ffmpeg before advertizing mp3. -- Improved fix for shared images, but not shared pixmaps. - -------------------------------------------------------------------- -Thu Mar 16 16:03:28 CET 2006 - mhopf@suse.de - -- Really fixed #132749: crippled xine URL was no longer valid. - Missed text in one of the patches. - -------------------------------------------------------------------- -Fri Mar 10 16:13:16 CET 2006 - bk@suse.de - -- Add esound-devel to BuildRequires (was implicily by SDL-devel) - -------------------------------------------------------------------- -Mon Mar 6 19:51:40 CET 2006 - mhopf@suse.de - -- xine-ui had broken user interface on Xservers that support shared images, - but no shared pixmaps (like Xgl). Fixed. - -------------------------------------------------------------------- -Fri Mar 3 17:35:03 CET 2006 - mhopf@suse.de - -- Fixed #132749: crippled xine URL was no longer valid. - Now on opensuse.org. - -------------------------------------------------------------------- -Wed Mar 1 18:28:47 CET 2006 - mhopf@suse.de - -- Fixed #144083: vdr button not shown. - -------------------------------------------------------------------- -Fri Jan 27 14:45:04 CET 2006 - mhopf@suse.de - -- Fixed BuildRequires. - -------------------------------------------------------------------- -Wed Jan 25 21:43:10 CET 2006 - mls@suse.de - -- converted neededforbuild to BuildRequires - -------------------------------------------------------------------- -Mon Jan 9 18:03:32 CET 2006 - mhopf@suse.de - -- Fixed snapshot function (aspect ratio calculation). - -------------------------------------------------------------------- -Mon Jan 9 17:27:22 CET 2006 - schwab@suse.de - -- Fix support for RealPlayer10 codecs. - -------------------------------------------------------------------- -Tue Jan 3 18:02:01 CET 2006 - mhopf@suse.de - -- Update to xine-lib 1.1.1 -- Update to vdr-xine 0.7.6 (adapted to 1.1.1) - -------------------------------------------------------------------- -Sun Dec 4 23:54:44 CET 2005 - lmuelle@suse.de - -- Revert libsmbclient renameing. - -------------------------------------------------------------------- -Mon Nov 14 22:47:17 CET 2005 - lmuelle@suse.de - -- Use samba-libs instead of libsmbclient. - -------------------------------------------------------------------- -Thu Oct 27 14:50:09 CEST 2005 - adrian@suse.de - -- xine-internal needs xine-mad now - -------------------------------------------------------------------- -Tue Sep 6 15:04:54 CEST 2005 - schwab@suse.de - -- Use instead of own headers, SIZEOF_INT is missing. - -------------------------------------------------------------------- -Tue Sep 6 10:35:18 CEST 2005 - adrian@suse.de - -- use external mad lib, fix crashes on 64bit (#115358) - -------------------------------------------------------------------- -Thu Sep 1 17:33:21 CEST 2005 - tiwai@suse.de - -- Fix suspend/resume (#114725) - -------------------------------------------------------------------- -Mon Aug 29 17:57:36 CEST 2005 - jw@suse.de - -- That is actually: *Do* compile with -U_FORTIFY_SOURCE ... - -------------------------------------------------------------------- -Mon Aug 29 15:53:48 CEST 2005 - kukuk@suse.de - -- Fix xine-ui version number -- Don't compile with -U_FORTIFY_SOURCE as workaround for [#113612] - -------------------------------------------------------------------- -Fri Aug 26 00:05:27 CEST 2005 - lnussel@suse.de - -- update vdr-xine to version 0.7.5 - -------------------------------------------------------------------- -Thu Aug 25 17:46:04 CEST 2005 - schwab@suse.de - -- Fix last change. - -------------------------------------------------------------------- -Thu Aug 25 16:00:52 CEST 2005 - adrian@suse.de - -- require explicit the xine-lib version in plugin packages - -------------------------------------------------------------------- -Fri Aug 19 11:53:33 CEST 2005 - adrian@suse.de - -- move mpeg codecs to -mad package -- convert default video into theora format - -------------------------------------------------------------------- -Thu Aug 11 16:46:29 CEST 2005 - adrian@suse.de - -- enable smb and openGL plugins again -- extra file to mark mad support - -------------------------------------------------------------------- -Tue Aug 9 17:06:21 CEST 2005 - schwab@suse.de - -- Don't hardcode cache line size. - -------------------------------------------------------------------- -Fri Aug 5 13:31:02 CEST 2005 - lnussel@suse.de - -- update to vdr-xine-0.7.4 - -------------------------------------------------------------------- -Thu Aug 4 09:19:27 CEST 2005 - adrian@suse.de - -- update xine-lib to version 1.1.0 to fix crashes with gcc4 -- update xine-ui to version 0.99.4 - -------------------------------------------------------------------- -Thu Jul 21 12:50:49 CEST 2005 - hvogel@suse.de - -- Set Version tag in the xine-ui subpackage - -------------------------------------------------------------------- -Mon Jul 18 20:17:18 CEST 2005 - schwab@suse.de - -- Fix undefined operation. -- Support RealPlayer10 codecs. - -------------------------------------------------------------------- -Tue Jul 12 11:05:25 CEST 2005 - adrian@suse.de - -- package xineplug_vo_out_xvmc again, xvmc got fixed - -------------------------------------------------------------------- -Wed Apr 27 11:58:31 CEST 2005 - adrian@suse.de - -- update to version 1.0.1 - * security fixes - * mpc/musepack decoder -- remove extra binaries for mmx/xmm and trust in runtime detection - -------------------------------------------------------------------- -Tue Apr 12 15:37:08 CEST 2005 - adrian@suse.de - -- fix compilation with gcc 4 - -------------------------------------------------------------------- -Fri Apr 8 13:50:33 CEST 2005 - adrian@suse.de - -- move arts plugin to -extra package, since it is no optional in KDE - -------------------------------------------------------------------- -Wed Mar 9 10:31:40 CET 2005 - adrian@suse.de - -- avoid dependencies to main package - -------------------------------------------------------------------- -Wed Mar 2 10:23:42 CET 2005 - adrian@suse.de - -- parallelise build - -------------------------------------------------------------------- -Thu Feb 17 14:54:31 CET 2005 - adrian@suse.de - -- new url for xine dvd explanations - -------------------------------------------------------------------- -Mon Jan 31 16:08:33 CET 2005 - lnussel@suse.de - -- set vdr-xine fifodir to /var/lib/vdr-xine - -------------------------------------------------------------------- -Mon Jan 31 13:17:24 CET 2005 - adrian@suse.de - -- apply patch to support new vdr - -------------------------------------------------------------------- -Tue Jan 25 17:48:36 CET 2005 - sbrabec@suse.cz - -- Use system libcdio and libvcdinfo. - -------------------------------------------------------------------- -Mon Jan 10 14:57:26 CET 2005 - adrian@suse.de - -- disable XvMC support temporarly, the current X11 snapshot does mis - it. - -------------------------------------------------------------------- -Mon Jan 3 12:14:24 CET 2005 - adrian@suse.de - -- update to the FINAL version 1.0 ! - * spudvb support -- update xine-ui to version 0.99.3 -- own subpackage for -mad dependency - -------------------------------------------------------------------- -Wed Nov 10 16:04:40 CET 2004 - uli@suse.de - -- fixed to build on ppc64, s390* (no X?MC) - -------------------------------------------------------------------- -Tue Nov 9 09:10:02 CET 2004 - adrian@suse.de - -- update to version 1.0 rc7 - * rewritten DVB support - * speed improvements - * fix for playback freezes on 2.6 kernel - -------------------------------------------------------------------- -Thu Oct 14 02:04:00 CEST 2004 - ro@suse.de - -- added gnutls et.al. to neededforbuild - -------------------------------------------------------------------- -Sat Sep 25 13:16:31 CEST 2004 - adrian@suse.de - -- fix build of mad decoder (leads to crashes on 64bit #46091) -- downgrade goom plugin due to problems on 64bit (#46091) - -------------------------------------------------------------------- -Fri Sep 24 10:13:35 CEST 2004 - adrian@suse.de - -- fix permissions on directories (#45957) - -------------------------------------------------------------------- -Mon Sep 20 19:01:13 CEST 2004 - adrian@suse.de - -- update to verions 1.0 rc6a - * further security fix and obsoletes patches - * fix for QuickTime 6.3 DLLs - -------------------------------------------------------------------- -Sat Aug 21 12:26:51 CEST 2004 - adrian@suse.de - -- review the new plugins and move them either to the - public or internal package -- move flac to xine-lib, since we have flac anyway installed - by default now. - -------------------------------------------------------------------- -Thu Aug 19 10:33:29 CEST 2004 - adrian@suse.de - -- add libtheora-devel to nfb - -------------------------------------------------------------------- -Tue Aug 10 15:32:11 CEST 2004 - adrian@suse.de - -- fix buffer overflow in vcd input plugin (#43642) - http://www.open-security.org/advisories/6 - -------------------------------------------------------------------- -Tue Jul 6 10:24:38 CEST 2004 - adrian@suse.de - -- update xine-ui to version 0.99.2 - -------------------------------------------------------------------- -Wed Jun 23 14:17:46 CEST 2004 - adrian@suse.de - -- update to version rc5 - -------------------------------------------------------------------- -Sat May 15 11:38:19 CEST 2004 - adrian@suse.de - -- update to version rc4a -- add /usr/lib/win32 dir on ia32 - -------------------------------------------------------------------- -Sat May 1 10:31:28 CEST 2004 - adrian@suse.de - -- add input plugin from VDR system -- revert libmpeg2 change, it got too imcompatible meanwhile -- add some skins for xine-ui - -------------------------------------------------------------------- -Thu Apr 29 11:05:32 CEST 2004 - adrian@suse.de - -- update to version rc4 -- use external libmad and libmpeg2 - -------------------------------------------------------------------- -Thu Apr 22 13:31:16 CEST 2004 - adrian@suse.de - -- update xine-ui to version 0.99.1 - -------------------------------------------------------------------- -Wed Apr 14 10:02:13 CEST 2004 - adrian@suse.de - -- update to version rc3c. -- enable theora support - -------------------------------------------------------------------- -Sat Apr 3 12:02:58 CEST 2004 - adrian@suse.de - -- fix crash in goom plugin on 64bit (#36702) - -------------------------------------------------------------------- -Sun Mar 21 17:46:16 CET 2004 - adrian@suse.de - -- fix crash, when accessing a DVD - -------------------------------------------------------------------- -Thu Feb 26 09:14:35 CET 2004 - adrian@suse.de - -- enable arts plugin again for all architectures - -------------------------------------------------------------------- -Thu Feb 12 10:24:08 CET 2004 - adrian@suse.de - -- fix build (any base header had defined TRUE and FALSE before) - -------------------------------------------------------------------- -Thu Feb 5 18:51:16 CET 2004 - adrian@suse.de - -- this changelog entry misses a proper excuse, why the last one - broke the build - -------------------------------------------------------------------- -Wed Feb 4 19:37:09 CET 2004 - adrian@suse.de - -- remove theora from build system, or ogg would require it - -------------------------------------------------------------------- - -Mon Feb 2 00:56:28 CET 2004 - ro@suse.de - -- fix file-list for s390* (alsa) - -------------------------------------------------------------------- -Sat Jan 31 17:00:09 CET 2004 - adrian@suse.de - -- add switch to enable theora support, disabled by default - -------------------------------------------------------------------- -Mon Dec 29 09:38:30 CET 2003 - adrian@suse.de - -- update to version 1.0.0rc3a - * works with NPTL on kernel 2.6 now - -------------------------------------------------------------------- -Fri Dec 26 13:06:02 CET 2003 - adrian@suse.de - -- update xine-ui to version 0.9.23 - -------------------------------------------------------------------- -Thu Dec 18 11:47:59 CET 2003 - adrian@suse.de - -- update to version 1.0.0rc3 - -------------------------------------------------------------------- -Sun Nov 23 19:41:38 CET 2003 - adrian@suse.de - -- accept alsa 1.0 release in config check - -------------------------------------------------------------------- -Mon Oct 27 14:56:52 CET 2003 - adrian@suse.de - -- update to version 1.0.0rc2 - * new/better VCD plugin - -------------------------------------------------------------------- -Tue Oct 14 13:27:28 CEST 2003 - adrian@suse.de - -- update to version 1.0.0rc1 - * most amd64 patches are merged - * new frame buffer output plugin - -------------------------------------------------------------------- -Mon Sep 22 17:57:14 CEST 2003 - adrian@suse.de - -- fix rpm v4 Provides/Obsoletes behaviour - -------------------------------------------------------------------- -Sun Sep 21 13:44:52 CEST 2003 - adrian@suse.de - -- do not try to open the dvd device at all, if needed codecs - are missing (or a dead lock can happen) #30224 -- move dxr3 plugin to -extra, because of confusing console - messages (most people do not have the dxr3 hardware) - -------------------------------------------------------------------- -Fri Sep 19 14:48:40 CEST 2003 - adrian@suse.de - -- move alsa plugin into -extra package, not in default selection - * depending on the driver it crashes in libasound on some systems - while oss works fine - -------------------------------------------------------------------- -Fri Sep 5 08:18:55 CEST 2003 - adrian@suse.de - -- justify Categories - -------------------------------------------------------------------- -Wed Sep 3 09:41:30 CEST 2003 - adrian@suse.de - -- add warning popup, if the user click on dvd button and - has not sufficient support to play it - -------------------------------------------------------------------- -Wed Aug 20 00:31:35 CEST 2003 - adrian@suse.de - -- better 64bit fixes, unbreaking raw device support again -- do not load modules on ix86 multiple times - -------------------------------------------------------------------- -Tue Aug 19 09:08:46 CEST 2003 - adrian@suse.de - -- fix libdvdnav/read for 64bit/amd64 -- enable SSE/MMX on amd64 -- some magic mmx/sse fixes for amd64 from aj -- compile the fallback plugins really without mmx on ix86 - -------------------------------------------------------------------- -Thu Aug 14 10:04:39 CEST 2003 - adrian@suse.de - -- move speex plugin back to main package, ogg needs it anyway now -- head/tail syntax fixes -- fix crippled logo detection without xine-internal installed -- use desktop file from kappfinder -- do not package arts plugin on 64bit, it cause heavy memory - problems and I really do not want to fix them, after I have - seen the compiler warnings ... - -------------------------------------------------------------------- -Fri Aug 8 09:44:49 CEST 2003 - adrian@suse.de - -- update xine-ui to version 0.9.22 - -------------------------------------------------------------------- -Wed Aug 6 09:40:20 CEST 2003 - adrian@suse.de - -- move speex plugin to -extra - -------------------------------------------------------------------- -Sun Aug 3 16:17:55 CEST 2003 - adrian@suse.de - -- update to version 1-rc0 - * new support for speex and other - * broadcast functionality - -------------------------------------------------------------------- -Tue Jul 29 10:40:32 CEST 2003 - adrian@suse.de - -- add update-desktop-files to #neededforbuild -- fix gnome-vfs detection on lib64 -- define x86_64 architecture - -------------------------------------------------------------------- -Tue Jul 29 00:24:36 CEST 2003 - adrian@suse.de - -- fix file list - -------------------------------------------------------------------- -Mon Jul 28 17:14:43 CEST 2003 - adrian@suse.de - -- add Categories - -------------------------------------------------------------------- -Tue Jul 22 15:04:37 CEST 2003 - adrian@suse.de - -- package missing directories - -------------------------------------------------------------------- -Tue Jul 22 14:21:19 CEST 2003 - adrian@suse.de - -- fix build for older distributions -- add MMX optimized plugins -- build a SSE and a MMX libxine additionaly. - -------------------------------------------------------------------- -Tue Jul 15 09:36:56 CEST 2003 - adrian@suse.de - -- workaround libtool rpath auto usage -- fix build for non-ix86 architectures -- disable gnome_vfs support on 64bit until gnome is fixed - -------------------------------------------------------------------- -Mon Jul 14 16:32:43 CEST 2003 - sbrabec@suse.cz - -- GNOME prefix change to /opt/gnome. - -------------------------------------------------------------------- -Tue Jun 17 02:02:15 CEST 2003 - ro@suse.de - -- added directories to filelists - -------------------------------------------------------------------- -Mon Jun 2 16:06:04 CEST 2003 - schwab@suse.de - -- Put manpages in the correct subpackages. - -------------------------------------------------------------------- -Fri May 30 10:46:30 CEST 2003 - adrian@suse.de - -- build also SSE/i686 optimized plugins on ia32 - and patch xine to support them, if the cpu provides SSE - (there are already runtime checks in some code, but this is - the only way to get complete i686 optimized plugins) -- remove unneeded .la files in plugin directory - -------------------------------------------------------------------- -Sun May 18 09:51:31 CEST 2003 - adrian@suse.de - -- update xine-ui to version 0.9.21 - -------------------------------------------------------------------- -Fri May 16 12:30:35 CEST 2003 - adrian@suse.de - -- fix patch to build also with 2.4 headers - -------------------------------------------------------------------- -Tue May 13 23:56:32 CEST 2003 - adrian@suse.de - -- fix build - -------------------------------------------------------------------- -Mon May 12 15:30:04 CEST 2003 - ro@suse.de - -- fix build with current glibc/kernel includes - -------------------------------------------------------------------- -Mon May 12 09:28:00 CEST 2003 - adrian@suse.de - -- update to version 1.0-beta12 - (sorenson support, but it is not distributable) - -------------------------------------------------------------------- -Tue Apr 29 12:54:16 CEST 2003 - adrian@suse.de - -- update to version 1.0-beta11 - -------------------------------------------------------------------- -Wed Apr 16 10:05:44 CEST 2003 - adrian@suse.de - -- fix typos - -------------------------------------------------------------------- -Tue Apr 15 23:14:22 CEST 2003 - adrian@suse.de - -- fix criple runtime check - -------------------------------------------------------------------- -Wed Apr 9 18:33:31 CEST 2003 - schwab@suse.de - -- Fix uninitialized variable. - -------------------------------------------------------------------- -Wed Apr 9 10:57:45 CEST 2003 - adrian@suse.de - -- update to version 1.0-beta10 -- rename package from xine to xine-lib and create xine-ui and - an internal xine-INTERNAL package to check the packaging -- add freetype support - -------------------------------------------------------------------- -Mon Apr 7 14:15:01 CEST 2003 - kukuk@suse.de - -- Not all architectures have ALSA - -------------------------------------------------------------------- -Wed Mar 12 17:32:04 CET 2003 - adrian@suse.de - -- use cripple warning in default video - -------------------------------------------------------------------- -Mon Feb 24 16:40:25 CET 2003 - schwab@suse.de - -- Fix broken configure check. - -------------------------------------------------------------------- -Mon Feb 17 10:54:29 CET 2003 - adrian@suse.de - -- update legal comment according gsm 06.10 - -------------------------------------------------------------------- -Fri Feb 14 21:50:32 CET 2003 - adrian@suse.de - -- add README.SuSE, written by Stanislav - -------------------------------------------------------------------- -Wed Feb 12 20:27:13 CET 2003 - adrian@suse.de - -- fix build for 8.1 - -------------------------------------------------------------------- -Thu Feb 6 00:45:50 CET 2003 - adrian@suse.de - -- faad implementation is okay, but there are maybe other copyrights - -> disabled - -------------------------------------------------------------------- -Tue Feb 4 13:19:55 CET 2003 - adrian@suse.de - -- update xine-lib to 1-beta4 -- enable aalib support -- reorganize subpackages - * xine-extra for Gnome2 plugins - * xine-devel -- install .desktop file in KDE Multimedia menu -- install fonts, they are xine own property and freeware - -------------------------------------------------------------------- -Sun Feb 2 23:19:10 CET 2003 - adrian@suse.de - -- update xine-lib to version 1 beta3 -- update xine-ui to version 0.9.18 -- review all codecs for legal problems, still unsure on some, - which remain disabled - -------------------------------------------------------------------- -Tue Jun 11 01:41:04 CEST 2002 - ro@suse.de - -- added slang to neededforbuild (for aalib) -- fix build for lib64 running full auto-tools - -------------------------------------------------------------------- -Tue Apr 16 13:20:33 CEST 2002 - mmj@suse.de - -- Turn /usr/share/man into %docdir -> fix aaa_dir clash - -------------------------------------------------------------------- -Fri Feb 15 00:20:13 CET 2002 - ro@suse.de - -- changed neededforbuild to - -------------------------------------------------------------------- -Fri Feb 1 00:26:06 CET 2002 - ro@suse.de - -- changed neededforbuild to - -------------------------------------------------------------------- -Tue Jan 22 18:23:53 CET 2002 - ro@suse.de - -- changed neededforbuild to - -------------------------------------------------------------------- -Tue Dec 11 18:11:01 CET 2001 - ro@suse.de - -- move dvd plugins to subpackage again - -------------------------------------------------------------------- -Tue Nov 20 16:27:25 CET 2001 - ro@suse.de - -- fix neededforbuild: xf86 - -------------------------------------------------------------------- -Tue Nov 20 01:04:10 CET 2001 - ro@suse.de - -- added ogg-vorbis, esound. kdelibs-artsd to neededforbuild - -------------------------------------------------------------------- -Tue Nov 20 00:59:42 CET 2001 - ro@suse.de - -- no-fpic made it segfault on x86: force it to on -- disabled cpu-acceleration to make it compile with -fPIC -- update to 0.9.4 - -------------------------------------------------------------------- -Sat Nov 3 17:32:57 CET 2001 - stepan@suse.de - -- update to 0.9.3. got rid of patches as they are included now. - -------------------------------------------------------------------- -Thu Sep 27 15:50:36 CEST 2001 - stepan@suse.de - -- update to 0.9.1 (thanks to bjacke@suse.de) -- autoconf/gcc/libtool fixes. works on ia64 and s390 now. - -------------------------------------------------------------------- -Tue Jun 5 17:53:50 MEST 2001 - kukuk@suse.de - -- Remove nox86 patch, not necessary and does not apply - -------------------------------------------------------------------- -Tue May 22 21:01:33 CEST 2001 - wimer@suse.de - -- updated to version 0.4.3 -- changed SuSE series to gra again (change vanished) - -------------------------------------------------------------------- -Wed May 9 17:05:00 CEST 2001 - wimer@suse.de - -- updated to version 0.4.2 (stability fixes and works on ppc now) -- changed SuSE Series to gra instead of snd. - -------------------------------------------------------------------- -Sat Apr 7 19:05:33 CEST 2001 - bjacke@suse.de - -- make xine look for win32 codecs -- move doc to correct place -- some spec file fixes - -------------------------------------------------------------------- -Mon Mar 12 01:44:32 CET 2001 - wimer@suse.de - -- initial version: 0.4.01 +- first build of xine-lib-12 for packman diff --git a/xine-lib.spec b/xine-lib.spec index 00ac70c..3b51299 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -20,31 +20,20 @@ Name: xine-lib # %bcond_with = default off # %bcond_without = default on # -# --with distributable -> don't build libxine1-codecs -# --without distributable -> build libxine1-codecs +# --with distributable -> don't build libxine2-codecs +# --without distributable -> build libxine2-codecs # # default for buildservice is no patented codecs %bcond_without distributable %bcond_with onlynondistributable -%if 0%{suse_version} >= 1100 %bcond_without pulseaudio -%else -%bcond_with pulseaudio -%endif %bcond_with sdl %bcond_with aalib -%bcond_with arts %bcond_with esd %bcond_with jack %bcond_without gnome_vfs %bcond_with directfb -%if 0%{suse_version} > 1110 %bcond_without modplug -%else -%bcond_with modplug -%endif -# -%bcond_without external_ffmpeg # BuildRequires: ImageMagick-devel BuildRequires: Mesa-devel @@ -59,6 +48,7 @@ BuildRequires: krb5-devel BuildRequires: libcdio-devel BuildRequires: libdrm-devel BuildRequires: libmng-devel +BuildRequires: libmpcdec-devel BuildRequires: libsmbclient BuildRequires: libsmbclient-devel BuildRequires: libtheora-devel @@ -82,11 +72,10 @@ BuildRequires: lirc-devel BuildRequires: lirc %endif %if !%{with distributable} -# those requiremens are optional but internal copies are likely old -%if %{with external_ffmpeg} BuildRequires: libfaad-devel BuildRequires: libffmpeg-devel -%endif +%else +BuildRequires: libavutil-devel %endif %if %{with pulseaudio} BuildRequires: libpulse-devel @@ -98,9 +87,6 @@ BuildRequires: SDL-devel BuildRequires: aalib-devel BuildRequires: libcaca-devel %endif -%if %{with arts} -BuildRequires: arts-devel -%endif %if %{with esd} BuildRequires: esound-devel %endif @@ -111,7 +97,7 @@ BuildRequires: gnome-vfs2-devel BuildRequires: libjack-devel %endif %if %{with directfb} -%if 0%{suse_version} >= 1020 +%if %suse_version >= 1020 BuildRequires: DirectFB-devel %else BuildRequires: DirectFB @@ -120,112 +106,59 @@ BuildRequires: DirectFB %if %{with modplug} BuildRequires: libmodplug-devel %endif -Version: 1.1.20.1 +Version: 1.2.1 Release: 0 -# bug437293 -%ifarch ppc64 -Obsoletes: xine-lib-64bit -%endif -%define abiversion 1.30 +%define abiversion 2.1 Summary: Video Player with Plug-Ins -License: GPL-2.0+ +License: GPL-2.0+ ; SUSE-Public-Domain Group: Productivity/Multimedia/Video/Players Url: http://www.xine-project.org/home BuildRoot: %{_tmppath}/%{name}-%{version}-build + %if %{with distributable} Source: xine-lib-%{version}-crippled.tar.bz2 %else Source: http://downloads.sourceforge.net/project/xine/xine-lib/%{version}/xine-lib-%{version}.tar.bz2 %endif -Source2: baselibs.conf -Source10: README.SuSE -Source99: precheckin_cripple_tarball.sh -# *** xine-lib: Bugfixes -Patch26: xine-lib-doc-fix-X11R6.diff -Patch28: xine-lib-%{version}-ia64-is-not-alpha.diff -Patch31: xine-lib-%{version}-glitch-free-pulseaudio.patch -Patch32: xine-lib-1.1.20.1-zlib-hg10322.diff -# *** Addons -Patch50: vdr-xine-0.9.3.diff.bz2 -Patch51: vdr-xine-SUSE.diff -Patch61: xine-lib-%{version}-mjpegplugin.diff -Patch62: xine-lib-libdvdread_udf.diff -# *** SUSE only changes -Patch70: xine-lib-crippled-LOCAL.diff -Patch71: xine-lib-%{version}-demuxcheckfor_mad_ffmpeg.patch -Patch72: xine-lib-%{version}-install-plugins-helper.diff -Patch73: xine-lib-%{version}-assert.patch -Patch74: xine-configure.diff -Patch75: xine-lib-v4l-2.6.38.patch -# *** Only working for noncrippled source -Patch80: xine-lib-various-noncrippled.diff +Source1: baselibs.conf + +Patch0: xine-lib-libdvdread_udf.diff +Patch1: xine-lib-v4l-2.6.38.patch +Patch2: xine-lib-without-ffmpeg.patch +Patch3: xine-lib-ffmpeg11.patch %description -xine is a free multimedia player. It plays back CDs, DVDs, and VCDs. It -also decodes multimedia files like AVI, MOV, WMV, and MP3 from local -disk drives, and displays multimedia streamed over the Internet. It -interprets many of the most common multimedia formats available - and -some of the most uncommon formats, too. +

Great video and multimediaplayer, supports DVD, MPEG, AVI, DivX, VCD, Quicktime ...

You need a frontend for xine-lib like xine-ui, gxine, kaffeine or totem.

Since 1-rc6 the package number is reduced, all you may miss, is in the base package

If you want to play css encrypted Video-DVD's, you need to install libdvdcss.

%description -l de -xine ist ein freies Multimedia Wiedergabeprogramm. Es spielt Musik-CDs, -Video-DVDs und VCDs. Es gibt auch Multimeda Dateien wie AVI, MOV, WMV -und MP3 von der lokalen Platte sowie über das Internet wieder. Es gibt -die meisten übliche Multimedia Formate wieder, sowie einige weniger -verbreitete. +

Großartiger Video- und Multimediaplayer mit Support für DVD, MPEG, AVI, DivX, VCD,Quicktime ...

Bitte beachten Sie, dass Sie neben der xine-lib auch eine Bedienoberfläche wie xine-ui, gxine, kaffeine oder totem benötigen.

Seit 1-rc6 wurde die Zahl der Pakete reduziert, alles was sie eventuell vermissen, wurde in das Basispaket integriert.

Wenn Sie css verschlüsselte Video-DVDs abspielen wollen, müssen Sie zusätzlich die libdvdcss installieren.

-%package -n libxine1 +%package -n libxine2 Summary: Video Player with Plug-Ins License: GPL-2.0+ Group: Productivity/Multimedia/Video/Players -Provides: xine-lib = %{version}-%{release} -Obsoletes: xine-lib < %{version}-%{release} -Provides: xine-extra = %{version}-%{release} -Obsoletes: xine-extra < %{version}-%{release} -Provides: libxine1-syncfb = %{version}-%{release} -Obsoletes: libxine1-syncfb < %{version}-%{release} -Provides: libxine1-xvmc = %{version}-%{release} -Obsoletes: libxine1-xvmc < %{version}-%{release} -Provides: libxine1-dvb = %{version}-%{release} -Obsoletes: libxine1-dvb < %{version}-%{release} -# bug437293 -%ifarch ppc64 -Obsoletes: xine-lib-64bit -%endif -# -Recommends: libxine1-codecs = %{version} +Provides: libxine2-syncfb = %{version}-%{release} +Obsoletes: libxine2-syncfb < %{version}-%{release} +Provides: libxine2-xvmc = %{version}-%{release} +Obsoletes: libxine2-xvmc < %{version}-%{release} +Provides: libxine2-dvb = %{version}-%{release} +Obsoletes: libxine2-dvb < %{version}-%{release} +Recommends: libxine2-codecs = %{version} Recommends: opensuse-codecs-installer -%description -n libxine1 +%description -n libxine2 xine is a video player with a graphical front-end that supports a large number of file formats (VCD and MPEG2, for example) using plug-ins. Several plug-ins are included. Others can be installed after xine installation. xine supports stereo sound using OSS and AC5.1 using Alsa. -xine ist ein Videoplayer mit grafischem Frontend und unterstützt -eine vielzahl an Dateiformaten (z.B. VCD und MPEG2) mit hilfe von -Plugins. Einige Plugins sind enthalten, andere können nach der -Installation von xine nachinstalliert werden. xine untersützt -Stereosound via OSS und AC5.1 per Alsa. - -xine is a video player with a graphical front-end that supports a large -number of file formats (VCD and MPEG2, for example) using plug-ins. -Several plug-ins are included. Others can be installed after xine -installation. xine supports stereo sound using OSS and AC5.1 using -Alsa. - -xine ist ein Videoplayer mit grafischem Frontend und unterstützt -eine vielzahl an Dateiformaten (z.B. VCD und MPEG2) mit hilfe von -Plugins. Einige Plugins sind enthalten, andere können nach der -Installation von xine nachinstalliert werden. xine untersützt -Stereosound via OSS und AC5.1 per 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 %endif + More information about xine plug-ins can be found at http://www.xine-project.org/home @@ -233,25 +166,7 @@ Authors: -------- Guenter Bartsch -%description -n libxine1 -l de -xine is a video player with a graphical front-end that supports a large -number of file formats (VCD and MPEG2, for example) using plug-ins. -Several plug-ins are included. Others can be installed after xine -installation. xine supports stereo sound using OSS and AC5.1 using -Alsa. - -xine ist ein Videoplayer mit grafischem Frontend und unterstützt -eine vielzahl an Dateiformaten (z.B. VCD und MPEG2) mit hilfe von -Plugins. Einige Plugins sind enthalten, andere können nach der -Installation von xine nachinstalliert werden. xine untersützt -Stereosound via OSS und AC5.1 per Alsa. - -xine is a video player with a graphical front-end that supports a large -number of file formats (VCD and MPEG2, for example) using plug-ins. -Several plug-ins are included. Others can be installed after xine -installation. xine supports stereo sound using OSS and AC5.1 using -Alsa. - +%description -n libxine2 -l de xine ist ein Videoplayer mit grafischem Frontend und unterstützt eine vielzahl an Dateiformaten (z.B. VCD und MPEG2) mit hilfe von Plugins. Einige Plugins sind enthalten, andere können nach der @@ -263,6 +178,7 @@ 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 %endif + Weitere Informationen über xine Plugins finden Sie unter http://www.xine-project.org/home @@ -276,19 +192,18 @@ License: GPL-2.0+ ; SUSE-Public-Domain Group: Development/Libraries/C and C++ Requires: freetype2-devel Requires: glibc-devel -Requires: libxine1 = %{version} +Requires: libv4l-devel +Requires: libxine2 = %{version} Requires: zlib-devel -Obsoletes: libxine1-devel < %{version}-%{release} -Provides: libxine1-devel = %{version}-%{release} -Obsoletes: xine-devel < %{version}-%{release} -Provides: xine-devel = %{version}-%{release} -Obsoletes: xine-lib-devel < %{version}-%{release} -Provides: xine-lib-devel = %{version}-%{release} -# bug437293 -%ifarch ppc64 -Obsoletes: xine-lib-devel-64bit +%if !%{with distributable} +Requires: libffmpeg-devel +%else +Requires: libavutil-devel %endif -# +Obsoletes: libxine2-devel < %{version}-%{release} +Provides: libxine2-devel = %{version}-%{release} +Obsoletes: xine-lib2-devel < %{version}-%{release} +Provides: xine-lib2-devel = %{version}-%{release} %description -n libxine-devel This package contains all necessary include files, libraries and @@ -300,40 +215,12 @@ xine is a video player which supports a large number of file formats Others can be post-installed. Supports stereo sound using OSS and AC5.1 using Alsa. -Dieses Paket enthält alle nötigen Include Dateien, Biblioteken und -Konfigurationsdateien, die benötigt werden, um Anwendungen zu -kompilieren, die den xine Media Player verwenden. - -xine ist ein Videoplayer mit grafischem Frontend und unterstützt -eine vielzahl an Dateiformaten (z.B. VCD und MPEG2) mit hilfe von -Plugins. Einige Plugins sind enthalten, andere können nach der -Installation von xine nachinstalliert werden. xine untersützt -Stereosound via OSS und AC5.1 per Alsa. - -This package contains all necessary include files, libraries and -configuration files needed to compile applications that use the xine -media player. - -xine is a video player which supports a large number of file formats -(i.e., VCD, MPEG2) using plug-ins. Several plug-ins are included. -Others can be post-installed. Supports stereo sound using OSS and AC5.1 -using Alsa. - -Dieses Paket enthält alle nötigen Include Dateien, Biblioteken und -Konfigurationsdateien, die benötigt werden, um Anwendungen zu -kompilieren, die den xine Media Player verwenden. - -xine ist ein Videoplayer mit grafischem Frontend und unterstützt -eine vielzahl an Dateiformaten (z.B. VCD und MPEG2) mit hilfe von -Plugins. Einige Plugins sind enthalten, andere können nach der -Installation von xine nachinstalliert werden. xine untersützt -Stereosound via OSS und AC5.1 per 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 %endif + More information about xine plug-ins can be found at http://www.xine-project.org/home @@ -342,34 +229,6 @@ Authors: Guenter Bartsch %description -n libxine-devel -l de -This package contains all necessary include files, libraries and -configuration files needed to compile applications that use the xine -media player. - -xine is a video player which supports a large number of file formats -(i.e., VCD, MPEG2) using plug-ins. Several plug-ins are included. -Others can be post-installed. Supports stereo sound using OSS and AC5.1 -using Alsa. - -Dieses Paket enthält alle nötigen Include Dateien, Biblioteken und -Konfigurationsdateien, die benötigt werden, um Anwendungen zu -kompilieren, die den xine Media Player verwenden. - -xine ist ein Videoplayer mit grafischem Frontend und unterstützt -eine vielzahl an Dateiformaten (z.B. VCD und MPEG2) mit hilfe von -Plugins. Einige Plugins sind enthalten, andere können nach der -Installation von xine nachinstalliert werden. xine untersützt -Stereosound via OSS und AC5.1 per Alsa. - -This package contains all necessary include files, libraries and -configuration files needed to compile applications that use the xine -media player. - -xine is a video player which supports a large number of file formats -(i.e., VCD, MPEG2) using plug-ins. Several plug-ins are included. -Others can be post-installed. Supports stereo sound using OSS and AC5.1 -using Alsa. - Dieses Paket enthält alle nötigen Include Dateien, Biblioteken und Konfigurationsdateien, die benötigt werden, um Anwendungen zu kompilieren, die den xine Media Player verwenden. @@ -385,6 +244,7 @@ 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 %endif + Weitere Informationen über xine Plugins finden Sie unter http://www.xine-project.org/home @@ -393,239 +253,212 @@ Autoren: Guenter Bartsch %if %{with pulseaudio} - -%package -n libxine1-pulse +%package -n libxine2-pulse Summary: Pulseaudio plugin for xine License: GPL-2.0+ ; SUSE-Public-Domain Group: Productivity/Multimedia/Video/Players -Requires: libxine1 = %{version} -Supplements: packageand(libpulse0:libxine1) +Requires: libxine2 = %{version} +Supplements: packageand(libpulse0:libxine2) + +%description -n libxine2-pulse +libxine sound output plugin for the pulseaudio soundserver + -%description -n libxine1-pulse -xine sound output plugin for the pulseaudio soundserver Authors: -------- Guenter Bartsch -%description -n libxine1-pulse -l de -xine Soundausgabeplugin für den Pulseaudio Soundserver +%description -n libxine2-pulse -l de +libxine Soundausgabeplugin für den Pulseaudio Soundserver + + Autoren: -------- Guenter Bartsch - %endif -%if %{with sdl} -%package -n libxine1-sdl +%if %{with sdl} +%package -n libxine2-sdl Summary: SDL plugin for xine License: GPL-2.0+ ; SUSE-Public-Domain Group: Productivity/Multimedia/Video/Players -Requires: libxine1 = %{version} +Requires: libxine2 = %{version} -%description -n libxine1-sdl +%description -n libxine2-sdl SDL xine video output plugin + + Authors: -------- Guenter Bartsch -%description -n libxine1-sdl -l de +%description -n libxine2-sdl -l de SDL xine Video-Ausgabeplugin -Autoren: --------- - Guenter Bartsch -%endif - -%if %{with arts} - -%package -n libxine1-arts -Summary: Arts plugin for xine -License: GPL-2.0+ ; SUSE-Public-Domain -Group: Productivity/Multimedia/Video/Players -Requires: libxine1 = %{version} - -%description -n libxine1-arts -xine sound output plugin for the arts soundserver - -Authors: --------- - Guenter Bartsch - -%description -n libxine1-arts -l de -xine Soundausgabeplugin für den arts Soundserver Autoren: -------- Guenter Bartsch - %endif %if %{with aalib} - -%package -n libxine1-aa +%package -n libxine2-aa Summary: Aalib and libcaca plugin for xine License: GPL-2.0+ ; SUSE-Public-Domain Group: Productivity/Multimedia/Video/Players -Requires: libxine1 = %{version} +Requires: libxine2 = %{version} -%description -n libxine1-aa +%description -n libxine2-aa aalib and libcaca xine video-output plugin + + Authors: -------- Guenter Bartsch +%description -n libxine2-aa -l de +aalib und libcaca xine Video-Ausgabeplugin + -%description -n libxine1-aa -l de -aalib und libcaca xine Video Ausgabeplugin Autoren: -------- Guenter Bartsch - %endif -%if %{with esd} -%package -n libxine1-esd +%if %{with esd} +%package -n libxine2-esd Summary: Esd plugin for xine License: GPL-2.0+ ; SUSE-Public-Domain Group: Productivity/Multimedia/Video/Players -Requires: libxine1 = %{version} +Requires: libxine2 = %{version} -%description -n libxine1-esd +%description -n libxine2-esd libxine sound output plugin for the esound soundserver + + Authors: -------- Guenter Bartsch -%description -n libxine1-esd -l de +%description -n libxine2-esd -l de libxine Soundausgabeplugin für den esound Soundserver -Authors: + + +Autoren: -------- - Guenter Bartsch - + Guenter Bartsch %endif -%if %{with jack} -%package -n libxine1-jack +%if %{with jack} +%package -n libxine2-jack Summary: Jack plugin for xine License: GPL-2.0+ ; SUSE-Public-Domain Group: Productivity/Multimedia/Video/Players -Requires: libxine1 = %{version} +Requires: libxine2 = %{version} -%description -n libxine1-jack +%description -n libxine2-jack xine sound output plugin for the jack soundserver + + Authors: -------- Guenter Bartsch -%description -n libxine1-jack -l de +%description -n libxine2-jack -l de xine Soundausgabeplugin für den jack Soundserver + + Autoren: -------- Guenter Bartsch - %endif %if %{with directfb} - -%package -n libxine1-directfb +%package -n libxine2-directfb Summary: Directfb plugin for xine License: GPL-2.0+ ; SUSE-Public-Domain Group: Productivity/Multimedia/Video/Players -Requires: libxine1 = %{version} +Requires: libxine2 = %{version} -%description -n libxine1-directfb +%description -n libxine2-directfb Directfb xine video-output plugin + + Authors: -------- Guenter Bartsch -%description -n libxine1-directfb -l de +%description -n libxine2-directfb -l de Directfb xine Video-Ausgabeplugin + + Autoren: -------- Guenter Bartsch - %endif %if %{with gnome_vfs} - -%package -n libxine1-gnome-vfs +%package -n libxine2-gnome-vfs Summary: Gnome-vfs plugin for xine License: GPL-2.0+ ; SUSE-Public-Domain Group: Productivity/Multimedia/Video/Players -Requires: libxine1 = %{version} -Supplements: packageand(gnome-vfs2:libxine1) +Requires: libxine2 = %{version} -%description -n libxine1-gnome-vfs +%description -n libxine2-gnome-vfs Input plugin which enables xine to use Gnome-vfs -Authors: --------- - Guenter Bartsch - -%description -n libxine1-gnome-vfs -l de +%description -n libxine2-gnome-vfs -l de Eingabeplugin welches xine ermöglicht Gnome-vfs zu benutzen - -Autoren: --------- - Guenter Bartsch - %endif %if !%{with distributable} - -%package -n libxine1-codecs +%package -n libxine2-codecs # these libs are possibly illegal and may not work without libdvdcss anyway Summary: Xine plugins for watching DVDs, DivX and more License: GPL-2.0+ ; SUSE-Public-Domain Group: Productivity/Multimedia/Video/Players -Requires: libxine1 = %{version} -Obsoletes: xine-internal < %{version}-%{release} -Obsoletes: xine-mad -Provides: libxine1-dvd = %{version}-%{release} -Obsoletes: libxine1-dvd < %{version}-%{release} -Provides: libxine1-dxr3 = %{version}-%{release} -Obsoletes: libxine1-dxr3 < %{version}-%{release} -Provides: xine-lib:%{_libdir}/xine/plugins/1.0.0/xineplug_decode_mad.so -Provides: xine-mad -Obsoletes: xine-mad -Provides: libxine1-dvd = %{version}-%{release} -Obsoletes: libxine1-dvd < %{version}-%{release} -Provides: libxine1-dxr3 = %{version}-%{release} -Obsoletes: libxine1-dxr3 < %{version}-%{release} +Requires: libxine2 = %{version} +Provides: libxine2-dvd = %{version}-%{release} +Obsoletes: libxine2-dvd < %{version}-%{release} +Provides: libxine2-dxr3 = %{version}-%{release} +Obsoletes: libxine2-dxr3 < %{version}-%{release} %ifarch %{ix86} -Provides: libxine1-w32dll = %{version}-%{release} -Obsoletes: libxine1-w32dll < %{version}-%{release} +Provides: libxine2-w32dll = %{version}-%{release} +Obsoletes: libxine2-w32dll < %{version}-%{release} %endif Recommends: libdvdcss2 >= 1.2.10 -%description -n libxine1-codecs +%description -n libxine2-codecs With these xine plug-ins, you can watch DVDs and all other kind of media using xine. More information about xine plug-ins can be found at http://www.xine-project.org/home + + Authors: -------- Guenter Bartsch -%description -n libxine1-codecs -l de +%description -n libxine2-codecs -l de Mit diesem xine Plugins können Sie DVDs und alle von xine unterstützten Medienverainten abspielen. Weitere Informationtne über xine Plugins finden Sie unter http://www.xine-project.org/home + + Autoren: -------- Guenter Bartsch @@ -640,12 +473,11 @@ cat <= 1110 -# set fuzzy=2 to get patch work with crippled and noncrippled tarball -%patch50 -p1 -F2 -%else -%patch50 -p1 -%endif -%patch51 -p1 -sed -i 's|^noinst_HEADERS = input_vdr.h|xineinclude_HEADERS = input_vdr.h|' src/vdr/Makefile.am -%if 0%{suse_version} >= 1110 -# set fuzzy=2 to get patch work with crippled and noncrippled tarball -%patch61 -p1 -F2 -%else -%patch61 -p1 -%endif -%patch62 -p1 -#sed -i 's|^ac_config_files="|ac_config_files="src/vdr/Makefile src/mjpeg/Makefile|' configure -%if %{with distributable} -# Only apply to crippled source -%patch70 -%patch71 -p1 -%else -# Only apply to uncrippled source -%patch80 -%endif -%patch72 -p1 -%patch73 -p1 -%patch74 -p1 +%patch0 -p1 %if 0%{suse_version} >= 1210 -%patch75 +%patch1 +%endif +%if %{with distributable} +%patch2 -p1 +%else +%patch3 -p1 %endif - rm -f m4/libtool15.m4 +sed -i -e 's|/tmp/vdr-xine|/var/lib/vdr-xine|g' src/vdr/input_vdr.c %build export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fno-force-addr" @@ -699,7 +506,7 @@ echo 'AC_DEFUN([AC_REQUIRE_AUX_FILE])dnl' >> acinclude.m4 %endif %if 0%{?suse_version} < 1020 # hack for sles10 - rm m4/gettext.m4 + rm m4/gettext.m4 m4/intl.m4 sed -i -e '/AM_GNU_GETTEXT_VERSION/s/0\.16\.1/0.14/' configure.ac %endif if [ ! -f configure ]; then @@ -718,22 +525,22 @@ AUTOPOINT=true autoreconf -fi --enable-antialiasing \ --with-libflac \ --with-freetype \ + --enable-v4l \ %{?with_modplug:--enable-modplug} \ %{?with_directfb:--enable-directfb} \ - %{?with_arts:--with-arts} \ %if !%{with sdl} --without-sdl \ %endif %if !%{with distributable} - %{?with_external_ffmpeg:--with-external-ffmpeg} \ + --with-external-ffmpeg \ +%else + --disable-faad \ + --disable-a52dec \ + --disable-vdpau \ + --disable-dxr3 \ %endif %ifarch %{ix86} --with-w32-path=/usr/lib/win32 \ -%endif -%if 0%{suse_version} >= 1110 - --enable-v4l --enable-libv4l \ -%else - --disable-v4l --disable-libv4l \ %endif --with-install-plugins-helper=${_prefix}/lib/opensuse-codecs-installer %if 0%{?suse_version} < 1110 @@ -751,7 +558,7 @@ echo=echo \ make install DESTDIR=%{buildroot} LIB="%{buildroot}%{_libdir}/xine/plugins/%{abiversion}" # install documentation -install -m 0644 %{SOURCE10} COPYING AUTHORS %{buildroot}%{_defaultdocdir}/xine/ +#install -m 0644 %{SOURCE1} COPYING AUTHORS %{buildroot}%{_defaultdocdir}/xine/ # remove usless READMEs rm %{buildroot}%{_defaultdocdir}/xine/README.{irix,solaris,WIN32} %ifarch %{ix86} @@ -776,13 +583,13 @@ xineplug_vo_out_xcbshm xineplug_vo_out_xcbxv %endif xineplug_vo_out_raw +%if !%{with distributable} +xineplug_vo_out_vdpau +%endif xineplug_inp_dvb xineplug_inp_dvd -%if 0%{suse_version} >= 1110 xineplug_inp_v4l xineplug_inp_v4l2 -xineplug_inp_pvr -%endif xineplug_inp_file xineplug_inp_http xineplug_inp_net @@ -791,20 +598,16 @@ xineplug_inp_cdda xineplug_inp_smb xineplug_inp_stdin_fifo xineplug_inp_rtsp +xineplug_inp_pvr xineplug_inp_rtp xineplug_decode_bitplane xineplug_decode_rgb -xineplug_decode_mjpeg -xineplug_decode_vorbis xineplug_decode_yuv xineplug_decode_lpcm xineplug_decode_real -xineplug_decode_speex -xineplug_decode_theora xineplug_decode_mpc xineplug_decode_gdk_pixbuf xineplug_decode_spucmml -xineplug_decode_sputext xineplug_decode_spuhdmv # requires ImageMagick xineplug_decode_image @@ -816,23 +619,37 @@ xineplug_dmx_avi xineplug_dmx_flv xineplug_dmx_image xineplug_dmx_matroska -xineplug_dmx_ogg xineplug_dmx_fli xineplug_dmx_nsv xineplug_dmx_mng xineplug_dmx_pva xineplug_dmx_qt xineplug_dmx_rawdv -xineplug_dmx_sputext xineplug_dmx_games xineplug_dmx_slave +xineplug_dmx_modplug +xineplug_dmx_playlist +xineplug_dmx_vc1_es xineplug_flac +xineplug_sputext +xineplug_xiph xineplug_vdr xineplug_vo_out_xxmc xineplug_vo_out_xvmc -xineplug_vo_out_syncfb %ifarch %{ix86} xineplug_vo_out_vidix +vidix/cyberblade_vid +vidix/mach64_vid +vidix/mga_crtc2_vid +vidix/mga_vid +vidix/nvidia_vid +vidix/pm2_vid +vidix/pm3_vid +vidix/radeon_vid +vidix/rage128_vid +vidix/savage_vid +vidix/sis_vid +vidix/unichrome_vid %endif post/xineplug_post_audio_filters post/xineplug_post_goom @@ -844,9 +661,6 @@ post/xineplug_post_visualizations .pulse xineplug_ao_out_pulseaudio # -.arts -xineplug_ao_out_arts -# .esd xineplug_ao_out_esd # @@ -874,6 +688,7 @@ 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 @@ -893,7 +708,7 @@ xineplug_inp_mms xineplug_decode_spucc xineplug_decode_spu # NES Music File Format. free ?? -xineplug_decode_nsf +xineplug_nsf # Philips claimed intellectual property on GSM 06.10 xineplug_decode_gsm610 %ifarch %{ix86} @@ -903,6 +718,11 @@ 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 # unfortunately using external ffmpeg links the planar post # processing plugin against ffmpeg libs post/xineplug_post_planar @@ -914,8 +734,8 @@ grep -v ^# plugins | while read i; do [ "${i:0:1}" = "." ] && OUT_FILE=${i} && continue echo %{_libdir}/xine/plugins/%{abiversion}/${i}.so >> files${OUT_FILE} done -%find_lang libxine1 -cat libxine1.lang >>files +%find_lang libxine2 +cat libxine2.lang >>files %if %{with distributable} xargs -i+ rm -f %{buildroot}/+