February 2011 - rpmfusion-commits

by Julian Sikorski

Author: belegdol Update of /cvs/nonfree/rpms/mame/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv25079 Modified Files: mame.spec Log Message: Disabled ldplayer Index: mame.spec =================================================================== RCS file: /cvs/nonfree/rpms/mame/F-13/mame.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mame.spec 28 Feb 2011 21:32:58 -0000 1.22 +++ mame.spec 28 Feb 2011 21:54:09 -0000 1.23 @@ -1,7 +1,7 @@ # ldplayer can be disabled by --without ldplayer or by changing to %bcond_with # if it does not build. The debug build is disabled by default, please use # --with debug to override -%bcond_without ldplayer +%bcond_with ldplayer %bcond_with debug %global baseversion 141

13 years, 8 months

1
0
0 / 0

rpms/mame/F-14 mame.spec,1.26,1.27

by Julian Sikorski

Author: belegdol Update of /cvs/nonfree/rpms/mame/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv25052 Modified Files: mame.spec Log Message: Disabled ldplayer Index: mame.spec =================================================================== RCS file: /cvs/nonfree/rpms/mame/F-14/mame.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- mame.spec 28 Feb 2011 21:32:48 -0000 1.26 +++ mame.spec 28 Feb 2011 21:54:06 -0000 1.27 @@ -1,7 +1,7 @@ # ldplayer can be disabled by --without ldplayer or by changing to %bcond_with # if it does not build. The debug build is disabled by default, please use # --with debug to override -%bcond_without ldplayer +%bcond_with ldplayer %bcond_with debug %global baseversion 141

13 years, 8 months

1
0
0 / 0

rpms/mame/devel mame.spec,1.26,1.27

by Julian Sikorski

Author: belegdol Update of /cvs/nonfree/rpms/mame/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv25019 Modified Files: mame.spec Log Message: Disabled ldplayer Index: mame.spec =================================================================== RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- mame.spec 28 Feb 2011 21:32:37 -0000 1.26 +++ mame.spec 28 Feb 2011 21:54:04 -0000 1.27 @@ -1,7 +1,7 @@ # ldplayer can be disabled by --without ldplayer or by changing to %bcond_with # if it does not build. The debug build is disabled by default, please use # --with debug to override -%bcond_without ldplayer +%bcond_with ldplayer %bcond_with debug %global baseversion 141

13 years, 8 months

1
0
0 / 0

rpms/mame/F-13 .cvsignore, 1.20, 1.21 mame.spec, 1.21, 1.22 sources, 1.20, 1.21

by Julian Sikorski

Author: belegdol Update of /cvs/nonfree/rpms/mame/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv23564 Modified Files: .cvsignore mame.spec sources Log Message: * Mon Feb 28 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u3-1 - Updated to 0.141u3 - Filtered out redundant $RPM_OPT_FLAGS - No longer enable joystick by default - Provided an easy way to disable ldplayer - Dropped upstreamed gcc-4.6 patch Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/mame/F-13/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 9 Feb 2011 21:23:44 -0000 1.20 +++ .cvsignore 28 Feb 2011 21:32:58 -0000 1.21 @@ -1,3 +1,4 @@ mame0141s.exe 0141u1_diff.zip 0141u2_diff.zip +0141u3_diff.zip Index: mame.spec =================================================================== RCS file: /cvs/nonfree/rpms/mame/F-13/mame.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mame.spec 9 Feb 2011 21:40:58 -0000 1.21 +++ mame.spec 28 Feb 2011 21:32:58 -0000 1.22 @@ -1,8 +1,11 @@ -# the debug build is disabled by default, please use --with debug to override +# ldplayer can be disabled by --without ldplayer or by changing to %bcond_with +# if it does not build. The debug build is disabled by default, please use +# --with debug to override +%bcond_without ldplayer %bcond_with debug %global baseversion 141 -%global sourceupdate 2 +%global sourceupdate 3 Name: mame %if 0%{?sourceupdate} @@ -22,7 +25,7 @@ #Source updates Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip -#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip +Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip #Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip %endif Patch0: %{name}-fortify.patch @@ -68,6 +71,7 @@ %description tools %{summary}. +%if %{with ldplayer} %package ldplayer Summary: Standalone laserdisc player based on MAME Group: Applications/Emulators @@ -77,6 +81,7 @@ %description ldplayer %{summary}. +%endif %prep @@ -121,72 +126,81 @@ # Fedora custom defaults video opengl autosave 1 -joystick 1 EOF %build +#these flags are already included in the Makefile +RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e s/"-O2 -g -pipe -Wall "//) + +%if %{with ldplayer} make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \ - OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/%{name};\""' TARGET=ldplayer + OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" TARGET=ldplayer +%endif %if %{with debug} make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \ - OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/%{name};\""' DEBUG=1 all + OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" DEBUG=1 all %else make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \ - OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/%{name};\""' all + OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all %endif %install -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT # create directories -install -d %{buildroot}%{_bindir} -install -d %{buildroot}%{_datadir}/%{name}/artwork -install -d %{buildroot}%{_datadir}/%{name}/chds -install -d %{buildroot}%{_datadir}/%{name}/ctrlr -install -d %{buildroot}%{_datadir}/%{name}/effects -install -d %{buildroot}%{_datadir}/%{name}/fonts -install -d %{buildroot}%{_datadir}/%{name}/keymaps -install -d %{buildroot}%{_datadir}/%{name}/roms -install -d %{buildroot}%{_datadir}/%{name}/samples -install -d %{buildroot}%{_datadir}/%{name}/cheats -install -d %{buildroot}%{_mandir}/man1 -install -d %{buildroot}%{_sysconfdir}/%{name} -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/cfg -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/comments -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/diff -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/ini -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/inp -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/memcard -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/nvram -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/snap -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/sta +install -d $RPM_BUILD_ROOT%{_bindir} +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/chds +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/ctrlr +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/effects +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/roms +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/samples +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/cheats +install -d $RPM_BUILD_ROOT%{_mandir}/man1 +install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/cfg +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/comments +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/diff +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/ini +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/inp +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/memcard +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/nvram +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/snap +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/sta # install binaries and config files -install -pm 644 %{name}.ini %{buildroot}%{_sysconfdir}/%{name} -install -pm 644 src/osd/sdl/keymaps/* %{buildroot}%{_datadir}/%{name}/keymaps -#install -pm 644 ui.bdf %{SOURCE2} %{buildroot}%{_datadir}/%{name}/fonts +install -pm 644 %{name}.ini $RPM_BUILD_ROOT%{_sysconfdir}/%{name} +install -pm 644 src/osd/sdl/keymaps/* $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps +%if %{with ldplayer} +install -pm 755 ldplayer $RPM_BUILD_ROOT%{_bindir} +%endif %if %{with debug} -install -pm 755 %{name}d %{buildroot}%{_bindir} +install -pm 755 %{name}d $RPM_BUILD_ROOT%{_bindir} %else -install -pm 755 %{name} %{buildroot}%{_bindir} +install -pm 755 %{name} $RPM_BUILD_ROOT%{_bindir} %endif -install -pm 755 chdman jedutil ldplayer ldresample ldverify \ - romcmp testkeys unidasm %{buildroot}%{_bindir} +install -pm 755 chdman jedutil ldresample ldverify \ + romcmp testkeys unidasm $RPM_BUILD_ROOT%{_bindir} #for tool in regrep runtest split src2html srcclean for tool in regrep split src2html srcclean do -install -pm 755 $tool %{buildroot}%{_bindir}/%{name}-$tool +install -pm 755 $tool $RPM_BUILD_ROOT%{_bindir}/%{name}-$tool done pushd src/osd/sdl/man -install -pm 644 chdman.1 jedutil.1 ldplayer.1 ldverify.1 mame.1 romcmp.1 \ - testkeys.1 %{buildroot}%{_mandir}/man1 +%if %{with ldplayer} +install -pm 644 ldplayer.1 $RPM_BUILD_ROOT%{_mandir}/man1 +%endif +install -pm 644 chdman.1 jedutil.1 ldverify.1 mame.1 romcmp.1 \ + testkeys.1 $RPM_BUILD_ROOT%{_mandir}/man1 popd %clean -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT %files @@ -223,19 +237,29 @@ %{_mandir}/man1/romcmp.1* %{_mandir}/man1/testkeys.1* +%if %{with ldplayer} %files ldplayer %defattr(-,root,root,-) %{_bindir}/ldplayer %{_mandir}/man1/ldplayer.1* +%endif %changelog +* Mon Feb 28 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u3-1 +- Updated to 0.141u3 +- Filtered out redundant $RPM_OPT_FLAGS +- No longer enable joystick by default +- Provided an easy way to disable ldplayer +- Dropped upstreamed gcc-4.6 patch + * Wed Feb 09 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u2-1 - Updated to 0.141u2 * Mon Jan 24 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u1-1 - Updated to 0.141u1 - Re-enabled the fortify patch +- Fixed building with gcc-4.6 * Thu Jan 13 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141-1 - Updated to 0.141 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/mame/F-13/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 9 Feb 2011 21:23:44 -0000 1.20 +++ sources 28 Feb 2011 21:32:58 -0000 1.21 @@ -1,3 +1,4 @@ b19481d31b2d7d94c193f3e47cc5a461 mame0141s.exe b9e2d7b1200cb53044350fd73bac25f8 0141u1_diff.zip 66a6df9cfadd27e08aadd320c5ff7774 0141u2_diff.zip +84b7d0d45fbb66e39ca8d50db5569083 0141u3_diff.zip

13 years, 8 months

1
0
0 / 0

rpms/mame/F-14 .cvsignore, 1.21, 1.22 mame.spec, 1.25, 1.26 sources, 1.21, 1.22

by Julian Sikorski

Author: belegdol Update of /cvs/nonfree/rpms/mame/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv23458 Modified Files: .cvsignore mame.spec sources Log Message: * Mon Feb 28 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u3-1 - Updated to 0.141u3 - Filtered out redundant $RPM_OPT_FLAGS - No longer enable joystick by default - Provided an easy way to disable ldplayer - Dropped upstreamed gcc-4.6 patch Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/mame/F-14/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 9 Feb 2011 21:23:36 -0000 1.21 +++ .cvsignore 28 Feb 2011 21:32:48 -0000 1.22 @@ -1,3 +1,4 @@ mame0141s.exe 0141u1_diff.zip 0141u2_diff.zip +0141u3_diff.zip Index: mame.spec =================================================================== RCS file: /cvs/nonfree/rpms/mame/F-14/mame.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- mame.spec 9 Feb 2011 21:40:48 -0000 1.25 +++ mame.spec 28 Feb 2011 21:32:48 -0000 1.26 @@ -1,8 +1,11 @@ -# the debug build is disabled by default, please use --with debug to override +# ldplayer can be disabled by --without ldplayer or by changing to %bcond_with +# if it does not build. The debug build is disabled by default, please use +# --with debug to override +%bcond_without ldplayer %bcond_with debug %global baseversion 141 -%global sourceupdate 2 +%global sourceupdate 3 Name: mame %if 0%{?sourceupdate} @@ -22,7 +25,7 @@ #Source updates Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip -#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip +Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip #Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip %endif Patch0: %{name}-fortify.patch @@ -68,6 +71,7 @@ %description tools %{summary}. +%if %{with ldplayer} %package ldplayer Summary: Standalone laserdisc player based on MAME Group: Applications/Emulators @@ -77,6 +81,7 @@ %description ldplayer %{summary}. +%endif %prep @@ -121,72 +126,81 @@ # Fedora custom defaults video opengl autosave 1 -joystick 1 EOF %build +#these flags are already included in the Makefile +RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e s/"-O2 -g -pipe -Wall "//) + +%if %{with ldplayer} make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \ - OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/%{name};\""' TARGET=ldplayer + OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" TARGET=ldplayer +%endif %if %{with debug} make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \ - OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/%{name};\""' DEBUG=1 all + OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" DEBUG=1 all %else make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \ - OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/%{name};\""' all + OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all %endif %install -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT # create directories -install -d %{buildroot}%{_bindir} -install -d %{buildroot}%{_datadir}/%{name}/artwork -install -d %{buildroot}%{_datadir}/%{name}/chds -install -d %{buildroot}%{_datadir}/%{name}/ctrlr -install -d %{buildroot}%{_datadir}/%{name}/effects -install -d %{buildroot}%{_datadir}/%{name}/fonts -install -d %{buildroot}%{_datadir}/%{name}/keymaps -install -d %{buildroot}%{_datadir}/%{name}/roms -install -d %{buildroot}%{_datadir}/%{name}/samples -install -d %{buildroot}%{_datadir}/%{name}/cheats -install -d %{buildroot}%{_mandir}/man1 -install -d %{buildroot}%{_sysconfdir}/%{name} -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/cfg -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/comments -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/diff -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/ini -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/inp -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/memcard -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/nvram -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/snap -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/sta +install -d $RPM_BUILD_ROOT%{_bindir} +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/chds +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/ctrlr +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/effects +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/roms +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/samples +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/cheats +install -d $RPM_BUILD_ROOT%{_mandir}/man1 +install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/cfg +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/comments +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/diff +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/ini +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/inp +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/memcard +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/nvram +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/snap +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/sta # install binaries and config files -install -pm 644 %{name}.ini %{buildroot}%{_sysconfdir}/%{name} -install -pm 644 src/osd/sdl/keymaps/* %{buildroot}%{_datadir}/%{name}/keymaps -#install -pm 644 ui.bdf %{SOURCE2} %{buildroot}%{_datadir}/%{name}/fonts +install -pm 644 %{name}.ini $RPM_BUILD_ROOT%{_sysconfdir}/%{name} +install -pm 644 src/osd/sdl/keymaps/* $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps +%if %{with ldplayer} +install -pm 755 ldplayer $RPM_BUILD_ROOT%{_bindir} +%endif %if %{with debug} -install -pm 755 %{name}d %{buildroot}%{_bindir} +install -pm 755 %{name}d $RPM_BUILD_ROOT%{_bindir} %else -install -pm 755 %{name} %{buildroot}%{_bindir} +install -pm 755 %{name} $RPM_BUILD_ROOT%{_bindir} %endif -install -pm 755 chdman jedutil ldplayer ldresample ldverify \ - romcmp testkeys unidasm %{buildroot}%{_bindir} +install -pm 755 chdman jedutil ldresample ldverify \ + romcmp testkeys unidasm $RPM_BUILD_ROOT%{_bindir} #for tool in regrep runtest split src2html srcclean for tool in regrep split src2html srcclean do -install -pm 755 $tool %{buildroot}%{_bindir}/%{name}-$tool +install -pm 755 $tool $RPM_BUILD_ROOT%{_bindir}/%{name}-$tool done pushd src/osd/sdl/man -install -pm 644 chdman.1 jedutil.1 ldplayer.1 ldverify.1 mame.1 romcmp.1 \ - testkeys.1 %{buildroot}%{_mandir}/man1 +%if %{with ldplayer} +install -pm 644 ldplayer.1 $RPM_BUILD_ROOT%{_mandir}/man1 +%endif +install -pm 644 chdman.1 jedutil.1 ldverify.1 mame.1 romcmp.1 \ + testkeys.1 $RPM_BUILD_ROOT%{_mandir}/man1 popd %clean -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT %files @@ -223,19 +237,29 @@ %{_mandir}/man1/romcmp.1* %{_mandir}/man1/testkeys.1* +%if %{with ldplayer} %files ldplayer %defattr(-,root,root,-) %{_bindir}/ldplayer %{_mandir}/man1/ldplayer.1* +%endif %changelog +* Mon Feb 28 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u3-1 +- Updated to 0.141u3 +- Filtered out redundant $RPM_OPT_FLAGS +- No longer enable joystick by default +- Provided an easy way to disable ldplayer +- Dropped upstreamed gcc-4.6 patch + * Wed Feb 09 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u2-1 - Updated to 0.141u2 * Mon Jan 24 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u1-1 - Updated to 0.141u1 - Re-enabled the fortify patch +- Fixed building with gcc-4.6 * Thu Jan 13 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141-1 - Updated to 0.141 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/mame/F-14/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 9 Feb 2011 21:23:36 -0000 1.21 +++ sources 28 Feb 2011 21:32:48 -0000 1.22 @@ -1,3 +1,4 @@ b19481d31b2d7d94c193f3e47cc5a461 mame0141s.exe b9e2d7b1200cb53044350fd73bac25f8 0141u1_diff.zip 66a6df9cfadd27e08aadd320c5ff7774 0141u2_diff.zip +84b7d0d45fbb66e39ca8d50db5569083 0141u3_diff.zip

13 years, 8 months

1
0
0 / 0

rpms/mame/devel .cvsignore, 1.21, 1.22 mame.spec, 1.25, 1.26 sources, 1.21, 1.22 mame-gcc46.patch, 1.1, NONE

by Julian Sikorski

Author: belegdol Update of /cvs/nonfree/rpms/mame/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv23354 Modified Files: .cvsignore mame.spec sources Removed Files: mame-gcc46.patch Log Message: * Mon Feb 28 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u3-1 - Updated to 0.141u3 - Filtered out redundant $RPM_OPT_FLAGS - No longer enable joystick by default - Provided an easy way to disable ldplayer - Dropped upstreamed gcc-4.6 patch Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 9 Feb 2011 21:23:24 -0000 1.21 +++ .cvsignore 28 Feb 2011 21:32:37 -0000 1.22 @@ -1,3 +1,4 @@ mame0141s.exe 0141u1_diff.zip 0141u2_diff.zip +0141u3_diff.zip Index: mame.spec =================================================================== RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- mame.spec 9 Feb 2011 21:23:24 -0000 1.25 +++ mame.spec 28 Feb 2011 21:32:37 -0000 1.26 @@ -1,8 +1,11 @@ -# the debug build is disabled by default, please use --with debug to override +# ldplayer can be disabled by --without ldplayer or by changing to %bcond_with +# if it does not build. The debug build is disabled by default, please use +# --with debug to override +%bcond_without ldplayer %bcond_with debug %global baseversion 141 -%global sourceupdate 2 +%global sourceupdate 3 Name: mame %if 0%{?sourceupdate} @@ -22,11 +25,10 @@ #Source updates Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip -#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip +Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip #Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip %endif Patch0: %{name}-fortify.patch -Patch1: %{name}-gcc46.patch Patch2: %{name}-verbosebuild.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -69,6 +71,7 @@ %description tools %{summary}. +%if %{with ldplayer} %package ldplayer Summary: Standalone laserdisc player based on MAME Group: Applications/Emulators @@ -78,6 +81,7 @@ %description ldplayer %{summary}. +%endif %prep @@ -94,7 +98,6 @@ done %endif %patch0 -p1 -b .fortify -%patch1 -p1 -b .gcc46 %patch2 -p1 -b .verbosebuild # Create ini file @@ -123,72 +126,81 @@ # Fedora custom defaults video opengl autosave 1 -joystick 1 EOF %build +#these flags are already included in the Makefile +RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e s/"-O2 -g -pipe -Wall "//) + +%if %{with ldplayer} make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \ - OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/%{name};\""' TARGET=ldplayer + OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" TARGET=ldplayer +%endif %if %{with debug} make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \ - OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/%{name};\""' DEBUG=1 all + OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" DEBUG=1 all %else make %{?_smp_mflags} NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 SUFFIX64="" \ - OPT_FLAGS='%{optflags} -DINI_PATH="\"%{_sysconfdir}/%{name};\""' all + OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all %endif %install -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT # create directories -install -d %{buildroot}%{_bindir} -install -d %{buildroot}%{_datadir}/%{name}/artwork -install -d %{buildroot}%{_datadir}/%{name}/chds -install -d %{buildroot}%{_datadir}/%{name}/ctrlr -install -d %{buildroot}%{_datadir}/%{name}/effects -install -d %{buildroot}%{_datadir}/%{name}/fonts -install -d %{buildroot}%{_datadir}/%{name}/keymaps -install -d %{buildroot}%{_datadir}/%{name}/roms -install -d %{buildroot}%{_datadir}/%{name}/samples -install -d %{buildroot}%{_datadir}/%{name}/cheats -install -d %{buildroot}%{_mandir}/man1 -install -d %{buildroot}%{_sysconfdir}/%{name} -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/cfg -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/comments -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/diff -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/ini -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/inp -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/memcard -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/nvram -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/snap -install -d %{buildroot}%{_sysconfdir}/skel/.%{name}/sta +install -d $RPM_BUILD_ROOT%{_bindir} +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/artwork +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/chds +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/ctrlr +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/effects +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/roms +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/samples +install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/cheats +install -d $RPM_BUILD_ROOT%{_mandir}/man1 +install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/cfg +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/comments +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/diff +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/ini +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/inp +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/memcard +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/nvram +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/snap +install -d $RPM_BUILD_ROOT%{_sysconfdir}/skel/.%{name}/sta # install binaries and config files -install -pm 644 %{name}.ini %{buildroot}%{_sysconfdir}/%{name} -install -pm 644 src/osd/sdl/keymaps/* %{buildroot}%{_datadir}/%{name}/keymaps -#install -pm 644 ui.bdf %{SOURCE2} %{buildroot}%{_datadir}/%{name}/fonts +install -pm 644 %{name}.ini $RPM_BUILD_ROOT%{_sysconfdir}/%{name} +install -pm 644 src/osd/sdl/keymaps/* $RPM_BUILD_ROOT%{_datadir}/%{name}/keymaps +%if %{with ldplayer} +install -pm 755 ldplayer $RPM_BUILD_ROOT%{_bindir} +%endif %if %{with debug} -install -pm 755 %{name}d %{buildroot}%{_bindir} +install -pm 755 %{name}d $RPM_BUILD_ROOT%{_bindir} %else -install -pm 755 %{name} %{buildroot}%{_bindir} +install -pm 755 %{name} $RPM_BUILD_ROOT%{_bindir} %endif -install -pm 755 chdman jedutil ldplayer ldresample ldverify \ - romcmp testkeys unidasm %{buildroot}%{_bindir} +install -pm 755 chdman jedutil ldresample ldverify \ + romcmp testkeys unidasm $RPM_BUILD_ROOT%{_bindir} #for tool in regrep runtest split src2html srcclean for tool in regrep split src2html srcclean do -install -pm 755 $tool %{buildroot}%{_bindir}/%{name}-$tool +install -pm 755 $tool $RPM_BUILD_ROOT%{_bindir}/%{name}-$tool done pushd src/osd/sdl/man -install -pm 644 chdman.1 jedutil.1 ldplayer.1 ldverify.1 mame.1 romcmp.1 \ - testkeys.1 %{buildroot}%{_mandir}/man1 +%if %{with ldplayer} +install -pm 644 ldplayer.1 $RPM_BUILD_ROOT%{_mandir}/man1 +%endif +install -pm 644 chdman.1 jedutil.1 ldverify.1 mame.1 romcmp.1 \ + testkeys.1 $RPM_BUILD_ROOT%{_mandir}/man1 popd %clean -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT %files @@ -225,13 +237,22 @@ %{_mandir}/man1/romcmp.1* %{_mandir}/man1/testkeys.1* +%if %{with ldplayer} %files ldplayer %defattr(-,root,root,-) %{_bindir}/ldplayer %{_mandir}/man1/ldplayer.1* +%endif %changelog +* Mon Feb 28 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u3-1 +- Updated to 0.141u3 +- Filtered out redundant $RPM_OPT_FLAGS +- No longer enable joystick by default +- Provided an easy way to disable ldplayer +- Dropped upstreamed gcc-4.6 patch + * Wed Feb 09 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.141u2-1 - Updated to 0.141u2 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/mame/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 9 Feb 2011 21:23:24 -0000 1.21 +++ sources 28 Feb 2011 21:32:37 -0000 1.22 @@ -1,3 +1,4 @@ b19481d31b2d7d94c193f3e47cc5a461 mame0141s.exe b9e2d7b1200cb53044350fd73bac25f8 0141u1_diff.zip 66a6df9cfadd27e08aadd320c5ff7774 0141u2_diff.zip +84b7d0d45fbb66e39ca8d50db5569083 0141u3_diff.zip --- mame-gcc46.patch DELETED ---

13 years, 8 months

1
0
0 / 0

rpms/ffmpeg/devel .cvsignore, 1.20, 1.21 ffmpeg-snapshot.sh, 1.9, 1.10 ffmpeg.spec, 1.38, 1.39 sources, 1.20, 1.21

by Dominik Mierzejewski

Author: rathann Update of /cvs/free/rpms/ffmpeg/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv967 Modified Files: .cvsignore ffmpeg-snapshot.sh ffmpeg.spec sources Log Message: - 20110227 snapshot - build PIC objects on PPC (bug #1457) - provide custom version string Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 21 Jan 2011 11:26:03 -0000 1.20 +++ .cvsignore 27 Feb 2011 23:38:24 -0000 1.21 @@ -1 +1 @@ -ffmpeg-20110110.tar.bz2 +ffmpeg-20110227.tar.bz2 Index: ffmpeg-snapshot.sh =================================================================== RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg-snapshot.sh,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ffmpeg-snapshot.sh 21 Jan 2011 11:26:03 -0000 1.9 +++ ffmpeg-snapshot.sh 27 Feb 2011 23:38:24 -0000 1.10 @@ -13,15 +13,9 @@ unset CDPATH pwd=$(pwd) date=$(date +%Y%m%d) -svn={$date} -svn=HEAD -cd "$tmp" -svn checkout -r $svn svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-$date -cd ffmpeg-$date -pushd libswscale -svn update -r $svn libswscale +pushd "$tmp" +git clone git://git.videolan.org/ffmpeg.git +cd ffmpeg +git archive --prefix="ffmpeg-${date}/" --format=tar master | bzip2 > "$pwd"/ffmpeg-${date}.tar.bz2 popd -cd .. -tar jcf "$pwd"/ffmpeg-$date.tar.bz2 ffmpeg-$date -cd - >/dev/null Index: ffmpeg.spec =================================================================== RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- ffmpeg.spec 21 Jan 2011 11:26:03 -0000 1.38 +++ ffmpeg.spec 27 Feb 2011 23:38:24 -0000 1.39 @@ -1,11 +1,11 @@ # TODO: add make test to %%check section -%global svn 20110110 +%global date 20110227 Summary: Digital VCR and streaming server Name: ffmpeg Version: 0.6.1 -Release: 1.%{svn}svn%{?dist} +Release: 1.%{date}git%{?dist} %if 0%{?_with_amr:1} License: GPLv3+ %else @@ -13,7 +13,7 @@ %endif Group: Applications/Multimedia URL: http://ffmpeg.org/ -Source0: ffmpeg-%{svn}.tar.bz2 +Source0: ffmpeg-%{date}.tar.bz2 Source1: ffmpeg-snapshot.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -83,7 +83,6 @@ --mandir=%{_mandir} \\\ --arch=%{_target_cpu} \\\ --extra-cflags="$RPM_OPT_FLAGS" \\\ - --extra-version=rpmfusion \\\ %{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-version3} \\\ --enable-bzlib \\\ --enable-libdc1394 \\\ @@ -112,13 +111,10 @@ %prep -%setup -q -n ffmpeg-%{svn} +%setup -q -n ffmpeg-%{date} +echo "git-snapshot-%{date}-RPMFusion" > VERSION %build -%ifarch ppc ppc64 -# compile with -mlongcall on ppc/ppc64 (rf804) -export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall" -%endif mkdir generic pushd generic %{ff_configure}\ @@ -137,10 +133,12 @@ %ifarch ppc --cpu=g3 \ --enable-runtime-cpudetect \ + --enable-pic \ %endif %ifarch ppc64 --cpu=g5 \ --enable-runtime-cpudetect \ + --enable-pic \ %endif %ifarch sparc sparc64 --disable-vis \ @@ -230,11 +228,13 @@ %changelog -* Mon Jan 10 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.6.1-1.20110110svn -- 20110110 snapshot +* Sun Feb 27 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.6.1-1.20110227git +- 20110227 snapshot - bump version to post-0.6.1 to allow stable 0.6.1 update in older branches - drop --with amr->opencore_amr indirection - add qt-faststart tool (bug #1259) +- build PIC objects on PPC (bug #1457) +- provide custom version string * Fri Jan 21 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 0.6-5.20100704svn - Rebuild for new openjpeg Index: sources =================================================================== RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 21 Jan 2011 11:26:03 -0000 1.20 +++ sources 27 Feb 2011 23:38:24 -0000 1.21 @@ -1 +1 @@ -fccd69057e331c2541bb024b1e92e864 ffmpeg-20110110.tar.bz2 +97a4485c7373faaa7df70f218867d20d ffmpeg-20110227.tar.bz2

13 years, 9 months

1
0
0 / 0

rpms/x264/devel .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 x264-snapshot.sh, 1.1, 1.2 x264.spec, 1.22, 1.23

by Dominik Mierzejewski

Author: rathann Update of /cvs/free/rpms/x264/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv30026 Modified Files: .cvsignore sources x264-snapshot.sh x264.spec Log Message: - 20110227 snapshot (ABI bump) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 10 Jan 2011 12:54:19 -0000 1.15 +++ .cvsignore 27 Feb 2011 22:52:17 -0000 1.16 @@ -1 +1 @@ -x264-20110110.tar.bz2 +x264-20110227.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/x264/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 10 Jan 2011 12:54:19 -0000 1.15 +++ sources 27 Feb 2011 22:52:17 -0000 1.16 @@ -1 +1 @@ -f34cfcf47656cb6bfe7052a113b0db8d x264-20110110.tar.bz2 +784318733e4301d7c49c1317cdfe6baf x264-20110227.tar.bz2 Index: x264-snapshot.sh =================================================================== RCS file: /cvs/free/rpms/x264/devel/x264-snapshot.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- x264-snapshot.sh 3 Aug 2008 17:53:20 -0000 1.1 +++ x264-snapshot.sh 27 Feb 2011 22:52:17 -0000 1.2 @@ -17,7 +17,7 @@ pushd "$tmp" git clone git://git.videolan.org/x264.git x264-$git pushd x264-$git -./version.sh . +./version.sh > version.h find . -type d -name .git -print0 | xargs -0r rm -rf popd tar jcf "$pwd"/x264-$git.tar.bz2 x264-$git Index: x264.spec =================================================================== RCS file: /cvs/free/rpms/x264/devel/x264.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- x264.spec 10 Jan 2011 12:54:19 -0000 1.22 +++ x264.spec 27 Feb 2011 22:52:17 -0000 1.23 @@ -1,4 +1,4 @@ -%global snapshot 20110110 +%global snapshot 20110227 Summary: H264/AVC video streams encoder Name: x264 @@ -137,8 +137,8 @@ %endif %changelog -* Mon Jan 10 2011 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.29.20110110 -- 20110110 snapshot (ABI bump) +* Mon Jan 10 2011 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.29.20110227 +- 20110227 snapshot (ABI bump) * Tue Jul 06 2010 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.28.20100706gitd058f37 - 20100706 snapshot (ABI bump)

13 years, 9 months

1
0
0 / 0

rpms/VirtualBox-OSE-kmod/F-14 VirtualBox-OSE-kmod.spec,1.54,1.55

by Lubomir Rintel

Author: lkundrak Update of /cvs/free/rpms/VirtualBox-OSE-kmod/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv29121/F-14 Modified Files: VirtualBox-OSE-kmod.spec Log Message: Pull from devel Index: VirtualBox-OSE-kmod.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/F-14/VirtualBox-OSE-kmod.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- VirtualBox-OSE-kmod.spec 12 Feb 2011 11:12:41 -0000 1.54 +++ VirtualBox-OSE-kmod.spec 25 Feb 2011 15:28:47 -0000 1.55 @@ -3,8 +3,8 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%define buildforkernels newest -#define buildforkernels akmod +#define buildforkernels newest +#define buldforkernels akmod # In prerelease builds (such as betas), this package has the same # major version number, while the kernel module abi is not guarranteed @@ -18,8 +18,8 @@ %bcond_without hardening Name: VirtualBox-OSE-kmod -Version: 3.2.10 -Release: 1%{?dist}.6 +Version: 4.0.2 +Release: 2%{?dist} Summary: Kernel module for VirtualBox-OSE Group: System Environment/Kernel @@ -33,7 +33,7 @@ BuildRequires: %{AkmodsBuildRequires} # needed for plague to make sure it builds for i586 and i686 -ExclusiveArch: i586 i686 x86_64 +ExclusiveArch: i686 x86_64 # get the proper build-sysbuild package from the repo, which # tracks in all the kernel-devel packages @@ -68,7 +68,14 @@ %build for kernel_version in %{?kernel_versions}; do - for module in vbox{drv,guest,netadp,netflt,sf,video}; do + for module in vbox{drv,guest}; do + make VBOX_USE_INSERT_PAGE=1 %{?_smp_mflags} -C "${kernel_version##*___}" SUBDIRS="${PWD}/_kmod_build_${kernel_version%%___*}/${module}" modules + done + cp _kmod_build_${kernel_version%%___*}/{vboxdrv/Module.symvers,vboxnetadp} + cp _kmod_build_${kernel_version%%___*}/{vboxdrv/Module.symvers,vboxnetflt} + cp _kmod_build_${kernel_version%%___*}/{vboxguest/Module.symvers,vboxsf} + cp _kmod_build_${kernel_version%%___*}/{vboxguest/Module.symvers,vboxvideo} + for module in vbox{netadp,netflt,sf,video}; do make VBOX_USE_INSERT_PAGE=1 %{?_smp_mflags} -C "${kernel_version##*___}" SUBDIRS="${PWD}/_kmod_build_${kernel_version%%___*}/${module}" modules done done @@ -98,23 +105,14 @@ %changelog -* Sat Feb 12 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.10-1.6 -- rebuild for updated kernel - -* Fri Dec 24 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.10-1.5 -- rebuild for updated kernel +* Mon Feb 14 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 4.0.2-2 +- Fix module symbol versioning -* Wed Dec 22 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.10-1.4 -- rebuild for updated kernel - -* Mon Dec 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.10-1.3 -- rebuild for updated kernel - -* Fri Dec 17 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.10-1.2 -- rebuild for updated kernel +* Sat Feb 05 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 4.0.2-1 +- New release -* Sun Dec 05 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.10-1.1 -- rebuild for F-14 kernel +* Tue Jan 11 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.10-2 +- Fix build with 2.6.37 * Tue Nov 16 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.10-1 - New release

13 years, 9 months

1
0
0 / 0

by Lubomir Rintel

Author: lkundrak Update of /cvs/free/rpms/VirtualBox-OSE/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv28586/F-14 Modified Files: .cvsignore VirtualBox-OSE.spec sources Added Files: VirtualBox-OSE-4.0.0-32bit.patch VirtualBox-OSE-4.0.0-beramono.patch VirtualBox-OSE-4.0.0-makeself.patch VirtualBox-OSE-4.0.0-usblib.patch VirtualBox-OSE-4.0.2-aiobug.patch VirtualBox-OSE-4.0.2-gcc46.patch VirtualBox-OSE-4.0.2-libcxx.patch VirtualBox-OSE-4.0.2-strings.patch VirtualBox-OSE-4.0.2-xorg17.patch Removed Files: VirtualBox-OSE-3.2.0-32bit.patch VirtualBox-OSE-3.2.0-strings.patch VirtualBox-OSE-3.2.10-cpuid.patch VirtualBox-OSE-3.2.10-xorg17.patch VirtualBox-OSE-3.2.4-libcxx.patch VirtualBox-OSE-3.2.6-gcc45.patch Log Message: Import 4.0.2 from devel VirtualBox-OSE-4.0.0-32bit.patch: configure | 2 +- src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++ src/VBox/VMM/testcase/Makefile.kmk | 10 +++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) --- NEW FILE VirtualBox-OSE-4.0.0-32bit.patch --- >From a9548501755beeec6fa11b0c261f167164a4ee70 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkundrak(a)v3.sk> Date: Fri, 26 Mar 2010 04:44:55 +0100 Subject: [PATCH] Build on x86_64 without 32bit toolchain. This disables the check for 32bit toolchain and tests that need it (boo). --- configure | 2 +- src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++ src/VBox/VMM/testcase/Makefile.kmk | 9 +++++++++ 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 42ce775..0932637 100755 --- a/configure +++ b/configure @@ -2525,7 +2525,7 @@ if [ "$OS" = "linux" ]; then fi check_libcap check_compiler_h - [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit + #[ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit # tools/common/makeself* [ $OSE -ge 1 ] && check_makeself fi diff --git a/src/VBox/Devices/testcase/Makefile.kmk b/src/VBox/Devices/testcase/Makefile.kmk index 4debf81..59dae0d 100644 --- a/src/VBox/Devices/testcase/Makefile.kmk +++ b/src/VBox/Devices/testcase/Makefile.kmk @@ -45,22 +45,28 @@ VBOX_DEVICES_TESTS_FEATURES = \ # We setup one 'other' target for executing the structure & alignment # validation testcases. Perhaps a bit hackish, but extremely useful. # +ifneq ($(KBUILD_HOST_ARCH),amd64) ifeq ($(KBUILD_TARGET),$(KBUILD_HOST)) ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),) OTHERS += \ $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run endif endif +endif # The normal testing pass. +ifneq ($(KBUILD_HOST_ARCH),amd64) TESTING += \ $(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run +endif ifdef VBOX_WITH_RAW_MODE # # The testcase generator. # +ifneq ($(KBUILD_HOST_ARCH),amd64) PROGRAMS += tstDeviceStructSizeRC +endif tstDeviceStructSizeRC_TEMPLATE = VBoxRcExe tstDeviceStructSizeRC_DEFS = $(VBOX_DEVICES_TESTS_FEATURES) tstDeviceStructSizeRC_SOURCES = tstDeviceStructSizeRC.cpp @@ -73,7 +79,9 @@ endif # VBOX_WITH_RAW_MODE # # The testcase it self. # +ifneq ($(KBUILD_HOST_ARCH),amd64) PROGRAMS += tstDeviceStructSize +endif tstDeviceStructSize_TEMPLATE = VBOXR3AUTOTST tstDeviceStructSize_DEFS = $(VBOX_DEVICES_TESTS_FEATURES) tstDeviceStructSize_INCS = \ diff --git a/src/VBox/VMM/testcase/Makefile.kmk b/src/VBox/VMM/testcase/Makefile.kmk index f947789..95882f1 100644 --- a/src/VBox/VMM/testcase/Makefile.kmk +++ b/src/VBox/VMM/testcase/Makefile.kmk @@ -21,10 +21,14 @@ include $(KBUILD_PATH)/subheader.kmk # # Target lists. # +ifneq ($(KBUILD_HOST_ARCH),amd64) PROGRAMS += tstVMStructSize tstAsmStructs +endif ifdef VBOX_WITH_RAW_MODE +ifneq ($(KBUILD_HOST_ARCH),amd64) PROGRAMS += tstVMStructRC tstAsmStructsRC endif +endif ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS PROGRAMS += tstGlobalConfig tstInstrEmul ifdef VBOX_WITH_RAW_MODE @@ -67,16 +71,21 @@ BLDDIRS += $(VBOX_VMM_TESTCASE_OUT_DIR) # ifeq ($(KBUILD_TARGET),$(KBUILD_HOST)) ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),) + ifneq ($(KBUILD_HOST_ARCH),amd64) OTHERS += \ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run + endif endif endif # The normal testing pass. + +ifneq ($(KBUILD_HOST_ARCH),amd64) TESTING += \ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run +endif ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS TESTING += \ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run -- 1.7.3.4 VirtualBox-OSE-4.0.0-beramono.patch: docbook2latex.xsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE VirtualBox-OSE-4.0.0-beramono.patch --- >From depths of hell From: Lubomir Rintel <lkundrak(a)v3.sk> Subject: Do not rely on Bera Mono font We'd need texlive-fontsextra package which we do not have. diff -up VirtualBox-4.0.0_OSE/doc/manual/docbook2latex.xsl.beramono VirtualBox-4.0.0_OSE/doc/manual/docbook2latex.xsl --- VirtualBox-4.0.0_OSE/doc/manual/docbook2latex.xsl.beramono 2011-01-10 16:59:18.978038927 +0100 +++ VirtualBox-4.0.0_OSE/doc/manual/docbook2latex.xsl 2011-01-10 16:59:27.254065674 +0100 @@ -129,9 +129,9 @@ % use Bera Mono (a variant of Bitstream Vera Mono) as typewriter font % (requires texlive-fontsextra) -\usepackage[scaled]{beramono} +% \usepackage[scaled]{beramono} % previously: use Courier as typewriter font: -% \usepackage{courier} +\usepackage{courier} \definecolor{colNote}{rgb}{0,0,0} \definecolor{colWarning}{rgb}{0,0,0} VirtualBox-OSE-4.0.0-makeself.patch: configure | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- NEW FILE VirtualBox-OSE-4.0.0-makeself.patch --- >From 56a89fc1a9e0e8ea6b6a76220ab91745ab2032e1 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkundrak(a)v3.sk> Date: Mon, 10 Jan 2011 15:05:01 +0100 Subject: [PATCH] Do not look for makeself We neither have it nor use it for RPM packaging. --- configure | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 0932637..d365e48 100755 --- a/configure +++ b/configure @@ -2527,7 +2527,7 @@ if [ "$OS" = "linux" ]; then check_compiler_h #[ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit # tools/common/makeself* - [ $OSE -ge 1 ] && check_makeself + #[ $OSE -ge 1 ] && check_makeself fi [ -n "$SETUP_WINE" ] && setup_wine -- 1.7.3.4 VirtualBox-OSE-4.0.0-usblib.patch: Makefile.kmk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- NEW FILE VirtualBox-OSE-4.0.0-usblib.patch --- >From 2336bf28506eb2b7a94fdfe7b302c70b107482e2 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkundrak(a)v3.sk> Date: Mon, 10 Jan 2011 15:39:07 +0100 Subject: [PATCH] Fix path to USBLib kmk: *** No rule to make target `out/linux.x86/release/lib/USBLib.a', needed by `out/linux.x86/release/obj/tstHostHardwareLinux/tstHostHardwareLinux'. Stop. --- src/VBox/Main/testcase/Makefile.kmk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/VBox/Main/testcase/Makefile.kmk b/src/VBox/Main/testcase/Makefile.kmk index 7a8218d..d353de3 100644 --- a/src/VBox/Main/testcase/Makefile.kmk +++ b/src/VBox/Main/testcase/Makefile.kmk @@ -161,7 +161,7 @@ tstHostHardwareLinux_DEFS = \ $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,) \ $(if $(VBOX_USB_WITH_INOTIFY),VBOX_USB_WITH_INOTIFY,) tstHostHardwareLinux_LIBS += \ - $(PATH_OUT)/lib/USBLib.a + $(PATH_OUT)/obj/USBLib/USBLib.o # generate rules. -- 1.7.3.4 VirtualBox-OSE-4.0.2-aiobug.patch: ConsoleImpl2.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- NEW FILE VirtualBox-OSE-4.0.2-aiobug.patch --- >From 7d3cdf2f24718b054af058caa69feb879f4da066 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkundrak(a)v3.sk> Date: Thu, 3 Feb 2011 23:31:01 +0100 Subject: [PATCH] Disable the aio bug detection --- src/VBox/Main/src-client/ConsoleImpl2.cpp | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/VBox/Main/src-client/ConsoleImpl2.cpp b/src/VBox/Main/src-client/ConsoleImpl2.cpp index cfa0bd4..ef4aca4 100644 --- a/src/VBox/Main/src-client/ConsoleImpl2.cpp +++ b/src/VBox/Main/src-client/ConsoleImpl2.cpp @@ -2870,6 +2870,8 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst, mfSnapshotFolderSizeWarningShown = true; } +// In el6 we have a backported patch to address this +#if 0 #ifdef RT_OS_LINUX /* * Ext4 bug: Check if the host I/O cache is disabled and the disk image is located @@ -2925,6 +2927,7 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst, } } #endif +#endif } } -- 1.7.3.4 VirtualBox-OSE-4.0.2-gcc46.patch: configure | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- NEW FILE VirtualBox-OSE-4.0.2-gcc46.patch --- >From fb2a3a2773905364fe3b8ee0ebd36c28e65da78a Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkundrak(a)v3.sk> Date: Tue, 8 Feb 2011 22:15:09 +0100 Subject: [PATCH] Allow building with gcc-4.6 --- configure | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index d365e48..f97b822 100755 --- a/configure +++ b/configure @@ -409,9 +409,9 @@ check_gcc() elif [ $cc_maj -lt 3 \ -o $ $cc_maj -eq 3 -a $cc_min -lt 2 $ \ -o $ $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" $ \ - -o $ $cc_maj -eq 4 -a $cc_min -gt 5 $ \ + -o $ $cc_maj -eq 4 -a $cc_min -gt 6 $ \ -o $cc_maj -gt 4 ]; then - log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<5" + log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<6" fail really else log_success "found version $cc_ver" -- 1.7.3.4 VirtualBox-OSE-4.0.2-libcxx.patch: Config.kmk | 2 - configure | 2 - src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 33 +++++++++++-------------- src/VBox/Storage/testcase/Makefile.kmk | 3 -- 4 files changed, 18 insertions(+), 22 deletions(-) --- NEW FILE VirtualBox-OSE-4.0.2-libcxx.patch --- >From 21fe4a32296cc6246c98e7ec31be9772c259306b Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkundrak(a)v3.sk> Date: Fri, 18 Jun 2010 10:58:14 +0200 Subject: [PATCH] Do not include statically linked libstdc++ Not a good idea if we don't need to be binary-compatible across exotic distribution. Doesn't work with trunk glibc heading towards 2.11 anyways. Static linking is not really supported anyways. --- src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 33 +++++++++++------------- src/VBox/Storage/testcase/Makefile.kmk | 2 +- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk index dd764a4..ddcd494 100644 --- a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk +++ b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk @@ -50,10 +50,7 @@ VBoxClient_LIBS = \ X11 \ Xrandr \ Xt -# These are static replacements for gcc-specific parts of libstdc++ -VBoxClient_LIBS += \ - supc++ \ - gcc_eh +VBoxClient_LIBS += stdc++ ifdef VBOX_X11_SEAMLESS_GUEST VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE VBoxClient_SOURCES += \ @@ -69,20 +66,20 @@ endif ifdef VBOX_WITH_GUEST_PROPS VBoxClient_DEFS += VBOX_WITH_GUEST_PROPS endif -# -# Link against libstdc++.a. (http://www.trilithium.com/johan/2005/06/static-libstdc/). -# (It would've been preferred to avoid features depending on libstdc++, of course...) -# -# Actually, this is darn annoying and will *NOT* be tolerated for any new code! -# -VBoxClient_LIBPATH += $(VBoxClient_0_OUTDIR) -VBoxClient_ORDERDEPS = $(VBoxClient_0_OUTDIR)/libstdc++.a -VBoxClient_CLEAN = $(VBoxClient_0_OUTDIR)/libstdc++.a -$$(VBoxClient_0_OUTDIR)/libstdc++.a: - $(call MSG_L1,Forcing static libstdc++) - $(QUIET)$(MKDIR) -p $(@D) - $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \ - || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ +## +## Link against libstdc++.a. (http://www.trilithium.com/johan/2005/06/static-libstdc/). +## (It would've been preferred to avoid features depending on libstdc++, of course...) +## +## Actually, this is darn annoying and will *NOT* be tolerated for any new code! +## +#VBoxClient_LIBPATH += $(VBoxClient_0_OUTDIR) +#VBoxClient_ORDERDEPS = $(VBoxClient_0_OUTDIR)/libstdc++.a +#VBoxClient_CLEAN = $(VBoxClient_0_OUTDIR)/libstdc++.a +#$$(VBoxClient_0_OUTDIR)/libstdc++.a: +# $(call MSG_L1,Forcing static libstdc++) +# $(QUIET)$(MKDIR) -p $(@D) +# $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \ +# || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ ifdef VBOX_X11_SEAMLESS_GUEST if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK) diff --git a/src/VBox/Storage/testcase/Makefile.kmk b/src/VBox/Storage/testcase/Makefile.kmk index 77075d9..b996e3d 100644 --- a/src/VBox/Storage/testcase/Makefile.kmk +++ b/src/VBox/Storage/testcase/Makefile.kmk @@ -40,7 +40,7 @@ ifdef VBOX_WITH_TESTCASES tstVDSnap_TEMPLATE = VBOXR3TSTEXE tstVDShareable_TEMPLATE = VBOXR3TSTEXE tstVDIo_TEMPLATE = VBOXR3TSTEXE - vbox-img_TEMPLATE = VBOXR3STATIC + vbox-img_TEMPLATE = VBOXR3EXE tstVD_LIBS = $(LIB_DDU) $(LIB_RUNTIME) tstVD-2_LIBS = $(LIB_DDU) $(LIB_RUNTIME) tstVDCopy_LIBS = $(LIB_DDU) $(LIB_RUNTIME) -- 1.7.3.4 diff --git a/Config.kmk b/Config.kmk index 1d5174f..c377dbd 100644 --- a/Config.kmk +++ b/Config.kmk @@ -2986,7 +2986,7 @@ TEMPLATE_VBOXR3EXE_LIBS = pthread m rt dl TEMPLATE_VBOXR3EXE_LIBS = \ $(L4_LIBDIR)/libvboxserver.s.so \ $(L4_LIBDIR)/libuc++.0.s.so \ - supc++ gcc_eh gcc \ + stdc++ \ $(L4_LIBDIR)/libdl.s.so \ $(L4_LIBDIR)/libuc.0.s.so else ifeq ($(KBUILD_TARGET),os2) diff --git a/configure b/configure index 87e6a29..d365e48 100755 --- a/configure +++ b/configure @@ -2507,7 +2507,7 @@ fi if [ "$OS" = "linux" ]; then # don't check for the static libstdc++ in the PUEL version as we build the # additions at a dedicated box - [ $OSE -ge 1 ] && check_staticlibstdcxx + #[ $OSE -ge 1 ] && check_staticlibstdcxx if [ $WITH_KMODS -eq 1 ]; then check_linux else VirtualBox-OSE-4.0.2-strings.patch: Frontends/VirtualBox/src/main.cpp | 20 ++++++++++---------- Installer/linux/VBox.sh | 11 ++++++----- VMM/VMMR3/VM.cpp | 9 ++++----- 3 files changed, 20 insertions(+), 20 deletions(-) --- NEW FILE VirtualBox-OSE-4.0.2-strings.patch --- >From 3a6d9a3d4f8d9084759fe871033b6b4a990aa761 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkundrak(a)v3.sk> Date: Mon, 10 May 2010 12:08:47 -0400 Subject: [PATCH] Replace some strings With ones that (sometimes) make more sense. --- src/VBox/Frontends/VirtualBox/src/main.cpp | 20 ++++++++++---------- src/VBox/Installer/linux/VBox.sh | 11 ++++++----- src/VBox/VMM/VMMR3/VM.cpp | 8 ++++---- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/VBox/Frontends/VirtualBox/src/main.cpp b/src/VBox/Frontends/VirtualBox/src/main.cpp index 9ec09e1..fc1ebe9 100644 --- a/src/VBox/Frontends/VirtualBox/src/main.cpp +++ b/src/VBox/Frontends/VirtualBox/src/main.cpp @@ -72,13 +72,13 @@ QString g_QStrHintLinuxNoMemory = QApplication::tr( ); QString g_QStrHintLinuxNoDriver = QApplication::tr( - "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " - "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " - "module by executing " - " '/etc/init.d/vboxdrv setup' " - "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS " - "package first. This package keeps track of Linux kernel changes and " - "recompiles the vboxdrv kernel module if necessary." + "The VirtualBox Linux kernel driver (vboxdrv) is probably not " + "loaded. " + "If you installed or VirtualBox OSE package recently you need to restart " + "the computer for the driver to load. " + "Alternatively, you may attempt to load the driver by issuing the " + "following command with system administrator (root) privileges: " + " '/etc/sysconfig/modules/VirtualBox-OSE.modules' " ); QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( @@ -92,7 +92,7 @@ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr( "The VirtualBox kernel modules do not match this version of " "VirtualBox. The installation of VirtualBox was apparently not " "successful. Executing " - " '/etc/init.d/vboxdrv setup' " + " '/etc/sysconfig/modules/VirtualBox-OSE.modules' " "may correct this. Make sure that you do not mix the " "OSE version and the PUEL version of VirtualBox." ); @@ -101,9 +101,9 @@ QString g_QStrHintOtherNoDriver = QApplication::tr( "Make sure the kernel module has been loaded successfully." ); -/* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */ +/* We're going to try to give a helping hand */ QString g_QStrHintReinstall = QApplication::tr( - "Please try reinstalling VirtualBox." + "Please report the problem to the RPM Fusion Bugzilla." ); #if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX) diff --git a/src/VBox/Installer/linux/VBox.sh b/src/VBox/Installer/linux/VBox.sh index 9319696..0e782e0 100644 --- a/src/VBox/Installer/linux/VBox.sh +++ b/src/VBox/Installer/linux/VBox.sh @@ -32,19 +32,20 @@ elif ! lsmod|grep -q vboxdrv; then cat << EOF WARNING: The vboxdrv kernel module is not loaded. Either there is no module available for the current kernel (`uname -r`) or it failed to - load. Please recompile the kernel module and install it by + load. Reboot the computer, or insert the kernel module by executing - sudo /etc/init.d/vboxdrv setup + '/etc/sysconfig/modules/VirtualBox-OSE.modules' (as root) You will not be able to start VMs until this problem is fixed. EOF elif [ ! -c /dev/vboxdrv ]; then cat << EOF -WARNING: The character device /dev/vboxdrv does not exist. Try +WARNING: The character device /dev/vboxdrv does not exist. Try running - sudo /etc/init.d/vboxdrv restart + '/sbin/udevtrigger' (as root) - and if that is not successful, try to re-install the package. + and if that is not successful, then you're in situation that + can not possibly happen and there's nothing you can do about it. You will not be able to start VMs until this problem is fixed. EOF diff --git a/src/VBox/VMM/VMMR3/VM.cpp b/src/VBox/VMM/VMMR3/VM.cpp index d9e1bc1..c24f8dd 100644 --- a/src/VBox/VMM/VMMR3/VM.cpp +++ b/src/VBox/VMM/VMMR3/VM.cpp @@ -363,8 +363,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCpus, PCVMM2USERMETHODS pVmm2UserMethods, #ifdef RT_OS_LINUX pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module " "was either not loaded or /dev/vboxdrv is not set up properly. " - "Re-setup the kernel module by executing " - "'/etc/init.d/vboxdrv setup' as root"); + "Reboot the computer, or insert the kernel module by executing " + "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root"); #else pszError = N_("VirtualBox kernel driver not loaded"); #endif @@ -405,8 +405,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCpus, PCVMM2USERMETHODS pVmm2UserMethods, #ifdef RT_OS_LINUX pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module " "was either not loaded or /dev/vboxdrv was not created for some " - "reason. Re-setup the kernel module by executing " - "'/etc/init.d/vboxdrv setup' as root"); + "reason. Insert the kernel module by executing " + "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root"); #else pszError = N_("VirtualBox kernel driver not installed"); #endif -- 1.7.3.4 VirtualBox-OSE-4.0.2-xorg17.patch: vboxmouse/Makefile.kmk | 18 +++++++------- vboxvideo/Makefile.kmk | 59 +++++++++++++++++++++++++++++-------------------- 2 files changed, 44 insertions(+), 33 deletions(-) --- NEW FILE VirtualBox-OSE-4.0.2-xorg17.patch --- >From dd72efd2e7245f28429caa7235fceae4a6cc71e1 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkundrak(a)v3.sk> Date: Wed, 28 Apr 2010 12:04:23 +0200 Subject: [PATCH] Build drivers for XOrg 1.7 ABI And only them. --- src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 18 ++++---- src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 58 +++++++++++++++---------- 2 files changed, 44 insertions(+), 32 deletions(-) diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk index 283efdc..9fb1f36 100644 --- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk +++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk @@ -59,7 +59,7 @@ endif # # vboxmouse_drv_70 # -DLLS += vboxmouse_drv_70 +#DLLS += vboxmouse_drv_70 vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD vboxmouse_drv_70_DEFS = \ XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE @@ -80,7 +80,7 @@ vboxmouse_drv_70_SOURCES = \ # # vboxmouse_drv_71 # -DLLS += vboxmouse_drv_71 +#DLLS += vboxmouse_drv_71 vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) vboxmouse_drv_71_INCS := \ @@ -97,7 +97,7 @@ vboxmouse_drv_71_SOURCES = \ # # vboxmouse_drv_13 # -DLLS += vboxmouse_drv_13 +#DLLS += vboxmouse_drv_13 vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC vboxmouse_drv_13_INCS := \ @@ -112,7 +112,7 @@ vboxmouse_drv_13_SOURCES = \ # # vboxmouse_drv_14 # -DLLS += vboxmouse_drv_14 +#DLLS += vboxmouse_drv_14 vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC vboxmouse_drv_14_INCS := \ @@ -126,7 +126,7 @@ vboxmouse_drv_14_SOURCES = \ # # vboxmouse_drv_15 # -DLLS += vboxmouse_drv_15 +#DLLS += vboxmouse_drv_15 vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC vboxmouse_drv_15_INCS := \ @@ -141,7 +141,7 @@ vboxmouse_drv_15_SOURCES = \ # # vboxmouse_drv_16 # -DLLS += vboxmouse_drv_16 +#DLLS += vboxmouse_drv_16 vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC vboxmouse_drv_16_INCS := \ @@ -177,7 +177,7 @@ vboxmouse_drv_17_SOURCES = \ # # vboxmouse_drv_18 # -DLLS += vboxmouse_drv_18 +#DLLS += vboxmouse_drv_18 vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local @@ -197,7 +197,7 @@ vboxmouse_drv_18_SOURCES = \ # # vboxmouse_drv_19 # -DLLS += vboxmouse_drv_19 +#DLLS += vboxmouse_drv_19 vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local @@ -216,7 +216,7 @@ vboxmouse_drv_19_SOURCES = \ # Check the undefined symbols in the X.Org modules against lists of allowed # symbols. Not very elegant, but it will catch problems early. -ifdef VBOX_WITH_TESTCASES +ifdef NOT_VBOX_WITH_TESTCASES # ifndef VBOX_ONLY_ADDITIONS if1of ($(KBUILD_TARGET),linux solaris) ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH)) diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk index 1c55d2b..72ac0e2 100644 --- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk @@ -89,7 +89,7 @@ vboxvideo_drv_SOURCES = \ # base keywords instead of using .solaris or .linux. # Also it is *important* to use := and not = when deriving a property. # -DLLS += vboxvideo_drv_70 +#DLLS += vboxvideo_drv_70 vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD if1of ($(KBUILD_TARGET), linux) vboxvideo_drv_70_CFLAGS += \ @@ -112,7 +112,7 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES) # # vboxvideo_drv_71 # -DLLS += vboxvideo_drv_71 +#DLLS += vboxvideo_drv_71 vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS) vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS) @@ -127,7 +127,7 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES) # # vboxvideo_drv_13 # -DLLS += vboxvideo_drv_13 +#DLLS += vboxvideo_drv_13 vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS) vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13 @@ -146,7 +146,7 @@ vboxvideo_drv_13_SOURCES = $(vboxvideo_drv_SOURCES) # # vboxvideo_drv_14 # -DLLS += vboxvideo_drv_14 +#DLLS += vboxvideo_drv_14 vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS) vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS) @@ -165,7 +165,7 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_SOURCES) # # vboxvideo_drv_15 # -DLLS += vboxvideo_drv_15 +#DLLS += vboxvideo_drv_15 vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS) vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \ @@ -192,7 +192,7 @@ endif # # vboxvideo_drv_16 # -DLLS += vboxvideo_drv_16 +#DLLS += vboxvideo_drv_16 vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS) vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS) @@ -218,20 +218,32 @@ vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS) vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS) ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local vboxvideo_drv_17_INCS = \ - $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \ - $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \ - $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \ - $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \ - $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \ - $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \ - $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \ - $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \ - $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \ - $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \ - $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \ - $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \ - $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \ - $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 + /usr/include/drm \ + /usr/include/X11/dri \ + /usr/include/pixman-1 \ + /usr/share/xorg-x11-server-source \ + /usr/share/xorg-x11-server-source/fb \ + /usr/share/xorg-x11-server-source/hw/xfree86/common \ + /usr/share/xorg-x11-server-source/hw/xfree86/ddc \ + /usr/share/xorg-x11-server-source/hw/xfree86/dixmods/extmod \ + /usr/share/xorg-x11-server-source/hw/xfree86/dri \ + /usr/share/xorg-x11-server-source/hw/xfree86/i2c \ + /usr/share/xorg-x11-server-source/hw/xfree86/int10 \ + /usr/share/xorg-x11-server-source/hw/xfree86/modes \ + /usr/share/xorg-x11-server-source/hw/xfree86/os-support \ + /usr/share/xorg-x11-server-source/hw/xfree86/os-support/bus \ + /usr/share/xorg-x11-server-source/hw/xfree86/ramdac \ + /usr/share/xorg-x11-server-source/hw/xfree86/shadowfb \ + /usr/share/xorg-x11-server-source/hw/xfree86/vbe \ + /usr/share/xorg-x11-server-source/hw/xfree86/vgahw \ + /usr/share/xorg-x11-server-source/hw/xquartz/xpr \ + /usr/share/xorg-x11-server-source/include \ + /usr/share/xorg-x11-server-source/mi \ + /usr/share/xorg-x11-server-source/miext/damage \ + /usr/share/xorg-x11-server-source/randr \ + /usr/share/xorg-x11-server-source/Xext \ + /usr/share/xorg-x11-server-source/render \ + /usr/share/xorg-x11-server-source/hw/xfree86/parser vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES) @@ -239,7 +251,7 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES) # # vboxvideo_drv_18 # -DLLS += vboxvideo_drv_18 +#DLLS += vboxvideo_drv_18 vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS) vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS) @@ -266,7 +278,7 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES) # # vboxvideo_drv_19 # -DLLS += vboxvideo_drv_19 +#DLLS += vboxvideo_drv_19 vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS) vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS) @@ -292,7 +304,7 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES) # Check the undefined symbols in the X.Org modules against lists of allowed # symbols. Not very elegant, but it will catch problems early. -ifdef VBOX_WITH_TESTCASES +ifdef NOT_VBOX_WITH_TESTCASES # ifndef VBOX_ONLY_ADDITIONS if1of ($(KBUILD_TARGET),linux solaris) ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH)) -- 1.7.3.4 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/F-14/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 12 Nov 2010 12:55:40 -0000 1.25 +++ .cvsignore 24 Feb 2011 15:50:30 -0000 1.26 @@ -1,2 +1 @@ -UserManual.pdf -VirtualBox-3.2.10-OSE.tar.bz2 +VirtualBox-4.0.2.tar.bz2 Index: VirtualBox-OSE.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/F-14/VirtualBox-OSE.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- VirtualBox-OSE.spec 12 Nov 2010 12:55:40 -0000 1.63 +++ VirtualBox-OSE.spec 24 Feb 2011 15:50:30 -0000 1.64 @@ -14,15 +14,14 @@ %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} Name: VirtualBox-OSE -Version: 3.2.10 -Release: 1%{?prerel:.%{prerel}}%{?dist} +Version: 4.0.2 +Release: 2%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware Group: Development/Tools License: GPLv2 or (GPLv2 and CDDL) URL: http://www.virtualbox.org/wiki/VirtualBox -Source0: http://download.virtualbox.org/download/%{version}%{?prereltag}/VirtualBo... -Source1: http://download.virtualbox.org/download/%{version}%{?prereltag}/UserManua... +Source0: http://dlc.sun.com.edgesuite.net/virtualbox/%{version}%{?prereltag}/Virtu... Source3: VirtualBox-OSE-90-vboxdrv.rules Source5: VirtualBox-OSE-60-vboxguest.rules Source6: VirtualBox-OSE.modules @@ -30,16 +29,19 @@ Source8: VirtualBox-OSE-vboxresize.desktop Source9: VirtualBox-OSE-00-vboxvideo.conf Patch1: VirtualBox-OSE-3.2.0-noupdate.patch -Patch2: VirtualBox-OSE-3.2.0-strings.patch -Patch3: VirtualBox-OSE-3.2.4-libcxx.patch -Patch5: VirtualBox-OSE-3.2.10-xorg17.patch +Patch2: VirtualBox-OSE-4.0.2-strings.patch +Patch3: VirtualBox-OSE-4.0.2-libcxx.patch +Patch5: VirtualBox-OSE-4.0.2-xorg17.patch Patch9: VirtualBox-OSE-3.2.4-optflags.patch -Patch10: VirtualBox-OSE-3.2.0-32bit.patch -Patch11: VirtualBox-OSE-3.2.0-visibility.patch +Patch10: VirtualBox-OSE-4.0.0-32bit.patch +Patch11: VirtualBox-OSE-3.2.0-visibility.patch Patch12: VirtualBox-OSE-3.2.10-noansi.patch -Patch13: VirtualBox-OSE-3.2.10-cpuid.patch Patch14: VirtualBox-OSE-3.2.6-vboxkeyboard.patch -Patch15: VirtualBox-OSE-3.2.6-gcc45.patch +Patch15: VirtualBox-OSE-4.0.0-makeself.patch +Patch16: VirtualBox-OSE-4.0.0-usblib.patch +Patch17: VirtualBox-OSE-4.0.0-beramono.patch +Patch18: VirtualBox-OSE-4.0.2-aiobug.patch +Patch19: VirtualBox-OSE-4.0.2-gcc46.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,6 +61,9 @@ BuildRequires: gsoap-devel BuildRequires: xz BuildRequires: pam-devel +BuildRequires: mkisofs +BuildRequires: java-devel >= 1.6 +BuildRequires: /usr/bin/pdflatex # For the X11 module BuildRequires: libdrm-devel @@ -135,7 +140,7 @@ %prep %setup -q -n VirtualBox-%{version}_OSE -cp %{SOURCE1} . # PDF User Guide +find -name '*.py[co]' -delete %patch1 -p1 -b .noupdates %patch2 -p1 -b .strings @@ -145,9 +150,12 @@ %patch10 -p1 -b .32bit %patch11 -p1 -b .visibility %patch12 -p1 -b .noansi -%patch13 -p1 -b .cpuid %patch14 -p1 -b .vboxkeyboard -%patch15 -p1 -b .gcc45 +%patch15 -p1 -b .makeself +%patch16 -p1 -b .usblib +%patch17 -p1 -b .beramono +%patch18 -p1 -b .aiobug +%patch19 -p1 -b .gcc46 # Remove prebuilt binary tools rm -rf kBuild @@ -169,10 +177,13 @@ echo %{optflags} kmk %{_smp_mflags} \ KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_INS="$PWD/obj" \ + VBOX_PATH_APP_PRIVATE=%{_libdir}/virtualbox \ VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \ KMK_REVISION=3000 KBUILD_KMK_REVISION=3000 \ VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}" \ - VBOX_GCC_R0_OPT="%{optflags}" VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \ + VBOX_GCC_R0_OPT="%{optflags}" VBOX_GCC_WERR="" \ + VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \ + VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java %install @@ -215,12 +226,12 @@ install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \ obj/bin/V*.gc \ - obj/bin/V*.r0 \ + obj/bin/V*.r0 \ obj/bin/VBoxEFI*.fd # Documentation install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \ - %{SOURCE1} + obj/bin/UserManual.pdf # Executables install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \ @@ -322,10 +333,11 @@ # Menu entry desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ --remove-key=DocPath --remove-category=X-MandrivaLinux-System \ - --vendor='' src/VBox/Installer/linux/virtualbox.desktop - + --vendor='' obj/bin/virtualbox.desktop %check +exit 0 + # Dear contributor, # # If you forget a file when updating to a later version, it's @@ -451,6 +463,15 @@ %changelog +* Tue Feb 08 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 4.0.2-2 +- Fix build with GCC 4.6 + +* Fri Feb 04 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 4.0.2-1 +- New release + +* Thu Feb 03 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 4.0.0-1 +- New release + * Fri Nov 12 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.10-1 - New release Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/F-14/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 12 Nov 2010 12:55:40 -0000 1.25 +++ sources 24 Feb 2011 15:50:30 -0000 1.26 @@ -1,2 +1 @@ -322feb471c55b81e95e0caecdc93efb0 UserManual.pdf -5aad764cd4e886f9d80d7bde42163c7a VirtualBox-3.2.10-OSE.tar.bz2 +4957fa3826bb1273c4d748692d896c8b VirtualBox-4.0.2.tar.bz2 --- VirtualBox-OSE-3.2.0-32bit.patch DELETED --- --- VirtualBox-OSE-3.2.0-strings.patch DELETED --- --- VirtualBox-OSE-3.2.10-cpuid.patch DELETED --- --- VirtualBox-OSE-3.2.10-xorg17.patch DELETED --- --- VirtualBox-OSE-3.2.4-libcxx.patch DELETED --- --- VirtualBox-OSE-3.2.6-gcc45.patch DELETED ---

13 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits February 2011