[arch-commits] Commit in xine-lib/repos (8 files)
Eric Bélanger
eric at archlinux.org
Mon Sep 12 01:59:42 UTC 2011
Date: Sunday, September 11, 2011 @ 21:59:41
Author: eric
Revision: 137840
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
xine-lib/repos/staging-i686/
xine-lib/repos/staging-i686/PKGBUILD
(from rev 137839, xine-lib/trunk/PKGBUILD)
xine-lib/repos/staging-i686/xine-lib-1.1.1-configure-no-mcpu-march.patch
(from rev 137839, xine-lib/trunk/xine-lib-1.1.1-configure-no-mcpu-march.patch)
xine-lib/repos/staging-i686/xine-lib-1.1.19-xvmc.patch
(from rev 137839, xine-lib/trunk/xine-lib-1.1.19-xvmc.patch)
xine-lib/repos/staging-x86_64/
xine-lib/repos/staging-x86_64/PKGBUILD
(from rev 137839, xine-lib/trunk/PKGBUILD)
xine-lib/repos/staging-x86_64/xine-lib-1.1.1-configure-no-mcpu-march.patch
(from rev 137839, xine-lib/trunk/xine-lib-1.1.1-configure-no-mcpu-march.patch)
xine-lib/repos/staging-x86_64/xine-lib-1.1.19-xvmc.patch
(from rev 137839, xine-lib/trunk/xine-lib-1.1.19-xvmc.patch)
-------------------------------------------------------------+
staging-i686/PKGBUILD | 56 ++++++++++
staging-i686/xine-lib-1.1.1-configure-no-mcpu-march.patch | 13 ++
staging-i686/xine-lib-1.1.19-xvmc.patch | 17 +++
staging-x86_64/PKGBUILD | 56 ++++++++++
staging-x86_64/xine-lib-1.1.1-configure-no-mcpu-march.patch | 13 ++
staging-x86_64/xine-lib-1.1.19-xvmc.patch | 17 +++
6 files changed, 172 insertions(+)
Copied: xine-lib/repos/staging-i686/PKGBUILD (from rev 137839, xine-lib/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2011-09-12 01:59:41 UTC (rev 137840)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=xine-lib
+pkgver=1.1.19
+pkgrel=5
+pkgdesc="A multimedia playback engine"
+arch=('i686' 'x86_64')
+url="http://www.xine-project.org"
+license=('LGPL' 'GPL')
+depends=('libgl' 'libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug')
+makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa'
+ 'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex' 'aalib')
+optdepends=('imagemagick: for using the imagemagick plugin' \
+ 'smbclient: for using the smb plugin' \
+ 'jack: for using the jack plugin' \
+ 'vcdimager: for using the vcd plugin' \
+ 'gdk-pixbuf2: for using the gdk-pixbuf plugin' \
+ 'mesa: for using the opengl plugin' \
+ 'libpulse: for using the pulseaudio plugin' \
+ 'speex: for using the speex plugin' \
+ 'v4l-utils: for using the v4l plugin' \
+ 'wavpack: for using the wavpack plugin' \
+ 'faad2: for using the faad plugin' \
+ 'libmng: for using the mng plugin' \
+ 'aalib: for using the aalib plugin')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.bz2
+ 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
+ sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
+ configure.ac src/input/input_v4l.c src/video_out/video_out_syncfb.h
+
+ libtoolize --force --copy
+ aclocal -I m4
+ autoconf
+ automake --add-missing
+
+ ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: xine-lib/repos/staging-i686/xine-lib-1.1.1-configure-no-mcpu-march.patch (from rev 137839, xine-lib/trunk/xine-lib-1.1.1-configure-no-mcpu-march.patch)
===================================================================
--- staging-i686/xine-lib-1.1.1-configure-no-mcpu-march.patch (rev 0)
+++ staging-i686/xine-lib-1.1.1-configure-no-mcpu-march.patch 2011-09-12 01:59:41 UTC (rev 137840)
@@ -0,0 +1,13 @@
+--- m4/optimizations.m4.orig 2005-11-27 01:20:08.000000000 +0100
++++ m4/optimizations.m4 2005-11-27 01:22:56.000000000 +0100
+@@ -161,10 +161,6 @@
+ ;;
+
+ esac
+- if test x"$archopt_val" != x; then
+- CFLAGS="$sarchopt=$archopt_val $CFLAGS"
+- DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
+- fi
+ fi
+ else
+ dnl we have the Intel compiler
Copied: xine-lib/repos/staging-i686/xine-lib-1.1.19-xvmc.patch (from rev 137839, xine-lib/trunk/xine-lib-1.1.19-xvmc.patch)
===================================================================
--- staging-i686/xine-lib-1.1.19-xvmc.patch (rev 0)
+++ staging-i686/xine-lib-1.1.19-xvmc.patch 2011-09-12 01:59:41 UTC (rev 137840)
@@ -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
+
Copied: xine-lib/repos/staging-x86_64/PKGBUILD (from rev 137839, xine-lib/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-09-12 01:59:41 UTC (rev 137840)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=xine-lib
+pkgver=1.1.19
+pkgrel=5
+pkgdesc="A multimedia playback engine"
+arch=('i686' 'x86_64')
+url="http://www.xine-project.org"
+license=('LGPL' 'GPL')
+depends=('libgl' 'libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug')
+makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa'
+ 'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex' 'aalib')
+optdepends=('imagemagick: for using the imagemagick plugin' \
+ 'smbclient: for using the smb plugin' \
+ 'jack: for using the jack plugin' \
+ 'vcdimager: for using the vcd plugin' \
+ 'gdk-pixbuf2: for using the gdk-pixbuf plugin' \
+ 'mesa: for using the opengl plugin' \
+ 'libpulse: for using the pulseaudio plugin' \
+ 'speex: for using the speex plugin' \
+ 'v4l-utils: for using the v4l plugin' \
+ 'wavpack: for using the wavpack plugin' \
+ 'faad2: for using the faad plugin' \
+ 'libmng: for using the mng plugin' \
+ 'aalib: for using the aalib plugin')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.bz2
+ 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
+ sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \
+ configure.ac src/input/input_v4l.c src/video_out/video_out_syncfb.h
+
+ libtoolize --force --copy
+ aclocal -I m4
+ autoconf
+ automake --add-missing
+
+ ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: xine-lib/repos/staging-x86_64/xine-lib-1.1.1-configure-no-mcpu-march.patch (from rev 137839, xine-lib/trunk/xine-lib-1.1.1-configure-no-mcpu-march.patch)
===================================================================
--- staging-x86_64/xine-lib-1.1.1-configure-no-mcpu-march.patch (rev 0)
+++ staging-x86_64/xine-lib-1.1.1-configure-no-mcpu-march.patch 2011-09-12 01:59:41 UTC (rev 137840)
@@ -0,0 +1,13 @@
+--- m4/optimizations.m4.orig 2005-11-27 01:20:08.000000000 +0100
++++ m4/optimizations.m4 2005-11-27 01:22:56.000000000 +0100
+@@ -161,10 +161,6 @@
+ ;;
+
+ esac
+- if test x"$archopt_val" != x; then
+- CFLAGS="$sarchopt=$archopt_val $CFLAGS"
+- DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
+- fi
+ fi
+ else
+ dnl we have the Intel compiler
Copied: xine-lib/repos/staging-x86_64/xine-lib-1.1.19-xvmc.patch (from rev 137839, xine-lib/trunk/xine-lib-1.1.19-xvmc.patch)
===================================================================
--- staging-x86_64/xine-lib-1.1.19-xvmc.patch (rev 0)
+++ staging-x86_64/xine-lib-1.1.19-xvmc.patch 2011-09-12 01:59:41 UTC (rev 137840)
@@ -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
+
More information about the arch-commits
mailing list