[arch-commits] Commit in xine-lib/trunk (PKGBUILD accel_vaapi.h)
Eric Bélanger
eric at nymeria.archlinux.org
Tue Sep 24 20:08:30 UTC 2013
Date: Tuesday, September 24, 2013 @ 22:08:30
Author: eric
Revision: 195055
upgpkg: xine-lib 1.2.4-1
Upstream update, Add smbclient optdepends, Remove old patch
Modified:
xine-lib/trunk/PKGBUILD
Deleted:
xine-lib/trunk/accel_vaapi.h
---------------+
PKGBUILD | 16 ++----
accel_vaapi.h | 135 --------------------------------------------------------
2 files changed, 6 insertions(+), 145 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-09-24 19:27:44 UTC (rev 195054)
+++ PKGBUILD 2013-09-24 20:08:30 UTC (rev 195055)
@@ -2,8 +2,8 @@
# Maintainer: Eric Bélanger <eric at archlinux.org>
pkgname=xine-lib
-pkgver=1.2.3
-pkgrel=4
+pkgver=1.2.4
+pkgrel=1
pkgdesc="A multimedia playback engine"
arch=('i686' 'x86_64')
url="http://www.xine-project.org"
@@ -28,16 +28,12 @@
'libcaca: for using the caca plugin' \
'libbluray: for using the bluray plugin' \
'gnome-vfs: for using the gnome-vfs plugin' \
- 'libvdpau: for using the VDPAU plugin')
+ 'libvdpau: for using the VDPAU plugin' \
+ 'smbclient: for using the samba plugin')
options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz accel_vaapi.h)
-sha1sums=('6f9ef4ba75688659052d21448d46527db2b77e57'
- '08ed9947ef919c71c87151baa8fc0ce7d8f72050')
+source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz)
+sha1sums=('32267c5fcaa1439a5fbf7606d27dc4fafba9e504')
-prepare() {
- cp accel_vaapi.h ${pkgname}-${pkgver}/src/xine-engine/
-}
-
build() {
cd ${pkgname}-${pkgver}
./configure --prefix=/usr --with-wavpack --enable-vdpau --disable-optimizations
Deleted: accel_vaapi.h
===================================================================
--- accel_vaapi.h 2013-09-24 19:27:44 UTC (rev 195054)
+++ accel_vaapi.h 2013-09-24 20:08:30 UTC (rev 195055)
@@ -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 <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
-
More information about the arch-commits
mailing list