rpms/VirtualBox/F-20 VirtualBox-4.3.10-gcc.patch, NONE, 1.1 VirtualBox-4.3.10-xserver_guest.patch, NONE, 1.1 .cvsignore, 1.53, 1.54 VirtualBox.spec, 1.58, 1.59 sources, 1.53, 1.54 VirtualBox-4.2.6-gcc48.patch, 1.1, NONE VirtualBox-4.3.6-mesa.patch, 1.2, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31195
Modified Files:
.cvsignore VirtualBox.spec sources
Added Files:
VirtualBox-4.3.10-gcc.patch
VirtualBox-4.3.10-xserver_guest.patch
Removed Files:
VirtualBox-4.2.6-gcc48.patch VirtualBox-4.3.6-mesa.patch
Log Message:
* Fri May 16 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.12-1
- New upstream release .
- Rename and split X11 and mesa (for guest) patches .
VirtualBox-4.3.10-gcc.patch:
configure | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE VirtualBox-4.3.10-gcc.patch ---
--- ./configure.gcc 2014-05-02 19:18:06.929223329 +0100
+++ ./configure 2014-05-02 19:21:11.010309549 +0100
@@ -420,9 +420,9 @@ check_gcc()
elif [ $cc_maj -lt 3 \
-o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
-o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
- -o \( $cc_maj -eq 4 -a $cc_min -gt 8 \) \
+ -o \( $cc_maj -eq 4 -a $cc_min -gt 9 \) \
-o $cc_maj -gt 4 ]; then
- log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<8"
+ log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<10"
fail really
else
log_success "found version $cc_ver"
VirtualBox-4.3.10-xserver_guest.patch:
Makefile.kmk | 35 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 16 deletions(-)
--- NEW FILE VirtualBox-4.3.10-xserver_guest.patch ---
Just compile with X11 system source and we may remove bundle X11 source code.
--- ./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
@@ -82,18 +82,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
@@ -222,11 +216,20 @@ 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
+ if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86 )
+ VBoxOGL_LIBS += \
+ /usr/lib/libXcomposite.so \
+ /usr/lib/libXdamage.so \
+ /usr/lib/libXfixes.so \
+ /usr/lib/libXext.so
+ endif
+ if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64 )
+ VBoxOGL_LIBS += \
+ /usr/lib64/libXcomposite.so \
+ /usr/lib64/libXdamage.so \
+ /usr/lib64/libXfixes.so \
+ /usr/lib64/libXext.so
+ endif
ifdef VBoxOGL_FAKEDRI
ifeq ($(KBUILD_TARGET), freebsd)
VBoxOGL_LIBS += \
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-20/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore 31 Mar 2014 01:23:05 -0000 1.53
+++ .cvsignore 17 May 2014 00:54:26 -0000 1.54
@@ -1 +1 @@
-VirtualBox-4.3.10.tar.bz2
+VirtualBox-4.3.12.tar.bz2
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-20/VirtualBox.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- VirtualBox.spec 31 Mar 2014 01:23:06 -0000 1.58
+++ VirtualBox.spec 17 May 2014 00:54:26 -0000 1.59
@@ -26,7 +26,7 @@
#endif
Name: VirtualBox
-Version: 4.3.10
+Version: 4.3.12
Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -49,9 +49,10 @@
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-4.3.6-mesa.patch
+Patch23: VirtualBox-4.3.10-xserver_guest.patch
Patch24: VirtualBox-4.3.0-VBoxGuestLib.patch
Patch26: VirtualBox-4.3.0-no-bundles.patch
+Patch27: VirtualBox-4.3.10-gcc.patch
%if 0%{?fedora} < 16
BuildRequires: kBuild >= 0.1.98
@@ -230,9 +231,10 @@
%if 0%{?fedora} < 16
%patch22 -p1 -b .gsoap
%endif
-%patch23 -p1 -b .mesa
+%patch23 -p1 -b .xserver_guest
%patch24 -p1 -b .guestlib
%patch26 -p1 -b .nobundles
+%patch27 -p1 -b .gcc
# CRLF->LF
sed -i 's/\r//' COPYING
@@ -242,8 +244,7 @@
%if %{enable_webservice}
--enable-webservice \
%endif
-%if %{enable_docs}
-%else
+%if !%{enable_docs}
--disable-docs \
%endif
@@ -442,8 +443,8 @@
install -p -m 0644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-vboxguest.rules
# Install modules load script
-install -p -m 0755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}.conf
-install -p -m 0755 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}-guest.conf
+install -p -m 0644 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}.conf
+install -p -m 0644 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/modules-load.d/%{name}-guest.conf
# Module Source Code
mkdir -p %{name}-kmod-%{version}
@@ -619,6 +620,13 @@
%changelog
+* Fri May 16 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.12-1
+- New upstream release .
+- Rename and split X11 and mesa (for guest) patches .
+
+* Fri May 02 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.10-2
+- Rebuild for new x11-xorg-server
+
* Mon Mar 31 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.10-1
- In vboxvideo guest drive, don't patch the source code of Mesa part that use glapi and use bundled
x11include/mesa-7.2 headers of Mesa, which btw rawhide doesn't have it, F20 have glapi in xorg-x11-server-source, but by what
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-20/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- sources 31 Mar 2014 01:23:06 -0000 1.53
+++ sources 17 May 2014 00:54:26 -0000 1.54
@@ -1 +1 @@
-c3e9e61d5ed7c672bfc747fb8df4367b VirtualBox-4.3.10.tar.bz2
+b31908e98f6c271c59b97ce8154e31da VirtualBox-4.3.12.tar.bz2
--- VirtualBox-4.2.6-gcc48.patch DELETED ---
--- VirtualBox-4.3.6-mesa.patch DELETED ---
9 years, 11 months
rpms/VirtualBox/devel .cvsignore,1.54,1.55 sources,1.54,1.55
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30844
Modified Files:
.cvsignore sources
Log Message:
* Fri May 16 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.12-1
- New upstream release .
- Rename and split X11 and mesa (for guest) patches .
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore 31 Mar 2014 01:13:25 -0000 1.54
+++ .cvsignore 17 May 2014 00:37:28 -0000 1.55
@@ -1 +1 @@
-VirtualBox-4.3.10.tar.bz2
+VirtualBox-4.3.12.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources 31 Mar 2014 01:13:25 -0000 1.54
+++ sources 17 May 2014 00:37:28 -0000 1.55
@@ -1 +1 @@
-c3e9e61d5ed7c672bfc747fb8df4367b VirtualBox-4.3.10.tar.bz2
+b31908e98f6c271c59b97ce8154e31da VirtualBox-4.3.12.tar.bz2
9 years, 11 months
rpms/VirtualBox/devel VirtualBox-4.3.10-mesa_guest.patch, NONE, 1.1 VirtualBox-4.3.10-xserver_guest.patch, NONE, 1.1 VirtualBox.spec, 1.61, 1.62 VirtualBox-4.3.6-mesa.patch, 1.4, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30728
Modified Files:
VirtualBox.spec
Added Files:
VirtualBox-4.3.10-mesa_guest.patch
VirtualBox-4.3.10-xserver_guest.patch
Removed Files:
VirtualBox-4.3.6-mesa.patch
Log Message:
* Fri May 16 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.12-1
- New upstream release .
- Rename and split X11 and mesa (for guest) patches .
VirtualBox-4.3.10-mesa_guest.patch:
Config.kmk | 10 ---
src/VBox/Additions/common/crOpenGL/fakedri_drv.c | 70 +----------------------
src/VBox/Additions/common/crOpenGL/fakedri_drv.h | 12 +--
3 files changed, 13 insertions(+), 79 deletions(-)
--- NEW FILE VirtualBox-4.3.10-mesa_guest.patch ---
fakedri_drv.c,h:
remove vboxPatchMesaGLAPITable function call that depends $(VBOX_PATH_X11_ROOT)/mesa-7.2
and we may remove bundle mesa-7.2 source code.
--- ./Config.kmk 2012-03-13 13:14:01.000000000 +0000
+++ ./Config.kmk 2012-03-27 23:55:28.070630137 +0100
@@ -2166,15 +2166,9 @@ 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
+ /usr/share/xorg-x11-server-source/ \
+ /usr/share/xorg-x11-server-source/include
endif
VBOX_DARWIN_OPENGL_INST = obj/VBoxOGL/GL/
--- ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h.mesa 2013-12-18 16:06:06.000000000 +0000
+++ ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2013-12-24 17:01:55.086948605 +0000
@@ -20,14 +20,12 @@
#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 <stdlib.h>
+#include <string.h>
+#include "include/xorg-server.h"
+#include <GL/glext.h>
#include "GL/internal/dri_interface.h"
+#include <xf86drm.h>
#include "glx_proto.h"
--- ./src/VBox/Additions/common/crOpenGL/fakedri_drv.c.mesa 2013-12-18 16:06:06.000000000 +0000
+++ ./src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2013-12-24 19:56:30.880070340 +0000
@@ -17,7 +17,12 @@
*/
#define _GNU_SOURCE 1
+#define HAVE_STRNDUP 1
+#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"
@@ -38,20 +42,6 @@
#include <string.h>
#endif
-/** 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
@@ -127,7 +117,6 @@ typedef struct _FAKEDRI_PatchNode
static FAKEDRI_PatchNode *g_pFreeList=NULL, *g_pRepatchList=NULL;
#endif
-static struct _glapi_table* vbox_glapi_table = NULL;
fakedri_glxapi_table glxim;
static const __DRIextension **gppSwDriExternsion = NULL;
@@ -136,54 +125,6 @@ static const __DRIswrastExtension *gpSwD
extern const __DRIextension * __driDriverExtensions[];
-#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); \
- 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);
-
-static void
-vboxPatchMesaExport(const char* psFuncName, const void *pStart, const void *pEnd);
-
-static void
-vboxPatchMesaGLAPITable()
-{
- void *pGLTable;
-
- pGLTable = (void *)_glapi_get_dispatch();
- vbox_glapi_table = crAlloc(_glapi_get_dispatch_table_size() * sizeof (void *));
- if (!vbox_glapi_table)
- {
- crError("Not enough memory to allocate dispatch table");
- }
- crMemcpy(vbox_glapi_table, pGLTable, _glapi_get_dispatch_table_size() * sizeof (void *));
-
- #include "fakedri_glfuncsList.h"
-
- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glBlendEquationSeparateEXT", cr_glBlendEquationSeparate);
- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glSampleMaskSGIS", cr_glSampleMaskEXT);
- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glSamplePatternSGIS", cr_glSamplePatternEXT);
- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2dMESA", cr_glWindowPos2d);
- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2dvMESA", cr_glWindowPos2dv);
- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2fMESA", cr_glWindowPos2f);
- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2fvMESA", cr_glWindowPos2fv);
- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2iMESA", cr_glWindowPos2i);
- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2ivMESA", cr_glWindowPos2iv);
- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2sMESA", cr_glWindowPos2s);
- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2svMESA", cr_glWindowPos2sv);
- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3dMESA", cr_glWindowPos3d);
- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3dvMESA", cr_glWindowPos3dv);
- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3fMESA", cr_glWindowPos3f);
- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3fvMESA", cr_glWindowPos3fv);
- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3iMESA", cr_glWindowPos3i);
- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3ivMESA", cr_glWindowPos3iv);
- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3sMESA", cr_glWindowPos3s);
- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3svMESA", cr_glWindowPos3sv);
-
- _glapi_set_dispatch(vbox_glapi_table);
-};
-#undef GLAPI_ENTRY
-
#define GLXAPI_ENTRY(Func) pGLXTable->Func = VBOXGLXTAG(glX##Func);
static void
vboxFillGLXAPITable(fakedri_glxapi_table *pGLXTable)
@@ -686,7 +627,7 @@ void __attribute__ ((constructor)) vbox_
* Note, we don't need to install extension functions via _glapi_add_dispatch, because we'd override glXGetProcAddress.
*/
/* Mesa's dispatch table is different across library versions, have to modify mesa's table using offset info functions*/
- vboxPatchMesaGLAPITable();
+ //vboxPatchMesaGLAPITable();
/* Handle glx api.
* In the end application call would look like this:
VirtualBox-4.3.10-xserver_guest.patch:
Makefile.kmk | 35 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 16 deletions(-)
--- NEW FILE VirtualBox-4.3.10-xserver_guest.patch ---
Just compile with X11 system source and we may remove bundle X11 source code.
--- ./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
@@ -82,18 +82,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
@@ -222,11 +216,20 @@ 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
+ if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86 )
+ VBoxOGL_LIBS += \
+ /usr/lib/libXcomposite.so \
+ /usr/lib/libXdamage.so \
+ /usr/lib/libXfixes.so \
+ /usr/lib/libXext.so
+ endif
+ if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64 )
+ VBoxOGL_LIBS += \
+ /usr/lib64/libXcomposite.so \
+ /usr/lib64/libXdamage.so \
+ /usr/lib64/libXfixes.so \
+ /usr/lib64/libXext.so
+ endif
ifdef VBoxOGL_FAKEDRI
ifeq ($(KBUILD_TARGET), freebsd)
VBoxOGL_LIBS += \
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- VirtualBox.spec 2 May 2014 18:55:30 -0000 1.61
+++ VirtualBox.spec 17 May 2014 00:32:44 -0000 1.62
@@ -26,8 +26,8 @@
#endif
Name: VirtualBox
-Version: 4.3.10
-Release: 2%{?prerel:.%{prerel}}%{?dist}
+Version: 4.3.12
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -49,7 +49,7 @@
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-4.3.6-mesa.patch
+Patch23: VirtualBox-4.3.10-xserver_guest.patch
Patch24: VirtualBox-4.3.0-VBoxGuestLib.patch
Patch26: VirtualBox-4.3.0-no-bundles.patch
Patch27: VirtualBox-4.3.10-gcc.patch
@@ -231,7 +231,7 @@
%if 0%{?fedora} < 16
%patch22 -p1 -b .gsoap
%endif
-%patch23 -p1 -b .mesa
+%patch23 -p1 -b .xserver_guest
%patch24 -p1 -b .guestlib
%patch26 -p1 -b .nobundles
%patch27 -p1 -b .gcc
@@ -620,6 +620,10 @@
%changelog
+* Fri May 16 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.12-1
+- New upstream release .
+- Rename and split X11 and mesa (for guest) patches .
+
* Fri May 02 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.10-2
- Rebuild for new x11-xorg-server
--- VirtualBox-4.3.6-mesa.patch DELETED ---
9 years, 11 months
rpms/steam/F-19 steam.spec,1.10,1.11
by Simone Caronni
Author: slaanesh
Update of /cvs/nonfree/rpms/steam/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28834
Modified Files:
steam.spec
Log Message:
* Thu May 15 2014 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.47-4
- Update noruntime subpackage requirements.
Index: steam.spec
===================================================================
RCS file: /cvs/nonfree/rpms/steam/F-19/steam.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- steam.spec 5 May 2014 07:12:53 -0000 1.10
+++ steam.spec 15 May 2014 08:10:57 -0000 1.11
@@ -3,7 +3,7 @@
Name: steam
Version: 1.0.0.47
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Installer for the Steam software distribution service
# Redistribution and repackaging for Linux is allowed, see license file
License: Steam License Agreement
@@ -66,28 +66,24 @@
Requires: libasyncns%{_isa}
Requires: libattr%{_isa}
Requires: libffi%{_isa}
+Requires: libgcrypt%{_isa}
Requires: libsndfile%{_isa}
Requires: libusbx%{_isa}
Requires: libXau%{_isa}
Requires: libXdmcp%{_isa}
Requires: mesa-dri-drivers%{_isa}
Requires: mesa-libEGL%{_isa}
-Requires: mesa-libgbm%{_isa}
Requires: NetworkManager-glib%{_isa}
Requires: openal-soft%{_isa}
-Requires: openssl-libs%{_isa}
Requires: pcre%{_isa}
Requires: pixman%{_isa}
-Requires: pulseaudio-libs%{_isa}
Requires: tcp_wrappers-libs%{_isa}
# Additional requirements for games that use the Steam runtime libraries
-%if 0%{?fedora} >= 19
-Requires: SDL2_image%{_isa}
-Requires: SDL2_mixer%{_isa}
-%endif
Requires: SDL_image%{_isa}
Requires: SDL_mixer%{_isa}
Requires: SDL_ttf%{_isa}
+Requires: SDL2_image%{_isa}
+Requires: SDL2_mixer%{_isa}
%description noruntime
The Steam client normally uses a set of libraries derived from Ubuntu (the Steam
@@ -98,7 +94,6 @@
it. Please note that this is not a supported Valve configuration and it may lead
to unexpected results.
-
%prep
%setup -q -n %{name}
%patch0 -p1
@@ -106,11 +101,9 @@
sed -i 's/\r$//' steam_install_agreement.txt
cp %{SOURCE10} .
-
%build
# Nothing to build
-
%install
# Steam package
make install DESTDIR=%{buildroot}
@@ -125,7 +118,6 @@
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
install -pm 644 %{SOURCE1} %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d
-
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/update-desktop-database &> /dev/null || :
@@ -140,7 +132,6 @@
%posttrans
%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
%files
%doc README COPYING steam_install_agreement.txt debian/changelog README.Fedora
%{_bindir}/%{name}
@@ -156,6 +147,9 @@
%config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
%changelog
+* Thu May 15 2014 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.47-4
+- Update noruntime subpackage requirements.
+
* Mon May 05 2014 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.47-3
- Add new libbz2.so requirement.
9 years, 11 months
rpms/steam/F-20 steam.spec,1.10,1.11
by Simone Caronni
Author: slaanesh
Update of /cvs/nonfree/rpms/steam/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28731
Modified Files:
steam.spec
Log Message:
* Thu May 15 2014 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.47-4
- Update noruntime subpackage requirements.
Index: steam.spec
===================================================================
RCS file: /cvs/nonfree/rpms/steam/F-20/steam.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- steam.spec 5 May 2014 07:12:38 -0000 1.10
+++ steam.spec 15 May 2014 08:10:42 -0000 1.11
@@ -3,7 +3,7 @@
Name: steam
Version: 1.0.0.47
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Installer for the Steam software distribution service
# Redistribution and repackaging for Linux is allowed, see license file
License: Steam License Agreement
@@ -66,28 +66,24 @@
Requires: libasyncns%{_isa}
Requires: libattr%{_isa}
Requires: libffi%{_isa}
+Requires: libgcrypt%{_isa}
Requires: libsndfile%{_isa}
Requires: libusbx%{_isa}
Requires: libXau%{_isa}
Requires: libXdmcp%{_isa}
Requires: mesa-dri-drivers%{_isa}
Requires: mesa-libEGL%{_isa}
-Requires: mesa-libgbm%{_isa}
Requires: NetworkManager-glib%{_isa}
Requires: openal-soft%{_isa}
-Requires: openssl-libs%{_isa}
Requires: pcre%{_isa}
Requires: pixman%{_isa}
-Requires: pulseaudio-libs%{_isa}
Requires: tcp_wrappers-libs%{_isa}
# Additional requirements for games that use the Steam runtime libraries
-%if 0%{?fedora} >= 19
-Requires: SDL2_image%{_isa}
-Requires: SDL2_mixer%{_isa}
-%endif
Requires: SDL_image%{_isa}
Requires: SDL_mixer%{_isa}
Requires: SDL_ttf%{_isa}
+Requires: SDL2_image%{_isa}
+Requires: SDL2_mixer%{_isa}
%description noruntime
The Steam client normally uses a set of libraries derived from Ubuntu (the Steam
@@ -98,7 +94,6 @@
it. Please note that this is not a supported Valve configuration and it may lead
to unexpected results.
-
%prep
%setup -q -n %{name}
%patch0 -p1
@@ -106,11 +101,9 @@
sed -i 's/\r$//' steam_install_agreement.txt
cp %{SOURCE10} .
-
%build
# Nothing to build
-
%install
# Steam package
make install DESTDIR=%{buildroot}
@@ -125,7 +118,6 @@
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
install -pm 644 %{SOURCE1} %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d
-
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/update-desktop-database &> /dev/null || :
@@ -140,7 +132,6 @@
%posttrans
%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
%files
%doc README COPYING steam_install_agreement.txt debian/changelog README.Fedora
%{_bindir}/%{name}
@@ -156,6 +147,9 @@
%config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
%changelog
+* Thu May 15 2014 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.47-4
+- Update noruntime subpackage requirements.
+
* Mon May 05 2014 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.47-3
- Add new libbz2.so requirement.
9 years, 11 months
rpms/steam/devel steam.spec,1.10,1.11
by Simone Caronni
Author: slaanesh
Update of /cvs/nonfree/rpms/steam/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28586
Modified Files:
steam.spec
Log Message:
* Thu May 15 2014 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.47-4
- Update noruntime subpackage requirements.
Index: steam.spec
===================================================================
RCS file: /cvs/nonfree/rpms/steam/devel/steam.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- steam.spec 5 May 2014 07:12:17 -0000 1.10
+++ steam.spec 15 May 2014 08:10:29 -0000 1.11
@@ -3,7 +3,7 @@
Name: steam
Version: 1.0.0.47
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Installer for the Steam software distribution service
# Redistribution and repackaging for Linux is allowed, see license file
License: Steam License Agreement
@@ -66,28 +66,24 @@
Requires: libasyncns%{_isa}
Requires: libattr%{_isa}
Requires: libffi%{_isa}
+Requires: libgcrypt%{_isa}
Requires: libsndfile%{_isa}
Requires: libusbx%{_isa}
Requires: libXau%{_isa}
Requires: libXdmcp%{_isa}
Requires: mesa-dri-drivers%{_isa}
Requires: mesa-libEGL%{_isa}
-Requires: mesa-libgbm%{_isa}
Requires: NetworkManager-glib%{_isa}
Requires: openal-soft%{_isa}
-Requires: openssl-libs%{_isa}
Requires: pcre%{_isa}
Requires: pixman%{_isa}
-Requires: pulseaudio-libs%{_isa}
Requires: tcp_wrappers-libs%{_isa}
# Additional requirements for games that use the Steam runtime libraries
-%if 0%{?fedora} >= 19
-Requires: SDL2_image%{_isa}
-Requires: SDL2_mixer%{_isa}
-%endif
Requires: SDL_image%{_isa}
Requires: SDL_mixer%{_isa}
Requires: SDL_ttf%{_isa}
+Requires: SDL2_image%{_isa}
+Requires: SDL2_mixer%{_isa}
%description noruntime
The Steam client normally uses a set of libraries derived from Ubuntu (the Steam
@@ -98,7 +94,6 @@
it. Please note that this is not a supported Valve configuration and it may lead
to unexpected results.
-
%prep
%setup -q -n %{name}
%patch0 -p1
@@ -106,11 +101,9 @@
sed -i 's/\r$//' steam_install_agreement.txt
cp %{SOURCE10} .
-
%build
# Nothing to build
-
%install
# Steam package
make install DESTDIR=%{buildroot}
@@ -125,7 +118,6 @@
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
install -pm 644 %{SOURCE1} %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d
-
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/update-desktop-database &> /dev/null || :
@@ -140,7 +132,6 @@
%posttrans
%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
%files
%doc README COPYING steam_install_agreement.txt debian/changelog README.Fedora
%{_bindir}/%{name}
@@ -156,6 +147,9 @@
%config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
%changelog
+* Thu May 15 2014 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.47-4
+- Update noruntime subpackage requirements.
+
* Mon May 05 2014 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.47-3
- Add new libbz2.so requirement.
9 years, 11 months
rpms/wl-kmod/F-19 wl-kmod.spec,1.121,1.122
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/wl-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23514
Modified Files:
wl-kmod.spec
Log Message:
* Thu May 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-1.30
- Rebuilt for kernel
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-19/wl-kmod.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- wl-kmod.spec 25 Apr 2014 12:40:54 -0000 1.121
+++ wl-kmod.spec 15 May 2014 06:07:28 -0000 1.122
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 6.30.223.141
-Release: 1%{?dist}.29
+Release: 1%{?dist}.30
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -90,6 +90,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu May 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-1.30
+- Rebuilt for kernel
+
* Fri Apr 25 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-1.29
- Rebuilt for kernel
9 years, 11 months
rpms/nvidia-kmod/F-19 nvidia-kmod.spec,1.184,1.185
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23393
Modified Files:
nvidia-kmod.spec
Log Message:
* Thu May 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.67-1.3
- Rebuilt for kernel
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/nvidia-kmod.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- nvidia-kmod.spec 25 Apr 2014 12:40:48 -0000 1.184
+++ nvidia-kmod.spec 15 May 2014 06:07:23 -0000 1.185
@@ -9,7 +9,7 @@
Epoch: 1
Version: 331.67
# Taken over by kmodtool
-Release: 1%{?dist}.2
+Release: 1%{?dist}.3
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -97,6 +97,9 @@
%changelog
+* Thu May 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.67-1.3
+- Rebuilt for kernel
+
* Fri Apr 25 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.67-1.2
- Rebuilt for kernel
9 years, 11 months
rpms/nvidia-304xx-kmod/F-19 nvidia-304xx-kmod.spec,1.51,1.52
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23271
Modified Files:
nvidia-304xx-kmod.spec
Log Message:
* Thu May 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 304.119-2.12
- Rebuilt for kernel
Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/F-19/nvidia-304xx-kmod.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- nvidia-304xx-kmod.spec 25 Apr 2014 12:40:43 -0000 1.51
+++ nvidia-304xx-kmod.spec 15 May 2014 06:07:18 -0000 1.52
@@ -8,7 +8,7 @@
Name: nvidia-304xx-kmod
Version: 304.119
# Taken over by kmodtool
-Release: 2%{?dist}.11
+Release: 2%{?dist}.12
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -80,6 +80,9 @@
%changelog
+* Thu May 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 304.119-2.12
+- Rebuilt for kernel
+
* Fri Apr 25 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 304.119-2.11
- Rebuilt for kernel
9 years, 11 months
rpms/nvidia-173xx-kmod/F-19 nvidia-173xx-kmod.spec,1.96,1.97
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23145
Modified Files:
nvidia-173xx-kmod.spec
Log Message:
* Thu May 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.38-2.12
- Rebuilt for kernel
Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-19/nvidia-173xx-kmod.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- nvidia-173xx-kmod.spec 25 Apr 2014 12:40:37 -0000 1.96
+++ nvidia-173xx-kmod.spec 15 May 2014 06:07:12 -0000 1.97
@@ -8,7 +8,7 @@
Name: nvidia-173xx-kmod
Version: 173.14.38
# Taken over by kmodtool
-Release: 2%{?dist}.11
+Release: 2%{?dist}.12
Summary: NVIDIA 173xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -90,6 +90,9 @@
%changelog
+* Thu May 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.38-2.12
+- Rebuilt for kernel
+
* Fri Apr 25 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.38-2.11
- Rebuilt for kernel
9 years, 11 months