rpms/VirtualBox-OSE/F-11 VirtualBox-OSE-3.0.0-netfreeze.patch, NONE, 1.1 VirtualBox-OSE-3.0.0-strings.patch, NONE, 1.1 VirtualBox-OSE-60-vboxadd.rules, NONE, 1.1 VirtualBox-OSE-vboxresize.desktop, NONE, 1.1 .cvsignore, 1.4, 1.5 VirtualBox-OSE.spec, 1.6, 1.7 sources, 1.4, 1.5 VirtualBox-OSE-2.2.2-strings.patch, 1.1, NONE
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12063
Modified Files:
.cvsignore VirtualBox-OSE.spec sources
Added Files:
VirtualBox-OSE-3.0.0-netfreeze.patch
VirtualBox-OSE-3.0.0-strings.patch
VirtualBox-OSE-60-vboxadd.rules
VirtualBox-OSE-vboxresize.desktop
Removed Files:
VirtualBox-OSE-2.2.2-strings.patch
Log Message:
Merge 3.0.0 from devel
VirtualBox-OSE-3.0.0-netfreeze.patch:
--- NEW FILE VirtualBox-OSE-3.0.0-netfreeze.patch ---
r21126 | vboxsync | 2009-07-01 16:11:27 +0200 (Wed, 01 Jul 2009) | 2 lines
PDMR3QueueFlushAll: The bit number, not the mask.
r21128 | vboxsync | 2009-07-01 16:46:19 +0200 (Wed, 01 Jul 2009) | 1 line
PDMQueue: Fixed the flushing loop when a consumer (NAT?) had had enough.
r21151 | vboxsync | 2009-07-02 13:47:24 +0200 (Thu, 02 Jul 2009) | 1 line
PDMQueue: Fixed leaking the last pending item when the consume returned false. Also, be more paranoid whe returning unconsumed items to the pending list.
r21153 | vboxsync | 2009-07-02 13:50:23 +0200 (Thu, 02 Jul 2009) | 1 line
PDMQueue: tyop.
diff -up VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMInternal.h.netfreeze VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMInternal.h
--- VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMInternal.h.netfreeze 2009-06-30 12:21:58.000000000 +0200
+++ VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMInternal.h 2009-07-10 14:57:54.000000000 +0200
@@ -723,6 +723,21 @@ typedef struct PDMQUEUE
} aFreeItems[1];
} PDMQUEUE;
+/** @name PDM::fQueueFlushing
+ * @{ */
+/** Indicating that an queue insert has been performed. */
+#define PDM_QUEUE_FLUSH_FLAG_ACTIVE RT_BIT_32(PDM_QUEUE_FLUSH_FLAG_ACTIVE_BIT)
+/** The bit number for PDM_QUEUE_FLUSH_FLAG_ACTIVE_BIT. */
+#define PDM_QUEUE_FLUSH_FLAG_ACTIVE_BIT 0
+/** Indicating there are pending items.
+ * This is make sure we don't miss inserts happening during flushing. The FF
+ * cannot be used for this since it has to be cleared immediately to prevent
+ * other EMTs from spinning. */
+#define PDM_QUEUE_FLUSH_FLAG_PENDING RT_BIT_32(PDM_QUEUE_FLUSH_FLAG_PENDING_BIT)
+/** The bit number for PDM_QUEUE_FLUSH_FLAG_PENDING. */
+#define PDM_QUEUE_FLUSH_FLAG_PENDING_BIT 1
+/** }@ */
+
/**
* Queue device helper task operation.
@@ -887,8 +902,9 @@ typedef struct PDM
/** Pointer to the queue which should be manually flushed - RC Ptr.
* Only touched by EMT. */
RCPTRTYPE(struct PDMQUEUE *) pQueueFlushRC;
- /** Set if we're currently checking queues to prevent other VCPUs from doing the same concurrently. */
- volatile uint32_t fQueueFlushing;
+ /** Bitmask controlling the queue flushing.
+ * See PDM_QUEUE_FLUSH_FLAG_ACTIVE and PDM_QUEUE_FLUSH_FLAG_PENDING. */
+ uint32_t volatile fQueueFlushing;
/** Head of the PDM Thread list. (singly linked) */
R3PTRTYPE(PPDMTHREAD) pThreads;
diff -up VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMQueue.cpp.netfreeze VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMQueue.cpp
--- VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMQueue.cpp.netfreeze 2009-07-10 14:57:54.117409044 +0200
+++ VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMQueue.cpp 2009-07-10 14:57:54.000000000 +0200
@@ -672,7 +672,7 @@ static bool pdmR3QueueFlush(PPDMQUEUE pQ
if ( !pItems
&& !pItemsRC
&& !pItemsR0)
- /* Somebody was racing us. */
+ /* Somebody may be racing us ... never mind. */
return true;
/*
@@ -721,10 +721,10 @@ static bool pdmR3QueueFlush(PPDMQUEUE pQ
case PDMQUEUETYPE_DEV:
while (pItems)
{
+ if (!pQueue->u.Dev.pfnCallback(pQueue->u.Dev.pDevIns, pItems))
+ break;
pCur = pItems;
pItems = pItems->pNextR3;
- if (!pQueue->u.Dev.pfnCallback(pQueue->u.Dev.pDevIns, pCur))
- break;
pdmR3QueueFree(pQueue, pCur);
}
break;
@@ -732,10 +732,10 @@ static bool pdmR3QueueFlush(PPDMQUEUE pQ
case PDMQUEUETYPE_DRV:
while (pItems)
{
+ if (!pQueue->u.Drv.pfnCallback(pQueue->u.Drv.pDrvIns, pItems))
+ break;
pCur = pItems;
pItems = pItems->pNextR3;
- if (!pQueue->u.Drv.pfnCallback(pQueue->u.Drv.pDrvIns, pCur))
- break;
pdmR3QueueFree(pQueue, pCur);
}
break;
@@ -743,10 +743,10 @@ static bool pdmR3QueueFlush(PPDMQUEUE pQ
case PDMQUEUETYPE_INTERNAL:
while (pItems)
{
+ if (!pQueue->u.Int.pfnCallback(pQueue->pVMR3, pItems))
+ break;
pCur = pItems;
pItems = pItems->pNextR3;
- if (!pQueue->u.Int.pfnCallback(pQueue->pVMR3, pCur))
- break;
pdmR3QueueFree(pQueue, pCur);
}
break;
@@ -754,10 +754,10 @@ static bool pdmR3QueueFlush(PPDMQUEUE pQ
case PDMQUEUETYPE_EXTERNAL:
while (pItems)
{
+ if (!pQueue->u.Ext.pfnCallback(pQueue->u.Ext.pvUser, pItems))
+ break;
pCur = pItems;
pItems = pItems->pNextR3;
- if (!pQueue->u.Ext.pfnCallback(pQueue->u.Ext.pvUser, pCur))
- break;
pdmR3QueueFree(pQueue, pCur);
}
break;
@@ -773,30 +773,34 @@ static bool pdmR3QueueFlush(PPDMQUEUE pQ
if (pItems)
{
/*
- * Shit, no!
- * 1. Insert pCur.
- * 2. Reverse the list.
- * 3. Insert the LIFO at the tail of the pending list.
+ * Reverse the list.
*/
- pCur->pNextR3 = pItems;
- pItems = pCur;
-
- //pCur = pItems;
+ pCur = pItems;
pItems = NULL;
while (pCur)
{
PPDMQUEUEITEMCORE pInsert = pCur;
- pCur = pCur->pNextR3;
+ pCur = pInsert->pNextR3;
pInsert->pNextR3 = pItems;
pItems = pInsert;
}
- if (!ASMAtomicCmpXchgPtr((void * volatile *)&pQueue->pPendingR3, pItems, NULL))
+ /*
+ * Insert the list at the tail of the pending list.
+ */
+ for (;;)
{
- pCur = pQueue->pPendingR3;
- while (pCur->pNextR3)
- pCur = pCur->pNextR3;
- pCur->pNextR3 = pItems;
+ if (ASMAtomicCmpXchgPtr((void * volatile *)&pQueue->pPendingR3, pItems, NULL))
+ break;
+ PPDMQUEUEITEMCORE pPending = (PPDMQUEUEITEMCORE)ASMAtomicXchgPtr((void * volatile *)&pQueue->pPendingR3, NULL);
+ if (pPending)
+ {
+ pCur = pPending;
+ while (pCur->pNextR3)
+ pCur = pCur->pNextR3;
+ pCur->pNextR3 = pItems;
+ pItems = pPending;
+ }
}
return false;
}
diff -up VirtualBox-3.0.0_OSE/src/VBox/VMM/VMMAll/PDMAllQueue.cpp.netfreeze VirtualBox-3.0.0_OSE/src/VBox/VMM/VMMAll/PDMAllQueue.cpp
--- VirtualBox-3.0.0_OSE/src/VBox/VMM/VMMAll/PDMAllQueue.cpp.netfreeze 2009-06-24 15:38:13.114408205 +0200
+++ VirtualBox-3.0.0_OSE/src/VBox/VMM/VMMAll/PDMAllQueue.cpp 2009-07-10 14:57:54.000000000 +0200
@@ -91,6 +91,7 @@ VMMDECL(void) PDMQueueInsert(PPDMQUEUE p
PVM pVM = pQueue->CTX_SUFF(pVM);
Log2(("PDMQueueInsert: VM_FF_PDM_QUEUES %d -> 1\n", VM_FF_ISSET(pVM, VM_FF_PDM_QUEUES)));
VM_FF_SET(pVM, VM_FF_PDM_QUEUES);
+ ASMAtomicBitSet(&pVM->pdm.s.fQueueFlushing, PDM_QUEUE_FLUSH_FLAG_PENDING_BIT);
#ifdef IN_RING3
REMR3NotifyQueuePending(pVM); /** @todo r=bird: we can remove REMR3NotifyQueuePending and let VMR3NotifyFF do the work. */
VMR3NotifyGlobalFFU(pVM->pUVM, VMNOTIFYFF_FLAGS_DONE_REM);
VirtualBox-OSE-3.0.0-strings.patch:
--- NEW FILE VirtualBox-OSE-3.0.0-strings.patch ---
Replace some strings which ones that (sometimes) make more sense.
Lubomir Rintel <lkundrak(a)v3.sk>
diff -urb VirtualBox-3.0.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-3.0.0_OSEb/src/VBox/Frontends/VirtualBox/src/main.cpp
--- VirtualBox-3.0.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-06-24 16:38:16.000000000 +0300
+++ VirtualBox-3.0.0_OSEb/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-07-03 14:14:27.528519750 +0300
@@ -72,13 +72,13 @@
);
QString g_QStrHintLinuxNoDriver = QApplication::tr(
- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
- "there is a permission problem with /dev/vboxdrv. Re-setup the kernel "
- "module by executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
- "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS "
- "package first. This package keeps track of Linux kernel changes and "
- "recompiles the vboxdrv kernel module if necessary."
+ "The VirtualBox Linux kernel driver (vboxdrv) is probably not "
+ "loaded.<br/><br/>"
+ "If you installed or VirtualBox OSE package recently you need to restart "
+ "the computer for the driver to load.<br/><br/>"
+ "Alternatively, you may attempt to load the driver by issuing the "
+ "following command with system administrator (root) privileges:<br/><br/>"
+ " <font color=blue>'/etc/sysconfig/modules/VirtualBox-OSE.modules'</font><br/><br/>"
);
QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
@@ -101,9 +101,9 @@
"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(
- "It may help to reinstall VirtualBox."
+ "Please report the problem to the RPM Fusion Bugzilla."
);
#if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX)
diff -urb VirtualBox-3.0.0_OSE/src/VBox/Installer/linux/VBox.sh VirtualBox-3.0.0_OSEb/src/VBox/Installer/linux/VBox.sh
--- VirtualBox-3.0.0_OSE/src/VBox/Installer/linux/VBox.sh 2009-03-27 21:13:57.000000000 +0200
+++ VirtualBox-3.0.0_OSEb/src/VBox/Installer/linux/VBox.sh 2009-07-03 14:12:02.490521356 +0300
@@ -36,19 +36,20 @@
cat << EOF
WARNING: The vboxdrv kernel module is not loaded. Either there is no module
available for the current kernel (`uname -r`) or it failed to
- load. Please recompile the kernel module and install it by
+ load. Reboot the computer, or insert the kernel module by executing
- sudo /etc/init.d/vboxdrv setup
+ '/etc/sysconfig/modules/VirtualBox-OSE.modules' (as root)
You will not be able to start VMs until this problem is fixed.
EOF
elif [ ! -c /dev/vboxdrv ]; then
cat << EOF
-WARNING: The character device /dev/vboxdrv does not exist. Try
+WARNING: The character device /dev/vboxdrv does not exist. Try running
- sudo /etc/init.d/vboxdrv restart
+ '/sbin/udevtrigger' (as root)
- and if that is not successful, try to re-install the package.
+ and if that is not successful, then you're in situation that
+ can not possibly happen and there's nothing you can do about it.
You will not be able to start VMs until this problem is fixed.
EOF
diff -urb VirtualBox-3.0.0_OSE/src/VBox/Installer/linux/VirtualBox.desktop VirtualBox-3.0.0_OSEb/src/VBox/Installer/linux/VirtualBox.desktop
--- VirtualBox-3.0.0_OSE/src/VBox/Installer/linux/VirtualBox.desktop 2009-06-12 15:34:41.000000000 +0300
+++ VirtualBox-3.0.0_OSEb/src/VBox/Installer/linux/VirtualBox.desktop 2009-07-03 14:12:02.492525812 +0300
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Version=1.0
-Name=Sun VirtualBox
+Name=VirtualBox OSE
GenericName=Virtual Machine
Type=Application
Exec=VirtualBox
diff -urb VirtualBox-3.0.0_OSE/src/VBox/VMM/VM.cpp VirtualBox-3.0.0_OSEb/src/VBox/VMM/VM.cpp
--- VirtualBox-3.0.0_OSE/src/VBox/VMM/VM.cpp 2009-06-24 16:38:14.000000000 +0300
+++ VirtualBox-3.0.0_OSEb/src/VBox/VMM/VM.cpp 2009-07-03 14:12:02.501771542 +0300
@@ -314,8 +314,8 @@
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv is not set up properly. "
- "Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "Reboot the computer, or insert the kernel module by executing "
+ "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root");
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
@@ -356,8 +356,8 @@
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv was not created for some "
- "reason. Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "reason. Insert the kernel module by executing "
+ "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
--- NEW FILE VirtualBox-OSE-60-vboxadd.rules ---
ACTION=="add", KERNEL=="vboxadd", SUBSYSTEM=="misc", OWNER="root", MODE="0600"
ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"
--- NEW FILE VirtualBox-OSE-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-OSE/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 29 Jun 2009 21:52:06 -0000 1.4
+++ .cvsignore 10 Jul 2009 13:53:59 -0000 1.5
@@ -1,2 +1,2 @@
-VirtualBox-2.2.4-OSE.tar.bz2
+VirtualBox-3.0.0-OSE.tar.bz2
UserManual.pdf
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-11/VirtualBox-OSE.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VirtualBox-OSE.spec 29 Jun 2009 04:01:12 -0000 1.6
+++ VirtualBox-OSE.spec 10 Jul 2009 13:53:59 -0000 1.7
@@ -9,8 +9,8 @@
%bcond_without hardening
Name: VirtualBox-OSE
-Version: 2.2.4
-Release: 2%{?dist}.1
+Version: 3.0.0
+Release: 3%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -19,16 +19,22 @@
Source0: http://dlc.sun.com/virtualbox/%{version}/VirtualBox-%{version}-OSE.tar.bz2
Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
Source4: VirtualBox-OSE-90-vboxdrv.rules
-Source5: VirtualBox-OSE.modules
-Source6: VirtualBox-OSE-guest.modules
+Source5: VirtualBox-OSE-60-vboxadd.rules
+Source6: VirtualBox-OSE.modules
+Source7: VirtualBox-OSE-guest.modules
+Source8: VirtualBox-OSE-vboxresize.desktop
Patch1: VirtualBox-OSE-2.2.0-noupdate.patch
-Patch2: VirtualBox-OSE-2.2.2-strings.patch
+Patch2: VirtualBox-OSE-3.0.0-strings.patch
+Patch3: VirtualBox-OSE-3.0.0-netfreeze.patch
Patch10: VirtualBox-OSE-2.2.0-32bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kBuild >= 0.1.5-1
-BuildRequires: SDL-devel xalan-c-devel hal-devel
+BuildRequires: SDL-devel xalan-c-devel
+BuildRequires: hal-devel
+BuildRequires: openssl-devel
+BuildRequires: libcurl-devel
BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libXcursor-devel libIDL-devel
BuildRequires: yasm
BuildRequires: pulseaudio-libs-devel
@@ -95,6 +101,7 @@
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
+%patch3 -p1 -b .netfreeze
%patch10 -p1 -b .32bit
# Remove prebuilt binary tools
@@ -156,8 +163,10 @@
obj/bin/components/*
# Lib
+install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
+ obj/bin/*.so
+
install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/*.so \
obj/bin/V*.gc \
obj/bin/V*.r0
@@ -169,13 +178,14 @@
obj/bin/VBoxNetAdpCtl \
obj/bin/VirtualBox
-
# Other binaries
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
obj/bin/VBoxManage \
obj/bin/VBoxSVC \
obj/bin/VBoxXPCOMIPCD \
- obj/bin/VBoxSysInfo.sh
+ obj/bin/VBoxSysInfo.sh \
+ obj/bin/vboxshell.py \
+ obj/bin/VBoxTestOGL
# Language files
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \
@@ -204,7 +214,7 @@
# Guest tools
install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
obj/bin/additions/mountvboxsf \
- obj/bin/additions/vboxadd-timesync \
+ obj/bin/additions/VBoxService \
obj/bin/additions/VBoxClient \
obj/bin/additions/VBoxControl
@@ -213,7 +223,12 @@
install -m 0755 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \
$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+
+install -m 0755 -D %{SOURCE8} \
+ $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
+
desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
# Guest libraries
install -m 0755 -t $RPM_BUILD_ROOT%{_libdir} \
@@ -223,12 +238,13 @@
install -d $RPM_BUILD_ROOT/%{_sysconfdir}/vbox
echo 'INSTALL_DIR="%{_libdir}/virtualbox"' > $RPM_BUILD_ROOT/%{_sysconfdir}/vbox/vbox.cfg
-# Install udev rule
+# Install udev rules
install -p -m 0644 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
+install -p -m 0644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-vboxadd.rules
# Install modules load script
-install -p -m 0755 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/%{name}.modules
-install -p -m 0755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
+install -p -m 0755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/%{name}.modules
+install -p -m 0755 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
# Module Source Code
mkdir -p %{name}-kmod-%{version}
@@ -273,6 +289,7 @@
$RPM_BUILD_ROOT%{_libdir}/*OGL*.so \
$RPM_BUILD_ROOT%{_datadir}/{pixmaps,applications}/* \
-maxdepth 0 -type f \
+ -not -name '*.py[co]' \
-not -name VBox -exec basename '{}' \; |sort)
set -o posix
@@ -301,7 +318,7 @@
%config %{_sysconfdir}/vbox/vbox.cfg
%config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}.modules
-%doc COPYING
+%doc COPYING UserManual.pdf
%files devel
@@ -313,14 +330,16 @@
%files guest
%defattr(-,root,root,-)
%{_bindir}/mountvboxsf
-%{_bindir}/vboxadd-timesync
%{_bindir}/VBoxClient
%{_bindir}/VBoxControl
+%{_bindir}/VBoxService
%{_libdir}/xorg/modules/drivers/*
%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+%{_datadir}/gdm/autostart/LoginWindow
%{_libdir}/VBoxOGL*.so
%{_datadir}/hal/fdi/information/20thirdparty/90-vboxguest.fdi
+%config %{_sysconfdir}/udev/rules.d/60-vboxadd.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
%doc COPYING
@@ -331,11 +350,23 @@
%changelog
-* Mon Jun 29 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.2.4-2.1
-- FFFUUU- I somehow managed to make tag in devel tree; bumping
+* Fri Jul 10 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.0-3
+- Fix freeze of guests on network load (upstream ticket/4343)
+
+* Wed Jul 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.0-2
+- Tidy up the filelist check
+- Libs need to be executable for the dep generator (#698)
+
+* Fri Jul 03 2009 Jonathan Dieter <jdieter(a)gmail.com> - 3.0.0-1
+- New upstream release
+
+* Thu Jul 02 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.2.4-3
+- Enable resize for the login window
+- Add the guest udev rules
+- Actually install documentation
* Mon Jun 29 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.2.4-2
-- They left for beer too early, dicks, so we fix up vbox now
+- They left for beer too early, dicks, so we fix up wbox now
- Make guest additions just work
- Merge xorg stuff with rest of guest additions
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 29 Jun 2009 21:52:06 -0000 1.4
+++ sources 10 Jul 2009 13:53:59 -0000 1.5
@@ -1,2 +1,2 @@
-b90176e3878ccfef2991322b2248dcb0 VirtualBox-2.2.4-OSE.tar.bz2
-1f8ec67c1dbc0bcdfbbfbe26171eb098 UserManual.pdf
+d1560d8b0a766236161eeb659e802b5a VirtualBox-3.0.0-OSE.tar.bz2
+e62fce82380b3368e2558a663715734c UserManual.pdf
--- VirtualBox-OSE-2.2.2-strings.patch DELETED ---
15 years, 4 months
rpms/VirtualBox-OSE/devel VirtualBox-OSE-3.0.0-netfreeze.patch, NONE, 1.1 VirtualBox-OSE.spec, 1.10, 1.11
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11015
Modified Files:
VirtualBox-OSE.spec
Added Files:
VirtualBox-OSE-3.0.0-netfreeze.patch
Log Message:
* Fri Jul 10 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.0-3
- Fix freeze of guests on network load (upstream ticket/4343)
VirtualBox-OSE-3.0.0-netfreeze.patch:
--- NEW FILE VirtualBox-OSE-3.0.0-netfreeze.patch ---
r21126 | vboxsync | 2009-07-01 16:11:27 +0200 (Wed, 01 Jul 2009) | 2 lines
PDMR3QueueFlushAll: The bit number, not the mask.
r21128 | vboxsync | 2009-07-01 16:46:19 +0200 (Wed, 01 Jul 2009) | 1 line
PDMQueue: Fixed the flushing loop when a consumer (NAT?) had had enough.
r21151 | vboxsync | 2009-07-02 13:47:24 +0200 (Thu, 02 Jul 2009) | 1 line
PDMQueue: Fixed leaking the last pending item when the consume returned false. Also, be more paranoid whe returning unconsumed items to the pending list.
r21153 | vboxsync | 2009-07-02 13:50:23 +0200 (Thu, 02 Jul 2009) | 1 line
PDMQueue: tyop.
diff -up VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMInternal.h.netfreeze VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMInternal.h
--- VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMInternal.h.netfreeze 2009-06-30 12:21:58.000000000 +0200
+++ VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMInternal.h 2009-07-10 14:57:54.000000000 +0200
@@ -723,6 +723,21 @@ typedef struct PDMQUEUE
} aFreeItems[1];
} PDMQUEUE;
+/** @name PDM::fQueueFlushing
+ * @{ */
+/** Indicating that an queue insert has been performed. */
+#define PDM_QUEUE_FLUSH_FLAG_ACTIVE RT_BIT_32(PDM_QUEUE_FLUSH_FLAG_ACTIVE_BIT)
+/** The bit number for PDM_QUEUE_FLUSH_FLAG_ACTIVE_BIT. */
+#define PDM_QUEUE_FLUSH_FLAG_ACTIVE_BIT 0
+/** Indicating there are pending items.
+ * This is make sure we don't miss inserts happening during flushing. The FF
+ * cannot be used for this since it has to be cleared immediately to prevent
+ * other EMTs from spinning. */
+#define PDM_QUEUE_FLUSH_FLAG_PENDING RT_BIT_32(PDM_QUEUE_FLUSH_FLAG_PENDING_BIT)
+/** The bit number for PDM_QUEUE_FLUSH_FLAG_PENDING. */
+#define PDM_QUEUE_FLUSH_FLAG_PENDING_BIT 1
+/** }@ */
+
/**
* Queue device helper task operation.
@@ -887,8 +902,9 @@ typedef struct PDM
/** Pointer to the queue which should be manually flushed - RC Ptr.
* Only touched by EMT. */
RCPTRTYPE(struct PDMQUEUE *) pQueueFlushRC;
- /** Set if we're currently checking queues to prevent other VCPUs from doing the same concurrently. */
- volatile uint32_t fQueueFlushing;
+ /** Bitmask controlling the queue flushing.
+ * See PDM_QUEUE_FLUSH_FLAG_ACTIVE and PDM_QUEUE_FLUSH_FLAG_PENDING. */
+ uint32_t volatile fQueueFlushing;
/** Head of the PDM Thread list. (singly linked) */
R3PTRTYPE(PPDMTHREAD) pThreads;
diff -up VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMQueue.cpp.netfreeze VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMQueue.cpp
--- VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMQueue.cpp.netfreeze 2009-07-10 14:57:54.117409044 +0200
+++ VirtualBox-3.0.0_OSE/src/VBox/VMM/PDMQueue.cpp 2009-07-10 14:57:54.000000000 +0200
@@ -672,7 +672,7 @@ static bool pdmR3QueueFlush(PPDMQUEUE pQ
if ( !pItems
&& !pItemsRC
&& !pItemsR0)
- /* Somebody was racing us. */
+ /* Somebody may be racing us ... never mind. */
return true;
/*
@@ -721,10 +721,10 @@ static bool pdmR3QueueFlush(PPDMQUEUE pQ
case PDMQUEUETYPE_DEV:
while (pItems)
{
+ if (!pQueue->u.Dev.pfnCallback(pQueue->u.Dev.pDevIns, pItems))
+ break;
pCur = pItems;
pItems = pItems->pNextR3;
- if (!pQueue->u.Dev.pfnCallback(pQueue->u.Dev.pDevIns, pCur))
- break;
pdmR3QueueFree(pQueue, pCur);
}
break;
@@ -732,10 +732,10 @@ static bool pdmR3QueueFlush(PPDMQUEUE pQ
case PDMQUEUETYPE_DRV:
while (pItems)
{
+ if (!pQueue->u.Drv.pfnCallback(pQueue->u.Drv.pDrvIns, pItems))
+ break;
pCur = pItems;
pItems = pItems->pNextR3;
- if (!pQueue->u.Drv.pfnCallback(pQueue->u.Drv.pDrvIns, pCur))
- break;
pdmR3QueueFree(pQueue, pCur);
}
break;
@@ -743,10 +743,10 @@ static bool pdmR3QueueFlush(PPDMQUEUE pQ
case PDMQUEUETYPE_INTERNAL:
while (pItems)
{
+ if (!pQueue->u.Int.pfnCallback(pQueue->pVMR3, pItems))
+ break;
pCur = pItems;
pItems = pItems->pNextR3;
- if (!pQueue->u.Int.pfnCallback(pQueue->pVMR3, pCur))
- break;
pdmR3QueueFree(pQueue, pCur);
}
break;
@@ -754,10 +754,10 @@ static bool pdmR3QueueFlush(PPDMQUEUE pQ
case PDMQUEUETYPE_EXTERNAL:
while (pItems)
{
+ if (!pQueue->u.Ext.pfnCallback(pQueue->u.Ext.pvUser, pItems))
+ break;
pCur = pItems;
pItems = pItems->pNextR3;
- if (!pQueue->u.Ext.pfnCallback(pQueue->u.Ext.pvUser, pCur))
- break;
pdmR3QueueFree(pQueue, pCur);
}
break;
@@ -773,30 +773,34 @@ static bool pdmR3QueueFlush(PPDMQUEUE pQ
if (pItems)
{
/*
- * Shit, no!
- * 1. Insert pCur.
- * 2. Reverse the list.
- * 3. Insert the LIFO at the tail of the pending list.
+ * Reverse the list.
*/
- pCur->pNextR3 = pItems;
- pItems = pCur;
-
- //pCur = pItems;
+ pCur = pItems;
pItems = NULL;
while (pCur)
{
PPDMQUEUEITEMCORE pInsert = pCur;
- pCur = pCur->pNextR3;
+ pCur = pInsert->pNextR3;
pInsert->pNextR3 = pItems;
pItems = pInsert;
}
- if (!ASMAtomicCmpXchgPtr((void * volatile *)&pQueue->pPendingR3, pItems, NULL))
+ /*
+ * Insert the list at the tail of the pending list.
+ */
+ for (;;)
{
- pCur = pQueue->pPendingR3;
- while (pCur->pNextR3)
- pCur = pCur->pNextR3;
- pCur->pNextR3 = pItems;
+ if (ASMAtomicCmpXchgPtr((void * volatile *)&pQueue->pPendingR3, pItems, NULL))
+ break;
+ PPDMQUEUEITEMCORE pPending = (PPDMQUEUEITEMCORE)ASMAtomicXchgPtr((void * volatile *)&pQueue->pPendingR3, NULL);
+ if (pPending)
+ {
+ pCur = pPending;
+ while (pCur->pNextR3)
+ pCur = pCur->pNextR3;
+ pCur->pNextR3 = pItems;
+ pItems = pPending;
+ }
}
return false;
}
diff -up VirtualBox-3.0.0_OSE/src/VBox/VMM/VMMAll/PDMAllQueue.cpp.netfreeze VirtualBox-3.0.0_OSE/src/VBox/VMM/VMMAll/PDMAllQueue.cpp
--- VirtualBox-3.0.0_OSE/src/VBox/VMM/VMMAll/PDMAllQueue.cpp.netfreeze 2009-06-24 15:38:13.114408205 +0200
+++ VirtualBox-3.0.0_OSE/src/VBox/VMM/VMMAll/PDMAllQueue.cpp 2009-07-10 14:57:54.000000000 +0200
@@ -91,6 +91,7 @@ VMMDECL(void) PDMQueueInsert(PPDMQUEUE p
PVM pVM = pQueue->CTX_SUFF(pVM);
Log2(("PDMQueueInsert: VM_FF_PDM_QUEUES %d -> 1\n", VM_FF_ISSET(pVM, VM_FF_PDM_QUEUES)));
VM_FF_SET(pVM, VM_FF_PDM_QUEUES);
+ ASMAtomicBitSet(&pVM->pdm.s.fQueueFlushing, PDM_QUEUE_FLUSH_FLAG_PENDING_BIT);
#ifdef IN_RING3
REMR3NotifyQueuePending(pVM); /** @todo r=bird: we can remove REMR3NotifyQueuePending and let VMR3NotifyFF do the work. */
VMR3NotifyGlobalFFU(pVM->pUVM, VMNOTIFYFF_FLAGS_DONE_REM);
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- VirtualBox-OSE.spec 9 Jul 2009 08:30:20 -0000 1.10
+++ VirtualBox-OSE.spec 10 Jul 2009 13:38:16 -0000 1.11
@@ -10,7 +10,7 @@
Name: VirtualBox-OSE
Version: 3.0.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -25,6 +25,7 @@
Source8: VirtualBox-OSE-vboxresize.desktop
Patch1: VirtualBox-OSE-2.2.0-noupdate.patch
Patch2: VirtualBox-OSE-3.0.0-strings.patch
+Patch3: VirtualBox-OSE-3.0.0-netfreeze.patch
Patch10: VirtualBox-OSE-2.2.0-32bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -100,6 +101,7 @@
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
+%patch3 -p1 -b .netfreeze
%patch10 -p1 -b .32bit
# Remove prebuilt binary tools
@@ -348,6 +350,9 @@
%changelog
+* Fri Jul 10 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.0-3
+- Fix freeze of guests on network load (upstream ticket/4343)
+
* Wed Jul 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.0-2
- Tidy up the filelist check
- Libs need to be executable for the dep generator (#698)
15 years, 4 months
rpms/sdlmame/F-10 .cvsignore, 1.48, 1.49 sdlmame.spec, 1.57, 1.58 sources, 1.49, 1.50
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27913
Modified Files:
.cvsignore sdlmame.spec sources
Log Message:
* Fri Jul 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-0.4.0132u4
- Updated to 0.132u4
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore 2 Jul 2009 16:13:23 -0000 1.48
+++ .cvsignore 10 Jul 2009 08:44:26 -0000 1.49
@@ -1,2 +1,2 @@
ui.bdc
-sdlmame0132u3.zip
+sdlmame0132u4.zip
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/sdlmame.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sdlmame.spec 2 Jul 2009 16:13:23 -0000 1.57
+++ sdlmame.spec 10 Jul 2009 08:44:26 -0000 1.58
@@ -1,4 +1,4 @@
-%define beta 0132u3
+%define beta 0132u4
%if "0%{?beta}" != "0"
%define _version %{?beta}
@@ -18,7 +18,7 @@
Name: sdlmame
Version: 0133
-Release: 0.3.%{?beta}%{?dist}
+Release: 0.4.%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -200,6 +200,9 @@
%changelog
+* Fri Jul 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-0.4.0132u4
+- Updated to 0.132u4
+
* Thu Jul 02 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-0.3.0132u3
- Updated to 0.132u3
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources 2 Jul 2009 16:13:23 -0000 1.49
+++ sources 10 Jul 2009 08:44:26 -0000 1.50
@@ -1,2 +1,2 @@
b64914c2a5589f6d5b00361464152acd ui.bdc
-89f3741d3e683c9694c42cb8f3b04d93 sdlmame0132u3.zip
+85a2546c6470d2ce75cb162d387b22c5 sdlmame0132u4.zip
15 years, 4 months
rpms/sdlmame/F-11 .cvsignore, 1.46, 1.47 sdlmame.spec, 1.55, 1.56 sources, 1.48, 1.49
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27811
Modified Files:
.cvsignore sdlmame.spec sources
Log Message:
* Fri Jul 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-0.4.0132u4
- Updated to 0.132u4
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-11/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore 2 Jul 2009 16:13:11 -0000 1.46
+++ .cvsignore 10 Jul 2009 08:44:14 -0000 1.47
@@ -1,2 +1,2 @@
ui.bdc
-sdlmame0132u3.zip
+sdlmame0132u4.zip
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-11/sdlmame.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sdlmame.spec 2 Jul 2009 16:13:11 -0000 1.55
+++ sdlmame.spec 10 Jul 2009 08:44:14 -0000 1.56
@@ -1,4 +1,4 @@
-%define beta 0132u3
+%define beta 0132u4
%if "0%{?beta}" != "0"
%define _version %{?beta}
@@ -18,7 +18,7 @@
Name: sdlmame
Version: 0133
-Release: 0.3.%{?beta}%{?dist}
+Release: 0.4.%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -200,6 +200,9 @@
%changelog
+* Fri Jul 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-0.4.0132u4
+- Updated to 0.132u4
+
* Thu Jul 02 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-0.3.0132u3
- Updated to 0.132u3
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-11/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources 2 Jul 2009 23:04:37 -0000 1.48
+++ sources 10 Jul 2009 08:44:14 -0000 1.49
@@ -1,2 +1,2 @@
b64914c2a5589f6d5b00361464152acd ui.bdc
-e8aca47128d06a7c7f8afd906f60cd6e sdlmame0132u3.zip
+85a2546c6470d2ce75cb162d387b22c5 sdlmame0132u4.zip
15 years, 4 months
rpms/sdlmame/devel .cvsignore, 1.48, 1.49 sdlmame.spec, 1.57, 1.58 sources, 1.49, 1.50
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27703
Modified Files:
.cvsignore sdlmame.spec sources
Log Message:
* Fri Jul 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-0.4.0132u4
- Updated to 0.132u4
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore 2 Jul 2009 16:13:01 -0000 1.48
+++ .cvsignore 10 Jul 2009 08:44:04 -0000 1.49
@@ -1,2 +1,2 @@
ui.bdc
-sdlmame0132u3.zip
+sdlmame0132u4.zip
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/devel/sdlmame.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sdlmame.spec 2 Jul 2009 16:13:01 -0000 1.57
+++ sdlmame.spec 10 Jul 2009 08:44:04 -0000 1.58
@@ -1,4 +1,4 @@
-%define beta 0132u3
+%define beta 0132u4
%if "0%{?beta}" != "0"
%define _version %{?beta}
@@ -18,7 +18,7 @@
Name: sdlmame
Version: 0133
-Release: 0.3.%{?beta}%{?dist}
+Release: 0.4.%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -200,6 +200,9 @@
%changelog
+* Fri Jul 10 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-0.4.0132u4
+- Updated to 0.132u4
+
* Thu Jul 02 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0133-0.3.0132u3
- Updated to 0.132u3
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources 2 Jul 2009 16:13:01 -0000 1.49
+++ sources 10 Jul 2009 08:44:04 -0000 1.50
@@ -1,2 +1,2 @@
b64914c2a5589f6d5b00361464152acd ui.bdc
-89f3741d3e683c9694c42cb8f3b04d93 sdlmame0132u3.zip
+85a2546c6470d2ce75cb162d387b22c5 sdlmame0132u4.zip
15 years, 4 months
rpms/lxdream/F-10 lxdream.spec,1.10,1.11 lxdream.desktop,1.1,NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/lxdream/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25951
Modified Files:
lxdream.spec
Removed Files:
lxdream.desktop
Log Message:
* Thu Jul 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.1-1
- Updated to 0.9.1
- Dropped the sanerconfig patch
- Conditionalised the ExclusiveArch line
- Dropped the icon conversion, upstream now ships a png one
- Dropped hicolor-icon-theme from Requires
- Dropped the desktop file, upstream now ships it as well
- Added SDL-devel and lirc-devel to BuildRequires
Index: lxdream.spec
===================================================================
RCS file: /cvs/free/rpms/lxdream/F-10/lxdream.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lxdream.spec 9 Jul 2009 20:48:48 -0000 1.10
+++ lxdream.spec 10 Jul 2009 08:11:32 -0000 1.11
@@ -8,16 +8,15 @@
# Actual source URL is: http://www.lxdream.org/count.php?file=%{name}-%{version}.tar.gz
Source0: %{name}-%{version}.tar.gz
Source1: README.fedora
-Source2: %{name}.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: esound-devel
BuildRequires: gettext
BuildRequires: gtk2-devel
-BuildRequires: ImageMagick
BuildRequires: libGL-devel
+BuildRequires: lirc-devel
BuildRequires: pulseaudio-libs-devel
-Requires: hicolor-icon-theme
+BuildRequires: SDL-devel
# there should be a {ix86} instead of i386 in the ExclusiveArch line but
# that would make plague build the package for athlon, i386, i586 and i686 :-/
%if 0%{?fedora} >= 11
@@ -35,57 +34,40 @@
%prep
%setup -q
+#Fix the desktop file
+sed -i "s/Categories=Game;Emulator/Categories=Game;Emulator;/" lxdream.desktop
+
%build
%configure
make %{?_smp_mflags}
-# Create icon
-convert -scale 128 pixmaps/dcemu.gif %{name}.png
-
-
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
-install -pm0644 %{name}.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
install -pm0644 %{SOURCE1} README.fedora
+#Validate the desktop file
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/lxdream.desktop
+
#Find locales
%find_lang %{name}
-desktop-file-install --vendor "" \
- --dir %{buildroot}%{_datadir}/applications \
- %{SOURCE2}
-
%clean
rm -rf %{buildroot}
-%post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-
%files -f %{name}.lang
%defattr(-,root,root,-)
-%{_bindir}/%{name}
-%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-%{_datadir}/applications/%{name}.desktop
-%{_mandir}/man1/%{name}.1*
+%{_bindir}/lxdream
+%{_libdir}/lxdream
+%{_datadir}/applications/lxdream.desktop
+%{_mandir}/man1/lxdream.1*
%{_datadir}/pixmaps/lxdream
-%config(noreplace) %{_sysconfdir}/%{name}rc
+%{_datadir}/pixmaps/lxdream.png
+%config(noreplace) %{_sysconfdir}/lxdreamrc
%doc COPYING ChangeLog README.fedora
@@ -94,6 +76,10 @@
- Updated to 0.9.1
- Dropped the sanerconfig patch
- Conditionalised the ExclusiveArch line
+- Dropped the icon conversion, upstream now ships a png one
+- Dropped hicolor-icon-theme from Requires
+- Dropped the desktop file, upstream now ships it as well
+- Added SDL-devel and lirc-devel to BuildRequires
* Sun Apr 12 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.9-3
- s/i386/i586/ in ExclusiveArch for F11
--- lxdream.desktop DELETED ---
15 years, 4 months
rpms/lxdream/F-11 lxdream.spec,1.12,1.13 lxdream.desktop,1.1,NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/lxdream/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25880
Modified Files:
lxdream.spec
Removed Files:
lxdream.desktop
Log Message:
* Thu Jul 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.1-1
- Updated to 0.9.1
- Dropped the sanerconfig patch
- Conditionalised the ExclusiveArch line
- Dropped the icon conversion, upstream now ships a png one
- Dropped hicolor-icon-theme from Requires
- Dropped the desktop file, upstream now ships it as well
- Added SDL-devel and lirc-devel to BuildRequires
Index: lxdream.spec
===================================================================
RCS file: /cvs/free/rpms/lxdream/F-11/lxdream.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- lxdream.spec 9 Jul 2009 20:50:39 -0000 1.12
+++ lxdream.spec 10 Jul 2009 08:11:27 -0000 1.13
@@ -8,16 +8,15 @@
# Actual source URL is: http://www.lxdream.org/count.php?file=%{name}-%{version}.tar.gz
Source0: %{name}-%{version}.tar.gz
Source1: README.fedora
-Source2: %{name}.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: esound-devel
BuildRequires: gettext
BuildRequires: gtk2-devel
-BuildRequires: ImageMagick
BuildRequires: libGL-devel
+BuildRequires: lirc-devel
BuildRequires: pulseaudio-libs-devel
-Requires: hicolor-icon-theme
+BuildRequires: SDL-devel
# there should be a {ix86} instead of i386 in the ExclusiveArch line but
# that would make plague build the package for athlon, i386, i586 and i686 :-/
%if 0%{?fedora} >= 11
@@ -35,57 +34,40 @@
%prep
%setup -q
+#Fix the desktop file
+sed -i "s/Categories=Game;Emulator/Categories=Game;Emulator;/" lxdream.desktop
+
%build
%configure
make %{?_smp_mflags}
-# Create icon
-convert -scale 128 pixmaps/dcemu.gif %{name}.png
-
-
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
-install -pm0644 %{name}.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
install -pm0644 %{SOURCE1} README.fedora
+#Validate the desktop file
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/lxdream.desktop
+
#Find locales
%find_lang %{name}
-desktop-file-install --vendor "" \
- --dir %{buildroot}%{_datadir}/applications \
- %{SOURCE2}
-
%clean
rm -rf %{buildroot}
-%post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-
%files -f %{name}.lang
%defattr(-,root,root,-)
-%{_bindir}/%{name}
-%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-%{_datadir}/applications/%{name}.desktop
-%{_mandir}/man1/%{name}.1*
+%{_bindir}/lxdream
+%{_libdir}/lxdream
+%{_datadir}/applications/lxdream.desktop
+%{_mandir}/man1/lxdream.1*
%{_datadir}/pixmaps/lxdream
-%config(noreplace) %{_sysconfdir}/%{name}rc
+%{_datadir}/pixmaps/lxdream.png
+%config(noreplace) %{_sysconfdir}/lxdreamrc
%doc COPYING ChangeLog README.fedora
@@ -94,6 +76,10 @@
- Updated to 0.9.1
- Dropped the sanerconfig patch
- Conditionalised the ExclusiveArch line
+- Dropped the icon conversion, upstream now ships a png one
+- Dropped hicolor-icon-theme from Requires
+- Dropped the desktop file, upstream now ships it as well
+- Added SDL-devel and lirc-devel to BuildRequires
* Sun Apr 12 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.9-3
- s/i386/i586/ in ExclusiveArch for F11
--- lxdream.desktop DELETED ---
15 years, 4 months
rpms/lxdream/devel lxdream.spec,1.12,1.13 lxdream.desktop,1.1,NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/lxdream/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25803
Modified Files:
lxdream.spec
Removed Files:
lxdream.desktop
Log Message:
* Thu Jul 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.9.1-1
- Updated to 0.9.1
- Dropped the sanerconfig patch
- Conditionalised the ExclusiveArch line
- Dropped the icon conversion, upstream now ships a png one
- Dropped hicolor-icon-theme from Requires
- Dropped the desktop file, upstream now ships it as well
- Added SDL-devel and lirc-devel to BuildRequires
Index: lxdream.spec
===================================================================
RCS file: /cvs/free/rpms/lxdream/devel/lxdream.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- lxdream.spec 9 Jul 2009 20:48:10 -0000 1.12
+++ lxdream.spec 10 Jul 2009 08:11:21 -0000 1.13
@@ -8,16 +8,15 @@
# Actual source URL is: http://www.lxdream.org/count.php?file=%{name}-%{version}.tar.gz
Source0: %{name}-%{version}.tar.gz
Source1: README.fedora
-Source2: %{name}.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: esound-devel
BuildRequires: gettext
BuildRequires: gtk2-devel
-BuildRequires: ImageMagick
BuildRequires: libGL-devel
+BuildRequires: lirc-devel
BuildRequires: pulseaudio-libs-devel
-Requires: hicolor-icon-theme
+BuildRequires: SDL-devel
# there should be a {ix86} instead of i386 in the ExclusiveArch line but
# that would make plague build the package for athlon, i386, i586 and i686 :-/
%if 0%{?fedora} >= 11
@@ -35,57 +34,40 @@
%prep
%setup -q
+#Fix the desktop file
+sed -i "s/Categories=Game;Emulator/Categories=Game;Emulator;/" lxdream.desktop
+
%build
%configure
make %{?_smp_mflags}
-# Create icon
-convert -scale 128 pixmaps/dcemu.gif %{name}.png
-
-
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
-install -pm0644 %{name}.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
install -pm0644 %{SOURCE1} README.fedora
+#Validate the desktop file
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/lxdream.desktop
+
#Find locales
%find_lang %{name}
-desktop-file-install --vendor "" \
- --dir %{buildroot}%{_datadir}/applications \
- %{SOURCE2}
-
%clean
rm -rf %{buildroot}
-%post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-
%files -f %{name}.lang
%defattr(-,root,root,-)
-%{_bindir}/%{name}
-%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-%{_datadir}/applications/%{name}.desktop
-%{_mandir}/man1/%{name}.1*
+%{_bindir}/lxdream
+%{_libdir}/lxdream
+%{_datadir}/applications/lxdream.desktop
+%{_mandir}/man1/lxdream.1*
%{_datadir}/pixmaps/lxdream
-%config(noreplace) %{_sysconfdir}/%{name}rc
+%{_datadir}/pixmaps/lxdream.png
+%config(noreplace) %{_sysconfdir}/lxdreamrc
%doc COPYING ChangeLog README.fedora
@@ -94,6 +76,10 @@
- Updated to 0.9.1
- Dropped the sanerconfig patch
- Conditionalised the ExclusiveArch line
+- Dropped the icon conversion, upstream now ships a png one
+- Dropped hicolor-icon-theme from Requires
+- Dropped the desktop file, upstream now ships it as well
+- Added SDL-devel and lirc-devel to BuildRequires
* Sun Apr 12 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.9-3
- s/i386/i586/ in ExclusiveArch for F11
--- lxdream.desktop DELETED ---
15 years, 4 months
rpms/mednafen/F-10 .cvsignore, 1.5, 1.6 mednafen.spec, 1.5, 1.6 sources, 1.5, 1.6
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mednafen/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7813
Modified Files:
.cvsignore mednafen.spec sources
Log Message:
* Thu Jul 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.12-1.0.8.C
- Updated to 0.8.C
- Dropped the upstreamed gcc44 patch
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mednafen/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 11 Mar 2009 17:12:49 -0000 1.5
+++ .cvsignore 10 Jul 2009 02:21:27 -0000 1.6
@@ -1 +1 @@
-mednafen-0.8.B.tar.bz2
+mednafen-0.8.C.tar.bz2
Index: mednafen.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mednafen/F-10/mednafen.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mednafen.spec 11 Mar 2009 17:12:49 -0000 1.5
+++ mednafen.spec 10 Jul 2009 02:21:27 -0000 1.6
@@ -1,7 +1,7 @@
-%define _version 0.8.B
+%define _version 0.8.C
Name: mednafen
-Version: 0.8.11
+Version: 0.8.12
Release: 1.%{_version}%{?dist}
Summary: A multi-system emulator utilizing OpenGL and SDL
Group: Applications/Emulators
@@ -18,6 +18,10 @@
BuildRequires: zlib-devel
BuildRequires: jack-audio-connection-kit-devel
+%if 0%{?fedora} >= 11
+ExcludeArch: ppc64
+%endif
+
%description
A portable command-line driven, multi-system emulator which uses OpenGL and
SDL. It emulates the following:
@@ -68,8 +72,16 @@
%changelog
+* Thu Jul 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.12-1.0.8.C
+- Updated to 0.8.C
+- Dropped the upstreamed gcc44 patch
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8.11-2.0.8.B
+- rebuild for new F11 features
+
* Sun Mar 08 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.11-1.0.8.B
- Updated to 0.8.B
+- ExcludeArch: ppc64 on Fedora 11+
* Thu Nov 6 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.10-2.0.8.A
- Rebuilt. Something has mangled the x86_64 rpm
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mednafen/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 11 Mar 2009 17:12:49 -0000 1.5
+++ sources 10 Jul 2009 02:21:27 -0000 1.6
@@ -1 +1 @@
-d1aab33cbb5d4e585724c19177f0f02f mednafen-0.8.B.tar.bz2
+e8f4b6ba7ed2eca399b02578e1803831 mednafen-0.8.C.tar.bz2
15 years, 4 months
rpms/mednafen/F-11 .cvsignore, 1.5, 1.6 mednafen.spec, 1.7, 1.8 sources, 1.5, 1.6 mednafen-0.8.B-gcc44.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mednafen/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7705
Modified Files:
.cvsignore mednafen.spec sources
Removed Files:
mednafen-0.8.B-gcc44.patch
Log Message:
* Thu Jul 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.12-1.0.8.C
- Updated to 0.8.C
- Dropped the upstreamed gcc44 patch
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mednafen/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 11 Mar 2009 17:12:37 -0000 1.5
+++ .cvsignore 10 Jul 2009 02:21:18 -0000 1.6
@@ -1 +1 @@
-mednafen-0.8.B.tar.bz2
+mednafen-0.8.C.tar.bz2
Index: mednafen.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mednafen/F-11/mednafen.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mednafen.spec 29 Mar 2009 15:00:56 -0000 1.7
+++ mednafen.spec 10 Jul 2009 02:21:18 -0000 1.8
@@ -1,14 +1,13 @@
-%define _version 0.8.B
+%define _version 0.8.C
Name: mednafen
-Version: 0.8.11
-Release: 2.%{_version}%{?dist}
+Version: 0.8.12
+Release: 1.%{_version}%{?dist}
Summary: A multi-system emulator utilizing OpenGL and SDL
Group: Applications/Emulators
License: GPLv2+
URL: http://mednafen.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{_version}.tar.bz2
-Patch0: mednafen-0.8.B-gcc44.patch
BuildRoot: %{_tmppath}/%{name}-%{_version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
BuildRequires: pkgconfig >= 0.9.0
@@ -46,7 +45,6 @@
%prep
%setup -q -n %{name}
-%patch0 -p0 -b .gcc44
# Permission cleanups for debuginfo
chmod -x src/wswan/dis/*
@@ -74,6 +72,10 @@
%changelog
+* Thu Jul 09 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.8.12-1.0.8.C
+- Updated to 0.8.C
+- Dropped the upstreamed gcc44 patch
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8.11-2.0.8.B
- rebuild for new F11 features
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mednafen/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 11 Mar 2009 17:12:37 -0000 1.5
+++ sources 10 Jul 2009 02:21:18 -0000 1.6
@@ -1 +1 @@
-d1aab33cbb5d4e585724c19177f0f02f mednafen-0.8.B.tar.bz2
+e8f4b6ba7ed2eca399b02578e1803831 mednafen-0.8.C.tar.bz2
--- mednafen-0.8.B-gcc44.patch DELETED ---
15 years, 4 months