ports: Backports

lowlevelmemes · Jan 14, 2024 · dcfdcf3 · dcfdcf3
1 parent 47cb1df
commit dcfdcf3
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/patches/xf86-video-fbdev/jinx-working-patch.patch b/patches/xf86-video-fbdev/jinx-working-patch.patch
@@ -1,3 +1,29 @@
+diff --git xf86-video-fbdev-clean/configure.ac xf86-video-fbdev-workdir/configure.ac
+index 27778cd..67436db 100644
+--- xf86-video-fbdev-clean/configure.ac
++++ xf86-video-fbdev-workdir/configure.ac
+@@ -86,6 +86,8 @@ AC_SUBST([moduledir])
+ DRIVER_NAME=fbdev
+ AC_SUBST([DRIVER_NAME])
+
++AC_SUBST([SYSROOT])
++
+ AC_CONFIG_FILES([
+                 Makefile
+                 src/Makefile
+diff --git xf86-video-fbdev-clean/src/Makefile.am xf86-video-fbdev-workdir/src/Makefile.am
+index fbe420e..1ef5f49 100644
+--- xf86-video-fbdev-clean/src/Makefile.am
++++ xf86-video-fbdev-workdir/src/Makefile.am
+@@ -25,7 +25,7 @@
+ # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+ AM_CFLAGS = @XORG_CFLAGS@
+ fbdev_drv_la_LTLIBRARIES = fbdev_drv.la
+-fbdev_drv_la_LDFLAGS = -module -avoid-version
++fbdev_drv_la_LDFLAGS = -module -avoid-version -R@moduledir@ -L@SYSROOT@@moduledir@ -lfbdevhw -lshadow
+ fbdev_drv_ladir = @moduledir@/drivers
+
+ fbdev_drv_la_SOURCES = \
 diff --git xf86-video-fbdev-clean/src/fbdev.c xf86-video-fbdev-workdir/src/fbdev.c
 index f25ef72..7facb9f 100644
 --- xf86-video-fbdev-clean/src/fbdev.c

diff --git a/recipes/xf86-video-fbdev b/recipes/xf86-video-fbdev
@@ -13,6 +13,7 @@ regenerate() {
 }
 
 build() {
+        SYSROOT=${sysroot_dir} \
     autotools_configure \
         --disable-pciaccess
 

diff --git a/recipes/xorg-server b/recipes/xorg-server
@@ -15,6 +15,8 @@ regenerate() {
 build() {
         CFLAGS="-Wno-error=array-bounds ${common_flags}" \
     autotools_configure \
+        --with-xkb-bin-directory=/usr/bin \
+        --with-xkb-path=/usr/share/X11/xkb \
         --with-xkb-output=/var/lib/xkb \
         --with-fontrootdir=/usr/share/fonts/X11 \
         --enable-xorg \