46768830ae
Now x11-packages repository will use original names for packages. For example, libgtk2 now will be provided as gtk2, libgtk3 will be available as gtk3, libsdl - as sdl. List of changed packages: libatk --> atk libglu --> glu libgtk2 --> gtk2 libgtk3 --> gtk3 libmesa --> mesa libsdl --> sdl libsdl2 --> sdl2 libsdl-net --> sdl-net riscvemu-sdl --> riscvemu xorg-xvfb --> xorg-server-xvfb List of dependent packages (should be rebuilt with new deps): dosbox, emacs-x, galculator, geany, libepoxy, mtpaint, qemu-system-x86_64, the-powder-toy, tigervnc, wireshark-gtk, xarchiver. Note: depending on which packages are installed, it may be necessary to upgrade with 'apt dist-upgrade'.
22 lines
900 B
Diff
22 lines
900 B
Diff
diff -uNr xorg-server-1.20.1/hw/xfree86/common/compiler.h xorg-server-1.20.1.mod/hw/xfree86/common/compiler.h
|
|
--- xorg-server-1.20.1/hw/xfree86/common/compiler.h 2018-08-07 19:31:02.000000000 +0300
|
|
+++ xorg-server-1.20.1.mod/hw/xfree86/common/compiler.h 2018-10-03 00:40:35.481555908 +0300
|
|
@@ -518,7 +518,7 @@
|
|
barrier();
|
|
}
|
|
|
|
-#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
|
|
+#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) || defined(__ANDROID__)
|
|
#if defined(__arm32__) || defined(__mips64)
|
|
#define PORT_SIZE long
|
|
#else
|
|
@@ -758,7 +758,7 @@
|
|
return xf86ReadMmio32Le((void *) ioBase, port);
|
|
}
|
|
|
|
-#elif defined(__arm__) && defined(__linux__)
|
|
+#elif defined(__arm__) && defined(__linux__) && !defined(__ANDROID__)
|
|
|
|
/* for Linux on ARM, we use the LIBC inx/outx routines */
|
|
/* note that the appropriate setup via "ioperm" needs to be done */
|