Author: belegdol Update of /cvs/free/rpms/mplayer/F-17 In directory se02.es.rpmfusion.net:/tmp/cvs-serv15478 Modified Files: mplayer-ffmpeg.patch mplayer.spec Log Message: * Sun Mar 18 2012 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.0-0.135.20120205svn - Rebuilt for ffmpeg-0.10.2 mplayer-ffmpeg.patch: Makefile | 2 configure | 4 - ffmpeg/libavformat/internal.h | 32 +++++++++++++ ffmpeg/libavutil/x86_cpu.h | 98 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 133 insertions(+), 3 deletions(-) Index: mplayer-ffmpeg.patch =================================================================== RCS file: /cvs/free/rpms/mplayer/F-17/mplayer-ffmpeg.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mplayer-ffmpeg.patch 28 Feb 2012 18:40:40 -0000 1.5 +++ mplayer-ffmpeg.patch 18 Mar 2012 13:54:22 -0000 1.6 @@ -1,6 +1,6 @@ -diff -up mplayer-export-2012-02-04/configure.ffmpeg mplayer-export-2012-02-04/configure ---- mplayer-export-2012-02-04/configure.ffmpeg 2012-02-27 15:32:56.721715932 +0100 -+++ mplayer-export-2012-02-04/configure 2012-02-27 15:32:56.760716194 +0100 +diff -up mplayer-export-2012-02-05/configure.ffmpeg mplayer-export-2012-02-05/configure +--- mplayer-export-2012-02-05/configure.ffmpeg 2012-03-12 00:18:05.000000000 +0100 ++++ mplayer-export-2012-02-05/configure 2012-03-12 00:18:05.000000000 +0100 @@ -6718,7 +6718,7 @@ elif test "$ffmpeg_so" = auto ; then inc_ffmpeg=$($_pkg_config --cflags libpostproc libswscale libavformat libavcodec libavutil) ld_tmp=$($_pkg_config --libs libpostproc libswscale libavformat libavcodec libavutil) @@ -19,10 +19,10 @@ die "The GUI requires libavcodec with PNG support (needs zlib)." fi test "$_freetype" = no && test "$_bitmap_font" = no && -diff -up mplayer-export-2012-02-04/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2012-02-04/ffmpeg/libavformat/internal.h ---- mplayer-export-2012-02-04/ffmpeg/libavformat/internal.h.ffmpeg 2012-02-27 15:32:56.762716209 +0100 -+++ mplayer-export-2012-02-04/ffmpeg/libavformat/internal.h 2012-02-27 15:32:56.762716209 +0100 -@@ -0,0 +1,309 @@ +diff -up mplayer-export-2012-02-05/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2012-02-05/ffmpeg/libavformat/internal.h +--- mplayer-export-2012-02-05/ffmpeg/libavformat/internal.h.ffmpeg 2012-03-12 00:20:43.000000000 +0100 ++++ mplayer-export-2012-02-05/ffmpeg/libavformat/internal.h 2012-03-12 00:23:13.000000000 +0100 +@@ -0,0 +1,32 @@ +/* + * copyright (c) 2001 Fabrice Bellard + * @@ -47,294 +47,17 @@ +#define AVFORMAT_INTERNAL_H + +#include <stdint.h> -+#include "libavformat/avformat.h" -+ -+#define MAX_URL_SIZE 4096 -+ -+#ifdef DEBUG -+# define hex_dump_debug(class, buf, size) av_hex_dump_log(class, AV_LOG_DEBUG, buf, size) -+#else -+# define hex_dump_debug(class, buf, size) -+#endif ++#include <libavformat/avformat.h> + +typedef struct AVCodecTag { + enum CodecID id; + unsigned int tag; +} AVCodecTag; + -+#ifdef __GNUC__ -+#define dynarray_add(tab, nb_ptr, elem)\ -+do {\ -+ __typeof__(tab) _tab = (tab);\ -+ __typeof__(elem) _elem = (elem);\ -+ (void)sizeof(**_tab == _elem); /* check that types are compatible */\ -+ av_dynarray_add(_tab, nb_ptr, _elem);\ -+} while(0) -+#else -+#define dynarray_add(tab, nb_ptr, elem)\ -+do {\ -+ av_dynarray_add((tab), nb_ptr, (elem));\ -+} while(0) -+#endif -+ -+struct tm *brktimegm(time_t secs, struct tm *tm); -+ -+char *ff_data_to_hex(char *buf, const uint8_t *src, int size, int lowercase); -+ -+/** -+ * Parse a string of hexadecimal strings. Any space between the hexadecimal -+ * digits is ignored. -+ * -+ * @param data if non-null, the parsed data is written to this pointer -+ * @param p the string to parse -+ * @return the number of bytes written (or to be written, if data is null) -+ */ -+int ff_hex_to_data(uint8_t *data, const char *p); -+ -+void ff_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx); -+ -+/** -+ * Add packet to AVFormatContext->packet_buffer list, determining its -+ * interleaved position using compare() function argument. -+ * @return 0, or < 0 on error -+ */ -+int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, -+ int (*compare)(AVFormatContext *, AVPacket *, AVPacket *)); -+ -+void ff_read_frame_flush(AVFormatContext *s); -+ -+#define NTP_OFFSET 2208988800ULL -+#define NTP_OFFSET_US (NTP_OFFSET * 1000000ULL) -+ -+/** Get the current time since NTP epoch in microseconds. */ -+uint64_t ff_ntp_time(void); -+ -+/** -+ * Assemble a URL string from components. This is the reverse operation -+ * of av_url_split. -+ * -+ * Note, this requires networking to be initialized, so the caller must -+ * ensure ff_network_init has been called. -+ * -+ * @see av_url_split -+ * -+ * @param str the buffer to fill with the url -+ * @param size the size of the str buffer -+ * @param proto the protocol identifier, if null, the separator -+ * after the identifier is left out, too -+ * @param authorization an optional authorization string, may be null. -+ * An empty string is treated the same as a null string. -+ * @param hostname the host name string -+ * @param port the port number, left out from the string if negative -+ * @param fmt a generic format string for everything to add after the -+ * host/port, may be null -+ * @return the number of characters written to the destination buffer -+ */ -+int ff_url_join(char *str, int size, const char *proto, -+ const char *authorization, const char *hostname, -+ int port, const char *fmt, ...) av_printf_format(7, 8); -+ -+/** -+ * Append the media-specific SDP fragment for the media stream c -+ * to the buffer buff. -+ * -+ * Note, the buffer needs to be initialized, since it is appended to -+ * existing content. -+ * -+ * @param buff the buffer to append the SDP fragment to -+ * @param size the size of the buff buffer -+ * @param c the AVCodecContext of the media to describe -+ * @param dest_addr the destination address of the media stream, may be NULL -+ * @param dest_type the destination address type, may be NULL -+ * @param port the destination port of the media stream, 0 if unknown -+ * @param ttl the time to live of the stream, 0 if not multicast -+ * @param fmt the AVFormatContext, which might contain options modifying -+ * the generated SDP -+ */ -+void ff_sdp_write_media(char *buff, int size, AVCodecContext *c, -+ const char *dest_addr, const char *dest_type, -+ int port, int ttl, AVFormatContext *fmt); -+ -+/** -+ * Write a packet to another muxer than the one the user originally -+ * intended. Useful when chaining muxers, where one muxer internally -+ * writes a received packet to another muxer. -+ * -+ * @param dst the muxer to write the packet to -+ * @param dst_stream the stream index within dst to write the packet to -+ * @param pkt the packet to be written -+ * @param src the muxer the packet originally was intended for -+ * @return the value av_write_frame returned -+ */ -+int ff_write_chained(AVFormatContext *dst, int dst_stream, AVPacket *pkt, -+ AVFormatContext *src); -+ -+/** -+ * Get the length in bytes which is needed to store val as v. -+ */ -+int ff_get_v_length(uint64_t val); -+ -+/** -+ * Put val using a variable number of bytes. -+ */ -+void ff_put_v(AVIOContext *bc, uint64_t val); -+ -+/** -+ * Read a whole line of text from AVIOContext. Stop reading after reaching -+ * either a \\n, a \\0 or EOF. The returned string is always \\0-terminated, -+ * and may be truncated if the buffer is too small. -+ * -+ * @param s the read-only AVIOContext -+ * @param buf buffer to store the read line -+ * @param maxlen size of the buffer -+ * @return the length of the string written in the buffer, not including the -+ * final \\0 -+ */ -+int ff_get_line(AVIOContext *s, char *buf, int maxlen); -+ -+#define SPACE_CHARS " \t\r\n" -+ -+/** -+ * Callback function type for ff_parse_key_value. -+ * -+ * @param key a pointer to the key -+ * @param key_len the number of bytes that belong to the key, including the '=' -+ * char -+ * @param dest return the destination pointer for the value in *dest, may -+ * be null to ignore the value -+ * @param dest_len the length of the *dest buffer -+ */ -+typedef void (*ff_parse_key_val_cb)(void *context, const char *key, -+ int key_len, char **dest, int *dest_len); -+/** -+ * Parse a string with comma-separated key=value pairs. The value strings -+ * may be quoted and may contain escaped characters within quoted strings. -+ * -+ * @param str the string to parse -+ * @param callback_get_buf function that returns where to store the -+ * unescaped value string. -+ * @param context the opaque context pointer to pass to callback_get_buf -+ */ -+void ff_parse_key_value(const char *str, ff_parse_key_val_cb callback_get_buf, -+ void *context); -+ -+/** -+ * Find stream index based on format-specific stream ID -+ * @return stream index, or < 0 on error -+ */ -+int ff_find_stream_index(AVFormatContext *s, int id); -+ -+/** -+ * Internal version of av_index_search_timestamp -+ */ -+int ff_index_search_timestamp(const AVIndexEntry *entries, int nb_entries, -+ int64_t wanted_timestamp, int flags); -+ -+/** -+ * Internal version of av_add_index_entry -+ */ -+int ff_add_index_entry(AVIndexEntry **index_entries, -+ int *nb_index_entries, -+ unsigned int *index_entries_allocated_size, -+ int64_t pos, int64_t timestamp, int size, int distance, int flags); -+ -+/** -+ * Add a new chapter. -+ * -+ * @param s media file handle -+ * @param id unique ID for this chapter -+ * @param start chapter start time in time_base units -+ * @param end chapter end time in time_base units -+ * @param title chapter title -+ * -+ * @return AVChapter or NULL on error -+ */ -+AVChapter *avpriv_new_chapter(AVFormatContext *s, int id, AVRational time_base, -+ int64_t start, int64_t end, const char *title); -+ -+/** -+ * Ensure the index uses less memory than the maximum specified in -+ * AVFormatContext.max_index_size by discarding entries if it grows -+ * too large. -+ */ -+void ff_reduce_index(AVFormatContext *s, int stream_index); -+ -+/* -+ * Convert a relative url into an absolute url, given a base url. -+ * -+ * @param buf the buffer where output absolute url is written -+ * @param size the size of buf -+ * @param base the base url, may be equal to buf. -+ * @param rel the new url, which is interpreted relative to base -+ */ -+void ff_make_absolute_url(char *buf, int size, const char *base, -+ const char *rel); -+ -+enum CodecID ff_guess_image2_codec(const char *filename); -+ -+/** -+ * Convert a date string in ISO8601 format to Unix timestamp. -+ */ -+int64_t ff_iso8601_to_unix_time(const char *datestr); -+ -+/** -+ * Perform a binary search using av_index_search_timestamp() and -+ * AVInputFormat.read_timestamp(). -+ * -+ * @param target_ts target timestamp in the time base of the given stream -+ * @param stream_index stream number -+ */ -+int ff_seek_frame_binary(AVFormatContext *s, int stream_index, -+ int64_t target_ts, int flags); -+ -+/** -+ * Update cur_dts of all streams based on the given timestamp and AVStream. -+ * -+ * Stream ref_st unchanged, others set cur_dts in their native time base. -+ * Only needed for timestamp wrapping or if (dts not set and pts!=dts). -+ * @param timestamp new dts expressed in time_base of param ref_st -+ * @param ref_st reference stream giving time_base of param timestamp -+ */ -+void ff_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp); -+ -+/** -+ * Perform a binary search using read_timestamp(). -+ * -+ * @param target_ts target timestamp in the time base of the given stream -+ * @param stream_index stream number -+ */ -+int64_t ff_gen_search(AVFormatContext *s, int stream_index, -+ int64_t target_ts, int64_t pos_min, -+ int64_t pos_max, int64_t pos_limit, -+ int64_t ts_min, int64_t ts_max, -+ int flags, int64_t *ts_ret, -+ int64_t (*read_timestamp)(struct AVFormatContext *, int , int64_t *, int64_t )); -+ -+/** -+ * Set the pts for a given stream. If the new values would be invalid -+ * (<= 0), it leaves the AVStream unchanged. -+ * -+ * @param s stream -+ * @param pts_wrap_bits number of bits effectively used by the pts -+ * (used for wrap control, 33 is the value for MPEG) -+ * @param pts_num numerator to convert to seconds (MPEG: 1) -+ * @param pts_den denominator to convert to seconds (MPEG: 90000) -+ */ -+void avpriv_set_pts_info(AVStream *s, int pts_wrap_bits, -+ unsigned int pts_num, unsigned int pts_den); -+ -+/** -+ * Add side data to a packet for changing parameters to the given values. -+ * Parameters set to 0 aren't included in the change. -+ */ -+int ff_add_param_change(AVPacket *pkt, int32_t channels, -+ uint64_t channel_layout, int32_t sample_rate, -+ int32_t width, int32_t height); -+ +#endif /* AVFORMAT_INTERNAL_H */ -diff -up mplayer-export-2012-02-04/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-export-2012-02-04/ffmpeg/libavutil/x86_cpu.h ---- mplayer-export-2012-02-04/ffmpeg/libavutil/x86_cpu.h.ffmpeg 2012-02-27 15:32:56.780716332 +0100 -+++ mplayer-export-2012-02-04/ffmpeg/libavutil/x86_cpu.h 2012-02-27 15:32:56.780716332 +0100 +diff -up mplayer-export-2012-02-05/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-export-2012-02-05/ffmpeg/libavutil/x86_cpu.h +--- mplayer-export-2012-02-05/ffmpeg/libavutil/x86_cpu.h.ffmpeg 2012-03-12 00:18:05.000000000 +0100 ++++ mplayer-export-2012-02-05/ffmpeg/libavutil/x86_cpu.h 2012-03-12 00:18:05.000000000 +0100 @@ -0,0 +1,98 @@ +/* + * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at&gt; @@ -434,9 +157,9 @@ +#endif + +#endif /* AVUTIL_X86_CPU_H */ -diff -up mplayer-export-2012-02-04/Makefile.ffmpeg mplayer-export-2012-02-04/Makefile ---- mplayer-export-2012-02-04/Makefile.ffmpeg 2012-02-27 15:32:56.722715938 +0100 -+++ mplayer-export-2012-02-04/Makefile 2012-02-27 15:32:56.793716420 +0100 +diff -up mplayer-export-2012-02-05/Makefile.ffmpeg mplayer-export-2012-02-05/Makefile +--- mplayer-export-2012-02-05/Makefile.ffmpeg 2012-03-12 00:18:05.000000000 +0100 ++++ mplayer-export-2012-02-05/Makefile 2012-03-12 00:18:05.000000000 +0100 @@ -787,7 +787,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): $(CC) -o $@ $^ $(EXTRALIBS) Index: mplayer.spec =================================================================== RCS file: /cvs/free/rpms/mplayer/F-17/mplayer.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- mplayer.spec 13 Mar 2012 08:43:17 -0000 1.46 +++ mplayer.spec 18 Mar 2012 13:54:22 -0000 1.47 @@ -6,7 +6,7 @@ Name: mplayer Version: 1.0 -Release: 0.133.%{pre}%{?dist} +Release: 0.135.%{pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -37,7 +37,6 @@ BuildRequires: aalib-devel BuildRequires: bzip2-devel BuildRequires: alsa-lib-devel -BuildRequires: cdparanoia-devel BuildRequires: desktop-file-utils BuildRequires: em8300-devel BuildRequires: enca-devel @@ -61,18 +60,17 @@ BuildRequires: libbluray-devel BuildRequires: libbs2b-devel BuildRequires: libcaca-devel +BuildRequires: libcdio-devel BuildRequires: libdca-devel BuildRequires: libdv-devel BuildRequires: libdvdnav-devel >= 4.1.3-1 BuildRequires: libjpeg-devel -BuildRequires: libmpcdec-devel BuildRequires: libmpeg2-devel BuildRequires: libmpg123-devel BuildRequires: librtmp-devel BuildRequires: libtheora-devel BuildRequires: libvdpau-devel BuildRequires: libvorbis-devel -BuildRequires: libvpx-devel >= 0.9.1 BuildRequires: lirc-devel BuildRequires: live555-devel BuildRequires: lzo-devel >= 2 @@ -89,6 +87,7 @@ %{?_with_faac:BuildRequires: faac-devel} %{?_with_jack:BuildRequires: jack-audio-connection-kit-devel} %{?_with_libmad:BuildRequires: libmad-devel} +%{?_with_libmpcdec:BuildRequires: libmpcdec-devel} %{?_with_nemesi:BuildRequires: libnemesi-devel >= 0.6.3} %{?_with_openal:BuildRequires: openal-soft-devel} %{?_with_samba:BuildRequires: libsmbclient-devel} @@ -194,6 +193,7 @@ %{?_without_amr:--disable-libopencore_amrnb --disable-libopencore_amrwb} \\\ %{!?_with_faac:--disable-faac} \\\ %{!?_with_libmad:--disable-mad} \\\ + %{?_with_libmpcdec:--enable-musepack} \\\ --disable-libmpeg2-internal \\\ --disable-tremor-internal \\\ %{?_with_xmms:--enable-xmms} \\\ @@ -378,9 +378,18 @@ %{_datadir}/mplayer/*.fp %changelog -* Tue Mar 13 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0-0.133.20120205svn +* Sun Mar 18 2012 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.0-0.135.20120205svn +- Rebuilt for ffmpeg-0.10.2 + +* Tue Mar 13 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.0-0.134.20120205svn - Rebuilt for x264 ABI 0.120 +* Sun Mar 11 2012 Dominik Mierzejewski <rpm(a)greysector.net&gt; - 1.0-0.133.20120205svn +- drop libvpx build requirement (unused due to shared FFmpeg) +- trim patch for shared FFmpeg support to minimum +- replace cdparanoia with libcdio for better CD-Audio support +- add conditional to enable libmpcdec (disabled upstream by default) + * Wed Feb 29 2012 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.0-0.132.20120205svn - 20120205 snapshot