[arch-commits] Commit in mplayer/repos (24 files)
Bartłomiej Piotrowski
bpiotrowski at nymeria.archlinux.org
Tue Nov 26 19:19:27 UTC 2013
Date: Tuesday, November 26, 2013 @ 20:19:27
Author: bpiotrowski
Revision: 200345
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
mplayer/repos/extra-i686/PKGBUILD
(from rev 200344, mplayer/trunk/PKGBUILD)
mplayer/repos/extra-i686/cdio-includes.patch
(from rev 200344, mplayer/trunk/cdio-includes.patch)
mplayer/repos/extra-i686/include-samba-4.0.patch
(from rev 200344, mplayer/trunk/include-samba-4.0.patch)
mplayer/repos/extra-i686/mplayer.desktop
(from rev 200344, mplayer/trunk/mplayer.desktop)
mplayer/repos/extra-i686/mplayer.install
(from rev 200344, mplayer/trunk/mplayer.install)
mplayer/repos/extra-i686/mplayer.png
(from rev 200344, mplayer/trunk/mplayer.png)
mplayer/repos/extra-x86_64/PKGBUILD
(from rev 200344, mplayer/trunk/PKGBUILD)
mplayer/repos/extra-x86_64/cdio-includes.patch
(from rev 200344, mplayer/trunk/cdio-includes.patch)
mplayer/repos/extra-x86_64/include-samba-4.0.patch
(from rev 200344, mplayer/trunk/include-samba-4.0.patch)
mplayer/repos/extra-x86_64/mplayer.desktop
(from rev 200344, mplayer/trunk/mplayer.desktop)
mplayer/repos/extra-x86_64/mplayer.install
(from rev 200344, mplayer/trunk/mplayer.install)
mplayer/repos/extra-x86_64/mplayer.png
(from rev 200344, mplayer/trunk/mplayer.png)
Deleted:
mplayer/repos/extra-i686/PKGBUILD
mplayer/repos/extra-i686/cdio-includes.patch
mplayer/repos/extra-i686/include-samba-4.0.patch
mplayer/repos/extra-i686/mplayer.desktop
mplayer/repos/extra-i686/mplayer.install
mplayer/repos/extra-i686/mplayer.png
mplayer/repos/extra-x86_64/PKGBUILD
mplayer/repos/extra-x86_64/cdio-includes.patch
mplayer/repos/extra-x86_64/include-samba-4.0.patch
mplayer/repos/extra-x86_64/mplayer.desktop
mplayer/repos/extra-x86_64/mplayer.install
mplayer/repos/extra-x86_64/mplayer.png
--------------------------------------+
/PKGBUILD | 212 +++++++++++++++++++++++++++++++++
/cdio-includes.patch | 86 +++++++++++++
/include-samba-4.0.patch | 24 +++
/mplayer.desktop | 44 ++++++
/mplayer.install | 22 +++
extra-i686/PKGBUILD | 111 -----------------
extra-i686/cdio-includes.patch | 43 ------
extra-i686/include-samba-4.0.patch | 12 -
extra-i686/mplayer.desktop | 22 ---
extra-i686/mplayer.install | 11 -
extra-x86_64/PKGBUILD | 111 -----------------
extra-x86_64/cdio-includes.patch | 43 ------
extra-x86_64/include-samba-4.0.patch | 12 -
extra-x86_64/mplayer.desktop | 22 ---
extra-x86_64/mplayer.install | 11 -
15 files changed, 388 insertions(+), 398 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-11-26 19:19:01 UTC (rev 200344)
+++ extra-i686/PKGBUILD 2013-11-26 19:19:27 UTC (rev 200345)
@@ -1,111 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-
-pkgbase=mplayer
-pkgname=('mplayer' 'mencoder')
-pkgver=36498
-pkgrel=3
-arch=('i686' 'x86_64')
-makedepends=(
- 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
- 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca'
- 'x264' 'faac' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
- 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa'
- 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray'
- 'libcdio-paranoia' 'opus'
- )
-license=('GPL')
-url='http://www.mplayerhq.hu/'
-options=('!buildflags' '!emptydirs')
-source=(ftp://ftp.archlinux.org/other/packages/$pkgbase/$pkgbase-$pkgver.tar.xz
- http://ffmpeg.org/releases/ffmpeg-2.1.tar.bz2
- mplayer.desktop
- cdio-includes.patch
- include-samba-4.0.patch)
-md5sums=('8b856e8833d910b6e38b04bb8453d0dc'
- '4ec1cedd4c7753512462f70b347c338a'
- '62f44a58f072b2b1a3c3d3e4976d64b3'
- '7b5be7191aafbea64218dc4916343bbc'
- '868a92bdef148df7f38bfa992b26ce9d')
-
-prepare() {
- cd $pkgbase-$pkgver
- patch -p0 -i ../cdio-includes.patch
- patch -p1 -i ../include-samba-4.0.patch
-
- mv ../ffmpeg-2.1 ./ffmpeg
-}
-
-build() {
- cd $pkgbase-$pkgver
-
- ./configure --prefix=/usr \
- --enable-runtime-cpudetection \
- --disable-gui \
- --disable-arts \
- --disable-liblzo \
- --disable-speex \
- --disable-openal \
- --disable-libdv \
- --disable-musepack \
- --disable-esd \
- --disable-mga \
- --disable-ass-internal \
- --disable-cdparanoia \
- --enable-xvmc \
- --enable-radio \
- --enable-radio-capture \
- --enable-smb \
- --language=all \
- --confdir=/etc/mplayer
- [[ "$CARCH" = "i686" ]] && sed 's|-march=i486|-march=i686|g' -i config.mak
-
- make
-}
-
-package_mplayer() {
- pkgdesc="A movie player for linux"
- 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' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga'
- 'fribidi' 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123'
- 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus'
- )
-
- cd $pkgbase-$pkgver
- 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/mplayer256x256.png \
- "$pkgdir/usr/share/pixmaps/mplayer.png"
-}
-
-package_mencoder() {
- pkgdesc="Free command line video decoding, encoding and filtering tool"
- depends=(
- 'enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame'
- 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore'
- 'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2'
- 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia'
- 'libvorbis' 'opus'
- )
-
- cd $pkgbase-$pkgver
- make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
- find "$pkgdir/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
-}
Copied: mplayer/repos/extra-i686/PKGBUILD (from rev 200344, mplayer/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-11-26 19:19:27 UTC (rev 200345)
@@ -0,0 +1,106 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgbase=mplayer
+pkgname=('mplayer' 'mencoder')
+pkgver=36498
+pkgrel=4
+arch=('i686' 'x86_64')
+makedepends=(
+ 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
+ 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca'
+ 'x264' 'faac' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
+ 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa'
+ 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray'
+ 'libcdio-paranoia' 'opus'
+ )
+license=('GPL')
+url='http://www.mplayerhq.hu/'
+options=('!buildflags' '!emptydirs')
+source=(ftp://ftp.archlinux.org/other/packages/$pkgbase/$pkgbase-$pkgver.tar.xz
+ http://ffmpeg.org/releases/ffmpeg-2.1.tar.bz2
+ mplayer.desktop
+ cdio-includes.patch
+ include-samba-4.0.patch)
+md5sums=('8b856e8833d910b6e38b04bb8453d0dc'
+ '4ec1cedd4c7753512462f70b347c338a'
+ '62f44a58f072b2b1a3c3d3e4976d64b3'
+ '7b5be7191aafbea64218dc4916343bbc'
+ '868a92bdef148df7f38bfa992b26ce9d')
+
+prepare() {
+ cd $pkgbase-$pkgver
+ patch -p0 -i ../cdio-includes.patch
+ patch -p1 -i ../include-samba-4.0.patch
+
+ mv ../ffmpeg-2.1 ./ffmpeg
+}
+
+build() {
+ cd $pkgbase-$pkgver
+
+ ./configure --prefix=/usr \
+ --enable-runtime-cpudetection \
+ --disable-gui \
+ --disable-arts \
+ --disable-liblzo \
+ --disable-speex \
+ --disable-openal \
+ --disable-libdv \
+ --disable-musepack \
+ --disable-esd \
+ --disable-mga \
+ --disable-ass-internal \
+ --disable-cdparanoia \
+ --enable-xvmc \
+ --enable-radio \
+ --enable-radio-capture \
+ --enable-smb \
+ --language=all \
+ --confdir=/etc/mplayer
+ [[ "$CARCH" = "i686" ]] && sed 's|-march=i486|-march=i686|g' -i config.mak
+
+ make
+}
+
+package_mplayer() {
+ pkgdesc="A movie 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'
+ 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'
+ 'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore'
+ 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga'
+ 'fribidi' 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123'
+ 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus'
+ )
+
+ cd $pkgbase-$pkgver
+ make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
+
+ install -Dm644 etc/{codecs.conf,input.conf,example.conf} \
+ "$pkgdir/etc/mplayer/"
+
+ # desktop file FS#14770
+ install -Dm644 "$srcdir/mplayer.desktop" \
+ "$pkgdir/usr/share/applications/mplayer.desktop"
+ install -Dm644 etc/mplayer256x256.png \
+ "$pkgdir/usr/share/pixmaps/mplayer.png"
+}
+
+package_mencoder() {
+ pkgdesc="Free command line video decoding, encoding and filtering tool"
+ depends=(
+ 'enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame'
+ 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore'
+ 'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2'
+ 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia'
+ 'libvorbis' 'opus'
+ )
+
+ cd $pkgbase-$pkgver
+ make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
+ find "$pkgdir/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
+}
Deleted: extra-i686/cdio-includes.patch
===================================================================
--- extra-i686/cdio-includes.patch 2013-11-26 19:19:01 UTC (rev 200344)
+++ extra-i686/cdio-includes.patch 2013-11-26 19:19:27 UTC (rev 200345)
@@ -1,43 +0,0 @@
-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>
Copied: mplayer/repos/extra-i686/cdio-includes.patch (from rev 200344, mplayer/trunk/cdio-includes.patch)
===================================================================
--- extra-i686/cdio-includes.patch (rev 0)
+++ extra-i686/cdio-includes.patch 2013-11-26 19:19:27 UTC (rev 200345)
@@ -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>
Deleted: extra-i686/include-samba-4.0.patch
===================================================================
--- extra-i686/include-samba-4.0.patch 2013-11-26 19:19:01 UTC (rev 200344)
+++ extra-i686/include-samba-4.0.patch 2013-11-26 19:19:27 UTC (rev 200345)
@@ -1,12 +0,0 @@
-diff -rupN a/stream/stream_smb.c b/stream/stream_smb.c
---- a/stream/stream_smb.c 2013-03-16 13:38:34.000000000 +0000
-+++ b/stream/stream_smb.c 2013-10-31 20:05:32.473947926 +0000
-@@ -18,7 +18,7 @@
-
- #include "config.h"
-
--#include <libsmbclient.h>
-+#include <samba-4.0/libsmbclient.h>
- #include <unistd.h>
-
- #include "mp_msg.h"
Copied: mplayer/repos/extra-i686/include-samba-4.0.patch (from rev 200344, mplayer/trunk/include-samba-4.0.patch)
===================================================================
--- extra-i686/include-samba-4.0.patch (rev 0)
+++ extra-i686/include-samba-4.0.patch 2013-11-26 19:19:27 UTC (rev 200345)
@@ -0,0 +1,12 @@
+diff -rupN a/stream/stream_smb.c b/stream/stream_smb.c
+--- a/stream/stream_smb.c 2013-03-16 13:38:34.000000000 +0000
++++ b/stream/stream_smb.c 2013-10-31 20:05:32.473947926 +0000
+@@ -18,7 +18,7 @@
+
+ #include "config.h"
+
+-#include <libsmbclient.h>
++#include <samba-4.0/libsmbclient.h>
+ #include <unistd.h>
+
+ #include "mp_msg.h"
Deleted: extra-i686/mplayer.desktop
===================================================================
--- extra-i686/mplayer.desktop 2013-11-26 19:19:01 UTC (rev 200344)
+++ extra-i686/mplayer.desktop 2013-11-26 19:19:27 UTC (rev 200345)
@@ -1,22 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=MPlayer Media Player
-Name[ca]=Reproductor multimèdia MPlayer
-Name[pl]=MPlayer odtwarzacz multimedialny
-GenericName=Multimedia player
-Comment=Play movies and songs
-Comment[ca]=Reproduïu vídeos i cançons
-Comment[de]=Filme und Musik abspielen
-Comment[es]=Reproduzca vídeos y canciones
-Comment[fr]=Lecteur multimédia
-Comment[it]=Lettore multimediale
-Comment[zh]=多媒体播放器
-Comment[pl]=Odtwarzaj filmy i muzykę
-Icon=mplayer
-TryExec=mplayer
-Exec=mplayer %F
-Terminal=false
-NoDisplay=true
-Categories=GTK;AudioVideo;Audio;Video;Player;TV;
-MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;
-X-KDE-Protocols=http,ftp,smb
Copied: mplayer/repos/extra-i686/mplayer.desktop (from rev 200344, mplayer/trunk/mplayer.desktop)
===================================================================
--- extra-i686/mplayer.desktop (rev 0)
+++ extra-i686/mplayer.desktop 2013-11-26 19:19:27 UTC (rev 200345)
@@ -0,0 +1,22 @@
+[Desktop Entry]
+Type=Application
+Name=MPlayer Media Player
+Name[ca]=Reproductor multimèdia MPlayer
+Name[pl]=MPlayer odtwarzacz multimedialny
+GenericName=Multimedia player
+Comment=Play movies and songs
+Comment[ca]=Reproduïu vídeos i cançons
+Comment[de]=Filme und Musik abspielen
+Comment[es]=Reproduzca vídeos y canciones
+Comment[fr]=Lecteur multimédia
+Comment[it]=Lettore multimediale
+Comment[zh]=多媒体播放器
+Comment[pl]=Odtwarzaj filmy i muzykę
+Icon=mplayer
+TryExec=mplayer
+Exec=mplayer %F
+Terminal=false
+NoDisplay=true
+Categories=GTK;AudioVideo;Audio;Video;Player;TV;
+MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;
+X-KDE-Protocols=http,ftp,smb
Deleted: extra-i686/mplayer.install
===================================================================
--- extra-i686/mplayer.install 2013-11-26 19:19:01 UTC (rev 200344)
+++ extra-i686/mplayer.install 2013-11-26 19:19:27 UTC (rev 200345)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: mplayer/repos/extra-i686/mplayer.install (from rev 200344, mplayer/trunk/mplayer.install)
===================================================================
--- extra-i686/mplayer.install (rev 0)
+++ extra-i686/mplayer.install 2013-11-26 19:19:27 UTC (rev 200345)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-i686/mplayer.png
===================================================================
(Binary files differ)
Copied: mplayer/repos/extra-i686/mplayer.png (from rev 200344, mplayer/trunk/mplayer.png)
===================================================================
(Binary files differ)
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-11-26 19:19:01 UTC (rev 200344)
+++ extra-x86_64/PKGBUILD 2013-11-26 19:19:27 UTC (rev 200345)
@@ -1,111 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru at archlinux.org>
-# Contributor: Hugo Doria <hugo at archlinux.org>
-
-pkgbase=mplayer
-pkgname=('mplayer' 'mencoder')
-pkgver=36498
-pkgrel=3
-arch=('i686' 'x86_64')
-makedepends=(
- 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
- 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca'
- 'x264' 'faac' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
- 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa'
- 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray'
- 'libcdio-paranoia' 'opus'
- )
-license=('GPL')
-url='http://www.mplayerhq.hu/'
-options=('!buildflags' '!emptydirs')
-source=(ftp://ftp.archlinux.org/other/packages/$pkgbase/$pkgbase-$pkgver.tar.xz
- http://ffmpeg.org/releases/ffmpeg-2.1.tar.bz2
- mplayer.desktop
- cdio-includes.patch
- include-samba-4.0.patch)
-md5sums=('8b856e8833d910b6e38b04bb8453d0dc'
- '4ec1cedd4c7753512462f70b347c338a'
- '62f44a58f072b2b1a3c3d3e4976d64b3'
- '7b5be7191aafbea64218dc4916343bbc'
- '868a92bdef148df7f38bfa992b26ce9d')
-
-prepare() {
- cd $pkgbase-$pkgver
- patch -p0 -i ../cdio-includes.patch
- patch -p1 -i ../include-samba-4.0.patch
-
- mv ../ffmpeg-2.1 ./ffmpeg
-}
-
-build() {
- cd $pkgbase-$pkgver
-
- ./configure --prefix=/usr \
- --enable-runtime-cpudetection \
- --disable-gui \
- --disable-arts \
- --disable-liblzo \
- --disable-speex \
- --disable-openal \
- --disable-libdv \
- --disable-musepack \
- --disable-esd \
- --disable-mga \
- --disable-ass-internal \
- --disable-cdparanoia \
- --enable-xvmc \
- --enable-radio \
- --enable-radio-capture \
- --enable-smb \
- --language=all \
- --confdir=/etc/mplayer
- [[ "$CARCH" = "i686" ]] && sed 's|-march=i486|-march=i686|g' -i config.mak
-
- make
-}
-
-package_mplayer() {
- pkgdesc="A movie player for linux"
- 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' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga'
- 'fribidi' 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123'
- 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus'
- )
-
- cd $pkgbase-$pkgver
- 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/mplayer256x256.png \
- "$pkgdir/usr/share/pixmaps/mplayer.png"
-}
-
-package_mencoder() {
- pkgdesc="Free command line video decoding, encoding and filtering tool"
- depends=(
- 'enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame'
- 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore'
- 'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2'
- 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia'
- 'libvorbis' 'opus'
- )
-
- cd $pkgbase-$pkgver
- make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
- find "$pkgdir/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
-}
Copied: mplayer/repos/extra-x86_64/PKGBUILD (from rev 200344, mplayer/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-11-26 19:19:27 UTC (rev 200345)
@@ -0,0 +1,106 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgbase=mplayer
+pkgname=('mplayer' 'mencoder')
+pkgver=36498
+pkgrel=4
+arch=('i686' 'x86_64')
+makedepends=(
+ 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
+ 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca'
+ 'x264' 'faac' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
+ 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa'
+ 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray'
+ 'libcdio-paranoia' 'opus'
+ )
+license=('GPL')
+url='http://www.mplayerhq.hu/'
+options=('!buildflags' '!emptydirs')
+source=(ftp://ftp.archlinux.org/other/packages/$pkgbase/$pkgbase-$pkgver.tar.xz
+ http://ffmpeg.org/releases/ffmpeg-2.1.tar.bz2
+ mplayer.desktop
+ cdio-includes.patch
+ include-samba-4.0.patch)
+md5sums=('8b856e8833d910b6e38b04bb8453d0dc'
+ '4ec1cedd4c7753512462f70b347c338a'
+ '62f44a58f072b2b1a3c3d3e4976d64b3'
+ '7b5be7191aafbea64218dc4916343bbc'
+ '868a92bdef148df7f38bfa992b26ce9d')
+
+prepare() {
+ cd $pkgbase-$pkgver
+ patch -p0 -i ../cdio-includes.patch
+ patch -p1 -i ../include-samba-4.0.patch
+
+ mv ../ffmpeg-2.1 ./ffmpeg
+}
+
+build() {
+ cd $pkgbase-$pkgver
+
+ ./configure --prefix=/usr \
+ --enable-runtime-cpudetection \
+ --disable-gui \
+ --disable-arts \
+ --disable-liblzo \
+ --disable-speex \
+ --disable-openal \
+ --disable-libdv \
+ --disable-musepack \
+ --disable-esd \
+ --disable-mga \
+ --disable-ass-internal \
+ --disable-cdparanoia \
+ --enable-xvmc \
+ --enable-radio \
+ --enable-radio-capture \
+ --enable-smb \
+ --language=all \
+ --confdir=/etc/mplayer
+ [[ "$CARCH" = "i686" ]] && sed 's|-march=i486|-march=i686|g' -i config.mak
+
+ make
+}
+
+package_mplayer() {
+ pkgdesc="A movie 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'
+ 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'
+ 'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore'
+ 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga'
+ 'fribidi' 'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123'
+ 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus'
+ )
+
+ cd $pkgbase-$pkgver
+ make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
+
+ install -Dm644 etc/{codecs.conf,input.conf,example.conf} \
+ "$pkgdir/etc/mplayer/"
+
+ # desktop file FS#14770
+ install -Dm644 "$srcdir/mplayer.desktop" \
+ "$pkgdir/usr/share/applications/mplayer.desktop"
+ install -Dm644 etc/mplayer256x256.png \
+ "$pkgdir/usr/share/pixmaps/mplayer.png"
+}
+
+package_mencoder() {
+ pkgdesc="Free command line video decoding, encoding and filtering tool"
+ depends=(
+ 'enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame'
+ 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore'
+ 'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2'
+ 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia'
+ 'libvorbis' 'opus'
+ )
+
+ cd $pkgbase-$pkgver
+ make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
+ find "$pkgdir/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
+}
Deleted: extra-x86_64/cdio-includes.patch
===================================================================
--- extra-x86_64/cdio-includes.patch 2013-11-26 19:19:01 UTC (rev 200344)
+++ extra-x86_64/cdio-includes.patch 2013-11-26 19:19:27 UTC (rev 200345)
@@ -1,43 +0,0 @@
-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>
Copied: mplayer/repos/extra-x86_64/cdio-includes.patch (from rev 200344, mplayer/trunk/cdio-includes.patch)
===================================================================
--- extra-x86_64/cdio-includes.patch (rev 0)
+++ extra-x86_64/cdio-includes.patch 2013-11-26 19:19:27 UTC (rev 200345)
@@ -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>
Deleted: extra-x86_64/include-samba-4.0.patch
===================================================================
--- extra-x86_64/include-samba-4.0.patch 2013-11-26 19:19:01 UTC (rev 200344)
+++ extra-x86_64/include-samba-4.0.patch 2013-11-26 19:19:27 UTC (rev 200345)
@@ -1,12 +0,0 @@
-diff -rupN a/stream/stream_smb.c b/stream/stream_smb.c
---- a/stream/stream_smb.c 2013-03-16 13:38:34.000000000 +0000
-+++ b/stream/stream_smb.c 2013-10-31 20:05:32.473947926 +0000
-@@ -18,7 +18,7 @@
-
- #include "config.h"
-
--#include <libsmbclient.h>
-+#include <samba-4.0/libsmbclient.h>
- #include <unistd.h>
-
- #include "mp_msg.h"
Copied: mplayer/repos/extra-x86_64/include-samba-4.0.patch (from rev 200344, mplayer/trunk/include-samba-4.0.patch)
===================================================================
--- extra-x86_64/include-samba-4.0.patch (rev 0)
+++ extra-x86_64/include-samba-4.0.patch 2013-11-26 19:19:27 UTC (rev 200345)
@@ -0,0 +1,12 @@
+diff -rupN a/stream/stream_smb.c b/stream/stream_smb.c
+--- a/stream/stream_smb.c 2013-03-16 13:38:34.000000000 +0000
++++ b/stream/stream_smb.c 2013-10-31 20:05:32.473947926 +0000
+@@ -18,7 +18,7 @@
+
+ #include "config.h"
+
+-#include <libsmbclient.h>
++#include <samba-4.0/libsmbclient.h>
+ #include <unistd.h>
+
+ #include "mp_msg.h"
Deleted: extra-x86_64/mplayer.desktop
===================================================================
--- extra-x86_64/mplayer.desktop 2013-11-26 19:19:01 UTC (rev 200344)
+++ extra-x86_64/mplayer.desktop 2013-11-26 19:19:27 UTC (rev 200345)
@@ -1,22 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=MPlayer Media Player
-Name[ca]=Reproductor multimèdia MPlayer
-Name[pl]=MPlayer odtwarzacz multimedialny
-GenericName=Multimedia player
-Comment=Play movies and songs
-Comment[ca]=Reproduïu vídeos i cançons
-Comment[de]=Filme und Musik abspielen
-Comment[es]=Reproduzca vídeos y canciones
-Comment[fr]=Lecteur multimédia
-Comment[it]=Lettore multimediale
-Comment[zh]=多媒体播放器
-Comment[pl]=Odtwarzaj filmy i muzykę
-Icon=mplayer
-TryExec=mplayer
-Exec=mplayer %F
-Terminal=false
-NoDisplay=true
-Categories=GTK;AudioVideo;Audio;Video;Player;TV;
-MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;
-X-KDE-Protocols=http,ftp,smb
Copied: mplayer/repos/extra-x86_64/mplayer.desktop (from rev 200344, mplayer/trunk/mplayer.desktop)
===================================================================
--- extra-x86_64/mplayer.desktop (rev 0)
+++ extra-x86_64/mplayer.desktop 2013-11-26 19:19:27 UTC (rev 200345)
@@ -0,0 +1,22 @@
+[Desktop Entry]
+Type=Application
+Name=MPlayer Media Player
+Name[ca]=Reproductor multimèdia MPlayer
+Name[pl]=MPlayer odtwarzacz multimedialny
+GenericName=Multimedia player
+Comment=Play movies and songs
+Comment[ca]=Reproduïu vídeos i cançons
+Comment[de]=Filme und Musik abspielen
+Comment[es]=Reproduzca vídeos y canciones
+Comment[fr]=Lecteur multimédia
+Comment[it]=Lettore multimediale
+Comment[zh]=多媒体播放器
+Comment[pl]=Odtwarzaj filmy i muzykę
+Icon=mplayer
+TryExec=mplayer
+Exec=mplayer %F
+Terminal=false
+NoDisplay=true
+Categories=GTK;AudioVideo;Audio;Video;Player;TV;
+MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;
+X-KDE-Protocols=http,ftp,smb
Deleted: extra-x86_64/mplayer.install
===================================================================
--- extra-x86_64/mplayer.install 2013-11-26 19:19:01 UTC (rev 200344)
+++ extra-x86_64/mplayer.install 2013-11-26 19:19:27 UTC (rev 200345)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: mplayer/repos/extra-x86_64/mplayer.install (from rev 200344, mplayer/trunk/mplayer.install)
===================================================================
--- extra-x86_64/mplayer.install (rev 0)
+++ extra-x86_64/mplayer.install 2013-11-26 19:19:27 UTC (rev 200345)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: extra-x86_64/mplayer.png
===================================================================
(Binary files differ)
Copied: mplayer/repos/extra-x86_64/mplayer.png (from rev 200344, mplayer/trunk/mplayer.png)
===================================================================
(Binary files differ)
More information about the arch-commits
mailing list