diff options
Diffstat (limited to 'package')
-rw-r--r-- | package/dejavu-ttf-fonts/Makefile | 30 | ||||
-rw-r--r-- | package/dillo/Makefile | 6 | ||||
-rw-r--r-- | package/eudev/Makefile | 10 | ||||
-rw-r--r-- | package/fltk/Makefile | 2 | ||||
-rw-r--r-- | package/gdk-pixbuf/Makefile | 1 | ||||
-rw-r--r-- | package/glib/Makefile | 19 | ||||
-rw-r--r-- | package/libpciaccess/Makefile | 14 | ||||
-rw-r--r-- | package/libptytty/Makefile | 3 | ||||
-rw-r--r-- | package/pam/Makefile | 2 | ||||
-rw-r--r-- | package/rxvt-unicode/Makefile | 2 | ||||
-rw-r--r-- | package/util-linux/Makefile | 1 | ||||
-rw-r--r-- | package/xf86-input-libinput/Makefile | 27 | ||||
-rw-r--r-- | package/xkbcomp/Makefile | 10 | ||||
-rw-r--r-- | package/xkeyboard-config/Makefile | 13 | ||||
-rw-r--r-- | package/xorg-server/Makefile | 13 | ||||
-rw-r--r-- | package/xorg-server/files/xorg.conf.raspberry-pi5 | 6 | ||||
-rw-r--r-- | package/xterm/Makefile | 4 |
17 files changed, 124 insertions, 39 deletions
diff --git a/package/dejavu-ttf-fonts/Makefile b/package/dejavu-ttf-fonts/Makefile new file mode 100644 index 000000000..c1bc7d6f5 --- /dev/null +++ b/package/dejavu-ttf-fonts/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:= dejavu-fonts-ttf +PKG_VERSION:= 2.37 +PKG_RELEASE:= 1 +PKG_HASH:= fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7 +PKG_DESCR:= free fonts +PKG_SECTION:= x11/fonts +PKG_URL:= https://dejavu-fonts.github.io/ +PKG_SITES:= http://sourceforge.net/projects/dejavu/files/dejavu/$(PKG_VERSION)/ + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,DEJAVU_FONTS_TTF,dejavu-fonts-ttf,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +dejavu-fonts-ttf-install: + $(INSTALL_DIR) $(IDIR_DEJAVU_FONTS_TTF)/usr/share/fonts/dejavu + $(INSTALL_BIN) $(WRKBUILD)/ttf/*.ttf \ + $(IDIR_DEJAVU_FONTS_TTF)/usr/share/fonts/dejavu + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/dillo/Makefile b/package/dillo/Makefile index d34ee1692..b46c53746 100644 --- a/package/dillo/Makefile +++ b/package/dillo/Makefile @@ -16,7 +16,7 @@ PKG_NEEDS:= threads cxx PKG_URL:= https://dillo-browser.github.io/ PKG_SITES:= https://github.com/dillo-browser/dillo/releases/download/v$(PKG_VERSION)/ -PKG_ARCH_DEPENDS:= arm mips mips64 sh x86 x86_64 +PKG_ARCH_DEPENDS:= aarch64 arm mips mips64 sh x86 x86_64 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 @@ -24,9 +24,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,DILLO,dillo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -#TARGET_CFLAGS+= -fcommon -#TARGET_CXXFLAGS+= -fcommon -TARGET_LDFLAGS+= -liconv -latomic +TARGET_LDFLAGS+= -latomic CONFIGURE_ENV+= PNG_CONFIG=$(STAGING_TARGET_DIR)/scripts/libpng-config CONFIGURE_ARGS+= --enable-tls diff --git a/package/eudev/Makefile b/package/eudev/Makefile index 8ed7c39d7..1b20894b9 100644 --- a/package/eudev/Makefile +++ b/package/eudev/Makefile @@ -4,15 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= eudev -PKG_VERSION:= 3.2.8 +PKG_VERSION:= 3.2.14 PKG_RELEASE:= 1 -PKG_HASH:= 61e4948e9e51271c3cce2bb5311a30b206dd03ef011062e6c627fb007e43f6b8 +PKG_HASH:= 8da4319102f24abbf7fff5ce9c416af848df163b29590e666d334cc1927f006f PKG_DESCR:= device manager PKG_SECTION:= sys/utils -PKG_BUILDDEP:= gperf-host glib -PKG_DEPENDS:= glib libkmod +PKG_BUILDDEP:= gperf-host +PKG_DEPENDS:= libkmod PKG_URL:= http://wiki.gentoo.org/wiki/Project:Eudev -PKG_SITES:= http://dev.gentoo.org/~blueness/eudev/ +PKG_SITES:= https://github.com/eudev-project/eudev/releases/download/v$(PKG_VERSION)/ PKG_LIBNAME:= libudev PKG_OPTS:= dev diff --git a/package/fltk/Makefile b/package/fltk/Makefile index 36efaf466..77d299cf9 100644 --- a/package/fltk/Makefile +++ b/package/fltk/Makefile @@ -17,7 +17,7 @@ PKG_SITES:= https://github.com/fltk/fltk/releases/download/release-$(PKG_VERSIO PKG_LIBNAME:= libfltk PKG_OPTS:= dev -PKG_ARCH_DEPENDS:= x86 x86_64 mips sh arm +PKG_ARCH_DEPENDS:= aarch64 x86 x86_64 mips sh arm DISTFILES:= ${PKG_NAME}-$(PKG_VERSION)-source.tar.gz diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile index e10050cfe..c47c5c131 100644 --- a/package/gdk-pixbuf/Makefile +++ b/package/gdk-pixbuf/Makefile @@ -10,6 +10,7 @@ PKG_RELEASE:= 1 PKG_HASH:= b9505b3445b9a7e48ced34760c3bcb73e966df3ac94c95a148cb669ab748e3c7 PKG_DESCR:= image loading and pixel buffer manipulation library PKG_SECTION:= libs/image +PKG_DEPENDS:= libjpeg-turbo libtiff glib libpng PKG_BUILDDEP:= libjpeg-turbo libtiff glib libpng gdk-pixbuf-host HOST_BUILDDEP:= glib-host libffi-host libpng-host libjpeg-turbo-host PKG_NEEDS:= c++ diff --git a/package/glib/Makefile b/package/glib/Makefile index 4dce8b040..51276ee1a 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -4,10 +4,10 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= glib -PKG_VERSION:= 2.84.0 +PKG_VERSION:= 2.84.3 PKG_RELEASE:= 1 PKG_EXTRAVER:= 2.84 -PKG_HASH:= f8823600cb85425e2815cfad82ea20fdaa538482ab74e7293d58b3f64a5aff6a +PKG_HASH:= aa4f87c3225bf57ca85f320888f7484901a17934ca37023c3bd8435a72db863e PKG_DESCR:= low-level core library that forms the basis of gtk+ PKG_SECTION:= libs/misc PKG_DEPENDS:= pcre2 zlib libffi @@ -35,11 +35,20 @@ CONFIG_STYLE:= meson BUILD_STYLE:= meson INSTALL_STYLE:= meson -HOST_MESON_FLAGS:= -Dintrospection=disabled -Dnls=disabled -Dtests=false -Dxattr=false \ +HOST_MESON_FLAGS:= -Dintrospection=disabled \ + -Dnls=disabled \ + -Dtests=false \ + -Dxattr=false \ -Doss_fuzz=disabled \ -Dsysprof=disabled \ --default-library=static -MESON_FLAGS:= -Dintrospection=disabled -Dtests=false -Dxattr=false -Doss_fuzz=disabled -Dsysprof=disabled +MESON_FLAGS:= -Dintrospection=disabled \ + -Dnls=disabled \ + -Dtests=false \ + -Dxattr=false \ + -Doss_fuzz=disabled \ + -Dglib_debug=disabled \ + -Dsysprof=disabled hostpost-install: $(CP) $(HOSTWRKBUILD)/../glib-obj/meson-private/*.pc \ @@ -56,7 +65,7 @@ glib-install: $(CP) $(WRKINST)/usr/lib/libgobject*.so* $(IDIR_GLIB)/usr/lib $(CP) $(WRKINST)/usr/lib/libgmodule*.so* $(IDIR_GLIB)/usr/lib $(CP) $(WRKINST)/usr/lib/libgthread*.so* $(IDIR_GLIB)/usr/lib - $(CP) $(WRKINST)/usr/lib/libintl*.so* $(IDIR_GLIB)/usr/lib + -$(CP) $(WRKINST)/usr/lib/libintl*.so* $(IDIR_GLIB)/usr/lib # workaround for dev subpackage $(INSTALL_DIR) $(IDIR_GLIB_DEV)/usr/include $(INSTALL_DIR) $(IDIR_GLIB_DEV)/usr/lib/glib-2.0/include diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile index 89e388cd4..db5378c53 100644 --- a/package/libpciaccess/Makefile +++ b/package/libpciaccess/Makefile @@ -4,20 +4,24 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libpciaccess -PKG_VERSION:= 0.16 +PKG_VERSION:= 0.18.1 PKG_RELEASE:= 1 -PKG_HASH:= 84413553994aef0070cf420050aa5c0a51b1956b404920e21b81e96db6a61a27 +PKG_HASH:= 4af43444b38adb5545d0ed1c2ce46d9608cc47b31c2387fc5181656765a6fa76 PKG_DESCR:= pci access library PKG_SECTION:= x11/libs -PKG_SITES:= http://www.x.org/releases/individual/lib/ +PKG_SITES:= http://xorg.freedesktop.org/releases/individual/lib/ PKG_OPTS:= dev -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBPCIACCESS,libpciaccess,$(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 + libpciaccess-install: ${INSTALL_DIR} ${IDIR_LIBPCIACCESS}/usr/lib ${CP} ${WRKINST}/usr/lib/libpciaccess.so* \ diff --git a/package/libptytty/Makefile b/package/libptytty/Makefile index cb1126ce1..396e496e1 100644 --- a/package/libptytty/Makefile +++ b/package/libptytty/Makefile @@ -21,7 +21,8 @@ $(eval $(call PKG_template,LIBPTYTTY,libptytty,$(PKG_VERSION)-$(PKG_RELEASE),$(P TARGET_CFLAGS+= -lstdc++ CONFIG_STYLE:= cmake CMAKE_FLAGS+= -DTTY_GID_SUPPORT_EXITCODE=0 \ - -DTTY_GID_SUPPORT_EXITCODE__TRYRUN_OUTPUT=0 + -DUTMP_SUPPORT=0 \ + -DWTMP_SUPPORT=0 \ XAKE_FLAGS+= VERBOSE=1 libptytty-install: diff --git a/package/pam/Makefile b/package/pam/Makefile index 933101e47..de36b2448 100644 --- a/package/pam/Makefile +++ b/package/pam/Makefile @@ -8,7 +8,9 @@ PKG_VERSION:= 1.7.0 PKG_RELEASE:= 1 PKG_HASH:= 1dad9cb50b4a19accd7d7b9716777caf5a0f33d26f018f27d63e9e095998f12b PKG_DESCR:= pluggable authentication modules +PKG_DEPENDS_GLIBC:= libxcrypt PKG_BUILDDEP:= flex meson-host +PKG_BUILDDEP_GLIBC:= libxcrypt PKG_SECTION:= sys/misc PKG_URL:= http://www.linux-pam.org/ PKG_SITES:= https://github.com/linux-pam/linux-pam/archive/refs/tags/ diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile index 8b977427d..3e6e625d9 100644 --- a/package/rxvt-unicode/Makefile +++ b/package/rxvt-unicode/Makefile @@ -10,7 +10,7 @@ PKG_HASH:= fe1c93d12f385876457a989fc3ae05c0915d2692efc59289d0f70fabe5b44d2d PKG_DESCR:= terminal emulator with unicode support PKG_SECTION:= x11/apps PKG_DEPENDS:= libx11 fontconfig libxft libxml2 gdk-pixbuf libptytty -PKG_DEPENDS+= libffi libmount +PKG_DEPENDS+= libffi libmount glib PKG_BUILDDEP:= libX11 fontconfig libXft libxml2 gdk-pixbuf libptytty PKG_BUILDDEP+= libffi util-linux PKG_NEEDS:= c++ diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 8d8e113ef..137fd1054 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -24,6 +24,7 @@ PKGSD_LIBFDISK:= fdisk library PKGSC_LIBFDISK:= libs/misc PKGSD_LIBMOUNT:= mount library PKGSC_LIBMOUNT:= libs/misc +PKGSS_LIBMOUNT:= libblkid PKGSD_LIBSMARTCOLS:= smartcols library PKGSC_LIBSMARTCOLS:= libs/misc PKGSD_FDISK:= partition table manipulation utility diff --git a/package/xf86-input-libinput/Makefile b/package/xf86-input-libinput/Makefile new file mode 100644 index 000000000..5509b8201 --- /dev/null +++ b/package/xf86-input-libinput/Makefile @@ -0,0 +1,27 @@ +# 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-input-libinput +PKG_VERSION:= 1.5.0 +PKG_RELEASE:= 1 +PKG_HASH:= 2524c35f196554ea11aef3bba1cf324759454e1d49f98ac026ace2f6003580e6 +PKG_DESCR:= x11 driver for libinput +PKG_SECTION:= x11/drivers +PKG_DEPENDS:= xorg-server libudev libevdev mtdev libinput +PKG_BUILDDEP:= xorg-server eudev libevdev mtdev libinput +PKG_SITES:= https://www.x.org/releases/individual/driver/ + +PKG_CFLINE_XF86_INPUT_LIBINPUT:= depends on ADK_TARGET_WITH_INPUT + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,XF86_INPUT_LIBINPUT,xf86-input-libinput,$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +xf86-input-libinput-install: + ${INSTALL_DIR} ${IDIR_XF86_INPUT_LIBINPUT}/usr/lib/xorg/modules/input + ${CP} ${WRKINST}/usr/lib/xorg/modules/input/*.so \ + ${IDIR_XF86_INPUT_LIBINPUT}/usr/lib/xorg/modules/input/ + +include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xkbcomp/Makefile b/package/xkbcomp/Makefile index fd8f421cd..50be6a1a1 100644 --- a/package/xkbcomp/Makefile +++ b/package/xkbcomp/Makefile @@ -4,17 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xkbcomp -PKG_VERSION:= 1.0.5 -PKG_RELEASE:= 2 -PKG_HASH:= 817e2bda2ca51ffc1fc664e3f9ab88b359cd91246f0f4736fc747d6fbc59f2e7 +PKG_VERSION:= 1.4.7 +PKG_RELEASE:= 1 +PKG_HASH:= 0a288114e5f44e31987042c79aecff1ffad53a8154b8ec971c24a69a80f81f77 PKG_DESCR:= x11 keyboard compiler PKG_SECTION:= x11/misc PKG_BUILDDEP:= libxkbfile libX11 PKG_DEPENDS:= libxkbfile libx11 HOST_BUILDDEP:= libxkbfile-host -PKG_SITES:= http://xorg.freedesktop.org/releases/X11R7.4/src/everything/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_SITES:= http://xorg.freedesktop.org/releases/individual/app/ include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile index 27551639b..5724468e0 100644 --- a/package/xkeyboard-config/Makefile +++ b/package/xkeyboard-config/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xkeyboard-config -PKG_VERSION:= 2.37 +PKG_VERSION:= 2.45 PKG_RELEASE:= 1 -PKG_HASH:= eb1383a5ac4b6210d7c7302b9d6fab052abdf51c5d2c9b55f1f779997ba68c6c +PKG_HASH:= 169e075a92d957a57787c199e84e359df2931b7196c1c5b4a3d576ee6235a87c PKG_DESCR:= keyboard config PKG_SECTION:= x11/misc PKG_BUILDDEP:= util-macros-host xkbcomp-host xkbcomp meson-host @@ -23,9 +23,10 @@ BUILD_STYLE:= meson INSTALL_STYLE:= meson xkeyboard-config-install: - ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb - ${CP} ${WRKINST}/usr/share/X11/xkb/* \ - ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb - rm -rf ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/symbols/sun_vndr + ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11 + ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/xkeyboard-config-2 + ${CP} ${WRKINST}/usr/share/xkeyboard-config-2/* \ + ${IDIR_XKEYBOARD_CONFIG}/usr/share/xkeyboard-config-2 + (cd $(IDIR_XKEYBOARD_CONFIG)/usr/share/X11 && ln -sf ../xkeyboard-config-2 xkb) include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index dd1e01e98..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 font-util-host +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/ @@ -70,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 \ @@ -85,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 \ @@ -128,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/xterm/Makefile b/package/xterm/Makefile index c01042855..0c6f1c634 100644 --- a/package/xterm/Makefile +++ b/package/xterm/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xterm -PKG_VERSION:= 396 +PKG_VERSION:= 401 PKG_RELEASE:= 1 -PKG_HASH:= 43f94b6d0eecb4219a99f46352e746f2ab5558e40d922d411acff96cc778a6a5 +PKG_HASH:= 3da2b5e64cb49b03aa13057d85e62e1f2e64f7c744719c00d338d11cd3e6ca1a PKG_DESCR:= terminal emulator PKG_SECTION:= x11/apps PKG_DEPENDS:= libxaw libxt libncurses libxft fontconfig libuuid |