Changes - j0ke.net Open Build Service

Changes of Revision 11

[-] [+]	Changed	MPlayer.spec
@@ -1,33 +1,23 @@ +# norootforbuild %define suseversion %(echo "SUSE Linux `echo -e "scale=1\\n%{suse_version}/100" \| bc` (%_build_cpu)" \|\| Unknown) Name: MPlayer License: GPL Group: Productivity/Multimedia/Video/Players -Version: 1.0rc1try3 -Release: 1 +Version: 1.0rc2 +Release: 1.pm.1 Summary: Multimedia Player Summary(de): Multimedia-Abspielprogramm - -Source0: http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2 +Source0: http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc2.tar.bz2 Source1: http://www1.mplayerhq.hu/MPlayer/Skin/Blue-1.7.tar.bz2 -Source2: ivtv.h - Patch1: MPlayer-1.0rc1-desktopfile.patch Patch2: MPlayer-0.90pre9-tempfile-unrarlib.diff Patch3: MPlayer-decl.patch Patch4: MPlayer-1.0pre7-gcc4-altivec.patch -Patch5: MPlayer-1.0pre8-cleanup.patch Patch6: asm-fixes.diff Patch7: MPlayer-1.0rc1-warn.patch Patch8: MPlayer-comparison.patch -Patch13: MPlayer-1.0pre7-depends.patch -Patch14: MPlayer-1.0pre7-lzo2.patch Patch18: MPlayer-pci_linux_gnu_source.patch -Patch19: asmrules_fix_20061231.diff -Patch20: MPlayer-1.0rc1-vuln.patch -Patch21: cddb_fix_20070605.diff -Patch22: MPlayer-1.0rc1-ivtv.patch - URL: http://www.mplayerhq.hu BuildRoot: %{_tmppath}/%{name}-%{version}-build Prefix: %{_prefix} @@ -77,27 +67,15 @@ %prep -%setup -q -n MPlayer-1.0rc1 -cp %{S:2} . +%setup -q %patch1 %patch2 -p1 %patch3 %patch4 -%patch5 #%patch6 %patch7 %patch8 -p1 -%if %suse_version > 1000 -%patch13 -%endif -%if %suse_version >= 1000 -%patch14 -p1 -%endif %patch18 -%patch19 -%patch20 -%patch21 -%patch22 %build @@ -119,9 +97,13 @@ %endif --enable-bl --enable-fbdev --enable-zr \ --enable-gui --enable-menu --language=all \ - --enable-ivtv --enable-xvmc --with-xvmclib=XvMCW \ + --enable-xvmc --with-xvmclib=XvMCW \ --enable-largefiles --enable-smb --enable-joystick \ - --enable-radio --enable-radio-capture + --enable-radio --enable-radio-capture \ +%if %suse_version <= 1010 + --disable-ssse3 \ +%endif + --realcodecsdir=%_libdir/RealPlayer10/codecs %{__make} %{?jobs:-j%{jobs}} @@ -142,7 +124,7 @@ %files %defattr(-, root, root) -%doc DOCS TOOLS README AUTHORS ChangeLog +%doc DOCS TOOLS README AUTHORS Changelog %dir %{_sysconfdir}/mplayer %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/mplayer/mplayer.conf %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/mplayer/input.conf @@ -163,8 +145,8 @@ %_mandir/it/man1/mencoder.1.gz %_mandir/pl/man1/mplayer.1.gz %_mandir/pl/man1/mencoder.1.gz -%_mandir/sv/man1/mplayer.1.gz -%_mandir/sv/man1/mencoder.1.gz +%_mandir/ru/man1/mplayer.1.gz +%_mandir/ru/man1/mencoder.1.gz %{_bindir}/* %dir %{_datadir}/mplayer @@ -174,9 +156,6 @@ %{_datadir}/applications/* %{_datadir}/pixmaps/* -%_libdir/libdha.so* -%_libdir/mplayer/ - %changelog * Sun Sep 30 2007 Carsten Schoene <cs@linux-administrator.com> - import for SLE_10 build x 1 @@ -1,33 +1,23 @@ 2 +# norootforbuild 3 %define suseversion %(echo "SUSE Linux `echo -e "scale=1\\n%{suse_version}/100" \| bc` (%_build_cpu)" \|\| Unknown) 4 5 Name: MPlayer 6 License: GPL 7 Group: Productivity/Multimedia/Video/Players 8 -Version: 1.0rc1try3 9 -Release: 1 10 +Version: 1.0rc2 11 +Release: 1.pm.1 12 Summary: Multimedia Player 13 Summary(de): Multimedia-Abspielprogramm 14 - 15 -Source0: http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2 16 +Source0: http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc2.tar.bz2 17 Source1: http://www1.mplayerhq.hu/MPlayer/Skin/Blue-1.7.tar.bz2 18 -Source2: ivtv.h 19 - 20 Patch1: MPlayer-1.0rc1-desktopfile.patch 21 Patch2: MPlayer-0.90pre9-tempfile-unrarlib.diff 22 Patch3: MPlayer-decl.patch 23 Patch4: MPlayer-1.0pre7-gcc4-altivec.patch 24 -Patch5: MPlayer-1.0pre8-cleanup.patch 25 Patch6: asm-fixes.diff 26 Patch7: MPlayer-1.0rc1-warn.patch 27 Patch8: MPlayer-comparison.patch 28 -Patch13: MPlayer-1.0pre7-depends.patch 29 -Patch14: MPlayer-1.0pre7-lzo2.patch 30 Patch18: MPlayer-pci_linux_gnu_source.patch 31 -Patch19: asmrules_fix_20061231.diff 32 -Patch20: MPlayer-1.0rc1-vuln.patch 33 -Patch21: cddb_fix_20070605.diff 34 -Patch22: MPlayer-1.0rc1-ivtv.patch 35 - 36 URL: http://www.mplayerhq.hu 37 BuildRoot: %{_tmppath}/%{name}-%{version}-build 38 Prefix: %{_prefix} 39 @@ -77,27 +67,15 @@ 40 41 42 %prep 43 -%setup -q -n MPlayer-1.0rc1 44 -cp %{S:2} . 45 +%setup -q 46 %patch1 47 %patch2 -p1 48 %patch3 49 %patch4 50 -%patch5 51 #%patch6 52 %patch7 53 %patch8 -p1 54 -%if %suse_version > 1000 55 -%patch13 56 -%endif 57 -%if %suse_version >= 1000 58 -%patch14 -p1 59 -%endif 60 %patch18 61 -%patch19 62 -%patch20 63 -%patch21 64 -%patch22 65 66 %build 67 68 @@ -119,9 +97,13 @@ 69 %endif 70 --enable-bl --enable-fbdev --enable-zr \ 71 --enable-gui --enable-menu --language=all \ 72 - --enable-ivtv --enable-xvmc --with-xvmclib=XvMCW \ 73 + --enable-xvmc --with-xvmclib=XvMCW \ 74 --enable-largefiles --enable-smb --enable-joystick \ 75 - --enable-radio --enable-radio-capture 76 + --enable-radio --enable-radio-capture \ 77 +%if %suse_version <= 1010 78 + --disable-ssse3 \ 79 +%endif 80 + --realcodecsdir=%_libdir/RealPlayer10/codecs 81 82 %{__make} %{?jobs:-j%{jobs}} 83 84 @@ -142,7 +124,7 @@ 85 86 %files 87 %defattr(-, root, root) 88 -%doc DOCS TOOLS README AUTHORS ChangeLog 89 +%doc DOCS TOOLS README AUTHORS Changelog 90 %dir %{_sysconfdir}/mplayer 91 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/mplayer/mplayer.conf 92 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/mplayer/input.conf 93 @@ -163,8 +145,8 @@ 94 %_mandir/it/man1/mencoder.1.gz 95 %_mandir/pl/man1/mplayer.1.gz 96 %_mandir/pl/man1/mencoder.1.gz 97 -%_mandir/sv/man1/mplayer.1.gz 98 -%_mandir/sv/man1/mencoder.1.gz 99 +%_mandir/ru/man1/mplayer.1.gz 100 +%_mandir/ru/man1/mencoder.1.gz 101 102 %{_bindir}/* 103 %dir %{_datadir}/mplayer 104 @@ -174,9 +156,6 @@ 105 %{_datadir}/applications/* 106 %{_datadir}/pixmaps/* 107 108 -%_libdir/libdha.so* 109 -%_libdir/mplayer/ 110 - 111 %changelog 112 * Sun Sep 30 2007 Carsten Schoene <cs@linux-administrator.com> 113 - import for SLE_10 build 114
[-] [+]	Changed	MPlayer-1.0pre7-gcc4-altivec.patch ^
@@ -64,15 +64,16 @@ +#endif #include "swscale.h" #include "swscale_internal.h" - -@@ -604,6 +607,7 @@ + +@@ -652,7 +652,7 @@ #ifdef HAVE_ALTIVEC if (c->flags & SWS_CPU_CAPS_ALTIVEC) { -+ extern SwsFunc yuv2rgb_init_altivec(SwsContext ); - SwsFunc t = yuv2rgb_init_altivec(c); - if(t) return t; +- SwsFunc t = yuv2rgb_init_altivec(c); ++ extern SwsFunc yuv2rgb_init_altivec(SwsContext ); + if (t) return t; } + #endif --- libswscale/yuv2rgb_altivec.c +++ libswscale/yuv2rgb_altivec.c @@ -90,6 +90,9 @@
[-] [+]	Changed	MPlayer-decl.patch ^
@@ -1,5 +1,5 @@ ---- libmpdvdkit2/libdvdcss.c -+++ libmpdvdkit2/libdvdcss.c +--- libdvdcss/libdvdcss.c ++++ libdvdcss/libdvdcss.c @@ -135,6 +135,8 @@ #include "ioctl.h" #include "device.h"
[-] [+]	Changed	MPlayer-pci_linux_gnu_source.patch ^
@@ -1,5 +1,5 @@ ---- libdha/pci.c -+++ libdha/pci.c +--- vidix/pci.c ++++ vidix/pci.c @@ -50,7 +50,8 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * @@ -7,16 +7,16 @@ - + +#define _GNU_SOURCE - #include "libdha.h" + #include "dha.h" #include <errno.h> #include <string.h> ---- libdha/sysdep/pci_linux.c -+++ libdha/sysdep/pci_linux.c +--- vidix/sysdep/pci_linux.c ++++ vidix/sysdep/pci_linux.c @@ -3,6 +3,7 @@ $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.34.2.17 1998/11/10 11:55:40 dawes Exp $ Modified for readability by Nick Kurshev */ -+#define _GNU_SOURCE ++#define _GNU_SOURCE #include <errno.h> - #include <unistd.h> #ifdef __i386__ + //#include <sys/perm.h> doesn't exist on libc5 systems
	Added	MPlayer-1.0rc2.tar.bz2 ^