From 01f906403504ea1a61cc42b6bf4d795571dda0f8 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Wed, 16 Jan 2013 15:53:37 -0200 Subject: mplayer{-vaapi,}-libre: changing libcdio to libcdio-paranoia --- libre/mplayer-libre/PKGBUILD | 21 ++++++++-------- libre/mplayer-libre/cdio-includes.patch | 43 +++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 10 deletions(-) create mode 100644 libre/mplayer-libre/cdio-includes.patch (limited to 'libre/mplayer-libre') diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 583b679ca..936dc402a 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -2,25 +2,28 @@ # Maintainer : Ionut Biru # Contributor: Hugo Doria # Maintainer (Parabola): André Silva +# Contributor (Parabola): Márcio Silva _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=35421 -pkgrel=1.1 -arch=('i686' 'x86_64') +pkgrel=2 +arch=('i686' 'x86_64' 'mips64el') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' -'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio' 'subversion') +'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion') license=('GPL') url="http://www.mplayerhq.hu/" options=(!buildflags !emptydirs) -source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop) -md5sums=('b8a82ad1e1d6c3ac847074772daba817' - 'c0d6ef795cf6de48e3b87ff7c23f0319') +source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch) +md5sums=('b5d8c24fc106b4ed58acda3b86c468fa' + 'c0d6ef795cf6de48e3b87ff7c23f0319' + 'dcf64a9113ecb99ec102108c901159e3') build() { cd "$srcdir/$_pkgbase" + patch -Np0 -i ../cdio-includes.patch ./configure --prefix=/usr \ --enable-runtime-cpudetection \ @@ -51,7 +54,7 @@ package_mplayer-libre() { backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' - 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio') + 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia') provides=("mplayer=$pkgver") replaces=('mplayer') conflicts=('mplayer') @@ -71,7 +74,7 @@ package_mplayer-libre() { package_mencoder-libre() { pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)" depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' - 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio' 'libvorbis') + 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' 'libvorbis') provides=("mencoder=$pkgver") replaces=('mencoder') conflicts=('mencoder') @@ -80,5 +83,3 @@ package_mencoder-libre() { make DESTDIR="$pkgdir" install-mencoder install-mencoder-man find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \; } -md5sums=('b5d8c24fc106b4ed58acda3b86c468fa' - 'c0d6ef795cf6de48e3b87ff7c23f0319') diff --git a/libre/mplayer-libre/cdio-includes.patch b/libre/mplayer-libre/cdio-includes.patch new file mode 100644 index 000000000..894650717 --- /dev/null +++ b/libre/mplayer-libre/cdio-includes.patch @@ -0,0 +1,43 @@ +Index: configure +=================================================================== +--- configure (revision 35421) ++++ configure (working copy) +@@ -5968,8 +5968,8 @@ + cat > $TMPC << EOF + #include + #include +-#include +-#include ++#include ++#include + 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 ++#include + #elif defined(CONFIG_CDDA) + #include + #endif +Index: stream/stream_cdda.c +=================================================================== +--- stream/stream_cdda.c (revision 35421) ++++ stream/stream_cdda.c (working copy) +@@ -21,8 +21,8 @@ + #include + #include + #else +-#include +-#include ++#include ++#include + #endif + #include + #include -- cgit v1.2.3 From 4d0aad6b62e4cfa8916a674bc5a24af6ff038c0a Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 17 Feb 2013 19:55:20 -0200 Subject: mplayer-libre-35915-1: updating version --- libre/mplayer-libre/PKGBUILD | 12 ++++++------ libre/mplayer-libre/cdio-includes.patch | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'libre/mplayer-libre') diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 936dc402a..1db55148e 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 171086 2012-11-16 15:00:56Z ibiru $ +# $Id: PKGBUILD 178122 2013-02-16 22:45:31Z ioni $ # Maintainer : Ionut Biru # Contributor: Hugo Doria # Maintainer (Parabola): André Silva @@ -7,8 +7,8 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') -pkgver=35421 -pkgrel=2 +pkgver=35915 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' @@ -16,10 +16,10 @@ makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'lib license=('GPL') url="http://www.mplayerhq.hu/" options=(!buildflags !emptydirs) -source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch) -md5sums=('b5d8c24fc106b4ed58acda3b86c468fa' +source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch) +md5sums=('166dc6c426d38698a860dd07403b55b6' 'c0d6ef795cf6de48e3b87ff7c23f0319' - 'dcf64a9113ecb99ec102108c901159e3') + '7b5be7191aafbea64218dc4916343bbc') build() { cd "$srcdir/$_pkgbase" diff --git a/libre/mplayer-libre/cdio-includes.patch b/libre/mplayer-libre/cdio-includes.patch index 894650717..f71472812 100644 --- a/libre/mplayer-libre/cdio-includes.patch +++ b/libre/mplayer-libre/cdio-includes.patch @@ -19,7 +19,7 @@ Index: gui/win32/interface.c +++ gui/win32/interface.c (working copy) @@ -24,7 +24,7 @@ #include "config.h" - + #if defined(CONFIG_LIBCDIO) -#include +#include -- cgit v1.2.3 From 57b9ae8349f1fcc6f52118188d9432466fe42b11 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 19 Feb 2013 11:18:32 -0200 Subject: mplayer-libre-35920-1: updating version --- libre/mplayer-libre/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libre/mplayer-libre') diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 1db55148e..e5023f3cb 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178122 2013-02-16 22:45:31Z ioni $ +# $Id: PKGBUILD 178232 2013-02-18 16:28:11Z ioni $ # Maintainer : Ionut Biru # Contributor: Hugo Doria # Maintainer (Parabola): André Silva @@ -7,17 +7,17 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') -pkgver=35915 +pkgver=35920 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' -'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion') +'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion') license=('GPL') url="http://www.mplayerhq.hu/" options=(!buildflags !emptydirs) source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch) -md5sums=('166dc6c426d38698a860dd07403b55b6' +md5sums=('5f96e829d711e7d1ea65e324710dca50' 'c0d6ef795cf6de48e3b87ff7c23f0319' '7b5be7191aafbea64218dc4916343bbc') -- cgit v1.2.3