+++ /dev/null
---- mplayer-r33917/help/help_mp-en.h~ 2011-07-25 11:28:45.000000000 +0200
-+++ mplayer-r33917/help/help_mp-en.h 2011-07-25 11:38:03.007928282 +0200
-@@ -1973,6 +1973,7 @@
- #define MSGTR_RADIO_AudioInInitFailed "[radio] audio_in_init failed.\n"
- #define MSGTR_RADIO_AudioInSetupFailed "[radio] audio_in_setup call failed: %s\n"
- #define MSGTR_RADIO_ClearBufferFailed "[radio] Clearing buffer failed: %s\n"
-+#define MSGTR_RADIO_SelectedChannel "[radio] Selected channel: %d - %s (freq: %.2f)\n"
- #define MSGTR_RADIO_StreamEnableCacheFailed "[radio] Call to stream_enable_cache failed: %s\n"
- #define MSGTR_RADIO_DriverUnknownStr "[radio] Unknown driver name: %s\n"
- #define MSGTR_RADIO_DriverV4L2 "[radio] Using V4Lv2 radio interface.\n"
---- m/gui/interface.c~ 2012-05-21 20:46:25.000000000 +0200
-+++ m/gui/interface.c 2012-11-04 16:30:43.831294291 +0100
-@@ -1168,7 +1168,7 @@
- vsnprintf(msg, sizeof(msg), format, va);
- va_end(va);
-
-- mp_msg(mod, lev, msg);
-+ mp_msg(mod, lev, "%s", msg);
-
- if (mp_msg_test(mod, lev))
- gtkMessageBox(GTK_MB_FATAL, msg);
---- m/stream/stream_radio.c~ 2011-07-25 01:55:34.000000000 +0200
-+++ m/stream/stream_radio.c 2012-11-04 16:31:53.339743343 +0100
-@@ -1138,7 +1138,7 @@
- mp_msg(MSGT_RADIO,MSGL_V,"\n");
-
- if(priv->driver)
-- mp_msg(MSGT_RADIO, MSGL_INFO, priv->driver->info);
-+ mp_msg(MSGT_RADIO, MSGL_INFO, "%s", priv->driver->info);
- else{
- mp_msg(MSGT_RADIO, MSGL_INFO, MSGTR_RADIO_DriverUnknownStr,priv->radio_param->driver);
- close_s(stream);
+++ /dev/null
---- MPlayer-1.1/configure 2013-05-06 16:44:41.394467719 +0300
-+++ MPlayer-1.1.1/configure 2013-05-06 22:22:22.804625607 +0300
-@@ -626,6 +626,11 @@
- # GOTCHA: the variables below defines the default behavior for autodetection
- # and have - unless stated otherwise - at least 2 states : yes no
- # If autodetection is available then the third state is: auto
-+
-+# XXX this is in wrong place anyway
-+ffmpeg_config=false
-+test -x /usr/bin/ffmpeg-avconfig && ffmpeg_config=/usr/bin/ffmpeg-avconfig
-+
- _mmx=auto
- _3dnow=auto
- _3dnowext=auto
-@@ -666,22 +671,22 @@
- _libopencore_amrnb=auto
- _libopencore_amrwb=auto
- libopenjpeg=auto
--libavdecoders_all=$(sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
-+libavdecoders_all=$($ffmpeg_config --decoders || sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
- libavdecoders=$(echo $libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g')
--libavencoders_all=$(sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
-+libavencoders_all=$($ffmpeg_config --encoders || sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
- libavencoders=$(echo $libavencoders_all | sed -e 's/ LIB[A-Z0-9_]*_ENCODER//g')
--libavparsers_all=$(sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
-+libavparsers_all=$($ffmpeg_config --parsers || sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
- libavparsers=$libavparsers_all
--libavbsfs_all=$(sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
-+libavbsfs_all=$($ffmpeg_config --bsfs || sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
- libavbsfs=$libavbsfs_all
- libavhwaccels_all=$(sed -n 's/^[^#]*HWACCEL.*(.*, *\(.*\)).*/\1_hwaccel/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
- # Disable all hardware accelerators for now.
- libavhwaccels=
--libavdemuxers_all=$(sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]')
-+libavdemuxers_all=$($ffmpeg_config --demuxers || sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]')
- libavdemuxers=$(echo $libavdemuxers_all | sed -e 's/ LIB[A-Z0-9_]*_DEMUXER//g' -e s/REDIR_DEMUXER// -e s/AVISYNTH_DEMUXER//)
--libavmuxers_all=$(sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]')
-+libavmuxers_all=$($ffmpeg_config --muxers || sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]')
- libavmuxers=$(echo $libavmuxers_all | sed -e 's/ LIB[A-Z0-9_]*_MUXER//g' -e s/RTP_MUXER// -e s/RTSP_MUXER// -e s/SAP_MUXER//)
--libavprotocols_all=$(sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]')
-+libavprotocols_all=$($ffmpeg_config --protocols || sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' ffmpeg/libavformat/allformats.c | tr '[a-z]' '[A-Z]')
- libavprotocols=$libavprotocols_all
- libavprotocols=$(echo $libavprotocols | sed -e s/HTTPS_PROTOCOL// -e s/TLS_PROTOCOL// -e s/BLURAY_PROTOCOL//)
- libavfilters_all=$(sed -n 's/^[^#]*FILTER.*(.*, *\(.*\),.*).*/\1_filter/p' ffmpeg/libavfilter/allfilters.c | tr '[a-z]' '[A-Z]')
---- MPlayer-1.1/Makefile~ 2013-05-06 16:37:01.000000000 +0300
-+++ MPlayer-1.1/Makefile 2013-05-06 16:45:59.221182150 +0300
-@@ -689,7 +689,7 @@
- $(SRCS_MENCODER-yes)
-
- # (linking) order matters for these libraries
--FFMPEGPARTS_ALL = libpostproc libavfilter libavformat libavcodec libswscale libswresample libavutil
-+FFMPEGPARTS_ALL =
- FFMPEGPARTS = $(foreach part, $(FFMPEGPARTS_ALL), $(if $(wildcard ffmpeg/$(part)), $(part)))
- FFMPEGLIBS = $(foreach part, $(FFMPEGPARTS), ffmpeg/$(part)/$(part).a)
- FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(wildcard $(addprefix ffmpeg/$(part)/,*.[chS] /*/*.[chS] /*/*.asm)))
+++ /dev/null
-Patch taken from:
-http://code.google.com/p/gecko-mediaplayer/issues/detail?id=170
-http://patches.libav.org/patch/18621/
-
---- mplayer/libmpdemux/demux_lavf.c.bak 2013-07-05 03:03:36.684099781 +0200
-+++ mplayer/libmpdemux/demux_lavf.c 2013-07-05 03:04:40.447433846 +0200
-@@ -105,8 +105,13 @@
- pos += stream->end_pos;
- else if(whence == SEEK_SET)
- pos += stream->start_pos;
-- else if(whence == AVSEEK_SIZE && stream->end_pos > 0)
-+ else if(whence == AVSEEK_SIZE && stream->end_pos > 0) {
-+ off_t size;
-+ stream_control(demuxer->stream, STREAM_CTRL_GET_SIZE, &size);
-+ if (size > stream->end_pos)
-+ stream->end_pos = size;
- return stream->end_pos - stream->start_pos;
-+ }
- else
- return -1;
-
---- mplayer/stream/cache2.c.bak 2013-07-05 03:00:03.010763995 +0200
-+++ mplayer/stream/cache2.c 2013-07-05 03:03:18.380766237 +0200
-@@ -91,7 +91,7 @@
- // callback
- stream_t* stream;
- volatile int control;
-- volatile unsigned control_uint_arg;
-+ volatile uint64_t control_uint_arg;
- volatile double control_double_arg;
- volatile struct stream_lang_req control_lang_arg;
- volatile int control_res;
-@@ -264,6 +264,7 @@
- static int cache_execute_control(cache_vars_t *s) {
- double double_res;
- unsigned uint_res;
-+ unsigned uint64_res;
- int needs_flush = 0;
- static unsigned last;
- int quit = s->control == -2;
-@@ -316,6 +317,10 @@
- s->control_res = s->stream->control(s->stream, s->control, &uint_res);
- s->control_uint_arg = uint_res;
- break;
-+ case STREAM_CTRL_GET_SIZE:
-+ s->control_res = s->stream->control(s->stream, s->control, &uint64_res);
-+ s->control_uint_arg = uint64_res;
-+ break;
- case STREAM_CTRL_GET_LANG:
- s->control_res = s->stream->control(s->stream, s->control, (void *)&s->control_lang_arg);
- break;
-@@ -640,6 +645,7 @@
- case STREAM_CTRL_GET_ASPECT_RATIO:
- case STREAM_CTRL_GET_NUM_ANGLES:
- case STREAM_CTRL_GET_ANGLE:
-+ case STREAM_CTRL_GET_SIZE:
- case -2:
- s->control = cmd;
- break;
-@@ -680,6 +686,9 @@
- case STREAM_CTRL_GET_ANGLE:
- *(unsigned *)arg = s->control_uint_arg;
- break;
-+ case STREAM_CTRL_GET_SIZE:
-+ *(off_t *)arg = s->control_uint_arg;
-+ break;
- case STREAM_CTRL_GET_LANG:
- *(struct stream_lang_req *)arg = s->control_lang_arg;
- break;
def_libgsm='#define CONFIG_LIBGSM 1'
--- MPlayer-1.1/ffmpeg/libavcodec/libgsm.c.orig 2012-06-02 20:13:19.000000000 +0200
+++ MPlayer-1.1/ffmpeg/libavcodec/libgsm.c 2013-02-03 19:07:39.377220838 +0100
-@@ -27,7 +27,7 @@
-
+@@ -28,11 +28,7 @@
// The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
+ #include "config.h"
+-#if HAVE_GSM_H
+ #include <gsm.h>
+-#else
-#include <gsm/gsm.h>
-+#include <gsm.h>
+-#endif
- #include "avcodec.h"
- #include "internal.h"
+ #include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
+
echores "yes"
else
echores "no"
-@@ -7988,6 +7992,8 @@
+@@ -8390,6 +8390,8 @@
+ CFLAGS_STACKREALIGN = $cflags_stackrealign
CFLAGS_SVGALIB_HELPER = $cflags_svgalib_helper
- CFLAGS_TREMOR_LOW = $cflags_tremor_low
+LDFLAGS = $real_ldflags
+
- EXTRALIBS = $extra_ldflags $ld_static $extra_libs
+ EXTRALIBS = $extra_ldflags $ld_static $timer_libs $extra_libs
EXTRALIBS_MPLAYER = $libs_mplayer
EXTRALIBS_MENCODER = $libs_mencoder
--- mplayer-r32669/Makefile.orig 2010-10-27 19:55:45.000000000 +0200
--- mplayer-r32669/Makefile.orig 2010-11-30 09:29:43.000000000 +0100
+++ mplayer-r32669/Makefile 2010-11-30 09:31:08.071501256 +0100
-@@ -734,7 +734,7 @@
- OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
+@@ -687,7 +687,7 @@
+ OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS)
-MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS)
+MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS) -lXext -lX11
- DEP_FILES = $(SRCS_COMMON) $(SRCS_MPLAYER) $(SRCS_MENCODER)
+ DEP_FILES = $(SRCS_COMMON) $(SRCS_MPLAYER) $(SRCS_MENCODER)
$(foreach suffix,.c .cpp .m .S,$(eval DEP_FILES := $(DEP_FILES:$(suffix)=.d)))
--- mplayer-r32923/configure.orig 2011-06-28 21:37:44.000000000 +0200
+++ mplayer-r32923/configure 2011-06-28 21:39:56.738031684 +0200
-@@ -7604,7 +7604,7 @@
+@@ -7869,7 +7869,7 @@
return exitvar;
}
EOF
-- cc_check -lXext && _xshape=yes
-+ cc_check -lXext -lX11 && _xshape=yes
- fi
- if test "$_xshape" = yes ; then
- def_xshape='#define CONFIG_XSHAPE 1'
+- cc_check -lXext && _xshape=yes
++ cc_check -lXext -lX11 && _xshape=yes
+ fi
+ if test "$_xshape" = yes ; then
+ def_xshape='#define CONFIG_XSHAPE 1'
+
---- mplayer-r29930/libdvdread4/dvdread/dvd_reader.h~ 2009-11-19 14:23:23.231276231 +0100
-+++ mplayer-r29930/libdvdread4/dvdread/dvd_reader.h 2009-11-19 14:25:48.524614054 +0100
-@@ -74,6 +74,8 @@
- */
- typedef struct dvd_stat_s dvd_stat_t;
-
-+#pragma GCC visibility push(default)
-+
- /**
- * Opens a block device of a DVD-ROM file, or an image file, or a directory
- * name for a mounted DVD or HD copy of a DVD.
-@@ -305,6 +307,8 @@
- */
- int DVDUDFCacheLevel( dvd_reader_t *, int );
-
-+#pragma GCC visibility pop
-+
- #ifdef __cplusplus
+--- mplayer/binary.ver~ 2014-04-29 17:29:35.000000000 +0200
++++ mplayer/binary.ver 2014-04-29 17:30:22.560066797 +0200
+@@ -1,5 +1,7 @@
+ MPLAYER_1 {
+ # to support glibcs abhorrent backwards-compatibility hack
+ global: _IO_stdin_used;
++ # for vstream-client
++ vstream_error;
+ local: *;
};
- #endif
---- mplayer-r29930/libdvdread4/dvdread/ifo_read.h~ 2009-11-19 14:23:00.545070443 +0100
-+++ mplayer-r29930/libdvdread4/dvdread/ifo_read.h 2009-11-19 14:26:19.125441477 +0100
-@@ -29,6 +29,7 @@
- extern "C" {
- #endif
-
-+#pragma GCC visibility push(default)
- /**
- * handle = ifoOpen(dvd, title);
- *
-@@ -226,6 +227,8 @@
- void ifoFree_TITLE_VOBU_ADMAP(ifo_handle_t *);
- void ifoFree_TXTDT_MGI(ifo_handle_t *);
-
-+#pragma GCC visibility pop
-+
- #ifdef __cplusplus
- };
- #endif
---- mplayer-r29930/libdvdread4/dvdread/nav_read.h~ 2009-11-18 00:00:29.000000000 +0100
-+++ mplayer-r29930/libdvdread4/dvdread/nav_read.h 2009-11-19 14:27:13.724600811 +0100
-@@ -31,6 +31,7 @@
- extern "C" {
- #endif
-
-+#pragma GCC visibility push(default)
- /**
- * Reads the PCI packet data pointed to into th pci struct.
- *
-@@ -46,6 +47,7 @@
- * @param bufffer Pointer to the buffer of the on disc DSI data.
- */
- void navRead_DSI(dsi_t *, unsigned char *);
-+#pragma GCC visibility pop
-
- #ifdef __cplusplus
- };
---- MPlayer-1.1/configure.orig 2013-02-24 17:53:33.092693098 +0100
-+++ MPlayer-1.1/configure 2013-02-24 19:29:59.079116950 +0100
-@@ -7426,6 +7426,7 @@
- _vstream=no
- cat > $TMPC <<EOF
- #include <vstream-client.h>
-+#pragma GCC visibility push(default)
- void vstream_error(const char *format, ... ) {}
- int main(void) { vstream_start(); return 0; }
- EOF
---- MPlayer-1.1/stream/stream_vstream.c.orig 2011-10-21 17:44:58.000000000 +0200
-+++ MPlayer-1.1/stream/stream_vstream.c 2013-02-24 21:03:09.752215665 +0100
-@@ -51,6 +51,7 @@
-
- #include <vstream-client.h>
-
-+#pragma GCC visibility push(default)
- void vstream_error(const char *format, ...) {
- char buf[1024];
- va_list va;
-@@ -59,6 +60,7 @@
- va_end(va);
- mp_msg(MSGT_STREAM, MSGL_ERR, buf);
- }
-+#pragma GCC visibility pop
-
- static struct stream_priv_s {
- char* host;
else
noinputmodules="vstream $noinputmodules"
def_vstream='#undef CONFIG_VSTREAM'
-@@ -8048,7 +8048,7 @@
+@@ -8415,7 +8415,7 @@
LDFLAGS = $real_ldflags
--EXTRALIBS = $extra_ldflags $ld_static $extra_libs
-+EXTRALIBS = $extra_ldflags $ndextra_ldflags $ld_static $extra_libs
+-EXTRALIBS = $extra_ldflags $ld_static $timer_libs $extra_libs
++EXTRALIBS = $extra_ldflags $ndextra_ldflags $ld_static $timer_libs $extra_libs
EXTRALIBS_MPLAYER = $libs_mplayer
EXTRALIBS_MENCODER = $libs_mencoder
+
%define binsuf 32
%endif
+# date from directory inside of tarball (like mplayer-export-2014-04-29)
+%define snap 2014-04-29
+%define ssnap %(echo %{snap} | tr -d -)
Summary: MPlayer - THE Movie Player for UN*X
Summary(de.UTF-8): MPlayer ist ein unter der freien GPL-Lizenz stehender Media-Player
Summary(es.UTF-8): Otro reproductor de películas
Summary(pt_BR.UTF-8): Reprodutor de filmes
Name: mplayer
Version: 1.1.1
-Release: 6
+Release: 6.%{ssnap}.1
# DO NOT increase epoch unless it's really neccessary!
# especially such changes like pre7->pre7try2, increase Release instead!
# PS: $ rpmvercmp pre7try2 pre7
Epoch: 3
License: GPL
Group: Applications/Multimedia
-# for snapshots:
-# svn export svn://svn.mplayerhq.hu/mplayer/trunk mplayer-rXXX
-# cd mplayer-rXXX && git clone git://git.videolan.org/ffmpeg.git
-# tar -cvJf mplayer-rXXX.tar.xz mplayer-rXXX
-Source0: http://mplayerhq.hu/MPlayer/releases/MPlayer-%{version}.tar.xz
-# Source0-md5: 39dd55f30eb5403f219a606e79a6648a
+# Source0: http://mplayerhq.hu/MPlayer/releases/MPlayer-%{version}.tar.xz
+Source0: ftp://ftp.mplayerhq.hu/MPlayer/releases/mplayer-export-snapshot.tar.bz2
+# Source0-md5: e0183567e23a6c03495cbff696d840c0
+Source1: http://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2
+# Source1-md5: 2e2d3842604047137318880f5b7d8691
Source3: ftp://ftp1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
# Source3-md5: 7b47904a925cf58ea546ca15f3df160c
Source5: g%{name}.desktop
Patch11: %{name}-altivec.patch
Patch12: %{name}-check-byteswap.patch
Patch13: %{name}-visibility-hidden-fix.patch
-Patch14: %{name}-ffmpeg.patch
+
Patch15: %{name}-live555-async.patch
Patch16: %{name}-libcdio.patch
Patch17: %{name}-gsm.patch
# update, hard to fix right now because of gnome bug 579430:
# https://bugzilla.gnome.org/show_bug.cgi?id=579430
#Patch32: %{name}-gnome-screensaver.patch
-Patch33: %{name}-growing-files.patch
Patch100: %{name}-on2flix.patch
Patch101: %{name}-link.patch
-Patch102: %{name}-build.patch
URL: http://www.mplayerhq.hu/
%{?with_directfb:BuildRequires: DirectFB-devel}
MEncoder to koder filmów dla Linuksa będący częścią pakietu MPlayer.
%prep
-%setup -q -n MPlayer-%{version} -a3 -a6 -a9
+%setup -q -n %{name}-export-%{snap} -a1 -a3 -a6 -a9
cp -f etc/codecs.conf etc/codecs.win32.conf
# build (configure / Makefile) related:
%patch11 -p1
%patch12 -p1
%patch13 -p1
-%{?with_system_ffmpeg:%patch14 -p1}
+
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch30 -p0
%patch31 -p1
#%{with_gnomess:%patch32 -p1}
-%patch33 -p1
# on2flix
mv mencoder-on2flixenglinux{-*-*-*,}
%endif
%patch101 -p1
-%patch102 -p1
cat etc/example.conf > etc/mplayer.conf
cat <<'CONFIGADD' >> etc/mplayer.conf
%if %{with system_ffmpeg}
# using external ffmpeg, but mplayer adds these to includepath
-%{__rm} -r ffmpeg
+%{__rm} -rf ffmpeg
%endif
%build
--extra-ldflags="%{?_x_libraries:-L%{_x_libraries}}" \
--language=all \
%if %{with system_ffmpeg}
- --disable-libavutil_a \
- --disable-libavcodec_a \
- --disable-libavformat_a \
- --disable-libpostproc_a \
- --enable-libavutil_so \
- --enable-libavcodec_so \
- --enable-libavformat_so \
- --enable-libpostproc_so \
+ --disable-ffmpeg_a \
%endif
%ifnarch %{ix86} %{x8664}
--disable-3dnow \
projects / packages / mplayer.git / commitdiff