diff --git a/multimedia/video/mplayer/actions.py b/multimedia/video/mplayer/actions.py index 4a0ec30285..34d488450c 100755 --- a/multimedia/video/mplayer/actions.py +++ b/multimedia/video/mplayer/actions.py @@ -13,14 +13,20 @@ from pisi.actionsapi import pythonmodules pisitools.flags.sub("-O[\ds]+", "-O3") def setup(): + shelltools.system('sed -E "s|(#include )|#include \n\1|g" -i stream/stream_smb.c ./version.sh') autotools.rawConfigure('\ --prefix=/usr \ + --libdir=/usr/lib \ --confdir=/usr/share/mplayer \ --enable-dynamic-plugins \ --enable-menu \ + --enable-x11 \ --datadir=/usr/share/mplayer \ --charset=UTF-8 \ - --language=en \ + --enable-xvmc \ + --enable-smb \ + --enable-radio \ + --enable-radio-capture \ --enable-gui') def build(): @@ -35,7 +41,8 @@ def install(): MANDIR=%(D)s/usr/share/man" % {"D": get.installDIR()}) # set the default skin for gui - shelltools.copytree("mplayer-1.2_pre37124/Blue-multilingual", "%s/usr/share/mplayer/skins/default" % get.installDIR()) + #shelltools.copytree("mplayer-1.2_pre37124/Blue-multilingual", "%s/usr/share/mplayer/skins/default" % get.installDIR()) + shelltools.copytree("Clearlooks-multilingual", "%s/usr/share/mplayer/skins/default" % get.installDIR()) # codecs conf, not something user will interact with pisitools.insinto("/etc/mplayer", "etc/*.conf") diff --git a/multimedia/video/mplayer/files/include-samba-4.0.patch b/multimedia/video/mplayer/files/include-samba-4.0.patch new file mode 100644 index 0000000000..2ed272b6a5 --- /dev/null +++ b/multimedia/video/mplayer/files/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 ++#include + #include + + #include "mp_msg.h" diff --git a/multimedia/video/mplayer/files/x11-libs.patch b/multimedia/video/mplayer/files/x11-libs.patch new file mode 100644 index 0000000000..4b56903f21 --- /dev/null +++ b/multimedia/video/mplayer/files/x11-libs.patch @@ -0,0 +1,11 @@ +--- ./configure.orig ++++ ./configure +@@ -4394,6 +4394,7 @@ + if test "$_x11" = yes ; then + def_x11='#define CONFIG_X11 1' + vomodules="x11 xover $vomodules" ++ libs_mplayer="$libs_mplayer -lX11 -lXext" + else + _x11=no + def_x11='#undef CONFIG_X11' + diff --git a/multimedia/video/mplayer/pspec.xml b/multimedia/video/mplayer/pspec.xml index eb5f7d9ddb..d40a9287bb 100755 --- a/multimedia/video/mplayer/pspec.xml +++ b/multimedia/video/mplayer/pspec.xml @@ -15,7 +15,8 @@ Media Player for Linux MPlayer is a movie player that can run on many platforms. It plays most MPEG/VOB, AVI, Ogg/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4, RealMedia, Matroska, NUT, NuppelVideo, FLI, YUV4MPEG, FILM, RoQ, PVA files, supported by many native codecs. http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.4.tar.xz - https://sourceforge.net/projects/pisilinux/files/source/Blue-multilingual-1.13.2.tar.bz2 + + https://mplayerhq.hu/MPlayer/skins/Clearlooks-multilingual-2.0.3.tar.bz2 gsm-devel glib2-devel @@ -61,7 +62,7 @@ rtmpdump-devel libmpeg2-devel alsa-lib-devel - openjpeg-devel + openjpeg2-devel DirectFB-devel libtheora-devel libmpcdec-devel @@ -87,6 +88,8 @@ lzo-devel zlib-devel bzip2 + live555-devel + libraw1394-devel cdparanoia-devel yasm-devel gnutls-devel @@ -101,7 +104,8 @@ tr-locale-fix.patch - + include-samba-4.0.patch + x11-libs.patch @@ -143,8 +147,8 @@ twolame libXext DirectFB - openjpeg alsa-lib + openjpeg2 libvdpau rtmpdump libmpeg2 @@ -221,6 +225,13 @@ + + 2019-11-16 + 1.4 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2019-04-27 1.4