rpms/VirtualBox/devel VirtualBox-4.2.0-mesa.patch, NONE, 1.1 VirtualBox-4.2.0-xorg17.patch, 1.3, 1.4 VirtualBox.spec, 1.25, 1.26 VirtualBox-OSE-4.1.10-mesa.patch, 1.1, NONE
Sérgio M. Basto
sergiomb at rpmfusion.org
Sat Sep 15 05:32:02 CEST 2012
- Previous message: rpms/VirtualBox/F-18 VirtualBox.spec,1.18,1.19
- Next message: rpms/VirtualBox/F-18 VirtualBox-4.2.0-mesa.patch, NONE, 1.1 VirtualBox-4.2.0-xorg17.patch, 1.2, 1.3 VirtualBox.spec, 1.19, 1.20 VirtualBox-OSE-4.1.10-mesa.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14072
Modified Files:
VirtualBox-4.2.0-xorg17.patch VirtualBox.spec
Added Files:
VirtualBox-4.2.0-mesa.patch
Removed Files:
VirtualBox-OSE-4.1.10-mesa.patch
Log Message:
* Thu Sep 13 2012 Sérgio Basto <sergio at serjux.com> - 4.2.0-1
- 4.2.0 released
- Rebase and rework VirtualBox-4.2.0-xorg17.patch, add 2 new Definitions: XSERVER_LIBPCIACCESS XORG_VERSION_CURRENT=101300000
- Rename and rework VirtualBox-OSE-4.1.10-mesa.patch
- Reorganize last 2 patches.
- Revert attempt to remove 32-bits patch.
VirtualBox-4.2.0-mesa.patch:
Makefile.kmk | 16 ++++--------
fakedri_drv.c | 72 +++++++++++++++++++++++++++++++++++++++++++---------------
fakedri_drv.h | 21 +++++++++++-----
3 files changed, 73 insertions(+), 36 deletions(-)
--- NEW FILE VirtualBox-4.2.0-mesa.patch ---
--- ./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
@@ -63,18 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES
VBoxOGL_INCS = .
if1of ($(KBUILD_TARGET), linux solaris freebsd)
VBoxOGL_INCS += \
- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
- $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1 \
$(VBOX_MESA_INCS) \
- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
+ /usr/include/drm \
+ /usr/include/libdrm
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif
--- ./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 @@
*/
#define _GNU_SOURCE 1
+#define HAVE_STRNDUP 1
+#include <dlfcn.h>
+#include <elf.h>
+#include <unistd.h>
+#include <xf86.h>
+#include <xf86drm.h>
+#include <GL/gl.h>
+#include <GL/glext.h>
#include "cr_error.h"
#include "cr_gl.h"
#include "cr_mem.h"
@@ -26,23 +34,6 @@
#include "dri_glx.h"
#include "iprt/mem.h"
#include "iprt/err.h"
-#include <dlfcn.h>
-#include <elf.h>
-#include <unistd.h>
-/** X server message type definitions. */
-typedef enum {
- X_PROBED, /* Value was probed */
- X_CONFIG, /* Value was given in the config file */
- X_DEFAULT, /* Value is a default */
- X_CMDLINE, /* Value was given on the command line */
- X_NOTICE, /* Notice */
- X_ERROR, /* Error message */
- X_WARNING, /* Warning message */
- X_INFO, /* Informational message */
- X_NONE, /* No prefix */
- X_NOT_IMPLEMENTED, /* Not implemented */
- X_UNKNOWN = -1 /* unknown -- this must always be last */
-} MessageType;
#define VBOX_NO_MESA_PATCH_REPORTS
@@ -104,8 +108,53 @@ static const __DRIswrastExtension *gpSwD
extern const __DRIextension * __driDriverExtensions[];
+//copy from /usr/share/xorg-x11-server-source/glx/dispatch.h
+#define SET_by_offset(disp, offset, fn) \
+ do { \
+ if ( (offset) < 0 ) { \
+ /* fprintf( stderr, "[%s:%u] SET_by_offset(%p, %d, %s)!\n", */ \
+ /* __func__, __LINE__, disp, offset, # fn); */ \
+ /* abort(); */ \
+ } \
+ else { \
+ ( (_glapi_proc *) (disp) )[offset] = (_glapi_proc) fn; \
+ } \
+ } while(0)
+
+// copy from glx/glapi.c
+
+/**
+ * Search the table of static entrypoint functions for the named function
+ * and return the corresponding glprocs_table_t entry.
+ */
+static const glprocs_table_t * find_entry( const char * n )
+{
+ GLuint i;
+ for (i = 0; static_functions[i].Name_offset >= 0; i++) {
+ const char *testName = gl_string_table + static_functions[i].Name_offset;
+ if (strcmp(testName, n) == 0) {
+ return &static_functions[i];
+ }
+ }
+ return NULL;
+}
+
+/**
+ * Return dispatch table offset of the named static (built-in) function.
+ * Return -1 if function not found.
+ */
+static GLint
+get_static_proc_offset(const char *funcName)
+{
+ const glprocs_table_t * const f = find_entry( funcName );
+ if (f) {
+ return f->Offset;
+ }
+ return -1;
+}
+
#define VBOX_SET_MESA_FUNC(table, name, func) \
- if (_glapi_get_proc_offset(name)>=0) SET_by_offset(table, _glapi_get_proc_offset(name), func); \
+ if (get_static_proc_offset(name)>=0) SET_by_offset(table, get_static_proc_offset(name), func); \
else crWarning("%s not found in mesa table", name)
#define GLAPI_ENTRY(Func) VBOX_SET_MESA_FUNC(vbox_glapi_table, "gl"#Func, cr_gl##Func);
--- ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2012-03-13 13:14:21.000000000 +0000
+++ ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2012-03-27 23:14:15.058370962 +0100
@@ -20,13 +20,20 @@
#ifndef ___CROPENGL_FAKEDRIDRV_H
#define ___CROPENGL_FAKEDRIDRV_H
-#include "src/mesa/main/mtypes.h"
-#include "src/mesa/main/dd.h"
-#include "src/mesa/glapi/dispatch.h"
-#include "src/mesa/glapi/glapi.h"
-#include "src/mesa/glapi/glapitable.h"
-#include "src/mesa/glapi/glapioffsets.h"
-#include "src/mesa/drivers/dri/common/dri_util.h"
+//#include "/usr/share/xorg-x11-server-source/glx/glapi.h"
+typedef void (*_glapi_proc)(void); /* generic function pointer */
+
+extern GLuint
+_glapi_get_dispatch_table_size(void);
+
+extern struct _glapi_table *
+_glapi_get_dispatch(void);
+
+extern void
+_glapi_set_dispatch(struct _glapi_table *dispatch);
+
+//#include "/usr/share/xorg-x11-server-source/glx/glapioffsets.h"
+#include "/usr/share/xorg-x11-server-source/glx/glprocs.h"
#include "GL/internal/dri_interface.h"
#include "glx_proto.h"
VirtualBox-4.2.0-xorg17.patch:
Config.kmk | 10
src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk | 8
src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp | 53 ++++
src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 40 +--
src/VBox/Additions/x11/vboxmouse/vboxmouse.c | 8
src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 108 ++++++----
src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk | 4
7 files changed, 142 insertions(+), 89 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VirtualBox-4.2.0-xorg17.patch 9 Sep 2012 01:03:58 -0000 1.3
+++ VirtualBox-4.2.0-xorg17.patch 15 Sep 2012 03:32:01 -0000 1.4
@@ -2,68 +2,31 @@
Author: Sérgio Basto <sergio at serjux.com>
Based on scripts by Michael Meskes <meskes at debian.org>, Felix Geyer <debfx-pkg at fobos.de>
-diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
---- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-@@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUESTDLL
- VBoxOGL_INCS = .
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGL_INCS += \
-- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
-- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
-- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
-- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
-- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
-- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
-- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
-- $(VBOX_PATH_X11_ROOT)/1.3/xorg \
-+ /usr/include/x11 \
-+ /usr/include/xorg \
-+ /usr/include/pixman-1 \
- $(VBOX_MESA_INCS) \
-- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
-+ /usr/include/drm \
-+ /usr/include/libdrm
- VBoxOGL_DEFS += VBOX_NO_NATIVEGL
- endif
-
---- a/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 19:57:53.762613198 +0000
-+++ b/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 20:01:17.296596446 +0000
-@@ -36,11 +36,11 @@ endif # !VBOX_ONLY_SDK
- #
- tstSetModeXOrg_TEMPLATE = VBOXR3TSTEXE
- tstSetModeXOrg_CFLAGS += -std=c99
--tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_15_DEFS)) TESTCASE
-+tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_17_DEFS)) TESTCASE
- tstSetModeXOrg_SOURCES = \
- tstSetModeXOrg.c \
- ../setmode.c
--tstSetModeXOrg_INCS = $(vboxvideo_drv_15_INCS)
-+tstSetModeXOrg_INCS = $(vboxvideo_drv_17_INCS)
-
-
- # generate rules.
---- ./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 @@
-
- #ifdef VBOX_GUESTR3XF86MOD
- # define _X_EXPORT
--#else
--# include <errno.h>
--# include <fcntl.h>
--# include <unistd.h>
- #endif
-
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+
- #include "product-generated.h"
-
- static void
---- VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxmouse/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100
-+++ VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2012-09-07 03:18:17.460463185 +0100
+VBoxGuestR3LibRuntimeXF86.cpp:
+Inspired from http://opensource.apple.com/source/X11server/X11server-85/kdrive/xorg-server-1.6.0/hw/xfree86/dummylib/
+xalloc.c and verrorf.c
+
+--- ./Config.kmk 2012-03-13 13:14:01.000000000 +0000
++++ ./Config.kmk 2012-03-27 23:55:28.070630137 +0100
+@@ -2003,15 +2003,7 @@ ifdef VBOX_WITH_CROGL
+ endif
+
+ if1of ($(KBUILD_TARGET), freebsd linux solaris)
+- # VBOX_PATH_MESA_SOURCE = $(PATH_ROOT)/src/libs/mesa-7.2
+- VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
+- VBOX_MESA_INCS = \
+- $(VBOX_PATH_MESA_SOURCE) \
+- $(VBOX_PATH_MESA_SOURCE)/include \
+- $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \
+- $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \
+- $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
+- $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common
++ VBOX_MESA_INCS = /usr/include/GL /usr/include/xorg /usr/include/pixman-1
+ endif
+
+ VBOX_DARWIN_OPENGL_INST = obj/VBoxOGL/GL/
+--- ./src/VBox/Additions/x11/vboxmouse/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100
++++ ./src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2012-09-07 03:18:17.460463185 +0100
@@ -30,25 +30,12 @@ if1of ($(KBUILD_TARGET), linux)
# This one has to be defined when building server code on systems where
# unsigned long is 64bits
@@ -125,8 +88,27 @@
+
include $(FILE_KBUILD_SUB_FOOTER)
---- VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxvideo/Makefile.kmk.xorg17 2012-05-30 11:39:29.000000000 +0100
-+++ VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2012-09-07 03:24:32.187238932 +0100
+--- ./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 @@
+
+ #ifdef VBOX_GUESTR3XF86MOD
+ # define _X_EXPORT
+-#else
+-# include <errno.h>
+-# include <fcntl.h>
+-# include <unistd.h>
+ #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__
# This one has to be defined when building server code on systems where
# unsigned long is 64bits
@@ -141,7 +123,7 @@
- IN_MODULE XFree86Module IN_XF86_MODULE IN_RT_STATIC
-vboxvideo_drv_DEFS += memset=xf86memset memcpy=xf86memcpy
+vboxvideo_drv_DEFS := XFree86Server IN_MODULE XFree86Module XFree86LOADER IN_XF86_MODULE XORG_7X RENDER=1 \
-+ IN_RT_STATIC VBOXVIDEO_13 NO_ANSIC PCIACCESS VBOX_NO_LOW_COLOUR VBOX_DRI
++ IN_RT_STATIC VBOXVIDEO_13 NO_ANSIC PCIACCESS VBOX_NO_LOW_COLOUR VBOX_DRI XSERVER_LIBPCIACCESS XORG_VERSION_CURRENT=101300000
vboxvideo_drv_INCS = \
- $(VBOX_PATH_X11_XFREE_4_3)/include \
- $(VBOX_PATH_X11_XFREE_4_3)/include/X11 \
@@ -218,7 +200,7 @@
+vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxvideo_drv_17_CFLAGS += -Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros) # template?
+vboxvideo_drv_17_DEFS := XFree86Server IN_MODULE XFree86Module XFree86LOADER XORG_7X RENDER=1 \
-+ IN_XF86_MODULE IN_RT_STATIC VBOXVIDEO_13 NO_ANSIC PCIACCESS VBOX_NO_LOW_COLOUR VBOX_DRI
++ IN_XF86_MODULE IN_RT_STATIC VBOXVIDEO_13 NO_ANSIC PCIACCESS VBOX_NO_LOW_COLOUR VBOX_DRI XSERVER_LIBPCIACCESS XORG_VERSION_CURRENT=101300000
+vboxvideo_drv_17_INCS = \
+ /usr/include/drm \
+ /usr/include/X11/dri \
@@ -262,6 +244,22 @@
+endif # NOT_FEDORA
+
include $(FILE_KBUILD_SUB_FOOTER)
+--- ./src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 19:57:53.762613198 +0000
++++ ./src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 20:01:17.296596446 +0000
+@@ -36,11 +36,11 @@ endif # !VBOX_ONLY_SDK
+ #
+ tstSetModeXOrg_TEMPLATE = VBOXR3TSTEXE
+ tstSetModeXOrg_CFLAGS += -std=c99
+-tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_15_DEFS)) TESTCASE
++tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_17_DEFS)) TESTCASE
+ tstSetModeXOrg_SOURCES = \
+ tstSetModeXOrg.c \
+ ../setmode.c
+-tstSetModeXOrg_INCS = $(vboxvideo_drv_15_INCS)
++tstSetModeXOrg_INCS = $(vboxvideo_drv_17_INCS)
+
+
+ # 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 = \
@@ -279,8 +277,6 @@
VBoxGuestR3LibRuntimeXF86.cpp_CXXFLAGS = -Wno-shadow
-# inspired from http://opensource.apple.com/source/X11server/X11server-85/kdrive/xorg-server-1.6.0/hw/xfree86/dummylib/
-#xalloc.c and verrorf.c
--- ./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 @@
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- VirtualBox.spec 13 Sep 2012 21:50:30 -0000 1.25
+++ VirtualBox.spec 15 Sep 2012 03:32:01 -0000 1.26
@@ -10,12 +10,12 @@
# 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 RC4
+#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
Name: VirtualBox
Version: 4.2.0
-Release: 0.7%{?prerel:.%{prerel}}%{?dist}
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -34,12 +34,14 @@
Patch2: VirtualBox-4.1.18-strings.patch
Patch3: VirtualBox-4.2.0-libcxx.patch
Patch5: VirtualBox-4.2.0-xorg17.patch
+%ifarch x86_64
+Patch10: VirtualBox-4.2.0-32bit.patch
+%endif
Patch15: VirtualBox-OSE-4.0.0-makeself.patch
Patch17: VirtualBox-OSE-4.0.0-beramono.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
Patch22: VirtualBox-OSE-4.1.12-gsoap.patch
-Patch23: VirtualBox-OSE-4.1.10-mesa.patch
-Patch24: VirtualBox-4.1.20-x113.patch
+Patch23: VirtualBox-4.2.0-mesa.patch
%if 0%{?fedora} < 16
BuildRequires: kBuild >= 0.1.98
@@ -61,7 +63,10 @@
BuildRequires: java-devel >= 1.6
BuildRequires: /usr/bin/pdflatex
BuildRequires: libpng-devel
-BuildRequires: glibc(x86-32) glibc-devel(x86-32) libstdc++(x86-32)
+#BuildRequires: glibc(x86-32) glibc-devel(x86-32) libstdc++(x86-32)
+#BuildRequires: glibc.i686 glibc-devel.i686 libstdc++.i686
+#BuildRequires: /usr/lib/libc.so
+#BuildRequires: /usr/lib/libstdc++.so.6 /lib/libc.so.6
# For the X11 module
BuildRequires: libdrm-devel
@@ -176,15 +181,15 @@
%patch3 -p1 -b .libcxx
%patch5 -p1 -b .xorg17
%patch15 -p1 -b .makeself
+%ifarch x86_64
+%patch10 -p1 -b .32bit
+%endif
%patch17 -p1 -b .beramono
%patch18 -p1 -b .aiobug
%if 0%{?fedora} < 16
%patch22 -p1 -b .gsoap
%endif
%patch23 -p1 -b .mesa
-#if 0%{?fedora} > 17
-#patch24 -p1 -b .x113
-#endif
# Remove prebuilt binary tools
%if 0%{?fedora} < 16
@@ -549,6 +554,13 @@
%changelog
+* Thu Sep 13 2012 Sérgio Basto <sergio at serjux.com> - 4.2.0-1
+- 4.2.0 released
+- Rebase and rework VirtualBox-4.2.0-xorg17.patch, add 2 new Definitions: XSERVER_LIBPCIACCESS XORG_VERSION_CURRENT=101300000
+- Rename and rework VirtualBox-OSE-4.1.10-mesa.patch
+- Reorganize last 2 patches.
+- Revert attempt to remove 32-bits patch.
+
* Thu Sep 13 2012 Sérgio Basto <sergio at serjux.com> - 4.2.0-0.7.RC4
- Another try to compile with 32-bits suport on x86_64.
--- VirtualBox-OSE-4.1.10-mesa.patch DELETED ---
- Previous message: rpms/VirtualBox/F-18 VirtualBox.spec,1.18,1.19
- Next message: rpms/VirtualBox/F-18 VirtualBox-4.2.0-mesa.patch, NONE, 1.1 VirtualBox-4.2.0-xorg17.patch, 1.2, 1.3 VirtualBox.spec, 1.19, 1.20 VirtualBox-OSE-4.1.10-mesa.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the rpmfusion-commits
mailing list