diff options
Diffstat (limited to 'package/xorg-server')
| -rw-r--r-- | package/xorg-server/Makefile | 4 | ||||
| -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 |
3 files changed, 17 insertions, 4 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 13775e48a..4efbf78a9 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -20,7 +20,7 @@ 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 PKG_NEEDS:= threads c++ PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/xserver/ @@ -48,6 +48,8 @@ $(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-${PKG_RELEASE} TARGET_CPPFLAGS+= -D_GNU_SOURCE -D__gid_t=gid_t -D__uid_t=uid_t +AUTOTOOL_STYLE:= autoreconf + ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_OPENSSL},y) CONFIGURE_ARGS+= --with-sha1=libcrypto endif 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 = \ |