From b1c3b3703dab3635af772b7476bb185d87066f88 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 14 Nov 2021 03:24:47 +0100 Subject: xorg-server: update to latest modesetting driver is included. Tested with Qemu -std vga. --- package/libX11/Makefile | 4 +- package/libX11/patches/patch-src_util_Makefile_in | 13 ---- package/libxcvt/Makefile | 30 ++++++++++ package/xf86-input-mouse/Makefile | 4 +- package/xf86-video-modesetting/Makefile | 29 --------- package/xorg-server/Makefile | 23 ++++---- .../patches/patch-hw_xfree86_common_compiler_h | 69 ---------------------- package/xorg-server/patches/patch-include_misc_h | 50 ++++++++++++++++ package/xorgproto/Makefile | 30 ++++++++++ 9 files changed, 125 insertions(+), 127 deletions(-) delete mode 100644 package/libX11/patches/patch-src_util_Makefile_in create mode 100644 package/libxcvt/Makefile delete mode 100644 package/xf86-video-modesetting/Makefile delete mode 100644 package/xorg-server/patches/patch-hw_xfree86_common_compiler_h create mode 100644 package/xorg-server/patches/patch-include_misc_h create mode 100644 package/xorgproto/Makefile (limited to 'package') diff --git a/package/libX11/Makefile b/package/libX11/Makefile index f7aae2149..561d82ff0 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libX11 -PKG_VERSION:= 1.6.4 +PKG_VERSION:= 1.7.2 PKG_RELEASE:= 1 -PKG_HASH:= 5d7fbb9e15c27900ea8963218a59750b674a8d7c94161b66e96fcfbdaa1c6263 +PKG_HASH:= 2c26ccd08f43a6214de89110554fbe97c71692eeb7e7d4829f3004ae6fafd2c0 PKG_DESCR:= x11 client-side library PKG_SECTION:= x11/libs PKG_BUILDDEP:= libX11-host xproto xextproto xtrans libXdmcp libXau xcb-proto diff --git a/package/libX11/patches/patch-src_util_Makefile_in b/package/libX11/patches/patch-src_util_Makefile_in deleted file mode 100644 index 8a194f2d1..000000000 --- a/package/libX11/patches/patch-src_util_Makefile_in +++ /dev/null @@ -1,13 +0,0 @@ ---- libX11-1.6.3.orig/src/util/Makefile.in 2015-03-09 23:29:02.000000000 +0100 -+++ libX11-1.6.3/src/util/Makefile.in 2016-01-08 10:43:16.257572082 +0100 -@@ -348,9 +348,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --AM_CFLAGS = \ -- $(X11_CFLAGS) \ -- $(CWARNFLAGS) -+AM_CFLAGS = - - AM_CPPFLAGS = \ - -I$(top_srcdir)/include diff --git a/package/libxcvt/Makefile b/package/libxcvt/Makefile new file mode 100644 index 000000000..952b7c7e7 --- /dev/null +++ b/package/libxcvt/Makefile @@ -0,0 +1,30 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= libxcvt +PKG_VERSION:= 0.1.1 +PKG_RELEASE:= 1 +PKG_HASH:= 27ebce180d355f94c1992930bedb40a36f6d7312ee50bf7f0acbcd22f33e8c29 +PKG_DESCR:= xcvt library +PKG_SECTION:= libs/misc +PKG_SITES:= https://www.x.org/releases/individual/lib/ +PKG_OPTS:= dev + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBXCVT,libxcvt,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +libxcvt-install: + $(INSTALL_DIR) $(IDIR_LIBXCVT)/usr/lib + $(CP) $(WRKINST)/usr/lib/libxcvt*.so* \ + $(IDIR_LIBXCVT)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile index 6bef7daef..3198dbc53 100644 --- a/package/xf86-input-mouse/Makefile +++ b/package/xf86-input-mouse/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xf86-input-mouse -PKG_VERSION:= 1.9.2 +PKG_VERSION:= 1.9.3 PKG_RELEASE:= 1 -PKG_HASH:= 82bb4b01b26853b180e87ab97510316c741af2bded359c994c0d689386947095 +PKG_HASH:= 71f3aa0a18dfe1ca5cb235ec9210f33571cf5fbbd90ac5b55306a954f67aa5c6 PKG_DESCR:= x11 driver for mouse PKG_SECTION:= x11/drivers PKG_DEPENDS:= xorg-server diff --git a/package/xf86-video-modesetting/Makefile b/package/xf86-video-modesetting/Makefile deleted file mode 100644 index 4cd733739..000000000 --- a/package/xf86-video-modesetting/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= xf86-video-modesetting -PKG_VERSION:= 0.8.1 -PKG_RELEASE:= 1 -PKG_HASH:= 7cb67bc95e83f195bc5f50b6af0b4ff66b5b9ccd16848613d55d732bc1e5fdb6 -PKG_DESCR:= x11 driver for kms -PKG_SECTION:= x11/drivers -PKG_DEPENDS:= xorg-server libudev -PKG_BUILDDEP:= xorg-server eudev -PKG_NEEDS:= c++ -PKG_SITES:= http://www.x.org/releases/individual/driver/ - -PKG_SYSTEM_DEPENDS:= qemu-x86 qemu-x86_64 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call PKG_template,XF86_VIDEO_MODESETTING,xf86-video-modesetting,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -xf86-video-modesetting-install: - ${INSTALL_DIR} ${IDIR_XF86_VIDEO_MODESETTING}/usr/lib/xorg/modules/drivers - ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/modesetting_*.so \ - ${IDIR_XF86_VIDEO_MODESETTING}/usr/lib/xorg/modules/drivers/ - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index ff495d1d7..2879cafea 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -4,28 +4,27 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xorg-server -PKG_VERSION:= 1.19.7 +PKG_VERSION:= 21.1.1 PKG_RELEASE:= 1 -PKG_HASH:= 5f6d3da0d1e341f27a7706779a24a5fa7174d5f161b5f8530f103753f0152de7 +PKG_HASH:= 782e7fef2ca0c7cbe60a937b8bf42dac69c904fb841950fd0363e1c2346ea755 PKG_DESCR:= xorg server PKG_SECTION:= x11/drivers -PKG_DEPENDS:= libxfont2 pixman libpciaccess libxkbfile +PKG_DEPENDS:= libxfont2 pixman libpciaccess libxkbfile libxcvt PKG_DEPENDS+= libfontenc xkeyboard-config xkbcomp libxau libxaw PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext -PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb +PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb libdrm PKG_DEPENDS+= libxshmfence libfreetype libfontenc libpciaccess PKG_BUILDDEP:= libX11 randrproto renderproto fixesproto damageproto PKG_BUILDDEP+= scrnsaverproto resourceproto fontsproto videoproto PKG_BUILDDEP+= compositeproto evieext libxkbfile libXfont2 pixman PKG_BUILDDEP+= libpciaccess xf86dgaproto recordproto dri3proto PKG_BUILDDEP+= xineramaproto presentproto xf86driproto glproto mesa +PKG_BUILDDEP+= xorgproto libxcvt libdrm PKG_NEEDS:= threads c++ PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/xserver/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC PKG_FLAVOURS_XORG_SERVER:= WITH_KDRIVE @@ -68,7 +67,6 @@ CONFIGURE_ARGS+= --enable-dga \ --disable-xephyr \ --disable-xf86bigfont \ --disable-xf86vidmode \ - --disable-xfake \ --disable-xnest \ --disable-xselinux \ --disable-xcsecurity \ @@ -78,17 +76,15 @@ CONFIGURE_ARGS+= --enable-dga \ --disable-strict-compilation \ --enable-dri \ --enable-dri2 \ - --disable-dri3 \ + --enable-dri3 \ --enable-glx \ - --enable-aiglx \ --with-xkb-output=/tmp \ - --with-os-vendor="$(ADK_VENDOR)" \ --with-vendor-web="$(ADK_VENDOR_URL)" ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_KDRIVE},y) -CONFIGURE_ARGS+= --enable-kdrive --enable-xfbdev --enable-kdrive-kbd --enable-kdrive-mouse --enable-kdrive-evdev +CONFIGURE_ARGS+= --enable-kdrive --enable-kdrive-kbd --enable-kdrive-mouse --enable-kdrive-evdev else -CONFIGURE_ARGS+= --disable-kdrive --disable-xfbdev +CONFIGURE_ARGS+= --disable-kdrive endif ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) @@ -99,6 +95,7 @@ xorg-server-install: $(INSTALL_DIR) $(IDIR_XORG_SERVER)/etc/X11 $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions + $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/drivers $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/fonts $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia ${CP} ${WRKINST}/usr/lib/xorg/protocol.txt \ @@ -106,6 +103,8 @@ xorg-server-install: ${CP} ${WRKINST}/usr/bin/* $(IDIR_XORG_SERVER)/usr/bin ${CP} ${WRKINST}/usr/lib/xorg/modules/*.so \ $(IDIR_XORG_SERVER)/usr/lib/xorg/modules + ${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/*.so \ + $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/drivers ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) ${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*.so \ $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h deleted file mode 100644 index 824744f53..000000000 --- a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h +++ /dev/null @@ -1,69 +0,0 @@ -from alpinelinux - ---- xorg-server-1.18.0.orig/hw/xfree86/common/compiler.h 2015-10-28 19:15:36.000000000 +0100 -+++ xorg-server-1.18.0/hw/xfree86/common/compiler.h 2016-01-08 01:41:49.582326445 +0100 -@@ -525,26 +525,26 @@ xf86WriteMmio32Le(__volatile__ void *bas - #define PORT_SIZE short - #endif - --_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ -+_X_EXPORT volatile unsigned char *ioBase; /* Memory mapped I/O port area */ - - static __inline__ void - outb(unsigned PORT_SIZE port, unsigned char val) - { -- *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = -+ *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + ioBase) = - val; - } - - static __inline__ void - outw(unsigned PORT_SIZE port, unsigned short val) - { -- *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = -+ *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + ioBase) = - val; - } - - static __inline__ void - outl(unsigned PORT_SIZE port, unsigned int val) - { -- *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) = -+ *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + ioBase) = - val; - } - -@@ -552,21 +552,21 @@ static __inline__ unsigned int - inb(unsigned PORT_SIZE port) - { - return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + -- IOPortBase); -+ ioBase); - } - - static __inline__ unsigned int - inw(unsigned PORT_SIZE port) - { - return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + -- IOPortBase); -+ ioBase); - } - - static __inline__ unsigned int - inl(unsigned PORT_SIZE port) - { - return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + -- IOPortBase); -+ ioBase); - } - - #if defined(__mips__) -@@ -758,7 +758,7 @@ inl(unsigned short port) - return xf86ReadMmio32Le((void *) ioBase, port); - } - --#elif defined(__arm__) && defined(__linux__) -+#elif defined(__arm__) && defined(__GLIBC__) - - /* for Linux on ARM, we use the LIBC inx/outx routines */ - /* note that the appropriate setup via "ioperm" needs to be done */ diff --git a/package/xorg-server/patches/patch-include_misc_h b/package/xorg-server/patches/patch-include_misc_h new file mode 100644 index 000000000..820df214a --- /dev/null +++ b/package/xorg-server/patches/patch-include_misc_h @@ -0,0 +1,50 @@ +--- xorg-server-21.1.0.orig/include/misc.h 2021-10-27 12:47:08.000000000 +0200 ++++ xorg-server-21.1.0/include/misc.h 2021-11-12 22:48:04.777225906 +0100 +@@ -298,33 +298,12 @@ __builtin_constant_p(int x) + } + #endif + +-static inline uint64_t +-bswap_64(uint64_t x) +-{ +- return (((x & 0xFF00000000000000ull) >> 56) | +- ((x & 0x00FF000000000000ull) >> 40) | +- ((x & 0x0000FF0000000000ull) >> 24) | +- ((x & 0x000000FF00000000ull) >> 8) | +- ((x & 0x00000000FF000000ull) << 8) | +- ((x & 0x0000000000FF0000ull) << 24) | +- ((x & 0x000000000000FF00ull) << 40) | +- ((x & 0x00000000000000FFull) << 56)); +-} +- + #define swapll(x) do { \ + if (sizeof(*(x)) != 8) \ + wrong_size(); \ + *(x) = bswap_64(*(x)); \ + } while (0) + +-static inline uint32_t +-bswap_32(uint32_t x) +-{ +- return (((x & 0xFF000000) >> 24) | +- ((x & 0x00FF0000) >> 8) | +- ((x & 0x0000FF00) << 8) | +- ((x & 0x000000FF) << 24)); +-} + + static inline Bool + checked_int64_add(int64_t *out, int64_t a, int64_t b) +@@ -361,13 +340,6 @@ checked_int64_subtract(int64_t *out, int + *(x) = bswap_32(*(x)); \ + } while (0) + +-static inline uint16_t +-bswap_16(uint16_t x) +-{ +- return (((x & 0xFF00) >> 8) | +- ((x & 0x00FF) << 8)); +-} +- + #define swaps(x) do { \ + if (sizeof(*(x)) != 2) \ + wrong_size(); \ diff --git a/package/xorgproto/Makefile b/package/xorgproto/Makefile new file mode 100644 index 000000000..264ee8da6 --- /dev/null +++ b/package/xorgproto/Makefile @@ -0,0 +1,30 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= xorgproto +PKG_VERSION:= 2021.5 +PKG_RELEASE:= 1 +PKG_DESCR:= xorg extension headers +PKG_SECTION:= dev/header +PKG_HASH:= be6ddd6590881452fdfa170c1c9ff87209a98d36155332cbf2ccbc431add86ff +PKG_SITES:= http://www.x.org/releases/individual/proto/ +PKG_OPTS:= dev devonly + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,XORGPROTO,xorgproto,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,XORGPROTO,xorgproto,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +HOST_STYLE:= auto + +post-install: + $(CP) ${WRKINST}/usr/share/pkgconfig/*.pc \ + ${STAGING_TARGET_DIR}/usr/lib/pkgconfig/ + +include $(ADK_TOPDIR)/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk -- cgit v1.2.3