diff options
| author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-01-16 15:53:37 -0200 |
|---|---|---|
| committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-01-16 15:53:37 -0200 |
| commit | 01f906403504ea1a61cc42b6bf4d795571dda0f8 (patch) | |
| tree | f8a36d9a74319f649b523e725ce3e28dc60fe9b4 /libre/mplayer-vaapi-libre | |
| parent | 3bc297c183d57d430434c200d8323fc4b8f9938d (diff) | |
| download | abslibre-01f906403504ea1a61cc42b6bf4d795571dda0f8.tar.gz abslibre-01f906403504ea1a61cc42b6bf4d795571dda0f8.tar.bz2 abslibre-01f906403504ea1a61cc42b6bf4d795571dda0f8.zip | |
mplayer{-vaapi,}-libre: changing libcdio to libcdio-paranoia
Diffstat (limited to 'libre/mplayer-vaapi-libre')
| -rw-r--r-- | libre/mplayer-vaapi-libre/PKGBUILD | 12 | ||||
| -rw-r--r-- | libre/mplayer-vaapi-libre/cdio-includes.patch | 43 |
2 files changed, 51 insertions, 4 deletions
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index c5b33cf75..f1042a9b1 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -4,17 +4,18 @@ # Contributor: Hugo Doria <hugo@archlinux.org> # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> pkgname=mplayer-vaapi-libre pkgver=35107 -pkgrel=3.1 +pkgrel=4 pkgdesc="A movie player, compiled with vaapi (without unfree faac support)" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://gitorious.org/vaapi/mplayer" license=('GPL') -depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio' 'libxinerama' 'sdl' +depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama' 'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu' - 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'speex' 'faad2' + 'sdl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'speex' 'faad2' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'libbluray' 'libva' 'libass' 'desktop-file-utils') @@ -24,15 +25,18 @@ conflicts=('mplayer' 'mplayer-vaapi') replaces=('mplayer-vaapi') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz + cdio-includes.patch tweak-desktop-file.patch) options=('!buildflags' '!emptydirs') install=mplayer-vaapi.install sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56' + '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720' '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b') build() { cd "$srcdir/mplayer-vaapi-$pkgver" + patch -Np0 -i "$srcdir/cdio-includes.patch" patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch" ./configure \ diff --git a/libre/mplayer-vaapi-libre/cdio-includes.patch b/libre/mplayer-vaapi-libre/cdio-includes.patch new file mode 100644 index 000000000..894650717 --- /dev/null +++ b/libre/mplayer-vaapi-libre/cdio-includes.patch @@ -0,0 +1,43 @@ +Index: configure +=================================================================== +--- configure (revision 35421) ++++ configure (working copy) +@@ -5968,8 +5968,8 @@ + cat > $TMPC << EOF + #include <stdio.h> + #include <cdio/version.h> +-#include <cdio/cdda.h> +-#include <cdio/paranoia.h> ++#include <cdio/paranoia/cdda.h> ++#include <cdio/paranoia/paranoia.h> + int main(void) { + void *test = cdda_verbose_set; + printf("%s\n", CDIO_VERSION); +Index: gui/win32/interface.c +=================================================================== +--- gui/win32/interface.c (revision 35421) ++++ gui/win32/interface.c (working copy) +@@ -24,7 +24,7 @@ + #include "config.h" + + #if defined(CONFIG_LIBCDIO) +-#include <cdio/cdda.h> ++#include <cdio/paranoia/cdda.h> + #elif defined(CONFIG_CDDA) + #include <cdda_interface.h> + #endif +Index: stream/stream_cdda.c +=================================================================== +--- stream/stream_cdda.c (revision 35421) ++++ stream/stream_cdda.c (working copy) +@@ -21,8 +21,8 @@ + #include <cdda_interface.h> + #include <cdda_paranoia.h> + #else +-#include <cdio/cdda.h> +-#include <cdio/paranoia.h> ++#include <cdio/paranoia/cdda.h> ++#include <cdio/paranoia/paranoia.h> + #endif + #include <stdio.h> + #include <stdlib.h> |