diff options
Diffstat (limited to 'package/xorg-server')
| -rw-r--r-- | package/xorg-server/Makefile | 16 | ||||
| -rw-r--r-- | package/xorg-server/files/xorg.conf.raspberry-pi5 | 6 | ||||
| -rw-r--r-- | package/xorg-server/patches/patch-configure | 6 | ||||
| -rw-r--r-- | package/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_Makefile_am | 11 |
4 files changed, 33 insertions, 6 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 13775e48a..7de6a3c6d 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -14,13 +14,13 @@ PKG_DEPENDS+= libfontenc xkeyboard-config xkbcomp libxau libxaw PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb libdrm PKG_DEPENDS+= libxshmfence libfreetype libfontenc libpciaccess -PKG_DEPENDS+= libepoxy +PKG_DEPENDS+= libepoxy libdbus 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 libepoxy +PKG_BUILDDEP+= xorgproto libxcvt libdrm libepoxy font-util-host dbus PKG_NEEDS:= threads c++ PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/xserver/ @@ -47,6 +47,9 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_CPPFLAGS+= -D_GNU_SOURCE -D__gid_t=gid_t -D__uid_t=uid_t +TARGET_LDFLAGS+= -latomic + +AUTOTOOL_STYLE:= autoreconf ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_OPENSSL},y) CONFIGURE_ARGS+= --with-sha1=libcrypto @@ -67,10 +70,11 @@ CONFIGURE_ARGS+= --enable-dga \ --enable-vgahw \ --enable-dpms \ --enable-xinerama \ + --disable-config-udev \ + --enable-debug \ --disable-docs \ --disable-glamor \ --disable-config-hal \ - --disable-config-udev \ --disable-xace \ --disable-xephyr \ --disable-xf86bigfont \ @@ -82,6 +86,8 @@ CONFIGURE_ARGS+= --enable-dga \ --disable-xvmc \ --disable-selective-werror \ --disable-strict-compilation \ + --disable-systemd-logind \ + --without-systemd-daemon \ --enable-dri \ --enable-dri2 \ --enable-dri3 \ @@ -125,6 +131,10 @@ ifeq (${ADK_TARGET_SYSTEM_SHARP_ZAURUS},y) ${CP} ./files/xorg.conf.sharp-zaurus \ $(IDIR_XORG_SERVER)/etc/X11/xorg.conf endif +ifeq (${ADK_TARGET_SYSTEM_RASPBERRY_PI5},y) + ${CP} ./files/xorg.conf.raspberry-pi5 \ + $(IDIR_XORG_SERVER)/etc/X11/xorg.conf +endif # add m4 file to host directory $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/share/aclocal $(CP) ${WRKINST}/usr/share/aclocal/xorg-server.m4 \ diff --git a/package/xorg-server/files/xorg.conf.raspberry-pi5 b/package/xorg-server/files/xorg.conf.raspberry-pi5 new file mode 100644 index 000000000..f23cd1328 --- /dev/null +++ b/package/xorg-server/files/xorg.conf.raspberry-pi5 @@ -0,0 +1,6 @@ +Section "OutputClass" + Identifier "vc4" + MatchDriver "vc4" + Driver "modesetting" + Option "PrimaryGPU" "true" +EndSection diff --git a/package/xorg-server/patches/patch-configure b/package/xorg-server/patches/patch-configure index 378c27c1c..f7b7beab0 100644 --- a/package/xorg-server/patches/patch-configure +++ b/package/xorg-server/patches/patch-configure @@ -1,6 +1,6 @@ ---- xorg-server-21.1.5.orig/configure 2022-12-14 03:25:26.000000000 +0100 -+++ xorg-server-21.1.5/configure 2022-12-31 10:38:30.017910171 +0100 -@@ -29281,7 +29281,7 @@ printf "%s\n" "#define BASE_FONT_PATH \" +--- xorg-server-21.1.16.orig/configure 2025-02-25 18:56:12.000000000 +0000 ++++ xorg-server-21.1.16/configure 2025-04-19 02:08:40.369203750 +0000 +@@ -30272,7 +30272,7 @@ printf "%s\n" "#define BASE_FONT_PATH \" test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE diff --git a/package/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_Makefile_am b/package/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_Makefile_am new file mode 100644 index 000000000..c8cf55563 --- /dev/null +++ b/package/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_Makefile_am @@ -0,0 +1,11 @@ +--- xorg-server-21.1.16.orig/hw/xfree86/drivers/modesetting/Makefile.am 2025-02-25 18:56:05.000000000 +0000 ++++ xorg-server-21.1.16/hw/xfree86/drivers/modesetting/Makefile.am 2025-04-24 17:19:31.290883875 +0000 +@@ -41,7 +41,7 @@ AM_CPPFLAGS = \ + + modesetting_drv_la_LTLIBRARIES = modesetting_drv.la + modesetting_drv_la_LDFLAGS = -module -avoid-version +-modesetting_drv_la_LIBADD = $(UDEV_LIBS) $(DRM_LIBS) ++modesetting_drv_la_LIBADD = $(UDEV_LIBS) $(DRM_LIBS) $(GBM_LIBS) + modesetting_drv_ladir = @moduledir@/drivers + + modesetting_drv_la_SOURCES = \ |