rpmfusion-commits
September 2012
rpmfusion-commits@lists.rpmfusion.org
- 17 participants
- 284 discussions
rpms/x264/F-18 .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 x264.spec, 1.42, 1.43
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/x264/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15724
Modified Files:
.cvsignore sources x264.spec
Log Message:
* Sun Sep 09 2012 Sérgio Basto <sergio(a)serjux.com> - 0.125-3.20120909
- update x264-0.125 from r2201 to r2209.
* Tue Sep 04 2012 Sérgio Basto <sergio(a)serjux.com> - 0.125-1.20120904
- Pulled latest stable patches, which bump version to 0.125.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/F-18/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore 17 Jun 2012 02:52:30 -0000 1.21
+++ .cvsignore 9 Sep 2012 16:00:32 -0000 1.22
@@ -1 +1 @@
-x264-stable-20120616.tar.bz2
+x264-stable-20120909.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/F-18/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 17 Jun 2012 02:52:30 -0000 1.21
+++ sources 9 Sep 2012 16:00:32 -0000 1.22
@@ -1 +1 @@
-e754da06d665c307dd70b5a7edf6fde1 x264-stable-20120616.tar.bz2
+c8cf985a5c6dc213d01a26af79153156 x264-stable-20120909.tar.bz2
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/F-18/x264.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- x264.spec 25 Jun 2012 21:25:11 -0000 1.42
+++ x264.spec 9 Sep 2012 16:00:32 -0000 1.43
@@ -1,6 +1,8 @@
-%global snapshot 20120616
+%global snapshot 20120909
%global branch stable
+%global _with_bootstrap 1
+
%{?_with_bootstrap:
%global _without_gpac 1
%global _without_libavformat 1
@@ -17,8 +19,8 @@
Summary: H264/AVC video streams encoder
Name: x264
-Version: 0.124
-Release: 5.%{snapshot}%{?dist}
+Version: 0.125
+Release: 3.%{snapshot}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -184,6 +186,15 @@
%{_libdir}/libx26410b.so
%changelog
+* Sun Sep 09 2012 Sérgio Basto <sergio(a)serjux.com> - 0.125-3.20120909
+- update x264-0.125 from r2201 to r2209.
+
+* Thu Sep 06 2012 Sérgio Basto <sergio(a)serjux.com> - 0.125-2.20120904
+- unbootstrap
+
+* Tue Sep 04 2012 Sérgio Basto <sergio(a)serjux.com> - 0.125-1.20120904
+- Pulled latest stable patches, which bump version to 0.125.
+
* Mon Jun 25 2012 Sérgio Basto <sergio(a)serjux.com> - 0.124-5.20120616
- Fixed detection of gf_malloc and gf_free
12 years, 3 months
- 1
- 0
rpms/x264/devel .cvsignore, 1.22, 1.23 sources, 1.22, 1.23 x264.spec, 1.45, 1.46
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/x264/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7579
Modified Files:
.cvsignore sources x264.spec
Log Message:
* Sun Sep 09 2012 Sérgio Basto <sergio(a)serjux.com> - 0.125-3.20120909
- update x264-0.125 from r2201 to r2209.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore 4 Sep 2012 20:27:29 -0000 1.22
+++ .cvsignore 9 Sep 2012 03:44:38 -0000 1.23
@@ -1 +1 @@
-x264-stable-20120904.tar.bz2
+x264-stable-20120909.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 4 Sep 2012 20:27:29 -0000 1.22
+++ sources 9 Sep 2012 03:44:38 -0000 1.23
@@ -1 +1 @@
-3d3982c026de90d4b6039036285af00a x264-stable-20120904.tar.bz2
+c8cf985a5c6dc213d01a26af79153156 x264-stable-20120909.tar.bz2
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- x264.spec 5 Sep 2012 23:32:52 -0000 1.45
+++ x264.spec 9 Sep 2012 03:44:38 -0000 1.46
@@ -1,4 +1,4 @@
-%global snapshot 20120904
+%global snapshot 20120909
%global branch stable
#global _with_bootstrap 1
@@ -20,7 +20,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.125
-Release: 2.%{snapshot}%{?dist}
+Release: 3.%{snapshot}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -186,6 +186,9 @@
%{_libdir}/libx26410b.so
%changelog
+* Sun Sep 09 2012 Sérgio Basto <sergio(a)serjux.com> - 0.125-3.20120909
+- update x264-0.125 from r2201 to r2209.
+
* Thu Sep 06 2012 Sérgio Basto <sergio(a)serjux.com> - 0.125-2.20120904
- unbootstrap
12 years, 3 months
- 1
- 0
rpms/VirtualBox-kmod/F-18 VirtualBox-kmod.spec,1.6,1.7
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1184
Modified Files:
VirtualBox-kmod.spec
Log Message:
* 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/F-18/VirtualBox-kmod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VirtualBox-kmod.spec 8 Sep 2012 03:30:49 -0000 1.6
+++ VirtualBox-kmod.spec 9 Sep 2012 02:49:50 -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 0.6
+%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: 0.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,10 @@
%changelog
+* 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, 3 months
- 1
- 0
rpms/VirtualBox/F-18 VirtualBox-4.2.0-32bit.patch, NONE, 1.1 .cvsignore, 1.38, 1.39 VirtualBox-4.2.0-xorg17.patch, 1.1, 1.2 VirtualBox.spec, 1.16, 1.17 sources, 1.38, 1.39 VirtualBox-OSE-4.0.0-32bit.patch, 1.2, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9102
Modified Files:
.cvsignore VirtualBox-4.2.0-xorg17.patch VirtualBox.spec
sources
Added Files:
VirtualBox-4.2.0-32bit.patch
Removed Files:
VirtualBox-OSE-4.0.0-32bit.patch
Log Message:
* Sun Sep 09 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.6.RC4
- Update to RC4.
- Rename 32-bits patch to VirtualBox-4.2.0-32bit.patch
- Drop patch23 to fix ABI/API breakages in X11 1.13, appears fixed in RC4 !
- Compile VBoxGuestLib with X11 sources from system and fix VBoxGuestR3LibRuntimeXF86.cpp.
- Removes X11 includes from sources (src/VBox/Additions/x11/x11include).
VirtualBox-4.2.0-32bit.patch:
configure | 2 +-
src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++
src/VBox/VMM/testcase/Makefile.kmk | 13 ++++++++++---
3 files changed, 19 insertions(+), 4 deletions(-)
--- NEW FILE VirtualBox-4.2.0-32bit.patch ---
>From a9548501755beeec6fa11b0c261f167164a4ee70 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Fri, 26 Mar 2010 04:44:55 +0100
Subject: [PATCH] Build on x86_64 without 32bit toolchain.
This disables the check for 32bit toolchain and tests that need it
(boo).
---
configure | 2 +-
src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++
src/VBox/VMM/testcase/Makefile.kmk | 9 +++++++++
3 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
index 42ce775..0932637 100755
--- a/configure
+++ b/configure
@@ -2525,7 +2525,7 @@ if [ "$OS" = "linux" ]; then
fi
check_libcap
check_compiler_h
- [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
+ #[ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
# tools/common/makeself*
#[ $OSE -ge 1 ] && check_makeself
fi
diff --git a/src/VBox/Devices/testcase/Makefile.kmk b/src/VBox/Devices/testcase/Makefile.kmk
index 4debf81..59dae0d 100644
--- a/src/VBox/Devices/testcase/Makefile.kmk
+++ b/src/VBox/Devices/testcase/Makefile.kmk
@@ -45,22 +45,28 @@ VBOX_DEVICES_TESTS_FEATURES = \
# We setup one 'other' target for executing the structure & alignment
# validation testcases. Perhaps a bit hackish, but extremely useful.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
OTHERS += \
$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
endif
endif
+endif
# The normal testing pass.
+ifneq ($(KBUILD_HOST_ARCH),amd64)
TESTING += \
$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
+endif
ifdef VBOX_WITH_RAW_MODE
#
# The testcase generator.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
PROGRAMS += tstDeviceStructSizeRC
+endif
tstDeviceStructSizeRC_TEMPLATE = VBoxRcExe
tstDeviceStructSizeRC_DEFS = $(VBOX_DEVICES_TESTS_FEATURES)
tstDeviceStructSizeRC_SOURCES = tstDeviceStructSizeRC.cpp
@@ -73,7 +79,9 @@ endif # VBOX_WITH_RAW_MODE
#
# The testcase it self.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
PROGRAMS += tstDeviceStructSize
+endif
tstDeviceStructSize_TEMPLATE = VBOXR3AUTOTST
tstDeviceStructSize_DEFS = $(VBOX_DEVICES_TESTS_FEATURES)
tstDeviceStructSize_INCS = \
--- a/src/VBox/VMM/testcase/Makefile.kmk.32bit 2012-07-18 09:58:08.000000000 +0100
+++ b/src/VBox/VMM/testcase/Makefile.kmk 2012-09-02 04:04:34.551296386 +0100
@@ -21,9 +21,11 @@ include $(KBUILD_PATH)/subheader.kmk
#
# Target lists.
#
-PROGRAMS += tstVMStructSize tstAsmStructs
-ifdef VBOX_WITH_RAW_MODE
- PROGRAMS += tstVMStructRC tstAsmStructsRC
+ifneq ($(KBUILD_HOST_ARCH),amd64)
+ PROGRAMS += tstVMStructSize tstAsmStructs
+ ifdef VBOX_WITH_RAW_MODE
+ PROGRAMS += tstVMStructRC tstAsmStructsRC
+ endif
endif
if !defined(VBOX_ONLY_EXTPACKS) \
&& ( defined(VBOX_WITH_DTRACE_R3) \
@@ -77,16 +79,21 @@ BLDDIRS += $(VBOX_VMM_TESTCASE_OUT_DIR)
#
ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
+ ifneq ($(KBUILD_HOST_ARCH),amd64)
OTHERS += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
+ endif
endif
endif
# The normal testing pass.
+
+ifneq ($(KBUILD_HOST_ARCH),amd64)
TESTING += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
+endif
ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
TESTING += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore 8 Sep 2012 02:08:19 -0000 1.38
+++ .cvsignore 9 Sep 2012 01:25:00 -0000 1.39
@@ -1 +1 @@
-VirtualBox-4.2.0_RC3.tar.bz2
+VirtualBox-4.2.0_RC4.tar.bz2
VirtualBox-4.2.0-xorg17.patch:
./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk | 8
./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp | 53 ++++
./src/VBox/Additions/x11/vboxmouse/vboxmouse.c | 8
VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 40 +--
VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 108 ++++++----
b/src/VBox/Additions/common/crOpenGL/Makefile.kmk | 14 -
src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk | 4
7 files changed, 146 insertions(+), 89 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-4.2.0-xorg17.patch 8 Sep 2012 02:08:19 -0000 1.1
+++ VirtualBox-4.2.0-xorg17.patch 9 Sep 2012 01:25:00 -0000 1.2
@@ -43,25 +43,25 @@
# generate rules.
---- VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxmouse/vboxmouse.c.xorg17 2012-09-07 02:38:56.473777159 +0100
-+++ VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxmouse/vboxmouse.c 2012-09-07 02:39:11.025882086 +0100
-@@ -52,13 +52,9 @@
+--- ./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 @@
- #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
--- 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
@@ -30,25 +30,12 @@ if1of ($(KBUILD_TARGET), linux)
@@ -262,3 +262,125 @@
+endif # NOT_FEDORA
+
include $(FILE_KBUILD_SUB_FOOTER)
+--- ./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
+
+# inspired from http://opensource.apple.com/source/X11server/X11server-85/kdrive/xorg-ser...
+#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 @@
+ #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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- VirtualBox.spec 8 Sep 2012 02:08:19 -0000 1.16
+++ VirtualBox.spec 9 Sep 2012 01:25:00 -0000 1.17
@@ -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 RC3
+%global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
Name: VirtualBox
Version: 4.2.0
-Release: 0.5%{?prerel:.%{prerel}}%{?dist}
+Release: 0.6%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -35,7 +35,7 @@
Patch3: VirtualBox-4.2.0-libcxx.patch
Patch5: VirtualBox-4.2.0-xorg17.patch
%ifarch x86_64
-Patch10: VirtualBox-OSE-4.0.0-32bit.patch
+Patch10: VirtualBox-4.2.0-32bit.patch
%endif
Patch15: VirtualBox-OSE-4.0.0-makeself.patch
Patch17: VirtualBox-OSE-4.0.0-beramono.patch
@@ -192,16 +192,16 @@
%if 0%{?fedora} > 16
%patch23 -p1 -b .mesa
%endif
-%if 0%{?fedora} > 17
-%patch24 -p1 -b .x113
-%endif
+#if 0%{?fedora} > 17
+#patch24 -p1 -b .x113
+#endif
# Remove prebuilt binary tools
%if 0%{?fedora} < 16
rm -rf kBuild
%endif
rm -rf tools
-#rm -rf src/VBox/Additions/x11/x11include
+rm -rf src/VBox/Additions/x11/x11include
# CRLF->LF
sed -i 's/\r//' COPYING
@@ -557,6 +557,13 @@
%changelog
+* Sun Sep 09 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.6.RC4
+- Update to RC4.
+- Rename 32-bits patch to VirtualBox-4.2.0-32bit.patch
+- Drop patch23 to fix ABI/API breakages in X11 1.13, appears fixed in RC4 !
+- Compile VBoxGuestLib with X11 sources from system and fix VBoxGuestR3LibRuntimeXF86.cpp.
+- Removes X11 includes from sources (src/VBox/Additions/x11/x11include).
+
* Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.5.RC3
- not drop 32-bit patch, on x86_64 as quick resolution of not have glic-devel.i686 on x86_64.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources 8 Sep 2012 02:08:19 -0000 1.38
+++ sources 9 Sep 2012 01:25:00 -0000 1.39
@@ -1 +1 @@
-cc019414a29aa021d82952d763541a2c VirtualBox-4.2.0_RC3.tar.bz2
+697790b7d150569e6e3cc869242ddfe3 VirtualBox-4.2.0_RC4.tar.bz2
--- VirtualBox-OSE-4.0.0-32bit.patch DELETED ---
12 years, 3 months
- 1
- 0
rpms/VirtualBox/devel .cvsignore,1.38,1.39 sources,1.38,1.39
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8562
Modified Files:
.cvsignore sources
Log Message:
* Sun Sep 09 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.6.RC4
- Update to RC4.
- Rename 32-bits patch to VirtualBox-4.2.0-32bit.patch
- Drop patch23 to fix ABI/API breakages in X11 1.13, appears fixed in RC4 !
- Compile VBoxGuestLib with X11 sources from system and fix VBoxGuestR3LibRuntimeXF86.cpp.
- Removes X11 includes from sources (src/VBox/Additions/x11/x11include).
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore 7 Sep 2012 03:24:21 -0000 1.38
+++ .cvsignore 9 Sep 2012 01:15:33 -0000 1.39
@@ -1 +1 @@
-VirtualBox-4.2.0_RC3.tar.bz2
+VirtualBox-4.2.0_RC4.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources 7 Sep 2012 03:24:21 -0000 1.38
+++ sources 9 Sep 2012 01:15:33 -0000 1.39
@@ -1 +1 @@
-cc019414a29aa021d82952d763541a2c VirtualBox-4.2.0_RC3.tar.bz2
+697790b7d150569e6e3cc869242ddfe3 VirtualBox-4.2.0_RC4.tar.bz2
12 years, 3 months
- 1
- 0
rpms/VirtualBox/devel VirtualBox-4.2.0-32bit.patch, NONE, 1.1 VirtualBox-4.2.0-xorg17.patch, 1.2, 1.3 VirtualBox.spec, 1.23, 1.24 VirtualBox-OSE-4.0.0-32bit.patch, 1.5, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7958
Modified Files:
VirtualBox-4.2.0-xorg17.patch VirtualBox.spec
Added Files:
VirtualBox-4.2.0-32bit.patch
Removed Files:
VirtualBox-OSE-4.0.0-32bit.patch
Log Message:
* Sun Sep 09 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.6.RC4
- Update to RC4.
- Rename 32-bits patch to VirtualBox-4.2.0-32bit.patch
- Drop patch23 to fix ABI/API breakages in X11 1.13, appears fixed in RC4 !
- Compile VBoxGuestLib with X11 sources from system and fix VBoxGuestR3LibRuntimeXF86.cpp.
- Removes X11 includes from sources (src/VBox/Additions/x11/x11include).
VirtualBox-4.2.0-32bit.patch:
configure | 2 +-
src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++
src/VBox/VMM/testcase/Makefile.kmk | 13 ++++++++++---
3 files changed, 19 insertions(+), 4 deletions(-)
--- NEW FILE VirtualBox-4.2.0-32bit.patch ---
>From a9548501755beeec6fa11b0c261f167164a4ee70 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Fri, 26 Mar 2010 04:44:55 +0100
Subject: [PATCH] Build on x86_64 without 32bit toolchain.
This disables the check for 32bit toolchain and tests that need it
(boo).
---
configure | 2 +-
src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++
src/VBox/VMM/testcase/Makefile.kmk | 9 +++++++++
3 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
index 42ce775..0932637 100755
--- a/configure
+++ b/configure
@@ -2525,7 +2525,7 @@ if [ "$OS" = "linux" ]; then
fi
check_libcap
check_compiler_h
- [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
+ #[ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
# tools/common/makeself*
#[ $OSE -ge 1 ] && check_makeself
fi
diff --git a/src/VBox/Devices/testcase/Makefile.kmk b/src/VBox/Devices/testcase/Makefile.kmk
index 4debf81..59dae0d 100644
--- a/src/VBox/Devices/testcase/Makefile.kmk
+++ b/src/VBox/Devices/testcase/Makefile.kmk
@@ -45,22 +45,28 @@ VBOX_DEVICES_TESTS_FEATURES = \
# We setup one 'other' target for executing the structure & alignment
# validation testcases. Perhaps a bit hackish, but extremely useful.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
OTHERS += \
$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
endif
endif
+endif
# The normal testing pass.
+ifneq ($(KBUILD_HOST_ARCH),amd64)
TESTING += \
$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
+endif
ifdef VBOX_WITH_RAW_MODE
#
# The testcase generator.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
PROGRAMS += tstDeviceStructSizeRC
+endif
tstDeviceStructSizeRC_TEMPLATE = VBoxRcExe
tstDeviceStructSizeRC_DEFS = $(VBOX_DEVICES_TESTS_FEATURES)
tstDeviceStructSizeRC_SOURCES = tstDeviceStructSizeRC.cpp
@@ -73,7 +79,9 @@ endif # VBOX_WITH_RAW_MODE
#
# The testcase it self.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
PROGRAMS += tstDeviceStructSize
+endif
tstDeviceStructSize_TEMPLATE = VBOXR3AUTOTST
tstDeviceStructSize_DEFS = $(VBOX_DEVICES_TESTS_FEATURES)
tstDeviceStructSize_INCS = \
--- a/src/VBox/VMM/testcase/Makefile.kmk.32bit 2012-07-18 09:58:08.000000000 +0100
+++ b/src/VBox/VMM/testcase/Makefile.kmk 2012-09-02 04:04:34.551296386 +0100
@@ -21,9 +21,11 @@ include $(KBUILD_PATH)/subheader.kmk
#
# Target lists.
#
-PROGRAMS += tstVMStructSize tstAsmStructs
-ifdef VBOX_WITH_RAW_MODE
- PROGRAMS += tstVMStructRC tstAsmStructsRC
+ifneq ($(KBUILD_HOST_ARCH),amd64)
+ PROGRAMS += tstVMStructSize tstAsmStructs
+ ifdef VBOX_WITH_RAW_MODE
+ PROGRAMS += tstVMStructRC tstAsmStructsRC
+ endif
endif
if !defined(VBOX_ONLY_EXTPACKS) \
&& ( defined(VBOX_WITH_DTRACE_R3) \
@@ -77,16 +79,21 @@ BLDDIRS += $(VBOX_VMM_TESTCASE_OUT_DIR)
#
ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
+ ifneq ($(KBUILD_HOST_ARCH),amd64)
OTHERS += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
+ endif
endif
endif
# The normal testing pass.
+
+ifneq ($(KBUILD_HOST_ARCH),amd64)
TESTING += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
+endif
ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
TESTING += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run
VirtualBox-4.2.0-xorg17.patch:
./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk | 8
./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp | 53 ++++
./src/VBox/Additions/x11/vboxmouse/vboxmouse.c | 8
VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 40 +--
VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 108 ++++++----
b/src/VBox/Additions/common/crOpenGL/Makefile.kmk | 14 -
src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk | 4
7 files changed, 146 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VirtualBox-4.2.0-xorg17.patch 7 Sep 2012 03:03:37 -0000 1.2
+++ VirtualBox-4.2.0-xorg17.patch 9 Sep 2012 01:03:58 -0000 1.3
@@ -43,25 +43,25 @@
# generate rules.
---- VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxmouse/vboxmouse.c.xorg17 2012-09-07 02:38:56.473777159 +0100
-+++ VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxmouse/vboxmouse.c 2012-09-07 02:39:11.025882086 +0100
-@@ -52,13 +52,9 @@
+--- ./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 @@
- #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
--- 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
@@ -30,25 +30,12 @@ if1of ($(KBUILD_TARGET), linux)
@@ -262,3 +262,125 @@
+endif # NOT_FEDORA
+
include $(FILE_KBUILD_SUB_FOOTER)
+--- ./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
+
+# inspired from http://opensource.apple.com/source/X11server/X11server-85/kdrive/xorg-ser...
+#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 @@
+ #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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- VirtualBox.spec 8 Sep 2012 01:25:16 -0000 1.23
+++ VirtualBox.spec 9 Sep 2012 01:03:58 -0000 1.24
@@ -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 RC3
+%global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
Name: VirtualBox
Version: 4.2.0
-Release: 0.5%{?prerel:.%{prerel}}%{?dist}
+Release: 0.6%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -35,7 +35,7 @@
Patch3: VirtualBox-4.2.0-libcxx.patch
Patch5: VirtualBox-4.2.0-xorg17.patch
%ifarch x86_64
-Patch10: VirtualBox-OSE-4.0.0-32bit.patch
+Patch10: VirtualBox-4.2.0-32bit.patch
%endif
Patch15: VirtualBox-OSE-4.0.0-makeself.patch
Patch17: VirtualBox-OSE-4.0.0-beramono.patch
@@ -192,16 +192,16 @@
%if 0%{?fedora} > 16
%patch23 -p1 -b .mesa
%endif
-%if 0%{?fedora} > 17
-%patch24 -p1 -b .x113
-%endif
+#if 0%{?fedora} > 17
+#patch24 -p1 -b .x113
+#endif
# Remove prebuilt binary tools
%if 0%{?fedora} < 16
rm -rf kBuild
%endif
rm -rf tools
-#rm -rf src/VBox/Additions/x11/x11include
+rm -rf src/VBox/Additions/x11/x11include
# CRLF->LF
sed -i 's/\r//' COPYING
@@ -557,6 +557,13 @@
%changelog
+* Sun Sep 09 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.6.RC4
+- Update to RC4.
+- Rename 32-bits patch to VirtualBox-4.2.0-32bit.patch
+- Drop patch23 to fix ABI/API breakages in X11 1.13, appears fixed in RC4 !
+- Compile VBoxGuestLib with X11 sources from system and fix VBoxGuestR3LibRuntimeXF86.cpp.
+- Removes X11 includes from sources (src/VBox/Additions/x11/x11include).
+
* Fri Sep 07 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.5.RC3
- not drop 32-bit patch, on x86_64 as quick resolution of not have glic-devel.i686 on x86_64.
--- VirtualBox-OSE-4.0.0-32bit.patch DELETED ---
12 years, 3 months
- 1
- 0
rpms/mplayer/F-17 mplayer-audio-subs-language.patch, NONE, 1.1 mplayer.spec, 1.52, 1.53
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/mplayer/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3535
Modified Files:
mplayer.spec
Added Files:
mplayer-audio-subs-language.patch
Log Message:
* Sat Sep 08 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-0.141.20120205svn
- Added a patch from SVN fixing the display of audio and subtitle languages
mplayer-audio-subs-language.patch:
command.c | 71 ++-----------------------------------------------
libmpdemux/demuxer.c | 53 +++++++++++++++++++++++++++++++++---
libmpdemux/demuxer.h | 3 ++
stream/cache2.c | 9 ++++++
stream/stream.h | 11 +++++++
stream/stream_bd.c | 20 +++++++++++++
stream/stream_bd.h | 1
stream/stream_bluray.c | 30 ++++++++++++++++++++
stream/stream_dvd.c | 23 ++++++++++++++-
stream/stream_dvd.h | 2 -
stream/stream_dvdnav.c | 46 ++++++++++++++++++++-----------
stream/stream_dvdnav.h | 2 -
12 files changed, 176 insertions(+), 95 deletions(-)
--- NEW FILE mplayer-audio-subs-language.patch ---
Index: stream/cache2.c
===================================================================
--- stream/cache2.c (wersja 34735)
+++ stream/cache2.c (wersja 34737)
@@ -93,6 +93,7 @@
volatile int control;
volatile unsigned control_uint_arg;
volatile double control_double_arg;
+ volatile struct stream_lang_req control_lang_arg;
volatile int control_res;
volatile double stream_time_length;
volatile double stream_time_pos;
@@ -318,6 +319,9 @@
s->control_res = s->stream->control(s->stream, s->control, &uint_res);
s->control_uint_arg = uint_res;
break;
+ case STREAM_CTRL_GET_LANG:
+ s->control_res = s->stream->control(s->stream, s->control, (void *)&s->control_lang_arg);
+ break;
default:
s->control_res = STREAM_UNSUPPORTED;
break;
@@ -628,6 +632,8 @@
case STREAM_CTRL_GET_CURRENT_TIME:
*(double *)arg = s->stream_time_pos;
return s->stream_time_pos != MP_NOPTS_VALUE ? STREAM_OK : STREAM_UNSUPPORTED;
+ case STREAM_CTRL_GET_LANG:
+ s->control_lang_arg = *(struct stream_lang_req *)arg;
case STREAM_CTRL_GET_NUM_CHAPTERS:
case STREAM_CTRL_GET_CURRENT_CHAPTER:
case STREAM_CTRL_GET_ASPECT_RATIO:
@@ -673,6 +679,9 @@
case STREAM_CTRL_GET_ANGLE:
*(unsigned *)arg = s->control_uint_arg;
break;
+ case STREAM_CTRL_GET_LANG:
+ *(struct stream_lang_req *)arg = s->control_lang_arg;
+ break;
}
return s->control_res;
}
Index: stream/stream_dvd.c
===================================================================
--- stream/stream_dvd.c (wersja 34735)
+++ stream/stream_dvd.c (wersja 34737)
@@ -149,7 +149,7 @@
return chapter;
}
-int dvd_lang_from_aid(stream_t *stream, int id) {
+static int dvd_lang_from_aid(stream_t *stream, int id) {
dvd_priv_t *d;
int i;
if (!stream) return 0;
@@ -195,7 +195,7 @@
return maxid + 1;
}
-int dvd_lang_from_sid(stream_t *stream, int id) {
+static int dvd_lang_from_sid(stream_t *stream, int id) {
int i;
dvd_priv_t *d;
if (!stream) return 0;
@@ -731,6 +731,25 @@
d->angle_seek = 1;
return 1;
}
+ case STREAM_CTRL_GET_LANG:
+ {
+ struct stream_lang_req *req = arg;
+ int lang = 0;
+ switch(req->type) {
+ case stream_ctrl_audio:
+ lang = dvd_lang_from_aid(stream, req->id);
+ break;
+ case stream_ctrl_sub:
+ lang = dvd_lang_from_sid(stream, req->id);
+ break;
+ }
+ if (!lang)
+ break;
+ req->buf[0] = lang >> 8;
+ req->buf[1] = lang;
+ req->buf[2] = 0;
+ return STREAM_OK;
+ }
}
return STREAM_UNSUPPORTED;
}
Index: stream/stream_dvdnav.c
===================================================================
--- stream/stream_dvdnav.c (wersja 34735)
+++ stream/stream_dvdnav.c (wersja 34737)
@@ -402,6 +402,9 @@
return len;
}
+static int mp_dvdnav_lang_from_sid(stream_t *stream, int sid);
+static int mp_dvdnav_lang_from_aid(stream_t *stream, int sid);
+
static int control(stream_t *stream, int cmd, void* arg) {
dvdnav_priv_t* priv=stream->priv;
int tit, part;
@@ -496,6 +499,25 @@
if(dvdnav_angle_change(priv->dvdnav, new_angle) != DVDNAV_STATUS_OK)
return 1;
}
+ case STREAM_CTRL_GET_LANG:
+ {
+ struct stream_lang_req *req = arg;
+ int lang = 0;
+ switch(req->type) {
+ case stream_ctrl_audio:
+ lang = mp_dvdnav_lang_from_aid(stream, req->id);
+ break;
+ case stream_ctrl_sub:
+ lang = mp_dvdnav_lang_from_sid(stream, req->id);
+ break;
+ }
+ if (!lang)
+ break;
+ req->buf[0] = lang >> 8;
+ req->buf[1] = lang;
+ req->buf[2] = 0;
+ return STREAM_OK;
+ }
}
return STREAM_UNSUPPORTED;
@@ -758,13 +780,12 @@
}
/**
- * \brief mp_dvdnav_lang_from_aid() assigns to buf the language corresponding to audio id 'aid'
+ * \brief mp_dvdnav_lang_from_aid() returns the language corresponding to audio id 'aid'
* \param stream: - stream pointer
* \param sid: physical subtitle id
- * \param buf: buffer to contain the 2-chars language string
- * \return 0 on error, 1 if successful
+ * \return 0 on error, otherwise language id
*/
-int mp_dvdnav_lang_from_aid(stream_t *stream, int aid, unsigned char *buf) {
+static int mp_dvdnav_lang_from_aid(stream_t *stream, int aid) {
uint8_t lg;
uint16_t lang;
dvdnav_priv_t * priv = stream->priv;
@@ -775,10 +796,7 @@
if(lg == 0xff) return 0;
lang = dvdnav_audio_stream_to_lang(priv->dvdnav, lg);
if(lang == 0xffff) return 0;
- buf[0] = lang >> 8;
- buf[1] = lang & 0xFF;
- buf[2] = 0;
- return 1;
+ return lang;
}
@@ -810,13 +828,12 @@
}
/**
- * \brief mp_dvdnav_lang_from_sid() assigns to buf the language corresponding to subtitle id 'sid'
+ * \brief mp_dvdnav_lang_from_sid() returns the language corresponding to subtitle id 'sid'
* \param stream: - stream pointer
* \param sid: physical subtitle id
- * \param buf: buffer to contain the 2-chars language string
- * \return 0 on error, 1 if successful
+ * \return 0 on error, otherwise language id
*/
-int mp_dvdnav_lang_from_sid(stream_t *stream, int sid, unsigned char *buf) {
+static int mp_dvdnav_lang_from_sid(stream_t *stream, int sid) {
uint8_t k;
uint16_t lang;
dvdnav_priv_t *priv = stream->priv;
@@ -828,10 +845,7 @@
return 0;
lang = dvdnav_spu_stream_to_lang(priv->dvdnav, k);
if(lang == 0xffff) return 0;
- buf[0] = lang >> 8;
- buf[1] = lang & 0xFF;
- buf[2] = 0;
- return 1;
+ return lang;
}
/**
Index: stream/stream_bd.c
===================================================================
--- stream/stream_bd.c (wersja 34735)
+++ stream/stream_bd.c (wersja 34737)
@@ -25,6 +25,7 @@
#include "libavutil/common.h"
#include "libavutil/aes.h"
#include "libavutil/sha.h"
+#include "libavutil/avstring.h"
#include "libmpdemux/demuxer.h"
#include "libavutil/intreadwrite.h"
#include "m_struct.h"
@@ -372,7 +373,7 @@
return 0;
}
-const char *bd_lang_from_id(stream_t *s, int id)
+static const char *bd_lang_from_id(stream_t *s, int id)
{
struct bd_priv *bd = s->priv;
int i;
@@ -451,6 +452,22 @@
free_stream(file);
}
+static int bd_stream_control(stream_t *s, int cmd, void *arg)
+{
+ switch (cmd) {
+ case STREAM_CTRL_GET_LANG:
+ {
+ struct stream_lang_req *req = arg;
+ const char *lang = bd_lang_from_id(s, req->id);
+ if (!lang)
+ return STREAM_ERROR;
+ av_strlcpy(req->buf, lang, sizeof(req->buf));
+ return STREAM_OK;
+ }
+ }
+ return STREAM_UNSUPPORTED;
+}
+
static int bd_stream_open(stream_t *s, int mode, void* opts, int* file_format)
{
char filename[PATH_MAX];
@@ -470,6 +487,7 @@
s->flags = STREAM_READ | MP_STREAM_SEEK;
s->fill_buffer = bd_stream_fill_buffer;
s->seek = bd_stream_seek;
+ s->control = bd_stream_control;
s->close = bd_stream_close;
s->start_pos = 0;
s->priv = bd;
Index: stream/stream_bluray.c
===================================================================
--- stream/stream_bluray.c (wersja 34735)
+++ stream/stream_bluray.c (wersja 34737)
@@ -191,6 +191,36 @@
return 1;
}
+ case STREAM_CTRL_GET_LANG: {
+ struct stream_lang_req *req = arg;
+ BLURAY_TITLE_INFO *ti = bd_get_title_info(b->bd, b->current_title, b->current_angle);
+ if (ti->clip_count) {
+ BLURAY_STREAM_INFO *si = NULL;
+ int count = 0;
+ switch (req->type) {
+ case stream_ctrl_audio:
+ count = ti->clips[0].audio_stream_count;
+ si = ti->clips[0].audio_streams;
+ break;
+ case stream_ctrl_sub:
+ count = ti->clips[0].pg_stream_count;
+ si = ti->clips[0].pg_streams;
+ break;
+ }
+ while (count-- > 0) {
+ if (si->pid == req->id) {
+ memcpy(req->buf, si->lang, 4);
+ req->buf[4] = 0;
+ bd_free_title_info(ti);
+ return STREAM_OK;
+ }
+ si++;
+ }
+ }
+ bd_free_title_info(ti);
+ return STREAM_ERROR;
+ }
+
default:
break;
}
Index: stream/stream.h
===================================================================
--- stream/stream.h (wersja 34735)
+++ stream/stream.h (wersja 34737)
@@ -99,8 +99,19 @@
#define STREAM_CTRL_GET_ANGLE 10
#define STREAM_CTRL_SET_ANGLE 11
#define STREAM_CTRL_GET_NUM_TITLES 12
+#define STREAM_CTRL_GET_LANG 13
+enum stream_ctrl_type {
+ stream_ctrl_audio,
+ stream_ctrl_sub,
+};
+struct stream_lang_req {
+ enum stream_ctrl_type type;
+ int id;
+ char buf[40];
+};
+
typedef enum {
streaming_stopped_e,
streaming_playing_e
Index: command.c
===================================================================
--- command.c (wersja 34735)
+++ command.c (wersja 34737)
@@ -910,30 +910,7 @@
*(char **) arg = strdup(MSGTR_Disabled);
else {
char lang[40] = MSGTR_Unknown;
- sh_audio_t* sh = mpctx->sh_audio;
- if (sh && sh->lang)
- av_strlcpy(lang, sh->lang, 40);
- // TODO: use a proper STREAM_CTRL instead of this mess
- else if (sh && mpctx->stream->type == STREAMTYPE_BD) {
- const char *l = bd_lang_from_id(mpctx->stream, audio_id);
- if (l)
- av_strlcpy(lang, l, sizeof(lang));
- }
-#ifdef CONFIG_DVDREAD
- else if (mpctx->stream->type == STREAMTYPE_DVD) {
- int code = dvd_lang_from_aid(mpctx->stream, current_id);
- if (code) {
- lang[0] = code >> 8;
- lang[1] = code;
- lang[2] = 0;
- }
- }
-#endif
-
-#ifdef CONFIG_DVDNAV
- else if (mpctx->stream->type == STREAMTYPE_DVDNAV)
- mp_dvdnav_lang_from_aid(mpctx->stream, current_id, lang);
-#endif
+ demuxer_audio_lang(mpctx->demuxer, current_id, lang, sizeof(lang));
*(char **) arg = malloc(64);
snprintf(*(char **) arg, 64, "(%d) %s", audio_id, lang);
}
@@ -1497,37 +1474,7 @@
strlen(tmp) < 20 ? tmp : tmp + strlen(tmp) - 19);
return M_PROPERTY_OK;
}
-#ifdef CONFIG_DVDNAV
- if (mpctx->stream->type == STREAMTYPE_DVDNAV) {
- if (vo_spudec && dvdsub_id >= 0) {
- unsigned char lang[3];
- if (mp_dvdnav_lang_from_sid(mpctx->stream, dvdsub_id, lang)) {
- snprintf(*(char **) arg, 63, "(%d) %s", dvdsub_id, lang);
- return M_PROPERTY_OK;
- }
- }
- }
-#endif
- if (mpctx->stream->type == STREAMTYPE_BD
- && d_sub && d_sub->sh && dvdsub_id >= 0) {
- const char *lang = bd_lang_from_id(mpctx->stream, ((sh_sub_t*)d_sub->sh)->sid);
- if (!lang) lang = MSGTR_Unknown;
- snprintf(*(char **) arg, 63, "(%d) %s", dvdsub_id, lang);
- return M_PROPERTY_OK;
- }
-
- if ((mpctx->demuxer->type == DEMUXER_TYPE_MATROSKA
- || mpctx->demuxer->type == DEMUXER_TYPE_LAVF
- || mpctx->demuxer->type == DEMUXER_TYPE_LAVF_PREFERRED
- || mpctx->demuxer->type == DEMUXER_TYPE_OGG)
- && d_sub && d_sub->sh && dvdsub_id >= 0) {
- const char* lang = ((sh_sub_t*)d_sub->sh)->lang;
- if (!lang) lang = MSGTR_Unknown;
- snprintf(*(char **) arg, 63, "(%d) %s", dvdsub_id, lang);
- return M_PROPERTY_OK;
- }
-
if (vo_vobsub && vobsub_id >= 0) {
const char *language = MSGTR_Unknown;
language = vobsub_get_id(vo_vobsub, (unsigned int) vobsub_id);
@@ -1535,22 +1482,12 @@
vobsub_id, language ? language : MSGTR_Unknown);
return M_PROPERTY_OK;
}
-#ifdef CONFIG_DVDREAD
- if (vo_spudec && mpctx->stream->type == STREAMTYPE_DVD
- && dvdsub_id >= 0) {
- char lang[3];
- int code = dvd_lang_from_sid(mpctx->stream, dvdsub_id);
- lang[0] = code >> 8;
- lang[1] = code;
- lang[2] = 0;
+ if (dvdsub_id >= 0) {
+ char lang[40] = MSGTR_Unknown;
+ demuxer_sub_lang(mpctx->demuxer, dvdsub_id, lang, sizeof(lang));
snprintf(*(char **) arg, 63, "(%d) %s", dvdsub_id, lang);
return M_PROPERTY_OK;
}
-#endif
- if (dvdsub_id >= 0) {
- snprintf(*(char **) arg, 63, "(%d) %s", dvdsub_id, MSGTR_Unknown);
- return M_PROPERTY_OK;
- }
snprintf(*(char **) arg, 63, MSGTR_Disabled);
return M_PROPERTY_OK;
Index: libmpdemux/demuxer.c
===================================================================
--- libmpdemux/demuxer.c (wersja 34735)
+++ libmpdemux/demuxer.c (wersja 34737)
@@ -53,6 +53,7 @@
#endif
#include "av_helpers.h"
#endif
+#include "libavutil/avstring.h"
// This is quite experimental, in particular it will mess up the pts values
// in the queue - on the other hand it might fix some issues like generating
@@ -1785,6 +1786,50 @@
return angle;
}
+int demuxer_audio_lang(demuxer_t *d, int id, char *buf, int buf_len)
+{
+ struct stream_lang_req req;
+ sh_audio_t *sh;
+ if (id < 0 || id >= MAX_A_STREAMS)
+ return -1;
+ sh = d->a_streams[id];
+ if (!sh)
+ return -1;
+ if (sh->lang) {
+ av_strlcpy(buf, sh->lang, buf_len);
+ return 0;
+ }
+ req.type = stream_ctrl_audio;
+ req.id = sh->aid;
+ if (stream_control(d->stream, STREAM_CTRL_GET_LANG, &req) == STREAM_OK) {
+ av_strlcpy(buf, req.buf, buf_len);
+ return 0;
+ }
+ return -1;
+}
+
+int demuxer_sub_lang(demuxer_t *d, int id, char *buf, int buf_len)
+{
+ struct stream_lang_req req;
+ sh_sub_t *sh;
+ if (id < 0 || id >= MAX_S_STREAMS)
+ return -1;
+ sh = d->s_streams[id];
+ if (!sh)
+ return -1;
+ if (sh->lang) {
+ av_strlcpy(buf, sh->lang, buf_len);
+ return 0;
+ }
+ req.type = stream_ctrl_sub;
+ req.id = sh->sid;
+ if (stream_control(d->stream, STREAM_CTRL_GET_LANG, &req) == STREAM_OK) {
+ av_strlcpy(buf, req.buf, buf_len);
+ return 0;
+ }
+ return -1;
+}
+
int demuxer_audio_track_by_lang(demuxer_t *d, char *lang)
{
int i, len;
Index: libmpdemux/demuxer.h
===================================================================
--- libmpdemux/demuxer.h (wersja 34735)
+++ libmpdemux/demuxer.h (wersja 34737)
@@ -473,6 +473,9 @@
/// Get number of angles.
int demuxer_angles_count(demuxer_t *demuxer);
+int demuxer_audio_lang(demuxer_t *d, int id, char *buf, int buf_len);
+int demuxer_sub_lang(demuxer_t *d, int id, char *buf, int buf_len);
+
// get the index of a track
// lang is a comma-separated list
int demuxer_audio_track_by_lang(demuxer_t* demuxer, char* lang);
Index: stream/stream_dvd.h
===================================================================
--- stream/stream_dvd.h (wersja 34738)
+++ stream/stream_dvd.h (wersja 34739)
@@ -57,8 +57,6 @@
} dvd_priv_t;
int dvd_number_of_subs(stream_t *stream);
-int dvd_lang_from_aid(stream_t *stream, int id);
-int dvd_lang_from_sid(stream_t *stream, int id);
int dvd_aid_from_lang(stream_t *stream, const unsigned char* lang);
int dvd_sid_from_lang(stream_t *stream, const unsigned char* lang);
int dvd_chapter_from_cell(dvd_priv_t *dvd,int title,int cell);
Index: stream/stream_dvdnav.h
===================================================================
--- stream/stream_dvdnav.h (wersja 34738)
+++ stream/stream_dvdnav.h (wersja 34739)
@@ -31,9 +31,7 @@
int mp_dvdnav_number_of_subs(stream_t *stream);
int mp_dvdnav_aid_from_audio_num(stream_t *stream, int audio_num);
int mp_dvdnav_aid_from_lang(stream_t *stream, const unsigned char *language);
-int mp_dvdnav_lang_from_aid(stream_t *stream, int id, unsigned char *buf);
int mp_dvdnav_sid_from_lang(stream_t *stream, const unsigned char *language);
-int mp_dvdnav_lang_from_sid(stream_t *stream, int sid, unsigned char *buf);
void mp_dvdnav_handle_input(stream_t *stream, int cmd, int *button);
void mp_dvdnav_update_mouse_pos(stream_t *stream, int32_t x, int32_t y, int* button);
void mp_dvdnav_get_highlight (stream_t *stream, nav_highlight_t *hl);
Index: stream/stream_bd.h
===================================================================
--- stream/stream_bd.h (wersja 34738)
+++ stream/stream_bd.h (wersja 34739)
@@ -21,7 +21,6 @@
#include "stream.h"
-const char *bd_lang_from_id(stream_t *s, int id);
int bd_aid_from_lang(stream_t *s, const char *lang);
int bd_sid_from_lang(stream_t *s, const char *lang);
Index: libmpdemux/demuxer.c
===================================================================
--- libmpdemux/demuxer.c (wersja 34776)
+++ libmpdemux/demuxer.c (wersja 34777)
@@ -1815,14 +1815,14 @@
if (id < 0 || id >= MAX_S_STREAMS)
return -1;
sh = d->s_streams[id];
- if (!sh)
- return -1;
- if (sh->lang) {
+ if (sh && sh->lang) {
av_strlcpy(buf, sh->lang, buf_len);
return 0;
}
req.type = stream_ctrl_sub;
- req.id = sh->sid;
+ // assume 1:1 mapping so we can show the language of
+ // DVD subs even when we have not yet created the stream.
+ req.id = sh ? sh->sid : id;
if (stream_control(d->stream, STREAM_CTRL_GET_LANG, &req) == STREAM_OK) {
av_strlcpy(buf, req.buf, buf_len);
return 0;
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-17/mplayer.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- mplayer.spec 24 Jun 2012 11:34:59 -0000 1.52
+++ mplayer.spec 8 Sep 2012 23:27:05 -0000 1.53
@@ -6,7 +6,7 @@
Name: mplayer
Version: 1.0
-Release: 0.140.%{pre}%{?dist}
+Release: 0.141.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
%if 0%{!?_without_amr:1}
@@ -27,6 +27,8 @@
Patch1: %{name}-pngalpha.patch
# set defaults for Fedora
Patch2: %{name}-config.patch
+# fix the display of audio and subtitle languages
+Patch3: %{name}-audio-subs-language.patch
# use roff include statements instead of symlinks
Patch8: %{name}-manlinks.patch
# erase any trace of libdvdcss
@@ -225,6 +227,7 @@
%patch0 -p0 -b .gmplayer-subtitles
%patch1 -p0 -b .pngalpha
%patch2 -p1 -b .config
+%patch3 -p0 -b .audio-subs-language
%patch8 -p1 -b .manlinks
%patch14 -p1 -b .nodvdcss
%patch18 -p1 -b .ffmpeg
@@ -383,6 +386,9 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Sat Sep 08 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-0.141.20120205svn
+- Added a patch from SVN fixing the display of audio and subtitle languages
+
* Sun Jun 24 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-0.140.20120205svn
- Fixed -vo png:alpha using a patch from SVN (RPM Fusion bug #2362)
12 years, 3 months
- 1
- 0
rpms/nvidia-settings/F-18 nvidia-settings-85ab38c897e266d1e9805e4d276916dceb0ad801.patch, NONE, 1.1 nvidia-settings.spec, 1.22, 1.23
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25946/F-18
Modified Files:
nvidia-settings.spec
Added Files:
nvidia-settings-85ab38c897e266d1e9805e4d276916dceb0ad801.patch
Log Message:
Update to latest
nvidia-settings-85ab38c897e266d1e9805e4d276916dceb0ad801.patch:
ctkcolorcorrectionpage.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++
ctkcolorcorrectionpage.h | 89 +++++++++++++++++++++++++++++++-
2 files changed, 218 insertions(+), 1 deletion(-)
--- NEW FILE nvidia-settings-85ab38c897e266d1e9805e4d276916dceb0ad801.patch ---
>From 85ab38c897e266d1e9805e4d276916dceb0ad801 Mon Sep 17 00:00:00 2001
From: Aaron Plattner <aplattner(a)nvidia.com>
Date: Sat, 08 Sep 2012 02:23:34 +0000
Subject: Add missing color correction page sources
src/gtk+-2.x/ctkcolorcorrectionpage.c and .h were missed in commit
cc58d9323aa331f16121c2e157611189cee92293.
---
diff --git a/src/gtk+-2.x/ctkcolorcorrectionpage.c b/src/gtk+-2.x/ctkcolorcorrectionpage.c
new file mode 100644
index 0000000..3b15260
--- a/dev/null
+++ b/src/gtk+-2.x/ctkcolorcorrectionpage.c
@@ -0,0 +1,130 @@
+/*
+ * nvidia-settings: A tool for configuring the NVIDIA X driver on Unix
+ * and Linux systems.
+ *
+ * Copyright (C) 2012 NVIDIA Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses>.
+ */
+
+#include <gtk/gtk.h>
+
+#include "NvCtrlAttributes.h"
+
+#include "ctkbanner.h"
+
+#include "ctkcolorcorrectionpage.h"
+#include "ctkcolorcorrection.h"
+
+#include "ctkconfig.h"
+#include "ctkhelp.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+
+GType ctk_color_correction_page_get_type(
+ void
+)
+{
+ static GType ctk_color_correction_page_type = 0;
+
+ if (!ctk_color_correction_page_type) {
+ static const GTypeInfo ctk_color_correction_page_info = {
+ sizeof (CtkColorCorrectionPageClass),
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ NULL, /* class_init */
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (CtkColorCorrectionPage),
+ 0, /* n_preallocs */
+ NULL, /* instance_init */
+ NULL /* value_table */
+ };
+
+ ctk_color_correction_page_type =
+ g_type_register_static(GTK_TYPE_VBOX, "CtkColorCorrectionPage",
+ &ctk_color_correction_page_info, 0);
+ }
+
+ return ctk_color_correction_page_type;
+}
+
+
+GtkWidget* ctk_color_correction_page_new(NvCtrlAttributeHandle *handle,
+ CtkConfig *ctk_config,
+ ParsedAttribute *p,
+ CtkEvent *ctk_event)
+{
+ CtkColorCorrectionPage *ctk_color_correction_page;
+ ReturnStatus ret;
+ GObject *object;
+ GtkWidget *banner;
+ GtkWidget *ctk_color_correction;
+ gint val;
+
+ /* check if the VidMode extension is present */
+
+ ret = NvCtrlGetAttribute(handle, NV_CTRL_ATTR_EXT_VM_PRESENT, &val);
+ if ((ret != NvCtrlSuccess) || (val == FALSE)) {
+ return NULL;
+ }
+
+ /* check if the noScanout mode enabled */
+
+ ret = NvCtrlGetAttribute(handle, NV_CTRL_NO_SCANOUT, &val);
+ if ((ret == NvCtrlSuccess) && (val == NV_CTRL_NO_SCANOUT_ENABLED)) {
+ return NULL;
+ }
+
+ /* allocate the color correction widget */
+
+ ctk_color_correction =
+ ctk_color_correction_new(handle, ctk_config, p, ctk_event);
+
+ if (ctk_color_correction == NULL) {
+ return NULL;
+ }
+
+ /* create the new page */
+
+ object = g_object_new(CTK_TYPE_COLOR_CORRECTION_PAGE, NULL);
+
+ ctk_color_correction_page = CTK_COLOR_CORRECTION_PAGE(object);
+
+ gtk_box_set_spacing(GTK_BOX(ctk_color_correction_page), 10);
+
+ /*
+ * pack the banner at the top of the page, followed by the color
+ * correction widget
+ */
+
+ banner = ctk_banner_image_new(BANNER_ARTWORK_COLOR);
+ gtk_box_pack_start(GTK_BOX(ctk_color_correction_page),
+ banner, FALSE, FALSE, 0);
+
+ gtk_box_pack_start(GTK_BOX(ctk_color_correction_page),
+ ctk_color_correction, TRUE, TRUE, 0);
+
+ gtk_widget_show_all(GTK_WIDGET(object));
+
+ return GTK_WIDGET(object);
+}
+
+
+GtkTextBuffer *ctk_color_correction_page_create_help(GtkTextTagTable *table,
+ const gchar *title)
+{
+ return ctk_color_correction_create_help(table, title, FALSE /* randr */);
+}
diff --git a/src/gtk+-2.x/ctkcolorcorrectionpage.h b/src/gtk+-2.x/ctkcolorcorrectionpage.h
new file mode 100644
index 0000000..5512985
--- a/dev/null
+++ b/src/gtk+-2.x/ctkcolorcorrectionpage.h
@@ -0,0 +1,88 @@
+/*
+ * nvidia-settings: A tool for configuring the NVIDIA X driver on Unix
+ * and Linux systems.
+ *
+ * Copyright (C) 2012 NVIDIA Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses>.
+ */
+
+#ifndef __CTK_COLOR_CORRECTION_PAGE_H__
+#define __CTK_COLOR_CORRECTION_PAGE_H__
+
+#include "parse.h"
+#include "ctkevent.h"
+#include "ctkconfig.h"
+
+G_BEGIN_DECLS
+
+#define CTK_TYPE_COLOR_CORRECTION_PAGE (ctk_color_correction_page_get_type())
+
+#define CTK_COLOR_CORRECTION_PAGE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), CTK_TYPE_COLOR_CORRECTION_PAGE, \
+ CtkColorCorrectionPage))
+
+#define CTK_COLOR_CORRECTION_PAGE_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), CTK_TYPE_COLOR_CORRECTION_PAGE, \
+ CtkColorCorrectionPageClass))
+
+#define CTK_IS_COLOR_CORRECTION_PAGE(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), CTK_TYPE_COLOR_CORRECTION_PAGE))
+
+#define CTK_IS_COLOR_CORRECTION_PAGE_CLASS(class) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), CTK_TYPE_COLOR_CORRECTION_PAGE))
+
+#define CTK_COLOR_CORRECTION_PAGE_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS((obj), CTK_TYPE_COLOR_CORRECTION_PAGE, \
+ CtkColorCorrectionPageClass))
+
+
+typedef struct _CtkColorCorrectionPage CtkColorCorrectionPage;
+typedef struct _CtkColorCorrectionPageClass CtkColorCorrectionPageClass;
+
+struct _CtkColorCorrectionPage
+{
+ GtkVBox parent;
+ NvCtrlAttributeHandle *handle;
+ CtkConfig *ctk_config;
+ GtkWidget *option_menu;
+ GtkObject *brightness_adjustment;
+ GtkObject *contrast_adjustment;
+ GtkObject *gamma_adjustment;
+ GtkWidget *confirm_button;
+ GtkWidget *confirm_label;
+ gint confirm_countdown;
+ guint confirm_timer;
+ gfloat cur_slider_val[3][4]; // as [attribute][channel]
+ gfloat prev_slider_val[3][4]; // as [attribute][channel]
+ guint enabled_display_devices;
+};
+
+struct _CtkColorCorrectionPageClass
+{
+ GtkVBoxClass parent_class;
+
+ void (*changed) (CtkColorCorrectionPage *);
+};
+
+GType ctk_color_correction_page_get_type (void) G_GNUC_CONST;
+GtkWidget* ctk_color_correction_page_new (NvCtrlAttributeHandle *,
+ CtkConfig *, ParsedAttribute *,
+ CtkEvent *);
+GtkTextBuffer *ctk_color_correction_page_create_help(GtkTextTagTable *,
+ const gchar *title);
+
+G_END_DECLS
+
+#endif /* __CTK_COLOR_CORRECTION_PAGE_H__ */
+
--
cgit v0.9.0.2-2-gbebe
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-18/nvidia-settings.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nvidia-settings.spec 5 Sep 2012 22:10:03 -0000 1.22
+++ nvidia-settings.spec 8 Sep 2012 11:06:37 -0000 1.23
@@ -18,6 +18,7 @@
Source0: http://cgit.freedesktop.org/~aplattner/nvidia-settings/snapshot/nvidia-se...
Patch0: nvidia-settings-256.35-validate.patch
Patch1: 03_do_not_exit_on_no_scanout.patch
+Patch2: nvidia-settings-85ab38c897e266d1e9805e4d276916dceb0ad801.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -34,9 +35,10 @@
#BuildRequires: libXNVCtrl-devel
BuildRequires: libXxf86vm-devel
BuildRequires: libXext-devel
+BuildRequires: libXrandr-devel
BuildRequires: libXv-devel
#Needed for FBConfig table
-#BuildRequires: xorg-x11-drv-nvidia-devel
+BuildRequires: xorg-x11-drv-nvidia-devel
BuildRequires: mesa-libGL-devel
Provides: %{name}-nversion = %{nversion}
@@ -55,6 +57,7 @@
%setup -q -n nvidia-settings-%{nversion}
%patch0 -p1 -b .validate
%patch1 -p1 -b .noscanout
+%patch2 -p1
rm -rf src/libXNVCtrl/libXNVCtrl.a
sed -i -e 's|/usr/local|%{_prefix}|g' utils.mk
@@ -69,7 +72,9 @@
NVDEBUG=1 \
NV_VERBOSE=1 \
X_LDFLAGS="-L%{_libdir}" \
- CC_ONLY_CFLAGS="$RPM_OPT_FLAGS"
+ CC_ONLY_CFLAGS="$RPM_OPT_FLAGS" || :
+
+make -C samples
%install
@@ -99,6 +104,8 @@
%changelog
* Wed Sep 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-24
- Update to 304.43
+- Add BR libXrandr-devel
+- Add missing files
* Tue Aug 14 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-23
- Update to 304.37
12 years, 3 months
- 1
- 0
rpms/nvidia-settings/devel nvidia-settings-85ab38c897e266d1e9805e4d276916dceb0ad801.patch, NONE, 1.1 nvidia-settings.spec, 1.22, 1.23
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25946/devel
Modified Files:
nvidia-settings.spec
Added Files:
nvidia-settings-85ab38c897e266d1e9805e4d276916dceb0ad801.patch
Log Message:
Update to latest
nvidia-settings-85ab38c897e266d1e9805e4d276916dceb0ad801.patch:
ctkcolorcorrectionpage.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++
ctkcolorcorrectionpage.h | 89 +++++++++++++++++++++++++++++++-
2 files changed, 218 insertions(+), 1 deletion(-)
--- NEW FILE nvidia-settings-85ab38c897e266d1e9805e4d276916dceb0ad801.patch ---
>From 85ab38c897e266d1e9805e4d276916dceb0ad801 Mon Sep 17 00:00:00 2001
From: Aaron Plattner <aplattner(a)nvidia.com>
Date: Sat, 08 Sep 2012 02:23:34 +0000
Subject: Add missing color correction page sources
src/gtk+-2.x/ctkcolorcorrectionpage.c and .h were missed in commit
cc58d9323aa331f16121c2e157611189cee92293.
---
diff --git a/src/gtk+-2.x/ctkcolorcorrectionpage.c b/src/gtk+-2.x/ctkcolorcorrectionpage.c
new file mode 100644
index 0000000..3b15260
--- a/dev/null
+++ b/src/gtk+-2.x/ctkcolorcorrectionpage.c
@@ -0,0 +1,130 @@
+/*
+ * nvidia-settings: A tool for configuring the NVIDIA X driver on Unix
+ * and Linux systems.
+ *
+ * Copyright (C) 2012 NVIDIA Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses>.
+ */
+
+#include <gtk/gtk.h>
+
+#include "NvCtrlAttributes.h"
+
+#include "ctkbanner.h"
+
+#include "ctkcolorcorrectionpage.h"
+#include "ctkcolorcorrection.h"
+
+#include "ctkconfig.h"
+#include "ctkhelp.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+
+GType ctk_color_correction_page_get_type(
+ void
+)
+{
+ static GType ctk_color_correction_page_type = 0;
+
+ if (!ctk_color_correction_page_type) {
+ static const GTypeInfo ctk_color_correction_page_info = {
+ sizeof (CtkColorCorrectionPageClass),
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ NULL, /* class_init */
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (CtkColorCorrectionPage),
+ 0, /* n_preallocs */
+ NULL, /* instance_init */
+ NULL /* value_table */
+ };
+
+ ctk_color_correction_page_type =
+ g_type_register_static(GTK_TYPE_VBOX, "CtkColorCorrectionPage",
+ &ctk_color_correction_page_info, 0);
+ }
+
+ return ctk_color_correction_page_type;
+}
+
+
+GtkWidget* ctk_color_correction_page_new(NvCtrlAttributeHandle *handle,
+ CtkConfig *ctk_config,
+ ParsedAttribute *p,
+ CtkEvent *ctk_event)
+{
+ CtkColorCorrectionPage *ctk_color_correction_page;
+ ReturnStatus ret;
+ GObject *object;
+ GtkWidget *banner;
+ GtkWidget *ctk_color_correction;
+ gint val;
+
+ /* check if the VidMode extension is present */
+
+ ret = NvCtrlGetAttribute(handle, NV_CTRL_ATTR_EXT_VM_PRESENT, &val);
+ if ((ret != NvCtrlSuccess) || (val == FALSE)) {
+ return NULL;
+ }
+
+ /* check if the noScanout mode enabled */
+
+ ret = NvCtrlGetAttribute(handle, NV_CTRL_NO_SCANOUT, &val);
+ if ((ret == NvCtrlSuccess) && (val == NV_CTRL_NO_SCANOUT_ENABLED)) {
+ return NULL;
+ }
+
+ /* allocate the color correction widget */
+
+ ctk_color_correction =
+ ctk_color_correction_new(handle, ctk_config, p, ctk_event);
+
+ if (ctk_color_correction == NULL) {
+ return NULL;
+ }
+
+ /* create the new page */
+
+ object = g_object_new(CTK_TYPE_COLOR_CORRECTION_PAGE, NULL);
+
+ ctk_color_correction_page = CTK_COLOR_CORRECTION_PAGE(object);
+
+ gtk_box_set_spacing(GTK_BOX(ctk_color_correction_page), 10);
+
+ /*
+ * pack the banner at the top of the page, followed by the color
+ * correction widget
+ */
+
+ banner = ctk_banner_image_new(BANNER_ARTWORK_COLOR);
+ gtk_box_pack_start(GTK_BOX(ctk_color_correction_page),
+ banner, FALSE, FALSE, 0);
+
+ gtk_box_pack_start(GTK_BOX(ctk_color_correction_page),
+ ctk_color_correction, TRUE, TRUE, 0);
+
+ gtk_widget_show_all(GTK_WIDGET(object));
+
+ return GTK_WIDGET(object);
+}
+
+
+GtkTextBuffer *ctk_color_correction_page_create_help(GtkTextTagTable *table,
+ const gchar *title)
+{
+ return ctk_color_correction_create_help(table, title, FALSE /* randr */);
+}
diff --git a/src/gtk+-2.x/ctkcolorcorrectionpage.h b/src/gtk+-2.x/ctkcolorcorrectionpage.h
new file mode 100644
index 0000000..5512985
--- a/dev/null
+++ b/src/gtk+-2.x/ctkcolorcorrectionpage.h
@@ -0,0 +1,88 @@
+/*
+ * nvidia-settings: A tool for configuring the NVIDIA X driver on Unix
+ * and Linux systems.
+ *
+ * Copyright (C) 2012 NVIDIA Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses>.
+ */
+
+#ifndef __CTK_COLOR_CORRECTION_PAGE_H__
+#define __CTK_COLOR_CORRECTION_PAGE_H__
+
+#include "parse.h"
+#include "ctkevent.h"
+#include "ctkconfig.h"
+
+G_BEGIN_DECLS
+
+#define CTK_TYPE_COLOR_CORRECTION_PAGE (ctk_color_correction_page_get_type())
+
+#define CTK_COLOR_CORRECTION_PAGE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj), CTK_TYPE_COLOR_CORRECTION_PAGE, \
+ CtkColorCorrectionPage))
+
+#define CTK_COLOR_CORRECTION_PAGE_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass), CTK_TYPE_COLOR_CORRECTION_PAGE, \
+ CtkColorCorrectionPageClass))
+
+#define CTK_IS_COLOR_CORRECTION_PAGE(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj), CTK_TYPE_COLOR_CORRECTION_PAGE))
+
+#define CTK_IS_COLOR_CORRECTION_PAGE_CLASS(class) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass), CTK_TYPE_COLOR_CORRECTION_PAGE))
+
+#define CTK_COLOR_CORRECTION_PAGE_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS((obj), CTK_TYPE_COLOR_CORRECTION_PAGE, \
+ CtkColorCorrectionPageClass))
+
+
+typedef struct _CtkColorCorrectionPage CtkColorCorrectionPage;
+typedef struct _CtkColorCorrectionPageClass CtkColorCorrectionPageClass;
+
+struct _CtkColorCorrectionPage
+{
+ GtkVBox parent;
+ NvCtrlAttributeHandle *handle;
+ CtkConfig *ctk_config;
+ GtkWidget *option_menu;
+ GtkObject *brightness_adjustment;
+ GtkObject *contrast_adjustment;
+ GtkObject *gamma_adjustment;
+ GtkWidget *confirm_button;
+ GtkWidget *confirm_label;
+ gint confirm_countdown;
+ guint confirm_timer;
+ gfloat cur_slider_val[3][4]; // as [attribute][channel]
+ gfloat prev_slider_val[3][4]; // as [attribute][channel]
+ guint enabled_display_devices;
+};
+
+struct _CtkColorCorrectionPageClass
+{
+ GtkVBoxClass parent_class;
+
+ void (*changed) (CtkColorCorrectionPage *);
+};
+
+GType ctk_color_correction_page_get_type (void) G_GNUC_CONST;
+GtkWidget* ctk_color_correction_page_new (NvCtrlAttributeHandle *,
+ CtkConfig *, ParsedAttribute *,
+ CtkEvent *);
+GtkTextBuffer *ctk_color_correction_page_create_help(GtkTextTagTable *,
+ const gchar *title);
+
+G_END_DECLS
+
+#endif /* __CTK_COLOR_CORRECTION_PAGE_H__ */
+
--
cgit v0.9.0.2-2-gbebe
Index: nvidia-settings.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/nvidia-settings.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nvidia-settings.spec 5 Sep 2012 22:10:02 -0000 1.22
+++ nvidia-settings.spec 8 Sep 2012 11:06:37 -0000 1.23
@@ -18,6 +18,7 @@
Source0: http://cgit.freedesktop.org/~aplattner/nvidia-settings/snapshot/nvidia-se...
Patch0: nvidia-settings-256.35-validate.patch
Patch1: 03_do_not_exit_on_no_scanout.patch
+Patch2: nvidia-settings-85ab38c897e266d1e9805e4d276916dceb0ad801.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
@@ -34,9 +35,10 @@
#BuildRequires: libXNVCtrl-devel
BuildRequires: libXxf86vm-devel
BuildRequires: libXext-devel
+BuildRequires: libXrandr-devel
BuildRequires: libXv-devel
#Needed for FBConfig table
-#BuildRequires: xorg-x11-drv-nvidia-devel
+BuildRequires: xorg-x11-drv-nvidia-devel
BuildRequires: mesa-libGL-devel
Provides: %{name}-nversion = %{nversion}
@@ -55,6 +57,7 @@
%setup -q -n nvidia-settings-%{nversion}
%patch0 -p1 -b .validate
%patch1 -p1 -b .noscanout
+%patch2 -p1
rm -rf src/libXNVCtrl/libXNVCtrl.a
sed -i -e 's|/usr/local|%{_prefix}|g' utils.mk
@@ -69,7 +72,9 @@
NVDEBUG=1 \
NV_VERBOSE=1 \
X_LDFLAGS="-L%{_libdir}" \
- CC_ONLY_CFLAGS="$RPM_OPT_FLAGS"
+ CC_ONLY_CFLAGS="$RPM_OPT_FLAGS" || :
+
+make -C samples
%install
@@ -99,6 +104,8 @@
%changelog
* Wed Sep 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-24
- Update to 304.43
+- Add BR libXrandr-devel
+- Add missing files
* Tue Aug 14 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 1.0-23
- Update to 304.37
12 years, 3 months
- 1
- 0
rpms/VirtualBox-kmod/F-18 VirtualBox-kmod.spec,1.5,1.6
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32432
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.1.RC3
- New RC major upstream release.
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-18/VirtualBox-kmod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VirtualBox-kmod.spec 21 Jun 2012 03:23:49 -0000 1.5
+++ VirtualBox-kmod.spec 8 Sep 2012 03:30:49 -0000 1.6
@@ -9,7 +9,7 @@
# 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 beta3
+%global prerel RC3
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
# Allow only root to access vboxdrv regardless of the file mode
@@ -17,8 +17,8 @@
%bcond_without hardening
Name: VirtualBox-kmod
-Version: 4.1.18
-Release: 1%{?dist}
+Version: 4.2.0
+Release: 0.1%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -27,7 +27,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}%{?prereltag}, xz, time
+%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc = %{version}, xz, time
BuildRequires: %{AkmodsBuildRequires}
# needed for plague to make sure it builds for i586 and i686
@@ -96,6 +96,9 @@
%changelog
+* Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-0.1.RC3
+- New RC major upstream release.
+
* Thu Jun 21 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.18-1
- New upstream release.
12 years, 3 months
- 1
- 0