diff options
| -rw-r--r-- | .SRCINFO | 145 | ||||
| -rw-r--r-- | PKGBUILD | 59 | ||||
| -rw-r--r-- | include-samba-4.0.patch | 12 | ||||
| -rw-r--r-- | mplayer-gui-svn.install | 8 | ||||
| -rw-r--r-- | revert-icl-fixes.patch | 66 |
5 files changed, 290 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..e9fdcf8cb8c6 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,145 @@ +pkgbase = mplayer-gui-svn + pkgdesc = Media player for Linux - SVN version + pkgver = 38214M + pkgrel = 1 + url = http://www.mplayerhq.hu/ + install = mplayer-gui-svn.install + arch = i686 + arch = x86_64 + license = GPL + makedepends = xorgproto + makedepends = libxxf86vm + makedepends = libmad + makedepends = libxinerama + makedepends = libmng + makedepends = libxss + makedepends = smbclient + makedepends = aalib + makedepends = jack2 + makedepends = libcaca + makedepends = faac + makedepends = faad2 + makedepends = lirc + makedepends = libxv + makedepends = libxvmc + makedepends = enca + makedepends = libdca + makedepends = a52dec + makedepends = libvpx + makedepends = unzip + makedepends = mesa + makedepends = live-media + makedepends = yasm + makedepends = git + makedepends = mpg123 + makedepends = ladspa + makedepends = libcdio + makedepends = zlib + makedepends = libcdio-paranoia + makedepends = x264 + makedepends = rtmpdump + makedepends = libdvdcss + makedepends = libdvdread + makedepends = libdvdnav + makedepends = ffmpeg + makedepends = giflib + makedepends = libbs2b + makedepends = fribidi + makedepends = opus + makedepends = libvorbis + makedepends = gsm + makedepends = libpulse + makedepends = alsa-lib + makedepends = glibc + makedepends = libass + makedepends = libjpeg + makedepends = libpng + makedepends = libogg + makedepends = libtheora + makedepends = libbluray + makedepends = xvidcore + makedepends = ncurses + makedepends = fontconfig + makedepends = freetype2 + makedepends = libx11 + makedepends = libxext + makedepends = libvdpau + makedepends = libgl + makedepends = lame + makedepends = desktop-file-utils + makedepends = ttf-font + makedepends = openal + makedepends = speex + makedepends = libmpeg2 + depends = desktop-file-utils + depends = ttf-font + depends = enca + depends = libxss + depends = a52dec + depends = libvpx + depends = lirc + depends = x264 + depends = libmng + depends = libdca + depends = aalib + depends = libxinerama + depends = smbclient + depends = jack2 + depends = libmad + depends = libcaca + depends = libxxf86vm + depends = faac + depends = faad2 + depends = libxv + depends = libxvmc + depends = mpg123 + depends = libx11 + depends = libcdio + depends = libcdio-paranoia + depends = rtmpdump + depends = libdvdread + depends = libdvdnav + depends = ffmpeg + depends = libbs2b + depends = alsa-lib + depends = giflib + depends = glibc + depends = libass + depends = zlib + depends = libjpeg + depends = libpng + depends = libpulse + depends = libogg + depends = fribidi + depends = libtheora + depends = libvorbis + depends = libbluray + depends = xvidcore + depends = ncurses + depends = fontconfig + depends = freetype2 + depends = libxext + depends = libvdpau + depends = libgl + depends = openal + depends = speex + depends = libmpeg2 + depends = glibc + depends = lame + depends = subversion + provides = mplayer + provides = mencoder + conflicts = mplayer + conflicts = mencoder + options = !emptydirs + source = mplayer::svn://svn.mplayerhq.hu/mplayer/trunk + source = https://mplayerhq.hu/MPlayer/skins/Blue-1.13.tar.bz2 + source = include-samba-4.0.patch + source = revert-icl-fixes.patch + sha512sums = SKIP + sha512sums = SKIP + sha512sums = SKIP + sha512sums = SKIP + +pkgname = mplayer-gui-svn + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..126d3684c05a --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,59 @@ +# Contributor: Bitts311 <oceanmail311@gmail.com> + +##Select your language - all bg cs da de el en es fr hu it ja ko mk nb nl pl ro ru sk sv tr uk pt_BR zh_CN zh_TW + +pkgname=mplayer-gui-svn +pkgver=38214M +pkgrel=1 +pkgdesc='Media player for Linux - SVN version' +url='http://www.mplayerhq.hu/' +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc' 'x264' 'libmng' 'libdca' 'aalib' 'libxinerama' 'smbclient' 'jack2' 'libmad' 'libcaca' 'libxxf86vm' 'faac' 'faad2' 'libxv' 'libxvmc' 'mpg123' 'libx11' 'libcdio' 'libcdio-paranoia' 'rtmpdump' 'libdvdread' 'libdvdnav' 'ffmpeg' 'libbs2b' 'alsa-lib' 'giflib' 'glibc' 'libass' 'zlib' 'libjpeg' 'libpng' 'libpulse' 'libogg' 'fribidi' 'libtheora' 'libvorbis' 'libbluray' 'xvidcore' 'ncurses' 'fontconfig' 'freetype2' 'libxext' 'libvdpau' 'libgl' 'openal' 'speex' 'libmpeg2' 'glibc' 'lame' 'subversion' +) + +makedepends=('xorgproto' 'libxxf86vm' 'libmad' 'libxinerama' 'libmng' 'libxss' 'smbclient' 'aalib' 'jack2' 'libcaca' 'faac' 'faad2' 'lirc' 'libxv' 'libxvmc' 'enca' 'libdca' 'a52dec' 'libvpx' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'mpg123' 'ladspa' 'libcdio' 'zlib' 'libcdio-paranoia' 'x264' 'rtmpdump' 'libdvdcss' 'libdvdread' 'libdvdnav' 'ffmpeg' 'giflib' 'libbs2b' 'fribidi' 'opus' 'libvorbis' 'gsm' 'libpulse' 'alsa-lib' 'glibc' 'libass' 'libjpeg' 'libpng' 'libogg' 'libtheora' 'libbluray' 'xvidcore' 'ncurses' 'fontconfig' 'freetype2' 'libx11' 'libxext' 'libvdpau' 'libgl' 'lame' 'desktop-file-utils' 'ttf-font' 'openal' 'speex' 'libmpeg2' +) + +conflicts=('mplayer' 'mencoder') +provides=('mplayer' 'mencoder') +install=mplayer-gui-svn.install +options=('!emptydirs') +source=("mplayer::svn://svn.mplayerhq.hu/mplayer/trunk" + "https://mplayerhq.hu/MPlayer/skins/Blue-1.13.tar.bz2" + include-samba-4.0.patch + revert-icl-fixes.patch +) +sha512sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' +) + +pkgver() { + cd "mplayer" + svnversion +} + +prepare() { + cd "mplayer" + + patch -p1 < "../include-samba-4.0.patch" + patch -p0 < "../revert-icl-fixes.patch" + sed -E "s|(#include <samba-4.0/libsmbclient.h>)|#include <time.h>\n\1|g" -i stream/stream_smb.c + ./version.sh +} + + +build() { + cd "mplayer" + ./configure --prefix=/usr --enable-runtime-cpudetection --enable-gui --enable-gl --language=all --language-msg=all --enable-smb + make +} + +package() { + cd "mplayer" + make DESTDIR="$pkgdir" install + mv $srcdir/Blue $pkgdir/usr/share/mplayer/skins/default +} + diff --git a/include-samba-4.0.patch b/include-samba-4.0.patch new file mode 100644 index 000000000000..2ed272b6a5f3 --- /dev/null +++ b/include-samba-4.0.patch @@ -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" diff --git a/mplayer-gui-svn.install b/mplayer-gui-svn.install new file mode 100644 index 000000000000..ce17dfd03d93 --- /dev/null +++ b/mplayer-gui-svn.install @@ -0,0 +1,8 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_remove() { + post_install +} diff --git a/revert-icl-fixes.patch b/revert-icl-fixes.patch new file mode 100644 index 000000000000..e5f049ff514c --- /dev/null +++ b/revert-icl-fixes.patch @@ -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); + } + |