[arch-commits] Commit in mplayer/repos (16 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Sat Apr 18 11:06:52 UTC 2015
Date: Saturday, April 18, 2015 @ 13:06:51
Author: bpiotrowski
Revision: 237398
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
mplayer/repos/staging-i686/
mplayer/repos/staging-i686/PKGBUILD
(from rev 237397, mplayer/trunk/PKGBUILD)
mplayer/repos/staging-i686/cdio-includes.patch
(from rev 237397, mplayer/trunk/cdio-includes.patch)
mplayer/repos/staging-i686/include-samba-4.0.patch
(from rev 237397, mplayer/trunk/include-samba-4.0.patch)
mplayer/repos/staging-i686/mplayer.desktop
(from rev 237397, mplayer/trunk/mplayer.desktop)
mplayer/repos/staging-i686/mplayer.install
(from rev 237397, mplayer/trunk/mplayer.install)
mplayer/repos/staging-i686/mplayer.png
(from rev 237397, mplayer/trunk/mplayer.png)
mplayer/repos/staging-i686/revert-icl-fixes.patch
(from rev 237397, mplayer/trunk/revert-icl-fixes.patch)
mplayer/repos/staging-x86_64/
mplayer/repos/staging-x86_64/PKGBUILD
(from rev 237397, mplayer/trunk/PKGBUILD)
mplayer/repos/staging-x86_64/cdio-includes.patch
(from rev 237397, mplayer/trunk/cdio-includes.patch)
mplayer/repos/staging-x86_64/include-samba-4.0.patch
(from rev 237397, mplayer/trunk/include-samba-4.0.patch)
mplayer/repos/staging-x86_64/mplayer.desktop
(from rev 237397, mplayer/trunk/mplayer.desktop)
mplayer/repos/staging-x86_64/mplayer.install
(from rev 237397, mplayer/trunk/mplayer.install)
mplayer/repos/staging-x86_64/mplayer.png
(from rev 237397, mplayer/trunk/mplayer.png)
mplayer/repos/staging-x86_64/revert-icl-fixes.patch
(from rev 237397, mplayer/trunk/revert-icl-fixes.patch)
----------------------------------------+
staging-i686/PKGBUILD | 118 +++++++++++++++++++++++++++++++
staging-i686/cdio-includes.patch | 43 +++++++++++
staging-i686/include-samba-4.0.patch | 12 +++
staging-i686/mplayer.desktop | 22 +++++
staging-i686/mplayer.install | 11 ++
staging-i686/revert-icl-fixes.patch | 66 +++++++++++++++++
staging-x86_64/PKGBUILD | 118 +++++++++++++++++++++++++++++++
staging-x86_64/cdio-includes.patch | 43 +++++++++++
staging-x86_64/include-samba-4.0.patch | 12 +++
staging-x86_64/mplayer.desktop | 22 +++++
staging-x86_64/mplayer.install | 11 ++
staging-x86_64/revert-icl-fixes.patch | 66 +++++++++++++++++
12 files changed, 544 insertions(+)
Copied: mplayer/repos/staging-i686/PKGBUILD (from rev 237397, mplayer/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-04-18 11:06:51 UTC (rev 237398)
@@ -0,0 +1,118 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgbase=mplayer
+pkgname=('mplayer' 'mencoder')
+pkgver=37379
+pkgrel=3
+arch=('i686' 'x86_64')
+makedepends=(
+ 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
+ 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca'
+ 'faac' 'faad2' 'lirc' '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' 'subversion' 'x264' 'libx264' 'rtmpdump' 'gnutls'
+ 'gsm' 'libdvdcss' 'libdvdread' 'libdvdnav'
+)
+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.2.tar.bz2
+ mplayer.desktop
+ cdio-includes.patch
+ include-samba-4.0.patch
+ revert-icl-fixes.patch)
+md5sums=('SKIP'
+ 'e75d598921285d6775f20164a91936ac'
+ '62f44a58f072b2b1a3c3d3e4976d64b3'
+ '7b5be7191aafbea64218dc4916343bbc'
+ '868a92bdef148df7f38bfa992b26ce9d'
+ '3579402002b7302fdf2d146639333efd')
+
+pkgver() {
+ cd $pkgbase-$pkgver
+ svnversion
+}
+
+prepare() {
+ cd $pkgbase-$pkgver
+ mv ../ffmpeg-*/ ./ffmpeg
+
+ patch -p0 -i ../cdio-includes.patch
+ patch -p1 -i ../include-samba-4.0.patch
+ patch -Np0 -i ../revert-icl-fixes.patch
+
+ ./version.sh
+}
+
+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='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'
+ 'lirc' 'libx264' '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' 'rtmpdump'
+ 'gsm' 'gnutls' 'libdvdnav'
+ )
+
+ 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 ../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' 'libx264' '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' 'rtmpdump' 'gsm' 'libdvdnav'
+ )
+
+ make -C $pkgbase-$pkgver DESTDIR="$pkgdir" install-mencoder install-mencoder-man
+ find "$pkgdir"/usr/share/man -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
+}
Copied: mplayer/repos/staging-i686/cdio-includes.patch (from rev 237397, mplayer/trunk/cdio-includes.patch)
===================================================================
--- staging-i686/cdio-includes.patch (rev 0)
+++ staging-i686/cdio-includes.patch 2015-04-18 11:06:51 UTC (rev 237398)
@@ -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>
Copied: mplayer/repos/staging-i686/include-samba-4.0.patch (from rev 237397, mplayer/trunk/include-samba-4.0.patch)
===================================================================
--- staging-i686/include-samba-4.0.patch (rev 0)
+++ staging-i686/include-samba-4.0.patch 2015-04-18 11:06:51 UTC (rev 237398)
@@ -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"
Copied: mplayer/repos/staging-i686/mplayer.desktop (from rev 237397, mplayer/trunk/mplayer.desktop)
===================================================================
--- staging-i686/mplayer.desktop (rev 0)
+++ staging-i686/mplayer.desktop 2015-04-18 11:06:51 UTC (rev 237398)
@@ -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
Copied: mplayer/repos/staging-i686/mplayer.install (from rev 237397, mplayer/trunk/mplayer.install)
===================================================================
--- staging-i686/mplayer.install (rev 0)
+++ staging-i686/mplayer.install 2015-04-18 11:06:51 UTC (rev 237398)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: mplayer/repos/staging-i686/mplayer.png (from rev 237397, mplayer/trunk/mplayer.png)
===================================================================
(Binary files differ)
Copied: mplayer/repos/staging-i686/revert-icl-fixes.patch (from rev 237397, mplayer/trunk/revert-icl-fixes.patch)
===================================================================
--- staging-i686/revert-icl-fixes.patch (rev 0)
+++ staging-i686/revert-icl-fixes.patch 2015-04-18 11:06:51 UTC (rev 237398)
@@ -0,0 +1,66 @@
+Index: libmpcodecs/vf_fspp.c
+===================================================================
+--- libmpcodecs/vf_fspp.c (revision 37183)
++++ libmpcodecs/vf_fspp.c (revision 37181)
+@@ -1598,10 +1598,6 @@
+
+ : "+S"(data), "+D"(output), "+c"(cnt), "=o"(temps)
+ : "d"(thr_adr)
+- NAMED_CONSTRAINTS_ADD(ff_MM_FIX_0_707106781,MM_2,MM_FIX_1_414213562_A,MM_FIX_1_414213562,MM_FIX_0_382683433,
+- ff_MM_FIX_0_541196100,MM_FIX_1_306562965,MM_FIX_0_847759065)
+- NAMED_CONSTRAINTS_ADD(MM_FIX_0_566454497,MM_FIX_0_198912367,MM_FIX_2_613125930,MM_FIX_1_847759065,
+- MM_FIX_1_082392200)
+ : "%"REG_a
+ );
+ }
+@@ -1871,8 +1867,6 @@
+
+ : "+S"(workspace), "+D"(output_adr), "+c"(cnt), "=o"(temps)
+ : "a"(output_stride*sizeof(short))
+- NAMED_CONSTRAINTS_ADD(MM_FIX_1_414213562_A,MM_FIX_2_613125930,MM_FIX_1_847759065,MM_FIX_1_082392200,
+- MM_FIX_1_414213562,MM_DESCALE_RND)
+ : "%"REG_d
+ );
+ }
+@@ -1980,10 +1974,10 @@
+ "movd (%%"REG_S",%%"REG_a",2), %%mm3 \n\t" //5
+ "paddw %%mm4, %%mm1 \n\t"
+
+- "movq %%mm5, %3 \n\t" //t7
++ "movq %%mm5, 0*8+%3 \n\t" //t7
+ "punpcklbw %%mm7, %%mm3 \n\t"
+
+- "movq %%mm6, %4 \n\t" //t6
++ "movq %%mm6, 1*8+%3 \n\t" //t6
+ "movq %%mm2, %%mm4 \n\t"
+
+ "movd (%%"REG_S"), %%mm5 \n\t" //3
+@@ -2029,7 +2023,7 @@
+ "psubw %%mm1, %%mm5 \n\t" //d1
+ "movq %%mm0, %%mm6 \n\t"
+
+- "movq %4, %%mm1 \n\t"
++ "movq 1*8+%3, %%mm1 \n\t"
+ "punpcklwd %%mm5, %%mm0 \n\t"
+
+ "punpckhwd %%mm5, %%mm6 \n\t"
+@@ -2053,7 +2047,7 @@
+ "movq %%mm7, "DCTSIZE_S"*3*2(%%"REG_D") \n\t"
+ "psllw $2, %%mm3 \n\t" //t10
+
+- "movq %3, %%mm2 \n\t"
++ "movq 0*8+%3, %%mm2 \n\t"
+ "psllw $2, %%mm4 \n\t" //t11
+
+ "pmulhw "MANGLE(MM_FIX_0_707106781)", %%mm4 \n\t" //z3
+@@ -2116,9 +2110,8 @@
+ "dec %%"REG_c" \n\t"
+ "jnz 6b \n\t"
+
+- : "+S"(pixels), "+D"(data), "+c"(cnt), "=o"(temps), "=o"(temps[1])
++ : "+S"(pixels), "+D"(data), "+c"(cnt), "=o"(temps)
+ : "a"(line_size)
+- NAMED_CONSTRAINTS_ADD(ff_MM_FIX_0_707106781,ff_MM_FIX_0_541196100,MM_FIX_0_382683433,MM_FIX_1_306562965)
+ : "%"REG_d);
+ }
+
Copied: mplayer/repos/staging-x86_64/PKGBUILD (from rev 237397, mplayer/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-04-18 11:06:51 UTC (rev 237398)
@@ -0,0 +1,118 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgbase=mplayer
+pkgname=('mplayer' 'mencoder')
+pkgver=37379
+pkgrel=3
+arch=('i686' 'x86_64')
+makedepends=(
+ 'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
+ 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca'
+ 'faac' 'faad2' 'lirc' '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' 'subversion' 'x264' 'libx264' 'rtmpdump' 'gnutls'
+ 'gsm' 'libdvdcss' 'libdvdread' 'libdvdnav'
+)
+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.2.tar.bz2
+ mplayer.desktop
+ cdio-includes.patch
+ include-samba-4.0.patch
+ revert-icl-fixes.patch)
+md5sums=('SKIP'
+ 'e75d598921285d6775f20164a91936ac'
+ '62f44a58f072b2b1a3c3d3e4976d64b3'
+ '7b5be7191aafbea64218dc4916343bbc'
+ '868a92bdef148df7f38bfa992b26ce9d'
+ '3579402002b7302fdf2d146639333efd')
+
+pkgver() {
+ cd $pkgbase-$pkgver
+ svnversion
+}
+
+prepare() {
+ cd $pkgbase-$pkgver
+ mv ../ffmpeg-*/ ./ffmpeg
+
+ patch -p0 -i ../cdio-includes.patch
+ patch -p1 -i ../include-samba-4.0.patch
+ patch -Np0 -i ../revert-icl-fixes.patch
+
+ ./version.sh
+}
+
+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='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'
+ 'lirc' 'libx264' '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' 'rtmpdump'
+ 'gsm' 'gnutls' 'libdvdnav'
+ )
+
+ 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 ../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' 'libx264' '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' 'rtmpdump' 'gsm' 'libdvdnav'
+ )
+
+ make -C $pkgbase-$pkgver DESTDIR="$pkgdir" install-mencoder install-mencoder-man
+ find "$pkgdir"/usr/share/man -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
+}
Copied: mplayer/repos/staging-x86_64/cdio-includes.patch (from rev 237397, mplayer/trunk/cdio-includes.patch)
===================================================================
--- staging-x86_64/cdio-includes.patch (rev 0)
+++ staging-x86_64/cdio-includes.patch 2015-04-18 11:06:51 UTC (rev 237398)
@@ -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>
Copied: mplayer/repos/staging-x86_64/include-samba-4.0.patch (from rev 237397, mplayer/trunk/include-samba-4.0.patch)
===================================================================
--- staging-x86_64/include-samba-4.0.patch (rev 0)
+++ staging-x86_64/include-samba-4.0.patch 2015-04-18 11:06:51 UTC (rev 237398)
@@ -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"
Copied: mplayer/repos/staging-x86_64/mplayer.desktop (from rev 237397, mplayer/trunk/mplayer.desktop)
===================================================================
--- staging-x86_64/mplayer.desktop (rev 0)
+++ staging-x86_64/mplayer.desktop 2015-04-18 11:06:51 UTC (rev 237398)
@@ -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
Copied: mplayer/repos/staging-x86_64/mplayer.install (from rev 237397, mplayer/trunk/mplayer.install)
===================================================================
--- staging-x86_64/mplayer.install (rev 0)
+++ staging-x86_64/mplayer.install 2015-04-18 11:06:51 UTC (rev 237398)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: mplayer/repos/staging-x86_64/mplayer.png (from rev 237397, mplayer/trunk/mplayer.png)
===================================================================
(Binary files differ)
Copied: mplayer/repos/staging-x86_64/revert-icl-fixes.patch (from rev 237397, mplayer/trunk/revert-icl-fixes.patch)
===================================================================
--- staging-x86_64/revert-icl-fixes.patch (rev 0)
+++ staging-x86_64/revert-icl-fixes.patch 2015-04-18 11:06:51 UTC (rev 237398)
@@ -0,0 +1,66 @@
+Index: libmpcodecs/vf_fspp.c
+===================================================================
+--- libmpcodecs/vf_fspp.c (revision 37183)
++++ libmpcodecs/vf_fspp.c (revision 37181)
+@@ -1598,10 +1598,6 @@
+
+ : "+S"(data), "+D"(output), "+c"(cnt), "=o"(temps)
+ : "d"(thr_adr)
+- NAMED_CONSTRAINTS_ADD(ff_MM_FIX_0_707106781,MM_2,MM_FIX_1_414213562_A,MM_FIX_1_414213562,MM_FIX_0_382683433,
+- ff_MM_FIX_0_541196100,MM_FIX_1_306562965,MM_FIX_0_847759065)
+- NAMED_CONSTRAINTS_ADD(MM_FIX_0_566454497,MM_FIX_0_198912367,MM_FIX_2_613125930,MM_FIX_1_847759065,
+- MM_FIX_1_082392200)
+ : "%"REG_a
+ );
+ }
+@@ -1871,8 +1867,6 @@
+
+ : "+S"(workspace), "+D"(output_adr), "+c"(cnt), "=o"(temps)
+ : "a"(output_stride*sizeof(short))
+- NAMED_CONSTRAINTS_ADD(MM_FIX_1_414213562_A,MM_FIX_2_613125930,MM_FIX_1_847759065,MM_FIX_1_082392200,
+- MM_FIX_1_414213562,MM_DESCALE_RND)
+ : "%"REG_d
+ );
+ }
+@@ -1980,10 +1974,10 @@
+ "movd (%%"REG_S",%%"REG_a",2), %%mm3 \n\t" //5
+ "paddw %%mm4, %%mm1 \n\t"
+
+- "movq %%mm5, %3 \n\t" //t7
++ "movq %%mm5, 0*8+%3 \n\t" //t7
+ "punpcklbw %%mm7, %%mm3 \n\t"
+
+- "movq %%mm6, %4 \n\t" //t6
++ "movq %%mm6, 1*8+%3 \n\t" //t6
+ "movq %%mm2, %%mm4 \n\t"
+
+ "movd (%%"REG_S"), %%mm5 \n\t" //3
+@@ -2029,7 +2023,7 @@
+ "psubw %%mm1, %%mm5 \n\t" //d1
+ "movq %%mm0, %%mm6 \n\t"
+
+- "movq %4, %%mm1 \n\t"
++ "movq 1*8+%3, %%mm1 \n\t"
+ "punpcklwd %%mm5, %%mm0 \n\t"
+
+ "punpckhwd %%mm5, %%mm6 \n\t"
+@@ -2053,7 +2047,7 @@
+ "movq %%mm7, "DCTSIZE_S"*3*2(%%"REG_D") \n\t"
+ "psllw $2, %%mm3 \n\t" //t10
+
+- "movq %3, %%mm2 \n\t"
++ "movq 0*8+%3, %%mm2 \n\t"
+ "psllw $2, %%mm4 \n\t" //t11
+
+ "pmulhw "MANGLE(MM_FIX_0_707106781)", %%mm4 \n\t" //z3
+@@ -2116,9 +2110,8 @@
+ "dec %%"REG_c" \n\t"
+ "jnz 6b \n\t"
+
+- : "+S"(pixels), "+D"(data), "+c"(cnt), "=o"(temps), "=o"(temps[1])
++ : "+S"(pixels), "+D"(data), "+c"(cnt), "=o"(temps)
+ : "a"(line_size)
+- NAMED_CONSTRAINTS_ADD(ff_MM_FIX_0_707106781,ff_MM_FIX_0_541196100,MM_FIX_0_382683433,MM_FIX_1_306562965)
+ : "%"REG_d);
+ }
+
More information about the arch-commits
mailing list