|
[-]
[+]
|
Added |
xine-lib1.changes
|
|
|
|
[-]
[+]
|
Changed |
xine-lib1.spec
^
|
|
|
|
[-]
[+]
|
Changed |
vdr-xine-0.9.3.diff.bz2
^
|
| @@ -1,7 +1,7 @@
-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:22:58.385897392 +0100
-+++ xine-lib-1.1.20/configure.ac 2011-11-13 17:35:47.563072821 +0100
-@@ -2864,6 +2864,7 @@
+diff -uNr xine-lib-1.1.21.orig/configure.ac xine-lib-1.1.21/configure.ac
+--- xine-lib-1.1.21.orig/configure.ac 2012-06-10 20:40:51.056729059 +0200
++++ xine-lib-1.1.21/configure.ac 2012-06-10 20:46:04.677845200 +0200
+@@ -2869,6 +2869,7 @@
src/video_out/vidix/drivers/Makefile
src/xine-utils/Makefile
src/xine-engine/Makefile
@@ -9,7 +9,7 @@
win32/Makefile
win32/include/Makefile])
AC_CONFIG_COMMANDS([default],[[chmod +x ./misc/SlackBuild ./misc/build_rpms.sh ./misc/relchk.sh]],[[]])
-@@ -2931,6 +2932,7 @@
+@@ -2923,6 +2924,7 @@
echo " - stdin_fifo - rtp"
echo " - http - mms"
echo " - pnm - rtsp"
@@ -17,7 +17,7 @@
if test "$have_supported_dvb" = yes; then
echo " - dvb"
fi
-@@ -3145,6 +3147,7 @@
+@@ -3140,6 +3142,7 @@
echo " - eq - eq2"
echo " - boxblur - denoise3d"
echo " - unsharp - tvtime"
@@ -25,9 +25,9 @@
echo " * SFX:"
echo " - goom - oscope"
echo " - fftscope - mosaico"
-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 2010-03-09 23:17:05.000000000 +0100
-+++ xine-lib-1.1.20/src/Makefile.am 2011-11-13 17:35:47.563072821 +0100
+diff -uNr xine-lib-1.1.21.orig/src/Makefile.am xine-lib-1.1.21/src/Makefile.am
+--- xine-lib-1.1.21.orig/src/Makefile.am 2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.21/src/Makefile.am 2012-06-10 20:46:04.677845200 +0200
@@ -28,4 +28,5 @@
libfaad \
libmusepack \
@@ -35,9 +35,9 @@
- combined
+ combined \
+ vdr
-diff -uNr xine-lib-1.1.20.orig/src/vdr/combined_vdr.c xine-lib-1.1.20/src/vdr/combined_vdr.c
---- xine-lib-1.1.20.orig/src/vdr/combined_vdr.c 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.1.20/src/vdr/combined_vdr.c 2011-11-13 17:35:47.563072821 +0100
+diff -uNr xine-lib-1.1.21.orig/src/vdr/combined_vdr.c xine-lib-1.1.21/src/vdr/combined_vdr.c
+--- xine-lib-1.1.21.orig/src/vdr/combined_vdr.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.21/src/vdr/combined_vdr.c 2012-06-10 20:46:04.677845200 +0200
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -83,9 +83,9 @@
+ { PLUGIN_NONE , 0, "" , 0 , NULL , NULL }
+};
+
-diff -uNr xine-lib-1.1.20.orig/src/vdr/combined_vdr.h xine-lib-1.1.20/src/vdr/combined_vdr.h
---- xine-lib-1.1.20.orig/src/vdr/combined_vdr.h 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.1.20/src/vdr/combined_vdr.h 2011-11-13 17:35:47.567072786 +0100
+diff -uNr xine-lib-1.1.21.orig/src/vdr/combined_vdr.h xine-lib-1.1.21/src/vdr/combined_vdr.h
+--- xine-lib-1.1.21.orig/src/vdr/combined_vdr.h 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.21/src/vdr/combined_vdr.h 2012-06-10 20:46:04.678845172 +0200
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -179,9 +179,9 @@
+
+#endif /* __COMBINED_VDR_H */
+
-diff -uNr xine-lib-1.1.20.orig/src/vdr/input_vdr.c xine-lib-1.1.20/src/vdr/input_vdr.c
---- xine-lib-1.1.20.orig/src/vdr/input_vdr.c 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.1.20/src/vdr/input_vdr.c 2011-11-13 17:35:47.567072786 +0100
+diff -uNr xine-lib-1.1.21.orig/src/vdr/input_vdr.c xine-lib-1.1.21/src/vdr/input_vdr.c
+--- xine-lib-1.1.21.orig/src/vdr/input_vdr.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.21/src/vdr/input_vdr.c 2012-06-10 20:46:04.680845115 +0200
@@ -0,0 +1,2665 @@
+/*
+ * Copyright (C) 2003-2004 the xine project
@@ -2848,9 +2848,9 @@
+
+ return this;
+}
-diff -uNr xine-lib-1.1.20.orig/src/vdr/Makefile.am xine-lib-1.1.20/src/vdr/Makefile.am
---- xine-lib-1.1.20.orig/src/vdr/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.1.20/src/vdr/Makefile.am 2011-11-13 17:35:47.567072786 +0100
+diff -uNr xine-lib-1.1.21.orig/src/vdr/Makefile.am xine-lib-1.1.21/src/vdr/Makefile.am
+--- xine-lib-1.1.21.orig/src/vdr/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.21/src/vdr/Makefile.am 2012-06-10 20:46:04.680845115 +0200
@@ -0,0 +1,13 @@
+include $(top_srcdir)/misc/Makefile.common
+
@@ -2865,9 +2865,9 @@
+
+xineinclude_HEADERS = vdr.h
+noinst_HEADERS = combined_vdr.h
-diff -uNr xine-lib-1.1.20.orig/src/vdr/post_vdr_audio.c xine-lib-1.1.20/src/vdr/post_vdr_audio.c
---- xine-lib-1.1.20.orig/src/vdr/post_vdr_audio.c 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.1.20/src/vdr/post_vdr_audio.c 2011-11-13 17:35:47.567072786 +0100
+diff -uNr xine-lib-1.1.21.orig/src/vdr/post_vdr_audio.c xine-lib-1.1.21/src/vdr/post_vdr_audio.c
+--- xine-lib-1.1.21.orig/src/vdr/post_vdr_audio.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.21/src/vdr/post_vdr_audio.c 2012-06-10 20:46:04.680845115 +0200
@@ -0,0 +1,285 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -3154,9 +3154,9 @@
+
+ return;
+}
-diff -uNr xine-lib-1.1.20.orig/src/vdr/post_vdr_video.c xine-lib-1.1.20/src/vdr/post_vdr_video.c
---- xine-lib-1.1.20.orig/src/vdr/post_vdr_video.c 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.1.20/src/vdr/post_vdr_video.c 2011-11-13 17:35:47.567072786 +0100
+diff -uNr xine-lib-1.1.21.orig/src/vdr/post_vdr_video.c xine-lib-1.1.21/src/vdr/post_vdr_video.c
+--- xine-lib-1.1.21.orig/src/vdr/post_vdr_video.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.21/src/vdr/post_vdr_video.c 2012-06-10 20:46:04.681845086 +0200
@@ -0,0 +1,502 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -3660,9 +3660,9 @@
+
+ return skip;
+}
-diff -uNr xine-lib-1.1.20.orig/src/vdr/vdr.h xine-lib-1.1.20/src/vdr/vdr.h
---- xine-lib-1.1.20.orig/src/vdr/vdr.h 1970-01-01 01:00:00.000000000 +0100
-+++ xine-lib-1.1.20/src/vdr/vdr.h 2011-11-13 17:35:47.567072786 +0100
+diff -uNr xine-lib-1.1.21.orig/src/vdr/vdr.h xine-lib-1.1.21/src/vdr/vdr.h
+--- xine-lib-1.1.21.orig/src/vdr/vdr.h 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.21/src/vdr/vdr.h 2012-06-10 20:46:04.681845086 +0200
@@ -0,0 +1,665 @@
+/*
+ * Copyright (C) 2000-2004 the xine project
@@ -4329,10 +4329,10 @@
+
+#endif /* __VDR_H */
+
-diff -uNr xine-lib-1.1.20.orig/src/video_out/video_out_xvmc.c xine-lib-1.1.20/src/video_out/video_out_xvmc.c
---- xine-lib-1.1.20.orig/src/video_out/video_out_xvmc.c 2011-10-04 23:42:53.000000000 +0200
-+++ xine-lib-1.1.20/src/video_out/video_out_xvmc.c 2011-11-13 17:35:47.571072751 +0100
-@@ -486,9 +486,9 @@
+diff -uNr xine-lib-1.1.21.orig/src/video_out/video_out_xvmc.c xine-lib-1.1.21/src/video_out/video_out_xvmc.c
+--- xine-lib-1.1.21.orig/src/video_out/video_out_xvmc.c 2012-02-14 21:30:26.000000000 +0100
++++ xine-lib-1.1.21/src/video_out/video_out_xvmc.c 2012-06-10 20:46:04.682845057 +0200
+@@ -488,9 +488,9 @@
int second_field,
xvmc_macroblocks_t *macroblocks) {
xvmc_driver_t *this = (xvmc_driver_t *) current_image->driver;
@@ -4345,7 +4345,7 @@
int flags;
lprintf ("xvmc_render_macro_blocks\n");
-@@ -561,6 +561,7 @@
+@@ -563,6 +563,7 @@
return NULL;
frame->vo_frame.accel_data = &frame->xvmc_data;
@@ -4353,9 +4353,9 @@
/* keep track of frames and how many frames alocated. */
this->frames[this->num_frame_buffers++] = frame;
-diff -uNr xine-lib-1.1.20.orig/src/video_out/video_out_xxmc.c xine-lib-1.1.20/src/video_out/video_out_xxmc.c
---- xine-lib-1.1.20.orig/src/video_out/video_out_xxmc.c 2011-10-04 23:42:53.000000000 +0200
-+++ xine-lib-1.1.20/src/video_out/video_out_xxmc.c 2011-11-13 17:35:47.571072751 +0100
+diff -uNr xine-lib-1.1.21.orig/src/video_out/video_out_xxmc.c xine-lib-1.1.21/src/video_out/video_out_xxmc.c
+--- xine-lib-1.1.21.orig/src/video_out/video_out_xxmc.c 2012-02-14 21:30:26.000000000 +0100
++++ xine-lib-1.1.21/src/video_out/video_out_xxmc.c 2012-06-10 20:46:04.683845028 +0200
@@ -365,15 +365,15 @@
switch(pc_type) {
@@ -4471,9 +4471,9 @@
format, flags);
}
}
-diff -uNr xine-lib-1.1.20.orig/src/video_out/xvmc_mocomp.c xine-lib-1.1.20/src/video_out/xvmc_mocomp.c
---- xine-lib-1.1.20.orig/src/video_out/xvmc_mocomp.c 2010-03-09 23:17:05.000000000 +0100
-+++ xine-lib-1.1.20/src/video_out/xvmc_mocomp.c 2011-11-13 17:35:47.571072751 +0100
+diff -uNr xine-lib-1.1.21.orig/src/video_out/xvmc_mocomp.c xine-lib-1.1.21/src/video_out/xvmc_mocomp.c
+--- xine-lib-1.1.21.orig/src/video_out/xvmc_mocomp.c 2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.21/src/video_out/xvmc_mocomp.c 2012-06-10 20:46:04.683845028 +0200
@@ -70,9 +70,9 @@
int second_field,
xvmc_macroblocks_t *macroblocks) {
@@ -4487,9 +4487,9 @@
int flags;
lprintf ("xvmc_render_macro_blocks\n");
-diff -uNr xine-lib-1.1.20.orig/src/video_out/xvmc_vld.c xine-lib-1.1.20/src/video_out/xvmc_vld.c
---- xine-lib-1.1.20.orig/src/video_out/xvmc_vld.c 2010-03-09 23:17:05.000000000 +0100
-+++ xine-lib-1.1.20/src/video_out/xvmc_vld.c 2011-11-13 17:35:47.571072751 +0100
+diff -uNr xine-lib-1.1.21.orig/src/video_out/xvmc_vld.c xine-lib-1.1.21/src/video_out/xvmc_vld.c
+--- xine-lib-1.1.21.orig/src/video_out/xvmc_vld.c 2010-03-09 23:17:05.000000000 +0100
++++ xine-lib-1.1.21/src/video_out/xvmc_vld.c 2012-06-10 20:46:04.684845000 +0200
@@ -32,12 +32,12 @@
{
vo_frame_t *this = (vo_frame_t *) this_gen;
@@ -4515,9 +4515,9 @@
xxmc_driver_t
*driver = (xxmc_driver_t *) cf->vo_frame.driver;
|
|
[-]
[+]
|
Deleted |
xine-lib-1.1.20.1-assert.patch
^
|
| @@ -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 <alloca.h>
- #endif
-+#include <assert.h>
-
- #define ALSA_PCM_NEW_HW_PARAMS_API
- #define ALSA_PCM_NEW_SW_PARAMS_API
|
|
[-]
[+]
|
Deleted |
xine-lib-1.1.20.1-demuxcheckfor_mad_ffmpeg.patch
^
|
| @@ -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;
-+ }
-+ }
- }
- }
-
|
|
[-]
[+]
|
Deleted |
xine-lib-1.1.20.1-glitch-free-pulseaudio.patch
^
|
| @@ -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);
-
|
|
[-]
[+]
|
Deleted |
xine-lib-1.1.20.1-ia64-is-not-alpha.diff
^
|
| @@ -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])
|
|
[-]
[+]
|
Deleted |
xine-lib-1.1.20.1-install-plugins-helper.diff
^
|
| @@ -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 <stdio.h>
-+#include <unistd.h>
-+#include <sys/wait.h>
-+
-+#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 <inttypes.h>
-+#include "xine_internal.h"
-+
-+/*
-+ * execute install plugins helper
-+ */
|
|
[-]
[+]
|
Deleted |
xine-lib-1.1.20.1-mjpegplugin.diff
^
|
| @@ -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@
|
|
[-]
[+]
|
Added |
xine-lib-1.1.21-assert.patch
^
|
| @@ -0,0 +1,11 @@
+diff -uNr xine-lib-1.1.21.orig/src/audio_out/audio_alsa_out.c xine-lib-1.1.21/src/audio_out/audio_alsa_out.c
+--- xine-lib-1.1.21.orig/src/audio_out/audio_alsa_out.c 2012-02-03 20:00:46.000000000 +0100
++++ xine-lib-1.1.21/src/audio_out/audio_alsa_out.c 2012-06-10 20:56:32.007076891 +0200
+@@ -41,6 +41,7 @@
+ #ifdef HAVE_ALLOCA_H
+ #include <alloca.h>
+ #endif
++#include <assert.h>
+
+ #define ALSA_PCM_NEW_HW_PARAMS_API
+ #define ALSA_PCM_NEW_SW_PARAMS_API
|
|
[-]
[+]
|
Added |
xine-lib-1.1.21-demuxcheckfor_mad_ffmpeg.patch
^
|
| @@ -0,0 +1,37 @@
+diff -ur xine-lib-1.1.21.orig/src/xine-engine/load_plugins.c xine-lib-1.1.21/src/xine-engine/load_plugins.c
+--- xine-lib-1.1.21.orig/src/xine-engine/load_plugins.c 2012-01-18 21:57:28.000000000 +0100
++++ xine-lib-1.1.21/src/xine-engine/load_plugins.c 2012-06-10 21:11:49.019156601 +0200
+@@ -2504,9 +2504,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;
+@@ -2518,7 +2527,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;
++ }
++ }
+ }
+ }
+
|
|
[-]
[+]
|
Added |
xine-lib-1.1.21-glitch-free-pulseaudio.patch
^
|
| @@ -0,0 +1,22 @@
+diff -ur xine-lib-1.1.21.orig/src/xine-engine/audio_out.c xine-lib-1.1.21/src/xine-engine/audio_out.c
+--- xine-lib-1.1.21.orig/src/xine-engine/audio_out.c 2012-06-08 15:36:36.000000000 +0200
++++ xine-lib-1.1.21/src/xine-engine/audio_out.c 2012-06-10 20:41:23.663804460 +0200
+@@ -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);
+
|
|
[-]
[+]
|
Added |
xine-lib-1.1.21-ia64-is-not-alpha.diff
^
|
| @@ -0,0 +1,18 @@
+diff -ur xine-lib-1.1.21.orig/configure.ac xine-lib-1.1.21/configure.ac
+--- xine-lib-1.1.21.orig/configure.ac 2012-06-09 18:40:10.000000000 +0200
++++ xine-lib-1.1.21/configure.ac 2012-06-10 20:39:04.500752114 +0200
+@@ -2412,10 +2412,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])
|
|
[-]
[+]
|
Added |
xine-lib-1.1.21-install-plugins-helper.diff
^
|
| @@ -0,0 +1,266 @@
+diff -uNr xine-lib-1.1.21.orig/configure.ac xine-lib-1.1.21/configure.ac
+--- xine-lib-1.1.21.orig/configure.ac 2012-06-10 20:52:23.759111639 +0200
++++ xine-lib-1.1.21/configure.ac 2012-06-10 20:54:54.233846569 +0200
+@@ -2662,6 +2662,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.21.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.21/src/xine-engine/audio_decoder.c
+--- xine-lib-1.1.21.orig/src/xine-engine/audio_decoder.c 2012-06-08 15:36:36.000000000 +0200
++++ xine-lib-1.1.21/src/xine-engine/audio_decoder.c 2012-06-10 20:54:54.234846540 +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.21.orig/src/xine-engine/install_plugins_helper.c xine-lib-1.1.21/src/xine-engine/install_plugins_helper.c
+--- xine-lib-1.1.21.orig/src/xine-engine/install_plugins_helper.c 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.21/src/xine-engine/install_plugins_helper.c 2012-06-10 20:54:54.234846540 +0200
+@@ -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 <stdio.h>
++#include <unistd.h>
++#include <sys/wait.h>
++
++#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.21.orig/src/xine-engine/install_plugins_helper.h xine-lib-1.1.21/src/xine-engine/install_plugins_helper.h
+--- xine-lib-1.1.21.orig/src/xine-engine/install_plugins_helper.h 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.21/src/xine-engine/install_plugins_helper.h 2012-06-10 20:54:54.234846540 +0200
+@@ -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 <inttypes.h>
++#include "xine_internal.h"
++
++/*
++ * execute install plugins helper
++ */
|
|
[-]
[+]
|
Added |
xine-lib-1.1.21-mjpegplugin.diff
^
|
| @@ -0,0 +1,1252 @@
+diff -uNr xine-lib-1.1.21.orig/configure xine-lib-1.1.21/configure
+--- xine-lib-1.1.21.orig/configure 2012-06-09 18:54:46.000000000 +0200
++++ xine-lib-1.1.21/configure 2012-06-10 20:50:44.577924537 +0200
+@@ -35151,6 +35151,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.21.orig/configure.ac xine-lib-1.1.21/configure.ac
+--- xine-lib-1.1.21.orig/configure.ac 2012-06-10 20:49:02.007830679 +0200
++++ xine-lib-1.1.21/configure.ac 2012-06-10 20:50:44.579924481 +0200
+@@ -1102,6 +1102,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 ---------------------------------------------
+
+@@ -2850,6 +2872,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
+@@ -3058,6 +3081,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.21.orig/src/Makefile.am xine-lib-1.1.21/src/Makefile.am
+--- xine-lib-1.1.21.orig/src/Makefile.am 2012-06-10 20:49:02.007830679 +0200
++++ xine-lib-1.1.21/src/Makefile.am 2012-06-10 20:50:44.580924453 +0200
+@@ -27,6 +27,7 @@
+ libreal \
+ libfaad \
+ libmusepack \
++ mjpeg \
+ post \
+ combined \
+ vdr
+diff -uNr xine-lib-1.1.21.orig/src/Makefile.in xine-lib-1.1.21/src/Makefile.in
+--- xine-lib-1.1.21.orig/src/Makefile.in 2012-06-09 18:54:37.000000000 +0200
++++ xine-lib-1.1.21/src/Makefile.in 2012-06-10 20:50:44.581924425 +0200
+@@ -462,6 +462,7 @@
+ libreal \
+ libfaad \
+ libmusepack \
++ mjpeg \
+ post \
+ combined
+
+diff -uNr xine-lib-1.1.21.orig/src/mjpeg/Makefile.am xine-lib-1.1.21/src/mjpeg/Makefile.am
+--- xine-lib-1.1.21.orig/src/mjpeg/Makefile.am 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.21/src/mjpeg/Makefile.am 2012-06-10 20:50:44.581924425 +0200
+@@ -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.21.orig/src/mjpeg/Makefile.in xine-lib-1.1.21/src/mjpeg/Makefile.in
+--- xine-lib-1.1.21.orig/src/mjpeg/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ xine-lib-1.1.21/src/mjpeg/Makefile.in 2012-06-10 20:50:44.582924397 +0200
+@@ -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@
|
|
[-]
[+]
|
Changed |
xine-lib-v4l-2.6.38.patch
^
|
| @@ -1,6 +1,6 @@
---- 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 @@
+--- configure.ac.orig 2012-06-10 20:59:18.609360289 +0200
++++ configure.ac 2012-06-10 20:59:55.016330051 +0200
+@@ -676,7 +676,7 @@
have_v4l=no
have_v4l2=no
if test "x$enable_v4l" != "xno"; then
@@ -9,8 +9,8 @@
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
+--- src/input/input_v4l.c.orig 2011-10-04 23:42:53.000000000 +0200
++++ src/input/input_v4l.c 2012-06-10 20:59:55.018329995 +0200
@@ -47,7 +47,7 @@
*/
#define _LINUX_TIME_H
|
|
|
Changed |
xine-lib-1.1.21.tar.bz2
^
|
