commit: 794a47ca882aeed56c14ed92c01529f745658d5b Author: stefson <herrtimson <AT> yahoo <DOT> de> AuthorDate: Thu Aug 16 11:48:21 2018 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Sat Aug 18 09:51:20 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=794a47ca
x11-base/xorg-server: revbump to point release x11-base/xorg-server/Manifest | 2 +- ...ine-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch | 224 --------------------- ...ver-1.20.0.ebuild => xorg-server-1.20.1.ebuild} | 0 3 files changed, 1 insertion(+), 225 deletions(-) diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 94db573..0c6e270 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,3 +1,3 @@ DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c DIST xorg-server-1.19.6.tar.bz2 5984528 BLAKE2B 7aaef0bccbfef669ea5e78faabf736e8ab4f460079b7b12b58a642dd9cb42ad4b6c662a6e8671bfc41e697561c856cb663dfbe9cbdf3a4e67d800f2e98c253f6 SHA512 38519a8d0af9dd034045fc346959496dd718fa59b6188307974797a1cd9c349deb54987f6232ea8396baf810dcc710c0ff191f76ed2186cae4d44921b3680412 -DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde +DIST xorg-server-1.20.1.tar.bz2 6103772 BLAKE2B ac71d603cef8efe814275b658d4a76e231eb0fda14dd6e7177509bf147feaf37657789d8fc83f8017435c84760d7be357f203a8346aac612a53083cf413f7d75 SHA512 ef2b93a61683c8ca8d1f14b771e70db65ba119a73db8a46e7cdbf2ac2243e3f4b2732068eb5aa5d7b76f460db995a3c04390870198a5210ec30df4360ad9f94b diff --git a/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch b/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch deleted file mode 100644 index ebf677a..0000000 --- a/x11-base/xorg-server/files/xorg-server-1.20.0-xfree86-Inline-xf86-Read-Write-Mmio-8-16-32-on-alpha.patch +++ /dev/null @@ -1,224 +0,0 @@ -From eecedfffd40f0465d85347f14547ddc6b30e57df Mon Sep 17 00:00:00 2001 -From: Matt Turner <matts...@gmail.com> -Date: Tue, 22 May 2018 21:10:55 -0700 -Subject: [PATCH xserver] xfree86: Inline xf86{Read,Write}Mmio{8,16,32} on - alpha - -In commit 9db2af6f757e (xfree86: Remove xf86{Map,Unmap}VidMem) we -somehow stopped exporting xf86{Read,Write}Mmio{8,16,32}. Since the -function pointer indirection was intended to support dense vs sparse and -sparse support is now gone, we can just make the functions static inline -in compiler.h and avoid all of this. - -Bugzilla: https://bugs.gentoo.org/548906 -Tested-by: Christopher May-Townsend <ch...@maytownsend.co.uk> -Reviewed-by: Adam Jackson <a...@redhat.com> -Signed-off-by: Matt Turner <matts...@gmail.com> ---- - configure.ac | 4 -- - hw/xfree86/common/compiler.h | 67 ++++++++++++++++++++++++--------- - hw/xfree86/os-support/bsd/Makefile.am | 3 +- - hw/xfree86/os-support/linux/Makefile.am | 12 ------ - hw/xfree86/os-support/linux/lnx_video.c | 27 ------------- - hw/xfree86/os-support/meson.build | 1 - - 6 files changed, 50 insertions(+), 64 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ddc47faa2..0075b6ace 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1908,9 +1908,6 @@ if test "x$XORG" = xyes; then - XORG_OS_SUBDIR="linux" - linux_acpi="no" - case $host_cpu in -- alpha*) -- linux_alpha=yes -- ;; - i*86|amd64*|x86_64*|ia64*) - linux_acpi=$enable_linux_acpi - ;; -@@ -2075,7 +2072,6 @@ AM_CONDITIONAL([XORG], [test "x$XORG" = xyes]) - AM_CONDITIONAL([XORG_BUS_PCI], [test "x$PCI" = xyes]) - AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes]) - AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes]) --AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes]) - AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes]) - AM_CONDITIONAL([LNXAPM], [test "x$linux_apm" = xyes]) - AM_CONDITIONAL([SOLARIS_VT], [test "x$solaris_vt" = xyes]) -diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h -index eea29dfb5..7144c6a27 100644 ---- a/hw/xfree86/common/compiler.h -+++ b/hw/xfree86/common/compiler.h -@@ -986,33 +986,64 @@ inl(unsigned PORT_SIZE port) - #endif - - #ifdef __alpha__ --/* entry points for Mmio memory access routines */ --extern _X_EXPORT int (*xf86ReadMmio8) (void *, unsigned long); --extern _X_EXPORT int (*xf86ReadMmio16) (void *, unsigned long); --extern _X_EXPORT int (*xf86ReadMmio32) (void *, unsigned long); --extern _X_EXPORT void (*xf86WriteMmio8) (int, void *, unsigned long); --extern _X_EXPORT void (*xf86WriteMmio16) (int, void *, unsigned long); --extern _X_EXPORT void (*xf86WriteMmio32) (int, void *, unsigned long); -+static inline int -+xf86ReadMmio8(void *Base, unsigned long Offset) -+{ -+ mem_barrier(); -+ return *(CARD8 *) ((unsigned long) Base + (Offset)); -+} -+ -+static inline int -+xf86ReadMmio16(void *Base, unsigned long Offset) -+{ -+ mem_barrier(); -+ return *(CARD16 *) ((unsigned long) Base + (Offset)); -+} -+ -+static inline int -+xf86ReadMmio32(void *Base, unsigned long Offset) -+{ -+ mem_barrier(); -+ return *(CARD32 *) ((unsigned long) Base + (Offset)); -+} -+ -+static inline void -+xf86WriteMmio8(int Value, void *Base, unsigned long Offset) -+{ -+ write_mem_barrier(); -+ *(CARD8 *) ((unsigned long) Base + (Offset)) = Value; -+} -+ -+static inline void -+xf86WriteMmio16(int Value, void *Base, unsigned long Offset) -+{ -+ write_mem_barrier(); -+ *(CARD16 *) ((unsigned long) Base + (Offset)) = Value; -+} -+ -+static inline void -+xf86WriteMmio32(int Value, void *Base, unsigned long Offset) -+{ -+ write_mem_barrier(); -+ *(CARD32 *) ((unsigned long) Base + (Offset)) = Value; -+} -+ - extern _X_EXPORT void xf86SlowBCopyFromBus(unsigned char *, unsigned char *, - int); - extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int); - - /* Some macros to hide the system dependencies for MMIO accesses */ - /* Changed to kill noise generated by gcc's -Wcast-align */ --#define MMIO_IN8(base, offset) (*xf86ReadMmio8)(base, offset) --#define MMIO_IN16(base, offset) (*xf86ReadMmio16)(base, offset) --#define MMIO_IN32(base, offset) (*xf86ReadMmio32)(base, offset) -- --#define MMIO_OUT32(base, offset, val) \ -- do { \ -- write_mem_barrier(); \ -- *(volatile CARD32 *)(void *)(((CARD8*)(base)) + (offset)) = (val); \ -- } while (0) -+#define MMIO_IN8(base, offset) xf86ReadMmio8(base, offset) -+#define MMIO_IN16(base, offset) xf86ReadMmio16(base, offset) -+#define MMIO_IN32(base, offset) xf86ReadMmio32(base, offset) - - #define MMIO_OUT8(base, offset, val) \ -- (*xf86WriteMmio8)((CARD8)(val), base, offset) -+ xf86WriteMmio8((CARD8)(val), base, offset) - #define MMIO_OUT16(base, offset, val) \ -- (*xf86WriteMmio16)((CARD16)(val), base, offset) -+ xf86WriteMmio16((CARD16)(val), base, offset) -+#define MMIO_OUT32(base, offset, val) \ -+ xf86WriteMmio32((CARD32)(val), base, offset) - - #elif defined(__powerpc__) || defined(__sparc__) - /* -diff --git a/hw/xfree86/os-support/bsd/Makefile.am b/hw/xfree86/os-support/bsd/Makefile.am -index b01ea5bca..66ac83805 100644 ---- a/hw/xfree86/os-support/bsd/Makefile.am -+++ b/hw/xfree86/os-support/bsd/Makefile.am -@@ -26,8 +26,7 @@ endif - if ALPHA_VIDEO - # Cheat here and piggyback other alpha bits on ALPHA_VIDEO. - ARCH_SOURCES = \ -- alpha_video.c \ -- bsd_ev56.c -+ alpha_video.c - endif - - if ARM_VIDEO -diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am -index 26e40bb93..9b4535b53 100644 ---- a/hw/xfree86/os-support/linux/Makefile.am -+++ b/hw/xfree86/os-support/linux/Makefile.am -@@ -1,13 +1,5 @@ - noinst_LTLIBRARIES = liblinux.la - --if LINUX_ALPHA --noinst_LTLIBRARIES += liblinuxev56.la -- --liblinuxev56_la_CFLAGS = $(AM_CFLAGS) -mcpu=ev56 -- --liblinuxev56_la_SOURCES = lnx_ev56.c --endif -- - if LNXACPI - ACPI_SRCS = lnx_acpi.c - if !LNXAPM -@@ -39,7 +31,3 @@ liblinux_la_SOURCES = linux.h lnx_init.c lnx_video.c \ - AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) - - AM_CPPFLAGS = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) -- --if LINUX_ALPHA --liblinux_la_LIBADD = liblinuxev56.la --endif -diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c -index c09d71947..04e45092a 100644 ---- a/hw/xfree86/os-support/linux/lnx_video.c -+++ b/hw/xfree86/os-support/linux/lnx_video.c -@@ -166,30 +166,3 @@ xf86DisableIO(void) - - ExtendedEnabled = FALSE; - } -- --#if defined (__alpha__) -- --extern int readDense8(void *Base, register unsigned long Offset); --extern int readDense16(void *Base, register unsigned long Offset); --extern int readDense32(void *Base, register unsigned long Offset); --extern void -- writeDense8(int Value, void *Base, register unsigned long Offset); --extern void -- writeDense16(int Value, void *Base, register unsigned long Offset); --extern void -- writeDense32(int Value, void *Base, register unsigned long Offset); -- --void (*xf86WriteMmio8) (int Value, void *Base, unsigned long Offset) -- = writeDense8; --void (*xf86WriteMmio16) (int Value, void *Base, unsigned long Offset) -- = writeDense16; --void (*xf86WriteMmio32) (int Value, void *Base, unsigned long Offset) -- = writeDense32; --int (*xf86ReadMmio8) (void *Base, unsigned long Offset) -- = readDense8; --int (*xf86ReadMmio16) (void *Base, unsigned long Offset) -- = readDense16; --int (*xf86ReadMmio32) (void *Base, unsigned long Offset) -- = readDense32; -- --#endif /* __alpha__ */ -diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build -index 901422786..b6e5c975d 100644 ---- a/hw/xfree86/os-support/meson.build -+++ b/hw/xfree86/os-support/meson.build -@@ -100,7 +100,6 @@ elif host_machine.system().endswith('bsd') - srcs_xorg_os_support += 'shared/ioperm_noop.c' - elif host_machine.cpu_family() == 'alpha' - srcs_xorg_os_support += 'bsd/alpha_video.c' -- srcs_xorg_os_support += 'bsd/bsd_ev56.c' - endif - - if host_machine.system() == 'freebsd' --- -2.16.1 - diff --git a/x11-base/xorg-server/xorg-server-1.20.0.ebuild b/x11-base/xorg-server/xorg-server-1.20.1.ebuild similarity index 100% rename from x11-base/xorg-server/xorg-server-1.20.0.ebuild rename to x11-base/xorg-server/xorg-server-1.20.1.ebuild