SHA256
1
0
forked from pool/acpica

- Update to latest version 20121018.

-> one patch got accepted mainline -> removed.

OBS-URL: https://build.opensuse.org/package/show/hardware/acpica?expand=0&rev=42
This commit is contained in:
2012-11-07 10:29:07 +00:00
committed by Git OBS Bridge
parent 24c3252a57
commit a80717c838
7 changed files with 28 additions and 41 deletions

View File

@@ -12,11 +12,11 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
source/include/acapps.h | 8 ++++----
3 files changed, 8 insertions(+), 13 deletions(-)
Index: acpica-unix2-20120913/source/compiler/aslcompile.c
Index: acpica-unix2-20121018/source/compiler/aslcompile.c
===================================================================
--- acpica-unix2-20120913.orig/source/compiler/aslcompile.c
+++ acpica-unix2-20120913/source/compiler/aslcompile.c
@@ -161,8 +161,6 @@ void
--- acpica-unix2-20121018.orig/source/compiler/aslcompile.c
+++ acpica-unix2-20121018/source/compiler/aslcompile.c
@@ -160,8 +160,6 @@ void
AslCompilerFileHeader (
UINT32 FileId)
{
@@ -25,7 +25,7 @@ Index: acpica-unix2-20120913/source/compiler/aslcompile.c
char *Prefix = "";
@@ -202,12 +200,9 @@ AslCompilerFileHeader (
@@ -201,12 +199,9 @@ AslCompilerFileHeader (
/* Compilation header with timestamp */
@@ -40,11 +40,11 @@ Index: acpica-unix2-20120913/source/compiler/aslcompile.c
Prefix);
switch (FileId)
Index: acpica-unix2-20120913/source/compiler/aslutils.c
Index: acpica-unix2-20121018/source/compiler/aslutils.c
===================================================================
--- acpica-unix2-20120913.orig/source/compiler/aslutils.c
+++ acpica-unix2-20120913/source/compiler/aslutils.c
@@ -456,8 +456,8 @@ UtDisplaySummary (
--- acpica-unix2-20121018.orig/source/compiler/aslutils.c
+++ acpica-unix2-20121018/source/compiler/aslutils.c
@@ -454,8 +454,8 @@ UtDisplaySummary (
{
/* Compiler name and version number */
@@ -55,10 +55,10 @@ Index: acpica-unix2-20120913/source/compiler/aslutils.c
}
/* Summary of main input and output files */
Index: acpica-unix2-20120913/source/include/acapps.h
Index: acpica-unix2-20121018/source/include/acapps.h
===================================================================
--- acpica-unix2-20120913.orig/source/include/acapps.h
+++ acpica-unix2-20120913/source/include/acapps.h
--- acpica-unix2-20121018.orig/source/include/acapps.h
+++ acpica-unix2-20121018/source/include/acapps.h
@@ -69,15 +69,15 @@
/* Macros for signons and file headers */

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bdd50252a66e9878f1250cdf589fcdf678f5250de9e5eeb841000ec766678d47
size 817298

View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7b9b91f6dbad151cd1975f39d9bd31bb09c1025a420fe9a16b73042029d17f59
size 821064

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Nov 7 10:27:54 UTC 2012 - trenn@suse.de
- Update to latest version 20121018.
-> one patch got accepted mainline -> removed.
-------------------------------------------------------------------
Wed Sep 19 10:56:44 UTC 2012 - trenn@suse.de

View File

@@ -20,7 +20,7 @@
Name: acpica
Url: http://acpica.org
Version: 20120913
Version: 20121018
Release: 6
License: GPL-2.0
%define src_dir acpica-unix2-%{version}
@@ -31,9 +31,8 @@ Source: %{src_dir}.tar.bz2
Patch1: acpica_make_CFLAGS_overridable
Patch2: acpidump-override-CFLAGS.patch
Patch3: acpica-no-compiletime.patch
Patch4: acpica_fix_32bit_build.patch
Patch5: acpica_acpisrc_fix_unused_result.patch
Patch6: acpica_makefile_whitespace_cleanup.patch
Patch4: acpica_acpisrc_fix_unused_result.patch
Patch5: acpica_makefile_whitespace_cleanup.patch
Source1: ec_access.c
Source2: acpidump-%{dmp_ver}.tar.bz2
Source3: acpi_genl.tar.bz2
@@ -70,7 +69,6 @@ Authors:
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
cc %{SOURCE1} $RPM_OPT_FLAGS -o ec_access

View File

@@ -10,11 +10,11 @@ Signed-off-by: Thomas Renninger <trenn@suse.de>
source/tools/acpisrc/asfile.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
Index: acpica-unix2-20120913/source/tools/acpisrc/asfile.c
Index: acpica-unix2-20121018/source/tools/acpisrc/asfile.c
===================================================================
--- acpica-unix2-20120913.orig/source/tools/acpisrc/asfile.c
+++ acpica-unix2-20120913/source/tools/acpisrc/asfile.c
@@ -805,7 +805,11 @@ AsPutFile (
--- acpica-unix2-20121018.orig/source/tools/acpisrc/asfile.c
+++ acpica-unix2-20121018/source/tools/acpisrc/asfile.c
@@ -810,7 +810,11 @@ AsPutFile (
/* Write the buffer to the file */
FileSize = strlen (FileBuffer);

View File

@@ -1,17 +0,0 @@
---
source/include/platform/aclinux.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: acpica-unix2-20120518/source/include/platform/aclinux.h
===================================================================
--- acpica-unix2-20120518.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20120518/source/include/platform/aclinux.h
@@ -98,7 +98,7 @@
#define COMPILER_DEPENDENT_INT64 long long
#define COMPILER_DEPENDENT_UINT64 unsigned long long
#define ACPI_USE_NATIVE_DIVIDE
-#define ACPI_CAST_PTHREAD_T(pthread) ((ACPI_THREAD_ID) (UINT32) (void *) (pthread))
+#define ACPI_CAST_PTHREAD_T(pthread) ((ACPI_THREAD_ID) (UINT32) (pthread))
#endif
#ifndef __cdecl