diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-07-17 08:45:34 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-07-17 08:45:34 +0000 |
| commit | 36a08464509dbf214d81a9b8e5075ba4875be7cf (patch) | |
| tree | 15410873ddd2990a0b8bccebcee3cf7b7e6f1be0 /testing/dosbox | |
| parent | 0c5b948f9b90cc1f0204169fe91b2c322efe0f4b (diff) | |
| download | aports-36a08464509dbf214d81a9b8e5075ba4875be7cf.tar.bz2 aports-36a08464509dbf214d81a9b8e5075ba4875be7cf.tar.xz | |
main/dosbox: build fix for x86
add fix for PIC
Diffstat (limited to 'testing/dosbox')
| -rw-r--r-- | testing/dosbox/APKBUILD | 4 | ||||
| -rw-r--r-- | testing/dosbox/pic-fix.patch | 35 |
2 files changed, 39 insertions, 0 deletions
diff --git a/testing/dosbox/APKBUILD b/testing/dosbox/APKBUILD index 791fe94344..698f3f72ae 100644 --- a/testing/dosbox/APKBUILD +++ b/testing/dosbox/APKBUILD @@ -15,6 +15,7 @@ source="http://downloads.sourceforge.net/project/dosbox/dosbox/$pkgver/dosbox-$p dosbox-0.74-formatsecurity.patch dosbox-0.74-gcc46.patch dosbox-0.74-init-crash.patch + pic-fix.patch dosbox.desktop dosbox.png " @@ -61,17 +62,20 @@ md5sums="b9b240fa87104421962d14eee71351e8 dosbox-0.74.tar.gz 9bb0b70a44151a33b50a6e07ed0a5658 dosbox-0.74-formatsecurity.patch d4534babc251a9ff12bf6ce27301de91 dosbox-0.74-gcc46.patch a90321ab0e29f65664317f61ff0abcb3 dosbox-0.74-init-crash.patch +e87a9e420dd76f8832bb3fcd7ee7f9b7 pic-fix.patch f197a5de143e94f22c06c8ac3d6ea4d9 dosbox.desktop eca02a0e08f639122453a38cc5549eef dosbox.png" sha256sums="13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05 dosbox-0.74.tar.gz 3bc0f22e3c47449e655aedcf316c50d634d8661874d3f236b2d9f1f74b67cc0a dosbox-0.74-formatsecurity.patch aea0e78a2e2d9963eb902aff9647cc35cb864e970f06d3ca0745e2b89a4e5ad6 dosbox-0.74-gcc46.patch 99d892707cf1c9d119f0c510eca562c2b4b3fa4c8ad8cb11de37594352ca0f8e dosbox-0.74-init-crash.patch +c8e072a7a0feccf50f3353ca728ac2be1f8da67641355053d88bf25004dc40c3 pic-fix.patch d1f5ef81ecb57987425bb250fb7e42f8fac6437e124d3986ab8037068c077c52 dosbox.desktop 3c4361396fa6a61e2ade5c94b53f0a349193c66c133fdc04cd7cffd2faf86cd0 dosbox.png" sha512sums="4a6ff4c658997a495119d200ec6ad37649da940814a4b14fca0dd29a99142026e324695b7aa9d2946efc2abf9067a819d911e43778efe905ed10ddf9b9f2dd3d dosbox-0.74.tar.gz 8ba824d754b7a804efa9c832608672d257d4978dc84f0035f32d48d312666107c3271158e2764d058d84b70caab0c0b5dff1fa93a72390d11b6dc7f655c50c31 dosbox-0.74-formatsecurity.patch 115805d684ec5b5eb747fd46e4787d67fae0e6cf6622b52114031e82abb0db08b7bf98b2d2526a8336c41541d7202d429d7689e894a0abcd26599cd4be5768bf dosbox-0.74-gcc46.patch b7ee5c48e05a8de5b25eb35421167cf381fd21f1ff8cebf9da5671938d1a6dce05a78e05cd8db3178b233253ad9d8277c66ac38a302fc6cf9eaac4965e208822 dosbox-0.74-init-crash.patch +f3711f0fc9039af6bc902eb9f70c433199cca655024897d248a7953df0b0eac1cd82301f5c55199e28573a49bd6182036c96d543935401e40d373c104a8576c5 pic-fix.patch 882bf0c964c0041460780eb40548a2c5301eca4ff1fbdfd418a35ca98479dd2dce32c3fdfc31fe390ca3c3a5c4a523fa7ef025a13c6ed3457c7042fbb739d16c dosbox.desktop 249db09d98b293e26189635018248780dd0eaefcb09c5bd9dc1b266547d54930bce413a7a50898872a5e70de2efc5ac665527ebe2450a505df724028d1261000 dosbox.png" diff --git a/testing/dosbox/pic-fix.patch b/testing/dosbox/pic-fix.patch new file mode 100644 index 0000000000..74d26ff441 --- /dev/null +++ b/testing/dosbox/pic-fix.patch @@ -0,0 +1,35 @@ +diff --exclude '*.*o' -ru dosbox-0.74.orig/include/dos_inc.h dosbox-0.74/include/dos_inc.h +--- dosbox-0.74.orig/include/dos_inc.h 2010-05-10 20:43:54.000000000 -0300 ++++ dosbox-0.74/include/dos_inc.h 2014-07-17 11:00:44.418771087 -0300 +@@ -21,6 +21,7 @@ + #ifndef DOSBOX_DOS_INC_H + #define DOSBOX_DOS_INC_H + ++#include <stddef.h> + #ifndef DOSBOX_DOS_SYSTEM_H + #include "dos_system.h" + #endif +diff --exclude '*.*o' -ru dosbox-0.74.orig/src/cpu/core_dyn_x86/risc_x86.h dosbox-0.74/src/cpu/core_dyn_x86/risc_x86.h +--- dosbox-0.74.orig/src/cpu/core_dyn_x86/risc_x86.h 2010-05-10 20:43:54.000000000 -0300 ++++ dosbox-0.74/src/cpu/core_dyn_x86/risc_x86.h 2014-07-17 11:00:12.432277706 -0300 +@@ -112,7 +112,7 @@ + pop ebx + mov [retval],eax + } +-#elif defined (MACOSX) ++#elif defined (MACOSX) || defined (__PIC__) + register Bit32u tempflags=reg_flags & FMASK_TEST; + __asm__ volatile ( + "pushl %%ebx \n" +diff --exclude '*.*o' -ru dosbox-0.74.orig/src/cpu/cpu.cpp dosbox-0.74/src/cpu/cpu.cpp +--- dosbox-0.74.orig/src/cpu/cpu.cpp 2010-05-12 12:57:31.000000000 -0300 ++++ dosbox-0.74/src/cpu/cpu.cpp 2014-07-17 10:57:04.226630637 -0300 +@@ -19,6 +19,7 @@ + /* $Id: cpu.cpp,v 1.116 2009-03-16 18:10:08 c2woody Exp $ */ + + #include <assert.h> ++#include <stddef.h> + #include <sstream> + #include "dosbox.h" + #include "cpu.h" + |