From 820e907b9b1b49463fba79ded99f6fee1c179613 Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Mon, 2 Dec 2013 22:33:53 +1100 Subject: [PATCH] xine-lib: 1.2.3 -> 1.2.4. Removed dependency libfame --- xine-lib/.footprint | 6 +- xine-lib/.md5sum | 3 +- xine-lib/Pkgfile | 9 +-- xine-lib/accel_vaapi.h | 135 ----------------------------------------- 4 files changed, 7 insertions(+), 146 deletions(-) delete mode 100644 xine-lib/accel_vaapi.h diff --git a/xine-lib/.footprint b/xine-lib/.footprint index 4881dde23..bb12cc8f7 100644 --- a/xine-lib/.footprint +++ b/xine-lib/.footprint @@ -48,9 +48,9 @@ drwxr-xr-x root/root usr/include/xine/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libxine-interface.la -rwxr-xr-x root/root usr/lib/libxine.la -lrwxrwxrwx root/root usr/lib/libxine.so -> libxine.so.2.3.0 -lrwxrwxrwx root/root usr/lib/libxine.so.2 -> libxine.so.2.3.0 --rw-r--r-- root/root usr/lib/libxine.so.2.3.0 +lrwxrwxrwx root/root usr/lib/libxine.so -> libxine.so.2.3.1 +lrwxrwxrwx root/root usr/lib/libxine.so.2 -> libxine.so.2.3.1 +-rw-r--r-- root/root usr/lib/libxine.so.2.3.1 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libxine.pc drwxr-xr-x root/root usr/lib/xine/ diff --git a/xine-lib/.md5sum b/xine-lib/.md5sum index a3b9f64dd..432953410 100644 --- a/xine-lib/.md5sum +++ b/xine-lib/.md5sum @@ -1,2 +1 @@ -eba8ea7de59c0d5a25e475bbd129341d accel_vaapi.h -011def012e9db3dee06808b4580ccede xine-lib-1.2.3.tar.xz +d59f737097848d4c2586b61b49b0fe2a xine-lib-1.2.4.tar.xz diff --git a/xine-lib/Pkgfile b/xine-lib/Pkgfile index d6c95faf9..ba8323c71 100644 --- a/xine-lib/Pkgfile +++ b/xine-lib/Pkgfile @@ -2,19 +2,16 @@ # URL: http://xine.sourceforge.net # Maintainer: Danny Rawlins, monster dot romster at gmail dot com # Packager: sten, nick dot steeves at shaw dot ca -# Depends on: ffmpeg gtk libmad libmng libmpcdec vcdimager wavpack xorg-libxi xorg-libxvmc xorg-xvinfo libdvdnav libmodplug libvdpau liba52 libbluray libfame libdca glu flac +# Depends on: ffmpeg gtk libmad libmng libmpcdec vcdimager wavpack xorg-libxi xorg-libxvmc xorg-xvinfo libdvdnav libmodplug libvdpau liba52 libbluray libdca glu flac name=xine-lib -version=1.2.3 +version=1.2.4 release=1 -source=(http://downloads.sourceforge.net/project/xine/$name/$version/$name-$version.tar.xz - accel_vaapi.h) +source=(http://downloads.sourceforge.net/project/xine/$name/$version/$name-$version.tar.xz) build() { cd $name-$version - cp $SRC/accel_vaapi.h src/xine-engine/ - ./configure \ CFLAGS='' \ CXXFLAGS='' \ diff --git a/xine-lib/accel_vaapi.h b/xine-lib/accel_vaapi.h deleted file mode 100644 index 666b23fd6..000000000 --- a/xine-lib/accel_vaapi.h +++ /dev/null @@ -1,135 +0,0 @@ -/* - * 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 -