September 2012 - rpmfusion-commits

rpms/dvbcut/F-16 dvbcut-svn179-ffmpeg-oldver-fix.patch,NONE,1.1

by David Timms

Author: dtimms Update of /cvs/free/rpms/dvbcut/F-16 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2563 Added Files: dvbcut-svn179-ffmpeg-oldver-fix.patch Log Message: add missed dvbcut-svn179-ffmpeg-oldver-fix.patch and retag dvbcut-svn179-ffmpeg-oldver-fix.patch: lavfmuxer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE dvbcut-svn179-ffmpeg-oldver-fix.patch --- diff -ur dvbcut.orig/src/lavfmuxer.cpp dvbcut/src/lavfmuxer.cpp --- dvbcut.orig/src/lavfmuxer.cpp 2012-09-01 21:43:18.000000000 +1000 +++ dvbcut/src/lavfmuxer.cpp 2012-09-03 08:03:24.966156637 +1000 @@ -99,7 +99,7 @@ int16_t samples[AVCODEC_MAX_AUDIO_FRAME_SIZE/sizeof(int16_t)]; int frame_size=sizeof(samples); //fprintf(stderr, "** decode audio size=%d\n", sd->inbytes()); -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0) +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 0, 0) AVPacket avpkt; av_init_packet(&avpkt); avpkt.data = (uint8_t*)sd->getdata();

12 years, 3 months

1
0
0 / 0

rpms/dvbcut/F-16 dvbcut.spec,1.14,1.15

by David Timms

Author: dtimms Update of /cvs/free/rpms/dvbcut/F-16 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2168 Modified Files: dvbcut.spec Log Message: add ffmpeg patch to suit ffmpeg-0.1.12 in F-16. Index: dvbcut.spec =================================================================== RCS file: /cvs/free/rpms/dvbcut/F-16/dvbcut.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- dvbcut.spec 1 Sep 2012 13:32:58 -0000 1.14 +++ dvbcut.spec 2 Sep 2012 22:11:14 -0000 1.15 @@ -7,7 +7,7 @@ Name: dvbcut Version: 0.6.1 -Release: 7.svn%{svnrev}%{?dist} +Release: 8.svn%{svnrev}%{?dist} Summary: Clip and convert DVB transport streams to MPEG2 program streams Group: Applications/Multimedia @@ -30,6 +30,7 @@ Patch3: %{name}-svn176-desktop-additions.patch Patch6: %{name}-179-vs-ubuntu-12.04.diff Patch7: %{name}-svn179-ffmpeg-0.11.1.patch +Patch8: %{name}-svn179-ffmpeg-oldver-fix.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: autoconf @@ -66,6 +67,7 @@ %patch3 -b .desktop-improvements %patch6 -b .orig %patch7 -p1 -b .orig +%patch8 -p1 -b .orig2 # Fix QTDIR libs in configure sed -i 's,$QTDIR/$mr_libdirname,$QTDIR/lib,' configure.in @@ -135,6 +137,9 @@ %changelog +* Sun Sep 2 2012 David Timms <iinet.net.au at dtimms> - 0.6.1-8.svn179 +- add ffmpeg patch to suit ffmpeg-0.1.12 in F-16. + * Wed Aug 29 2012 David Timms <iinet.net.au at dtimms> - 0.6.1-7.svn179 - add ffmpeg-0.10.4 patch dvbcut-179-vs-ubuntu-12.04.diff from Olaf Dietsche - drop ffmpeg-0.8.2 patch superseded by ffmpeg-0.10.4 patch

12 years, 3 months

1
0
0 / 0

rpms/VirtualBox-kmod/F-16 VirtualBox-kmod.spec,1.14,1.15

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox-kmod/F-16 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8264 Modified Files: VirtualBox-kmod.spec Log Message: * Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.20-1 - New upstream release Index: VirtualBox-kmod.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-kmod/F-16/VirtualBox-kmod.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- VirtualBox-kmod.spec 26 Aug 2012 15:25:36 -0000 1.14 +++ VirtualBox-kmod.spec 1 Sep 2012 23:46:45 -0000 1.15 @@ -3,7 +3,7 @@ # "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 newest # In prerelease builds (such as betas), this package has the same # major version number, while the kernel module abi is not guarranteed @@ -17,8 +17,8 @@ %bcond_without hardening Name: VirtualBox-kmod -Version: 4.1.18 -Release: 1%{?dist}.5 +Version: 4.1.20 +Release: 1%{?dist} Summary: Kernel module for VirtualBox Group: System Environment/Kernel @@ -96,6 +96,9 @@ %changelog +* Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.20-1 +- New upstream release + * Sun Aug 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1.18-1.5 - Rebuilt for updated kernel

12 years, 3 months

1
0
0 / 0

rpms/VirtualBox-kmod/F-17 VirtualBox-kmod.spec,1.17,1.18

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox-kmod/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2568 Modified Files: VirtualBox-kmod.spec Log Message: * Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.20-1 - New upstream release, only build akmods. Index: VirtualBox-kmod.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-kmod/F-17/VirtualBox-kmod.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- VirtualBox-kmod.spec 31 Aug 2012 06:41:23 -0000 1.17 +++ VirtualBox-kmod.spec 1 Sep 2012 22:17:54 -0000 1.18 @@ -3,7 +3,7 @@ # "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 # In prerelease builds (such as betas), this package has the same # major version number, while the kernel module abi is not guarranteed @@ -17,8 +17,8 @@ %bcond_without hardening Name: VirtualBox-kmod -Version: 4.1.18 -Release: 1%{?dist}.7 +Version: 4.1.20 +Release: 1%{?dist} Summary: Kernel module for VirtualBox Group: System Environment/Kernel @@ -96,6 +96,9 @@ %changelog +* Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.20-1 +- New upstream release, only build akmods. + * Fri Aug 31 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1.18-1.7 - Rebuilt for updated kernel @@ -117,7 +120,7 @@ * Tue Jul 17 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1.18-1.1 - Rebuilt for updated kernel -* Sun Jul 08 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.8-1 +* Sun Jul 08 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.18-1 - New upstream release. * Fri Jul 06 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1.16-1.5

12 years, 3 months

1
0
0 / 0

rpms/VirtualBox/F-16 VirtualBox-00-vboxvideo.conf, NONE, 1.1 VirtualBox-4.1.18-strings.patch, NONE, 1.1 VirtualBox-4.1.20-libcxx.patch, NONE, 1.1 VirtualBox-60-vboxguest.rules, NONE, 1.1 VirtualBox-90-vboxdrv.rules, NONE, 1.1 VirtualBox-guest.modules, NONE, 1.1 VirtualBox-vboxresize.desktop, NONE, 1.1 VirtualBox.modules, NONE, 1.1 .cvsignore, 1.36, 1.37 VirtualBox.spec, 1.6, 1.7 sources, 1.36, 1.37 VirtualBox-OSE-00-vboxvideo.conf, 1.1, NONE VirtualBox-OSE-3.2.10-noansi.patch, 1.2, NONE VirtualBox-OSE-3.2.4

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox/F-16 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30141 Modified Files: .cvsignore VirtualBox.spec sources Added Files: VirtualBox-00-vboxvideo.conf VirtualBox-4.1.18-strings.patch VirtualBox-4.1.20-libcxx.patch VirtualBox-60-vboxguest.rules VirtualBox-90-vboxdrv.rules VirtualBox-guest.modules VirtualBox-vboxresize.desktop VirtualBox.modules Removed Files: VirtualBox-OSE-00-vboxvideo.conf VirtualBox-OSE-3.2.10-noansi.patch VirtualBox-OSE-3.2.4-optflags.patch VirtualBox-OSE-4.1.2-libcxx.patch VirtualBox-OSE-4.1.6-strings.patch VirtualBox-OSE-60-vboxguest.rules VirtualBox-OSE-90-vboxdrv.rules VirtualBox-OSE-guest.modules VirtualBox-OSE-vboxresize.desktop VirtualBox-OSE.modules Log Message: * Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.20-1 - New upstream release. - Redo VirtualBox-4.1.20-libcxx.patch - Patch9 (VirtualBox-OSE-3.2.4-optflags.patch) integrated in Patch3 (VirtualBox-4.1.20-libcxx.patch). - drop Patch12 (VirtualBox-OSE-3.2.10-noansi.patch) no need anymore. - drop Patch11 (VirtualBox-OSE-3.2.0-visibility.patch) no need anymore. - fix rfbz #2416 - /bin/mount.vboxsf must be moved to /sbin/mount.vboxsf - move files VirtualBox-OSE .rules .modules .desktop and .conf to VirtualBox --- NEW FILE VirtualBox-00-vboxvideo.conf --- Section "Device" Identifier "Videocard666" Driver "vboxvideo" EndSection VirtualBox-4.1.18-strings.patch: Frontends/VirtualBox/src/main.cpp | 22 +++++++++++----------- Installer/linux/VBox.sh | 13 ++++++++----- VMM/VMMR3/VM.cpp | 8 ++++---- 3 files changed, 23 insertions(+), 20 deletions(-) --- NEW FILE VirtualBox-4.1.18-strings.patch --- * Mon Jul 09 2012 Sérgio Basto <sergio(a)serjux.com> - rfbz #1826, last review of https://bugzilla.rpmfusion.org/attachment.cgi?id=888 by: Naveed Hasan <naveed(a)cs.columbia.edu> * Sat Jun 16 2012 Sérgio Basto <sergio(a)serjux.com> - Rebased for 4.1.16 (partial rfbz #1826) 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 -Nurp VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.18.new2/src/VBox/Frontends/VirtualBox/src/main.cpp --- VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/main.cpp 2012-06-20 14:16:20.000000000 +0100 +++ VirtualBox-4.1.18.new2/src/VBox/Frontends/VirtualBox/src/main.cpp 2012-07-09 04:57:00.690645723 +0100 @@ -72,13 +72,13 @@ QString g_QStrHintLinuxNoMemory = QAppli ); 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. If it is available in your distribution, you 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 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.modules' " ); QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( @@ -92,18 +92,18 @@ QString g_QStrHintLinuxWrongDriverVersio "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.modules' as root " "may correct this. Make sure that you do not mix the " - "OSE version and the PUEL version of VirtualBox." + "RPM Fusion version and the Oracle version of VirtualBox." ); 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 -Nurp VirtualBox-4.1.18/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.18.new2/src/VBox/Installer/linux/VBox.sh --- VirtualBox-4.1.18/src/VBox/Installer/linux/VBox.sh 2012-06-20 14:17:29.000000000 +0100 +++ VirtualBox-4.1.18.new2/src/VBox/Installer/linux/VBox.sh 2012-07-09 05:02:47.158108166 +0100 @@ -32,19 +32,22 @@ 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 load the kernel module by executing - sudo /etc/init.d/vboxdrv setup + '/etc/sysconfig/modules/VirtualBox.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 executing - sudo /etc/init.d/vboxdrv restart + '/sbin/udevadm control --reload-rules' (as root) + 'systemctl restart udev-trigger.service' (as root) + 'systemctl restart udev-settle.service' (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 -Nurp VirtualBox-4.1.18/src/VBox/VMM/VMMR3/VM.cpp VirtualBox-4.1.18.new2/src/VBox/VMM/VMMR3/VM.cpp --- VirtualBox-4.1.18/src/VBox/VMM/VMMR3/VM.cpp 2012-06-20 14:18:34.000000000 +0100 +++ VirtualBox-4.1.18.new2/src/VBox/VMM/VMMR3/VM.cpp 2012-07-09 05:01:48.544521745 +0100 @@ -375,8 +375,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp #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 load the kernel module by executing " + "'/etc/sysconfig/modules/VirtualBox.modules' as root"); #else pszError = N_("VirtualBox kernel driver not loaded"); #endif @@ -417,8 +417,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp #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. Load the kernel module by executing " + "'/etc/sysconfig/modules/VirtualBox.modules' as root"); #else pszError = N_("VirtualBox kernel driver not installed"); #endif VirtualBox-4.1.20-libcxx.patch: Config.kmk | 6 +++--- configure | 2 +- src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 5 +---- src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +- src/VBox/HostDrivers/Support/Makefile.kmk | 2 +- src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ src/VBox/HostDrivers/win/Makefile.kmk | 2 +- src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/VBox/Storage/testcase/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- src/libs/zlib-1.2.6/Makefile.kmk | 3 +-- 14 files changed, 21 insertions(+), 25 deletions(-) --- NEW FILE VirtualBox-4.1.20-libcxx.patch --- From: Lubomir Rintel <lkundrak(a)v3.sk> Date: Fri, 14 May 2010 12:26:33 +0200 Subject: [PATCH] If anyone finds out why did I remove those I owe him a beer. Seems like this patch could be safely left out. removes -g -pipe --- Config.kmk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) >From dd383911ef6a9a43c17b18d48b17cd82d6c8feb9 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 2/3] 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. --- Config.kmk | 4 ++-- configure | 2 +- .../WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 5 +---- src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +- src/VBox/HostDrivers/Support/Makefile.kmk | 2 +- src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ src/VBox/HostDrivers/win/Makefile.kmk | 2 +- src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/VBox/Storage/testcase/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- src/libs/zlib-1.2.1/Makefile.kmk | 2 +- 17 files changed, 23 insertions(+), 26 deletions(-) diff --git a/Config.kmk b/Config.kmk index 0ea34d8..2ec388c 100644 --- a/Config.kmk +++ b/Config.kmk @@ -3163,7 +3163,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) @@ -3311,7 +3311,7 @@ endif # Temporary: Renaming the template and warnings will be errors (soon). # TEMPLATE_VBoxR3Static = New name for VBOXR3STATIC -TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3STATIC +TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3EXE TEMPLATE_VBoxR3Static_EXTENDS_BY = appending ifeq ($(KBUILD_TARGET),win) TEMPLATE_VBoxR3Static_CFLAGS += $(VBOX_VCC_WERR) @@ -4055,7 +4055,7 @@ ifdef VBOX_WITH_QTGUI $(LIB_SDL_INC) ## @todo Use VBOX_GCC_PEDANTIC_CXX? TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = \ - -g -pipe $(filter-out -Wno-unused,$(VBOX_GCC_WARN)) -frtti -fno-exceptions -Wno-non-virtual-dtor \ + $(filter-out -Wno-unused,$(VBOX_GCC_WARN)) -frtti -fno-exceptions -Wno-non-virtual-dtor \ -Wno-long-long -fshort-wchar -fno-strict-aliasing \ $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) \ $(VBOX_GCC_Wno-delete-non-virtual-dtor) diff --git a/configure b/configure index 987cf1b..75d556c 100755 --- a/configure +++ b/configure @@ -2582,7 +2582,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 diff --git a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk index 52fb6d3..af7ba4b 100644 --- a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk +++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk @@ -160,7 +160,7 @@ endif #ifdef VBOX_WITH_WDDM ifdef VBOXVIDEOWINDBG DLLS += vbvdbg -vbvdbg_TEMPLATE = VBOXR3STATIC +vbvdbg_TEMPLATE = VBOXR3EXE vbvdbg_DEFS = UNICODE _UNICODE vbvdbg_SOURCES = \ wddm/dbg/VBoxVideoWinDbg.cpp \ diff --git a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk index ee73ed0..e359702 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 += \ diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk index ed0163b..2ee8418 100644 --- a/src/VBox/Frontends/VirtualBox/Makefile.kmk +++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk @@ -957,7 +957,7 @@ endif # darwin if defined(VBOX_WITH_VIDEOHWACCEL) if1of ($(KBUILD_TARGET), win linux freebsd) LIBRARIES += VBoxOGL2D - VBoxOGL2D_TEMPLATE = VBOXR3STATIC + VBoxOGL2D_TEMPLATE = VBOXR3EXE VBoxOGL2D_USES = qt4 VBoxOGL2D_SDKS = QT4 VBoxOGL2D_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS) VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL diff --git a/src/VBox/HostDrivers/Support/Makefile.kmk b/src/VBox/HostDrivers/Support/Makefile.kmk index bf77085..9d67f49 100644 --- a/src/VBox/HostDrivers/Support/Makefile.kmk +++ b/src/VBox/HostDrivers/Support/Makefile.kmk @@ -95,7 +95,7 @@ SUPR3_SOURCES = \ # # Static version of SUPR3. # -SUPR3Static_TEMPLATE = VBOXR3STATIC +SUPR3Static_TEMPLATE = VBOXR3EXE SUPR3Static_EXTENDS = SUPR3 # diff --git a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk index a40f46d..e29273f 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk +++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk @@ -141,7 +141,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # WinNetConfig - static library with host network interface config API # LIBRARIES.win += WinNetConfig - WinNetConfig_TEMPLATE = VBOXR3STATIC + WinNetConfig_TEMPLATE = VBOXR3EXE WinNetConfig_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE WinNetConfig_SDKS = WINPSDK W2K3DDK WinNetConfig_SOURCES = \ @@ -152,7 +152,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # NetFltInstall # PROGRAMS.win += NetFltInstall - NetFltInstall_TEMPLATE = VBOXR3STATIC + NetFltInstall_TEMPLATE = VBOXR3EXE NetFltInstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL NetFltInstall_SOURCES = win/tools/VBoxNetFltInstall.cpp NetFltInstall_LIBS = \ @@ -166,7 +166,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # NetFltUninstall # PROGRAMS.win += NetFltUninstall - NetFltUninstall_TEMPLATE = VBOXR3STATIC + NetFltUninstall_TEMPLATE = VBOXR3EXE NetFltUninstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL NetFltUninstall_SOURCES = win/tools/VBoxNetFltUninstall.cpp NetFltUninstall_LIBS = \ @@ -179,7 +179,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # NetAdpInstall # PROGRAMS.win += NetAdpInstall - NetAdpInstall_TEMPLATE = VBOXR3STATIC + NetAdpInstall_TEMPLATE = VBOXR3EXE NetAdpInstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL NetAdpInstall_SOURCES = win/tools/VBoxNetAdpInstall.cpp NetAdpInstall_LIBS = \ @@ -193,7 +193,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # NetAdpUninstall # PROGRAMS.win += NetAdpUninstall - NetAdpUninstall_TEMPLATE = VBOXR3STATIC + NetAdpUninstall_TEMPLATE = VBOXR3EXE NetAdpUninstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL NetAdpUninstall_SOURCES = win/tools/VBoxNetAdpUninstall.cpp NetAdpUninstall_LIBS = \ @@ -206,7 +206,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # VBoxNetFltNobj # DLLS.win += VBoxNetFltNobj - VBoxNetFltNobj_TEMPLATE = VBOXR3STATIC + VBoxNetFltNobj_TEMPLATE = VBOXR3EXE if defined(VBOX_SIGNING_MODE) VBoxNetFltNobj_NOINST = true endif diff --git a/src/VBox/HostDrivers/win/Makefile.kmk b/src/VBox/HostDrivers/win/Makefile.kmk index 19c15d5..6d2366f 100644 --- a/src/VBox/HostDrivers/win/Makefile.kmk +++ b/src/VBox/HostDrivers/win/Makefile.kmk @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../.. include $(KBUILD_PATH)/subheader.kmk LIBRARIES += VBoxDrvCfg -VBoxDrvCfg_TEMPLATE = VBOXR3STATIC +VBoxDrvCfg_TEMPLATE = VBOXR3EXE VBoxDrvCfg_SDKS = WINPSDK W2K3DDK VBoxDrvCfg_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE VBoxDrvCfg_SOURCES = cfg/VBoxDrvCfg.cpp diff --git a/src/VBox/Installer/win/InstallHelper/Makefile.kmk b/src/VBox/Installer/win/InstallHelper/Makefile.kmk index 5271e49..aa18e57 100644 --- a/src/VBox/Installer/win/InstallHelper/Makefile.kmk +++ b/src/VBox/Installer/win/InstallHelper/Makefile.kmk @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../.. include $(KBUILD_PATH)/subheader.kmk DLLS += VBoxInstallHelper -VBoxInstallHelper_TEMPLATE = VBOXR3STATIC +VBoxInstallHelper_TEMPLATE = VBOXR3EXE VBoxInstallHelper_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE VBoxInstallHelper_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV) VBoxInstallHelper_DEPS = $(VBOX_SVN_REV_KMK) diff --git a/src/VBox/Installer/win/Resources/Makefile.kmk b/src/VBox/Installer/win/Resources/Makefile.kmk index 77ea1b7..5e58fdc 100644 --- a/src/VBox/Installer/win/Resources/Makefile.kmk +++ b/src/VBox/Installer/win/Resources/Makefile.kmk @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../.. include $(KBUILD_PATH)/subheader.kmk DLLS += VBoxRes -VBoxRes_TEMPLATE = VBOXR3STATIC +VBoxRes_TEMPLATE = VBOXR3EXE VBoxRes_DEPS = $(VBOX_SVN_REV_KMK) VBoxRes_SOURCES = \ dummy.cpp \ diff --git a/src/VBox/Installer/win/Stub/Makefile.kmk b/src/VBox/Installer/win/Stub/Makefile.kmk index a8f89eb..6cf55cc 100644 --- a/src/VBox/Installer/win/Stub/Makefile.kmk +++ b/src/VBox/Installer/win/Stub/Makefile.kmk @@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk if "$(KBUILD_TARGET_ARCH)" == "x86" TEMPLATE_VBOXSTUB = Drop the signing, we will sign it later. -TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3STATIC +TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3EXE TEMPLATE_VBOXSTUB_POST_CMDS = $(NO_SUCH_VARIABLE) PROGRAMS.x86 += VBoxStub diff --git a/src/VBox/Storage/testcase/Makefile.kmk b/src/VBox/Storage/testcase/Makefile.kmk index f935b05..40f6bf2 100644 --- a/src/VBox/Storage/testcase/Makefile.kmk +++ b/src/VBox/Storage/testcase/Makefile.kmk @@ -68,7 +68,7 @@ ifdef VBOX_WITH_TESTCASES # # vbox-img - static because it migth be used as at standalone tool. # - vbox-img_TEMPLATE = VBOXR3STATIC + vbox-img_TEMPLATE = VBOXR3EXE vbox-img_DEFS += IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS IN_RT_R3 vbox-img_SOURCES = \ vbox-img.cpp \ diff --git a/src/libs/liblzf-3.4/Makefile.kmk b/src/libs/liblzf-3.4/Makefile.kmk index 44088fa..0afe89a 100644 --- a/src/libs/liblzf-3.4/Makefile.kmk +++ b/src/libs/liblzf-3.4/Makefile.kmk @@ -33,7 +33,7 @@ VBox-liblzf_SOURCES = \ lzf_c.c \ lzf_d.c -VBox-liblzf-static_TEMPLATE = VBOXR3STATIC +VBox-liblzf-static_TEMPLATE = VBOXR3EXE VBox-liblzf-static_BLD_TYPE = $(VBox-liblzf_BLD_TYPE) VBox-liblzf-static_DEFS = $(VBox-liblzf_DEFS) VBox-liblzf-static_DEFS.x86 = $(VBox-liblzf_DEFS.x86) diff --git a/src/libs/zlib-1.2.1/Makefile.kmk b/src/libs/zlib-1.2.1/Makefile.kmk index fde8b7c..405d354 100644 --- a/src/libs/zlib-1.2.6/Makefile.kmk +++ b/src/libs/zlib-1.2.6/Makefile.kmk @@ -39,7 +39,7 @@ VBox-zlib_SOURCES = \ inftrees.c \ inffast.c -VBox-zlib-static_TEMPLATE = VBOXR3STATIC +VBox-zlib-static_TEMPLATE = VBOXR3EXE VBox-zlib-static_DEFS = $(VBox-zlib_DEFS) VBox-zlib-static_SOURCES = $(VBox-zlib_SOURCES) -- 1.7.1 --- NEW FILE VirtualBox-60-vboxguest.rules --- ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" --- NEW FILE VirtualBox-90-vboxdrv.rules --- SUBSYSTEM=="usb_device", ACTION=="add", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="VBoxCreateUSBNode.sh --remove $major $minor" SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh --remove $major $minor" --- NEW FILE VirtualBox-guest.modules --- #!/bin/sh # Workaround for https://bugzilla.rpmfusion.org/show_bug.cgi?id=1083 insert_module () { grep -qR "^[ \t]*blacklist[ \t][ \t]*$1[ \t]*" /etc/modprobe.d && return modinfo $1 |awk '/filename:/ {print "insmod "$2}' |$SHELL } insert_module vboxguest insert_module vboxsf --- NEW FILE VirtualBox-vboxresize.desktop --- [Desktop Entry] Type=Application Version=1.0 Name=vbox-autoresize Exec=/usr/bin/VBoxClient --autoresize X-GNOME-Autostart-enabled=true --- NEW FILE VirtualBox.modules --- #!/bin/sh # User is advised to run this on upgrades /sbin/modprobe -r -b vboxnetflt &>/dev/null ||: /sbin/modprobe -r -b vboxnetadp &>/dev/null ||: /sbin/modprobe -r -b vboxdrv &>/dev/null ||: # Workaround for https://bugzilla.rpmfusion.org/show_bug.cgi?id=1083 insert_module () { grep -qR "^[ \t]*blacklist[ \t][ \t]*$1[ \t]*" /etc/modprobe.d && return modinfo $1 |awk '/filename:/ {print "insmod "$2}' |$SHELL } insert_module vboxdrv insert_module vboxnetflt insert_module vboxnetadp Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-16/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 8 Jul 2012 14:54:54 -0000 1.36 +++ .cvsignore 1 Sep 2012 21:06:01 -0000 1.37 @@ -1 +1 @@ -VirtualBox-4.1.18.tar.bz2 +VirtualBox-4.1.20.tar.bz2 Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-16/VirtualBox.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- VirtualBox.spec 8 Jul 2012 14:54:54 -0000 1.6 +++ VirtualBox.spec 1 Sep 2012 21:06:01 -0000 1.7 @@ -14,7 +14,7 @@ %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} Name: VirtualBox -Version: 4.1.18 +Version: 4.1.20 Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware @@ -22,22 +22,20 @@ License: GPLv2 or (GPLv2 and CDDL) URL: http://www.virtualbox.org/wiki/VirtualBox 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 -Source7: VirtualBox-OSE-guest.modules -Source8: VirtualBox-OSE-vboxresize.desktop -Source9: VirtualBox-OSE-00-vboxvideo.conf +Source3: VirtualBox-90-vboxdrv.rules +Source5: VirtualBox-60-vboxguest.rules +Source6: VirtualBox.modules +Source7: VirtualBox-guest.modules +Source8: VirtualBox-vboxresize.desktop +Source9: VirtualBox-00-vboxvideo.conf Source10: vboxweb.service Source11: vboxservice.service Patch1: VirtualBox-OSE-4.1.4-noupdate.patch -Patch2: VirtualBox-OSE-4.1.6-strings.patch -Patch3: VirtualBox-OSE-4.1.2-libcxx.patch +Patch2: VirtualBox-4.1.18-strings.patch +Patch3: VirtualBox-4.1.20-libcxx.patch Patch5: VirtualBox-OSE-4.1.4-xorg17.patch -Patch9: VirtualBox-OSE-3.2.4-optflags.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 +#Patch11: VirtualBox-OSE-3.2.0-visibility.patch Patch15: VirtualBox-OSE-4.0.0-makeself.patch Patch16: VirtualBox-OSE-4.1.2-usblib.patch Patch17: VirtualBox-OSE-4.0.0-beramono.patch @@ -179,10 +177,8 @@ %patch2 -p1 -b .strings %patch3 -p1 -b .libcxx %patch5 -p1 -b .xorg17 -%patch9 -p1 -b .optflags %patch10 -p1 -b .32bit -%patch11 -p1 -b .visibility -%patch12 -p1 -b .noansi +#%patch11 -p1 -b .visibility %patch15 -p1 -b .makeself %patch16 -p1 -b .usblib %patch17 -p1 -b .beramono @@ -233,6 +229,7 @@ # Directory structure install -d $RPM_BUILD_ROOT/%{_lib}/security install -d $RPM_BUILD_ROOT%{_bindir} +install -d $RPM_BUILD_ROOT%{_sbindir} install -d $RPM_BUILD_ROOT%{_libdir} install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/components @@ -341,8 +338,10 @@ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so # Guest tools +install -m 0755 -t $RPM_BUILD_ROOT%{_sbindir} \ + obj/bin/additions/mount.vboxsf + install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \ - obj/bin/additions/mount.vboxsf \ obj/bin/additions/VBoxService \ obj/bin/additions/VBoxClient \ obj/bin/additions/VBoxControl @@ -529,7 +528,7 @@ %files guest /%{_lib}/security/pam_vbox.so -%{_bindir}/mount.vboxsf +%{_sbindir}/mount.vboxsf %{_bindir}/VBoxClient %{_bindir}/VBoxControl %{_bindir}/VBoxService @@ -551,6 +550,18 @@ %changelog +* Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.20-1 +- New upstream release. +- Redo VirtualBox-4.1.20-libcxx.patch +- Patch9 (VirtualBox-OSE-3.2.4-optflags.patch) integrated in Patch3 (VirtualBox-4.1.20-libcxx.patch). +- drop Patch12 (VirtualBox-OSE-3.2.10-noansi.patch) no need anymore. +- drop Patch11 (VirtualBox-OSE-3.2.0-visibility.patch) no need anymore. +- fix rfbz #2416 - /bin/mount.vboxsf must be moved to /sbin/mount.vboxsf +- move files VirtualBox-OSE .rules .modules .desktop and .conf to VirtualBox + +* Mon Jul 09 2012 Sérgio Basto <sergio(a)serjux.com> 4.1.18-2 +- Improve some strings suggest on rfbz #1826 + * Thu Jun 21 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.18-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-16/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 8 Jul 2012 14:54:54 -0000 1.36 +++ sources 1 Sep 2012 21:06:01 -0000 1.37 @@ -1 +1 @@ -38db0a87cba659b484af868b0c2bd3ac VirtualBox-4.1.18.tar.bz2 +5784c6dda8a9d53f8f21b2d41eba903c VirtualBox-4.1.20.tar.bz2 --- VirtualBox-OSE-00-vboxvideo.conf DELETED --- --- VirtualBox-OSE-3.2.10-noansi.patch DELETED --- --- VirtualBox-OSE-3.2.4-optflags.patch DELETED --- --- VirtualBox-OSE-4.1.2-libcxx.patch DELETED --- --- VirtualBox-OSE-4.1.6-strings.patch DELETED --- --- VirtualBox-OSE-60-vboxguest.rules DELETED --- --- VirtualBox-OSE-90-vboxdrv.rules DELETED --- --- VirtualBox-OSE-guest.modules DELETED --- --- VirtualBox-OSE-vboxresize.desktop DELETED --- --- VirtualBox-OSE.modules DELETED ---

12 years, 3 months

1
0
0 / 0

rpms/VirtualBox/F-18 VirtualBox-00-vboxvideo.conf, NONE, 1.1 VirtualBox-4.1.18-strings.patch, NONE, 1.1 VirtualBox-4.1.20-libcxx.patch, NONE, 1.1 VirtualBox-60-vboxguest.rules, NONE, 1.1 VirtualBox-90-vboxdrv.rules, NONE, 1.1 VirtualBox-guest.modules, NONE, 1.1 VirtualBox-vboxresize.desktop, NONE, 1.1 VirtualBox.modules, NONE, 1.1 .cvsignore, 1.36, 1.37 VirtualBox.spec, 1.14, 1.15 sources, 1.36, 1.37 VirtualBox-OSE-00-vboxvideo.conf, 1.1, NONE VirtualBox-OSE-3.2.10-noansi.patch, 1.2, NONE VirtualBox-OSE-3.2

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox/F-18 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28946 Modified Files: .cvsignore VirtualBox.spec sources Added Files: VirtualBox-00-vboxvideo.conf VirtualBox-4.1.18-strings.patch VirtualBox-4.1.20-libcxx.patch VirtualBox-60-vboxguest.rules VirtualBox-90-vboxdrv.rules VirtualBox-guest.modules VirtualBox-vboxresize.desktop VirtualBox.modules Removed Files: VirtualBox-OSE-00-vboxvideo.conf VirtualBox-OSE-3.2.10-noansi.patch VirtualBox-OSE-3.2.4-optflags.patch VirtualBox-OSE-4.1.2-libcxx.patch VirtualBox-OSE-4.1.6-strings.patch VirtualBox-OSE-60-vboxguest.rules VirtualBox-OSE-90-vboxdrv.rules VirtualBox-OSE-guest.modules VirtualBox-OSE-vboxresize.desktop VirtualBox-OSE.modules Log Message: * Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.20-1 - New upstream release. - Redo VirtualBox-4.1.20-libcxx.patch - Patch9 (VirtualBox-OSE-3.2.4-optflags.patch) integrated in Patch3 (VirtualBox-4.1.20-libcxx.patch). - drop Patch12 (VirtualBox-OSE-3.2.10-noansi.patch) no need anymore. - drop Patch11 (VirtualBox-OSE-3.2.0-visibility.patch) no need anymore. - fix rfbz #2416 - /bin/mount.vboxsf must be moved to /sbin/mount.vboxsf - move files VirtualBox-OSE .rules .modules .desktop and .conf to VirtualBox --- NEW FILE VirtualBox-00-vboxvideo.conf --- Section "Device" Identifier "Videocard666" Driver "vboxvideo" EndSection VirtualBox-4.1.18-strings.patch: Frontends/VirtualBox/src/main.cpp | 22 +++++++++++----------- Installer/linux/VBox.sh | 13 ++++++++----- VMM/VMMR3/VM.cpp | 8 ++++---- 3 files changed, 23 insertions(+), 20 deletions(-) --- NEW FILE VirtualBox-4.1.18-strings.patch --- * Mon Jul 09 2012 Sérgio Basto <sergio(a)serjux.com> - rfbz #1826, last review of https://bugzilla.rpmfusion.org/attachment.cgi?id=888 by: Naveed Hasan <naveed(a)cs.columbia.edu> * Sat Jun 16 2012 Sérgio Basto <sergio(a)serjux.com> - Rebased for 4.1.16 (partial rfbz #1826) 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 -Nurp VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.18.new2/src/VBox/Frontends/VirtualBox/src/main.cpp --- VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/main.cpp 2012-06-20 14:16:20.000000000 +0100 +++ VirtualBox-4.1.18.new2/src/VBox/Frontends/VirtualBox/src/main.cpp 2012-07-09 04:57:00.690645723 +0100 @@ -72,13 +72,13 @@ QString g_QStrHintLinuxNoMemory = QAppli ); 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. If it is available in your distribution, you 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 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.modules' " ); QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( @@ -92,18 +92,18 @@ QString g_QStrHintLinuxWrongDriverVersio "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.modules' as root " "may correct this. Make sure that you do not mix the " - "OSE version and the PUEL version of VirtualBox." + "RPM Fusion version and the Oracle version of VirtualBox." ); 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 -Nurp VirtualBox-4.1.18/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.18.new2/src/VBox/Installer/linux/VBox.sh --- VirtualBox-4.1.18/src/VBox/Installer/linux/VBox.sh 2012-06-20 14:17:29.000000000 +0100 +++ VirtualBox-4.1.18.new2/src/VBox/Installer/linux/VBox.sh 2012-07-09 05:02:47.158108166 +0100 @@ -32,19 +32,22 @@ 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 load the kernel module by executing - sudo /etc/init.d/vboxdrv setup + '/etc/sysconfig/modules/VirtualBox.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 executing - sudo /etc/init.d/vboxdrv restart + '/sbin/udevadm control --reload-rules' (as root) + 'systemctl restart udev-trigger.service' (as root) + 'systemctl restart udev-settle.service' (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 -Nurp VirtualBox-4.1.18/src/VBox/VMM/VMMR3/VM.cpp VirtualBox-4.1.18.new2/src/VBox/VMM/VMMR3/VM.cpp --- VirtualBox-4.1.18/src/VBox/VMM/VMMR3/VM.cpp 2012-06-20 14:18:34.000000000 +0100 +++ VirtualBox-4.1.18.new2/src/VBox/VMM/VMMR3/VM.cpp 2012-07-09 05:01:48.544521745 +0100 @@ -375,8 +375,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp #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 load the kernel module by executing " + "'/etc/sysconfig/modules/VirtualBox.modules' as root"); #else pszError = N_("VirtualBox kernel driver not loaded"); #endif @@ -417,8 +417,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp #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. Load the kernel module by executing " + "'/etc/sysconfig/modules/VirtualBox.modules' as root"); #else pszError = N_("VirtualBox kernel driver not installed"); #endif VirtualBox-4.1.20-libcxx.patch: Config.kmk | 6 +++--- configure | 2 +- src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 5 +---- src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +- src/VBox/HostDrivers/Support/Makefile.kmk | 2 +- src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ src/VBox/HostDrivers/win/Makefile.kmk | 2 +- src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/VBox/Storage/testcase/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- src/libs/zlib-1.2.6/Makefile.kmk | 3 +-- 14 files changed, 21 insertions(+), 25 deletions(-) --- NEW FILE VirtualBox-4.1.20-libcxx.patch --- From: Lubomir Rintel <lkundrak(a)v3.sk> Date: Fri, 14 May 2010 12:26:33 +0200 Subject: [PATCH] If anyone finds out why did I remove those I owe him a beer. Seems like this patch could be safely left out. removes -g -pipe --- Config.kmk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) >From dd383911ef6a9a43c17b18d48b17cd82d6c8feb9 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 2/3] 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. --- Config.kmk | 4 ++-- configure | 2 +- .../WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 5 +---- src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +- src/VBox/HostDrivers/Support/Makefile.kmk | 2 +- src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ src/VBox/HostDrivers/win/Makefile.kmk | 2 +- src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/VBox/Storage/testcase/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- src/libs/zlib-1.2.1/Makefile.kmk | 2 +- 17 files changed, 23 insertions(+), 26 deletions(-) diff --git a/Config.kmk b/Config.kmk index 0ea34d8..2ec388c 100644 --- a/Config.kmk +++ b/Config.kmk @@ -3163,7 +3163,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) @@ -3311,7 +3311,7 @@ endif # Temporary: Renaming the template and warnings will be errors (soon). # TEMPLATE_VBoxR3Static = New name for VBOXR3STATIC -TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3STATIC +TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3EXE TEMPLATE_VBoxR3Static_EXTENDS_BY = appending ifeq ($(KBUILD_TARGET),win) TEMPLATE_VBoxR3Static_CFLAGS += $(VBOX_VCC_WERR) @@ -4055,7 +4055,7 @@ ifdef VBOX_WITH_QTGUI $(LIB_SDL_INC) ## @todo Use VBOX_GCC_PEDANTIC_CXX? TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = \ - -g -pipe $(filter-out -Wno-unused,$(VBOX_GCC_WARN)) -frtti -fno-exceptions -Wno-non-virtual-dtor \ + $(filter-out -Wno-unused,$(VBOX_GCC_WARN)) -frtti -fno-exceptions -Wno-non-virtual-dtor \ -Wno-long-long -fshort-wchar -fno-strict-aliasing \ $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) \ $(VBOX_GCC_Wno-delete-non-virtual-dtor) diff --git a/configure b/configure index 987cf1b..75d556c 100755 --- a/configure +++ b/configure @@ -2582,7 +2582,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 diff --git a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk index 52fb6d3..af7ba4b 100644 --- a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk +++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk @@ -160,7 +160,7 @@ endif #ifdef VBOX_WITH_WDDM ifdef VBOXVIDEOWINDBG DLLS += vbvdbg -vbvdbg_TEMPLATE = VBOXR3STATIC +vbvdbg_TEMPLATE = VBOXR3EXE vbvdbg_DEFS = UNICODE _UNICODE vbvdbg_SOURCES = \ wddm/dbg/VBoxVideoWinDbg.cpp \ diff --git a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk index ee73ed0..e359702 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 += \ diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk index ed0163b..2ee8418 100644 --- a/src/VBox/Frontends/VirtualBox/Makefile.kmk +++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk @@ -957,7 +957,7 @@ endif # darwin if defined(VBOX_WITH_VIDEOHWACCEL) if1of ($(KBUILD_TARGET), win linux freebsd) LIBRARIES += VBoxOGL2D - VBoxOGL2D_TEMPLATE = VBOXR3STATIC + VBoxOGL2D_TEMPLATE = VBOXR3EXE VBoxOGL2D_USES = qt4 VBoxOGL2D_SDKS = QT4 VBoxOGL2D_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS) VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL diff --git a/src/VBox/HostDrivers/Support/Makefile.kmk b/src/VBox/HostDrivers/Support/Makefile.kmk index bf77085..9d67f49 100644 --- a/src/VBox/HostDrivers/Support/Makefile.kmk +++ b/src/VBox/HostDrivers/Support/Makefile.kmk @@ -95,7 +95,7 @@ SUPR3_SOURCES = \ # # Static version of SUPR3. # -SUPR3Static_TEMPLATE = VBOXR3STATIC +SUPR3Static_TEMPLATE = VBOXR3EXE SUPR3Static_EXTENDS = SUPR3 # diff --git a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk index a40f46d..e29273f 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk +++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk @@ -141,7 +141,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # WinNetConfig - static library with host network interface config API # LIBRARIES.win += WinNetConfig - WinNetConfig_TEMPLATE = VBOXR3STATIC + WinNetConfig_TEMPLATE = VBOXR3EXE WinNetConfig_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE WinNetConfig_SDKS = WINPSDK W2K3DDK WinNetConfig_SOURCES = \ @@ -152,7 +152,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # NetFltInstall # PROGRAMS.win += NetFltInstall - NetFltInstall_TEMPLATE = VBOXR3STATIC + NetFltInstall_TEMPLATE = VBOXR3EXE NetFltInstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL NetFltInstall_SOURCES = win/tools/VBoxNetFltInstall.cpp NetFltInstall_LIBS = \ @@ -166,7 +166,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # NetFltUninstall # PROGRAMS.win += NetFltUninstall - NetFltUninstall_TEMPLATE = VBOXR3STATIC + NetFltUninstall_TEMPLATE = VBOXR3EXE NetFltUninstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL NetFltUninstall_SOURCES = win/tools/VBoxNetFltUninstall.cpp NetFltUninstall_LIBS = \ @@ -179,7 +179,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # NetAdpInstall # PROGRAMS.win += NetAdpInstall - NetAdpInstall_TEMPLATE = VBOXR3STATIC + NetAdpInstall_TEMPLATE = VBOXR3EXE NetAdpInstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL NetAdpInstall_SOURCES = win/tools/VBoxNetAdpInstall.cpp NetAdpInstall_LIBS = \ @@ -193,7 +193,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # NetAdpUninstall # PROGRAMS.win += NetAdpUninstall - NetAdpUninstall_TEMPLATE = VBOXR3STATIC + NetAdpUninstall_TEMPLATE = VBOXR3EXE NetAdpUninstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL NetAdpUninstall_SOURCES = win/tools/VBoxNetAdpUninstall.cpp NetAdpUninstall_LIBS = \ @@ -206,7 +206,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # VBoxNetFltNobj # DLLS.win += VBoxNetFltNobj - VBoxNetFltNobj_TEMPLATE = VBOXR3STATIC + VBoxNetFltNobj_TEMPLATE = VBOXR3EXE if defined(VBOX_SIGNING_MODE) VBoxNetFltNobj_NOINST = true endif diff --git a/src/VBox/HostDrivers/win/Makefile.kmk b/src/VBox/HostDrivers/win/Makefile.kmk index 19c15d5..6d2366f 100644 --- a/src/VBox/HostDrivers/win/Makefile.kmk +++ b/src/VBox/HostDrivers/win/Makefile.kmk @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../.. include $(KBUILD_PATH)/subheader.kmk LIBRARIES += VBoxDrvCfg -VBoxDrvCfg_TEMPLATE = VBOXR3STATIC +VBoxDrvCfg_TEMPLATE = VBOXR3EXE VBoxDrvCfg_SDKS = WINPSDK W2K3DDK VBoxDrvCfg_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE VBoxDrvCfg_SOURCES = cfg/VBoxDrvCfg.cpp diff --git a/src/VBox/Installer/win/InstallHelper/Makefile.kmk b/src/VBox/Installer/win/InstallHelper/Makefile.kmk index 5271e49..aa18e57 100644 --- a/src/VBox/Installer/win/InstallHelper/Makefile.kmk +++ b/src/VBox/Installer/win/InstallHelper/Makefile.kmk @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../.. include $(KBUILD_PATH)/subheader.kmk DLLS += VBoxInstallHelper -VBoxInstallHelper_TEMPLATE = VBOXR3STATIC +VBoxInstallHelper_TEMPLATE = VBOXR3EXE VBoxInstallHelper_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE VBoxInstallHelper_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV) VBoxInstallHelper_DEPS = $(VBOX_SVN_REV_KMK) diff --git a/src/VBox/Installer/win/Resources/Makefile.kmk b/src/VBox/Installer/win/Resources/Makefile.kmk index 77ea1b7..5e58fdc 100644 --- a/src/VBox/Installer/win/Resources/Makefile.kmk +++ b/src/VBox/Installer/win/Resources/Makefile.kmk @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../.. include $(KBUILD_PATH)/subheader.kmk DLLS += VBoxRes -VBoxRes_TEMPLATE = VBOXR3STATIC +VBoxRes_TEMPLATE = VBOXR3EXE VBoxRes_DEPS = $(VBOX_SVN_REV_KMK) VBoxRes_SOURCES = \ dummy.cpp \ diff --git a/src/VBox/Installer/win/Stub/Makefile.kmk b/src/VBox/Installer/win/Stub/Makefile.kmk index a8f89eb..6cf55cc 100644 --- a/src/VBox/Installer/win/Stub/Makefile.kmk +++ b/src/VBox/Installer/win/Stub/Makefile.kmk @@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk if "$(KBUILD_TARGET_ARCH)" == "x86" TEMPLATE_VBOXSTUB = Drop the signing, we will sign it later. -TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3STATIC +TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3EXE TEMPLATE_VBOXSTUB_POST_CMDS = $(NO_SUCH_VARIABLE) PROGRAMS.x86 += VBoxStub diff --git a/src/VBox/Storage/testcase/Makefile.kmk b/src/VBox/Storage/testcase/Makefile.kmk index f935b05..40f6bf2 100644 --- a/src/VBox/Storage/testcase/Makefile.kmk +++ b/src/VBox/Storage/testcase/Makefile.kmk @@ -68,7 +68,7 @@ ifdef VBOX_WITH_TESTCASES # # vbox-img - static because it migth be used as at standalone tool. # - vbox-img_TEMPLATE = VBOXR3STATIC + vbox-img_TEMPLATE = VBOXR3EXE vbox-img_DEFS += IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS IN_RT_R3 vbox-img_SOURCES = \ vbox-img.cpp \ diff --git a/src/libs/liblzf-3.4/Makefile.kmk b/src/libs/liblzf-3.4/Makefile.kmk index 44088fa..0afe89a 100644 --- a/src/libs/liblzf-3.4/Makefile.kmk +++ b/src/libs/liblzf-3.4/Makefile.kmk @@ -33,7 +33,7 @@ VBox-liblzf_SOURCES = \ lzf_c.c \ lzf_d.c -VBox-liblzf-static_TEMPLATE = VBOXR3STATIC +VBox-liblzf-static_TEMPLATE = VBOXR3EXE VBox-liblzf-static_BLD_TYPE = $(VBox-liblzf_BLD_TYPE) VBox-liblzf-static_DEFS = $(VBox-liblzf_DEFS) VBox-liblzf-static_DEFS.x86 = $(VBox-liblzf_DEFS.x86) diff --git a/src/libs/zlib-1.2.1/Makefile.kmk b/src/libs/zlib-1.2.1/Makefile.kmk index fde8b7c..405d354 100644 --- a/src/libs/zlib-1.2.6/Makefile.kmk +++ b/src/libs/zlib-1.2.6/Makefile.kmk @@ -39,7 +39,7 @@ VBox-zlib_SOURCES = \ inftrees.c \ inffast.c -VBox-zlib-static_TEMPLATE = VBOXR3STATIC +VBox-zlib-static_TEMPLATE = VBOXR3EXE VBox-zlib-static_DEFS = $(VBox-zlib_DEFS) VBox-zlib-static_SOURCES = $(VBox-zlib_SOURCES) -- 1.7.1 --- NEW FILE VirtualBox-60-vboxguest.rules --- ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" --- NEW FILE VirtualBox-90-vboxdrv.rules --- SUBSYSTEM=="usb_device", ACTION=="add", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="VBoxCreateUSBNode.sh --remove $major $minor" SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh --remove $major $minor" --- NEW FILE VirtualBox-guest.modules --- #!/bin/sh # Workaround for https://bugzilla.rpmfusion.org/show_bug.cgi?id=1083 insert_module () { grep -qR "^[ \t]*blacklist[ \t][ \t]*$1[ \t]*" /etc/modprobe.d && return modinfo $1 |awk '/filename:/ {print "insmod "$2}' |$SHELL } insert_module vboxguest insert_module vboxsf --- NEW FILE VirtualBox-vboxresize.desktop --- [Desktop Entry] Type=Application Version=1.0 Name=vbox-autoresize Exec=/usr/bin/VBoxClient --autoresize X-GNOME-Autostart-enabled=true --- NEW FILE VirtualBox.modules --- #!/bin/sh # User is advised to run this on upgrades /sbin/modprobe -r -b vboxnetflt &>/dev/null ||: /sbin/modprobe -r -b vboxnetadp &>/dev/null ||: /sbin/modprobe -r -b vboxdrv &>/dev/null ||: # Workaround for https://bugzilla.rpmfusion.org/show_bug.cgi?id=1083 insert_module () { grep -qR "^[ \t]*blacklist[ \t][ \t]*$1[ \t]*" /etc/modprobe.d && return modinfo $1 |awk '/filename:/ {print "insmod "$2}' |$SHELL } insert_module vboxdrv insert_module vboxnetflt insert_module vboxnetadp Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-18/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 21 Jun 2012 03:00:25 -0000 1.36 +++ .cvsignore 1 Sep 2012 20:47:44 -0000 1.37 @@ -1 +1 @@ -VirtualBox-4.1.18.tar.bz2 +VirtualBox-4.1.20.tar.bz2 Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- VirtualBox.spec 9 Jul 2012 04:27:12 -0000 1.14 +++ VirtualBox.spec 1 Sep 2012 20:47:44 -0000 1.15 @@ -14,30 +14,28 @@ %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} Name: VirtualBox -Version: 4.1.18 -Release: 2%{?prerel:.%{prerel}}%{?dist} +Version: 4.1.20 +Release: 1%{?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://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 -Source7: VirtualBox-OSE-guest.modules -Source8: VirtualBox-OSE-vboxresize.desktop -Source9: VirtualBox-OSE-00-vboxvideo.conf +Source3: VirtualBox-90-vboxdrv.rules +Source5: VirtualBox-60-vboxguest.rules +Source6: VirtualBox.modules +Source7: VirtualBox-guest.modules +Source8: VirtualBox-vboxresize.desktop +Source9: VirtualBox-00-vboxvideo.conf Source10: vboxweb.service Source11: vboxservice.service Patch1: VirtualBox-OSE-4.1.4-noupdate.patch -Patch2: VirtualBox-OSE-4.1.6-strings.patch -Patch3: VirtualBox-OSE-4.1.2-libcxx.patch +Patch2: VirtualBox-4.1.18-strings.patch +Patch3: VirtualBox-4.1.20-libcxx.patch Patch5: VirtualBox-OSE-4.1.4-xorg17.patch -Patch9: VirtualBox-OSE-3.2.4-optflags.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 +#Patch11: VirtualBox-OSE-3.2.0-visibility.patch Patch15: VirtualBox-OSE-4.0.0-makeself.patch Patch16: VirtualBox-OSE-4.1.2-usblib.patch Patch17: VirtualBox-OSE-4.0.0-beramono.patch @@ -179,10 +177,8 @@ %patch2 -p1 -b .strings %patch3 -p1 -b .libcxx %patch5 -p1 -b .xorg17 -%patch9 -p1 -b .optflags %patch10 -p1 -b .32bit -%patch11 -p1 -b .visibility -%patch12 -p1 -b .noansi +#%patch11 -p1 -b .visibility %patch15 -p1 -b .makeself %patch16 -p1 -b .usblib %patch17 -p1 -b .beramono @@ -233,6 +229,7 @@ # Directory structure install -d $RPM_BUILD_ROOT/%{_lib}/security install -d $RPM_BUILD_ROOT%{_bindir} +install -d $RPM_BUILD_ROOT%{_sbindir} install -d $RPM_BUILD_ROOT%{_libdir} install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/components @@ -341,8 +338,10 @@ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so # Guest tools +install -m 0755 -t $RPM_BUILD_ROOT%{_sbindir} \ + obj/bin/additions/mount.vboxsf + install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \ - obj/bin/additions/mount.vboxsf \ obj/bin/additions/VBoxService \ obj/bin/additions/VBoxClient \ obj/bin/additions/VBoxControl @@ -529,7 +528,7 @@ %files guest /%{_lib}/security/pam_vbox.so -%{_bindir}/mount.vboxsf +%{_sbindir}/mount.vboxsf %{_bindir}/VBoxClient %{_bindir}/VBoxControl %{_bindir}/VBoxService @@ -551,6 +550,18 @@ %changelog +* Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.20-1 +- New upstream release. +- Redo VirtualBox-4.1.20-libcxx.patch +- Patch9 (VirtualBox-OSE-3.2.4-optflags.patch) integrated in Patch3 (VirtualBox-4.1.20-libcxx.patch). +- drop Patch12 (VirtualBox-OSE-3.2.10-noansi.patch) no need anymore. +- drop Patch11 (VirtualBox-OSE-3.2.0-visibility.patch) no need anymore. +- fix rfbz #2416 - /bin/mount.vboxsf must be moved to /sbin/mount.vboxsf +- move files VirtualBox-OSE .rules .modules .desktop and .conf to VirtualBox + +* Mon Jul 09 2012 Sérgio Basto <sergio(a)serjux.com> 4.1.18-2 +- Improve some strings suggest on rfbz #1826 + * Thu Jun 21 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.18-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-18/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 21 Jun 2012 03:00:25 -0000 1.36 +++ sources 1 Sep 2012 20:47:44 -0000 1.37 @@ -1 +1 @@ -38db0a87cba659b484af868b0c2bd3ac VirtualBox-4.1.18.tar.bz2 +5784c6dda8a9d53f8f21b2d41eba903c VirtualBox-4.1.20.tar.bz2 --- VirtualBox-OSE-00-vboxvideo.conf DELETED --- --- VirtualBox-OSE-3.2.10-noansi.patch DELETED --- --- VirtualBox-OSE-3.2.4-optflags.patch DELETED --- --- VirtualBox-OSE-4.1.2-libcxx.patch DELETED --- --- VirtualBox-OSE-4.1.6-strings.patch DELETED --- --- VirtualBox-OSE-60-vboxguest.rules DELETED --- --- VirtualBox-OSE-90-vboxdrv.rules DELETED --- --- VirtualBox-OSE-guest.modules DELETED --- --- VirtualBox-OSE-vboxresize.desktop DELETED --- --- VirtualBox-OSE.modules DELETED ---

12 years, 3 months

1
0
0 / 0

rpms/VirtualBox/F-17 VirtualBox-00-vboxvideo.conf, NONE, 1.1 VirtualBox-4.1.18-strings.patch, NONE, 1.1 VirtualBox-4.1.20-libcxx.patch, NONE, 1.1 VirtualBox-60-vboxguest.rules, NONE, 1.1 VirtualBox-90-vboxdrv.rules, NONE, 1.1 VirtualBox-guest.modules, NONE, 1.1 VirtualBox-vboxresize.desktop, NONE, 1.1 VirtualBox.modules, NONE, 1.1 .cvsignore, 1.36, 1.37 VirtualBox.spec, 1.7, 1.8 sources, 1.36, 1.37 VirtualBox-OSE-00-vboxvideo.conf, 1.1, NONE VirtualBox-OSE-3.2.10-noansi.patch, 1.2, NONE VirtualBox-OSE-3.2.4

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25755 Modified Files: .cvsignore VirtualBox.spec sources Added Files: VirtualBox-00-vboxvideo.conf VirtualBox-4.1.18-strings.patch VirtualBox-4.1.20-libcxx.patch VirtualBox-60-vboxguest.rules VirtualBox-90-vboxdrv.rules VirtualBox-guest.modules VirtualBox-vboxresize.desktop VirtualBox.modules Removed Files: VirtualBox-OSE-00-vboxvideo.conf VirtualBox-OSE-3.2.10-noansi.patch VirtualBox-OSE-3.2.4-optflags.patch VirtualBox-OSE-4.1.2-libcxx.patch VirtualBox-OSE-4.1.6-strings.patch VirtualBox-OSE-60-vboxguest.rules VirtualBox-OSE-90-vboxdrv.rules VirtualBox-OSE-guest.modules VirtualBox-OSE-vboxresize.desktop VirtualBox-OSE.modules Log Message: * Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.20-1 - New upstream release. - Redo VirtualBox-4.1.20-libcxx.patch - Patch9 (VirtualBox-OSE-3.2.4-optflags.patch) integrated in Patch3 (VirtualBox-4.1.20-libcxx.patch). - drop Patch12 (VirtualBox-OSE-3.2.10-noansi.patch) no need anymore. - drop Patch11 (VirtualBox-OSE-3.2.0-visibility.patch) no need anymore. - fix rfbz #2416 - /bin/mount.vboxsf must be moved to /sbin/mount.vboxsf - move files VirtualBox-OSE .rules .modules .desktop and .conf to VirtualBox --- NEW FILE VirtualBox-00-vboxvideo.conf --- Section "Device" Identifier "Videocard666" Driver "vboxvideo" EndSection VirtualBox-4.1.18-strings.patch: Frontends/VirtualBox/src/main.cpp | 22 +++++++++++----------- Installer/linux/VBox.sh | 13 ++++++++----- VMM/VMMR3/VM.cpp | 8 ++++---- 3 files changed, 23 insertions(+), 20 deletions(-) --- NEW FILE VirtualBox-4.1.18-strings.patch --- * Mon Jul 09 2012 Sérgio Basto <sergio(a)serjux.com> - rfbz #1826, last review of https://bugzilla.rpmfusion.org/attachment.cgi?id=888 by: Naveed Hasan <naveed(a)cs.columbia.edu> * Sat Jun 16 2012 Sérgio Basto <sergio(a)serjux.com> - Rebased for 4.1.16 (partial rfbz #1826) 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 -Nurp VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.18.new2/src/VBox/Frontends/VirtualBox/src/main.cpp --- VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/main.cpp 2012-06-20 14:16:20.000000000 +0100 +++ VirtualBox-4.1.18.new2/src/VBox/Frontends/VirtualBox/src/main.cpp 2012-07-09 04:57:00.690645723 +0100 @@ -72,13 +72,13 @@ QString g_QStrHintLinuxNoMemory = QAppli ); 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. If it is available in your distribution, you 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 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.modules' " ); QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( @@ -92,18 +92,18 @@ QString g_QStrHintLinuxWrongDriverVersio "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.modules' as root " "may correct this. Make sure that you do not mix the " - "OSE version and the PUEL version of VirtualBox." + "RPM Fusion version and the Oracle version of VirtualBox." ); 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 -Nurp VirtualBox-4.1.18/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.18.new2/src/VBox/Installer/linux/VBox.sh --- VirtualBox-4.1.18/src/VBox/Installer/linux/VBox.sh 2012-06-20 14:17:29.000000000 +0100 +++ VirtualBox-4.1.18.new2/src/VBox/Installer/linux/VBox.sh 2012-07-09 05:02:47.158108166 +0100 @@ -32,19 +32,22 @@ 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 load the kernel module by executing - sudo /etc/init.d/vboxdrv setup + '/etc/sysconfig/modules/VirtualBox.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 executing - sudo /etc/init.d/vboxdrv restart + '/sbin/udevadm control --reload-rules' (as root) + 'systemctl restart udev-trigger.service' (as root) + 'systemctl restart udev-settle.service' (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 -Nurp VirtualBox-4.1.18/src/VBox/VMM/VMMR3/VM.cpp VirtualBox-4.1.18.new2/src/VBox/VMM/VMMR3/VM.cpp --- VirtualBox-4.1.18/src/VBox/VMM/VMMR3/VM.cpp 2012-06-20 14:18:34.000000000 +0100 +++ VirtualBox-4.1.18.new2/src/VBox/VMM/VMMR3/VM.cpp 2012-07-09 05:01:48.544521745 +0100 @@ -375,8 +375,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp #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 load the kernel module by executing " + "'/etc/sysconfig/modules/VirtualBox.modules' as root"); #else pszError = N_("VirtualBox kernel driver not loaded"); #endif @@ -417,8 +417,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp #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. Load the kernel module by executing " + "'/etc/sysconfig/modules/VirtualBox.modules' as root"); #else pszError = N_("VirtualBox kernel driver not installed"); #endif VirtualBox-4.1.20-libcxx.patch: Config.kmk | 6 +++--- configure | 2 +- src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 5 +---- src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +- src/VBox/HostDrivers/Support/Makefile.kmk | 2 +- src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ src/VBox/HostDrivers/win/Makefile.kmk | 2 +- src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/VBox/Storage/testcase/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- src/libs/zlib-1.2.6/Makefile.kmk | 3 +-- 14 files changed, 21 insertions(+), 25 deletions(-) --- NEW FILE VirtualBox-4.1.20-libcxx.patch --- From: Lubomir Rintel <lkundrak(a)v3.sk> Date: Fri, 14 May 2010 12:26:33 +0200 Subject: [PATCH] If anyone finds out why did I remove those I owe him a beer. Seems like this patch could be safely left out. removes -g -pipe --- Config.kmk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) >From dd383911ef6a9a43c17b18d48b17cd82d6c8feb9 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 2/3] 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. --- Config.kmk | 4 ++-- configure | 2 +- .../WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 5 +---- src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +- src/VBox/HostDrivers/Support/Makefile.kmk | 2 +- src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ src/VBox/HostDrivers/win/Makefile.kmk | 2 +- src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/VBox/Storage/testcase/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- src/libs/zlib-1.2.1/Makefile.kmk | 2 +- 17 files changed, 23 insertions(+), 26 deletions(-) diff --git a/Config.kmk b/Config.kmk index 0ea34d8..2ec388c 100644 --- a/Config.kmk +++ b/Config.kmk @@ -3163,7 +3163,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) @@ -3311,7 +3311,7 @@ endif # Temporary: Renaming the template and warnings will be errors (soon). # TEMPLATE_VBoxR3Static = New name for VBOXR3STATIC -TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3STATIC +TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3EXE TEMPLATE_VBoxR3Static_EXTENDS_BY = appending ifeq ($(KBUILD_TARGET),win) TEMPLATE_VBoxR3Static_CFLAGS += $(VBOX_VCC_WERR) @@ -4055,7 +4055,7 @@ ifdef VBOX_WITH_QTGUI $(LIB_SDL_INC) ## @todo Use VBOX_GCC_PEDANTIC_CXX? TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = \ - -g -pipe $(filter-out -Wno-unused,$(VBOX_GCC_WARN)) -frtti -fno-exceptions -Wno-non-virtual-dtor \ + $(filter-out -Wno-unused,$(VBOX_GCC_WARN)) -frtti -fno-exceptions -Wno-non-virtual-dtor \ -Wno-long-long -fshort-wchar -fno-strict-aliasing \ $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) \ $(VBOX_GCC_Wno-delete-non-virtual-dtor) diff --git a/configure b/configure index 987cf1b..75d556c 100755 --- a/configure +++ b/configure @@ -2582,7 +2582,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 diff --git a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk index 52fb6d3..af7ba4b 100644 --- a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk +++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk @@ -160,7 +160,7 @@ endif #ifdef VBOX_WITH_WDDM ifdef VBOXVIDEOWINDBG DLLS += vbvdbg -vbvdbg_TEMPLATE = VBOXR3STATIC +vbvdbg_TEMPLATE = VBOXR3EXE vbvdbg_DEFS = UNICODE _UNICODE vbvdbg_SOURCES = \ wddm/dbg/VBoxVideoWinDbg.cpp \ diff --git a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk index ee73ed0..e359702 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 += \ diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk index ed0163b..2ee8418 100644 --- a/src/VBox/Frontends/VirtualBox/Makefile.kmk +++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk @@ -957,7 +957,7 @@ endif # darwin if defined(VBOX_WITH_VIDEOHWACCEL) if1of ($(KBUILD_TARGET), win linux freebsd) LIBRARIES += VBoxOGL2D - VBoxOGL2D_TEMPLATE = VBOXR3STATIC + VBoxOGL2D_TEMPLATE = VBOXR3EXE VBoxOGL2D_USES = qt4 VBoxOGL2D_SDKS = QT4 VBoxOGL2D_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS) VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL diff --git a/src/VBox/HostDrivers/Support/Makefile.kmk b/src/VBox/HostDrivers/Support/Makefile.kmk index bf77085..9d67f49 100644 --- a/src/VBox/HostDrivers/Support/Makefile.kmk +++ b/src/VBox/HostDrivers/Support/Makefile.kmk @@ -95,7 +95,7 @@ SUPR3_SOURCES = \ # # Static version of SUPR3. # -SUPR3Static_TEMPLATE = VBOXR3STATIC +SUPR3Static_TEMPLATE = VBOXR3EXE SUPR3Static_EXTENDS = SUPR3 # diff --git a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk index a40f46d..e29273f 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk +++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk @@ -141,7 +141,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # WinNetConfig - static library with host network interface config API # LIBRARIES.win += WinNetConfig - WinNetConfig_TEMPLATE = VBOXR3STATIC + WinNetConfig_TEMPLATE = VBOXR3EXE WinNetConfig_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE WinNetConfig_SDKS = WINPSDK W2K3DDK WinNetConfig_SOURCES = \ @@ -152,7 +152,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # NetFltInstall # PROGRAMS.win += NetFltInstall - NetFltInstall_TEMPLATE = VBOXR3STATIC + NetFltInstall_TEMPLATE = VBOXR3EXE NetFltInstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL NetFltInstall_SOURCES = win/tools/VBoxNetFltInstall.cpp NetFltInstall_LIBS = \ @@ -166,7 +166,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # NetFltUninstall # PROGRAMS.win += NetFltUninstall - NetFltUninstall_TEMPLATE = VBOXR3STATIC + NetFltUninstall_TEMPLATE = VBOXR3EXE NetFltUninstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL NetFltUninstall_SOURCES = win/tools/VBoxNetFltUninstall.cpp NetFltUninstall_LIBS = \ @@ -179,7 +179,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # NetAdpInstall # PROGRAMS.win += NetAdpInstall - NetAdpInstall_TEMPLATE = VBOXR3STATIC + NetAdpInstall_TEMPLATE = VBOXR3EXE NetAdpInstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL NetAdpInstall_SOURCES = win/tools/VBoxNetAdpInstall.cpp NetAdpInstall_LIBS = \ @@ -193,7 +193,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # NetAdpUninstall # PROGRAMS.win += NetAdpUninstall - NetAdpUninstall_TEMPLATE = VBOXR3STATIC + NetAdpUninstall_TEMPLATE = VBOXR3EXE NetAdpUninstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL NetAdpUninstall_SOURCES = win/tools/VBoxNetAdpUninstall.cpp NetAdpUninstall_LIBS = \ @@ -206,7 +206,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # VBoxNetFltNobj # DLLS.win += VBoxNetFltNobj - VBoxNetFltNobj_TEMPLATE = VBOXR3STATIC + VBoxNetFltNobj_TEMPLATE = VBOXR3EXE if defined(VBOX_SIGNING_MODE) VBoxNetFltNobj_NOINST = true endif diff --git a/src/VBox/HostDrivers/win/Makefile.kmk b/src/VBox/HostDrivers/win/Makefile.kmk index 19c15d5..6d2366f 100644 --- a/src/VBox/HostDrivers/win/Makefile.kmk +++ b/src/VBox/HostDrivers/win/Makefile.kmk @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../.. include $(KBUILD_PATH)/subheader.kmk LIBRARIES += VBoxDrvCfg -VBoxDrvCfg_TEMPLATE = VBOXR3STATIC +VBoxDrvCfg_TEMPLATE = VBOXR3EXE VBoxDrvCfg_SDKS = WINPSDK W2K3DDK VBoxDrvCfg_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE VBoxDrvCfg_SOURCES = cfg/VBoxDrvCfg.cpp diff --git a/src/VBox/Installer/win/InstallHelper/Makefile.kmk b/src/VBox/Installer/win/InstallHelper/Makefile.kmk index 5271e49..aa18e57 100644 --- a/src/VBox/Installer/win/InstallHelper/Makefile.kmk +++ b/src/VBox/Installer/win/InstallHelper/Makefile.kmk @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../.. include $(KBUILD_PATH)/subheader.kmk DLLS += VBoxInstallHelper -VBoxInstallHelper_TEMPLATE = VBOXR3STATIC +VBoxInstallHelper_TEMPLATE = VBOXR3EXE VBoxInstallHelper_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE VBoxInstallHelper_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV) VBoxInstallHelper_DEPS = $(VBOX_SVN_REV_KMK) diff --git a/src/VBox/Installer/win/Resources/Makefile.kmk b/src/VBox/Installer/win/Resources/Makefile.kmk index 77ea1b7..5e58fdc 100644 --- a/src/VBox/Installer/win/Resources/Makefile.kmk +++ b/src/VBox/Installer/win/Resources/Makefile.kmk @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../.. include $(KBUILD_PATH)/subheader.kmk DLLS += VBoxRes -VBoxRes_TEMPLATE = VBOXR3STATIC +VBoxRes_TEMPLATE = VBOXR3EXE VBoxRes_DEPS = $(VBOX_SVN_REV_KMK) VBoxRes_SOURCES = \ dummy.cpp \ diff --git a/src/VBox/Installer/win/Stub/Makefile.kmk b/src/VBox/Installer/win/Stub/Makefile.kmk index a8f89eb..6cf55cc 100644 --- a/src/VBox/Installer/win/Stub/Makefile.kmk +++ b/src/VBox/Installer/win/Stub/Makefile.kmk @@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk if "$(KBUILD_TARGET_ARCH)" == "x86" TEMPLATE_VBOXSTUB = Drop the signing, we will sign it later. -TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3STATIC +TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3EXE TEMPLATE_VBOXSTUB_POST_CMDS = $(NO_SUCH_VARIABLE) PROGRAMS.x86 += VBoxStub diff --git a/src/VBox/Storage/testcase/Makefile.kmk b/src/VBox/Storage/testcase/Makefile.kmk index f935b05..40f6bf2 100644 --- a/src/VBox/Storage/testcase/Makefile.kmk +++ b/src/VBox/Storage/testcase/Makefile.kmk @@ -68,7 +68,7 @@ ifdef VBOX_WITH_TESTCASES # # vbox-img - static because it migth be used as at standalone tool. # - vbox-img_TEMPLATE = VBOXR3STATIC + vbox-img_TEMPLATE = VBOXR3EXE vbox-img_DEFS += IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS IN_RT_R3 vbox-img_SOURCES = \ vbox-img.cpp \ diff --git a/src/libs/liblzf-3.4/Makefile.kmk b/src/libs/liblzf-3.4/Makefile.kmk index 44088fa..0afe89a 100644 --- a/src/libs/liblzf-3.4/Makefile.kmk +++ b/src/libs/liblzf-3.4/Makefile.kmk @@ -33,7 +33,7 @@ VBox-liblzf_SOURCES = \ lzf_c.c \ lzf_d.c -VBox-liblzf-static_TEMPLATE = VBOXR3STATIC +VBox-liblzf-static_TEMPLATE = VBOXR3EXE VBox-liblzf-static_BLD_TYPE = $(VBox-liblzf_BLD_TYPE) VBox-liblzf-static_DEFS = $(VBox-liblzf_DEFS) VBox-liblzf-static_DEFS.x86 = $(VBox-liblzf_DEFS.x86) diff --git a/src/libs/zlib-1.2.1/Makefile.kmk b/src/libs/zlib-1.2.1/Makefile.kmk index fde8b7c..405d354 100644 --- a/src/libs/zlib-1.2.6/Makefile.kmk +++ b/src/libs/zlib-1.2.6/Makefile.kmk @@ -39,7 +39,7 @@ VBox-zlib_SOURCES = \ inftrees.c \ inffast.c -VBox-zlib-static_TEMPLATE = VBOXR3STATIC +VBox-zlib-static_TEMPLATE = VBOXR3EXE VBox-zlib-static_DEFS = $(VBox-zlib_DEFS) VBox-zlib-static_SOURCES = $(VBox-zlib_SOURCES) -- 1.7.1 --- NEW FILE VirtualBox-60-vboxguest.rules --- ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" --- NEW FILE VirtualBox-90-vboxdrv.rules --- SUBSYSTEM=="usb_device", ACTION=="add", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="VBoxCreateUSBNode.sh --remove $major $minor" SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh --remove $major $minor" --- NEW FILE VirtualBox-guest.modules --- #!/bin/sh # Workaround for https://bugzilla.rpmfusion.org/show_bug.cgi?id=1083 insert_module () { grep -qR "^[ \t]*blacklist[ \t][ \t]*$1[ \t]*" /etc/modprobe.d && return modinfo $1 |awk '/filename:/ {print "insmod "$2}' |$SHELL } insert_module vboxguest insert_module vboxsf --- NEW FILE VirtualBox-vboxresize.desktop --- [Desktop Entry] Type=Application Version=1.0 Name=vbox-autoresize Exec=/usr/bin/VBoxClient --autoresize X-GNOME-Autostart-enabled=true --- NEW FILE VirtualBox.modules --- #!/bin/sh # User is advised to run this on upgrades /sbin/modprobe -r -b vboxnetflt &>/dev/null ||: /sbin/modprobe -r -b vboxnetadp &>/dev/null ||: /sbin/modprobe -r -b vboxdrv &>/dev/null ||: # Workaround for https://bugzilla.rpmfusion.org/show_bug.cgi?id=1083 insert_module () { grep -qR "^[ \t]*blacklist[ \t][ \t]*$1[ \t]*" /etc/modprobe.d && return modinfo $1 |awk '/filename:/ {print "insmod "$2}' |$SHELL } insert_module vboxdrv insert_module vboxnetflt insert_module vboxnetadp Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-17/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 8 Jul 2012 14:44:53 -0000 1.36 +++ .cvsignore 1 Sep 2012 20:06:29 -0000 1.37 @@ -1 +1 @@ -VirtualBox-4.1.18.tar.bz2 +VirtualBox-4.1.20.tar.bz2 Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-17/VirtualBox.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- VirtualBox.spec 8 Jul 2012 14:44:53 -0000 1.7 +++ VirtualBox.spec 1 Sep 2012 20:06:34 -0000 1.8 @@ -14,7 +14,7 @@ %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} Name: VirtualBox -Version: 4.1.18 +Version: 4.1.20 Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware @@ -22,22 +22,20 @@ License: GPLv2 or (GPLv2 and CDDL) URL: http://www.virtualbox.org/wiki/VirtualBox 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 -Source7: VirtualBox-OSE-guest.modules -Source8: VirtualBox-OSE-vboxresize.desktop -Source9: VirtualBox-OSE-00-vboxvideo.conf +Source3: VirtualBox-90-vboxdrv.rules +Source5: VirtualBox-60-vboxguest.rules +Source6: VirtualBox.modules +Source7: VirtualBox-guest.modules +Source8: VirtualBox-vboxresize.desktop +Source9: VirtualBox-00-vboxvideo.conf Source10: vboxweb.service Source11: vboxservice.service Patch1: VirtualBox-OSE-4.1.4-noupdate.patch -Patch2: VirtualBox-OSE-4.1.6-strings.patch -Patch3: VirtualBox-OSE-4.1.2-libcxx.patch +Patch2: VirtualBox-4.1.18-strings.patch +Patch3: VirtualBox-4.1.20-libcxx.patch Patch5: VirtualBox-OSE-4.1.4-xorg17.patch -Patch9: VirtualBox-OSE-3.2.4-optflags.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 +#Patch11: VirtualBox-OSE-3.2.0-visibility.patch Patch15: VirtualBox-OSE-4.0.0-makeself.patch Patch16: VirtualBox-OSE-4.1.2-usblib.patch Patch17: VirtualBox-OSE-4.0.0-beramono.patch @@ -179,10 +177,8 @@ %patch2 -p1 -b .strings %patch3 -p1 -b .libcxx %patch5 -p1 -b .xorg17 -%patch9 -p1 -b .optflags %patch10 -p1 -b .32bit -%patch11 -p1 -b .visibility -%patch12 -p1 -b .noansi +#%patch11 -p1 -b .visibility %patch15 -p1 -b .makeself %patch16 -p1 -b .usblib %patch17 -p1 -b .beramono @@ -233,6 +229,7 @@ # Directory structure install -d $RPM_BUILD_ROOT/%{_lib}/security install -d $RPM_BUILD_ROOT%{_bindir} +install -d $RPM_BUILD_ROOT%{_sbindir} install -d $RPM_BUILD_ROOT%{_libdir} install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/components @@ -341,8 +338,10 @@ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so # Guest tools +install -m 0755 -t $RPM_BUILD_ROOT%{_sbindir} \ + obj/bin/additions/mount.vboxsf + install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \ - obj/bin/additions/mount.vboxsf \ obj/bin/additions/VBoxService \ obj/bin/additions/VBoxClient \ obj/bin/additions/VBoxControl @@ -529,7 +528,7 @@ %files guest /%{_lib}/security/pam_vbox.so -%{_bindir}/mount.vboxsf +%{_sbindir}/mount.vboxsf %{_bindir}/VBoxClient %{_bindir}/VBoxControl %{_bindir}/VBoxService @@ -551,6 +550,18 @@ %changelog +* Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.20-1 +- New upstream release. +- Redo VirtualBox-4.1.20-libcxx.patch +- Patch9 (VirtualBox-OSE-3.2.4-optflags.patch) integrated in Patch3 (VirtualBox-4.1.20-libcxx.patch). +- drop Patch12 (VirtualBox-OSE-3.2.10-noansi.patch) no need anymore. +- drop Patch11 (VirtualBox-OSE-3.2.0-visibility.patch) no need anymore. +- fix rfbz #2416 - /bin/mount.vboxsf must be moved to /sbin/mount.vboxsf +- move files VirtualBox-OSE .rules .modules .desktop and .conf to VirtualBox + +* Mon Jul 09 2012 Sérgio Basto <sergio(a)serjux.com> 4.1.18-2 +- Improve some strings suggest on rfbz #1826 + * Thu Jun 21 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.18-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox/F-17/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 8 Jul 2012 14:44:53 -0000 1.36 +++ sources 1 Sep 2012 20:06:34 -0000 1.37 @@ -1 +1 @@ -38db0a87cba659b484af868b0c2bd3ac VirtualBox-4.1.18.tar.bz2 +5784c6dda8a9d53f8f21b2d41eba903c VirtualBox-4.1.20.tar.bz2 --- VirtualBox-OSE-00-vboxvideo.conf DELETED --- --- VirtualBox-OSE-3.2.10-noansi.patch DELETED --- --- VirtualBox-OSE-3.2.4-optflags.patch DELETED --- --- VirtualBox-OSE-4.1.2-libcxx.patch DELETED --- --- VirtualBox-OSE-4.1.6-strings.patch DELETED --- --- VirtualBox-OSE-60-vboxguest.rules DELETED --- --- VirtualBox-OSE-90-vboxdrv.rules DELETED --- --- VirtualBox-OSE-guest.modules DELETED --- --- VirtualBox-OSE-vboxresize.desktop DELETED --- --- VirtualBox-OSE.modules DELETED ---

12 years, 3 months

1
0
0 / 0

rpms/VirtualBox/devel VirtualBox-00-vboxvideo.conf, NONE, 1.1 VirtualBox-4.1.18-strings.patch, NONE, 1.1 VirtualBox-4.1.20-libcxx.patch, NONE, 1.1 VirtualBox-60-vboxguest.rules, NONE, 1.1 VirtualBox-90-vboxdrv.rules, NONE, 1.1 VirtualBox-guest.modules, NONE, 1.1 VirtualBox-vboxresize.desktop, NONE, 1.1 .cvsignore, 1.36, 1.37 VirtualBox.spec, 1.14, 1.15 sources, 1.36, 1.37 VirtualBox-OSE-00-vboxvideo.conf, 1.1, NONE VirtualBox-OSE-3.2.10-noansi.patch, 1.2, NONE VirtualBox-OSE-3.2.4-optflags.patch, 1.1, NONE

by Sérgio M. Basto

Author: sergiomb Update of /cvs/free/rpms/VirtualBox/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25134 Modified Files: .cvsignore VirtualBox.spec sources Added Files: VirtualBox-00-vboxvideo.conf VirtualBox-4.1.18-strings.patch VirtualBox-4.1.20-libcxx.patch VirtualBox-60-vboxguest.rules VirtualBox-90-vboxdrv.rules VirtualBox-guest.modules VirtualBox-vboxresize.desktop Removed Files: VirtualBox-OSE-00-vboxvideo.conf VirtualBox-OSE-3.2.10-noansi.patch VirtualBox-OSE-3.2.4-optflags.patch VirtualBox-OSE-4.1.2-libcxx.patch VirtualBox-OSE-4.1.6-strings.patch VirtualBox-OSE-60-vboxguest.rules VirtualBox-OSE-90-vboxdrv.rules VirtualBox-OSE-guest.modules VirtualBox-OSE-vboxresize.desktop VirtualBox-OSE.modules Log Message: * Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.20-1 - New upstream release. - Redo VirtualBox-4.1.20-libcxx.patch - Patch9 (VirtualBox-OSE-3.2.4-optflags.patch) integrated in Patch3 (VirtualBox-4.1.20-libcxx.patch). - drop Patch12 (VirtualBox-OSE-3.2.10-noansi.patch) no need anymore. - drop Patch11 (VirtualBox-OSE-3.2.0-visibility.patch) no need anymore. - fix rfbz #2416 - /bin/mount.vboxsf must be moved to /sbin/mount.vboxsf - move files VirtualBox-OSE .rules .modules .desktop and .conf to VirtualBox --- NEW FILE VirtualBox-00-vboxvideo.conf --- Section "Device" Identifier "Videocard666" Driver "vboxvideo" EndSection VirtualBox-4.1.18-strings.patch: Frontends/VirtualBox/src/main.cpp | 22 +++++++++++----------- Installer/linux/VBox.sh | 13 ++++++++----- VMM/VMMR3/VM.cpp | 8 ++++---- 3 files changed, 23 insertions(+), 20 deletions(-) --- NEW FILE VirtualBox-4.1.18-strings.patch --- * Mon Jul 09 2012 Sérgio Basto <sergio(a)serjux.com> - rfbz #1826, last review of https://bugzilla.rpmfusion.org/attachment.cgi?id=888 by: Naveed Hasan <naveed(a)cs.columbia.edu> * Sat Jun 16 2012 Sérgio Basto <sergio(a)serjux.com> - Rebased for 4.1.16 (partial rfbz #1826) 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 -Nurp VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.18.new2/src/VBox/Frontends/VirtualBox/src/main.cpp --- VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/main.cpp 2012-06-20 14:16:20.000000000 +0100 +++ VirtualBox-4.1.18.new2/src/VBox/Frontends/VirtualBox/src/main.cpp 2012-07-09 04:57:00.690645723 +0100 @@ -72,13 +72,13 @@ QString g_QStrHintLinuxNoMemory = QAppli ); 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. If it is available in your distribution, you 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 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.modules' " ); QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( @@ -92,18 +92,18 @@ QString g_QStrHintLinuxWrongDriverVersio "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.modules' as root " "may correct this. Make sure that you do not mix the " - "OSE version and the PUEL version of VirtualBox." + "RPM Fusion version and the Oracle version of VirtualBox." ); 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 -Nurp VirtualBox-4.1.18/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.18.new2/src/VBox/Installer/linux/VBox.sh --- VirtualBox-4.1.18/src/VBox/Installer/linux/VBox.sh 2012-06-20 14:17:29.000000000 +0100 +++ VirtualBox-4.1.18.new2/src/VBox/Installer/linux/VBox.sh 2012-07-09 05:02:47.158108166 +0100 @@ -32,19 +32,22 @@ 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 load the kernel module by executing - sudo /etc/init.d/vboxdrv setup + '/etc/sysconfig/modules/VirtualBox.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 executing - sudo /etc/init.d/vboxdrv restart + '/sbin/udevadm control --reload-rules' (as root) + 'systemctl restart udev-trigger.service' (as root) + 'systemctl restart udev-settle.service' (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 -Nurp VirtualBox-4.1.18/src/VBox/VMM/VMMR3/VM.cpp VirtualBox-4.1.18.new2/src/VBox/VMM/VMMR3/VM.cpp --- VirtualBox-4.1.18/src/VBox/VMM/VMMR3/VM.cpp 2012-06-20 14:18:34.000000000 +0100 +++ VirtualBox-4.1.18.new2/src/VBox/VMM/VMMR3/VM.cpp 2012-07-09 05:01:48.544521745 +0100 @@ -375,8 +375,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp #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 load the kernel module by executing " + "'/etc/sysconfig/modules/VirtualBox.modules' as root"); #else pszError = N_("VirtualBox kernel driver not loaded"); #endif @@ -417,8 +417,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp #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. Load the kernel module by executing " + "'/etc/sysconfig/modules/VirtualBox.modules' as root"); #else pszError = N_("VirtualBox kernel driver not installed"); #endif VirtualBox-4.1.20-libcxx.patch: Config.kmk | 6 +++--- configure | 2 +- src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 5 +---- src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +- src/VBox/HostDrivers/Support/Makefile.kmk | 2 +- src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ src/VBox/HostDrivers/win/Makefile.kmk | 2 +- src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/VBox/Storage/testcase/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- src/libs/zlib-1.2.6/Makefile.kmk | 3 +-- 14 files changed, 21 insertions(+), 25 deletions(-) --- NEW FILE VirtualBox-4.1.20-libcxx.patch --- From: Lubomir Rintel <lkundrak(a)v3.sk> Date: Fri, 14 May 2010 12:26:33 +0200 Subject: [PATCH] If anyone finds out why did I remove those I owe him a beer. Seems like this patch could be safely left out. removes -g -pipe --- Config.kmk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) >From dd383911ef6a9a43c17b18d48b17cd82d6c8feb9 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 2/3] 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. --- Config.kmk | 4 ++-- configure | 2 +- .../WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 5 +---- src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +- src/VBox/HostDrivers/Support/Makefile.kmk | 2 +- src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ src/VBox/HostDrivers/win/Makefile.kmk | 2 +- src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/VBox/Storage/testcase/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- src/libs/zlib-1.2.1/Makefile.kmk | 2 +- 17 files changed, 23 insertions(+), 26 deletions(-) diff --git a/Config.kmk b/Config.kmk index 0ea34d8..2ec388c 100644 --- a/Config.kmk +++ b/Config.kmk @@ -3163,7 +3163,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) @@ -3311,7 +3311,7 @@ endif # Temporary: Renaming the template and warnings will be errors (soon). # TEMPLATE_VBoxR3Static = New name for VBOXR3STATIC -TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3STATIC +TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3EXE TEMPLATE_VBoxR3Static_EXTENDS_BY = appending ifeq ($(KBUILD_TARGET),win) TEMPLATE_VBoxR3Static_CFLAGS += $(VBOX_VCC_WERR) @@ -4055,7 +4055,7 @@ ifdef VBOX_WITH_QTGUI $(LIB_SDL_INC) ## @todo Use VBOX_GCC_PEDANTIC_CXX? TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = \ - -g -pipe $(filter-out -Wno-unused,$(VBOX_GCC_WARN)) -frtti -fno-exceptions -Wno-non-virtual-dtor \ + $(filter-out -Wno-unused,$(VBOX_GCC_WARN)) -frtti -fno-exceptions -Wno-non-virtual-dtor \ -Wno-long-long -fshort-wchar -fno-strict-aliasing \ $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) \ $(VBOX_GCC_Wno-delete-non-virtual-dtor) diff --git a/configure b/configure index 987cf1b..75d556c 100755 --- a/configure +++ b/configure @@ -2582,7 +2582,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 diff --git a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk index 52fb6d3..af7ba4b 100644 --- a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk +++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk @@ -160,7 +160,7 @@ endif #ifdef VBOX_WITH_WDDM ifdef VBOXVIDEOWINDBG DLLS += vbvdbg -vbvdbg_TEMPLATE = VBOXR3STATIC +vbvdbg_TEMPLATE = VBOXR3EXE vbvdbg_DEFS = UNICODE _UNICODE vbvdbg_SOURCES = \ wddm/dbg/VBoxVideoWinDbg.cpp \ diff --git a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk index ee73ed0..e359702 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 += \ diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk index ed0163b..2ee8418 100644 --- a/src/VBox/Frontends/VirtualBox/Makefile.kmk +++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk @@ -957,7 +957,7 @@ endif # darwin if defined(VBOX_WITH_VIDEOHWACCEL) if1of ($(KBUILD_TARGET), win linux freebsd) LIBRARIES += VBoxOGL2D - VBoxOGL2D_TEMPLATE = VBOXR3STATIC + VBoxOGL2D_TEMPLATE = VBOXR3EXE VBoxOGL2D_USES = qt4 VBoxOGL2D_SDKS = QT4 VBoxOGL2D_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS) VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL diff --git a/src/VBox/HostDrivers/Support/Makefile.kmk b/src/VBox/HostDrivers/Support/Makefile.kmk index bf77085..9d67f49 100644 --- a/src/VBox/HostDrivers/Support/Makefile.kmk +++ b/src/VBox/HostDrivers/Support/Makefile.kmk @@ -95,7 +95,7 @@ SUPR3_SOURCES = \ # # Static version of SUPR3. # -SUPR3Static_TEMPLATE = VBOXR3STATIC +SUPR3Static_TEMPLATE = VBOXR3EXE SUPR3Static_EXTENDS = SUPR3 # diff --git a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk index a40f46d..e29273f 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk +++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk @@ -141,7 +141,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # WinNetConfig - static library with host network interface config API # LIBRARIES.win += WinNetConfig - WinNetConfig_TEMPLATE = VBOXR3STATIC + WinNetConfig_TEMPLATE = VBOXR3EXE WinNetConfig_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE WinNetConfig_SDKS = WINPSDK W2K3DDK WinNetConfig_SOURCES = \ @@ -152,7 +152,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # NetFltInstall # PROGRAMS.win += NetFltInstall - NetFltInstall_TEMPLATE = VBOXR3STATIC + NetFltInstall_TEMPLATE = VBOXR3EXE NetFltInstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL NetFltInstall_SOURCES = win/tools/VBoxNetFltInstall.cpp NetFltInstall_LIBS = \ @@ -166,7 +166,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # NetFltUninstall # PROGRAMS.win += NetFltUninstall - NetFltUninstall_TEMPLATE = VBOXR3STATIC + NetFltUninstall_TEMPLATE = VBOXR3EXE NetFltUninstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL NetFltUninstall_SOURCES = win/tools/VBoxNetFltUninstall.cpp NetFltUninstall_LIBS = \ @@ -179,7 +179,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # NetAdpInstall # PROGRAMS.win += NetAdpInstall - NetAdpInstall_TEMPLATE = VBOXR3STATIC + NetAdpInstall_TEMPLATE = VBOXR3EXE NetAdpInstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL NetAdpInstall_SOURCES = win/tools/VBoxNetAdpInstall.cpp NetAdpInstall_LIBS = \ @@ -193,7 +193,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # NetAdpUninstall # PROGRAMS.win += NetAdpUninstall - NetAdpUninstall_TEMPLATE = VBOXR3STATIC + NetAdpUninstall_TEMPLATE = VBOXR3EXE NetAdpUninstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL NetAdpUninstall_SOURCES = win/tools/VBoxNetAdpUninstall.cpp NetAdpUninstall_LIBS = \ @@ -206,7 +206,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ # VBoxNetFltNobj # DLLS.win += VBoxNetFltNobj - VBoxNetFltNobj_TEMPLATE = VBOXR3STATIC + VBoxNetFltNobj_TEMPLATE = VBOXR3EXE if defined(VBOX_SIGNING_MODE) VBoxNetFltNobj_NOINST = true endif diff --git a/src/VBox/HostDrivers/win/Makefile.kmk b/src/VBox/HostDrivers/win/Makefile.kmk index 19c15d5..6d2366f 100644 --- a/src/VBox/HostDrivers/win/Makefile.kmk +++ b/src/VBox/HostDrivers/win/Makefile.kmk @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../.. include $(KBUILD_PATH)/subheader.kmk LIBRARIES += VBoxDrvCfg -VBoxDrvCfg_TEMPLATE = VBOXR3STATIC +VBoxDrvCfg_TEMPLATE = VBOXR3EXE VBoxDrvCfg_SDKS = WINPSDK W2K3DDK VBoxDrvCfg_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE VBoxDrvCfg_SOURCES = cfg/VBoxDrvCfg.cpp diff --git a/src/VBox/Installer/win/InstallHelper/Makefile.kmk b/src/VBox/Installer/win/InstallHelper/Makefile.kmk index 5271e49..aa18e57 100644 --- a/src/VBox/Installer/win/InstallHelper/Makefile.kmk +++ b/src/VBox/Installer/win/InstallHelper/Makefile.kmk @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../.. include $(KBUILD_PATH)/subheader.kmk DLLS += VBoxInstallHelper -VBoxInstallHelper_TEMPLATE = VBOXR3STATIC +VBoxInstallHelper_TEMPLATE = VBOXR3EXE VBoxInstallHelper_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE VBoxInstallHelper_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV) VBoxInstallHelper_DEPS = $(VBOX_SVN_REV_KMK) diff --git a/src/VBox/Installer/win/Resources/Makefile.kmk b/src/VBox/Installer/win/Resources/Makefile.kmk index 77ea1b7..5e58fdc 100644 --- a/src/VBox/Installer/win/Resources/Makefile.kmk +++ b/src/VBox/Installer/win/Resources/Makefile.kmk @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../.. include $(KBUILD_PATH)/subheader.kmk DLLS += VBoxRes -VBoxRes_TEMPLATE = VBOXR3STATIC +VBoxRes_TEMPLATE = VBOXR3EXE VBoxRes_DEPS = $(VBOX_SVN_REV_KMK) VBoxRes_SOURCES = \ dummy.cpp \ diff --git a/src/VBox/Installer/win/Stub/Makefile.kmk b/src/VBox/Installer/win/Stub/Makefile.kmk index a8f89eb..6cf55cc 100644 --- a/src/VBox/Installer/win/Stub/Makefile.kmk +++ b/src/VBox/Installer/win/Stub/Makefile.kmk @@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk if "$(KBUILD_TARGET_ARCH)" == "x86" TEMPLATE_VBOXSTUB = Drop the signing, we will sign it later. -TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3STATIC +TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3EXE TEMPLATE_VBOXSTUB_POST_CMDS = $(NO_SUCH_VARIABLE) PROGRAMS.x86 += VBoxStub diff --git a/src/VBox/Storage/testcase/Makefile.kmk b/src/VBox/Storage/testcase/Makefile.kmk index f935b05..40f6bf2 100644 --- a/src/VBox/Storage/testcase/Makefile.kmk +++ b/src/VBox/Storage/testcase/Makefile.kmk @@ -68,7 +68,7 @@ ifdef VBOX_WITH_TESTCASES # # vbox-img - static because it migth be used as at standalone tool. # - vbox-img_TEMPLATE = VBOXR3STATIC + vbox-img_TEMPLATE = VBOXR3EXE vbox-img_DEFS += IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS IN_RT_R3 vbox-img_SOURCES = \ vbox-img.cpp \ diff --git a/src/libs/liblzf-3.4/Makefile.kmk b/src/libs/liblzf-3.4/Makefile.kmk index 44088fa..0afe89a 100644 --- a/src/libs/liblzf-3.4/Makefile.kmk +++ b/src/libs/liblzf-3.4/Makefile.kmk @@ -33,7 +33,7 @@ VBox-liblzf_SOURCES = \ lzf_c.c \ lzf_d.c -VBox-liblzf-static_TEMPLATE = VBOXR3STATIC +VBox-liblzf-static_TEMPLATE = VBOXR3EXE VBox-liblzf-static_BLD_TYPE = $(VBox-liblzf_BLD_TYPE) VBox-liblzf-static_DEFS = $(VBox-liblzf_DEFS) VBox-liblzf-static_DEFS.x86 = $(VBox-liblzf_DEFS.x86) diff --git a/src/libs/zlib-1.2.1/Makefile.kmk b/src/libs/zlib-1.2.1/Makefile.kmk index fde8b7c..405d354 100644 --- a/src/libs/zlib-1.2.6/Makefile.kmk +++ b/src/libs/zlib-1.2.6/Makefile.kmk @@ -39,7 +39,7 @@ VBox-zlib_SOURCES = \ inftrees.c \ inffast.c -VBox-zlib-static_TEMPLATE = VBOXR3STATIC +VBox-zlib-static_TEMPLATE = VBOXR3EXE VBox-zlib-static_DEFS = $(VBox-zlib_DEFS) VBox-zlib-static_SOURCES = $(VBox-zlib_SOURCES) -- 1.7.1 --- NEW FILE VirtualBox-60-vboxguest.rules --- ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" --- NEW FILE VirtualBox-90-vboxdrv.rules --- SUBSYSTEM=="usb_device", ACTION=="add", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="VBoxCreateUSBNode.sh --remove $major $minor" SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh --remove $major $minor" --- NEW FILE VirtualBox-guest.modules --- #!/bin/sh # Workaround for https://bugzilla.rpmfusion.org/show_bug.cgi?id=1083 insert_module () { grep -qR "^[ \t]*blacklist[ \t][ \t]*$1[ \t]*" /etc/modprobe.d && return modinfo $1 |awk '/filename:/ {print "insmod "$2}' |$SHELL } insert_module vboxguest insert_module vboxsf --- NEW FILE VirtualBox-vboxresize.desktop --- [Desktop Entry] Type=Application Version=1.0 Name=vbox-autoresize Exec=/usr/bin/VBoxClient --autoresize X-GNOME-Autostart-enabled=true Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 21 Jun 2012 03:00:25 -0000 1.36 +++ .cvsignore 1 Sep 2012 20:00:35 -0000 1.37 @@ -1 +1 @@ -VirtualBox-4.1.18.tar.bz2 +VirtualBox-4.1.20.tar.bz2 Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- VirtualBox.spec 9 Jul 2012 04:27:12 -0000 1.14 +++ VirtualBox.spec 1 Sep 2012 20:00:39 -0000 1.15 @@ -14,30 +14,28 @@ %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} Name: VirtualBox -Version: 4.1.18 -Release: 2%{?prerel:.%{prerel}}%{?dist} +Version: 4.1.20 +Release: 1%{?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://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 -Source7: VirtualBox-OSE-guest.modules -Source8: VirtualBox-OSE-vboxresize.desktop -Source9: VirtualBox-OSE-00-vboxvideo.conf +Source3: VirtualBox-90-vboxdrv.rules +Source5: VirtualBox-60-vboxguest.rules +Source6: VirtualBox.modules +Source7: VirtualBox-guest.modules +Source8: VirtualBox-vboxresize.desktop +Source9: VirtualBox-00-vboxvideo.conf Source10: vboxweb.service Source11: vboxservice.service Patch1: VirtualBox-OSE-4.1.4-noupdate.patch -Patch2: VirtualBox-OSE-4.1.6-strings.patch -Patch3: VirtualBox-OSE-4.1.2-libcxx.patch +Patch2: VirtualBox-4.1.18-strings.patch +Patch3: VirtualBox-4.1.20-libcxx.patch Patch5: VirtualBox-OSE-4.1.4-xorg17.patch -Patch9: VirtualBox-OSE-3.2.4-optflags.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 +#Patch11: VirtualBox-OSE-3.2.0-visibility.patch Patch15: VirtualBox-OSE-4.0.0-makeself.patch Patch16: VirtualBox-OSE-4.1.2-usblib.patch Patch17: VirtualBox-OSE-4.0.0-beramono.patch @@ -179,10 +177,8 @@ %patch2 -p1 -b .strings %patch3 -p1 -b .libcxx %patch5 -p1 -b .xorg17 -%patch9 -p1 -b .optflags %patch10 -p1 -b .32bit -%patch11 -p1 -b .visibility -%patch12 -p1 -b .noansi +#%patch11 -p1 -b .visibility %patch15 -p1 -b .makeself %patch16 -p1 -b .usblib %patch17 -p1 -b .beramono @@ -233,6 +229,7 @@ # Directory structure install -d $RPM_BUILD_ROOT/%{_lib}/security install -d $RPM_BUILD_ROOT%{_bindir} +install -d $RPM_BUILD_ROOT%{_sbindir} install -d $RPM_BUILD_ROOT%{_libdir} install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/components @@ -341,8 +338,10 @@ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so # Guest tools +install -m 0755 -t $RPM_BUILD_ROOT%{_sbindir} \ + obj/bin/additions/mount.vboxsf + install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \ - obj/bin/additions/mount.vboxsf \ obj/bin/additions/VBoxService \ obj/bin/additions/VBoxClient \ obj/bin/additions/VBoxControl @@ -529,7 +528,7 @@ %files guest /%{_lib}/security/pam_vbox.so -%{_bindir}/mount.vboxsf +%{_sbindir}/mount.vboxsf %{_bindir}/VBoxClient %{_bindir}/VBoxControl %{_bindir}/VBoxService @@ -551,6 +550,18 @@ %changelog +* Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.20-1 +- New upstream release. +- Redo VirtualBox-4.1.20-libcxx.patch +- Patch9 (VirtualBox-OSE-3.2.4-optflags.patch) integrated in Patch3 (VirtualBox-4.1.20-libcxx.patch). +- drop Patch12 (VirtualBox-OSE-3.2.10-noansi.patch) no need anymore. +- drop Patch11 (VirtualBox-OSE-3.2.0-visibility.patch) no need anymore. +- fix rfbz #2416 - /bin/mount.vboxsf must be moved to /sbin/mount.vboxsf +- move files VirtualBox-OSE .rules .modules .desktop and .conf to VirtualBox + +* Mon Jul 09 2012 Sérgio Basto <sergio(a)serjux.com> 4.1.18-2 +- Improve some strings suggest on rfbz #1826 + * Thu Jun 21 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.18-1 - New upstream release. Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 21 Jun 2012 03:00:25 -0000 1.36 +++ sources 1 Sep 2012 20:00:39 -0000 1.37 @@ -1 +1 @@ -38db0a87cba659b484af868b0c2bd3ac VirtualBox-4.1.18.tar.bz2 +5784c6dda8a9d53f8f21b2d41eba903c VirtualBox-4.1.20.tar.bz2 --- VirtualBox-OSE-00-vboxvideo.conf DELETED --- --- VirtualBox-OSE-3.2.10-noansi.patch DELETED --- --- VirtualBox-OSE-3.2.4-optflags.patch DELETED --- --- VirtualBox-OSE-4.1.2-libcxx.patch DELETED --- --- VirtualBox-OSE-4.1.6-strings.patch DELETED --- --- VirtualBox-OSE-60-vboxguest.rules DELETED --- --- VirtualBox-OSE-90-vboxdrv.rules DELETED --- --- VirtualBox-OSE-guest.modules DELETED --- --- VirtualBox-OSE-vboxresize.desktop DELETED --- --- VirtualBox-OSE.modules DELETED ---

12 years, 3 months

1
0
0 / 0

rpms/mpd/F-17 mpd.spec,1.26,1.27

by Adrian Reber

Author: adrian Update of /cvs/free/rpms/mpd/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24889 Modified Files: mpd.spec Log Message: * Fri Aug 17 2012 Adrian Reber <adrian(a)lisas.de> - 1:0.16.8-5 - fix "mpd fails to bind an addres: started too early" (#2447) Index: mpd.spec =================================================================== RCS file: /cvs/free/rpms/mpd/F-17/mpd.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- mpd.spec 12 May 2012 07:20:26 -0000 1.26 +++ mpd.spec 1 Sep 2012 19:58:02 -0000 1.27 @@ -16,7 +16,7 @@ Name: mpd Epoch: 1 Version: 0.16.8 -Release: 3%{?dist} +Release: 5%{?dist} Summary: The Music Player Daemon License: GPLv2+ Group: Applications/Multimedia @@ -48,7 +48,7 @@ BuildRequires: libshout-devel BuildRequires: libvorbis-devel BuildRequires: mikmod-devel -BuildRequires: pulseaudio-lib-devel +BuildRequires: pkgconfig(libpulse) BuildRequires: sqlite-devel BuildRequires: wavpack-devel BuildRequires: zlib-devel @@ -75,6 +75,7 @@ %patch0 -p0 %build +sed -i -e "s,sound.target,sound.target network.target,g" mpd.service.in %{configure} \ --with-systemdsystemunitdir=%{_unitdir} \ --enable-bzip2 \ @@ -167,6 +168,13 @@ %changelog +* Fri Aug 17 2012 Adrian Reber <adrian(a)lisas.de> - 1:0.16.8-5 +- fix "mpd fails to bind an addres: started too early" (#2447) + +* Tue Jun 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:0.16.8-4 +- Rebuilt for FFmpeg +- Switch BR to pkgconfig(libpulse) + * Fri May 11 2012 Jamie Nguyen <jamie(a)tomoyolinux.co.uk> - 0.16.8-3 - enable lastfm support - enable hardened build

12 years, 3 months

1
0
0 / 0

rpms/dvbcut/F-17 dvbcut-179-vs-ubuntu-12.04.diff, NONE, 1.1 dvbcut-svn179-ffmpeg-0.11.1.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 dvbcut.spec, 1.17, 1.18 sources, 1.6, 1.7 dvbcut-ffmpeg-0.8.2.patch, 1.1, NONE dvbcut-gcc47.patch, 1.1, NONE

by David Timms

Author: dtimms Update of /cvs/free/rpms/dvbcut/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2168 Modified Files: .cvsignore dvbcut.spec sources Added Files: dvbcut-179-vs-ubuntu-12.04.diff dvbcut-svn179-ffmpeg-0.11.1.patch Removed Files: dvbcut-ffmpeg-0.8.2.patch dvbcut-gcc47.patch Log Message: drop upstreamed gcc47 patch add ffmpeg-0.10.4 patch dvbcut-179-vs-ubuntu-12.04.diff from Olaf Dietsche drop ffmpeg-0.8.2 patch superseded by ffmpeg-0.10.4 patch add ffmpeg-0.11.1 patch modify kde service install from desktop-file-install to copy. dvbcut-179-vs-ubuntu-12.04.diff: lavfmuxer.cpp | 24 ++++++++++++++++-------- lavfmuxer.h | 2 +- mpgfile.cpp | 30 ++++++++++++++++++++---------- 3 files changed, 37 insertions(+), 19 deletions(-) --- NEW FILE dvbcut-179-vs-ubuntu-12.04.diff --- Index: src/lavfmuxer.h =================================================================== --- src/lavfmuxer.h (revision 179) +++ src/lavfmuxer.h (working copy) @@ -73,7 +73,7 @@ avp.dts=dts; avp.stream_index=st[str].stream_index; if (flags & MUXER_FLAG_KEY) - avp.flags |= PKT_FLAG_KEY; + avp.flags |= AV_PKT_FLAG_KEY; int rv=av_interleaved_write_frame(avfc,&avp); Index: src/mpgfile.cpp =================================================================== --- src/mpgfile.cpp (revision 179) +++ src/mpgfile.cpp (working copy) @@ -154,15 +154,19 @@ if (!firstsequence || idx[streampic].getsequencenumber()>=seqnr) { - const uint8_t *data=(const uint8_t*)sd->getdata(); + AVPacket avpkt; + av_init_packet(&avpkt); + avpkt.data = (uint8_t*)sd->getdata(); + avpkt.size = bytes; + // HACK for CorePNG to decode as normal PNG by default + avpkt.flags = AV_PKT_FLAG_KEY; int frameFinished=0; - int decodebytes=bytes; - while (decodebytes>0) + while (avpkt.size>0) { frameFinished=0; - int bytesDecoded=avcodec_decode_video(S->avcc, avf, &frameFinished, - (uint8_t*) data, decodebytes); + int bytesDecoded=avcodec_decode_video2(S->avcc, avf, &frameFinished, + &avpkt); if (bytesDecoded<0) { fprintf(stderr,"libavcodec error while decoding frame #%d\n",pic); @@ -170,8 +174,8 @@ return; } - data+=bytesDecoded; - decodebytes-=bytesDecoded; + avpkt.data+=bytesDecoded; + avpkt.size-=bytesDecoded; if (frameFinished) { @@ -184,7 +188,7 @@ if (pic>=stop) { frameFinished=0; - decodebytes=0; + avpkt.size=0; break; } } @@ -200,8 +204,14 @@ if (pic < stop) { + AVPacket avpkt; + av_init_packet(&avpkt); + avpkt.data = NULL; + avpkt.size = 0; + // HACK for CorePNG to decode as normal PNG by default + avpkt.flags = AV_PKT_FLAG_KEY; int frameFinished=0; - avcodec_decode_video(S->avcc, avf, &frameFinished, NULL, 0); + avcodec_decode_video2(S->avcc, avf, &frameFinished, &avpkt); if (frameFinished) { if (last_cpn!=avf->coded_picture_number) @@ -248,7 +258,7 @@ stream *S=&s[VIDEOSTREAM]; S->id=vid; S->allocavcc(); - S->avcc->codec_type=CODEC_TYPE_VIDEO; + S->avcc->codec_type=AVMEDIA_TYPE_VIDEO; S->avcc->codec_id=CODEC_ID_MPEG2VIDEO; S->dec=avcodec_find_decoder(CODEC_ID_MPEG2VIDEO); S->enc=avcodec_find_encoder(CODEC_ID_MPEG2VIDEO); Index: src/lavfmuxer.cpp =================================================================== --- src/lavfmuxer.cpp (revision 179) +++ src/lavfmuxer.cpp (working copy) @@ -34,12 +34,12 @@ lavfmuxer::lavfmuxer(const char *format, uint32_t audiostreammask, mpgfile &mpg, const char *filename) : muxer(), avfc(0), fileopened(false) { - fmt = guess_format(format, NULL, NULL); + fmt = av_guess_format(format, NULL, NULL); if (!fmt) { return; } - avfc=av_alloc_format_context(); + avfc=avformat_alloc_context(); if (!avfc) return; @@ -73,7 +73,7 @@ av_free(s->codec); s->codec = avcodec_alloc_context(); avcodec_get_context_defaults(s->codec); - s->codec->codec_type=CODEC_TYPE_AUDIO; + s->codec->codec_type=AVMEDIA_TYPE_AUDIO; s->codec->codec_id = (mpg.getstreamtype(astr)==streamtype::ac3audio) ? CODEC_ID_AC3 : CODEC_ID_MP2; s->codec->rc_buffer_size = 224*1024*8; @@ -92,13 +92,21 @@ int16_t samples[AVCODEC_MAX_AUDIO_FRAME_SIZE/sizeof(int16_t)]; int frame_size=sizeof(samples); //fprintf(stderr, "** decode audio size=%d\n", sd->inbytes()); -#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(0<<8)+0) - avcodec_decode_audio2 +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0) + AVPacket avpkt; + av_init_packet(&avpkt); + avpkt.data = (uint8_t*)sd->getdata(); + avpkt.size = sd->inbytes(); + // HACK for CorePNG to decode as normal PNG by default + avpkt.flags = AV_PKT_FLAG_KEY; + avcodec_decode_audio3(s->codec,samples,&frame_size, &avpkt); +#elif LIBAVCODEC_VERSION_INT >= ((52<<16)+(0<<8)+0) + avcodec_decode_audio2(s->codec,samples,&frame_size, + (uint8_t*) sd->getdata(),sd->inbytes()); #else - avcodec_decode_audio + avcodec_decode_audio(s->codec,samples,&frame_size, + (uint8_t*) sd->getdata(),sd->inbytes()); #endif - (s->codec,samples,&frame_size, - (uint8_t*) sd->getdata(),sd->inbytes()); avcodec_close(s->codec); } break; dvbcut-svn179-ffmpeg-0.11.1.patch: lavfmuxer.cpp | 34 ++++++++++++++++++++++++++++++---- mpgfile.cpp | 5 ++++- mpgfile.cpp~ |only 3 files changed, 34 insertions(+), 5 deletions(-) --- NEW FILE dvbcut-svn179-ffmpeg-0.11.1.patch --- diff -ur dvbcut.orig/src/lavfmuxer.cpp dvbcut/src/lavfmuxer.cpp --- dvbcut.orig/src/lavfmuxer.cpp 2012-08-31 23:28:42.000000000 +1000 +++ dvbcut/src/lavfmuxer.cpp 2012-09-01 12:12:04.472248687 +1000 @@ -43,9 +43,16 @@ if (!avfc) return; +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0) +// todo: what here ? +// maybe: AVFormatContext::audio_preload but no direct access. +// AVOptions +// iformat +#else avfc->preload= (int)(.5*AV_TIME_BASE); - avfc->max_delay= (int)(.7*AV_TIME_BASE); avfc->mux_rate=10080000; +#endif + avfc->max_delay= (int)(.7*AV_TIME_BASE); avfc->oformat=fmt; strncpy(avfc->filename, filename, sizeof(avfc->filename)); @@ -114,19 +121,36 @@ } } +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0) + // error: 'av_set_parameters' was not declared in this scope + if (!(fmt->flags & AVFMT_NOFILE)&&(avio_open(&avfc->pb, filename, AVIO_FLAG_WRITE) < 0)) { +#else if ((av_set_parameters(avfc, NULL) < 0) || (!(fmt->flags & AVFMT_NOFILE)&&(url_fopen(&avfc->pb, filename, URL_WRONLY) < 0))) { +#endif av_free(avfc); avfc=0; return; } +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0) +// todo: what here ? +// maybe: AVFormatContext::audio_preload but no direct access. +// AVOptions +// iformat +#else avfc->preload= (int)(.5*AV_TIME_BASE); - avfc->max_delay= (int)(.7*AV_TIME_BASE); avfc->mux_rate=10080000; +#endif + avfc->max_delay= (int)(.7*AV_TIME_BASE); - +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0) + av_dump_format(avfc, 0, filename, 1); + fileopened=true; + avformat_write_header(avfc, NULL); +#else dump_format(avfc, 0, filename, 1); fileopened=true; av_write_header(avfc); +#endif } @@ -136,7 +160,9 @@ if (fileopened) { av_write_trailer(avfc); if (!(fmt->flags & AVFMT_NOFILE)) -#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0) +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0) + avio_close(avfc->pb); +#elif LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0) url_fclose(avfc->pb); #else url_fclose(&avfc->pb); diff -ur dvbcut.orig/src/mpgfile.cpp dvbcut/src/mpgfile.cpp --- dvbcut.orig/src/mpgfile.cpp 2012-09-01 12:26:19.000000000 +1000 +++ dvbcut/src/mpgfile.cpp 2012-09-01 12:49:57.133541130 +1000 @@ -733,8 +733,11 @@ f->pts=idx[idx.indexnr(start+p)].getpts()-startpts; f->coded_picture_number=f->display_picture_number=p; f->key_frame=(p==0)?1:0; +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 35, 0) + f->pict_type=(p==0)?AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; +#else f->pict_type=(p==0)?FF_I_TYPE:FF_P_TYPE; - +#endif out = avcodec_encode_video(avcc, buf, m2v.getsize(), f); Only in dvbcut/src: mpgfile.cpp~ Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/dvbcut/F-17/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 5 Sep 2011 14:07:28 -0000 1.6 +++ .cvsignore 1 Sep 2012 13:42:28 -0000 1.7 @@ -1 +1 @@ -dvbcut-svn178.tar.bz2 +dvbcut-svn179.tar.bz2 Index: dvbcut.spec =================================================================== RCS file: /cvs/free/rpms/dvbcut/F-17/dvbcut.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- dvbcut.spec 23 May 2012 20:33:05 -0000 1.17 +++ dvbcut.spec 1 Sep 2012 13:42:29 -0000 1.18 @@ -1,4 +1,4 @@ -%define svnrev 178 +%define svnrev 179 %if 0%{?fedora} > 6 || 0%{?rhel} > 5 %define qt3 qt3 %else @@ -7,7 +7,7 @@ Name: dvbcut Version: 0.6.1 -Release: 5.svn%{svnrev}%{?dist} +Release: 7.svn%{svnrev}%{?dist} Summary: Clip and convert DVB transport streams to MPEG2 program streams Group: Applications/Multimedia @@ -28,8 +28,8 @@ Patch1: %{name}-svn176-fix-make-install.patch Patch2: %{name}-svn176-fix-help-install-path.patch Patch3: %{name}-svn176-desktop-additions.patch -Patch4: %{name}-ffmpeg-0.8.2.patch -Patch5: dvbcut-gcc47.patch +Patch6: %{name}-179-vs-ubuntu-12.04.diff +Patch7: %{name}-svn179-ffmpeg-0.11.1.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: autoconf @@ -64,8 +64,8 @@ %patch1 -b .fix-make-install %patch2 -b .fix-help-install %patch3 -b .desktop-improvements -%patch4 -b .ffmpeg -%patch5 -p1 -b .gcc47 +%patch6 -b .orig +%patch7 -p1 -b .orig # Fix QTDIR libs in configure sed -i 's,$QTDIR/$mr_libdirname,$QTDIR/lib,' configure.in @@ -96,11 +96,9 @@ desktop-file-install --vendor="" \ --dir %{buildroot}%{_datadir}/applications dvbcut.desktop -#in future: % {_kde4_servicesdir}, but for now mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/ -desktop-file-install \ - --dir=%{buildroot}%{_kde4_datadir}/kde4/services \ - %{SOURCE6} +cp %{SOURCE6} %{buildroot}%{_kde4_datadir}/kde4/services/ + %clean rm -rf %{buildroot} @@ -137,6 +135,16 @@ %changelog +* Wed Aug 29 2012 David Timms <iinet.net.au at dtimms> - 0.6.1-7.svn179 +- drop upstreamed gcc47 patch +- add ffmpeg-0.10.4 patch dvbcut-179-vs-ubuntu-12.04.diff from Olaf Dietsche +- drop ffmpeg-0.8.2 patch superseded by ffmpeg-0.10.4 patch +- add ffmpeg-0.11.1 patch +- modify kde service install from desktop-file-install to copy. + +* Tue Jun 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6.1-6.svn178 +- Rebuilt for FFmpeg + * Wed May 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6.1-5.svn178 - Fix FTBFS with gcc47 Index: sources =================================================================== RCS file: /cvs/free/rpms/dvbcut/F-17/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 5 Sep 2011 14:07:29 -0000 1.6 +++ sources 1 Sep 2012 13:42:29 -0000 1.7 @@ -1 +1 @@ -92baf7f9d86f35805519117fb8e04357 dvbcut-svn178.tar.bz2 +467975975bc7bf6abcb559449e776654 dvbcut-svn179.tar.bz2 --- dvbcut-ffmpeg-0.8.2.patch DELETED --- --- dvbcut-gcc47.patch DELETED ---

12 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits September 2012