diff options
Diffstat (limited to 'abs/extra-testing/xine-lib')
| -rw-r--r-- | abs/extra-testing/xine-lib/ChangeLog | 12 | ||||
| -rw-r--r-- | abs/extra-testing/xine-lib/PKGBUILD | 34 | ||||
| -rw-r--r-- | abs/extra-testing/xine-lib/xine-imagemagick.patch | 11 |
3 files changed, 44 insertions, 13 deletions
diff --git a/abs/extra-testing/xine-lib/ChangeLog b/abs/extra-testing/xine-lib/ChangeLog index 57c843e..4b27a0a 100644 --- a/abs/extra-testing/xine-lib/ChangeLog +++ b/abs/extra-testing/xine-lib/ChangeLog @@ -1,3 +1,15 @@ +2008-12-05 Eric Belanger <eric@archlinux.org> + + * xine-lib 1.1.15-4 + * Rebuilt against heimdal 1.2.1 + * Added xcb support + +2008-11-27 Eric Belanger <eric@archlinux.org> + + * xine-lib 1.1.15-3 + * Added jack support (close FS#12020) + * Fixed several build issue (close FS#12117) + 2008-08-14 Eric Belanger <eric@archlinux.org> * xine-lib 1.1.15-1 diff --git a/abs/extra-testing/xine-lib/PKGBUILD b/abs/extra-testing/xine-lib/PKGBUILD index de79173..2988b74 100644 --- a/abs/extra-testing/xine-lib/PKGBUILD +++ b/abs/extra-testing/xine-lib/PKGBUILD @@ -1,36 +1,44 @@ -# $Id: PKGBUILD 10479 2008-08-29 07:46:38Z pierre $ +# $Id: PKGBUILD 20666 2008-12-06 08:58:36Z allan $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=xine-lib pkgver=1.1.15 -pkgrel=2 +pkgrel=4 pkgdesc="A free video player for Unix" arch=('i686' 'x86_64') url="http://xinehq.de/" license=('LGPL' 'GPL') -depends=('libgl' 'libxvmc' 'flac>=1.1.4' 'libvorbis' 'sdl' 'libmng' 'libtheora' - 'libxcb' 'wavpack' 'ffmpeg>=20080715') -makedepends=('pkgconfig' 'libtool' 'automake' 'autoconf' 'imagemagick' - 'smbclient' 'mesa' 'alsa-lib' ) +depends=('libgl' 'libxvmc' 'esound' 'flac>=1.1.4' 'libvorbis' 'sdl' 'libmng' 'libtheora' + 'libxcb' 'wavpack' 'ffmpeg>=20080715' '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) -md5sums=('42a2b4893b7f892eb334de2fc36d49c8' '9776df4eb54d2f1f68d8268adbc3b5c2' - 'b139ee72700f8d118f9051e9140473f5') + 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') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np0 -i ../xine-lib-1.1.1-configure-no-mcpu-march.patch || return 1 - patch -p0 -i ../xine-header.patch || return 1 + + 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 autoconf || return 1 automake --add-missing || return 1 ./configure --prefix=/usr --with-w32-path=/usr/lib/codecs \ - --with-xv-path=/usr/lib --with-libflac --with-wavpack \ - --without-arts --without-jack --without-speex \ + --with-xv-path=/usr/lib --with-xxmc-path=/usr/lib --with-xvmc-path=/usr/lib \ + --with-libflac --with-wavpack --with-xcb \ + --without-arts --with-jack --without-speex \ --disable-gnomevfs --without-pulseaudio --disable-aalib \ --disable-modplug --with-external-ffmpeg || return 1 make || return 1 diff --git a/abs/extra-testing/xine-lib/xine-imagemagick.patch b/abs/extra-testing/xine-lib/xine-imagemagick.patch new file mode 100644 index 0000000..9faa4ab --- /dev/null +++ b/abs/extra-testing/xine-lib/xine-imagemagick.patch @@ -0,0 +1,11 @@ +--- 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); |