rpms/buildsys-build-rpmfusion/F-16 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.27, 1.28 buildsys-build-rpmfusion.spec, 1.38, 1.39
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18707
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Sat Dec 10 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10:16-11
- rebuild for kernel 3.1.5-1.fc16
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-16/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- buildsys-build-rpmfusion-kerneldevpkgs-current 10 Dec 2011 20:59:19 -0000 1.27
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 10 Dec 2011 21:15:10 -0000 1.28
@@ -1,3 +1,3 @@
-kernel-3.1.5-1.fc16
-kernel-3.1.5-1.fc16smp
-kernel-3.1.5-1.fc16PAE
+3.1.5-1.fc16
+3.1.5-1.fc16smp
+3.1.5-1.fc16PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-16/buildsys-build-rpmfusion.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- buildsys-build-rpmfusion.spec 10 Dec 2011 20:59:19 -0000 1.38
+++ buildsys-build-rpmfusion.spec 10 Dec 2011 21:15:10 -0000 1.39
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 16
-Release: 10
+Release: 11
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,8 +86,8 @@
%changelog
-* Sat Dec 10 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10:16-10
-- rebuild for kernel kernel-3.1.5-1.fc16
+* Sat Dec 10 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10:16-11
+- rebuild for kernel 3.1.5-1.fc16
* Wed Nov 30 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10:16-9
- rebuild for kernel 3.1.4-1.fc16
12 years, 4 months
rpms/buildsys-build-rpmfusion/F-16 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.26, 1.27 buildsys-build-rpmfusion.spec, 1.37, 1.38
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14465
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Sat Dec 10 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10:16-10
- rebuild for kernel kernel-3.1.5-1.fc16
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-16/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- buildsys-build-rpmfusion-kerneldevpkgs-current 30 Nov 2011 15:14:38 -0000 1.26
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 10 Dec 2011 20:59:19 -0000 1.27
@@ -1,3 +1,3 @@
-3.1.4-1.fc16
-3.1.4-1.fc16smp
-3.1.4-1.fc16PAE
+kernel-3.1.5-1.fc16
+kernel-3.1.5-1.fc16smp
+kernel-3.1.5-1.fc16PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-16/buildsys-build-rpmfusion.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- buildsys-build-rpmfusion.spec 30 Nov 2011 15:14:38 -0000 1.37
+++ buildsys-build-rpmfusion.spec 10 Dec 2011 20:59:19 -0000 1.38
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 16
-Release: 9
+Release: 10
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Sat Dec 10 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10:16-10
+- rebuild for kernel kernel-3.1.5-1.fc16
+
* Wed Nov 30 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 10:16-9
- rebuild for kernel 3.1.4-1.fc16
12 years, 4 months
rpms/fakenes/F-16 fakenes-0.5.9-beta3-allegro44-build.patch, NONE, 1.1 fakenes-0.5.9-beta3-libm-build.patch, NONE, 1.1 fakenes.spec, 1.8, 1.9
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/fakenes/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30529
Modified Files:
fakenes.spec
Added Files:
fakenes-0.5.9-beta3-allegro44-build.patch
fakenes-0.5.9-beta3-libm-build.patch
Log Message:
* Sat Dec 10 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 0.5.9-0.3.beta3
- Fix building with allegro-4.4.x (rf#1969)
- Fix the broken icon
fakenes-0.5.9-beta3-allegro44-build.patch:
alleggl.cbd | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE fakenes-0.5.9-beta3-allegro44-build.patch ---
diff -up fakenes-0.5.9-beta3/build/alleggl.cbd~ fakenes-0.5.9-beta3/build/alleggl.cbd
--- fakenes-0.5.9-beta3/build/alleggl.cbd~ 2006-10-03 11:06:27.000000000 +0200
+++ fakenes-0.5.9-beta3/build/alleggl.cbd 2011-12-10 20:31:48.906063273 +0100
@@ -22,9 +22,9 @@ CFLAGS += ' -DUSE_ALLEGROGL'
# --
-LIBAGL = agl
+LIBAGL = alleggl
-ifopt debug LIBAGL = 'agld'
+ifopt debug LIBAGL = 'alleggld'
AGL_LIBS = "-l${LIBAGL} "
fakenes-0.5.9-beta3-libm-build.patch:
default.cbd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE fakenes-0.5.9-beta3-libm-build.patch ---
diff -up fakenes-0.5.9-beta3/default.cbd~ fakenes-0.5.9-beta3/default.cbd
--- fakenes-0.5.9-beta3/default.cbd~ 2007-06-25 18:43:10.000000000 +0200
+++ fakenes-0.5.9-beta3/default.cbd 2011-12-10 20:37:13.528058876 +0100
@@ -297,7 +297,7 @@ ifopt clean goto clean
CXXFLAGS = "${CFLAGS}"
# We have to include this or we get undefined references to new & delete.
-LDFLAGS += ' -lstdc++'
+LDFLAGS += ' -lstdc++ -lm'
compile ${SRCFILES}
Index: fakenes.spec
===================================================================
RCS file: /cvs/free/rpms/fakenes/F-16/fakenes.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fakenes.spec 3 Oct 2011 19:24:59 -0000 1.8
+++ fakenes.spec 10 Dec 2011 19:54:46 -0000 1.9
@@ -2,7 +2,7 @@
Name: fakenes
Version: 0.5.9
-Release: 0.2.%{beta}%{?dist}
+Release: 0.3.%{beta}%{?dist}
Summary: Nintendo Entertainment System emulator
Group: Amusements/Games
License: Artistic
@@ -13,9 +13,11 @@
Patch1: fakenes-0.5.8-driver-switch.patch
Patch2: fakenes-0.5.9-beta3-gcc43.patch
Patch3: fakenes-0.5.9-beta3-openal-build.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch4: fakenes-0.5.9-beta3-allegro44-build.patch
+Patch5: fakenes-0.5.9-beta3-libm-build.patch
BuildRequires: allegro-devel alleggl-devel zlib-devel openal-devel
BuildRequires: libGLU-devel freealut-devel desktop-file-utils
+BuildRequires: libicns-utils
Requires: hicolor-icon-theme
%description
@@ -32,6 +34,8 @@
%patch1 -p1 -z .driver
%patch2 -p1 -z .gcc43
%patch3 -p1 -z .openal-build
+%patch4 -p1 -z .allegro44-build
+%patch5 -p1 -z .libm
sed -i 's/\r//' docs/faq.html
@@ -39,43 +43,47 @@
export CFLAGS="$RPM_OPT_FLAGS -ffast-math"
make cbuild
./cbuild --verbose
+icns2png -x build/mac/FakeNES.icns
+touch -r build/mac/FakeNES.icns FakeNES_128x128x32.png
%install
-rm -rf $RPM_BUILD_ROOT
install -D -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor dribble \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-install -p -m 644 support/icon-32x32.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
+install -p -m 644 FakeNES_128x128x32.png \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
-%defattr(-, root, root)
%doc docs/CHANGES docs/LICENSE docs/README docs/faq.html
%{_bindir}/%{name}
%{_datadir}/applications/dribble-%{name}.desktop
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
%changelog
+* Sat Dec 10 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 0.5.9-0.3.beta3
+- Fix building with allegro-4.4.x (rf#1969)
+- Fix the broken icon
+
* Mon Oct 03 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.9-0.2.beta3
- Rebuilt for liballeg
12 years, 4 months
rpms/fakenes/devel fakenes-0.5.9-beta3-allegro44-build.patch, NONE, 1.1 fakenes-0.5.9-beta3-libm-build.patch, NONE, 1.1 fakenes.spec, 1.8, 1.9
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/fakenes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30285
Modified Files:
fakenes.spec
Added Files:
fakenes-0.5.9-beta3-allegro44-build.patch
fakenes-0.5.9-beta3-libm-build.patch
Log Message:
* Sat Dec 10 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 0.5.9-0.3.beta3
- Fix building with allegro-4.4.x (rf#1969)
- Fix the broken icon
fakenes-0.5.9-beta3-allegro44-build.patch:
alleggl.cbd | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE fakenes-0.5.9-beta3-allegro44-build.patch ---
diff -up fakenes-0.5.9-beta3/build/alleggl.cbd~ fakenes-0.5.9-beta3/build/alleggl.cbd
--- fakenes-0.5.9-beta3/build/alleggl.cbd~ 2006-10-03 11:06:27.000000000 +0200
+++ fakenes-0.5.9-beta3/build/alleggl.cbd 2011-12-10 20:31:48.906063273 +0100
@@ -22,9 +22,9 @@ CFLAGS += ' -DUSE_ALLEGROGL'
# --
-LIBAGL = agl
+LIBAGL = alleggl
-ifopt debug LIBAGL = 'agld'
+ifopt debug LIBAGL = 'alleggld'
AGL_LIBS = "-l${LIBAGL} "
fakenes-0.5.9-beta3-libm-build.patch:
default.cbd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE fakenes-0.5.9-beta3-libm-build.patch ---
diff -up fakenes-0.5.9-beta3/default.cbd~ fakenes-0.5.9-beta3/default.cbd
--- fakenes-0.5.9-beta3/default.cbd~ 2007-06-25 18:43:10.000000000 +0200
+++ fakenes-0.5.9-beta3/default.cbd 2011-12-10 20:37:13.528058876 +0100
@@ -297,7 +297,7 @@ ifopt clean goto clean
CXXFLAGS = "${CFLAGS}"
# We have to include this or we get undefined references to new & delete.
-LDFLAGS += ' -lstdc++'
+LDFLAGS += ' -lstdc++ -lm'
compile ${SRCFILES}
Index: fakenes.spec
===================================================================
RCS file: /cvs/free/rpms/fakenes/devel/fakenes.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fakenes.spec 3 Oct 2011 19:24:59 -0000 1.8
+++ fakenes.spec 10 Dec 2011 19:52:43 -0000 1.9
@@ -2,7 +2,7 @@
Name: fakenes
Version: 0.5.9
-Release: 0.2.%{beta}%{?dist}
+Release: 0.3.%{beta}%{?dist}
Summary: Nintendo Entertainment System emulator
Group: Amusements/Games
License: Artistic
@@ -13,9 +13,11 @@
Patch1: fakenes-0.5.8-driver-switch.patch
Patch2: fakenes-0.5.9-beta3-gcc43.patch
Patch3: fakenes-0.5.9-beta3-openal-build.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch4: fakenes-0.5.9-beta3-allegro44-build.patch
+Patch5: fakenes-0.5.9-beta3-libm-build.patch
BuildRequires: allegro-devel alleggl-devel zlib-devel openal-devel
BuildRequires: libGLU-devel freealut-devel desktop-file-utils
+BuildRequires: libicns-utils
Requires: hicolor-icon-theme
%description
@@ -32,6 +34,8 @@
%patch1 -p1 -z .driver
%patch2 -p1 -z .gcc43
%patch3 -p1 -z .openal-build
+%patch4 -p1 -z .allegro44-build
+%patch5 -p1 -z .libm
sed -i 's/\r//' docs/faq.html
@@ -39,43 +43,47 @@
export CFLAGS="$RPM_OPT_FLAGS -ffast-math"
make cbuild
./cbuild --verbose
+icns2png -x build/mac/FakeNES.icns
+touch -r build/mac/FakeNES.icns FakeNES_128x128x32.png
%install
-rm -rf $RPM_BUILD_ROOT
install -D -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor dribble \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE1}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-install -p -m 644 support/icon-32x32.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
+install -p -m 644 FakeNES_128x128x32.png \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
-%defattr(-, root, root)
%doc docs/CHANGES docs/LICENSE docs/README docs/faq.html
%{_bindir}/%{name}
%{_datadir}/applications/dribble-%{name}.desktop
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
%changelog
+* Sat Dec 10 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl> - 0.5.9-0.3.beta3
+- Fix building with allegro-4.4.x (rf#1969)
+- Fix the broken icon
+
* Mon Oct 03 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.9-0.2.beta3
- Rebuilt for liballeg
12 years, 4 months
rpms/VirtualBox-OSE-kmod/F-16 VirtualBox-OSE-kmod.spec,1.59,1.60
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28025
Modified Files:
VirtualBox-OSE-kmod.spec
Log Message:
* Fri Dec 9 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-1
- Build for new release
- added time package to AkmodsBuildRequires
- removed clean section
- change define to current
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/F-16/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- VirtualBox-OSE-kmod.spec 30 Nov 2011 23:05:31 -0000 1.59
+++ VirtualBox-OSE-kmod.spec 10 Dec 2011 05:35:38 -0000 1.60
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+%define buildforkernels current
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
@@ -17,8 +17,8 @@
%bcond_without hardening
Name: VirtualBox-OSE-kmod
-Version: 4.1.2
-Release: 1%{?dist}.8
+Version: 4.1.6
+Release: 1%{?dist}.1
Summary: Kernel module for VirtualBox-OSE
Group: System Environment/Kernel
@@ -28,7 +28,7 @@
Source1: VirtualBox-OSE-kmod-1.6.4-kernel-variants.txt
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-OSE-kmodsrc = %{version}%{?prereltag}, xz
+%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-OSE-kmodsrc = %{version}%{?prereltag}, xz, time
BuildRequires: %{AkmodsBuildRequires}
# needed for plague to make sure it builds for i586 and i686
@@ -99,11 +99,13 @@
[ $MODS = $DIRS ] || [ $MODS = 0 ]
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%changelog
+* Fri Dec 9 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-1
+- Build for new release
+- added time package to AkmodsBuildRequires
+- removed clean section
+- change define to current
+
* Thu Dec 01 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1.2-1.8
- rebuild for updated kernel
12 years, 4 months
rpms/VirtualBox-OSE/F-16 VirtualBox-OSE-4.1.4-noupdate.patch, NONE, 1.1 VirtualBox-OSE-4.1.4-xorg17.patch, NONE, 1.1 VirtualBox-OSE-4.1.6-strings.patch, NONE, 1.1
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-OSE/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10516
Added Files:
VirtualBox-OSE-4.1.4-noupdate.patch
VirtualBox-OSE-4.1.4-xorg17.patch
VirtualBox-OSE-4.1.6-strings.patch
Log Message:
* Sat Dec 3 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-3
add VirtualBox-OSE-4.1.4-noupdate.patch, VirtualBox-OSE-4.1.4-xorg17.patch and
VirtualBox-OSE-4.1.6-strings.patch
VirtualBox-OSE-4.1.4-noupdate.patch:
UIUpdateDefs.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE VirtualBox-OSE-4.1.4-noupdate.patch ---
>From 631f2a6aa525f51fa38a3b59550d80e452181e5f Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Wed, 28 Apr 2010 11:53:40 +0200
Subject: [PATCH 1/4] Disable automatic check for updates
Our OS provides superior way of dealing with updates (PackageKit).
Let's not bug the user with updates that are not yet packaged.
---
.../Frontends/VirtualBox/src/VBoxUpdateDlg.cpp | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
--- a/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp 2011-10-03 23:27:27.022252299 +0100
+++ b/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp 2011-10-03 23:27:37.597338185 +0100
@@ -138,7 +138,7 @@
if (m_dayList.isEmpty())
populate();
PeriodType index = (PeriodType)m_dayList.indexOf(VBoxUpdateDay(QString(), parser[0]));
- m_periodIndex = index == PeriodUndefined ? Period1Day : index;
+ m_periodIndex = index == PeriodUndefined ? PeriodNever : index;
}
/* Parse 'date' value: */
VirtualBox-OSE-4.1.4-xorg17.patch:
b/src/VBox/Additions/common/crOpenGL/Makefile.kmk | 14 +----
b/src/VBox/Additions/x11/Makefile.kmk | 4 +
b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 17 +++++-
src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 59 +++++++++++++---------
4 files changed, 58 insertions(+), 36 deletions(-)
--- NEW FILE VirtualBox-OSE-4.1.4-xorg17.patch ---
Based:
Description: Build the X.Org driver only for the selected system X Server version.
Author: Michael Meskes <meskes(a)debian.org>, Felix Geyer <debfx-pkg(a)fobos.de>
diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
--- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
@@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUESTDLL
VBoxOGL_INCS = .
if1of ($(KBUILD_TARGET), linux solaris freebsd)
VBoxOGL_INCS += \
- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
- $(VBOX_PATH_X11_ROOT)/1.3/xorg \
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1 \
$(VBOX_MESA_INCS) \
- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
+ /usr/include/drm \
+ /usr/include/libdrm
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif
diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk
--- a/src/VBox/Additions/x11/Makefile.kmk
+++ b/src/VBox/Additions/x11/Makefile.kmk
@@ -17,6 +17,10 @@
SUB_DEPTH = ../../../..
include $(KBUILD_PATH)/subheader.kmk
+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110)
+ XSERVER_VERSION := 17
+endif
+
# Include sub-makefiles.
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
@@ -56,6 +56,18 @@
endif
+ifeq ($(KBUILD_TARGET), linux)
+DLLS += vboxmouse_drv_$(XSERVER_VERSION)
+vboxmouse_drv_$(XSERVER_VERSION)_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxmouse_drv_$(XSERVER_VERSION)_DEFS = XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE \
+ NO_ANSIC
+vboxmouse_drv_$(XSERVER_VERSION)_INCS := \
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1
+vboxmouse_drv_$(XSERVER_VERSION) = \
+ vboxmouse_15.c
+else
#
# vboxmouse_drv_70
#
@@ -154,7 +166,6 @@
vboxmouse_15.c
-ifneq ($(KBUILD_TARGET), linux)
#
# vboxmouse_drv_17
@@ -256,6 +267,8 @@
$(QUIET)$(APPEND) -t "$@" "done"
endif
+ifneq ($(KBUILD_TARGET), linux)
+
TESTING += $(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run
OTHERS += $(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run
$$(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run: $$(vboxmouse_drv_70_1_STAGE_TARGET)
@@ -304,8 +317,6 @@
$(vboxmouse_drv_16_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined_15
$(QUIET)$(APPEND) -t "$@" "done"
-ifneq ($(KBUILD_TARGET), linux)
-
TESTING += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run
OTHERS += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run
$$(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run: $$(vboxmouse_drv_17_1_STAGE_TARGET)
--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -89,7 +89,7 @@ vboxvideo_drv_SOURCES = \
# base keywords instead of using .solaris or .linux.
# Also it is *important* to use := and not = when deriving a property.
#
-DLLS += vboxvideo_drv_70
+#DLLS += vboxvideo_drv_70
vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
if1of ($(KBUILD_TARGET), linux)
vboxvideo_drv_70_CFLAGS += \
@@ -112,7 +112,7 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES)
#
# vboxvideo_drv_71
#
-DLLS += vboxvideo_drv_71
+#DLLS += vboxvideo_drv_71
vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
@@ -127,7 +127,7 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES)
#
# vboxvideo_drv_13
#
-DLLS += vboxvideo_drv_13
+#DLLS += vboxvideo_drv_13
vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13
@@ -146,7 +146,7 @@ vboxvideo_drv_13_SOURCES = $(vboxvideo_drv_SOURCES)
#
# vboxvideo_drv_14
#
-DLLS += vboxvideo_drv_14
+#DLLS += vboxvideo_drv_14
vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS)
@@ -165,7 +165,7 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_SOURCES)
#
# vboxvideo_drv_15
#
-DLLS += vboxvideo_drv_15
+#DLLS += vboxvideo_drv_15
vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \
@@ -192,7 +192,7 @@ endif
#
# vboxvideo_drv_16
#
-DLLS += vboxvideo_drv_16
+#DLLS += vboxvideo_drv_16
vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS)
@@ -218,20 +218,32 @@ vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
vboxvideo_drv_17_INCS = \
- $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
- $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
- $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
- $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
- $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
- $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
- $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
- $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
- $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
+ /usr/include/drm \
+ /usr/include/X11/dri \
+ /usr/include/pixman-1 \
+ /usr/share/xorg-x11-server-source \
+ /usr/share/xorg-x11-server-source/fb \
+ /usr/share/xorg-x11-server-source/hw/xfree86/common \
+ /usr/share/xorg-x11-server-source/hw/xfree86/ddc \
+ /usr/share/xorg-x11-server-source/hw/xfree86/dixmods/extmod \
+ /usr/share/xorg-x11-server-source/hw/xfree86/dri \
+ /usr/share/xorg-x11-server-source/hw/xfree86/i2c \
+ /usr/share/xorg-x11-server-source/hw/xfree86/int10 \
+ /usr/share/xorg-x11-server-source/hw/xfree86/modes \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support/bus \
+ /usr/share/xorg-x11-server-source/hw/xfree86/ramdac \
+ /usr/share/xorg-x11-server-source/hw/xfree86/shadowfb \
+ /usr/share/xorg-x11-server-source/hw/xfree86/vbe \
+ /usr/share/xorg-x11-server-source/hw/xfree86/vgahw \
+ /usr/share/xorg-x11-server-source/hw/xquartz/xpr \
+ /usr/share/xorg-x11-server-source/include \
+ /usr/share/xorg-x11-server-source/mi \
+ /usr/share/xorg-x11-server-source/miext/damage \
+ /usr/share/xorg-x11-server-source/randr \
+ /usr/share/xorg-x11-server-source/Xext \
+ /usr/share/xorg-x11-server-source/render \
+ /usr/share/xorg-x11-server-source/hw/xfree86/parser
vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
@@ -239,7 +251,7 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
#
# vboxvideo_drv_18
#
-DLLS += vboxvideo_drv_18
+#DLLS += vboxvideo_drv_18
vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS)
@@ -266,7 +278,7 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
#
# vboxvideo_drv_19
#
-DLLS += vboxvideo_drv_19
+#DLLS += vboxvideo_drv_19
vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS)
@@ -292,7 +304,7 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)
# Check the undefined symbols in the X.Org modules against lists of allowed
# symbols. Not very elegant, but it will catch problems early.
-ifdef VBOX_WITH_TESTCASES
+ifdef NOT_VBOX_WITH_TESTCASES
# ifndef VBOX_ONLY_ADDITIONS
if1of ($(KBUILD_TARGET),linux solaris)
ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
--
1.7.3.4
VirtualBox-OSE-4.1.6-strings.patch:
b/src/VBox/Installer/linux/VBox.sh | 11 ++++++-----
b/src/VBox/VMM/VMMR3/VM.cpp | 9 ++++-----
src/VBox/Frontends/VirtualBox/src/main.cpp | 20 ++++++++++----------
3 files changed, 20 insertions(+), 20 deletions(-)
--- NEW FILE VirtualBox-OSE-4.1.6-strings.patch ---
>From 3a6d9a3d4f8d9084759fe871033b6b4a990aa761 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Mon, 10 May 2010 12:08:47 -0400
Subject: [PATCH] Replace some strings
With ones that (sometimes) make more sense.
---
src/VBox/Frontends/VirtualBox/src/main.cpp | 20 ++++++++++----------
src/VBox/Installer/linux/VBox.sh | 11 ++++++-----
src/VBox/VMM/VMMR3/VM.cpp | 8 ++++----
3 files changed, 20 insertions(+), 19 deletions(-)
--- a/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-05 07:16:19.000000000 +0000
+++ b/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-12 03:13:48.210675902 +0000
@@ -72,13 +72,13 @@
);
QString g_QStrHintLinuxNoDriver = QApplication::tr(
- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
- "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
- "module by executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
- "as root. If it is available in your distribution, you should install the "
- "DKMS package first. This package keeps track of Linux kernel changes and "
- "recompiles the vboxdrv kernel module if necessary."
+ "The VirtualBox Linux kernel driver (vboxdrv) is probably not "
+ "loaded.<br/><br/>"
+ "If you installed or VirtualBox OSE package recently you need to restart "
+ "the computer for the driver to load.<br/><br/>"
+ "Alternatively, you may attempt to load the driver by issuing the "
+ "following command with system administrator (root) privileges:<br/><br/>"
+ " <font color=blue>'/etc/sysconfig/modules/VirtualBox-OSE.modules'</font><br/><br/>"
);
QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
@@ -92,7 +92,7 @@
"The VirtualBox kernel modules do not match this version of "
"VirtualBox. The installation of VirtualBox was apparently not "
"successful. Executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
+ " <font color=blue>'/etc/sysconfig/modules/VirtualBox-OSE.modules'</font><br/><br/>"
"may correct this. Make sure that you do not mix the "
"OSE version and the PUEL version of VirtualBox."
);
@@ -101,9 +101,9 @@
"Make sure the kernel module has been loaded successfully."
);
-/* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */
+/* We're going to try to give a helping hand */
QString g_QStrHintReinstall = QApplication::tr(
- "Please try reinstalling VirtualBox."
+ "Please report the problem to the RPM Fusion Bugzilla."
);
#if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX)
diff --git a/src/VBox/Installer/linux/VBox.sh b/src/VBox/Installer/linux/VBox.sh
index 9319696..0e782e0 100644
--- a/src/VBox/Installer/linux/VBox.sh
+++ b/src/VBox/Installer/linux/VBox.sh
@@ -32,19 +32,20 @@ elif ! lsmod|grep -q vboxdrv; then
cat << EOF
WARNING: The vboxdrv kernel module is not loaded. Either there is no module
available for the current kernel (`uname -r`) or it failed to
- load. Please recompile the kernel module and install it by
+ load. Reboot the computer, or insert the kernel module by executing
- sudo /etc/init.d/vboxdrv setup
+ '/etc/sysconfig/modules/VirtualBox-OSE.modules' (as root)
You will not be able to start VMs until this problem is fixed.
EOF
elif [ ! -c /dev/vboxdrv ]; then
cat << EOF
-WARNING: The character device /dev/vboxdrv does not exist. Try
+WARNING: The character device /dev/vboxdrv does not exist. Try running
- sudo /etc/init.d/vboxdrv restart
+ '/sbin/udevtrigger' (as root)
- and if that is not successful, try to re-install the package.
+ and if that is not successful, then you're in situation that
+ can not possibly happen and there's nothing you can do about it.
You will not be able to start VMs until this problem is fixed.
EOF
diff --git a/src/VBox/VMM/VMMR3/VM.cpp b/src/VBox/VMM/VMMR3/VM.cpp
index d9e1bc1..c24f8dd 100644
--- a/src/VBox/VMM/VMMR3/VM.cpp
+++ b/src/VBox/VMM/VMMR3/VM.cpp
@@ -363,8 +363,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCpus, PCVMM2USERMETHODS pVmm2UserMethods,
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv is not set up properly. "
- "Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "Reboot the computer, or insert the kernel module by executing "
+ "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root");
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
@@ -405,8 +405,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCpus, PCVMM2USERMETHODS pVmm2UserMethods,
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv was not created for some "
- "reason. Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "reason. Insert the kernel module by executing "
+ "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
--
1.7.3.4
12 years, 4 months
rpms/VirtualBox-OSE/F-16 .cvsignore, 1.29, 1.30 VirtualBox-OSE.spec, 1.72, 1.73 sources, 1.29, 1.30 VirtualBox-OSE-4.0.2-strings.patch, 1.1, NONE VirtualBox-OSE-4.0.2-xorg17.patch, 1.1, NONE VirtualBox-OSE-4.1.2-noupdate.patch, 1.1, NONE VirtualBox-OSE-4.1.2-vboxpci.patch, 1.1, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-OSE/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9944
Modified Files:
.cvsignore VirtualBox-OSE.spec sources
Removed Files:
VirtualBox-OSE-4.0.2-strings.patch
VirtualBox-OSE-4.0.2-xorg17.patch
VirtualBox-OSE-4.1.2-noupdate.patch
VirtualBox-OSE-4.1.2-vboxpci.patch
Log Message:
* Sat Dec 3 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-3
- New release
- fix strings patch
- redo xorg17 patch (still need some improvements, I will wait for a new change that break the patch)
- redo noupdate patch.
- some cleanups.
- drop upstream patch VirtualBox-OSE-4.1.2-vboxpci.patch
- bug #1656 add VirtualBox-OSE-add-VBoxExtPackHelperApp.patch
- disable java binding, seems non maintained and doesn't compile with java-1.7.0-openjdk-devel.
- bug #2052, drop requirement of HAL in Fedora >= 16.
- bug #2040, is also fixed (update to 4.1.6).
- Now rawhide needs explicit BuildRequires libpng-devel
- Bump to release 3 to overwrite my external link.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-16/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore 22 Sep 2011 10:04:37 -0000 1.29
+++ .cvsignore 10 Dec 2011 04:11:00 -0000 1.30
@@ -1 +1 @@
-VirtualBox-4.1.2.tar.bz2
+VirtualBox-4.1.6.tar.bz2
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-16/VirtualBox-OSE.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- VirtualBox-OSE.spec 26 Nov 2011 12:54:53 -0000 1.72
+++ VirtualBox-OSE.spec 10 Dec 2011 04:11:01 -0000 1.73
@@ -14,8 +14,8 @@
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
Name: VirtualBox-OSE
-Version: 4.1.2
-Release: 2%{?prerel:.%{prerel}}%{?dist}
+Version: 4.1.6
+Release: 3%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -29,10 +29,10 @@
Source8: VirtualBox-OSE-vboxresize.desktop
Source9: VirtualBox-OSE-00-vboxvideo.conf
Source10: vboxweb-service
-Patch1: VirtualBox-OSE-4.1.2-noupdate.patch
-Patch2: VirtualBox-OSE-4.0.2-strings.patch
+Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
+Patch2: VirtualBox-OSE-4.1.6-strings.patch
Patch3: VirtualBox-OSE-4.1.2-libcxx.patch
-Patch5: VirtualBox-OSE-4.0.2-xorg17.patch
+Patch5: VirtualBox-OSE-4.1.4-xorg17.patch
Patch9: VirtualBox-OSE-3.2.4-optflags.patch
Patch10: VirtualBox-OSE-4.0.0-32bit.patch
Patch11: VirtualBox-OSE-3.2.0-visibility.patch
@@ -41,8 +41,7 @@
Patch16: VirtualBox-OSE-4.1.2-usblib.patch
Patch17: VirtualBox-OSE-4.0.0-beramono.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
-Patch19: VirtualBox-OSE-4.1.2-vboxpci.patch
-Patch20: VirtualBox-OSE-4.1.2-testmangle.patch
+Patch20: VirtualBox-OSE-4.1.2-testmangle.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,7 +49,7 @@
BuildRequires: SDL-devel xalan-c-devel
BuildRequires: openssl-devel
BuildRequires: libcurl-devel
-BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libXcursor-devel libIDL-devel
+BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libXcursor-devel libIDL-devel libXcomposite-devel
BuildRequires: yasm
BuildRequires: pulseaudio-libs-devel
BuildRequires: libXmu-devel
@@ -64,6 +63,7 @@
BuildRequires: mkisofs
BuildRequires: java-devel >= 1.6
BuildRequires: /usr/bin/pdflatex
+BuildRequires: libpng-devel
# For the X11 module
BuildRequires: libdrm-devel
@@ -120,16 +120,18 @@
Group: System Environment/Base
Requires: %{name}-kmod = %{version}
Provides: %{name}-kmod-common = %{version}
+%if 0%{?fedora} < 16
Requires: hal
+%endif
Requires: xorg-x11-server-Xorg
Requires: xorg-x11-xinit
Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release}
Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release}
Conflicts: %{name} <= %{version}-%{release}
%if "%(xserver-sdk-abi-requires 2>/dev/null)"
-Requires: %(xserver-sdk-abi-requires ansic)
-Requires: %(xserver-sdk-abi-requires videodrv)
-Requires: %(xserver-sdk-abi-requires xinput)
+Requires: %(xserver-sdk-abi-requires ansic)
+Requires: %(xserver-sdk-abi-requires videodrv)
+Requires: %(xserver-sdk-abi-requires xinput)
%endif
@@ -164,7 +166,6 @@
%patch16 -p1 -b .usblib
%patch17 -p1 -b .beramono
%patch18 -p1 -b .aiobug
-%patch19 -p1 -b .vboxpci
%patch20 -p1 -b .testmangle
# Remove prebuilt binary tools
@@ -176,7 +177,7 @@
%build
-./configure --disable-kmods --enable-webservice
+./configure --disable-kmods --enable-webservice --disable-java
. ./env.sh
# VirtualBox build system installs and builds in the same step,
@@ -259,18 +260,12 @@
obj/bin/VBoxSysInfo.sh \
obj/bin/vboxshell.py \
obj/bin/VBoxTestOGL \
+ obj/bin/VBoxExtPackHelperApp \
obj/bin/vboxwebsrv \
obj/bin/VBoxBalloonCtrl \
obj/bin/webtest \
obj/bin/VBoxBFE
-# Lowercase aliases
-for F in VBoxBalloonCtrl VBoxHeadless VBoxManage VBoxSDL VirtualBox VBoxBFE
-do
- ln $RPM_BUILD_ROOT%{_bindir}/$F \
- $RPM_BUILD_ROOT%{_bindir}/$(echo $F |awk '{print tolower($0)}')
-done
-
# Language files
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \
obj/bin/nls/*
@@ -309,10 +304,6 @@
install -m 0755 -D obj/bin/additions/vboxvideo_drv_%{x11_api}.so \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
-# This is no longer needed for a more recent Xorg, since evdev uses udev
-install -m 0755 -D src/VBox/Additions/linux/installer/90-vboxguest.fdi \
- $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
-
# Guest tools
install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
obj/bin/additions/mount.vboxsf \
@@ -368,11 +359,6 @@
--remove-key=DocPath --remove-category=X-MandrivaLinux-System \
--vendor='' obj/bin/virtualbox.desktop
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post
# Group for USB devices
getent group vboxusers >/dev/null || groupadd -r vboxusers
@@ -414,18 +400,12 @@
%files
%defattr(-,root,root,-)
%{_bindir}/VBox
-%{_bindir}/vboxballoonctrl
%{_bindir}/VBoxBalloonCtrl
-%{_bindir}/vboxbfe
%{_bindir}/VBoxBFE
-%{_bindir}/vboxheadless
%{_bindir}/VBoxHeadless
-%{_bindir}/vboxmanage
%{_bindir}/VBoxManage
-%{_bindir}/vboxsdl
%{_bindir}/VBoxSDL
%{_bindir}/VBoxTunctl
-%{_bindir}/virtualbox
%{_bindir}/VirtualBox
%{_bindir}/vboxwebsrv
%dir %{_libdir}/virtualbox
@@ -434,6 +414,7 @@
%{_libdir}/virtualbox/*.py*
%{_libdir}/virtualbox/components
%{_libdir}/virtualbox/nls
+%{_libdir}/virtualbox/VBoxExtPackHelperApp
%{_libdir}/virtualbox/VBoxManage
%{_libdir}/virtualbox/VBoxSVC
%{_libdir}/virtualbox/VBoxTestOGL
@@ -483,7 +464,6 @@
%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
%{_sysconfdir}/xdg/autostart/vboxclient.desktop
%exclude %{_datadir}/gdm
-%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
%config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
%doc COPYING
@@ -495,6 +475,20 @@
%changelog
+* Sat Dec 3 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-3
+- New release
+- fix strings patch
+- redo xorg17 patch (still need some improvements, I will wait for a new change that break the patch)
+- redo noupdate patch.
+- some cleanups.
+- drop upstream patch VirtualBox-OSE-4.1.2-vboxpci.patch
+- bug #1656 add VirtualBox-OSE-add-VBoxExtPackHelperApp.patch
+- disable java binding, seems non maintained and doesn't compile with java-1.7.0-openjdk-devel.
+- bug #2052, drop requirement of HAL in Fedora >= 16.
+- bug #2040, is also fixed (update to 4.1.6).
+- Now rawhide needs explicit BuildRequires libpng-devel
+- Bump to release 3 to overwrite my external link.
+
* Sat Nov 26 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.2-2
- small fix for bug #1979.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-16/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 22 Sep 2011 10:04:38 -0000 1.29
+++ sources 10 Dec 2011 04:11:01 -0000 1.30
@@ -1 +1 @@
-945d2c94c15a4f47280be4b01b67e244 VirtualBox-4.1.2.tar.bz2
+89b979d1b817242c7cdcb489898f166a VirtualBox-4.1.6.tar.bz2
--- VirtualBox-OSE-4.0.2-strings.patch DELETED ---
--- VirtualBox-OSE-4.0.2-xorg17.patch DELETED ---
--- VirtualBox-OSE-4.1.2-noupdate.patch DELETED ---
--- VirtualBox-OSE-4.1.2-vboxpci.patch DELETED ---
12 years, 4 months
rpms/zsnes/F-15 zsnes-1.51-hat_events.patch, NONE, 1.1 zsnes-1.51-libpng15.patch, NONE, 1.1 zsnes.spec, 1.9, 1.10
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/zsnes/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12180
Modified Files:
zsnes.spec
Added Files:
zsnes-1.51-hat_events.patch zsnes-1.51-libpng15.patch
Log Message:
* Sat Nov 26 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-12
- fixed FTBFS with libpng 1.5
zsnes-1.51-hat_events.patch:
sdllink.c | 8 ++++++++
1 file changed, 8 insertions(+)
--- NEW FILE zsnes-1.51-hat_events.patch ---
diff -durN zsnes_1_51/src/linux/sdllink.c zsnes_1_51.hat_events/src/linux/sdllink.c
--- zsnes_1_51/src/linux/sdllink.c 2007-01-18 17:56:04.000000000 +0100
+++ zsnes_1_51.hat_events/src/linux/sdllink.c 2011-11-26 19:10:00.806907739 +0100
@@ -307,6 +307,8 @@
case SDL_HAT_UP:
pressed[offset + 3] = 1;
pressed[offset + 2] = 0;
+ pressed[offset + 1] = 0;
+ pressed[offset + 0] = 0;
break;
case SDL_HAT_RIGHTUP:
pressed[offset] = 1;
@@ -317,6 +319,8 @@
case SDL_HAT_RIGHT:
pressed[offset] = 1;
pressed[offset + 1] = 0;
+ pressed[offset + 2] = 0;
+ pressed[offset + 3] = 0;
break;
case SDL_HAT_RIGHTDOWN:
pressed[offset] = 1;
@@ -326,6 +330,8 @@
break;
case SDL_HAT_DOWN:
pressed[offset + 2] = 1;
+ pressed[offset + 0] = 0;
+ pressed[offset + 1] = 0;
pressed[offset + 3] = 0;
break;
case SDL_HAT_LEFTDOWN:
@@ -337,6 +343,8 @@
case SDL_HAT_LEFT:
pressed[offset + 1] = 1;
pressed[offset] = 0;
+ pressed[offset + 2] = 0;
+ pressed[offset + 3] = 0;
break;
case SDL_HAT_LEFTUP:
pressed[offset + 1] = 1;
zsnes-1.51-libpng15.patch:
zpng.c | 1 -
1 file changed, 1 deletion(-)
--- NEW FILE zsnes-1.51-libpng15.patch ---
--- zsnes-1.510+bz2.orig/src/zip/zpng.c
+++ zsnes-1.510+bz2/src/zip/zpng.c
@@ -129,7 +129,6 @@ int Png_Dump(const char *filename, unsig
png_set_IHDR(png_ptr, info_ptr, width, height, 8,
PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
//Allocate an array of scanline pointers
row_pointers = (png_bytep*)malloc(height*sizeof(png_bytep));
Index: zsnes.spec
===================================================================
RCS file: /cvs/free/rpms/zsnes/F-15/zsnes.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- zsnes.spec 18 Sep 2011 17:38:54 -0000 1.9
+++ zsnes.spec 9 Dec 2011 15:23:10 -0000 1.10
@@ -4,7 +4,7 @@
Summary: A Super Nintendo emulator
Name: zsnes
Version: 1.51
-Release: 10%{?dist}
+Release: 12%{?dist}
License: GPLv2
Group: Applications/Emulators
URL: http://www.zsnes.com/
@@ -19,6 +19,13 @@
Patch4: zsnes-1.51-pulseaudio.patch
# Ralf Corsepius
Patch5: zsnes-1.51-psr.patch
+# Fix gamepad diagonals problem
+# http://board.zsnes.com/phpBB3/viewtopic.php?t=12544
+Patch6: zsnes-1.51-hat_events.patch
+# Fix FTBFS with libpng 1.5
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649801
+Patch7: zsnes-1.51-libpng15.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This is to build only for ix86 on plague
#ExclusiveArch: %{ix86}
@@ -50,6 +57,8 @@
%patch3 -p2
%patch4 -p2
%patch5 -p2
+%patch6 -p2
+%patch7 -p2
# Remove hardcoded CFLAGS and LDFLAGS
sed -i \
@@ -128,6 +137,12 @@
%doc ../docs/readme.htm/ ../docs/readme.txt/
%changelog
+* Sat Nov 26 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-12
+- fixed FTBFS with libpng 1.5
+
+* Sat Nov 26 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-11
+- fixed gamepad diagonals problem (BZ #1976)
+
* Sun Sep 18 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-10
- used a patch by Ralf Corsepius to fix issues with parsegen
12 years, 4 months
rpms/zsnes/F-16 zsnes-1.51-hat_events.patch, NONE, 1.1 zsnes-1.51-libpng15.patch, NONE, 1.1 zsnes.spec, 1.9, 1.10
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/zsnes/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12038
Modified Files:
zsnes.spec
Added Files:
zsnes-1.51-hat_events.patch zsnes-1.51-libpng15.patch
Log Message:
* Sat Nov 26 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-12
- fixed FTBFS with libpng 1.5
zsnes-1.51-hat_events.patch:
sdllink.c | 8 ++++++++
1 file changed, 8 insertions(+)
--- NEW FILE zsnes-1.51-hat_events.patch ---
diff -durN zsnes_1_51/src/linux/sdllink.c zsnes_1_51.hat_events/src/linux/sdllink.c
--- zsnes_1_51/src/linux/sdllink.c 2007-01-18 17:56:04.000000000 +0100
+++ zsnes_1_51.hat_events/src/linux/sdllink.c 2011-11-26 19:10:00.806907739 +0100
@@ -307,6 +307,8 @@
case SDL_HAT_UP:
pressed[offset + 3] = 1;
pressed[offset + 2] = 0;
+ pressed[offset + 1] = 0;
+ pressed[offset + 0] = 0;
break;
case SDL_HAT_RIGHTUP:
pressed[offset] = 1;
@@ -317,6 +319,8 @@
case SDL_HAT_RIGHT:
pressed[offset] = 1;
pressed[offset + 1] = 0;
+ pressed[offset + 2] = 0;
+ pressed[offset + 3] = 0;
break;
case SDL_HAT_RIGHTDOWN:
pressed[offset] = 1;
@@ -326,6 +330,8 @@
break;
case SDL_HAT_DOWN:
pressed[offset + 2] = 1;
+ pressed[offset + 0] = 0;
+ pressed[offset + 1] = 0;
pressed[offset + 3] = 0;
break;
case SDL_HAT_LEFTDOWN:
@@ -337,6 +343,8 @@
case SDL_HAT_LEFT:
pressed[offset + 1] = 1;
pressed[offset] = 0;
+ pressed[offset + 2] = 0;
+ pressed[offset + 3] = 0;
break;
case SDL_HAT_LEFTUP:
pressed[offset + 1] = 1;
zsnes-1.51-libpng15.patch:
zpng.c | 1 -
1 file changed, 1 deletion(-)
--- NEW FILE zsnes-1.51-libpng15.patch ---
--- zsnes-1.510+bz2.orig/src/zip/zpng.c
+++ zsnes-1.510+bz2/src/zip/zpng.c
@@ -129,7 +129,6 @@ int Png_Dump(const char *filename, unsig
png_set_IHDR(png_ptr, info_ptr, width, height, 8,
PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
//Allocate an array of scanline pointers
row_pointers = (png_bytep*)malloc(height*sizeof(png_bytep));
Index: zsnes.spec
===================================================================
RCS file: /cvs/free/rpms/zsnes/F-16/zsnes.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- zsnes.spec 18 Sep 2011 17:37:24 -0000 1.9
+++ zsnes.spec 9 Dec 2011 15:22:33 -0000 1.10
@@ -4,7 +4,7 @@
Summary: A Super Nintendo emulator
Name: zsnes
Version: 1.51
-Release: 10%{?dist}
+Release: 12%{?dist}
License: GPLv2
Group: Applications/Emulators
URL: http://www.zsnes.com/
@@ -19,6 +19,13 @@
Patch4: zsnes-1.51-pulseaudio.patch
# Ralf Corsepius
Patch5: zsnes-1.51-psr.patch
+# Fix gamepad diagonals problem
+# http://board.zsnes.com/phpBB3/viewtopic.php?t=12544
+Patch6: zsnes-1.51-hat_events.patch
+# Fix FTBFS with libpng 1.5
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649801
+Patch7: zsnes-1.51-libpng15.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This is to build only for ix86 on plague
#ExclusiveArch: %{ix86}
@@ -50,6 +57,8 @@
%patch3 -p2
%patch4 -p2
%patch5 -p2
+%patch6 -p2
+%patch7 -p2
# Remove hardcoded CFLAGS and LDFLAGS
sed -i \
@@ -128,6 +137,12 @@
%doc ../docs/readme.htm/ ../docs/readme.txt/
%changelog
+* Sat Nov 26 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-12
+- fixed FTBFS with libpng 1.5
+
+* Sat Nov 26 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-11
+- fixed gamepad diagonals problem (BZ #1976)
+
* Sun Sep 18 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-10
- used a patch by Ralf Corsepius to fix issues with parsegen
12 years, 4 months
rpms/zsnes/devel zsnes-1.51-libpng15.patch, NONE, 1.1 zsnes.spec, 1.10, 1.11
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/zsnes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10689
Modified Files:
zsnes.spec
Added Files:
zsnes-1.51-libpng15.patch
Log Message:
* Sat Nov 26 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-12
- fixed FTBFS with libpng 1.5
zsnes-1.51-libpng15.patch:
zpng.c | 1 -
1 file changed, 1 deletion(-)
--- NEW FILE zsnes-1.51-libpng15.patch ---
--- zsnes-1.510+bz2.orig/src/zip/zpng.c
+++ zsnes-1.510+bz2/src/zip/zpng.c
@@ -129,7 +129,6 @@ int Png_Dump(const char *filename, unsig
png_set_IHDR(png_ptr, info_ptr, width, height, 8,
PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
//Allocate an array of scanline pointers
row_pointers = (png_bytep*)malloc(height*sizeof(png_bytep));
Index: zsnes.spec
===================================================================
RCS file: /cvs/free/rpms/zsnes/devel/zsnes.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- zsnes.spec 9 Dec 2011 13:02:34 -0000 1.10
+++ zsnes.spec 9 Dec 2011 15:13:02 -0000 1.11
@@ -4,7 +4,7 @@
Summary: A Super Nintendo emulator
Name: zsnes
Version: 1.51
-Release: 11%{?dist}
+Release: 12%{?dist}
License: GPLv2
Group: Applications/Emulators
URL: http://www.zsnes.com/
@@ -22,6 +22,9 @@
# Fix gamepad diagonals problem
# http://board.zsnes.com/phpBB3/viewtopic.php?t=12544
Patch6: zsnes-1.51-hat_events.patch
+# Fix FTBFS with libpng 1.5
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649801
+Patch7: zsnes-1.51-libpng15.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This is to build only for ix86 on plague
@@ -55,6 +58,7 @@
%patch4 -p2
%patch5 -p2
%patch6 -p2
+%patch7 -p2
# Remove hardcoded CFLAGS and LDFLAGS
sed -i \
@@ -133,6 +137,9 @@
%doc ../docs/readme.htm/ ../docs/readme.txt/
%changelog
+* Sat Nov 26 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-12
+- fixed FTBFS with libpng 1.5
+
* Sat Nov 26 2011 Andrea Musuruane <musuruan(a)gmail.com> 1.51-11
- fixed gamepad diagonals problem (BZ #1976)
12 years, 4 months