subject:"\[arch\-commits\] Commit in xine\-lib\/trunk \(3 files\)"

[arch-commits] Commit in xine-lib/trunk (3 files)

2017-02-24 Thread Antonio Rojas

Date: Friday, February 24, 2017 @ 18:37:07
  Author: arojas
Revision: 289485

Update to 1.2.8

Modified:
  xine-lib/trunk/PKGBUILD
Deleted:
  xine-lib/trunk/xine-lib-ffmpeg3.patch
  xine-lib/trunk/xine-lib-xcb-1.12.patch

-+
 PKGBUILD|   19 +++
 xine-lib-ffmpeg3.patch  |   55 --
 xine-lib-xcb-1.12.patch |   25 
 3 files changed, 4 insertions(+), 95 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-02-24 14:07:49 UTC (rev 289484)
+++ PKGBUILD2017-02-24 18:37:07 UTC (rev 289485)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger 
 
 pkgname=xine-lib
-pkgver=1.2.6
-pkgrel=13
+pkgver=1.2.8
+pkgrel=1
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64')
 url="http://www.xine-project.org;
@@ -31,20 +31,9 @@
 'libvdpau: for using the VDPAU plugin' \
 'smbclient: for using the samba plugin' \
 'gdk-pixbuf2: for using the gdk-pixbuf plugin')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz
 xine-lib-ffmpeg3.patch xine-lib-xcb-1.12.patch)
-sha1sums=('ac929eef2b7bf5c27699bbed612b953a01fccba5'
-  'b4466616bb17142aef8aa1bb80fff67cd2d0d15d'
-  '890c8f044c0080bfb7d4b163061dd42621fc4df1')
+source=(https://xine-lib.alioth.debian.org/releases/xine-lib-$pkgver.tar.xz)
+sha1sums=('f20115ddfced42d51feb159393607b17e6f2bdc1')
 
-prepare() {
-  cd $pkgname-$pkgver
-# Fix build with ffmpeg 3.0 (Gentoo)
-  patch -p1 -i ../xine-lib-ffmpeg3.patch
-# Fix build with xcb 1.12 (Gentoo)
-  patch -p1 -i ../xine-lib-xcb-1.12.patch
-  autoreconf -vi
-}
-
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --with-wavpack --enable-vdpau 
--with-external-dvdnav \

Deleted: xine-lib-ffmpeg3.patch
===
--- xine-lib-ffmpeg3.patch  2017-02-24 14:07:49 UTC (rev 289484)
+++ xine-lib-ffmpeg3.patch  2017-02-24 18:37:07 UTC (rev 289485)
@@ -1,55 +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, 
_frame, );
-   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 (>av_frame);
-+av_frame_free (>av_frame);
- #endif
- pthread_mutex_lock (_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 (>av_frame);
-+av_frame_free (>av_frame);
- #endif
- pthread_mutex_lock (_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
 xine-lib-1.2.6/src/dxr3/ffmpeg_encoder.c.orig  2016-02-17 
07:54:31.950881580 +
-+++ xine-lib-1.2.6/src/dxr3/ffmpeg_encoder.c   2016-02-17 07:55:42.897237494 
+
-@@ -161,7 +161,7 @@
-   "dxr3_mpeg_encoder: Couldn't start the ffmpeg library\n");
- return 0;
-   }
--  this->picture = avcodec_alloc_frame();
-+  this->picture = av_frame_alloc();
-   if (!this->picture) {
- xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
-   "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n");

Deleted: xine-lib-xcb-1.12.patch
===
--- xine-lib-xcb-1.12.patch 2017-02-24 14:07:49 UTC (rev 289484)
+++ xine-lib-xcb-1.12.patch 2017-02-24 18:37:07 UTC (rev 289485)
@@ -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

[arch-commits] Commit in xine-lib/trunk (3 files)

2013-05-29 Thread Eric Bélanger

Date: Thursday, May 30, 2013 @ 05:33:22
  Author: eric
Revision: 186597

upgpkg: xine-lib 1.2.3-1

Upstream update, Add missing header, Remove old patch

Added:
  xine-lib/trunk/accel_vaapi.h
Modified:
  xine-lib/trunk/PKGBUILD
Deleted:
  
xine-lib/trunk/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch

+
 PKGBUILD   |   24 
 accel_vaapi.h  |  135 

 xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch |  277 
--
 3 files changed, 146 insertions(+), 290 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-30 03:23:06 UTC (rev 186596)
+++ PKGBUILD2013-05-30 03:33:22 UTC (rev 186597)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger e...@archlinux.org
 
 pkgname=xine-lib
-pkgver=1.2.2
-pkgrel=8
+pkgver=1.2.3
+pkgrel=1
 pkgdesc=A multimedia playback engine
 arch=('i686' 'x86_64')
 url=http://www.xine-project.org;
@@ -30,23 +30,21 @@
 'gnome-vfs: for using the gnome-vfs plugin' \
 'libvdpau: for using the VDPAU plugin')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz
-xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch)
-sha1sums=('a349cbb0b72256bb262377796a022dcf63829b4c'
-  '45500eca2aa40c133e1a6e8b23dbadc4b921b11f')
+source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz
 accel_vaapi.h)
+sha1sums=('6f9ef4ba75688659052d21448d46527db2b77e57'
+  '08ed9947ef919c71c87151baa8fc0ce7d8f72050')
 
+prepare() {
+  cp accel_vaapi.h ${pkgname}-${pkgver}/src/xine-engine/
+}
+
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # Fix audio decoding with newest FFmpeg
-  # https://bugs.archlinux.org/task/33818
-  patch -Np1 -i 
$srcdir/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch
-
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --with-wavpack --enable-vdpau 
--disable-optimizations
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
 }

Added: accel_vaapi.h
===
--- accel_vaapi.h   (rev 0)
+++ accel_vaapi.h   2013-05-30 03:33:22 UTC (rev 186597)
@@ -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_FREE0
+#define SURFACE_ALOC1
+#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;
+  VAConfigIDva_config_id;
+  int   width;
+  int   height;
+  int   sw_width;
+  int   sw_height;
+  int   va_profile;
+  unsigned int  va_colorspace;
+  VAImage   va_subpic_image;
+  VASubpictureIDva_subpic_id;
+  int   va_subpic_width;
+  int   va_subpic_height;
+  int   is_bound;
+  void  *gl_surface;
+  unsigned int  soft_head;
+  unsigned int

[arch-commits] Commit in xine-lib/trunk (3 files)

2010-09-25 Thread Eric Bélanger

Date: Saturday, September 25, 2010 @ 17:56:25
  Author: eric
Revision: 91275

Added XvMC build patch (close FS#20944)

Added:
  xine-lib/trunk/xine-lib-1.1.19-xvmc.patch
Modified:
  xine-lib/trunk/ChangeLog
  xine-lib/trunk/PKGBUILD

+
 ChangeLog  |4 
 PKGBUILD   |9 ++---
 xine-lib-1.1.19-xvmc.patch |   17 +
 3 files changed, 27 insertions(+), 3 deletions(-)

Modified: ChangeLog
===
--- ChangeLog   2010-09-25 19:18:25 UTC (rev 91274)
+++ ChangeLog   2010-09-25 21:56:25 UTC (rev 91275)
@@ -1,3 +1,7 @@
+2010-09-25  Eric Belanger  e...@archlinux.org
+
+   * Added XvMC build patch (close FS#20944)
+
 2010-07-28  Eric Belanger  e...@archlinux.org
 
* xine-lib 1.1.19-1

Modified: PKGBUILD
===
--- PKGBUILD2010-09-25 19:18:25 UTC (rev 91274)
+++ PKGBUILD2010-09-25 21:56:25 UTC (rev 91275)
@@ -19,13 +19,16 @@
 options=('!libtool')
 changelog=ChangeLog
 
source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.bz2
-xine-lib-1.1.1-configure-no-mcpu-march.patch)
-md5sums=('a410a0f0617e1d6309f0cbe907f73f8a' '9776df4eb54d2f1f68d8268adbc3b5c2')
-sha1sums=('5afcc28c5cf2bdaab99d951960f6587797e1e5a0' 
'121a8358d7919b2e51067412373f52848290338a')
+xine-lib-1.1.1-configure-no-mcpu-march.patch 
xine-lib-1.1.19-xvmc.patch)
+md5sums=('a410a0f0617e1d6309f0cbe907f73f8a' '9776df4eb54d2f1f68d8268adbc3b5c2'\
+ '8662fb124870b1dd7effe4ff5e2a2e3d')
+sha1sums=('5afcc28c5cf2bdaab99d951960f6587797e1e5a0' 
'121a8358d7919b2e51067412373f52848290338a'\
+ '920bf27e6e3523dfe4cc9c802ff713e9688a3f34')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   patch -p0  ../xine-lib-1.1.1-configure-no-mcpu-march.patch
+  patch -p0  ../xine-lib-1.1.19-xvmc.patch
 
   libtoolize --force --copy
   aclocal -I m4

Added: xine-lib-1.1.19-xvmc.patch
===
--- xine-lib-1.1.19-xvmc.patch  (rev 0)
+++ xine-lib-1.1.19-xvmc.patch  2010-09-25 21:56:25 UTC (rev 91275)
@@ -0,0 +1,17 @@
+Quoting ChangeLog of X11's videoproto package:
+vldXvMC.h: stop uselessly including XvMClib.h
+
+--- src/video_out/xxmc.h
 src/video_out/xxmc.h
+@@ -77,10 +77,10 @@
+ #include X11/extensions/XShm.h
+ #include X11/extensions/Xv.h
+ #include X11/extensions/Xvlib.h
++#include X11/extensions/XvMClib.h
+ #ifdef HAVE_VLDXVMC
+   #include X11/extensions/vldXvMC.h
+ #else
+-  #include X11/extensions/XvMClib.h
+   #include X11/extensions/XvMC.h
+ #endif
+

[arch-commits] Commit in xine-lib/trunk (3 files)

[arch-commits] Commit in xine-lib/trunk (3 files)

[arch-commits] Commit in xine-lib/trunk (3 files)

3 matches

Site Navigation

Mail list logo

Footer information