Skip to content
This repository
Browse code

mplayer: lets test it

  • Loading branch information...
commit 2be9d6bf44df3a316edc2b553fb5bfc237bfb6ae 1 parent 2325f87
Serdar Soytetir obsoleteman authored
51 multimedia/video/mplayer/actions.py
@@ -14,10 +14,10 @@
14 14
15 15 import os
16 16
17   -WorkDir = "mplayer"
18   -gcc_version = "4.3.5"
19   -mp_version = "32752"
20   -ff_version = "26223"
  17 +#WorkDir = "mplayer"
  18 +gcc_version = "4.7.2"
  19 +mp_version = "1.1"
  20 +ff_version = "1.0"
21 21
22 22 def fixPermissions(dest):
23 23 for root, dirs, files in os.walk(dest):
@@ -33,15 +33,17 @@ def setup():
33 33 # to keep the source tarball small and avoid sandbox violation from subversion we remove .svn folders
34 34 shelltools.unlink("version.sh")
35 35 shelltools.echo("version.sh", '#!/bin/bash\necho "#define VERSION \\\"SVN-r%s-%s\\\"" > version.h' % (mp_version, gcc_version))
36   - shelltools.echo("version.sh", 'echo "#define MP_TITLE \\\"%s \\\"VERSION\\\" (C) 2000-2010 MPlayer Team\\n\\\"" >> version.h')
  36 + shelltools.echo("version.sh", 'echo "#define MP_TITLE \\\"%s \\\"VERSION\\\" (C) 2000-2012 MPlayer Team\\n\\\"" >> version.h')
37 37 shelltools.chmod("version.sh", 0755)
38 38
39 39 shelltools.export("CFLAGS", "%s -O3" % get.CFLAGS())
40 40 shelltools.export("CXXFLAGS", "%s -O3" % get.CXXFLAGS())
  41 + shelltools.export("LDFLAGS", "%s " % get.LDFLAGS())
41 42
42 43 autotools.rawConfigure('--prefix=/usr \
43 44 --confdir=/usr/share/mplayer \
44 45 --datadir=/usr/share/mplayer \
  46 + --enable-gui \
45 47 --disable-3dfx \
46 48 --disable-altivec \
47 49 --disable-arts \
@@ -64,7 +66,6 @@ def setup():
64 66 --enable-ass \
65 67 --enable-bl \
66 68 --enable-caca \
67   - --enable-cdparanoia \
68 69 --enable-cmov \
69 70 --enable-dvb \
70 71 --enable-dvdnav \
@@ -73,15 +74,13 @@ def setup():
73 74 --enable-freetype \
74 75 --enable-ftp \
75 76 --enable-gif \
  77 + --enable-png \
76 78 --enable-gl \
77   - --enable-gui \
78 79 --enable-inet6 \
79 80 --enable-jack \
80 81 --enable-joystick \
81 82 --enable-jpeg \
82 83 --enable-langinfo \
83   - --enable-largefiles \
84   - --enable-libcdio \
85 84 --enable-liblzo \
86 85 --enable-libopencore_amrnb \
87 86 --enable-libopencore_amrwb \
@@ -97,7 +96,7 @@ def setup():
97 96 --enable-ossaudio \
98 97 --enable-png \
99 98 --enable-pulse \
100   - --enable-radio \
  99 + --enable-radio-v4l2 \
101 100 --enable-radio-capture \
102 101 --enable-radio-v4l2 \
103 102 --enable-real \
@@ -110,32 +109,39 @@ def setup():
110 109 --enable-sse2 \
111 110 --enable-tga \
112 111 --enable-tv \
113   - --enable-tv-v4l1 \
  112 + --disable-tv-v4l1 \
114 113 --enable-tv-v4l2 \
115 114 --enable-unrarexec \
116 115 --enable-v4l2 \
117   - --enable-v4lw \
118   - --enable-vaapi \
119 116 --disable-vdpau \
120 117 --enable-x11 \
121 118 --enable-xf86keysym \
122 119 --enable-xinerama \
123 120 --enable-xshape \
124 121 --enable-xv \
  122 + --enable-fontconfig \
  123 + --enable-xvid \
  124 + --enable-theora \
  125 + --enable-bluray \
  126 + --enable-ffmpeg_a \
  127 + --language=tr \
  128 + --disable-ass-internal \
125 129 --enable-xvmc \
126 130 --with-xvmclib=XvMCW \
127 131 --charset=UTF-8 \
128   - --extra-libs="-lopenal -ljack -lass" \
  132 + --extra-libs="-lopenal -ljack -lxvidcore -lfontconfig -lass -laa -lX11 -lXext" \
129 133 --disable-rpath' \
130 134 )
131 135
132 136 # stuff that fail hede=yes check, but working with hede=auto
133   - # --disable-faad-external \
134   - # --enable-directfb \
135   - # --enable-fontconfig \
136   - # --enable-xvid \
137   - # --enable-theora \
138   - # --language=tr \
  137 + # do not use: autodetect is fine --enable-cdparanoia and --enable-libcdio
  138 + # --enable-directfb \
  139 + #
  140 + # not ready
  141 + # --enable-live \
  142 + #
  143 + # Maybe used
  144 + # --disable-ffmpeg_so \
139 145
140 146 def build():
141 147 autotools.make()
@@ -166,8 +172,3 @@ def install():
166 172 pisitools.insinto("/%s/%s/" % (get.docDIR(), get.srcNAME()), "TOOLS")
167 173 pisitools.insinto("/%s/%s/" % (get.docDIR(), get.srcNAME()), "DOCS/tech")
168 174 pythonmodules.fixCompiledPy("/usr/share/doc")
169   -
170   - # we will use our own desktop file and icon
171   - pisitools.remove("/usr/share/applications/mplayer.desktop")
172   - pisitools.remove("/usr/share/pixmaps/mplayer.xpm")
173   -
74 multimedia/video/mplayer/files/gentoo/mplayer-1.0_rc4-pkg-config.patch
... ... @@ -0,0 +1,74 @@
  1 +respect $PKG_CONFIG, and use pkg-config for libdvdnav/libdvdread by
  2 +default rather than the ugly xxx-config scripts
  3 +
  4 +https://bugs.gentoo.org/410189
  5 +
  6 +hassle vapier@gentoo.org if this causes issues
  7 +
  8 +--- configure
  9 ++++ configure
  10 +@@ -4042,7 +4042,7 @@ echores "$_apple_ir"
  11 + fi #if linux
  12 +
  13 + echocheck "pkg-config"
  14 +-_pkg_config=pkg-config
  15 ++_pkg_config=${PKG_CONFIG:-pkg-config}
  16 + if $($_pkg_config --version > /dev/null 2>&1); then
  17 + if test "$ld_static"; then
  18 + _pkg_config="$_pkg_config --static"
  19 +@@ -5740,8 +5740,13 @@ if test "$_dvdread_internal" = auto ; th
  20 + elif test "$_dvdread" = auto ; then
  21 + _dvdread=no
  22 + if test "$_dl" = yes; then
  23 +- _dvdreadcflags=$($_dvdreadconfig --cflags 2> /dev/null)
  24 +- _dvdreadlibs=$($_dvdreadconfig --libs 2> /dev/null)
  25 ++ if ! $_pkg_config --exists dvdread ; then
  26 ++ _dvdreadcflags=$($_pkgconfig dvdread --cflags)
  27 ++ _dvdreadlibs=$($_pkgconfig dvdread --libs)
  28 ++ else
  29 ++ _dvdreadcflags=$($_dvdreadconfig --cflags 2> /dev/null)
  30 ++ _dvdreadlibs=$($_dvdreadconfig --libs 2> /dev/null)
  31 ++ fi
  32 + if header_check dvdread/dvd_reader.h $_dvdreadcflags $_dvdreadlibs $ld_dl ; then
  33 + _dvdread=yes
  34 + extra_cflags="$extra_cflags $_dvdreadcflags"
  35 +@@ -7721,13 +7726,20 @@ if test "$_dvdnav" = auto ; then
  36 + dvdnav_internal=yes
  37 + res_comment="internal"
  38 + else
  39 +- $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no
  40 ++ if ! $_pkg_config --exists dvdnavmini ; then
  41 ++ $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no
  42 ++ fi
  43 + fi
  44 + fi
  45 + if test "$_dvdnav" = auto ; then
  46 + _dvdnav=no
  47 +- _dvdnavdir=$($_dvdnavconfig --cflags)
  48 +- _dvdnavlibs=$($_dvdnavconfig --libs)
  49 ++ if $_pkg_config --exists dvdnavmini ; then
  50 ++ _dvdnavdir=$($_pkg_config --cflags dvdnavmini)
  51 ++ _dvdnavlibs=$($_pkg_config --libs dvdnavmini)
  52 ++ else
  53 ++ _dvdnavdir=$($_dvdnavconfig --cflags)
  54 ++ _dvdnavlibs=$($_dvdnavconfig --libs)
  55 ++ fi
  56 + statement_check_broken stdint.h dvdnav/dvdnav.h 'dvdnav_t *dvd = 0' $_dvdnavdir $_dvdnavlibs $ld_dl $ld_pthread && _dvdnav=yes
  57 + fi
  58 + if test "$_dvdnav" = yes ; then
  59 +@@ -7736,8 +7748,13 @@ if test "$_dvdnav" = yes ; then
  60 + cflags_libdvdnav="-Ilibdvdnav"
  61 + inputmodules="dvdnav(internal) $inputmodules"
  62 + else
  63 +- extra_cflags="$extra_cflags $($_dvdnavconfig --cflags)"
  64 +- extra_ldflags="$extra_ldflags $($_dvdnavconfig --minilibs)"
  65 ++ if $_pkg_config --exists dvdnavmini ; then
  66 ++ extra_cflags="$extra_cflags $($_pkg_config --cflags dvdnavmini)"
  67 ++ extra_ldflags="$extra_ldflags $($_pkg_config --libs dvdnavmini)"
  68 ++ else
  69 ++ extra_cflags="$extra_cflags $($_dvdnavconfig --cflags)"
  70 ++ extra_ldflags="$extra_ldflags $($_dvdnavconfig --minilibs)"
  71 ++ fi
  72 + inputmodules="dvdnav $inputmodules"
  73 + fi
  74 + else
19 multimedia/video/mplayer/files/gentoo/mplayer-1.1-codecid.patch
... ... @@ -0,0 +1,19 @@
  1 +r35075 | iive | 2012-08-11 12:42:43 -0400 (Sat, 11 Aug 2012) | 4 lines
  2 +
  3 +Quick Build Fix. FFmpeg CodecID is redefined as AVCodecID.
  4 +It needs the FFmpeg includes in all places that use it.
  5 +
  6 +
  7 +Index: libmpdemux/mp_taglists.h
  8 +===================================================================
  9 +--- libmpdemux/mp_taglists.h (revision 35074)
  10 ++++ libmpdemux/mp_taglists.h (revision 35075)
  11 +@@ -20,6 +20,8 @@
  12 + #define MPLAYER_MP_TAGLISTS_H
  13 +
  14 + #include <stdint.h>
  15 ++#include "libavutil/common.h"
  16 ++#include "libavformat/avformat.h"
  17 +
  18 + enum CodecID mp_tag2codec_id(uint32_t tag, int audio);
  19 + uint32_t mp_codec_id2tag(enum CodecID codec_id, uint32_t old_tag, int audio);
16 multimedia/video/mplayer/files/maegia/mplayer-fix-dvd-crash.patch
... ... @@ -0,0 +1,16 @@
  1 +Index: libmpcodecs/vd_ffmpeg.c
  2 +===================================================================
  3 +--- libmpcodecs/vd_ffmpeg.c (Revision 29857)
  4 ++++ libmpcodecs/vd_ffmpeg.c (Arbeitskopie)
  5 +@@ -118,7 +118,10 @@
  6 + // to set/get/query special features/parameters
  7 + static int control(sh_video_t *sh, int cmd, void *arg, ...){
  8 + vd_ffmpeg_ctx *ctx = sh->context;
  9 +- AVCodecContext *avctx = ctx->avctx;
  10 ++ AVCodecContext *avctx;
  11 ++
  12 ++ if (!ctx) return CONTROL_UNKNOWN;
  13 ++ avctx = ctx->avctx;
  14 + switch(cmd){
  15 + case VDCTRL_QUERY_FORMAT:
  16 + {
22 multimedia/video/mplayer/files/maegia/mplayer-format-string-literal.patch
... ... @@ -0,0 +1,22 @@
  1 +--- mplayer/gui/interface.c.format~ 2012-01-10 00:40:55.977159082 +0100
  2 ++++ mplayer/gui/interface.c 2012-01-10 00:40:58.037155989 +0100
  3 +@@ -1206,7 +1206,7 @@ void gmp_msg(int mod, int lev, const cha
  4 + vsnprintf(msg, sizeof(msg), format, va);
  5 + va_end(va);
  6 +
  7 +- mp_msg(mod, lev, msg);
  8 ++ mp_msg(mod, lev, "%s", msg);
  9 +
  10 + if (mp_msg_test(mod, lev))
  11 + gtkMessageBox(GTK_MB_FATAL, msg);
  12 +--- mplayer/mplayer.c.format~ 2011-12-11 15:44:36.000000000 +0100
  13 ++++ mplayer/mplayer.c 2012-01-10 00:38:44.212356938 +0100
  14 +@@ -2890,7 +2890,7 @@ int main(int argc, char *argv[])
  15 +
  16 + if (!filename && !player_idle_mode && !use_gui) {
  17 + // no file/vcd/dvd -> show HELP:
  18 +- mp_msg(MSGT_CPLAYER, MSGL_INFO, help_text);
  19 ++ mp_msg(MSGT_CPLAYER, MSGL_INFO, "%s", help_text);
  20 + exit_player_with_rc(EXIT_NONE, 0);
  21 + }
  22 +
17 multimedia/video/mplayer/files/maegia/mplayer-have-dlfcn_h.patch
... ... @@ -0,0 +1,17 @@
  1 +Index: libdvdread4/dvd_input.c
  2 +===================================================================
  3 +--- libdvdread4/dvd_input.c (Revision 1166)
  4 ++++ libdvdread4/dvd_input.c (Arbeitskopie)
  5 +@@ -50,12 +50,7 @@
  6 + #else
  7 +
  8 + /* dlopening libdvdcss */
  9 +-#ifdef HAVE_DLFCN_H
  10 + #include <dlfcn.h>
  11 +-#else
  12 +-/* Only needed on MINGW at the moment */
  13 +-#include "../../msvc/contrib/dlfcn.c"
  14 +-#endif
  15 +
  16 + typedef struct dvdcss_s *dvdcss_handle;
  17 + static dvdcss_handle (*DVDcss_open) (const char *);
10 multimedia/video/mplayer/files/maegia/mplayer-mp3lib-no-strict-aliasing.patch
... ... @@ -0,0 +1,10 @@
  1 +--- MPlayer-1.0rc2/mp3lib/Makefile.mp2 2007-10-07 21:49:27.000000000 +0200
  2 ++++ MPlayer-1.0rc2/mp3lib/Makefile 2007-10-09 11:00:41.000000000 +0200
  3 +@@ -1,6 +1,7 @@
  4 + include ../config.mak
  5 +
  6 + LIBNAME_COMMON = libmp3.a
  7 ++CFLAGS += -fno-strict-aliasing
  8 +
  9 + SRCS_COMMON = sr1.c
  10 + SRCS_COMMON-$(HAVE_MMX) += decode_MMX.c
35 ...dia/video/mplayer/files/maegia/mplayer-r34911-dont-use-ffmpeg-functionality-outside-stable-release.patch
... ... @@ -0,0 +1,35 @@
  1 +--- mplayer/fmt-conversion.c.ffmp~ 2012-05-17 02:14:22.204820469 +0200
  2 ++++ mplayer/fmt-conversion.c 2012-05-17 02:10:58.848585265 +0200
  3 +@@ -65,8 +65,10 @@ static const struct {
  4 + {IMGFMT_RGBA, PIX_FMT_RGB0},
  5 + {IMGFMT_RGB64LE, PIX_FMT_RGBA64LE},
  6 + {IMGFMT_RGB64BE, PIX_FMT_RGBA64BE},
  7 ++ /*
  8 + {IMGFMT_422A, PIX_FMT_YUVA422P},
  9 + {IMGFMT_444A, PIX_FMT_YUVA444P},
  10 ++ */
  11 + #endif
  12 + #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 20, 1)
  13 + {IMGFMT_GBR24P, PIX_FMT_GBRP},
  14 +--- mplayer/libmpcodecs/vf_spp.c.ffmp~ 2012-05-17 03:35:04.710553909 +0200
  15 ++++ mplayer/libmpcodecs/vf_spp.c 2012-05-17 03:35:08.653578743 +0200
  16 +@@ -579,7 +579,7 @@ static int vf_open(vf_instance_t *vf, ch
  17 + init_avcodec();
  18 +
  19 + vf->priv->avctx= avcodec_alloc_context3(NULL);
  20 +- ff_dsputil_init(&vf->priv->dsp, vf->priv->avctx);
  21 ++ dsputil_init(&vf->priv->dsp, vf->priv->avctx);
  22 +
  23 + vf->priv->log2_count= 3;
  24 +
  25 +--- mplayer/libmpdemux/mp_taglists.c.ffmp~ 2012-05-17 02:12:08.470008223 +0200
  26 ++++ mplayer/libmpdemux/mp_taglists.c 2012-05-17 05:07:11.200231555 +0200
  27 +@@ -125,7 +125,7 @@ static const struct AVCodecTag mp_bmp_ta
  28 + { CODEC_ID_BMV_VIDEO, MKTAG('B', 'M', 'V', 'V')},
  29 + { CODEC_ID_C93, MKTAG('C', '9', '3', 'V')},
  30 + { CODEC_ID_CDGRAPHICS, MKTAG('C', 'D', 'G', 'R')},
  31 +- { CODEC_ID_CDXL, MKTAG('C', 'D', 'X', 'L')},
  32 ++ /*{ CODEC_ID_CDXL, MKTAG('C', 'D', 'X', 'L')},*/
  33 + { CODEC_ID_CMV, MKTAG('M', 'V', 'I', 'f')},
  34 + { CODEC_ID_DFA, MKTAG('C', 'D', 'F', 'A')},
  35 + { CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n')},
31 multimedia/video/mplayer/files/maegia/mplayer-rtsp-extra-fixes.patch
... ... @@ -0,0 +1,31 @@
  1 +diff -p -up mplayer/stream/librtsp/rtsp_session.c.rtsp-extra-fixes mplayer/stream/librtsp/rtsp_session.c
  2 +--- mplayer/stream/librtsp/rtsp_session.c.rtsp-extra-fixes 2009-07-01 22:01:58.000000000 +0200
  3 ++++ mplayer/stream/librtsp/rtsp_session.c 2009-07-01 22:09:08.000000000 +0200
  4 +@@ -166,8 +166,8 @@ rtsp_session_t *rtsp_session_start(int f
  5 + }
  6 +
  7 + rtsp_session->real_session = init_real_rtsp_session ();
  8 +- if(!strncmp(h->streams[0]->mime_type, "application/vnd.rn-rmadriver", h->streams[0]->mime_type_size) ||
  9 +- !strncmp(h->streams[0]->mime_type, "application/smil", h->streams[0]->mime_type_size)) {
  10 ++ if(h->streams[0] && (!strncmp(h->streams[0]->mime_type, "application/vnd.rn-rmadriver", h->streams[0]->mime_type_size) ||
  11 ++ !strncmp(h->streams[0]->mime_type, "application/smil", h->streams[0]->mime_type_size))) {
  12 + rtsp_session->real_session->header_len = 0;
  13 + rtsp_session->real_session->recv_size = 0;
  14 + rtsp_session->real_session->rdt_rawdata = 1;
  15 +diff -p -up mplayer/stream/realrtsp/sdpplin.c.rtsp-extra-fixes mplayer/stream/realrtsp/sdpplin.c
  16 +--- mplayer/stream/realrtsp/sdpplin.c.rtsp-extra-fixes 2009-07-01 22:01:58.000000000 +0200
  17 ++++ mplayer/stream/realrtsp/sdpplin.c 2009-07-01 22:10:27.000000000 +0200
  18 +@@ -276,6 +276,13 @@ sdpplin_t *sdpplin_parse(char *data) {
  19 +
  20 + if (filter(data, "m=", &buf)) {
  21 + sdpplin_stream_t *stream=sdpplin_parse_stream(&data);
  22 ++ if (!stream) {
  23 ++ mp_msg(MSGT_OPEN, MSGL_ERR, "sdpplin: can't parse stream\n");
  24 ++ free(desc);
  25 ++ free(buf);
  26 ++ free(decoded);
  27 ++ return NULL;
  28 ++ }
  29 + #ifdef LOG
  30 + printf("got data for stream id %u\n", stream->stream_id);
  31 + #endif
69 multimedia/video/mplayer/pspec.xml
@@ -14,8 +14,8 @@
14 14 <IsA>app:console</IsA>
15 15 <Summary>Media Player for Linux</Summary>
16 16 <Description>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.</Description>
17   - <Archive sha1sum="2d6e1c9871c353209fc488044fc994b189e658d9" type="targz">http://cekirdek.pardus.org.tr/~serdar/dist/files/mplayer-32752.tar.gz</Archive>
18   - <Archive sha1sum="6f7522a14c7ff0083990d32f213ff6d8e577821e" type="targz" target="mplayer">http://cekirdek.pardus.org.tr/~serdar/dist/files/MPlayer_default_skin-0.1.tar.gz</Archive>
  17 + <Archive sha1sum="913a4bbeab7cbb515c2f43ad39bc83071b2efd75" type="tarxz">ftp://ftp.mplayerhq.hu/MPlayer/releases/MPlayer-1.1.tar.xz</Archive>
  18 + <Archive sha1sum="6f7522a14c7ff0083990d32f213ff6d8e577821e" type="targz" target="MPlayer-1.1">http://cekirdek.pardus.org.tr/~serdar/dist/files/MPlayer_default_skin-0.1.tar.gz</Archive>
19 19 <BuildDependencies>
20 20 <Dependency>DirectFB-devel</Dependency>
21 21 <Dependency>aalib-devel</Dependency>
@@ -79,55 +79,52 @@
79 79 <Dependency>rtmpdump-devel</Dependency>
80 80 </BuildDependencies>
81 81 <Patches>
  82 + <!-- Maegia Patches -->
  83 + <!--Patch>maegia/mplayer-1.1-fix-live-test.patch</Patch-->
  84 + <Patch>maegia/mplayer-fix-dvd-crash.patch</Patch>
  85 + <Patch level="1">maegia/mplayer-format-string-literal.patch</Patch>
  86 + <Patch>maegia/mplayer-have-dlfcn_h.patch</Patch>
  87 + <Patch level="1">maegia/mplayer-r34911-dont-use-ffmpeg-functionality-outside-stable-release.patch</Patch>
  88 + <Patch level="1">maegia/mplayer-rtsp-extra-fixes.patch</Patch>
  89 +
  90 + <!-- Gentoo Patches -->
  91 + <Patch level="0">gentoo/mplayer-1.0_rc4-pkg-config.patch</Patch>
  92 + <Patch level="0">gentoo/mplayer-1.1-codecid.patch</Patch>
  93 +
82 94 <!-- Bugfix -->
83 95 <Patch level="1">tr-locale-fix.patch</Patch>
84   - <!-- check if still needed
85   - <Patch level="1">noalignmessage.patch</Patch>
86   - -->
87   - <Patch level="1">noframeskiplog.patch</Patch>
  96 +
88 97 <Patch level="1">osdmenu_post_cmd.patch</Patch>
89 98 <Patch level="1">dvbmenu_post_cmd.patch</Patch>
90 99 <Patch level="1">asf_streams.patch</Patch>
91   - <!-- FIXME: is this still needed -->
92 100 <Patch level="1">http-parse.patch</Patch>
93 101 <Patch level="1">vo_keep_window_state.patch</Patch>
94 102
95 103 <Patch>asf_redirect_playlist.patch</Patch>
96 104 <Patch>asf_header_buffer_size.patch</Patch>
97 105 <Patch>center-sdl.patch</Patch>
98   - <!-- FIXME: use this on segfault and normal exit only after \n since some
99   - frontends suck to parse it or teach smplayer how to parse
100   - <Patch>reset-msgcolor-attributes.patch</Patch>
101   - -->
  106 +
102 107 <Patch>fix-dvd-sub.patch</Patch>
103 108 <Patch level="1">demux_mkv_seek.diff</Patch>
104 109 <Patch level="1">awk_path.patch</Patch>
105 110 <Patch level="1">remove_vfw_bframe_warning.patch</Patch>
106 111
107   - <!-- don't let console config mess with gui config -->
108   - <Patch level="1">dont_override_gui_conf.patch</Patch>
109   - <Patch level="1">default_gui_config.patch</Patch>
110   -
111 112 <!-- this is for \n\r in mp_msg when playing in gui -->
112 113 <Patch level="1">erase_to_eof.patch</Patch>
113 114
114 115 <!-- Menu stuff -->
115 116 <Patch level="1">menu-colors.patch</Patch>
116   - <!-- Menu is back to En now
117   - <Patch level="1">menu-locale.patch</Patch>
118   - -->
119   -
  117 + <!-- Menu is back to En now -->
  118 + <!--Patch level="1">menu-locale.patch</Patch -->
  119 +
120 120 <!-- Enhancement -->
121 121 <Patch level="1">alsa_surround.patch</Patch>
122 122 <Patch level="1">mmsplaylist.patch</Patch>
123   - <Patch level="1">config_per_protocol_and_extension-case.patch</Patch>
124   - <Patch level="1">keep_volume_level.patch</Patch>
125 123
126 124 <!-- Demuxer patches for eac3 support, can be epanded for provided samples -->
127   - <Patch level="1">eac3_mkv.patch</Patch>
128 125 <Patch level="1">eac3_codec_id.patch</Patch>
129 126
130   - <!-- for libvaapi support -->
  127 + <!-- for libvaapi support
131 128 <Patch level="1">mplayer-vaapi.patch</Patch>
132 129 <Patch level="1">mplayer-vaapi-menuload.patch</Patch>
133 130 <Patch level="1">mplayer-vaapi-0.29.patch</Patch>
@@ -135,24 +132,10 @@
135 132 <Patch level="1">mplayer-vdpau.patch</Patch>
136 133 <Patch level="1">vaapi_eosd_backports.patch</Patch>
137 134 <Patch level="1">mplayer-vaapi-disable_gtop.patch</Patch>
138   - <!-- too hacky, keep it in case we really need it
  135 + too hacky, keep it in case we really need it
139 136 <Patch level="1">mplayer-vaapi-gma500-workaround.patch</Patch>
140 137 -->
141   -
142   - <Patch level="1">v4lw.patch</Patch>
143   -
144   - <!-- Not needed, for now
145   - <Patch>x264_revert.patch</Patch>
146   - -->
147   -
148   - <!-- CVE-2011-1931 -->
149   - <Patch level="1">ffmpeg.git-89f903b3d5ec38c9c5d90fba7e626fa0eda61a32.patch</Patch>
150   -
151   - <!-- Internal libass fix for freetype 2.4.6 related crashes: https://code.google.com/p/libass/source/detail?spec=svn0b709a5df697b36a24e4456b24585ec8f0c54b63&r=0b709a5df697b36a24e4456b24585ec8f0c54b63 -->
152   - <Patch level="1">libass-0b709a5df697.diff</Patch>
153   -
154   - <!-- Fix SAMI subtitle parsing buffer overflow, pb #19331 -->
155   - <Patch level="1">SAMI-subtitle-secfix.patch</Patch>
  138 +
156 139 </Patches>
157 140 </Source>
158 141
@@ -257,6 +240,7 @@
257 240 <Path fileType="executable">/usr/bin/gmplayer</Path>
258 241 <Path fileType="data">/usr/share/applications</Path>
259 242 <Path fileType="data">/usr/share/mplayer/skins</Path>
  243 + <Path fileType="data">/usr/share/icons</Path>
260 244 </Files>
261 245 <AdditionalFiles>
262 246 <AdditionalFile owner="root" permission="0644" target="/usr/share/applications/mplayer.desktop">mplayer.desktop</AdditionalFile>
@@ -264,6 +248,13 @@
264 248 </Package>
265 249
266 250 <History>
  251 + <Update release="150">
  252 + <Date>2012-10-11</Date>
  253 + <Version>1.1</Version>
  254 + <Comment>Bump.</Comment>
  255 + <Name>Serdar Soytetir</Name>
  256 + <Email>tulliana@gmail.com</Email>
  257 + </Update>
267 258 <Update release="149" type="security">
268 259 <Date>2011-10-17</Date>
269 260 <Version>0.0_20110105</Version>

0 comments on commit 2be9d6b

Please sign in to comment.
Something went wrong with that request. Please try again.