Changes of Revision 3
| [-] | Changed | MPlayer.spec |
|
x 1 2 -# norootforbuild3 -#!BuildIgnore: post-build-checks4 +# vim: set sw=4 ts=4 et:5 6 %define _libexecdir %{_usr}/lib7 8 %define suseversion %(echo "openSUSE Linux `echo "scale=1; %{suse_version}/100" | bc 2>/dev/null || echo UNKNOWN` (%{_build_cpu})")9 10 -%define revision 3193011 +%define revision 3326912 13 -Name: MPlayer14 -License: GNU General Public License version 2 (GPL v2)15 -Group: Productivity/Multimedia/Video/Players16 -Version: 1.0rc4_r%{revision}17 -Release: 1.pm.3.218 -Summary: Multimedia Player19 -Summary(de): Multimedia-Abspielprogramm20 +Name: MPlayer21 +License: GNU General Public License version 2 (GPL v2)22 +Group: Productivity/Multimedia/Video/Players23 +Version: 1.0rc4_r%{revision}24 +Release: 1.pm.1.125 +Summary: Multimedia Player26 +Summary(de): Multimedia-Abspielprogramm27 ## Source0: http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}.tar.bz228 # svn://svn.mplayerhq.hu/mplayer/trunk29 -Source0: MPlayer-%{version}.tar.bz230 -Source1: http://www1.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz231 -Source100: %{name}-rpmlintrc32 -Patch0: MPlayer-decl.patch33 -Patch1: MPlayer-1.0rc4-warn.patch34 -Patch2: MPlayer-comparison.patch35 -Patch3: MPlayer-pci_linux_gnu_source.patch36 -Patch4: MPlayer-amd64-detection.patch37 -Patch5: bug490-demux_lavf.patch38 -# Patch7: MPlayer-x26465.patch39 -Patch10: MPlayer-fix_tools.patch40 -Patch11: MPlayer-pa-volume-fix.patch41 -Patch12: MPlayer-disable_subrip.patch42 -Patch20: MPlayer-svn_version.patch43 -URL: http://www.mplayerhq.hu 44 -BuildRoot: %{_tmppath}/%{name}-%{version}-build45 -#%if 0%{?opensuse_bs} || 0%{?packman_bs}46 -47 -BuildRequires: enca-devel48 -#%else49 -#BuildRequires: libenca-devel50 -#%endif51 +Source0: MPlayer-%{version}.tar.bz252 +Source1: http://www1.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz253 +Source2: http://www1.mplayerhq.hu/MPlayer/skins/Clearlooks-1.2.tar.bz254 +Patch0: MPlayer-decl.patch55 +Patch1: MPlayer-1.0rc4-warn.patch56 +Patch3: MPlayer-pci_linux_gnu_source.patch57 +Patch4: MPlayer-amd64-detection.patch58 +Patch5: bug490-demux_lavf.patch59 +Patch6: MPlayer-config.patch60 +Patch11: MPlayer-pa-volume-fix.patch61 +Patch12: MPlayer-disable_subrip.patch62 +Patch13: MPlayer-fix_win32_pointer_casts.patch63 +Patch20: MPlayer-svn_version.patch64 +## git://git.videolan.org/ffmpeg.git65 +Source10: ffmpeg-c104a6e90226eaa253aeba471c8859e0da922da7.tar.bz266 +Patch80: ffmpeg-fix_missing_return_in_non_void_function.patch67 +Source100: MPlayer-rpmlintrc68 +URL: http://www.mplayerhq.hu 69 +BuildRoot: %{_tmppath}/%{name}-%{version}-build70 +#BuildRequires: -post-build-checks71 +BuildRequires: enca-devel72 %ifarch %ix86 73 %if %suse_version <= 112074 BuildRequires: w32codec-all75 76 %endif77 BuildRequires: libmp3lame-devel libogg-devel libtheora-devel libsmbclient-devel SDL-devel ladspa aalib-devel esound-devel gtk2-devel78 BuildRequires: glib2-devel dvb libdca-devel libdv libxvidcore-devel gcc-c++ libmng-devel79 -BuildRequires: SDL_image-devel80 -BuildRequires: yasm81 -BuildRequires: DirectFB-devel bc cdparanoia-devel lzo lzo-devel fribidi-devel libspeex-devel82 -BuildRequires: libfaac-devel libmpeg2-devel twolame-devel gettext-devel libopencore-amr-devel pkgconfig83 +BuildRequires: xorg-x11-proto-devel84 +BuildRequires: SDL_image-devel85 +BuildRequires: yasm86 +BuildRequires: DirectFB-devel bc cdparanoia-devel lzo lzo-devel fribidi-devel speex-devel87 +BuildRequires: libfaac-devel twolame-devel gettext-devel libopencore-amr-devel libfaad-devel pkgconfig88 BuildRequires: libvstream-client-devel libdvdnav4 libdvdnav-devel89 BuildRequires: libvdpau-devel90 -BuildRequires: libpng-devel91 -BuildRequires: libx264-devel >= 0.0svn20080917 live libjack-devel giflib giflib-devel libjpeg-devel 92 +BuildRequires: libpng-devel93 +BuildRequires: libvpx-devel >= 0.9.694 +BuildRequires: libx264-devel >= 0.0svn20080917 live libjack-devel giflib giflib-devel libjpeg-devel 95 BuildRequires: krb5-devel openldap2-devel libgssapi libdv-devel libcaca-devel libpulse-devel96 BuildRequires: coreutils97 +BuildRequires: libmpg123-devel98 +BuildRequires: libbluray-devel99 +BuildRequires: librtmp-devel100 +BuildRequires: liba52-devel101 +BuildRequires: bs2b-devel102 +BuildRequires: libdvdcss-devel103 +BuildRequires: libcrystalhd-devel104 %if %suse_version > 1110105 BuildRequires: lirc-devel106 %else107 108 BuildRequires: termcap ncurses-devel109 BuildRequires: update-desktop-files110 # FIXME get rid of fam-devel when its fixed in libschroedinger-devel111 -BuildRequires: fam-devel112 +BuildRequires: fam-devel113 114 # Toni builds dirac from 10.3 on upwards115 %if %{suse_version} >= 1030116 -BuildRequires: libdirac-devel libschroedinger-devel117 +BuildRequires: libdirac-devel libschroedinger-devel118 %endif119 120 -Provides: mplayer = %{version}-%{release}121 -Provides: mplayer-gui = %{version}-%{release}122 -Provides: %{name}-gui = %{version}-%{release}123 -Provides: gmplayer = %{version}-%{release}124 -Provides: mencoder = %{version}-%{release}125 -Conflicts: MPlayer-unstable126 -Conflicts: mplayer-unstable127 +Provides: mplayer = %{version}-%{release}128 +Provides: mplayer-gui = %{version}-%{release}129 +Provides: %{name}-gui = %{version}-%{release}130 +Provides: mencoder = %{version}-%{release}131 +Conflicts: MPlayer-unstable132 +Conflicts: mplayer-unstable133 +Recommends: gmplayer = %{version}134 135 %description136 MPlayer plays most MPEG/VOB, AVI, Ogg/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4,137 138 supported by many native, XAnim, and Win32 DLL codecs. You can watch VideoCD,139 SVCD, DVD, 3ivx, DivX 3/4/5 and even WMV movies..140 141 +Note that the GUI frontend "gmplayer" is not part of this package.142 +Instead, you must also install the package "gmplayer".143 +144 145 146 147 148 --------149 MPlayer team <mplayer-users@mplayerhq.hu>150 151 +%package -n gmplayer152 +Summary: GUI Frontend for the %{name} Multimedia Player153 +Group: Productivity/Multimedia/Video/Players154 +Requires: %{name} = %{version}155 +156 +%description -n gmplayer157 +MPlayer plays most MPEG/VOB, AVI, Ogg/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4,158 +RealMedia, Matroska, NuppelVideo, FLI, YUV4MPEG, FILM, RoQ, PVA files,159 +supported by many native, XAnim, and Win32 DLL codecs. You can watch VideoCD,160 +SVCD, DVD, 3ivx, DivX 3/4/5 and even WMV movies..161 +162 +This subpackage contains the GUI frontend "gmplayer".163 +164 %package doc165 -Summary: Multimedia Player166 -Group: Productivity/Multimedia/Video/Players167 -Requires: %{name} = %{version}168 +Summary: Multimedia Player169 +Group: Productivity/Multimedia/Video/Players170 +Requires: %{name} = %{version}171 172 %description doc173 MPlayer plays most MPEG/VOB, AVI, Ogg/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4,174 175 This subpackage contains technical documentation about codecs, formats,176 and MPlayer implementation details.177 178 -%debug_package179 +180 %prep181 -%setup -q -a 1182 +%setup -q -a 1 -a 2 -a 10183 %patch0184 ### fix me! ###185 %if %suse_version >= 1110 186 187 %else 188 %patch1189 %endif190 -%patch2 -p1191 %patch3192 %patch4193 %patch5194 -# %patch7195 -%patch10196 +%patch6197 %if 0%{?revision} < 30000198 %patch11199 %endif200 %patch12201 |
||
| [+] | Deleted | MPlayer-comparison.patch ^ |
| @@ -1,1489 +0,0 @@ -diff -Naur MPlayer-1.0rc4_r31930.orig/libfaad2/structs.h MPlayer-1.0rc4_r31930/libfaad2/structs.h ---- MPlayer-1.0rc4_r31930.orig/libfaad2/structs.h 2008-01-26 19:31:48.000000000 +0100 -+++ MPlayer-1.0rc4_r31930/libfaad2/structs.h 2010-08-06 21:00:34.000000000 +0200 -@@ -325,7 +325,7 @@ - /*uint8_t*/ unsigned char aacSpectralDataResilienceFlag; - /*uint8_t*/ unsigned char epConfig; - -- /*uint8_t*/ char sbr_present_flag; -+ /*uint8_t*/ signed char sbr_present_flag; - /*uint8_t*/ char forceUpSampling; - /*uint8_t*/ char downSampledSBR; - } mp4AudioSpecificConfig; -diff -Naur MPlayer-1.0rc4_r31930.orig/libfaad2/structs.h.orig MPlayer-1.0rc4_r31930/libfaad2/structs.h.orig ---- MPlayer-1.0rc4_r31930.orig/libfaad2/structs.h.orig 1970-01-01 01:00:00.000000000 +0100 -+++ MPlayer-1.0rc4_r31930/libfaad2/structs.h.orig 2008-01-26 19:31:48.000000000 +0100 -@@ -0,0 +1,492 @@ -+/* -+** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -+** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com -+** -+** This program is free software; you can redistribute it and/or modify -+** it under the terms of the GNU General Public License as published by -+** the Free Software Foundation; either version 2 of the License, or -+** (at your option) any later version. -+** -+** This program is distributed in the hope that it will be useful, -+** but WITHOUT ANY WARRANTY; without even the implied warranty of -+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+** GNU General Public License for more details. -+** -+** You should have received a copy of the GNU General Public License -+** along with this program; if not, write to the Free Software -+** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+** -+** Any non-GPL usage of this software or parts of this software is strictly -+** forbidden. -+** -+** Commercial non-GPL licensing of this software is possible. -+** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. -+** -+** $Id: structs.h,v 1.42 2004/09/08 09:43:11 gcp Exp $ -+**/ -+ -+#ifndef __STRUCTS_H__ -+#define __STRUCTS_H__ -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#include "cfft.h" -+#ifdef SBR_DEC -+#include "sbr_dec.h" -+#endif -+ -+#define MAX_CHANNELS 64 -+#define MAX_SYNTAX_ELEMENTS 48 -+#define MAX_WINDOW_GROUPS 8 -+#define MAX_SFB 51 -+#define MAX_LTP_SFB 40 -+#define MAX_LTP_SFB_S 8 -+ -+/* used to save the prediction state */ -+typedef struct { -+ int16_t r[2]; -+ int16_t COR[2]; -+ int16_t VAR[2]; -+} pred_state; -+ -+typedef struct { -+ uint16_t N; -+ cfft_info *cfft; -+ complex_t *sincos; -+#ifdef PROFILE -+ int64_t cycles; -+ int64_t fft_cycles; -+#endif -+} mdct_info; -+ -+typedef struct -+{ -+ const real_t *long_window[2]; -+ const real_t *short_window[2]; -+#ifdef LD_DEC -+ const real_t *ld_window[2]; -+#endif -+ -+ mdct_info *mdct256; -+#ifdef LD_DEC -+ mdct_info *mdct1024; -+#endif -+ mdct_info *mdct2048; -+#ifdef PROFILE -+ int64_t cycles; -+#endif -+} fb_info; -+ -+typedef struct -+{ -+ uint8_t present; -+ -+ uint8_t num_bands; -+ uint8_t pce_instance_tag; -+ uint8_t excluded_chns_present; -+ uint8_t band_top[17]; -+ uint8_t prog_ref_level; -+ uint8_t dyn_rng_sgn[17]; -+ uint8_t dyn_rng_ctl[17]; -+ uint8_t exclude_mask[MAX_CHANNELS]; -+ uint8_t additional_excluded_chns[MAX_CHANNELS]; -+ -+ real_t ctrl1; -+ real_t ctrl2; -+} drc_info; -+ -+typedef struct -+{ -+ uint8_t element_instance_tag; -+ uint8_t object_type; -+ uint8_t sf_index; -+ uint8_t num_front_channel_elements; -+ uint8_t num_side_channel_elements; -+ uint8_t num_back_channel_elements; -+ uint8_t num_lfe_channel_elements; -+ uint8_t num_assoc_data_elements; -+ uint8_t num_valid_cc_elements; -+ uint8_t mono_mixdown_present; -+ uint8_t mono_mixdown_element_number; -+ uint8_t stereo_mixdown_present; -+ uint8_t stereo_mixdown_element_number; -+ uint8_t matrix_mixdown_idx_present; -+ uint8_t pseudo_surround_enable; -+ uint8_t matrix_mixdown_idx; -+ uint8_t front_element_is_cpe[16]; -+ uint8_t front_element_tag_select[16]; -+ uint8_t side_element_is_cpe[16]; -+ uint8_t side_element_tag_select[16]; -+ uint8_t back_element_is_cpe[16]; -+ uint8_t back_element_tag_select[16]; -+ uint8_t lfe_element_tag_select[16]; -+ uint8_t assoc_data_element_tag_select[16]; -+ uint8_t cc_element_is_ind_sw[16]; -+ uint8_t valid_cc_element_tag_select[16]; -+ -+ uint8_t channels; -+ -+ uint8_t comment_field_bytes; -+ uint8_t comment_field_data[257]; -+ -+ /* extra added values */ -+ uint8_t num_front_channels; -+ uint8_t num_side_channels; -+ uint8_t num_back_channels; -+ uint8_t num_lfe_channels; -+ uint8_t sce_channel[16]; -+ uint8_t cpe_channel[16]; -+} program_config; -+ -+typedef struct -+{ -+ uint16_t syncword; -+ uint8_t id; -+ uint8_t layer; -+ uint8_t protection_absent; -+ uint8_t profile; -+ uint8_t sf_index; -+ uint8_t private_bit; -+ uint8_t channel_configuration; -+ uint8_t original; -+ uint8_t home; -+ uint8_t emphasis; -+ uint8_t copyright_identification_bit; -+ uint8_t copyright_identification_start; -+ uint16_t aac_frame_length; -+ uint16_t adts_buffer_fullness; -+ uint8_t no_raw_data_blocks_in_frame; -+ uint16_t crc_check; -+ -+ /* control param */ -+ uint8_t old_format; -+} adts_header; -+ -+typedef struct -+{ -+ uint8_t copyright_id_present; -+ int8_t copyright_id[10]; -+ uint8_t original_copy; -+ uint8_t home; -+ uint8_t bitstream_type; -+ uint32_t bitrate; -+ uint8_t num_program_config_elements; -+ uint32_t adif_buffer_fullness; -+ -+ /* maximum of 16 PCEs */ -+ program_config pce[16]; -+} adif_header; -+ -+#ifdef LTP_DEC -+typedef struct | ||
| [+] | Added | MPlayer-config.patch ^ |
| @@ -0,0 +1,37 @@ +--- etc/example.conf.orig 2011-02-28 21:37:07.000000000 +0100 ++++ etc/example.conf 2011-02-28 21:38:11.000000000 +0100 +@@ -20,7 +20,7 @@ + ################## + + # Specify default video driver (see -vo help for a list). +-#vo=xv ++vo=vdpau,xv + + # Use SDL video with the aalib subdriver by default. + #vo = sdl:aalib +@@ -74,7 +74,7 @@ + ################## + + # Specify default audio driver (see -ao help for a list). +-#ao=oss ++ao=pulse,alsa + + # Use SDL audio driver with the esd subdriver by default. + #ao = sdl:esd +@@ -154,12 +154,13 @@ + #mouse-movements=yes + #nocache=yes + +-#[vo.vdpau] +-#vc=ffmpeg12vdpau,ffwmv3vdpau,ffvc1vdpau,ffh264vdpau,ffodivxvdpau, ++[vo.vdpau] ++vc=ffmpeg12vdpau,ffwmv3vdpau,ffvc1vdpau,ffh264vdpau,ffodivxvdpau, + # Most video filters do not work with vdpau. + #vf-clr=yes + +- ++# Disable joystick by default to make all shortcuts work: ++nojoystick=true + + # You can also include other configuration files. + #include = /path/to/the/file/you/want/to/include | ||
| [+] | Deleted | MPlayer-fix_tools.patch ^ |
| @@ -1,41 +0,0 @@ ---- Makefile.orig 2010-08-06 00:34:49.000000000 +0200 -+++ Makefile 2010-08-06 08:49:08.000000000 +0200 -@@ -1009,13 +1009,13 @@ - - ###### tests / tools ####### - --TEST_OBJS = mp_msg.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm -+TEST_OBJS = mp_msg.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) - - codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h help_mp.h $(TEST_OBJS) -- $(CC) -I. -DTESTING -o $@ $^ -+ $(CC) -I. -DTESTING -o $@ $^ -ltermcap -lm - - codecs2html$(EXESUF): codec-cfg.c help_mp.h $(TEST_OBJS) -- $(CC) -I. -DCODECS2HTML -o $@ $^ -+ $(CC) -I. -DCODECS2HTML -o $@ $^ -ltermcap -lm - - libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(TEST_OBJS) - -@@ -1043,7 +1043,7 @@ - TOOLS += TOOLS/fastmemcpybench TOOLS/modify_reg - endif - --ALLTOOLS = $(TOOLS) TOOLS/bmovl-test TOOLS/vfw2menc -+ALLTOOLS = $(TOOLS) - - tools: $(addsuffix $(EXESUF),$(TOOLS)) - alltools: $(addsuffix $(EXESUF),$(ALLTOOLS)) -@@ -1055,7 +1055,11 @@ - TOOLS/bmovl-test$(EXESUF): -lSDL_image - - TOOLS/subrip$(EXESUF): vobsub.o spudec.o unrar_exec.o libvo/aclib.o \ -- libswscale/libswscale.a libavutil/libavutil.a $(TEST_OBJS) -+ libswscale/libswscale.a libavutil/libavutil.a $(TEST_OBJS) -lncurses -lm -+ -+-lncurses: -+ -+-lm: - - TOOLS/vfw2menc$(EXESUF): -lwinmm -lole32 - | ||
| [+] | Added | MPlayer-fix_win32_pointer_casts.patch ^ |
| @@ -0,0 +1,19 @@ +--- loader/win32.c.orig 2011-04-12 08:33:55.000000000 +0200 ++++ loader/win32.c 2011-04-12 08:35:17.000000000 +0200 +@@ -53,6 +53,7 @@ + #include "path.h" + + #include <stdlib.h> ++#include <stdint.h> + #include <assert.h> + #include <stdarg.h> + #include <ctype.h> +@@ -2023,7 +2024,7 @@ + default: + dbgprintf("Signalling unknown object type %d!\n", hObjectToSignal); + } +- return expWaitForSingleObject(hObjectToWaitOn, dwMilliseconds); ++ return (intptr_t)expWaitForSingleObject((void*)((intptr_t)hObjectToWaitOn), dwMilliseconds); + } + + static long WINAPI expRegOpenKeyExA(long key, const char* subkey, long reserved, long access, int* newkey) | ||
| [+] | Changed | MPlayer-svn_version.patch ^ |
| @@ -1,7 +1,7 @@ ---- version.sh.orig 2010-08-06 00:21:32.000000000 +0200 -+++ version.sh 2010-08-06 00:22:45.000000000 +0200 -@@ -4,20 +4,16 @@ - +--- version.sh.orig 2011-02-28 21:39:19.000000000 +0100 ++++ version.sh 2011-02-28 21:41:05.000000000 +0100 +@@ -8,16 +8,11 @@ + if test -z $version ; then # Extract revision number from file used by daily tarball snapshots # or from the places different Subversion versions have it. -svn_revision=$(cat snapshot_version 2> /dev/null) @@ -10,18 +10,13 @@ -test $svn_revision || svn_revision=$(sed -n -e '/^dir$/{n;p;q;}' .svn/entries 2>/dev/null) -test $svn_revision && svn_revision=SVN-r$svn_revision -test $svn_revision || svn_revision=UNKNOWN +-version=$svn_revision +svn_revision='@@SVN_REVISION@@' +suse_version='@@SUSE_VERSION@@' - - # releases extract the version number from the VERSION file - version=$(cat VERSION 2> /dev/null) - test $version || version=$svn_revision + fi -NEW_REVISION="#define VERSION \"${version}${extra}\"" +NEW_REVISION="#define VERSION \"dev-SVN-r${svn_revision}${extra}-${suse_version}\"" OLD_REVISION=$(head -n 1 version.h 2> /dev/null) --TITLE='#define MP_TITLE "%s "VERSION" (C) 2000-2010 MPlayer Team\n"' -+TITLE="#define MP_TITLE \"MPlayer dev-SVN-r${svn_revision}${extra}-${suse_version} (C) 2000-2010 MPlayer Team\"" + TITLE='#define MP_TITLE "%s "VERSION" (C) 2000-2011 MPlayer Team\n"' - # Update version.h only on revision changes to avoid spurious rebuilds - if test "$NEW_REVISION" != "$OLD_REVISION"; then | ||
| [+] | Added | ffmpeg-fix_missing_return_in_non_void_function.patch ^ |
| @@ -0,0 +1,19 @@ +--- libswscale/x86/yuv2rgb_template.c.orig 2011-04-11 23:00:32.000000000 +0200 ++++ libswscale/x86/yuv2rgb_template.c 2011-04-11 23:01:28.000000000 +0200 +@@ -406,6 +406,8 @@ + YUV2RGB_ENDLOOP(4) + YUV2RGB_OPERANDS_ALPHA + YUV2RGB_ENDFUNC ++#else ++ return srcSliceH; + #endif + } + +@@ -449,5 +451,7 @@ + YUV2RGB_ENDLOOP(4) + YUV2RGB_OPERANDS_ALPHA + YUV2RGB_ENDFUNC ++#else ++ return srcSliceH; + #endif + } | ||
| Added | Clearlooks-1.2.tar.bz2 ^ | |
| Changed | MPlayer-1.0rc4_r33269.tar.bz2 ^ | |
| [+] | Changed | MPlayer-rpmlintrc ^ |
| @@ -1,3 +1,7 @@ +setBadness('bufferoverflowstrncat', 0) addFilter("MPlayer.*bufferoverflowstrncat.*") -setBadness('bufferoverflowstrncat', 0) +addFilter("strict-aliasing-punning") + +addFilter("no-rpm-opt-flags") + | ||
| Added | ffmpeg-c104a6e90226eaa253aeba471c8859e0da922da7.tar.bz2 ^ | |