summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/mplayer-libre/PKGBUILD33
-rw-r--r--libre/mplayer-libre/mplayer.desktop2
-rw-r--r--libre/mplayer-libre/mplayer.install4
-rw-r--r--libre/mplayer-vaapi-libre/PKGBUILD33
4 files changed, 35 insertions, 37 deletions
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 2602022f4..3ca302e09 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -2,14 +2,16 @@
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
+# libvdpau is currently useful only with proprietary software
+
_pkgbase=mplayer
pkgbase=mplayer-libre
pkgname=('mplayer-libre' 'mencoder-libre')
pkgver=34426
-pkgrel=1
+pkgrel=3
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' 'speex'
+'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'speex'
'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray')
license=('GPL')
url="http://www.mplayerhq.hu/"
@@ -33,6 +35,7 @@ build() {
--disable-esd \
--disable-mga \
--disable-ass-internal \
+ --disable-vdpau \
--enable-xvmc \
--enable-radio \
--language=all \
@@ -47,22 +50,22 @@ package_mplayer-libre() {
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' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray')
provides=("mplayer=$pkgver")
replaces=('mplayer')
conflicts=('mplayer')
- cd ${srcdir}/${_pkgbase}
+ cd "${srcdir}/${_pkgbase}"
- make DESTDIR=${pkgdir} install-mplayer install-mplayer-man
- install -Dm644 etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/
- install -dm755 ${pkgdir}/usr/share/mplayer/
- ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf
- rm -rf ${pkgdir}/usr/share/mplayer/font
+ make DESTDIR="${pkgdir}" install-mplayer install-mplayer-man
+ install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}/etc/mplayer/"
+ install -dm755 "${pkgdir}/usr/share/mplayer/"
+ ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}/usr/share/mplayer/subfont.ttf"
+ rm -rf "${pkgdir}/usr/share/mplayer/font"
#desktop file FS#14770
- install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop
- install -Dm644 etc/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png
+ install -Dm644 "${srcdir}/mplayer.desktop" "${pkgdir}/usr/share/applications/mplayer.desktop"
+ install -Dm644 etc/mplayer.png "${pkgdir}/usr/share/pixmaps/mplayer.png"
}
package_mencoder-libre() {
@@ -73,7 +76,9 @@ package_mencoder-libre() {
replaces=('mencoder')
conflicts=('mencoder')
- cd ${srcdir}/${_pkgbase}
- make DESTDIR=${pkgdir} install-mencoder install-mencoder-man
- find $pkgdir/usr/share/man -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
+ cd "${srcdir}/${_pkgbase}"
+ 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=('ff81117293e76b59e54debc439d8e612'
+ '647b9f4ab5284a7fef3f84f992214e77')
diff --git a/libre/mplayer-libre/mplayer.desktop b/libre/mplayer-libre/mplayer.desktop
index 07acea13f..e3229d042 100644
--- a/libre/mplayer-libre/mplayer.desktop
+++ b/libre/mplayer-libre/mplayer.desktop
@@ -14,7 +14,7 @@ Comment[zh]=多媒体播放器
Comment[pl]=Odtwarzaj filmy i muzykę
Icon=mplayer
TryExec=mplayer
-Exec=mplayer %F
+Exec=mplayer -really-quiet %F
Terminal=false
NoDisplay=true
Categories=GTK;AudioVideo;Audio;Video;Player;TV;
diff --git a/libre/mplayer-libre/mplayer.install b/libre/mplayer-libre/mplayer.install
index 660593cf5..f98ba7338 100644
--- a/libre/mplayer-libre/mplayer.install
+++ b/libre/mplayer-libre/mplayer.install
@@ -3,9 +3,9 @@ post_install() {
}
post_upgrade() {
- post_install
+ post_install $1
}
post_remove() {
- post_install
+ post_install $1
}
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 1904d4ec4..632ac4e12 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -6,39 +6,34 @@
_pkgname=mplayer-vaapi
pkgname=mplayer-vaapi-libre
-pkgver=34180
-_sha1=79e6aa7b
-pkgrel=2
+pkgver=34578
+pkgrel=3
+pkgdesc="A movie player, compiled with vaapi support"
arch=('i686' 'x86_64')
-url="http://www.splitted-desktop.com/~gbeauchesne/mplayer-vaapi/"
+url="http://gitorious.org/vaapi/mplayer"
license=('GPL')
-depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl'
+depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio' 'libxinerama' 'sdl'
'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'mesa'
- 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'speex'
+ 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'speex' 'faad2'
'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca'
'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'faad2'
'libva' 'libass' 'desktop-file-utils')
-makedepends=('p7zip-libre' 'live-media' 'yasm' 'ladspa' 'git')
-provides=("$_pkgname=$pkgver" 'mplayer')
+makedepends=('unzip-libre' 'live-media' 'yasm' 'ladspa' 'git')
+provides=("$_pkgname=$pkgver" "mplayer=$pkgver")
conflicts=('mplayer' "$_pkgname")
replaces=('mplayer-vaapi')
backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-#source=(http://pkgbuild.com/~foutrelis/mplayer-$pkgver.tar.xz
-# http://www.splitted-desktop.com/static/libva/mplayer-vaapi/mplayer-vaapi-$_vaapi_version.tar.bz2
-source=(mplayer-vaapi-$_sha1.tar.gz::http://gitorious.org/vaapi/mplayer/archive-tarball/$_sha1
+source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz
mplayer.desktop
mplayer.png)
options=('!buildflags' '!emptydirs')
install=mplayer-vaapi.install
-sha256sums=('df3ec3d6eba8fd66d6ed7e84dcc909db3b0dcbee2fafdff86c8e66340de1e323'
+sha256sums=('cc35a057c8a64d2cdec2dc0a037811ef0f91dd03cd3d07465c7272a08665a37d'
'9aa54571b37d15aec2c8e3ddf086753217efc3084ebf466335b2f28d819c74da'
'061739a8cc267748ad58f168034cc39785d949a5262772535e1b347c7842af48')
build() {
- cd "$srcdir/vaapi-mplayer"
-
- [[ -d ffmpeg ]] && rm -rf ffmpeg
- tsocks git clone --depth 1 git://git.videolan.org/ffmpeg.git ffmpeg
+ cd "$srcdir/mplayer-vaapi-$pkgver"
./configure --prefix=/usr \
--enable-runtime-cpudetection \
@@ -46,6 +41,7 @@ build() {
--disable-arts \
--disable-liblzo \
--enable-speex \
+ --disable-cdparanoia \
--disable-openal \
--disable-libdv \
--disable-musepack \
@@ -65,7 +61,7 @@ build() {
}
package() {
- cd "$srcdir/vaapi-mplayer"
+ cd "$srcdir/mplayer-vaapi-$pkgver"
make -j1 DESTDIR="$pkgdir" install-mplayer install-mplayer-man
install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
@@ -78,6 +74,3 @@ package() {
}
# vim:set ts=2 sw=2 et:
-sha256sums=('ab9386e81df7ea7f25102940f7d86fdac797bcdc9b489e0ce118c505c02508ba'
- '9aa54571b37d15aec2c8e3ddf086753217efc3084ebf466335b2f28d819c74da'
- '061739a8cc267748ad58f168034cc39785d949a5262772535e1b347c7842af48')