[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/files/

[David Seifert]

commit:     5a3ad9fcbeb0dce99007ae0a887190a59dc76fe9
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Dec 30 14:24:03 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 10:13:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a3ad9fc

media-libs/xine-lib: remove unused file

Closes: https://github.com/gentoo/gentoo/pull/3286

 media-libs/xine-lib/files/accel_vaapi.h | 135 --------------------------------
 1 file changed, 135 deletions(-)

diff --git a/media-libs/xine-lib/files/accel_vaapi.h b/media-libs/xine-lib/files/accel_vaapi.h
deleted file mode 100644
index 666b23f..00000000
--- a/media-libs/xine-lib/files/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 <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
-

[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/files/

[Tony Vroon]

commit:     1688ed671ae14234075f79fce6428d141c31ba7b
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jul  8 08:10:57 2018 +0000
Commit:     Tony Vroon <chainsaw <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 11:38:21 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1688ed67

media-libs/xine-lib: remove unused patches

 media-libs/xine-lib/files/ffmpeg29.patch           | 44 ----------------------
 .../files/xine-lib-1.2.6-libxcb-1.12.patch         | 25 ------------
 .../xine-lib/files/xine-lib-1.2.6-sysmacros.patch  | 15 --------
 3 files changed, 84 deletions(-)

diff --git a/media-libs/xine-lib/files/ffmpeg29.patch b/media-libs/xine-lib/files/ffmpeg29.patch
deleted file mode 100644
index a220483218c..00000000000
--- a/media-libs/xine-lib/files/ffmpeg29.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c
-===================================================================
---- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_audio_decoder.c
-+++ xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c
-@@ -590,7 +590,7 @@ static int ff_audio_decode (ff_audio_dec
-   int got_frame;
-   float gain = this->class->gain;
-   if (!this->av_frame)
--    this->av_frame = avcodec_alloc_frame ();
-+    this->av_frame = av_frame_alloc ();
- 
-   consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt);
-   if ((consumed >= 0) && got_frame) {
-@@ -1071,7 +1071,7 @@ static void ff_audio_reset (audio_decode
-   /* try to reset the wma decoder */
-   if( this->decoder_ok ) {
- #if AVAUDIO > 3
--    avcodec_free_frame (&this->av_frame);
-+    av_frame_free (&this->av_frame);
- #endif
-     pthread_mutex_lock (&ffmpeg_lock);
-     avcodec_close (this->context);
-@@ -1105,7 +1105,7 @@ static void ff_audio_dispose (audio_deco
- 
-   if( this->context && this->decoder_ok ) {
- #if AVAUDIO > 3
--    avcodec_free_frame (&this->av_frame);
-+    av_frame_free (&this->av_frame);
- #endif
-     pthread_mutex_lock (&ffmpeg_lock);
-     avcodec_close (this->context);
-Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c
-===================================================================
---- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_video_decoder.c
-+++ xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c
-@@ -2523,7 +2523,7 @@ static video_decoder_t *ff_video_open_pl
-   this->stream                            = stream;
-   this->class                             = (ff_video_class_t *) class_gen;
- 
--  this->av_frame          = avcodec_alloc_frame();
-+  this->av_frame          = av_frame_alloc();
-   this->context           = avcodec_alloc_context();
-   this->context->opaque   = this;
- #if AVPALETTE == 1

diff --git a/media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch b/media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch
deleted file mode 100644
index cc17643d9c5..00000000000
--- a/media-libs/xine-lib/files/xine-lib-1.2.6-libxcb-1.12.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.xine-project.org/show_bug.cgi?id=572
-https://bugs.gentoo.org/584640
-
---- xine-lib-1.2.6/m4/video_out.m4
-+++ xine-lib-1.2.6/m4/video_out.m4
-@@ -305,7 +305,7 @@
-     dnl xcb
-     XINE_ARG_WITH([xcb], [Enable support for XCB video out plugins])
-     if test x"$with_xcb" != x"no"; then
--        PKG_CHECK_MODULES([XCB], [xcb-shape >= 1.0], [have_xcb=yes], [have_xcb=no])
-+        PKG_CHECK_MODULES([XCB], [xcb xcb-shape >= 1.0], [have_xcb=yes], [have_xcb=no])
-         if test x"$hard_enable_xcb" = x"yes" && test x"$have_xcb" != x"yes"; then
-             AC_MSG_ERROR([XCB support requested, but XCB not found])
-         elif test x"$have_xcb" = x"yes"; then
---- xine-lib-1.2.6/src/video_out/Makefile.am
-+++ xine-lib-1.2.6/src/video_out/Makefile.am
-@@ -147,7 +147,7 @@
- xineplug_vo_out_xcbshm_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBSHM_CFLAGS) $(AVUTIL_CFLAGS)
- 
- xineplug_vo_out_xcbxv_la_SOURCES = video_out_xcbxv.c $(XCBOSD)
--xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS) $(XCB_LIBS)
-+xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS) $(XCBSHM_LIBS) $(XCB_LIBS)
- xineplug_vo_out_xcbxv_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBXV_CFLAGS)
- 
- xineplug_vo_out_xshm_la_SOURCES = video_out_xshm.c $(X11OSD)

diff --git a/media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch b/media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch
deleted file mode 100644
index a7168d5b450..00000000000
--- a/media-libs/xine-lib/files/xine-lib-1.2.6-sysmacros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fix build w/newer glibc due to major/minor includes being dropped from sys/types.h
-
-https://bugs.gentoo.org/580012
-https://bugs.xine-project.org/show_bug.cgi?id=574
-
---- a/src/xine-utils/xine_check.c
-+++ b/src/xine-utils/xine_check.c
-@@ -55,6 +55,7 @@
- #include <dlfcn.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-+#include <sys/sysmacros.h>
- #include <sys/utsname.h>
- #include <linux/major.h>
- #include <linux/hdreg.h>