rpms/VirtualBox-kmod/F-18 VirtualBox-kmod.spec,1.8,1.9
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25759
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-2
- Build with newest VirtualBox-kmodsrc (4.2.0-3).
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-18/VirtualBox-kmod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- VirtualBox-kmod.spec 16 Sep 2012 00:10:17 -0000 1.8
+++ VirtualBox-kmod.spec 23 Sep 2012 15:26:18 -0000 1.9
@@ -12,7 +12,7 @@
#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-%global vboxrel 1
+%global vboxrel 3
%global vboxreltag %{?vboxrel:-%{vboxrel}}
# Allow only root to access vboxdrv regardless of the file mode
# use only for debugging!
@@ -20,7 +20,7 @@
Name: VirtualBox-kmod
Version: 4.2.0
-Release: 1%{?prerel:.%{prerel}}%{?dist}
+Release: 2%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-2
+- Build with newest VirtualBox-kmodsrc (4.2.0-3).
+
* Sat Sep 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-1
- 4.2.0 released
12 years, 2 months
rpms/VirtualBox-kmod/devel VirtualBox-kmod.spec,1.6,1.7
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24546
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-2
- Build with newest VirtualBox-kmodsrc (4.2.0-3).
* Sat Sep 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-1
- 4.2.0 released
* Sun Sep 09 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.2.RC4
- New RC4
- Force use VirtualBox-kmodsrc >= 4.2.0-0.6
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/devel/VirtualBox-kmod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VirtualBox-kmod.spec 3 Sep 2012 04:24:52 -0000 1.6
+++ VirtualBox-kmod.spec 23 Sep 2012 14:57:35 -0000 1.7
@@ -9,16 +9,18 @@
# major version number, while the kernel module abi is not guarranteed
# to be stable. This is so that we force the module update in sync with
# userspace.
-%global prerel RC3
+#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
+%global vboxrel 3
+%global vboxreltag %{?vboxrel:-%{vboxrel}}
# Allow only root to access vboxdrv regardless of the file mode
# use only for debugging!
%bcond_without hardening
Name: VirtualBox-kmod
Version: 4.2.0
-Release: 0.1%{?prerel:.%{prerel}}%{?dist}
+Release: 2%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -27,7 +29,7 @@
# This filters out the XEN kernel, since we don't run on XEN
Source1: VirtualBox-OSE-kmod-1.6.4-kernel-variants.txt
-%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc = %{version}, xz, time
+%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
BuildRequires: %{AkmodsBuildRequires}
# needed for plague to make sure it builds for i586 and i686
@@ -96,6 +98,16 @@
%changelog
+* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-2
+- Build with newest VirtualBox-kmodsrc (4.2.0-3).
+
+* Sat Sep 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-1
+- 4.2.0 released
+
+* Sun Sep 09 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.2.RC4
+- New RC4
+- Force use VirtualBox-kmodsrc >= 4.2.0-0.6
+
* Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.1.RC3
- New RC major upstream release.
12 years, 2 months
rpms/VirtualBox/F-18 VirtualBox-4.2.0-VBoxGuestLib.patch, NONE, 1.1 VirtualBox-4.2.0-libcxx.patch, 1.1, 1.2 VirtualBox-4.2.0-mesa.patch, 1.1, 1.2 VirtualBox-4.2.0-xorg17.patch, 1.3, 1.4 VirtualBox.spec, 1.21, 1.22
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23688
Modified Files:
VirtualBox-4.2.0-libcxx.patch VirtualBox-4.2.0-mesa.patch
VirtualBox-4.2.0-xorg17.patch VirtualBox.spec
Added Files:
VirtualBox-4.2.0-VBoxGuestLib.patch
Log Message:
* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-3
- Another clean X11 bundle sources (src/VBox/Additions/x11/x11stubs), minor improve on
VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-VBoxGuestLib.patch
VirtualBox-4.2.0-VBoxGuestLib.patch:
Makefile.kmk | 8 ++----
VBoxGuestR3LibRuntimeXF86.cpp | 53 ++++++++++++++++++++++++++++++++++--------
2 files changed, 47 insertions(+), 14 deletions(-)
--- NEW FILE VirtualBox-4.2.0-VBoxGuestLib.patch ---
VBoxGuestR3LibRuntimeXF86.cpp:
Inspired from http://opensource.apple.com/source/X11server/X11server-85/kdrive/xorg-ser...
xalloc.c and verrorf.c
Author: Sérgio Basto <sergio(a)serjux.com>
--- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100
+++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2012-09-09 01:05:45.271905105 +0100
@@ -187,11 +187,9 @@ VBoxGuestR3LibXFree86_SOURCES = \
VBoxGuestR3LibVideo.cpp \
VBoxGuestR3LibRuntimeXF86.cpp
VBoxGuestR3LibXFree86_INCS = \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common/ \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \
- $(VBOX_PATH_X11_XFREE_4_3)/include \
- $(VBOX_PATH_X11_XFREE_4_3)/exports/include/X11
+ /usr/share/xorg-x11-server-source/hw/xfree86/common/ \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support \
+ /usr/share/xorg-x11-server-source/include
VBoxGuestR3LibRuntimeXF86.cpp_CXXFLAGS = -Wno-shadow
--- ./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp.xorg17 2011-01-14 20:15:34.000000000 +0000
+++ ./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp 2012-09-09 01:04:03.198818717 +0100
@@ -34,20 +34,55 @@
#include <iprt/log.h>
#include <iprt/mem.h>
#include <iprt/string.h>
+#include <string.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <ctype.h>
extern "C" {
# define XFree86LOADER
-# include <xf86_ansic.h>
# include <errno.h>
# undef size_t
}
+/** Provide an VErrorF function when used stand-alone. */
+void VErrorF(const char *format, va_list args)
+{
+ vfprintf(stderr, format, args); /* RATS: We assume the format string
+ * is trusted, since it is always
+ * from a log message in our code. */
+}
+
+/* When using this file as part of a stand-alone (i.e., non-X-Server
+ * program, then the ultimate output routines have to be defined. */
+
+/** Provide an ErrorF function when used stand-alone. */
+void ErrorF(const char *format, ...)
+{
+ va_list args;
+
+ va_start(args, format);
+ vfprintf(stderr, format, args); /* RATS: We assume the format string
+ * is trusted, since it is always
+ * from a log message in our code. */
+ va_end(args);
+}
+
+void *xalloc(unsigned long n)
+{
+ if (!n)
+ n = 1;
+ return malloc(n);
+}
+
/* This is risky as it restricts call to the ANSI format type specifiers. */
RTDECL(size_t) RTStrPrintf(char *pszBuffer, size_t cchBuffer, const char *pszFormat, ...)
{
va_list args;
int cbRet;
va_start(args, pszFormat);
- cbRet = xf86vsnprintf(pszBuffer, cchBuffer, pszFormat, args);
+ cbRet = vsnprintf(pszBuffer, cchBuffer, pszFormat, args);
va_end(args);
return cbRet >= 0 ? cbRet : 0;
}
@@ -55,8 +90,8 @@ RTDECL(size_t) RTStrPrintf(char *pszBuff
RTDECL(int) RTStrToUInt32Ex(const char *pszValue, char **ppszNext, unsigned uBase, uint32_t *pu32)
{
char *pszNext = NULL;
- xf86errno = 0;
- unsigned long ul = xf86strtoul(pszValue, &pszNext, uBase);
+ errno = 0;
+ unsigned long ul = strtoul(pszValue, &pszNext, uBase);
if (ppszNext)
*ppszNext = pszNext;
if (RT_UNLIKELY(pszValue == pszNext))
@@ -65,11 +100,11 @@ RTDECL(int) RTStrToUInt32Ex(const char *
ul = UINT32_MAX;
if (pu32)
*pu32 = (uint32_t) ul;
- if (RT_UNLIKELY(xf86errno == EINVAL))
+ if (RT_UNLIKELY(errno == EINVAL))
return VERR_INVALID_PARAMETER;
- if (RT_UNLIKELY(xf86errno == ERANGE))
+ if (RT_UNLIKELY(errno == ERANGE))
return VWRN_NUMBER_TOO_BIG;
- if (RT_UNLIKELY(xf86errno))
+ if (RT_UNLIKELY(errno))
/* RTErrConvertFromErrno() is not available */
return VERR_UNRESOLVED_ERROR;
if (RT_UNLIKELY(*pszValue == '-'))
@@ -77,7 +112,7 @@ RTDECL(int) RTStrToUInt32Ex(const char *
if (RT_UNLIKELY(*pszNext))
{
while (*pszNext)
- if (!xf86isspace(*pszNext))
+ if (!isspace(*pszNext))
return VWRN_TRAILING_CHARS;
return VWRN_TRAILING_SPACES;
}
@@ -135,6 +170,6 @@ RTDECL(void *) RTMemTmpAllocTag(size_t
RTDECL(void) RTMemTmpFree(void *pv)
{
- xfree(pv);
+ free(pv);
}
VirtualBox-4.2.0-libcxx.patch:
Config.kmk | 2 +-
configure | 2 +-
src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +-
src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 4 +---
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, 19 insertions(+), 22 deletions(-)
Index: VirtualBox-4.2.0-libcxx.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox-4.2.0-libcxx.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-4.2.0-libcxx.patch 8 Sep 2012 02:08:19 -0000 1.1
+++ VirtualBox-4.2.0-libcxx.patch 23 Sep 2012 14:33:25 -0000 1.2
@@ -1,29 +1,12 @@
-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++
+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(-)
-
+Was 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
diff --git a/Config.kmk b/Config.kmk
index 0ea34d8..2ec388c 100644
--- a/Config.kmk
@@ -37,15 +20,6 @@
$(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)
diff --git a/configure b/configure
index 987cf1b..75d556c 100755
--- a/configure
VirtualBox-4.2.0-mesa.patch:
common/crOpenGL/Makefile.kmk | 21 ++----------
common/crOpenGL/fakedri_drv.c | 72 +++++++++++++++++++++++++++++++-----------
common/crOpenGL/fakedri_drv.h | 21 ++++++++----
x11/Makefile.kmk | 1
4 files changed, 73 insertions(+), 42 deletions(-)
Index: VirtualBox-4.2.0-mesa.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox-4.2.0-mesa.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-4.2.0-mesa.patch 15 Sep 2012 03:35:33 -0000 1.1
+++ VirtualBox-4.2.0-mesa.patch 23 Sep 2012 14:33:25 -0000 1.2
@@ -1,5 +1,18 @@
---- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.xorg17 2012-09-13 09:26:18.000000000 +0100
-+++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2012-09-13 23:52:52.309227273 +0100
+fakedri_drv.c,h:
+Just compile with X11 system source and we may remove bundle X11 source code.
+
+--- ./src/VBox/Additions/x11/Makefile.kmk.orig 2012-09-23 01:00:38.301286632 +0100
++++ ./src/VBox/Additions/x11/Makefile.kmk 2012-09-23 01:00:45.135370696 +0100
+@@ -24,7 +24,6 @@ if1of ($(KBUILD_TARGET), freebsd linux n
+ ifneq ($(KBUILD_TARGET), solaris)
+ include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk
+ endif
+- include $(PATH_SUB_CURRENT)/x11stubs/Makefile.kmk
+ endif
+
+ include $(FILE_KBUILD_SUB_FOOTER)
+--- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.mesa 2012-09-13 09:26:18.000000000 +0100
++++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2012-09-23 01:08:36.032101751 +0100
@@ -63,18 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES
VBoxOGL_INCS = .
if1of ($(KBUILD_TARGET), linux solaris freebsd)
@@ -24,6 +37,18 @@
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif
+@@ -203,11 +197,6 @@ VBoxOGL_LIBS = \
+ $(VBOX_LIB_OGL_CRUTIL) \
+ $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+- VBoxOGL_LIBS += \
+- $(PATH_STAGE_LIB)/libXcomposite.so \
+- $(PATH_STAGE_LIB)/libXdamage.so \
+- $(PATH_STAGE_LIB)/libXfixes.so \
+- $(PATH_STAGE_LIB)/libXext.so
+ ifdef VBoxOGL_FAKEDRI
+ VBoxOGL_LIBS += \
+ dl
--- ./src/VBox/Additions/common/crOpenGL/fakedri_drv.c.mesa 2012-09-13 09:26:18.000000000 +0100
+++ ./src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2012-09-14 23:53:17.013381550 +0100
@@ -17,7 +17,15 @@
VirtualBox-4.2.0-xorg17.patch:
Config.kmk | 10 -
src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 40 ++----
src/VBox/Additions/x11/vboxmouse/vboxmouse.c | 10 -
src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 108 ++++++++++-------
src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk | 4
5 files changed, 94 insertions(+), 78 deletions(-)
Index: VirtualBox-4.2.0-xorg17.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox-4.2.0-xorg17.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VirtualBox-4.2.0-xorg17.patch 15 Sep 2012 03:35:33 -0000 1.3
+++ VirtualBox-4.2.0-xorg17.patch 23 Sep 2012 14:33:25 -0000 1.4
@@ -1,10 +1,6 @@
Build the X.Org driver only for the selected system X Server version.
-Author: Sérgio Basto <sergio(a)serjux.com>
Based on scripts by Michael Meskes <meskes(a)debian.org>, Felix Geyer <debfx-pkg(a)fobos.de>
-
-VBoxGuestR3LibRuntimeXF86.cpp:
-Inspired from http://opensource.apple.com/source/X11server/X11server-85/kdrive/xorg-ser...
-xalloc.c and verrorf.c
+Author: Sérgio Basto <sergio(a)serjux.com>
--- ./Config.kmk 2012-03-13 13:14:01.000000000 +0000
+++ ./Config.kmk 2012-03-27 23:55:28.070630137 +0100
@@ -89,24 +85,24 @@
include $(FILE_KBUILD_SUB_FOOTER)
--- ./src/VBox/Additions/x11/vboxmouse/vboxmouse.c.xorg17 2012-03-13 14:52:26.000000000 +0000
-+++ ./src/VBox/Additions/x11/vboxmouse/vboxmouse.c 2012-09-09 01:12:19.440114469 +0100
-@@ -54,12 +54,12 @@
++++ ./src/VBox/Additions/x11/vboxmouse/vboxmouse.c 2012-09-23 00:33:57.939600191 +0100
+@@ -52,13 +52,9 @@
+
+ #include <xf86Module.h>
- #ifdef VBOX_GUESTR3XF86MOD
- # define _X_EXPORT
+-#ifdef VBOX_GUESTR3XF86MOD
+-# define _X_EXPORT
-#else
-# include <errno.h>
-# include <fcntl.h>
-# include <unistd.h>
- #endif
-
+-#endif
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
-+
+
#include "product-generated.h"
- static void
--- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk.xorg17 2012-05-30 11:39:29.000000000 +0100
+++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2012-09-07 03:24:32.187238932 +0100
@@ -35,45 +35,35 @@ vboxvideo_drv_DEFS.x86 = __i386__
@@ -260,123 +256,3 @@
# generate rules.
---- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100
-+++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2012-09-09 01:05:45.271905105 +0100
-@@ -187,11 +187,9 @@ VBoxGuestR3LibXFree86_SOURCES = \
- VBoxGuestR3LibVideo.cpp \
- VBoxGuestR3LibRuntimeXF86.cpp
- VBoxGuestR3LibXFree86_INCS = \
-- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common/ \
-- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \
-- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \
-- $(VBOX_PATH_X11_XFREE_4_3)/include \
-- $(VBOX_PATH_X11_XFREE_4_3)/exports/include/X11
-+ /usr/share/xorg-x11-server-source/hw/xfree86/common/ \
-+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support \
-+ /usr/share/xorg-x11-server-source/include
-
- VBoxGuestR3LibRuntimeXF86.cpp_CXXFLAGS = -Wno-shadow
-
---- ./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp.xorg17 2011-01-14 20:15:34.000000000 +0000
-+++ ./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp 2012-09-09 01:04:03.198818717 +0100
-@@ -34,20 +34,55 @@
- #include <iprt/log.h>
- #include <iprt/mem.h>
- #include <iprt/string.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <math.h>
-+#include <ctype.h>
- extern "C" {
- # define XFree86LOADER
--# include <xf86_ansic.h>
- # include <errno.h>
- # undef size_t
- }
-
-+/** Provide an VErrorF function when used stand-alone. */
-+void VErrorF(const char *format, va_list args)
-+{
-+ vfprintf(stderr, format, args); /* RATS: We assume the format string
-+ * is trusted, since it is always
-+ * from a log message in our code. */
-+}
-+
-+/* When using this file as part of a stand-alone (i.e., non-X-Server
-+ * program, then the ultimate output routines have to be defined. */
-+
-+/** Provide an ErrorF function when used stand-alone. */
-+void ErrorF(const char *format, ...)
-+{
-+ va_list args;
-+
-+ va_start(args, format);
-+ vfprintf(stderr, format, args); /* RATS: We assume the format string
-+ * is trusted, since it is always
-+ * from a log message in our code. */
-+ va_end(args);
-+}
-+
-+void *xalloc(unsigned long n)
-+{
-+ if (!n)
-+ n = 1;
-+ return malloc(n);
-+}
-+
- /* This is risky as it restricts call to the ANSI format type specifiers. */
- RTDECL(size_t) RTStrPrintf(char *pszBuffer, size_t cchBuffer, const char *pszFormat, ...)
- {
- va_list args;
- int cbRet;
- va_start(args, pszFormat);
-- cbRet = xf86vsnprintf(pszBuffer, cchBuffer, pszFormat, args);
-+ cbRet = vsnprintf(pszBuffer, cchBuffer, pszFormat, args);
- va_end(args);
- return cbRet >= 0 ? cbRet : 0;
- }
-@@ -55,8 +90,8 @@ RTDECL(size_t) RTStrPrintf(char *pszBuff
- RTDECL(int) RTStrToUInt32Ex(const char *pszValue, char **ppszNext, unsigned uBase, uint32_t *pu32)
- {
- char *pszNext = NULL;
-- xf86errno = 0;
-- unsigned long ul = xf86strtoul(pszValue, &pszNext, uBase);
-+ errno = 0;
-+ unsigned long ul = strtoul(pszValue, &pszNext, uBase);
- if (ppszNext)
- *ppszNext = pszNext;
- if (RT_UNLIKELY(pszValue == pszNext))
-@@ -65,11 +100,11 @@ RTDECL(int) RTStrToUInt32Ex(const char *
- ul = UINT32_MAX;
- if (pu32)
- *pu32 = (uint32_t) ul;
-- if (RT_UNLIKELY(xf86errno == EINVAL))
-+ if (RT_UNLIKELY(errno == EINVAL))
- return VERR_INVALID_PARAMETER;
-- if (RT_UNLIKELY(xf86errno == ERANGE))
-+ if (RT_UNLIKELY(errno == ERANGE))
- return VWRN_NUMBER_TOO_BIG;
-- if (RT_UNLIKELY(xf86errno))
-+ if (RT_UNLIKELY(errno))
- /* RTErrConvertFromErrno() is not available */
- return VERR_UNRESOLVED_ERROR;
- if (RT_UNLIKELY(*pszValue == '-'))
-@@ -77,7 +112,7 @@ RTDECL(int) RTStrToUInt32Ex(const char *
- if (RT_UNLIKELY(*pszNext))
- {
- while (*pszNext)
-- if (!xf86isspace(*pszNext))
-+ if (!isspace(*pszNext))
- return VWRN_TRAILING_CHARS;
- return VWRN_TRAILING_SPACES;
- }
-@@ -135,6 +170,6 @@ RTDECL(void *) RTMemTmpAllocTag(size_t
-
- RTDECL(void) RTMemTmpFree(void *pv)
- {
-- xfree(pv);
-+ free(pv);
- }
-
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- VirtualBox.spec 15 Sep 2012 23:12:57 -0000 1.21
+++ VirtualBox.spec 23 Sep 2012 14:33:25 -0000 1.22
@@ -15,7 +15,7 @@
Name: VirtualBox
Version: 4.2.0
-Release: 2%{?prerel:.%{prerel}}%{?dist}
+Release: 3%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -42,6 +42,7 @@
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
Patch22: VirtualBox-OSE-4.1.12-gsoap.patch
Patch23: VirtualBox-4.2.0-mesa.patch
+Patch24: VirtualBox-4.2.0-VBoxGuestLib.patch
%if 0%{?fedora} < 16
BuildRequires: kBuild >= 0.1.98
@@ -190,6 +191,7 @@
%patch22 -p1 -b .gsoap
%endif
%patch23 -p1 -b .mesa
+%patch24 -p1 -b .guestlib
# Remove prebuilt binary tools
%if 0%{?fedora} < 16
@@ -197,8 +199,9 @@
%endif
rm -rf tools
-# Remove x11 source code.
+# Remove some bundle X11 sources.
rm -rf src/VBox/Additions/x11/x11include
+rm -rf src/VBox/Additions/x11/x11stubs
# CRLF->LF
sed -i 's/\r//' COPYING
@@ -556,6 +559,10 @@
%changelog
+* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-3
+- Another clean X11 bundle sources (src/VBox/Additions/x11/x11stubs), minor improve on
+VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-VBoxGuestLib.patch
+
* Sat Sep 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-2
- Disable websrv because fails to build on rawhide, temporarily I hope.
12 years, 2 months
rpms/gstreamer1-plugins-ugly/devel gstreamer1-plugins-ugly.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer1-plugins-ugly/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22526/devel
Modified Files:
.cvsignore sources
Added Files:
gstreamer1-plugins-ugly.spec
Log Message:
Initial import of gstreamer1-plugins-ugly
--- NEW FILE gstreamer1-plugins-ugly.spec ---
Summary: GStreamer 1.0 streaming media framework "ugly" plug-ins
Name: gstreamer1-plugins-ugly
Version: 0.11.93
Release: 2%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
Source0: http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-%{...
BuildRequires: gstreamer1-devel >= %{version}
BuildRequires: gstreamer1-plugins-base-devel >= %{version}
BuildRequires: gettext-devel gtk-doc
%if 0%{?fedora} <= 17
BuildRequires: libsidplay-devel >= 1.36.0
%endif
BuildRequires: a52dec-devel >= 0.7.3
BuildRequires: libdvdread-devel >= 0.9.0
BuildRequires: lame-devel >= 3.89
BuildRequires: libid3tag-devel >= 0.15.0
BuildRequires: libmad-devel >= 0.15.0
BuildRequires: mpeg2dec-devel >= 0.4.0
BuildRequires: orc-devel >= 0.4.5
BuildRequires: libcdio-devel >= 0.82
BuildRequires: twolame-devel
BuildRequires: x264-devel >= 0.0.0-0.28
BuildRequires: opencore-amr-devel
BuildRequires: PyXML
%description
GStreamer is a streaming media framework, based on graphs of elements which
operate on media data.
This package contains well-written plug-ins that can't be shipped in
gstreamer-plugins-good because:
- the license is not LGPL
- the license of the library is not LGPL
- there are possible licensing issues with the code.
%package devel-docs
Summary: Development documentation for the GStreamer "ugly" plug-ins
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%description devel-docs
GStreamer is a streaming media framework, based on graphs of elements which
operate on media data.
This package contains the development documentation for the plug-ins that can't
be shipped in gstreamer-plugins-good because:
- the license is not LGPL
- the license of the library is not LGPL
- there are possible licensing issues with the code.
%prep
%setup -q -n gst-plugins-ugly-%{version}
%build
%configure \
--with-package-name="gst-plugins-ugly 1.0 rpmfusion rpm" \
--with-package-origin="http://rpmfusion.org/" \
--enable-debug --enable-gtk-doc \
--disable-static
make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang gst-plugins-ugly-1.0
rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/*.la
%files -f gst-plugins-ugly-1.0.lang
%doc AUTHORS COPYING README REQUIREMENTS
%{_datadir}/gstreamer-1.0
# Plugins without external dependencies
%{_libdir}/gstreamer-1.0/libgstasf.so
%{_libdir}/gstreamer-1.0/libgstdvdlpcmdec.so
%{_libdir}/gstreamer-1.0/libgstdvdsub.so
%{_libdir}/gstreamer-1.0/libgstrmdemux.so
%{_libdir}/gstreamer-1.0/libgstxingmux.so
# Plugins with external dependencies
%{_libdir}/gstreamer-1.0/libgsta52dec.so
%{_libdir}/gstreamer-1.0/libgstamrnb.so
%{_libdir}/gstreamer-1.0/libgstamrwbdec.so
%{_libdir}/gstreamer-1.0/libgstcdio.so
%{_libdir}/gstreamer-1.0/libgstdvdread.so
%{_libdir}/gstreamer-1.0/libgstlame.so
%{_libdir}/gstreamer-1.0/libgstmad.so
%{_libdir}/gstreamer-1.0/libgstmpeg2dec.so
%if 0%{?fedora} <= 17
%{_libdir}/gstreamer-1.0/libgstsid.so
%endif
%{_libdir}/gstreamer-1.0/libgsttwolame.so
%{_libdir}/gstreamer-1.0/libgstx264.so
%files devel-docs
# Take the dir and everything below it for proper dir ownership
%doc %{_datadir}/gtk-doc
%changelog
* Sun Sep 16 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.11.93-2
- Fix gtk-doc dir ownership (rf#2474)
* Sun Sep 9 2012 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.11.93-1
- First version of gstreamer1-plugins-ugly for rpmfusion
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gstreamer1-plugins-ugly/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Sep 2012 16:22:39 -0000 1.1
+++ .cvsignore 23 Sep 2012 14:04:20 -0000 1.2
@@ -0,0 +1 @@
+gst-plugins-ugly-0.11.93.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gstreamer1-plugins-ugly/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Sep 2012 16:22:39 -0000 1.1
+++ sources 23 Sep 2012 14:04:21 -0000 1.2
@@ -0,0 +1 @@
+62f2ff1462b295295ecda60b9decaa25 gst-plugins-ugly-0.11.93.tar.xz
12 years, 2 months
rpms/VirtualBox/devel VirtualBox-4.2.0-VBoxGuestLib.patch, NONE, 1.1 VirtualBox-4.2.0-libcxx.patch, 1.1, 1.2 VirtualBox-4.2.0-mesa.patch, 1.1, 1.2 VirtualBox-4.2.0-xorg17.patch, 1.4, 1.5 VirtualBox.spec, 1.27, 1.28
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21720
Modified Files:
VirtualBox-4.2.0-libcxx.patch VirtualBox-4.2.0-mesa.patch
VirtualBox-4.2.0-xorg17.patch VirtualBox.spec
Added Files:
VirtualBox-4.2.0-VBoxGuestLib.patch
Log Message:
* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-3
- Another clean X11 bundle sources (src/VBox/Additions/x11/x11stubs), minor improve on
VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-VBoxGuestLib.patch
VirtualBox-4.2.0-VBoxGuestLib.patch:
Makefile.kmk | 8 ++----
VBoxGuestR3LibRuntimeXF86.cpp | 53 ++++++++++++++++++++++++++++++++++--------
2 files changed, 47 insertions(+), 14 deletions(-)
--- NEW FILE VirtualBox-4.2.0-VBoxGuestLib.patch ---
VBoxGuestR3LibRuntimeXF86.cpp:
Inspired from http://opensource.apple.com/source/X11server/X11server-85/kdrive/xorg-ser...
xalloc.c and verrorf.c
Author: Sérgio Basto <sergio(a)serjux.com>
--- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100
+++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2012-09-09 01:05:45.271905105 +0100
@@ -187,11 +187,9 @@ VBoxGuestR3LibXFree86_SOURCES = \
VBoxGuestR3LibVideo.cpp \
VBoxGuestR3LibRuntimeXF86.cpp
VBoxGuestR3LibXFree86_INCS = \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common/ \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \
- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \
- $(VBOX_PATH_X11_XFREE_4_3)/include \
- $(VBOX_PATH_X11_XFREE_4_3)/exports/include/X11
+ /usr/share/xorg-x11-server-source/hw/xfree86/common/ \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support \
+ /usr/share/xorg-x11-server-source/include
VBoxGuestR3LibRuntimeXF86.cpp_CXXFLAGS = -Wno-shadow
--- ./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp.xorg17 2011-01-14 20:15:34.000000000 +0000
+++ ./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp 2012-09-09 01:04:03.198818717 +0100
@@ -34,20 +34,55 @@
#include <iprt/log.h>
#include <iprt/mem.h>
#include <iprt/string.h>
+#include <string.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <math.h>
+#include <ctype.h>
extern "C" {
# define XFree86LOADER
-# include <xf86_ansic.h>
# include <errno.h>
# undef size_t
}
+/** Provide an VErrorF function when used stand-alone. */
+void VErrorF(const char *format, va_list args)
+{
+ vfprintf(stderr, format, args); /* RATS: We assume the format string
+ * is trusted, since it is always
+ * from a log message in our code. */
+}
+
+/* When using this file as part of a stand-alone (i.e., non-X-Server
+ * program, then the ultimate output routines have to be defined. */
+
+/** Provide an ErrorF function when used stand-alone. */
+void ErrorF(const char *format, ...)
+{
+ va_list args;
+
+ va_start(args, format);
+ vfprintf(stderr, format, args); /* RATS: We assume the format string
+ * is trusted, since it is always
+ * from a log message in our code. */
+ va_end(args);
+}
+
+void *xalloc(unsigned long n)
+{
+ if (!n)
+ n = 1;
+ return malloc(n);
+}
+
/* This is risky as it restricts call to the ANSI format type specifiers. */
RTDECL(size_t) RTStrPrintf(char *pszBuffer, size_t cchBuffer, const char *pszFormat, ...)
{
va_list args;
int cbRet;
va_start(args, pszFormat);
- cbRet = xf86vsnprintf(pszBuffer, cchBuffer, pszFormat, args);
+ cbRet = vsnprintf(pszBuffer, cchBuffer, pszFormat, args);
va_end(args);
return cbRet >= 0 ? cbRet : 0;
}
@@ -55,8 +90,8 @@ RTDECL(size_t) RTStrPrintf(char *pszBuff
RTDECL(int) RTStrToUInt32Ex(const char *pszValue, char **ppszNext, unsigned uBase, uint32_t *pu32)
{
char *pszNext = NULL;
- xf86errno = 0;
- unsigned long ul = xf86strtoul(pszValue, &pszNext, uBase);
+ errno = 0;
+ unsigned long ul = strtoul(pszValue, &pszNext, uBase);
if (ppszNext)
*ppszNext = pszNext;
if (RT_UNLIKELY(pszValue == pszNext))
@@ -65,11 +100,11 @@ RTDECL(int) RTStrToUInt32Ex(const char *
ul = UINT32_MAX;
if (pu32)
*pu32 = (uint32_t) ul;
- if (RT_UNLIKELY(xf86errno == EINVAL))
+ if (RT_UNLIKELY(errno == EINVAL))
return VERR_INVALID_PARAMETER;
- if (RT_UNLIKELY(xf86errno == ERANGE))
+ if (RT_UNLIKELY(errno == ERANGE))
return VWRN_NUMBER_TOO_BIG;
- if (RT_UNLIKELY(xf86errno))
+ if (RT_UNLIKELY(errno))
/* RTErrConvertFromErrno() is not available */
return VERR_UNRESOLVED_ERROR;
if (RT_UNLIKELY(*pszValue == '-'))
@@ -77,7 +112,7 @@ RTDECL(int) RTStrToUInt32Ex(const char *
if (RT_UNLIKELY(*pszNext))
{
while (*pszNext)
- if (!xf86isspace(*pszNext))
+ if (!isspace(*pszNext))
return VWRN_TRAILING_CHARS;
return VWRN_TRAILING_SPACES;
}
@@ -135,6 +170,6 @@ RTDECL(void *) RTMemTmpAllocTag(size_t
RTDECL(void) RTMemTmpFree(void *pv)
{
- xfree(pv);
+ free(pv);
}
VirtualBox-4.2.0-libcxx.patch:
Config.kmk | 2 +-
configure | 2 +-
src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +-
src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 4 +---
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, 19 insertions(+), 22 deletions(-)
Index: VirtualBox-4.2.0-libcxx.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.2.0-libcxx.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-4.2.0-libcxx.patch 3 Sep 2012 03:30:25 -0000 1.1
+++ VirtualBox-4.2.0-libcxx.patch 23 Sep 2012 13:49:23 -0000 1.2
@@ -1,29 +1,12 @@
-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++
+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(-)
-
+Was 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
diff --git a/Config.kmk b/Config.kmk
index 0ea34d8..2ec388c 100644
--- a/Config.kmk
@@ -37,15 +20,6 @@
$(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)
diff --git a/configure b/configure
index 987cf1b..75d556c 100755
--- a/configure
VirtualBox-4.2.0-mesa.patch:
common/crOpenGL/Makefile.kmk | 21 ++----------
common/crOpenGL/fakedri_drv.c | 72 +++++++++++++++++++++++++++++++-----------
common/crOpenGL/fakedri_drv.h | 21 ++++++++----
x11/Makefile.kmk | 1
4 files changed, 73 insertions(+), 42 deletions(-)
Index: VirtualBox-4.2.0-mesa.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.2.0-mesa.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-4.2.0-mesa.patch 15 Sep 2012 03:32:01 -0000 1.1
+++ VirtualBox-4.2.0-mesa.patch 23 Sep 2012 13:49:23 -0000 1.2
@@ -1,5 +1,18 @@
---- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.xorg17 2012-09-13 09:26:18.000000000 +0100
-+++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2012-09-13 23:52:52.309227273 +0100
+fakedri_drv.c,h:
+Just compile with X11 system source and we may remove bundle X11 source code.
+
+--- ./src/VBox/Additions/x11/Makefile.kmk.orig 2012-09-23 01:00:38.301286632 +0100
++++ ./src/VBox/Additions/x11/Makefile.kmk 2012-09-23 01:00:45.135370696 +0100
+@@ -24,7 +24,6 @@ if1of ($(KBUILD_TARGET), freebsd linux n
+ ifneq ($(KBUILD_TARGET), solaris)
+ include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk
+ endif
+- include $(PATH_SUB_CURRENT)/x11stubs/Makefile.kmk
+ endif
+
+ include $(FILE_KBUILD_SUB_FOOTER)
+--- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.mesa 2012-09-13 09:26:18.000000000 +0100
++++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2012-09-23 01:08:36.032101751 +0100
@@ -63,18 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES
VBoxOGL_INCS = .
if1of ($(KBUILD_TARGET), linux solaris freebsd)
@@ -24,6 +37,18 @@
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif
+@@ -203,11 +197,6 @@ VBoxOGL_LIBS = \
+ $(VBOX_LIB_OGL_CRUTIL) \
+ $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
+ if1of ($(KBUILD_TARGET), linux solaris freebsd)
+- VBoxOGL_LIBS += \
+- $(PATH_STAGE_LIB)/libXcomposite.so \
+- $(PATH_STAGE_LIB)/libXdamage.so \
+- $(PATH_STAGE_LIB)/libXfixes.so \
+- $(PATH_STAGE_LIB)/libXext.so
+ ifdef VBoxOGL_FAKEDRI
+ VBoxOGL_LIBS += \
+ dl
--- ./src/VBox/Additions/common/crOpenGL/fakedri_drv.c.mesa 2012-09-13 09:26:18.000000000 +0100
+++ ./src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2012-09-14 23:53:17.013381550 +0100
@@ -17,7 +17,15 @@
VirtualBox-4.2.0-xorg17.patch:
Config.kmk | 10 -
src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 40 ++----
src/VBox/Additions/x11/vboxmouse/vboxmouse.c | 10 -
src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 108 ++++++++++-------
src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk | 4
5 files changed, 94 insertions(+), 78 deletions(-)
Index: VirtualBox-4.2.0-xorg17.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.2.0-xorg17.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VirtualBox-4.2.0-xorg17.patch 15 Sep 2012 03:32:01 -0000 1.4
+++ VirtualBox-4.2.0-xorg17.patch 23 Sep 2012 13:49:23 -0000 1.5
@@ -1,10 +1,6 @@
Build the X.Org driver only for the selected system X Server version.
-Author: Sérgio Basto <sergio(a)serjux.com>
Based on scripts by Michael Meskes <meskes(a)debian.org>, Felix Geyer <debfx-pkg(a)fobos.de>
-
-VBoxGuestR3LibRuntimeXF86.cpp:
-Inspired from http://opensource.apple.com/source/X11server/X11server-85/kdrive/xorg-ser...
-xalloc.c and verrorf.c
+Author: Sérgio Basto <sergio(a)serjux.com>
--- ./Config.kmk 2012-03-13 13:14:01.000000000 +0000
+++ ./Config.kmk 2012-03-27 23:55:28.070630137 +0100
@@ -89,24 +85,24 @@
include $(FILE_KBUILD_SUB_FOOTER)
--- ./src/VBox/Additions/x11/vboxmouse/vboxmouse.c.xorg17 2012-03-13 14:52:26.000000000 +0000
-+++ ./src/VBox/Additions/x11/vboxmouse/vboxmouse.c 2012-09-09 01:12:19.440114469 +0100
-@@ -54,12 +54,12 @@
++++ ./src/VBox/Additions/x11/vboxmouse/vboxmouse.c 2012-09-23 00:33:57.939600191 +0100
+@@ -52,13 +52,9 @@
+
+ #include <xf86Module.h>
- #ifdef VBOX_GUESTR3XF86MOD
- # define _X_EXPORT
+-#ifdef VBOX_GUESTR3XF86MOD
+-# define _X_EXPORT
-#else
-# include <errno.h>
-# include <fcntl.h>
-# include <unistd.h>
- #endif
-
+-#endif
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
-+
+
#include "product-generated.h"
- static void
--- ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk.xorg17 2012-05-30 11:39:29.000000000 +0100
+++ ./src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2012-09-07 03:24:32.187238932 +0100
@@ -35,45 +35,35 @@ vboxvideo_drv_DEFS.x86 = __i386__
@@ -260,123 +256,3 @@
# generate rules.
---- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100
-+++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2012-09-09 01:05:45.271905105 +0100
-@@ -187,11 +187,9 @@ VBoxGuestR3LibXFree86_SOURCES = \
- VBoxGuestR3LibVideo.cpp \
- VBoxGuestR3LibRuntimeXF86.cpp
- VBoxGuestR3LibXFree86_INCS = \
-- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common/ \
-- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \
-- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \
-- $(VBOX_PATH_X11_XFREE_4_3)/include \
-- $(VBOX_PATH_X11_XFREE_4_3)/exports/include/X11
-+ /usr/share/xorg-x11-server-source/hw/xfree86/common/ \
-+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support \
-+ /usr/share/xorg-x11-server-source/include
-
- VBoxGuestR3LibRuntimeXF86.cpp_CXXFLAGS = -Wno-shadow
-
---- ./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp.xorg17 2011-01-14 20:15:34.000000000 +0000
-+++ ./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp 2012-09-09 01:04:03.198818717 +0100
-@@ -34,20 +34,55 @@
- #include <iprt/log.h>
- #include <iprt/mem.h>
- #include <iprt/string.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <math.h>
-+#include <ctype.h>
- extern "C" {
- # define XFree86LOADER
--# include <xf86_ansic.h>
- # include <errno.h>
- # undef size_t
- }
-
-+/** Provide an VErrorF function when used stand-alone. */
-+void VErrorF(const char *format, va_list args)
-+{
-+ vfprintf(stderr, format, args); /* RATS: We assume the format string
-+ * is trusted, since it is always
-+ * from a log message in our code. */
-+}
-+
-+/* When using this file as part of a stand-alone (i.e., non-X-Server
-+ * program, then the ultimate output routines have to be defined. */
-+
-+/** Provide an ErrorF function when used stand-alone. */
-+void ErrorF(const char *format, ...)
-+{
-+ va_list args;
-+
-+ va_start(args, format);
-+ vfprintf(stderr, format, args); /* RATS: We assume the format string
-+ * is trusted, since it is always
-+ * from a log message in our code. */
-+ va_end(args);
-+}
-+
-+void *xalloc(unsigned long n)
-+{
-+ if (!n)
-+ n = 1;
-+ return malloc(n);
-+}
-+
- /* This is risky as it restricts call to the ANSI format type specifiers. */
- RTDECL(size_t) RTStrPrintf(char *pszBuffer, size_t cchBuffer, const char *pszFormat, ...)
- {
- va_list args;
- int cbRet;
- va_start(args, pszFormat);
-- cbRet = xf86vsnprintf(pszBuffer, cchBuffer, pszFormat, args);
-+ cbRet = vsnprintf(pszBuffer, cchBuffer, pszFormat, args);
- va_end(args);
- return cbRet >= 0 ? cbRet : 0;
- }
-@@ -55,8 +90,8 @@ RTDECL(size_t) RTStrPrintf(char *pszBuff
- RTDECL(int) RTStrToUInt32Ex(const char *pszValue, char **ppszNext, unsigned uBase, uint32_t *pu32)
- {
- char *pszNext = NULL;
-- xf86errno = 0;
-- unsigned long ul = xf86strtoul(pszValue, &pszNext, uBase);
-+ errno = 0;
-+ unsigned long ul = strtoul(pszValue, &pszNext, uBase);
- if (ppszNext)
- *ppszNext = pszNext;
- if (RT_UNLIKELY(pszValue == pszNext))
-@@ -65,11 +100,11 @@ RTDECL(int) RTStrToUInt32Ex(const char *
- ul = UINT32_MAX;
- if (pu32)
- *pu32 = (uint32_t) ul;
-- if (RT_UNLIKELY(xf86errno == EINVAL))
-+ if (RT_UNLIKELY(errno == EINVAL))
- return VERR_INVALID_PARAMETER;
-- if (RT_UNLIKELY(xf86errno == ERANGE))
-+ if (RT_UNLIKELY(errno == ERANGE))
- return VWRN_NUMBER_TOO_BIG;
-- if (RT_UNLIKELY(xf86errno))
-+ if (RT_UNLIKELY(errno))
- /* RTErrConvertFromErrno() is not available */
- return VERR_UNRESOLVED_ERROR;
- if (RT_UNLIKELY(*pszValue == '-'))
-@@ -77,7 +112,7 @@ RTDECL(int) RTStrToUInt32Ex(const char *
- if (RT_UNLIKELY(*pszNext))
- {
- while (*pszNext)
-- if (!xf86isspace(*pszNext))
-+ if (!isspace(*pszNext))
- return VWRN_TRAILING_CHARS;
- return VWRN_TRAILING_SPACES;
- }
-@@ -135,6 +170,6 @@ RTDECL(void *) RTMemTmpAllocTag(size_t
-
- RTDECL(void) RTMemTmpFree(void *pv)
- {
-- xfree(pv);
-+ free(pv);
- }
-
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- VirtualBox.spec 15 Sep 2012 22:13:46 -0000 1.27
+++ VirtualBox.spec 23 Sep 2012 13:49:23 -0000 1.28
@@ -15,7 +15,7 @@
Name: VirtualBox
Version: 4.2.0
-Release: 2%{?prerel:.%{prerel}}%{?dist}
+Release: 3%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -42,6 +42,7 @@
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
Patch22: VirtualBox-OSE-4.1.12-gsoap.patch
Patch23: VirtualBox-4.2.0-mesa.patch
+Patch24: VirtualBox-4.2.0-VBoxGuestLib.patch
%if 0%{?fedora} < 16
BuildRequires: kBuild >= 0.1.98
@@ -190,6 +191,7 @@
%patch22 -p1 -b .gsoap
%endif
%patch23 -p1 -b .mesa
+%patch24 -p1 -b .guestlib
# Remove prebuilt binary tools
%if 0%{?fedora} < 16
@@ -197,8 +199,9 @@
%endif
rm -rf tools
-# Remove x11 source code.
+# Remove some bundle X11 sources.
rm -rf src/VBox/Additions/x11/x11include
+rm -rf src/VBox/Additions/x11/x11stubs
# CRLF->LF
sed -i 's/\r//' COPYING
@@ -556,6 +559,10 @@
%changelog
+* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-3
+- Another clean X11 bundle sources (src/VBox/Additions/x11/x11stubs), minor improve on
+VirtualBox-4.2.0-xorg17.patch and split VBoxGuestLib part into VirtualBox-4.2.0-VBoxGuestLib.patch
+
* Sat Sep 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-2
- Disable websrv because fails to build on rawhide, temporarily I hope.
12 years, 2 months
rpms/gstreamer1-plugins-ugly/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gstreamer1-plugins-ugly/devel
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/free/owners/tmpcvsO12517/rpms/gstreamer1-plugins-ugly/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module gstreamer1-plugins-ugly
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: gstreamer1-plugins-ugly
# $Id: Makefile,v 1.1 2012/09/22 16:22:39 kwizart Exp $
NAME := gstreamer1-plugins-ugly
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
12 years, 2 months
rpms/gstreamer1-plugins-ugly Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gstreamer1-plugins-ugly
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/free/owners/tmpcvsO12517/rpms/gstreamer1-plugins-ugly
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module gstreamer1-plugins-ugly
--- NEW FILE Makefile ---
# Top level Makefile for module gstreamer1-plugins-ugly
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
12 years, 2 months
rpms/gstreamer1-plugins-ugly - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gstreamer1-plugins-ugly
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/free/owners/tmpcvsO12517/rpms/gstreamer1-plugins-ugly
Log Message:
Directory /cvs/free/rpms/gstreamer1-plugins-ugly added to the repository
12 years, 2 months
rpms/gstreamer1-plugins-ugly/devel - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gstreamer1-plugins-ugly/devel
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/free/owners/tmpcvsO12517/rpms/gstreamer1-plugins-ugly/devel
Log Message:
Directory /cvs/free/rpms/gstreamer1-plugins-ugly/devel added to the repository
12 years, 2 months
rpms/mess/F-16 dead.package, NONE, 1.1 .cvsignore, 1.10, NONE mess-fortify.patch, 1.1, NONE mess-verbosebuild.patch, 1.4, NONE mess.spec, 1.10, NONE sources, 1.10, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mess/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14233
Added Files:
dead.package
Removed Files:
.cvsignore mess-fortify.patch mess-verbosebuild.patch
mess.spec sources
Log Message:
dead.package
--- NEW FILE dead.package ---
As of 0.147, MESS has been merged with MAME.
--- .cvsignore DELETED ---
--- mess-fortify.patch DELETED ---
--- mess-verbosebuild.patch DELETED ---
--- mess.spec DELETED ---
--- sources DELETED ---
12 years, 2 months
