diff --git a/extra/mplayer/PKGBUILD b/extra/mplayer/PKGBUILD index b9578c131..b35127c6e 100644 --- a/extra/mplayer/PKGBUILD +++ b/extra/mplayer/PKGBUILD @@ -11,8 +11,8 @@ pkgbase=mplayer pkgname=('mplayer' 'mencoder') -pkgver=37379 -pkgrel=7 +pkgver=37857 +pkgrel=1 arch=('i686' 'x86_64') makedepends=( 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' @@ -21,41 +21,36 @@ makedepends=( 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'opus' 'subversion' 'x264' 'libx264' 'rtmpdump' 'gnutls' - 'gsm' 'libdvdcss' 'libdvdread' 'libdvdnav' + 'gsm' 'libdvdcss' 'libdvdread' 'libdvdnav' 'ffmpeg' ) license=('GPL') url='http://www.mplayerhq.hu/' options=('!buildflags' '!emptydirs') source=($pkgbase-$pkgver::svn://svn.mplayerhq.hu/mplayer/trunk#revision=$pkgver - http://ffmpeg.org/releases/ffmpeg-2.6.7.tar.bz2 mplayer.desktop - cdio-includes.patch include-samba-4.0.patch ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch revert-icl-fixes.patch 37386.patch) md5sums=('SKIP' - '7521d6f70c5c54107572c501f77a6cd7' '62f44a58f072b2b1a3c3d3e4976d64b3' - '7b5be7191aafbea64218dc4916343bbc' '868a92bdef148df7f38bfa992b26ce9d' '71be9bcd297cb9ce833bbc5d425c0470' '3579402002b7302fdf2d146639333efd' '9131fa5229c857174ab029ed9b0cb71b') -pkgver() { - cd $pkgbase-$pkgver - svnversion -} +#pkgver() { +# cd $pkgbase-$pkgver +# svnversion +#} prepare() { cd $pkgbase-$pkgver - mv ../ffmpeg-*/ ./ffmpeg +# mv ../ffmpeg-*/ ./ffmpeg - patch -Np0 -i ../cdio-includes.patch patch -Np1 -i ../include-samba-4.0.patch patch -Np0 -i ../revert-icl-fixes.patch - patch -d ffmpeg -Np1 <../ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch +# patch -d ffmpeg -Np1 <../ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch patch -p0 -i ../37386.patch ./version.sh @@ -79,6 +74,7 @@ build() { --disable-mga \ --disable-ass-internal \ --disable-cdparanoia \ + --disable-ffmpeg_a \ --enable-xvmc \ --enable-radio \ --enable-radio-capture \ @@ -92,7 +88,6 @@ build() { package_mplayer() { pkgdesc='Media player for Linux' - install=mplayer.install backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') depends=( 'desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx' @@ -101,7 +96,7 @@ package_mplayer() { 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus' 'rtmpdump' - 'gsm' 'gnutls' 'libdvdnav' + 'gsm' 'gnutls' 'libdvdnav' 'ffmpeg' ) depends_aarch64=('ffmpeg') @@ -125,7 +120,7 @@ package_mencoder() { 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' - 'libvorbis' 'opus' 'rtmpdump' 'gsm' 'libdvdnav' + 'libvorbis' 'opus' 'rtmpdump' 'gsm' 'libdvdnav' 'ffmpeg' ) make -C $pkgbase-$pkgver DESTDIR="$pkgdir" install-mencoder install-mencoder-man diff --git a/extra/mplayer/mplayer.install b/extra/mplayer/mplayer.install deleted file mode 100644 index 660593cf5..000000000 --- a/extra/mplayer/mplayer.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}