Logoj0ke.net Open Build Service > Projects > multimedia > MPlayer > Changes
Sign Up | Log In

Changes of Revision 20

[-] Changed MPlayer.spec
​x
 
1
@@ -1,110 +1,122 @@
2
 # norootforbuild
3
+%if 0%{?sles_version}
4
 %define suseversion  %(echo "SUSE Linux Enterprise `echo -e "scale=1\\n%{sles_version}" | bc` (%_build_cpu)" || Unknown)
5
+%else
6
+%define suseversion  %(echo "openSUSE Linux `echo -e "scale=1\\n%{suse_version}/100" | bc 2>/dev/null || echo UNKNOWN` (%_build_cpu)")
7
+%endif
8
+
9
+%define revision 27637
10
11
 Name:      MPlayer
12
-License:   GPL
13
+License:   GNU General Public License version 2 (GPL v2)
14
 Group:     Productivity/Multimedia/Video/Players
15
-Version:   1.0rc2
16
-Release:   1.pm.1
17
+Version:   1.0rc2_r%{revision}
18
+Release:   3.pm.3
19
 Summary:   Multimedia Player
20
 Summary(de):   Multimedia-Abspielprogramm
21
-Source0:   http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc2.tar.bz2
22
-Source1:   http://www1.mplayerhq.hu/MPlayer/Skin/Blue-1.7.tar.bz2
23
-Patch1:         MPlayer-1.0rc1-desktopfile.patch
24
-Patch2:        MPlayer-0.90pre9-tempfile-unrarlib.diff
25
+# Source0: http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}.tar.bz2
26
+# svn://svn.mplayerhq.hu/mplayer/trunk
27
+Source0:   MPlayer-%{version}.tar.bz2
28
+Source1:   http://www1.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
29
 Patch3:        MPlayer-decl.patch
30
-Patch4:        MPlayer-1.0pre7-gcc4-altivec.patch
31
-Patch6:        asm-fixes.diff
32
+#Patch6:       asm-fixes.diff
33
 Patch7:        MPlayer-1.0rc1-warn.patch
34
 Patch8:        MPlayer-comparison.patch
35
 Patch18:   MPlayer-pci_linux_gnu_source.patch
36
-Patch20:   demux_audio_fix_20080129.diff
37
-Patch21:   demux_mov_fix_20080129.diff
38
-Patch22:   stream_cddb_fix_20080120.diff
39
-Patch23:   url_fix_20080120.diff
40
-Patch24:   MPlayer_Movie_Protect.patch
41
+# http://lists.freebsd.org/pipermail/freebsd-amd64/2005-May/004942.html
42
+Patch22:   MPlayer-amd64-detection.patch
43
+Patch23:   MPlayer-svn_version.patch
44
+# http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1267
45
+# fixes infinite loop while trying to parse the 'udta' tag of
46
+# a number of different MP4 files
47
+Patch24:   bug490-demux_lavf.patch
48
+Patch25:        mplayer_demux_real.patch
49
+Patch26:   MPlayer-x26465.patch
50
 URL:       http://www.mplayerhq.hu
51
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
52
-Prefix:        %{_prefix}
53
54
-%ifarch %ix86 || x86_64
55
-BuildRequires:  w32codec-all live
56
-%endif
57
-
58
-BuildRequires:  lame libtheora-devel libsmbclient-devel SDL-devel ladspa aalib-devel esound-devel gtk2-devel
59
-BuildRequires:  glib2-devel dvb lzo-devel libdca libpng-devel libogg-devel libvorbis-devel libdv
60
-BuildRequires:  DirectFB arts-devel lirc bc cdparanoia xvid-devel lzo lzo-devel fribidi-devel speex-devel
61
-BuildRequires:  faac libmpeg2-devel twolame-devel gettext-devel
62
-BuildRequires:  libx264-devel >= 0.0svn20061031
63
-BuildRequires: libjack0 libjack-devel
64
-# suse since 9.2 include giflib and libjpeg is splitted
65
-%if %suse_version >= 920
66
-BuildRequires:  giflib giflib-devel libjpeg-devel
67
-%else
68
-BuildRequires:  libungif libjpeg pkgconfig
69
-%endif
70
-# 10.1 stuff:
71
-# 10.1 builds libsmbclient against kerberos.
72
-# we need devs because the v4l configure checks look for v4l devices.
73
-# libdv got split
74
-# caca got added
75
-%if %suse_version > 1000 && %suse_version < 1100
76
-BuildRequires:  krb5-devel openldap2-devel libgssapi devs libdv-devel libcaca-devel
77
-%else
78
-BuildRequires:  krb5-devel openldap2-devel libgssapi libdv-devel libcaca-devel
79
+%ifarch %ix86
80
+BuildRequires:  w32codec-all
81
 %endif
82
-# 10.2 stuff
83
-# DirectFB has a split devel package
84
-%if %suse_version > 1010
85
-BuildRequires: DirectFB-devel
86
+BuildRequires:  libmp3lame-devel libogg-devel libtheora-devel libsmbclient-devel SDL-devel ladspa aalib-devel esound-devel gtk2-devel
87
+BuildRequires:  glib2-devel dvb lzo-devel libdca-devel libpng-devel libdv libxvidcore-devel gcc-c++
88
+BuildRequires:  DirectFB-devel lirc bc cdparanoia lzo lzo-devel fribidi-devel speex-devel
89
+BuildRequires:  libfaac-devel libmpeg2-devel twolame-devel gettext-devel amrnb-devel amrwb-devel pkgconfig
90
+BuildRequires:  libenca-devel libvstream-client-devel libdvdnav4 libdvdnav-devel
91
+BuildRequires: libx264-devel >= 0.0svn20080917 live libjack-devel giflib giflib-devel libjpeg-devel
92
+BuildRequires:  krb5-devel openldap2-devel libgssapi libdv-devel libcaca-devel libpulse-devel
93
+# FIXME get rid of fam-devel when its fixed in libschroedinger-devel
94
+BuildRequires: fam-devel
95
+
96
+# Toni builds dirac from 10.3 on upwards
97
+%if %{suse_version} >= 1030
98
+BuildRequires: libdirac-devel libschroedinger-devel
99
 %endif
100
101
+Provides:  mplayer = %{version}-%{release}
102
+Provides:  mplayer-gui = %{version}-%{release}
103
+Provides:  %{name}-gui = %{version}-%{release}
104
+Provides:  gmplayer = %{version}-%{release}
105
+Provides:  mencoder = %{version}-%{release}
106
+Conflicts: MPlayer-unstable
107
+Conflicts: mplayer-unstable
108
+
109
 %description
110
 MPlayer plays most MPEG/VOB, AVI, Ogg/OGM, VIVO, ASF/WMA/WMV, QT/MOV/MP4,
111
-RealMedia, Matroska, NUT, NuppelVideo, FLI, YUV4MPEG, FILM, RoQ, PVA files,
112
+RealMedia, Matroska, NuppelVideo, FLI, YUV4MPEG, FILM, RoQ, PVA files,
113
 supported by many native, XAnim, and Win32 DLL codecs. You can watch VideoCD,
114
 SVCD, DVD, 3ivx, DivX 3/4/5 and even WMV movies..
115
116
+Authors:
117
+--------
118
+    MPlayer team <mplayer-users@mplayerhq.hu>
119
+
120
 %description -l de
121
 MPlayer spielt die meisten MPEG/VOB, AVI, Ogg/OGM, VIVO, ASF/WMA/WMV,
122
-QT/MOV/MP4, RealMedia, Matroska, NUT, NuppelVideo, FLI, YUV4MPEG, FILM, RoQ,
123
+QT/MOV/MP4, RealMedia, Matroska, NuppelVideo, FLI, YUV4MPEG, FILM, RoQ,
124
 PVA-Dateien, unterstuetzt von vielen nativen, XAnim, und Win32 DLL-Codecs ab.
125
 Mit MPlayer koennen sie VideoCD, SVCD, DVD, 3ivx, DivX 3/4/5 und sogar WMV-Filme
126
 anschauen.
127
128
+Authoren:
129
+---------
130
+    Das MPlayer Team <mplayer-users@mplayerhq.hu>
131
132
+%debug_package
133
 %prep
134
-%setup -q
135
-%patch1
136
-%patch2 -p1
137
+%setup -q -a 1
138
 %patch3
139
-%patch4
140
 #%patch6
141
 %patch7
142
 %patch8 -p1
143
 %patch18
144
-%patch20
145
-%patch21
146
 %patch22
147
-%patch23
148
 %patch24
149
+%patch25
150
+%patch26
151
+# only apply if packaging an SVN snapshot:
152
+%if 0%{?revision:1}
153
+%patch23
154
+%endif
155
156
 %build
157
+%if 0%{?revision:1}
158
+%__sed -i 's|@@SVN_REVISION@@|%{revision}|g;s|@@SUSE_VERSION@@|%{suseversion}|g' ./version.sh
159
+%else
160
+%__awk '{gsub ("%{version}-","%{version}-%{suseversion}-"); print $0}' <version.sh >version.sh.patched
161
+%__mv version.sh.patched version.sh
162
+%endif
163
164
-tar xjf %{SOURCE1}
165
-
166
-awk '{gsub ("%{version}-","%{version}-%{suseversion}-"); print $0}' version.sh > version.sh~
167
-cp version.sh~ version.sh
168
-
169
-sed "s%%-O4%%$RPM_OPT_FLAGS -O4%%g" configure >configure~
170
-cat configure~ > configure
171
+%__sed -i 's|-O4|%{optflags}|g' configure
172
173
-./configure --prefix=%{_prefix} \
174
- --confdir=%{_sysconfdir}/mplayer \
175
- --datadir=%{_datadir}/mplayer \
176
- --libdir=%{_libdir} \
177
- --mandir=%{_mandir} \
178
-%ifarch %ix86
179
+./configure \
180
+ --prefix="%{_prefix}" \
181
+ --confdir="%{_sysconfdir}/mplayer" \
182
+ --datadir="%{_datadir}/mplayer" \
183
+ --libdir="%{_libdir}" \
184
+ --with-extralibdir="%{_libdir}" \
185
+ --mandir="%{_mandir}" \
186
+%ifarch %ix86 x86_64
187
  --enable-runtime-cpudetection \
188
 %endif
189
  --enable-bl --enable-fbdev --enable-zr \
190
@@ -112,69 +124,107 @@
191
  --enable-xvmc --with-xvmclib=XvMCW \
192
  --enable-largefiles --enable-smb --enable-joystick \
193
  --enable-radio --enable-radio-capture \
194
-%if %suse_version <= 1010
195
- --disable-ssse3 \
196
-%endif
197
- --realcodecsdir=%_libdir/RealPlayer10/codecs
198
+ --enable-dvdnav \
199
+ --disable-nemesi \
200
+ --disable-wii \
201
​
[+] Deleted MPlayer-0.90pre9-tempfile-unrarlib.diff ^
[+] Deleted MPlayer-1.0pre7-gcc4-altivec.patch ^
[+] Deleted MPlayer-1.0rc1-desktopfile.patch ^
[+] Added MPlayer-amd64-detection.patch ^
[+] Changed MPlayer-pci_linux_gnu_source.patch ^
[+] Added MPlayer-svn_version.patch ^
[+] Added MPlayer-x26465.patch ^
[+] Deleted MPlayer_Movie_Protect.patch ^
[+] Deleted asm-fixes.diff ^
[+] Added bug490-demux_lavf.patch ^
[+] Deleted demux_audio_fix_20080129.diff ^
[+] Deleted demux_mov_fix_20080129.diff ^
[+] Added mplayer_demux_real.patch ^
[+] Deleted stream_cddb_fix_20080120.diff ^
[+] Deleted url_fix_20080120.diff ^
Deleted MPlayer-1.0rc2.tar.bz2 ^
Added MPlayer-1.0rc2_r27637.tar.bz2 ^

Cancel