diff options
| -rw-r--r-- | libre/mplayer-libre/PKGBUILD | 33 | ||||
| -rw-r--r-- | libre/mplayer-libre/live-media.patch | 13 |
2 files changed, 15 insertions, 31 deletions
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index cf2be2b5f..d74af10ea 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,33 +1,29 @@ -# $Id: PKGBUILD 152227 2012-03-05 09:38:48Z ibiru $ +# $Id: PKGBUILD 160672 2012-06-03 16:16:53Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> # libvdpau is currently useful only with proprietary software _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') -pkgver=34799 -pkgrel=2 +pkgver=34992 +pkgrel=1 arch=('i686' 'x86_64') -makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' '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' +makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' +'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio') license=('GPL') url="http://www.mplayerhq.hu/" options=(!buildflags !emptydirs) -source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop - live-media.patch) -md5sums=('e8bd960bcdb48fdc5a1f45390dc13c53' - 'c0d6ef795cf6de48e3b87ff7c23f0319' - 'b6c057633ff7001ee0c102b5f81ec1e3') +source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop) +md5sums=('04642b1eb68671577ff53bb84839253a' + 'c0d6ef795cf6de48e3b87ff7c23f0319') build() { cd "$srcdir/$_pkgbase" - patch -Np0 -i "$srcdir/live-media.patch" - ./configure --prefix=/usr \ --enable-runtime-cpudetection \ --disable-gui \ @@ -45,18 +41,19 @@ build() { --enable-radio \ --enable-radio-capture \ --language=all \ - --confdir=/etc/mplayer + --confdir=/etc/mplayer \ + --extra-cflags="-fpermissive" [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak make } package_mplayer-libre() { - pkgdesc="A movie player for GNU/Linux (no unfree faac support)" + pkgdesc="A movie player for GNU/Linux (without unfree faac and libvdpau support)" install=mplayer.install 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' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' + 'libxinerama' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio') provides=("mplayer=$pkgver") replaces=('mplayer') @@ -75,8 +72,8 @@ 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' 'cdparanoia' + pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac and libvdpau 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') provides=("mencoder=$pkgver") replaces=('mencoder') diff --git a/libre/mplayer-libre/live-media.patch b/libre/mplayer-libre/live-media.patch deleted file mode 100644 index b704b5381..000000000 --- a/libre/mplayer-libre/live-media.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libmpdemux/demux_rtp.cpp -=================================================================== ---- libmpdemux/demux_rtp.cpp (revision 34798) -+++ libmpdemux/demux_rtp.cpp (working copy) -@@ -19,6 +19,8 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -+#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1 -+ - extern "C" { - // on MinGW, we must include windows.h before the things it conflicts - #ifdef __MINGW32__ // with. they are each protected from |