aboutsummaryrefslogtreecommitdiff
path: root/x11-servers/xorg-server
diff options
context:
space:
mode:
Diffstat (limited to 'x11-servers/xorg-server')
-rw-r--r--x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build4
-rw-r--r--x11-servers/xorg-server/files/patch-meson.build11
2 files changed, 13 insertions, 2 deletions
diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build
index 400068d37709..12373890385d 100644
--- a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build
+++ b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build
@@ -1,11 +1,11 @@
---- hw/xfree86/os-support/meson.build.orig 2022-08-04 15:48:52 UTC
+--- hw/xfree86/os-support/meson.build.orig 2022-07-12 13:27:57 UTC
+++ hw/xfree86/os-support/meson.build
@@ -113,7 +113,7 @@ elif host_machine.system().endswith('bsd')
endif
elif host_machine.cpu_family() == 'arm'
srcs_xorg_os_support += 'bsd/arm_video.c'
- elif host_machine.cpu_family() == 'powerpc'
-+ elif host_machine.cpu_family() == 'powerpc' or host_machine.cpu_family() == 'ppc64'
++ elif host_machine.cpu_family() == 'ppc' or host_machine.cpu_family() == 'ppc64'
srcs_xorg_os_support += 'bsd/ppc_video.c'
elif host_machine.cpu_family() == 'sparc64'
srcs_xorg_os_support += 'bsd/sparc64_video.c'
diff --git a/x11-servers/xorg-server/files/patch-meson.build b/x11-servers/xorg-server/files/patch-meson.build
new file mode 100644
index 000000000000..83f00aa7237e
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-meson.build
@@ -0,0 +1,11 @@
+--- meson.build.orig 2022-08-05 11:53:38 UTC
++++ meson.build
+@@ -249,7 +249,7 @@ if int10 == 'auto'
+ int10 = get_option('int10')
+ if int10 == 'auto'
+ int10 = 'x86emu'
+- if host_machine.cpu() == 'powerpc' and host_machine.system() == 'freebsd'
++ if host_machine.cpu() == 'ppc' and host_machine.system() == 'freebsd'
+ int10 = 'stub'
+ endif
+ if host_machine.cpu() == 'arm'