Hello community, here is the log from the commit of package xine-lib for openSUSE:Factory checked in at 2013-06-06 15:06:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xine-lib (Old) and /work/SRC/openSUSE:Factory/.xine-lib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xine-lib" Changes: -------- --- /work/SRC/openSUSE:Factory/xine-lib/xine-lib.changes 2013-03-10 09:52:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xine-lib.new/xine-lib.changes 2013-06-06 15:06:57.000000000 +0200 @@ -1,0 +2,16 @@ +Wed May 29 22:36:00 UTC 2013 - [email protected] + +- update to 1.2.3 + * Add VAAPI HW decoding support + * Add OpenGL 2.0 output plugin + * Add crop support to XShm output plugins + * Add color matrix and full range support to OpenGL/Xv/XShm output plugins + * Add test image generator input plugin + * Add fast libjpeg based JPEG decoder + * Add max. Xv image size detection to Xv video output plugin + * Fix crash when trying to display too large jpeg image with Xv output plugin + * Fix possible crash when stopping playback with deinterlacing enabled + * Support large PAT in MPEG TS + * Handle EAC3 audio (via ffmpeg) + +------------------------------------------------------------------- Old: ---- xine-lib-1.2.2-crippled.tar.bz2 xine-lib-1.2.2.tar.bz2 New: ---- xine-lib-1.2.3-crippled.tar.bz2 xine-lib-1.2.3.tar.bz2 xine-lib-missing-include-1.2.3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xine-lib.spec ++++++ --- /var/tmp/diff_new_pack.zxUm35/_old 2013-06-06 15:06:59.000000000 +0200 +++ /var/tmp/diff_new_pack.zxUm35/_new 2013-06-06 15:06:59.000000000 +0200 @@ -107,9 +107,9 @@ %if %{with modplug} BuildRequires: libmodplug-devel %endif -Version: 1.2.2 +Version: 1.2.3 Release: 0 -%define abiversion 2.2 +%define abiversion 2.3 Summary: Video Player with Plug-Ins License: GPL-2.0+ and SUSE-Public-Domain Group: Productivity/Multimedia/Video/Players @@ -130,6 +130,7 @@ 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 <p>Great video and multimediaplayer, supports DVD, MPEG, AVI, DivX, VCD, Quicktime ...</p><p>You need a frontend for xine-lib like <a href=http://packman.links2linux.de/package/xine-ui>xine-ui</a>, <a href=http://packman.links2linux.de/package/gxine>gxine</a>, <a href=http://packman.links2linux.de/package/kaffeine>kaffeine</a> or <a href=http://packman.links2linux.de/package/totem>totem</a>.</p><p>Since 1-rc6 the package number is reduced, all you may miss, is in the base package</p><p>If you want to play css encrypted Video-DVD's, you need to install <a href=http://packman.links2linux.de/package/libdvdcss2>libdvdcss</a>.</p> @@ -508,6 +509,7 @@ %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 @@ -592,6 +594,7 @@ xineplug_vo_out_fb xineplug_vo_out_none xineplug_vo_out_opengl +xineplug_vo_out_opengl2 xineplug_vo_out_xshm xineplug_vo_out_xv %if 0%{suse_version} > 1020 @@ -616,6 +619,7 @@ xineplug_inp_rtsp xineplug_inp_pvr xineplug_inp_rtp +xineplug_inp_test xineplug_decode_bitplane xineplug_decode_rgb xineplug_decode_yuv @@ -625,6 +629,7 @@ xineplug_decode_gdk_pixbuf xineplug_decode_spucmml xineplug_decode_spuhdmv +xineplug_decode_libjpeg # requires ImageMagick xineplug_decode_image xineplug_dmx_yuv_frames @@ -742,6 +747,7 @@ xineplug_decode_vdpau_mpeg12 xineplug_decode_vdpau_mpeg4 xineplug_decode_vdpau_vc1 +xineplug_vo_out_vaapi # unfortunately using external ffmpeg links the planar post # processing plugin against ffmpeg libs post/xineplug_post_planar ++++++ xine-lib-1.2.2-crippled.tar.bz2 -> xine-lib-1.2.3-crippled.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/xine-lib/xine-lib-1.2.2-crippled.tar.bz2 /work/SRC/openSUSE:Factory/.xine-lib.new/xine-lib-1.2.3-crippled.tar.bz2 differ: char 11, line 1 ++++++ xine-lib-1.2.2-crippled.tar.bz2 -> xine-lib-1.2.3.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/xine-lib/xine-lib-1.2.2-crippled.tar.bz2 /work/SRC/openSUSE:Factory/.xine-lib.new/xine-lib-1.2.3.tar.bz2 differ: char 11, line 1 ++++++ xine-lib-missing-include-1.2.3.patch ++++++ 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 <va/va_x11.h> +#include <pthread.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <avcodec.h> +#else +# include <libavcodec/avcodec.h> +#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 + ++++++ xine-lib-v4l-2.6.38.patch ++++++ --- /var/tmp/diff_new_pack.zxUm35/_old 2013-06-06 15:06:59.000000000 +0200 +++ /var/tmp/diff_new_pack.zxUm35/_new 2013-06-06 15:06:59.000000000 +0200 @@ -1,6 +1,6 @@ ---- m4/input.m4 2010-03-21 00:29:58.000000000 +0100 -+++ m4/input.m4 2011-11-16 15:59:40.674878245 +0100 -@@ -92,7 +92,7 @@ +--- 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 @@ 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 2011-10-05 22:44:39.000000000 +0200 -+++ src/input/input_v4l.c 2011-11-16 15:35:43.075546420 +0100 +--- 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 @@ -47,7 +47,7 @@ */ #define _LINUX_TIME_H -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
