[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 045ee6599fd6312888632c941e5cb12a7191a637

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 5725 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  045ee6599fd6312888632c941e5cb12a7191a637 (commit)
      from  b85eadf6d323597b09556bb4c93b3e86411e0dbf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 045ee6599fd6312888632c941e5cb12a7191a637
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 15 20:18:02 2012 +0200

    lrmi: New package.

-----------------------------------------------------------------------

Summary of changes:
 lrmi/lrmi.nm                            |   58 +++++++++++++++++++++++++++++++
 lrmi/patches/lrmi-0.10-newheaders.patch |   39 +++++++++++++++++++++
 lrmi/patches/lrmi-0.9-build.patch0      |   24 +++++++++++++
 3 files changed, 121 insertions(+), 0 deletions(-)
 create mode 100644 lrmi/lrmi.nm
 create mode 100644 lrmi/patches/lrmi-0.10-newheaders.patch
 create mode 100644 lrmi/patches/lrmi-0.9-build.patch0

Difference in files:
diff --git a/lrmi/lrmi.nm b/lrmi/lrmi.nm
new file mode 100644
index 0000000..9027c53
--- /dev/null
+++ b/lrmi/lrmi.nm
@@ -0,0 +1,58 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
+###############################################################################
+
+name       = lrmi
+version    = 0.10
+release    = 1
+
+# This is only supported on i686.
+arch       = i686
+
+groups     = System/Libraries
+url        = http://sourceforge.net/projects/lrmi/
+license    = MIT
+summary    = Library for calling real mode BIOS routines.
+
+description
+	LRMI is a library for calling real mode BIOS routines.
+end
+
+source_dl  = http://download.sourceforge.net/lrmi/
+
+build
+	requires
+		kernel-headers
+	end
+
+	make_build_targets = liblrmi.so vbetest CFLAGS="%{CFLAGS}"
+
+	install
+		make install LIBDIR=%{BUILDROOT}%{libdir} INCDIR=%{BUILDROOT}%{includedir}
+		install -D -p -m755 vbetest %{BUILDROOT}%{sbindir}/vbetest
+	end
+end
+
+packages
+	package %{name}
+		provides += lib%{name} = %{thisver}
+	end
+
+	package %{name}-devel
+		template DEVEL
+
+		provides += lib%{name}-devel = %{thisver}
+	end
+
+	package vbetest
+		summary = Utility for listing and testing VESA graphics modes
+		description = %{summary}.
+
+		files = %{sbindir}/vbetest
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
+end
diff --git a/lrmi/patches/lrmi-0.10-newheaders.patch b/lrmi/patches/lrmi-0.10-newheaders.patch
new file mode 100644
index 0000000..ae04c47
--- /dev/null
+++ b/lrmi/patches/lrmi-0.10-newheaders.patch
@@ -0,0 +1,39 @@
+diff -up lrmi-0.10/lrmi.c.BAD lrmi-0.10/lrmi.c
+--- lrmi-0.10/lrmi.c.BAD	2008-09-17 14:41:28.000000000 -0400
++++ lrmi-0.10/lrmi.c	2008-09-17 14:45:17.000000000 -0400
+@@ -239,7 +239,7 @@ LRMI_free_real(void *m)
+ 
+ 
+ #if defined(__linux__)
+-#define DEFAULT_VM86_FLAGS 	(IF_MASK | IOPL_MASK)
++#define DEFAULT_VM86_FLAGS 	(X86_EFLAGS_IF | X86_EFLAGS_IOPL)
+ #elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+ #define DEFAULT_VM86_FLAGS  (PSL_I | PSL_IOPL)
+ #define TF_MASK         PSL_T
+@@ -822,7 +822,7 @@ run_vm86(void)
+ 
+ 			CONTEXT_REGS.REG(cs) = get_int_seg(v);
+ 			CONTEXT_REGS.REG(eip) = get_int_off(v);
+-			CONTEXT_REGS.REG(eflags) &= ~(VIF_MASK | TF_MASK);
++			CONTEXT_REGS.REG(eflags) &= ~(X86_EFLAGS_VIF | X86_EFLAGS_TF);
+ 
+ 			continue;
+ 		}
+@@ -862,7 +862,7 @@ vm86_callback(int sig, int code, struct 
+ 
+ 			CONTEXT_REGS.REG(cs) = get_int_seg(v);
+ 			CONTEXT_REGS.REG(eip) = get_int_off(v);
+-			CONTEXT_REGS.REG(eflags) &= ~(VIF_MASK | TF_MASK);
++			CONTEXT_REGS.REG(eflags) &= ~(X86_EFLAGS_VIF | X86_EFLAGS_TF);
+ 
+ 			break;
+ 		}
+@@ -916,7 +916,7 @@ vm86_callback(int sig, int code, struct 
+ 
+ 		CONTEXT_REGS.REG(cs) = get_int_seg(addr[1]);
+ 		CONTEXT_REGS.REG(eip) = get_int_off(addr[1]);
+-		CONTEXT_REGS.REG(eflags) &= ~(VIF_MASK | TF_MASK);
++		CONTEXT_REGS.REG(eflags) &= ~(X86_EFLAGS_VIF | X86_EFLAGS_TF);
+ 	} else {
+ 		if (emulate() == 0) {
+ 			context.success = 0;
diff --git a/lrmi/patches/lrmi-0.9-build.patch0 b/lrmi/patches/lrmi-0.9-build.patch0
new file mode 100644
index 0000000..250f9cb
--- /dev/null
+++ b/lrmi/patches/lrmi-0.9-build.patch0
@@ -0,0 +1,24 @@
+--- Makefile~	2005-09-01 09:49:18.000000000 +0300
++++ Makefile	2005-11-09 09:40:30.000000000 +0200
+@@ -30,17 +30,17 @@
+ 	ln -sf $(LIBNAME).so.$(VERSION) $(LIBNAME).so.$(MAJOR)
+ 	ln -sf $(LIBNAME).so.$(MAJOR) $(LIBNAME).so
+ 
+-vbetest: vbetest.c liblrmi.a
++vbetest: vbetest.c liblrmi.so
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $^
+ 
+ install:
+ 	mkdir -p $(LIBDIR)
+-	install -m 755 -s -p $(LIBNAME).so.$(VERSION) $(LIBDIR)/$(LIBNAME).so.$(VERSION)
++	install -m 755 -p $(LIBNAME).so.$(VERSION) $(LIBDIR)/$(LIBNAME).so.$(VERSION)
+ 	rm -f $(LIBDIR)/$(LIBNAME).so
+ 	ln -sf $(LIBNAME).so.$(VERSION) $(LIBDIR)/$(LIBNAME).so.$(MAJOR)
+ 	ln -sf $(LIBNAME).so.$(MAJOR) $(LIBDIR)/$(LIBNAME).so
+-	install -m 644 -s -p lrmi.h $(INCDIR)/lrmi.h
+-	ldconfig
++	mkdir -p $(INCDIR)
++	install -m 644 -p lrmi.h vbe.h $(INCDIR)
+ 
+ .PHONY: clean
+ clean:


hooks/post-receive
--
IPFire 3.x development tree