Changes of Revision 20
| [-] | Changed | xine-lib.spec |
|
x 1 2 #3 -# spec file for package xine-lib (Version 1.1.19)4 +# spec file for package xine-lib5 #6 -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.7 +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.8 #9 # All modifications and additions to the file contributed by third parties10 # remain the property of their copyright owners, unless otherwise agreed11 12 BuildRequires: libcdio-devel libdrm-devel libmng-devel libsmbclient13 BuildRequires: Mesa-devel libsmbclient-devel libtheora-devel libvorbis-devel14 BuildRequires: readline-devel update-desktop-files vcdimager-devel15 -BuildRequires: libspeex-devel16 +BuildRequires: speex-devel17 +BuildRequires: libtool18 %if 0%{suse_version} >= 121019 BuildRequires: libv4l-devel >= 0.8.420 %else21 22 %if %{with modplug}23 BuildRequires: libmodplug-devel24 %endif25 -Version: 1.1.1926 -Release: 1.pm.44.527 +Version: 1.1.20.128 +Release: 60.129 # bug43729330 %ifarch ppc6431 Obsoletes: xine-lib-64bit32 %endif33 -%define abiversion 1.2934 +%define abiversion 1.3035 Summary: Video Player with Plug-Ins36 Group: Productivity/Multimedia/Video/Players37 License: GPLv2+38 39 Patch26: xine-lib-doc-fix-X11R6.diff40 Patch28: xine-lib-%{version}-ia64-is-not-alpha.diff41 Patch31: xine-lib-%{version}-glitch-free-pulseaudio.patch42 -Patch32: http://repos.archlinux.org/wsvn/packages/xine-lib/trunk/xine-lib-1.1.19-xvmc.patch43 # *** Addons44 Patch50: vdr-xine-0.9.3.diff.bz245 Patch51: vdr-xine-SUSE.diff46 47 Patch75: xine-lib-v4l-2.6.38.patch48 # *** Only working for noncrippled source49 Patch80: xine-lib-various-noncrippled.diff50 -Patch81: xine-lib-%{version}-ffmpeg_abi_change.diff51 52 %description53 xine is a free multimedia player. It plays back CDs, DVDs, and VCDs. It54 55 %patch2656 %patch28 -p157 %patch31 -p158 -%patch32 -p059 %if 0%{suse_version} >= 111060 # set fuzzy=2 to get patch work with crippled and noncrippled tarball61 %patch50 -p1 -F262 63 %else64 # Only apply to uncrippled source65 %patch8066 -%patch81 -p167 %endif68 %patch72 -p169 %patch73 -p170 71 LIB="%{buildroot}%{_libdir}/xine/plugins/%{abiversion}"72 # install documentation73 install -m 0644 %{SOURCE10} COPYING AUTHORS %{buildroot}%{_defaultdocdir}/xine/74 -%if !%{with distributable}75 -touch ${RPM_BUILD_ROOT}%{_datadir}/xine/mad || echo "can't touch"76 -%endif77 # remove usless READMEs78 rm %{buildroot}%{_defaultdocdir}/xine/README.{irix,solaris,WIN32}79 %ifarch %{ix86}80 81 for i in files files.*; do82 test "$i" = 'files.codecs' || xargs -i+ rm -f %{buildroot}/+ < $i83 done84 -rm -rf %{buildroot}/usr/share %{buildroot}/usr/bin85 +rm -rf %{buildroot}%{_datadir}86 +rm -rf %{buildroot}%{_bindir}87 rm -rf %{buildroot}%{_defaultdocdir}/xine %{buildroot}/usr/include88 rm -rf %{buildroot}/usr/lib/win32 %{buildroot}/%{_libdir}/pkgconfig89 rm -rf %{buildroot}%{_libdir}/xine/plugins/%{abiversion}/{vidix,mime.types}90 91 %dir %{_libdir}/xine/plugins92 %dir %{_libdir}/xine/plugins/%{abiversion}93 %dir %{_libdir}/xine/plugins/%{abiversion}/post94 -%{_datadir}/xine/mad95 %endif96 97 %changelog98 |
||
| [+] | Changed | vdr-xine-0.9.3.diff.bz2 ^ |
| @@ -1,7 +1,7 @@ -diff -urN 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:33:19.235784655 +0200 -+++ xine-lib-1.1.19/configure.ac 2010-07-26 00:39:10.215786402 +0200 -@@ -2850,6 +2850,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 @@ 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]],[[]]) -@@ -2892,6 +2893,7 @@ +@@ -2931,6 +2932,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 -@@ -3105,6 +3107,7 @@ +@@ -3145,6 +3147,7 @@ echo " - eq - eq2" echo " - boxblur - denoise3d" echo " - unsharp - tvtime" @@ -25,9 +25,9 @@ echo " * SFX:" echo " - goom - oscope" echo " - fftscope - mosaico" -diff -urN xine-lib-1.1.19.orig/src/Makefile.am xine-lib-1.1.19/src/Makefile.am ---- xine-lib-1.1.19.orig/src/Makefile.am 2010-03-09 23:17:05.000000000 +0100 -+++ xine-lib-1.1.19/src/Makefile.am 2010-07-26 00:39:10.215786402 +0200 +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 @@ -28,4 +28,5 @@ libfaad \ libmusepack \ @@ -35,9 +35,9 @@ - combined + combined \ + vdr -diff -urN xine-lib-1.1.19.orig/src/vdr/combined_vdr.c xine-lib-1.1.19/src/vdr/combined_vdr.c ---- xine-lib-1.1.19.orig/src/vdr/combined_vdr.c 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.19/src/vdr/combined_vdr.c 2010-07-26 00:39:10.216786094 +0200 +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 @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2000-2004 the xine project @@ -83,9 +83,9 @@ + { PLUGIN_NONE , 0, "" , 0 , NULL , NULL } +}; + -diff -urN xine-lib-1.1.19.orig/src/vdr/combined_vdr.h xine-lib-1.1.19/src/vdr/combined_vdr.h ---- xine-lib-1.1.19.orig/src/vdr/combined_vdr.h 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.19/src/vdr/combined_vdr.h 2010-07-26 00:39:10.216786094 +0200 +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 @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2000-2004 the xine project @@ -179,9 +179,9 @@ + +#endif /* __COMBINED_VDR_H */ + -diff -urN xine-lib-1.1.19.orig/src/vdr/input_vdr.c xine-lib-1.1.19/src/vdr/input_vdr.c ---- xine-lib-1.1.19.orig/src/vdr/input_vdr.c 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.19/src/vdr/input_vdr.c 2010-07-26 00:39:10.220795412 +0200 +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 @@ -0,0 +1,2665 @@ +/* + * Copyright (C) 2003-2004 the xine project @@ -2848,9 +2848,9 @@ + + return this; +} -diff -urN xine-lib-1.1.19.orig/src/vdr/Makefile.am xine-lib-1.1.19/src/vdr/Makefile.am ---- xine-lib-1.1.19.orig/src/vdr/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.19/src/vdr/Makefile.am 2010-07-26 00:39:10.220795412 +0200 +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 @@ -0,0 +1,13 @@ +include $(top_srcdir)/misc/Makefile.common + @@ -2865,9 +2865,9 @@ + +xineinclude_HEADERS = vdr.h +noinst_HEADERS = combined_vdr.h -diff -urN xine-lib-1.1.19.orig/src/vdr/post_vdr_audio.c xine-lib-1.1.19/src/vdr/post_vdr_audio.c ---- xine-lib-1.1.19.orig/src/vdr/post_vdr_audio.c 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.19/src/vdr/post_vdr_audio.c 2010-07-26 00:39:10.221785676 +0200 +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 @@ -0,0 +1,285 @@ +/* + * Copyright (C) 2000-2004 the xine project @@ -3154,9 +3154,9 @@ + + return; +} -diff -urN xine-lib-1.1.19.orig/src/vdr/post_vdr_video.c xine-lib-1.1.19/src/vdr/post_vdr_video.c ---- xine-lib-1.1.19.orig/src/vdr/post_vdr_video.c 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.19/src/vdr/post_vdr_video.c 2010-07-26 00:39:10.221785676 +0200 +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 @@ -0,0 +1,502 @@ +/* + * Copyright (C) 2000-2004 the xine project @@ -3660,9 +3660,9 @@ + + return skip; +} -diff -urN xine-lib-1.1.19.orig/src/vdr/vdr.h xine-lib-1.1.19/src/vdr/vdr.h ---- xine-lib-1.1.19.orig/src/vdr/vdr.h 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.19/src/vdr/vdr.h 2010-07-26 00:39:10.222784950 +0200 +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 @@ -0,0 +1,665 @@ +/* + * Copyright (C) 2000-2004 the xine project @@ -4329,9 +4329,9 @@ + +#endif /* __VDR_H */ + -diff -urN xine-lib-1.1.19.orig/src/video_out/video_out_xvmc.c xine-lib-1.1.19/src/video_out/video_out_xvmc.c ---- xine-lib-1.1.19.orig/src/video_out/video_out_xvmc.c 2010-04-08 16:52:29.000000000 +0200 -+++ xine-lib-1.1.19/src/video_out/video_out_xvmc.c 2010-07-26 00:39:10.223784433 +0200 +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 @@ int second_field, xvmc_macroblocks_t *macroblocks) { @@ -4353,9 +4353,9 @@ /* keep track of frames and how many frames alocated. */ this->frames[this->num_frame_buffers++] = frame; -diff -urN xine-lib-1.1.19.orig/src/video_out/video_out_xxmc.c xine-lib-1.1.19/src/video_out/video_out_xxmc.c ---- xine-lib-1.1.19.orig/src/video_out/video_out_xxmc.c 2010-04-08 16:52:43.000000000 +0200 -+++ xine-lib-1.1.19/src/video_out/video_out_xxmc.c 2010-07-26 00:39:10.224784615 +0200 +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 @@ -365,15 +365,15 @@ switch(pc_type) { @@ -4471,9 +4471,9 @@ format, flags); } } -diff -urN xine-lib-1.1.19.orig/src/video_out/xvmc_mocomp.c xine-lib-1.1.19/src/video_out/xvmc_mocomp.c ---- xine-lib-1.1.19.orig/src/video_out/xvmc_mocomp.c 2010-03-09 23:17:05.000000000 +0100 -+++ xine-lib-1.1.19/src/video_out/xvmc_mocomp.c 2010-07-26 00:39:10.224784615 +0200 +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 @@ -70,9 +70,9 @@ int second_field, xvmc_macroblocks_t *macroblocks) { @@ -4487,9 +4487,9 @@ int flags; lprintf ("xvmc_render_macro_blocks\n"); -diff -urN xine-lib-1.1.19.orig/src/video_out/xvmc_vld.c xine-lib-1.1.19/src/video_out/xvmc_vld.c ---- xine-lib-1.1.19.orig/src/video_out/xvmc_vld.c 2010-03-09 23:17:05.000000000 +0100 -+++ xine-lib-1.1.19/src/video_out/xvmc_vld.c 2010-07-26 00:39:10.224784615 +0200 +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 @@ -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; -diff -urN xine-lib-1.1.19.orig/src/xine-engine/accel_xvmc.h xine-lib-1.1.19/src/xine-engine/accel_xvmc.h ---- xine-lib-1.1.19.orig/src/xine-engine/accel_xvmc.h 2010-03-09 23:17:05.000000000 +0100 -+++ xine-lib-1.1.19/src/xine-engine/accel_xvmc.h 2010-07-26 00:39:10.225784587 +0200 +diff -uNr xine-lib-1.1.20.orig/src/xine-engine/accel_xvmc.h xine-lib-1.1.20/src/xine-engine/accel_xvmc.h +--- xine-lib-1.1.20.orig/src/xine-engine/accel_xvmc.h 2010-03-09 23:17:05.000000000 +0100 ++++ xine-lib-1.1.20/src/xine-engine/accel_xvmc.h 2011-11-13 17:35:47.571072751 +0100 @@ -65,6 +65,7 @@ @@ -4546,9 +4546,9 @@ | ||
| [+] | Deleted | xine-lib-1.1.19-assert.patch ^ |
| @@ -1,11 +0,0 @@ -diff -ur xine-lib-1.1.19.orig/src/audio_out/audio_alsa_out.c xine-lib-1.1.19/src/audio_out/audio_alsa_out.c ---- xine-lib-1.1.19.orig/src/audio_out/audio_alsa_out.c 2010-04-11 16:57:37.000000000 +0200 -+++ xine-lib-1.1.19/src/audio_out/audio_alsa_out.c 2010-07-26 00:57:55.476784389 +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 | ||
| [+] | Deleted | xine-lib-1.1.19-demuxcheckfor_mad_ffmpeg.patch ^ |
| @@ -1,37 +0,0 @@ -diff -ur xine-lib-1.1.19.orig/src/xine-engine/load_plugins.c xine-lib-1.1.19/src/xine-engine/load_plugins.c ---- xine-lib-1.1.19.orig/src/xine-engine/load_plugins.c 2010-03-09 23:17:05.000000000 +0100 -+++ xine-lib-1.1.19/src/xine-engine/load_plugins.c 2010-07-26 01:24:26.098035179 +0200 -@@ -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.19-ffmpeg_abi_change.diff ^ |
| @@ -1,241 +0,0 @@ -diff -ur xine-lib-1.1.19.orig/src/combined/ffmpeg/ff_audio_decoder.c xine-lib-1.1.19/src/combined/ffmpeg/ff_audio_decoder.c ---- xine-lib-1.1.19.orig/src/combined/ffmpeg/ff_audio_decoder.c 2010-03-23 16:41:49.000000000 +0100 -+++ xine-lib-1.1.19/src/combined/ffmpeg/ff_audio_decoder.c 2011-05-17 20:23:15.000000000 +0200 -@@ -46,6 +46,12 @@ - - #define AUDIOBUFSIZE (64 * 1024) - -+#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) -+# define AVAUDIO 3 -+#else -+# define AVAUDIO 2 -+#endif -+ - typedef struct { - audio_decoder_class_t decoder_class; - } ff_audio_class_t; -@@ -255,6 +261,9 @@ - buf->decoder_info[2]); - - } else if (!(buf->decoder_flags & BUF_FLAG_SPECIAL)) { -+#if AVAUDIO > 2 -+ AVPacket avpkt; -+#endif - - if( !this->decoder_ok ) { - if ( ! this->context || ! this->codec ) { -@@ -286,11 +295,21 @@ - if (!this->output_open) { - if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) { - decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; -+#if AVAUDIO > 2 -+ av_init_packet (&avpkt); -+ avpkt.data = (uint8_t *)&this->buf[0]; -+ avpkt.size = this->size; -+ avpkt.flags = AV_PKT_FLAG_KEY; -+ avcodec_decode_audio3 (this->context, -+ (int16_t *)this->decode_buffer, -+ &decode_buffer_size, &avpkt); -+#else - avcodec_decode_audio2 (this->context, - (int16_t *)this->decode_buffer, - &decode_buffer_size, - &this->buf[0], - this->size); -+#endif - this->audio_bits = this->context->bits_per_sample; - this->audio_sample_rate = this->context->sample_rate; - this->audio_channels = this->context->channels; -@@ -311,12 +330,21 @@ - offset = 0; - while (this->size>0) { - decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; -+#if AVAUDIO > 2 -+ av_init_packet (&avpkt); -+ avpkt.data = (uint8_t *)&this->buf[offset]; -+ avpkt.size = this->size; -+ avpkt.flags = AV_PKT_FLAG_KEY; -+ bytes_consumed = avcodec_decode_audio3 (this->context, -+ (int16_t *)this->decode_buffer, -+ &decode_buffer_size, &avpkt); -+#else - bytes_consumed = avcodec_decode_audio2 (this->context, - (int16_t *)this->decode_buffer, - &decode_buffer_size, - &this->buf[offset], - this->size); -- -+#endif - if (bytes_consumed<0) { - xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, - "ffmpeg_audio_dec: error decompressing audio frame\n"); -diff -ur xine-lib-1.1.19.orig/src/combined/ffmpeg/ff_video_decoder.c xine-lib-1.1.19/src/combined/ffmpeg/ff_video_decoder.c ---- xine-lib-1.1.19.orig/src/combined/ffmpeg/ff_video_decoder.c 2010-03-10 20:07:15.000000000 +0100 -+++ xine-lib-1.1.19/src/combined/ffmpeg/ff_video_decoder.c 2011-05-17 20:23:15.000000000 +0200 -@@ -58,6 +58,14 @@ - - #define ENABLE_DIRECT_RENDERING - -+#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) -+# define AVVIDEO 2 -+#else -+# define AVVIDEO 1 -+# define pp_context pp_context_t -+# define pp_mode pp_mode_t -+#endif -+ - /* reordered_opaque appeared in libavcodec 51.68.0 */ - #define AVCODEC_HAS_REORDERED_OPAQUE - #if LIBAVCODEC_VERSION_INT < 0x334400 -@@ -116,8 +124,8 @@ - - int pp_quality; - int pp_flags; -- pp_context_t *pp_context; -- pp_mode_t *pp_mode; -+ pp_context *our_context; -+ pp_mode *our_mode; - - /* mpeg-es parsing */ - mpeg_parser_t *mpeg_parser; -@@ -444,23 +452,23 @@ - this->pp_quality = this->class->pp_quality; - - if(this->pp_available && this->pp_quality) { -- if(!this->pp_context && this->context) -- this->pp_context = pp_get_context(this->context->width, this->context->height, -+ if(!this->our_context && this->context) -+ this->our_context = pp_get_context(this->context->width, this->context->height, - this->pp_flags); -- if(this->pp_mode) -- pp_free_mode(this->pp_mode); -+ if(this->our_mode) -+ pp_free_mode(this->our_mode); - -- this->pp_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a", -+ this->our_mode = pp_get_mode_by_name_and_quality("hb:a,vb:a,dr:a", - this->pp_quality); - } else { -- if(this->pp_mode) { -- pp_free_mode(this->pp_mode); -- this->pp_mode = NULL; -+ if(this->our_mode) { -+ pp_free_mode(this->our_mode); -+ this->our_mode = NULL; - } - -- if(this->pp_context) { -- pp_free_context(this->pp_context); -- this->pp_context = NULL; -+ if(this->our_context) { -+ pp_free_context(this->our_context); -+ this->our_context = NULL; - } - } - } -@@ -1055,12 +1063,26 @@ - } - - /* skip decoding b frames if too late */ -+#if AVVIDEO > 1 -+ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT; -+#else - this->context->hurry_up = (this->skipframes > 0); -+#endif - - lprintf("avcodec_decode_video: size=%d\n", this->mpeg_parser->buffer_size); -+#if AVVIDEO > 1 -+ AVPacket avpkt; -+ av_init_packet(&avpkt); -+ avpkt.data = (uint8_t *)this->mpeg_parser->chunk_buffer; -+ avpkt.size = this->mpeg_parser->buffer_size; -+ avpkt.flags = AV_PKT_FLAG_KEY; -+ len = avcodec_decode_video2 (this->context, this->av_frame, -+ &got_picture, &avpkt); -+#else - len = avcodec_decode_video (this->context, this->av_frame, - &got_picture, this->mpeg_parser->chunk_buffer, - this->mpeg_parser->buffer_size); -+#endif - lprintf("avcodec_decode_video: decoded_size=%d, got_picture=%d\n", - len, got_picture); - len = current - buf->content - offset; -@@ -1112,7 +1134,13 @@ - - } else { - -- if (this->context->hurry_up) { -+ if ( -+#if AVVIDEO > 1 -+ this->context->skip_frame != AVDISCARD_DEFAULT -+#else -+ this->context->hurry_up -+#endif -+ ) { - /* skipped frame, output a bad frame */ - img = this->stream->video_out->get_frame (this->stream->video_out, - this->bih.biWidth, -@@ -1304,13 +1332,25 @@ - got_picture = 0; - } else { - /* skip decoding b frames if too late */ -+#if AVVIDEO > 1 -+ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT; -+#else - this->context->hurry_up = (this->skipframes > 0); -- -+#endif - lprintf("buffer size: %d\n", this->size); -+#if AVVIDEO > 1 -+ AVPacket avpkt; -+ av_init_packet(&avpkt); -+ avpkt.data = (uint8_t *)&chunk_buf[offset]; -+ avpkt.size = this->size; -+ avpkt.flags = AV_PKT_FLAG_KEY; -+ len = avcodec_decode_video2 (this->context, this->av_frame, -+ &got_picture, &avpkt); -+#else - len = avcodec_decode_video (this->context, this->av_frame, - &got_picture, &chunk_buf[offset], | ||
| [+] | Deleted | xine-lib-1.1.19-glitch-free-pulseaudio.patch ^ |
| @@ -1,22 +0,0 @@ -diff -ur xine-lib-1.1.19.orig/src/xine-engine/audio_out.c xine-lib-1.1.19/src/xine-engine/audio_out.c ---- xine-lib-1.1.19.orig/src/xine-engine/audio_out.c 2010-07-21 19:43:52.000000000 +0200 -+++ xine-lib-1.1.19/src/xine-engine/audio_out.c 2010-07-26 00:34:13.178049961 +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); - | ||
| [+] | Deleted | xine-lib-1.1.19-ia64-is-not-alpha.diff ^ |
| @@ -1,18 +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-25 16:37:30.000000000 +0200 -+++ xine-lib-1.1.19/configure.ac 2010-07-26 00:30:47.254790180 +0200 -@@ -2395,10 +2395,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.19-install-plugins-helper.diff ^ |
| @@ -1,266 +0,0 @@ -diff -urN 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:48:39.267784541 +0200 -+++ xine-lib-1.1.19/configure.ac 2010-07-26 00:54:10.464784907 +0200 -@@ -2645,6 +2645,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 -urN xine-lib-1.1.19.orig/src/xine-engine/audio_decoder.c xine-lib-1.1.19/src/xine-engine/audio_decoder.c ---- xine-lib-1.1.19.orig/src/xine-engine/audio_decoder.c 2010-07-21 19:43:52.000000000 +0200 -+++ xine-lib-1.1.19/src/xine-engine/audio_decoder.c 2010-07-26 00:54:10.465817774 +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) { - -@@ -341,6 +342,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 -urN xine-lib-1.1.19.orig/src/xine-engine/install_plugins_helper.c xine-lib-1.1.19/src/xine-engine/install_plugins_helper.c ---- xine-lib-1.1.19.orig/src/xine-engine/install_plugins_helper.c 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.19/src/xine-engine/install_plugins_helper.c 2010-07-26 00:54:10.465817774 +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 -urN xine-lib-1.1.19.orig/src/xine-engine/install_plugins_helper.h xine-lib-1.1.19/src/xine-engine/install_plugins_helper.h ---- xine-lib-1.1.19.orig/src/xine-engine/install_plugins_helper.h 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.19/src/xine-engine/install_plugins_helper.h 2010-07-26 00:54:10.465817774 +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 -+ */ | ||
| [+] | Deleted | xine-lib-1.1.19-mjpegplugin.diff ^ |
| @@ -1,1252 +0,0 @@ -diff -urN xine-lib-1.1.19.orig/configure xine-lib-1.1.19/configure ---- xine-lib-1.1.19.orig/configure 2010-07-25 16:40:24.000000000 +0200 -+++ xine-lib-1.1.19/configure 2010-07-26 00:46:26.524784958 +0200 -@@ -33677,6 +33677,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 -urN 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:41:44.720048157 +0200 -+++ xine-lib-1.1.19/configure.ac 2010-07-26 00:46:26.537784872 +0200 -@@ -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 --------------------------------------------- - -@@ -2831,6 +2853,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 -@@ -3024,6 +3047,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 -urN xine-lib-1.1.19.orig/src/Makefile.am xine-lib-1.1.19/src/Makefile.am ---- xine-lib-1.1.19.orig/src/Makefile.am 2010-07-26 00:41:44.720048157 +0200 -+++ xine-lib-1.1.19/src/Makefile.am 2010-07-26 00:46:26.538786101 +0200 -@@ -27,6 +27,7 @@ - libreal \ - libfaad \ - libmusepack \ -+ mjpeg \ - post \ - combined \ - vdr -diff -urN xine-lib-1.1.19.orig/src/Makefile.in xine-lib-1.1.19/src/Makefile.in ---- xine-lib-1.1.19.orig/src/Makefile.in 2010-07-25 16:40:01.000000000 +0200 -+++ xine-lib-1.1.19/src/Makefile.in 2010-07-26 00:46:26.539796410 +0200 -@@ -453,6 +453,7 @@ - libreal \ - libfaad \ - libmusepack \ -+ mjpeg \ - post \ - combined - -diff -urN xine-lib-1.1.19.orig/src/mjpeg/Makefile.am xine-lib-1.1.19/src/mjpeg/Makefile.am ---- xine-lib-1.1.19.orig/src/mjpeg/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.19/src/mjpeg/Makefile.am 2010-07-26 00:46:26.539796410 +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 -urN xine-lib-1.1.19.orig/src/mjpeg/Makefile.in xine-lib-1.1.19/src/mjpeg/Makefile.in ---- xine-lib-1.1.19.orig/src/mjpeg/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.1.19/src/mjpeg/Makefile.in 2010-07-26 00:46:26.540794705 +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@ | ||
| [+] | Deleted | xine-lib-1.1.19-xvmc.patch ^ |
| @@ -1,17 +0,0 @@ -Quoting ChangeLog of X11's videoproto package: -vldXvMC.h: stop uselessly including XvMClib.h - ---- src/video_out/xxmc.h -+++ src/video_out/xxmc.h -@@ -77,10 +77,10 @@ - #include <X11/extensions/XShm.h> - #include <X11/extensions/Xv.h> - #include <X11/extensions/Xvlib.h> -+#include <X11/extensions/XvMClib.h> - #ifdef HAVE_VLDXVMC - #include <X11/extensions/vldXvMC.h> - #else -- #include <X11/extensions/XvMClib.h> - #include <X11/extensions/XvMC.h> - #endif - | ||
| [+] | Added | xine-lib-1.1.20.1-assert.patch ^ |
| @@ -0,0 +1,11 @@ +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 | ||
| [+] | Added | xine-lib-1.1.20.1-demuxcheckfor_mad_ffmpeg.patch ^ |
| @@ -0,0 +1,37 @@ +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; ++ } ++ } + } + } + | ||
| [+] | Added | xine-lib-1.1.20.1-glitch-free-pulseaudio.patch ^ |
| @@ -0,0 +1,22 @@ +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); + | ||
| [+] | Added | xine-lib-1.1.20.1-ia64-is-not-alpha.diff ^ |
| @@ -0,0 +1,18 @@ +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]) | ||
| [+] | Added | xine-lib-1.1.20.1-install-plugins-helper.diff ^ |
| @@ -0,0 +1,266 @@ +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 ++ */ | ||
| [+] | Added | xine-lib-1.1.20.1-mjpegplugin.diff ^ |
| @@ -0,0 +1,1252 @@ +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@ | ||
| Changed | xine-lib-1.1.20.1.tar.bz2 ^ | |
| [+] | Deleted | xine-lib.spec.pm ^ |
| @@ -1,1885 +0,0 @@ -# -# spec file for package xine-lib (Version 1.1.19) -# -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - -# norootforbuild - - -Name: xine-lib -# %bcond_with = default off -# %bcond_without = default on -# -# --with distributable -> don't build libxine1-codecs -# --without distributable -> build libxine1-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 alsa-devel flac-devel giflib-devel -BuildRequires: glib2-devel gnutls-devel gtk2-devel imlib2-devel krb5-devel -BuildRequires: libcdio-devel libdrm-devel libmng-devel libsmbclient -BuildRequires: Mesa-devel libsmbclient-devel libtheora-devel libvorbis-devel -BuildRequires: readline-devel update-desktop-files vcdimager-devel -BuildRequires: speex-devel -%if 0%{suse_version} >= 1210 -BuildRequires: libv4l-devel >= 0.8.4 -%else -%if 0%{suse_version} >= 1110 -BuildRequires: libv4l-devel -%endif -%endif -%if 0%{suse_version} >= 1030 -BuildRequires: lirc-devel -%else -BuildRequires: lirc -%endif -%if !%{with distributable} -# those requiremens are optional but internal copies are likely old -%if %{with external_ffmpeg} -BuildRequires: libfaad-devel libffmpeg-devel -%endif -%endif -%if %{with pulseaudio} -BuildRequires: libpulse-devel -%endif -%if %{with sdl} -BuildRequires: SDL-devel -%endif -%if %{with aalib} -BuildRequires: aalib-devel -BuildRequires: libcaca-devel -%endif -%if %{with arts} -BuildRequires: arts-devel -%endif -%if %{with esd} -BuildRequires: esound-devel -%endif -%if %{with gnome_vfs} -BuildRequires: gnome-vfs2-devel -%endif -%if %{with jack} -BuildRequires: libjack-devel -%endif -%if %{with directfb} -%if 0%{suse_version} >= 1020 -BuildRequires: DirectFB-devel -%else -BuildRequires: DirectFB -%endif -%endif -%if %{with modplug} -BuildRequires: libmodplug-devel -%endif -Version: 1.1.19 -Release: 2.pm.47.1 -# bug437293 -%ifarch ppc64 -Obsoletes: xine-lib-64bit -%endif -%define abiversion 1.29 -Summary: Video Player with Plug-Ins -Group: Productivity/Multimedia/Video/Players -License: GPLv2+ -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: http://repos.archlinux.org/wsvn/packages/xine-lib/trunk/xine-lib-1.1.19-xvmc.patch -# *** 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 -Patch81: xine-lib-%{version}-ffmpeg_abi_change.diff - -%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. - -%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. - -%package -n libxine1 -Summary: Video Player with Plug-Ins -Group: Productivity/Multimedia/Video/Players -License: GPLv2+ -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} -Recommends: opensuse-codecs-installer - -%description -n libxine1 -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 | ||