From 1a5776972a70faf18bee21c9406e76544ec7a66c2bdc15233e714767724f9524 Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Fri, 11 Apr 2014 22:54:32 +0000 Subject: [PATCH] - update to 1.2.5 * Update german translation. * Add bass downmix support to AC3 decoder. * Add experimental YCgCo colorspace support. * Add avformat demux plugin. - Support for new formats and protocols. - Proper rtsp support (with avformat+rtsp://, rtsp+tcp:// and rtsp+http:// mrls). - by default native xine demux plugins are probed first. This can be overridden in config, by selecting demuxer in mrl (#demux:avformat), or by using "avformat+" mrl prefix. * Add avio (libavformat) input plugin: - Support for new protocols (https://, ftp://, sftp://, ...). - Support for seekable http streams (with "avio+http://" mrl). - By default native xine input plugins are used. This can be overridden in config or by using "avio+" mrl prefix. * Recognise & use HEVC/H.265. (ffmpeg) * Add support for HEVC/H.265 to the mpeg-ts demuxer. * Add support for HEVC/H.265 and VP9 to the matroska demuxer. * Add VP8/VP9 decoder using libvpx. * Modernise Quicktime demuxer: - Multiple user selectable audio traks. - Support AC3, EAC3, vorbis, Purevoice audio. - Support ISO fragment media files. - More safety on broken files. - Slightly faster. * Recognise & use ADPCM G.726 and ATRAC3. (ffmpeg/libva) * Build fixes. * Fix HDMV subtitle channel. * FFmpeg compatibility fixes. * Some colour format conversion fixes. * Fix RealVideo re-ordered PTS: pass through, let the decoder re-order it. OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=75 --- xine-lib-1.2.3-crippled.tar.bz2 | 3 - xine-lib-1.2.3.tar.bz2 | 3 - xine-lib-1.2.5-crippled.tar.bz2 | 3 + xine-lib-1.2.5.tar.bz2 | 3 + xine-lib-missing-include-1.2.3.patch | 139 --------------------------- xine-lib-v4l-2.6.38.patch | 10 +- xine-lib.changes | 62 ++++++++++++ xine-lib.spec | 8 +- 8 files changed, 76 insertions(+), 155 deletions(-) delete mode 100644 xine-lib-1.2.3-crippled.tar.bz2 delete mode 100644 xine-lib-1.2.3.tar.bz2 create mode 100644 xine-lib-1.2.5-crippled.tar.bz2 create mode 100644 xine-lib-1.2.5.tar.bz2 delete mode 100644 xine-lib-missing-include-1.2.3.patch diff --git a/xine-lib-1.2.3-crippled.tar.bz2 b/xine-lib-1.2.3-crippled.tar.bz2 deleted file mode 100644 index 4ff5116..0000000 --- a/xine-lib-1.2.3-crippled.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b7c898d5c93ce206d23339e7c7d42d1295a49d5c76efa282fee535525cc7510d -size 6317329 diff --git a/xine-lib-1.2.3.tar.bz2 b/xine-lib-1.2.3.tar.bz2 deleted file mode 100644 index 435fafa..0000000 --- a/xine-lib-1.2.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d77bc1d886621fa395c7b6b5a64fae18db258b595bf0666cc44b93aec31f9790 -size 6361625 diff --git a/xine-lib-1.2.5-crippled.tar.bz2 b/xine-lib-1.2.5-crippled.tar.bz2 new file mode 100644 index 0000000..db5cc17 --- /dev/null +++ b/xine-lib-1.2.5-crippled.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42e9cd68e50aaaee520d462f2c2a4500209b940a4ceefb3e18c7b7c829cbe5dd +size 6392301 diff --git a/xine-lib-1.2.5.tar.bz2 b/xine-lib-1.2.5.tar.bz2 new file mode 100644 index 0000000..6623b43 --- /dev/null +++ b/xine-lib-1.2.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c92662ed3f567a099c37b1016fa105ae55982d4800ca2c93766967c24747f49 +size 6422874 diff --git a/xine-lib-missing-include-1.2.3.patch b/xine-lib-missing-include-1.2.3.patch deleted file mode 100644 index a6f18d1..0000000 --- a/xine-lib-missing-include-1.2.3.patch +++ /dev/null @@ -1,139 +0,0 @@ -diff -uNr xine-lib-1.2.3.orig/src/xine-engine/accel_vaapi.h xine-lib-1.2.3/src/xine-engine/accel_vaapi.h ---- xine-lib-1.2.3.orig/src/xine-engine/accel_vaapi.h 1970-01-01 01:00:00.000000000 +0100 -+++ xine-lib-1.2.3/src/xine-engine/accel_vaapi.h 2013-01-17 20:51:47.000000000 +0100 -@@ -0,0 +1,135 @@ -+/* -+ * Copyright (C) 2008 the xine project -+ * -+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -+ * -+ * -+ * Common acceleration definitions for vdpau -+ * -+ * -+ */ -+ -+#ifndef HAVE_XINE_ACCEL_VAAPI_H -+#define HAVE_XINE_ACCEL_VAAPI_H -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include -+#include -+#ifdef HAVE_FFMPEG_AVUTIL_H -+# include -+#else -+# include -+#endif -+ -+#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 -+ -+#define NUM_OUTPUT_SURFACES 22 -+ -+#define SURFACE_FREE 0 -+#define SURFACE_ALOC 1 -+#define SURFACE_RELEASE 2 -+#define SURFACE_RENDER 3 -+#define SURFACE_RENDER_RELEASE 5 -+ -+struct vaapi_equalizer { -+ VADisplayAttribute brightness; -+ VADisplayAttribute contrast; -+ VADisplayAttribute hue; -+ VADisplayAttribute saturation; -+}; -+ -+typedef struct ff_vaapi_context_s ff_vaapi_context_t; -+ -+struct ff_vaapi_context_s { -+ VADisplay va_display; -+ VAContextID va_context_id; -+ VAConfigID va_config_id; -+ int width; -+ int height; -+ int sw_width; -+ int sw_height; -+ int va_profile; -+ unsigned int va_colorspace; -+ VAImage va_subpic_image; -+ VASubpictureID va_subpic_id; -+ int va_subpic_width; -+ int va_subpic_height; -+ int is_bound; -+ void *gl_surface; -+ unsigned int soft_head; -+ unsigned int valid_context; -+ unsigned int va_head; -+ unsigned int va_soft_head; -+ vo_driver_t *driver; -+ unsigned int last_sub_image_fmt; -+ VASurfaceID last_sub_surface_id; -+ struct vaapi_equalizer va_equalizer; -+ VAImageFormat *va_image_formats; -+ int va_num_image_formats; -+ VAImageFormat *va_subpic_formats; -+ int va_num_subpic_formats; -+}; -+ -+typedef struct ff_vaapi_surface_s ff_vaapi_surface_t; -+typedef struct vaapi_accel_s vaapi_accel_t; -+ -+struct ff_vaapi_surface_s { -+ unsigned int index; -+ vaapi_accel_t *accel; -+ VASurfaceID va_surface_id; -+ unsigned int status; -+}; -+ -+struct vaapi_accel_s { -+ unsigned int index; -+ vo_frame_t *vo_frame; -+ -+#if AVVIDEO > 1 -+ int (*avcodec_decode_video2)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture, -+ int *got_picture_ptr, AVPacket *avpkt); -+#else -+ int (*avcodec_decode_video)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture, -+ int *got_picture_ptr, uint8_t *buf, int buf_size); -+#endif -+ VAStatus (*vaapi_init)(vo_frame_t *frame_gen, int va_profile, int width, int height, int softrender); -+ int (*profile_from_imgfmt)(vo_frame_t *frame_gen, enum PixelFormat pix_fmt, int codec_id, int vaapi_mpeg_sofdec); -+ ff_vaapi_context_t *(*get_context)(vo_frame_t *frame_gen); -+ int (*guarded_render)(vo_frame_t *frame_gen); -+ ff_vaapi_surface_t *(*get_vaapi_surface)(vo_frame_t *frame_gen); -+ void (*render_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface); -+ void (*release_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface); -+}; -+ -+#ifdef __cplusplus -+} -+#endif -+ -+#endif -+ diff --git a/xine-lib-v4l-2.6.38.patch b/xine-lib-v4l-2.6.38.patch index 8b720e3..58baace 100644 --- a/xine-lib-v4l-2.6.38.patch +++ b/xine-lib-v4l-2.6.38.patch @@ -1,6 +1,6 @@ ---- m4/input.m4 2012-02-09 00:41:11.000000000 +0100 -+++ m4/input.m4 2013-05-29 22:52:23.322037277 +0200 -@@ -93,7 +93,7 @@ +--- m4/input.m4 2014-02-26 16:49:10.000000000 +0100 ++++ m4/input.m4 2014-04-11 23:22:34.923765318 +0200 +@@ -96,7 +96,7 @@ XINE_ARG_ENABLE([v4l], [Enable Video4Linux support]) if test x"$enable_v4l" != x"no"; then have_v4l=yes @@ -9,8 +9,8 @@ AC_CHECK_HEADERS([asm/types.h]) if test x"$hard_enable_v4l" = x"yes" && test x"$have_v4l" != x"yes"; then AC_MSG_ERROR([Video4Linux support requested, but prerequisite headers not found.]) ---- src/input/input_v4l.c 2012-02-05 20:17:02.000000000 +0100 -+++ src/input/input_v4l.c 2013-05-29 22:52:23.324037225 +0200 +--- src/input/input_v4l.c 2014-03-11 14:28:30.000000000 +0100 ++++ src/input/input_v4l.c 2014-04-11 23:22:34.926765238 +0200 @@ -47,7 +47,7 @@ */ #define _LINUX_TIME_H diff --git a/xine-lib.changes b/xine-lib.changes index c05e188..48b5f91 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,3 +1,65 @@ +------------------------------------------------------------------- +Fri Apr 11 00:00:00 UTC 2014 - Manfred.Tremmel@iiv.de + +- update to 1.2.5 + * Update german translation. + * Add bass downmix support to AC3 decoder. + * Add experimental YCgCo colorspace support. + * Add avformat demux plugin. + - Support for new formats and protocols. + - Proper rtsp support (with avformat+rtsp://, rtsp+tcp:// and rtsp+http:// mrls). + - by default native xine demux plugins are probed first. + This can be overridden in config, by selecting demuxer in mrl (#demux:avformat), + or by using "avformat+" mrl prefix. + * Add avio (libavformat) input plugin: + - Support for new protocols (https://, ftp://, sftp://, ...). + - Support for seekable http streams (with "avio+http://" mrl). + - By default native xine input plugins are used. This can be overridden in config or by using "avio+" mrl prefix. + * Recognise & use HEVC/H.265. (ffmpeg) + * Add support for HEVC/H.265 to the mpeg-ts demuxer. + * Add support for HEVC/H.265 and VP9 to the matroska demuxer. + * Add VP8/VP9 decoder using libvpx. + * Modernise Quicktime demuxer: + - Multiple user selectable audio traks. + - Support AC3, EAC3, vorbis, Purevoice audio. + - Support ISO fragment media files. + - More safety on broken files. + - Slightly faster. + * Recognise & use ADPCM G.726 and ATRAC3. (ffmpeg/libva) + * Build fixes. + * Fix HDMV subtitle channel. + * FFmpeg compatibility fixes. + * Some colour format conversion fixes. + * Fix RealVideo re-ordered PTS: pass through, let the decoder re-order it. + * Fix some problems with COOK audio. +- from 1.2.4 + * Some VAAPI plugin fixes (build, image size changes). + * ffmpeg multi-channel playback fixes: + - Handle channel configuration changes sooner. + - Generic layout if none provided; follow user changes. + - Defer opening output if nothing to play. + - Don't re-open with identical settings. + - Don't use the bits-per-sample value (may not match decoder output). + * ffmpeg video fixes: + - Default to square pixels, avoiding black bars & unnecessary scaling. + - Avoid CODEC_FLAG_EMU_EDGE (and some possible segfaults). + - Use MPEG2VIDEO. + * OpenGL2 output: don't render into invalid drawable. + * Fix a possible xine_play() hang related to display locking. + * FLV demuxer rewrite: + - Improved metadata parsing. + - PTS/DTS fixes. + - Large file support on 32-bit. + - Much improved seeking. + - Much optimisation. + - More codecs supported. + * audio_out speed control fixes. + * Optimised RGB→YUY2 conversion. + * Avoid a possible performance penalty where AVX-optimised memcpy is used. + * Add BD-J (BluRay Java) support with ARGB overlay capable video drivers (opengl2, vaapi, vdpau) + * Add support for theora 4:2:2 and 4:4:4 pixel formats + + ------------------------------------------------------------------- Wed Sep 11 13:19:26 UTC 2013 - pgajdos@suse.com diff --git a/xine-lib.spec b/xine-lib.spec index 324a8cf..65df5e3 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -1,7 +1,7 @@ # # spec file for package xine-lib # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -107,9 +107,9 @@ BuildRequires: DirectFB %if %{with modplug} BuildRequires: libmodplug-devel %endif -Version: 1.2.3 +Version: 1.2.5 Release: 0 -%define abiversion 2.3 +%define abiversion 2.4 Summary: Video Player with Plug-Ins License: GPL-2.0+ and SUSE-Public-Domain Group: Productivity/Multimedia/Video/Players @@ -130,7 +130,6 @@ Patch2: xine-lib-without-ffmpeg.patch Patch3: fix-non-x86-build.diff # Add theora FOURCC to libxine I found an avi container that xine wouldn't play. Patch4: xine-lib-theora.patch -Patch5: xine-lib-missing-include-1.2.3.patch %description

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

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

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

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

@@ -509,7 +508,6 @@ EOF %patch3 %endif %patch4 -%patch5 -p1 rm -f m4/libtool15.m4 sed -i -e 's|/tmp/vdr-xine|/var/lib/vdr-xine|g' src/vdr/input_vdr.c