New commits:
commit 98d9b96b3b5af93a3d120d42a96d8ba1bb808de5
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>
vbetool: updated version to 1.1
in DETAILS, fixed SOURCE, SOURCE_URL and WEB_SITE
in DEPENDS, added libx86
in PRE_BUILD, applying a patch to fix compilation issue with Makefile
looking for static libpci while this lib is shared
added libpci-shared.patch to fix Makefile.*
commit 0961eca6f7e19f317483f0992ec2daac61498068
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>
libx86: added PRE_BUILD and defines.patch to fix compilation issue with
latest kernel
headers when not using x86emu
diff --git a/libs/libx86/HISTORY b/libs/libx86/HISTORY
index 5a97dc8..781ac0b 100644
--- a/libs/libx86/HISTORY
+++ b/libs/libx86/HISTORY
@@ -1,3 +1,7 @@
+2009-03-12 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * PRE_BUILD, defines.patch: added to fix compilation issue with
latest kernel
+ headers when not using x86emu
+
2008-06-27 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: Install using INSTALL_ROOT for LIBDIR
Use user defined CFLAGS
diff --git a/libs/libx86/PRE_BUILD b/libs/libx86/PRE_BUILD
new file mode 100755
index 0000000..08e3949
--- /dev/null
+++ b/libs/libx86/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+# fix compilation issue with latest kernel headers when not using x86emu
+if [[ "${SMGL_COMPAT_ARCHS[1]}" != "x86_64" ]]; then
+ patch -p1 < $SCRIPT_DIRECTORY/defines.patch
+fi
diff --git a/libs/libx86/defines.patch b/libs/libx86/defines.patch
new file mode 100644
index 0000000..4e12a29
--- /dev/null
+++ b/libs/libx86/defines.patch
@@ -0,0 +1,21 @@
+--- libx86-1.1.orig/lrmi.c 2009-03-12 14:27:01.000000000 +0100
++++ libx86-1.1/lrmi.c 2009-03-12 14:27:35.000000000 +0100
+@@ -55,6 +55,18 @@
+ #include "x86-common.h"
+
+ #if defined(__linux__)
++#ifndef TF_MASK
++#define TF_MASK X86_EFLAGS_TF
++#endif
++#ifndef IF_MASK
++#define IF_MASK X86_EFLAGS_IF
++#endif
++#ifndef IOPL_MASK
++#define IOPL_MASK X86_EFLAGS_IOPL
++#endif
++#ifndef VIF_MASK
++#define VIF_MASK X86_EFLAGS_VIF
++#endif
+ #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK)
+ #elif defined(__NetBSD__) || defined(__FreeBSD__)
+ #define DEFAULT_VM86_FLAGS (PSL_I | PSL_IOPL)
diff --git a/utils/vbetool/DEPENDS b/utils/vbetool/DEPENDS
index 0a62843..7168cb9 100755
--- a/utils/vbetool/DEPENDS
+++ b/utils/vbetool/DEPENDS
@@ -1 +1,2 @@
-depends pciutils
+depends pciutils &&
+depends libx86
diff --git a/utils/vbetool/DETAILS b/utils/vbetool/DETAILS
index b887a0a..96bbd57 100755
--- a/utils/vbetool/DETAILS
+++ b/utils/vbetool/DETAILS
@@ -1,10 +1,10 @@
SPELL=vbetool
- VERSION=0.7
- SOURCE=${SPELL}_${VERSION}-1.tar.gz
-
SOURCE_HASH=sha512:38d4ac1294a38147a75047804646fd98b8afa15555532647e5353692314c88fb871aab704267135773b8d771146a6769ecfe215c170421b3aae81fc0e71f6c24
+ VERSION=1.1
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+
SOURCE_HASH=sha512:09d8713516f074fe8e901ab3e24aba7e8b9ddf459b3ee3394b7604e4489a70a27c6dc3604cf1284c49233dba908f00da746c583562af2bc93b6df8ff413efd96
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://www.srcf.ucam.org/~mjg59/$SPELL/$SOURCE
- WEB_SITE=http://www.srcf.ucam.org/~mjg59/$SPELL/
+ SOURCE_URL[0]=http://www.codon.org.uk/~mjg59/$SPELL/download/$SOURCE
+ WEB_SITE=http://www.codon.org.uk/~mjg59/$SPELL/
ENTERED=20070423
LICENSE[0]=GPL
SHORT="vbetool is a video bios tool"
diff --git a/utils/vbetool/HISTORY b/utils/vbetool/HISTORY
index 2bd2c43..ca4e7f6 100644
--- a/utils/vbetool/HISTORY
+++ b/utils/vbetool/HISTORY
@@ -1,3 +1,10 @@
+2009-03-12 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 1.1, fixed SOURCE, SOURCE_URL and
WEB_SITE
+ * DEPENDS: added libx86
+ * PRE_BUILD: applies patch to fix compilation issue with Makefile
looking for
+ static libpci
+ * libpci-shared.patch: added, fixes Makefile.*
+
2008-04-25 Justin Boffemmyer <flux AT sourcemage.org>
* DEPENDS: added depends pciutils (needed for pci/pci.h header)
diff --git a/utils/vbetool/PRE_BUILD b/utils/vbetool/PRE_BUILD
index aa12ea3..398dd85 100755
--- a/utils/vbetool/PRE_BUILD
+++ b/utils/vbetool/PRE_BUILD
@@ -11,4 +11,7 @@ then
fi
fi &&