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

[Eric Bélanger]

    Date: Sunday, January 11, 2009 @ 18:51:11
  Author: eric
Revision: 24033

upgpkg: xine-lib 1.1.16-1
    Upstream update, built against ffmpeg 20081220, removed old patches

Modified:
  xine-lib/trunk/ChangeLog
  xine-lib/trunk/PKGBUILD
Deleted:
  xine-lib/trunk/xine-header.patch
  xine-lib/trunk/xine-imagemagick.patch

------------------------+
 ChangeLog              |    5 +++++
 PKGBUILD               |   19 ++++++-------------
 xine-header.patch      |   11 -----------
 xine-imagemagick.patch |   11 -----------
 4 files changed, 11 insertions(+), 35 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-01-11 23:42:38 UTC (rev 24032)
+++ ChangeLog	2009-01-11 23:51:11 UTC (rev 24033)
@@ -1,3 +1,8 @@
+2009-01-10  Eric Belanger  <eric at archlinux.org>
+
+	* xine-lib 1.1.16-1
+        * Upstream update
+
 2008-12-05  Eric Belanger  <eric at archlinux.org>
 
 	* xine-lib 1.1.15-4

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-01-11 23:42:38 UTC (rev 24032)
+++ PKGBUILD	2009-01-11 23:51:11 UTC (rev 24033)
@@ -3,32 +3,25 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=xine-lib
-pkgver=1.1.15
-pkgrel=4
+pkgver=1.1.16
+pkgrel=1
 pkgdesc="A free video player for Unix"
 arch=('i686' 'x86_64')
 url="http://xinehq.de/"
 license=('LGPL' 'GPL')
 depends=('libgl' 'libxvmc' 'esound' 'flac>=1.1.4' 'libvorbis' 'sdl' 'libmng' 'libtheora'
-         'libxcb' 'wavpack' 'ffmpeg>=20080715' 'heimdal>=1.2.1')
+         'libxcb' 'wavpack' 'ffmpeg>=20081220' 'heimdal>=1.2.1')
 makedepends=('pkgconfig' 'libtool' 'imagemagick' 'smbclient' 'mesa' 'alsa-lib' 
              'vcdimager' 'jack-audio-connection-kit')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.bz2
-        xine-lib-1.1.1-configure-no-mcpu-march.patch xine-header.patch xine-imagemagick.patch)
-md5sums=('42a2b4893b7f892eb334de2fc36d49c8' '9776df4eb54d2f1f68d8268adbc3b5c2'\
-         'b139ee72700f8d118f9051e9140473f5' '45d248d45b747f049129925cbf25716d')
-sha1sums=('bcb567ea2a11c5f26b2384d5400b8466ea9048c6'
-          '121a8358d7919b2e51067412373f52848290338a'
-          '30cd75db3f0c0002f467d85466f1c404452397df'
-          'f0a0c04d5dfa3d0cd9246a1310f628deff489c12')
+        xine-lib-1.1.1-configure-no-mcpu-march.patch)
+md5sums=('acd1a210c5a6444e8fd44696469352bb' '9776df4eb54d2f1f68d8268adbc3b5c2')
+sha1sums=('b7a8d159ac81befe2a2cc0df20a4c0a00cef4ad7' '121a8358d7919b2e51067412373f52848290338a')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-
   patch -p0 < ../xine-lib-1.1.1-configure-no-mcpu-march.patch || return 1
-  patch -p0 <../xine-header.patch || return 1
-  #patch -p1 <../xine-imagemagick.patch || return 1
 
   libtoolize --force --copy || return 1
   aclocal -I m4 || return 1

Deleted: xine-header.patch
===================================================================
--- xine-header.patch	2009-01-11 23:42:38 UTC (rev 24032)
+++ xine-header.patch	2009-01-11 23:51:11 UTC (rev 24033)
@@ -1,11 +0,0 @@
---- src/xine-engine/buffer.h	2008-07-16 23:01:56.000000000 +0200
-+++ src/xine-engine/buffer.h	2008-08-24 21:14:39.000000000 +0200
-@@ -676,7 +676,7 @@
- /* convert xine_waveformatex struct from little endian */
- void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED;
- 
--static inline _x_is_fourcc(void *ptr, void *tag) {
-+static __inline _x_is_fourcc(void *ptr, void *tag) {
-   return memcmp(ptr, tag, 4) == 0;
- }
- 

Deleted: xine-imagemagick.patch
===================================================================
--- xine-imagemagick.patch	2009-01-11 23:42:38 UTC (rev 24032)
+++ xine-imagemagick.patch	2009-01-11 23:51:11 UTC (rev 24033)
@@ -1,11 +0,0 @@
---- xine-lib-1.1.15.orig/src/libxinevdec/image.c
-+++ xine-lib-1.1.15/src/libxinevdec/image.c
-@@ -110,7 +110,7 @@
-     width = MagickGetImageWidth(wand) & ~1; /* must be even for init_yuv_planes */
-     height = MagickGetImageHeight(wand);
-     img_buf = malloc(width * height * 3);
--    MagickGetImagePixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf);
-+    MagickGetAuthenticPixels(wand, 0, 0, width, height, "RGB", CharPixel, img_buf);
-     DestroyMagickWand(wand);
- 
-     _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, width);