summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/base-files/Makefile3
-rw-r--r--package/bash/Makefile4
-rw-r--r--package/bcm28xx-bootloader/Makefile2
-rw-r--r--package/bcm28xx-utils/Makefile32
-rw-r--r--package/bcm28xx-utils/patches/patch-CMakeLists_txt16
-rw-r--r--package/cog/Makefile8
-rw-r--r--package/curl/Makefile4
-rw-r--r--package/dillo/Makefile23
-rw-r--r--package/e2fsprogs/Makefile4
-rw-r--r--package/elfutils/Makefile2
-rw-r--r--package/expat/Makefile7
-rw-r--r--package/fltk/Makefile14
-rw-r--r--package/fltk/patches/patch-Makefile8
-rw-r--r--package/fltk/patches/patch-makeinclude_in12
-rw-r--r--package/font-adobe-100dpi/Makefile4
-rw-r--r--package/font-adobe-75dpi/Makefile4
-rw-r--r--package/font-util/Makefile3
-rw-r--r--package/fontconfig/Makefile14
-rw-r--r--package/freeglut/Makefile7
-rw-r--r--package/freeglut/patches/patch-Makefile_in31
-rw-r--r--package/freeglut/patches/patch-progs_Makefile_in11
-rw-r--r--package/freeglut/patches/patch-src_fg_gl2_c23
-rw-r--r--package/freeglut/patches/patch-src_fg_gl2_h23
-rw-r--r--package/freeglut/patches/patch-src_fg_version_h16
-rw-r--r--package/freetype/Makefile6
-rw-r--r--package/freetype/patches/patch-include_freetype_config_ftoption_h11
-rw-r--r--package/glib/Makefile1
-rw-r--r--package/irssi/Makefile6
-rw-r--r--package/kbd/Makefile4
-rw-r--r--package/kbd/files/hpjornada.map279
-rw-r--r--package/kexec-tools/Makefile6
-rw-r--r--package/kmod/Makefile4
-rw-r--r--package/lftp/Makefile13
-rw-r--r--package/lftp/patches/patch-src_lftp_ssl_cc38
-rw-r--r--package/libdisplay-info/Makefile8
-rw-r--r--package/libdrm/Makefile4
-rw-r--r--package/libepoxy/Makefile2
-rw-r--r--package/libinput/Makefile8
-rw-r--r--package/libnettle/Makefile4
-rw-r--r--package/libpsl/Makefile6
-rw-r--r--package/libsoup3/Makefile4
-rw-r--r--package/libtasn1/Makefile4
-rw-r--r--package/libtirpc/Makefile4
-rw-r--r--package/libtirpc/patches/patch-src_auth_none_c11
-rw-r--r--package/libtirpc/patches/patch-src_auth_time_c20
-rw-r--r--package/libtirpc/patches/patch-src_getpublickey_c11
-rw-r--r--package/libtirpc/patches/patch-src_key_call_c15
-rw-r--r--package/libtirpc/patches/patch-src_svc_auth_none_c13
-rw-r--r--package/libwpe/Makefile2
-rw-r--r--package/libxkbcommon/Makefile9
-rw-r--r--package/libxml2/Makefile6
-rw-r--r--package/libxslt/Makefile5
-rw-r--r--package/mesa/Makefile3
-rw-r--r--package/openssh/Makefile6
-rw-r--r--package/openssl/Makefile4
-rw-r--r--package/strace/Makefile4
-rw-r--r--package/util-linux/Makefile1
-rw-r--r--package/wayland-protocols/Makefile6
-rw-r--r--package/weston/Makefile16
-rw-r--r--package/wpebackend-fdo/Makefile5
-rw-r--r--package/wpewebkit/Makefile15
-rw-r--r--package/xf86-video-fbdev/Makefile4
-rw-r--r--package/xorg-server/Makefile5
-rw-r--r--package/xorg-server/patches/patch-configure6
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_drivers_modesetting_Makefile_am11
65 files changed, 542 insertions, 323 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 9b3191ae7..0c7ce0b24 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -127,9 +127,6 @@ ifeq ($(ADK_TARGET_WITH_ROOT_RW),y)
else
echo 'export IPKGTMPDIR=/tmp' >> $(IDIR_BASE_FILES)/etc/profile
endif
-ifeq ($(ADK_TARGET_BOARD_BCM28XX),y)
- echo 'export LD_LIBRARY_PATH=/opt/vc/lib' >> $(IDIR_BASE_FILES)/etc/profile
-endif
endif
ifeq (${ADK_TARGET_PACKAGE_IPKG},y)
$(CP) ./files/ipkg.conf $(IDIR_BASE_FILES)/etc/
diff --git a/package/bash/Makefile b/package/bash/Makefile
index bfed5373c..3d8acfc22 100644
--- a/package/bash/Makefile
+++ b/package/bash/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= bash
-PKG_VERSION:= 5.2.21
+PKG_VERSION:= 5.2.37
PKG_RELEASE:= 1
-PKG_HASH:= c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8
+PKG_HASH:= 9599b22ecd1d5787ad7d3b7bf0c59f312b3396d1e281175dd1f8a4014da621ff
PKG_DESCR:= bourne-again shell
PKG_SECTION:= base/shells
PKG_URL:= http://www.gnu.org/software/bash/
diff --git a/package/bcm28xx-bootloader/Makefile b/package/bcm28xx-bootloader/Makefile
index 83a594ad0..b297779a2 100644
--- a/package/bcm28xx-bootloader/Makefile
+++ b/package/bcm28xx-bootloader/Makefile
@@ -66,7 +66,6 @@ ifeq ($(ADK_PACKAGE_BCM28XX_BOOTLOADER_CUTDOWN),y)
endif
printf "gpu_mem=$(ADK_TARGET_GPU_MEM)\n" >> \
$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
-ifeq ($(ADK_PACKAGE_KODI),y)
ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI4)$(ADK_TARGET_SYSTEM_RASPBERRY_PI4_64),y)
printf "dtoverlay=vc4-kms-v3d-pi4\n" >> \
$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
@@ -75,7 +74,6 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI5),y)
printf "dtoverlay=vc4-kms-v3d-pi5\n" >> \
$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
endif
-endif
ifneq ($(ADK_TARGET_HARDWARE_HIFIBERRY_AMP),)
printf "dtoverlay=hifiberry-amp\n" >> \
$(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt
diff --git a/package/bcm28xx-utils/Makefile b/package/bcm28xx-utils/Makefile
deleted file mode 100644
index e59dbde56..000000000
--- a/package/bcm28xx-utils/Makefile
+++ /dev/null
@@ -1,32 +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:= bcm28xx-utils
-PKG_VERSION:= e65f5ec102e74218cda7da9fdc8b1caa0fd1127d
-PKG_GIT:= hash
-PKG_RELEASE:= 1
-PKG_DESCR:= videocore tools and utils
-PKG_SECTION:= sys/hw
-PKG_BUILDDEP:= cmake-host
-PKG_NEEDS:= c++ threads
-PKG_URL:= https://github.com/raspberrypi/utils
-PKG_SITES:= https://github.com/raspberrypi/utils.git
-
-PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi0 raspberry-pi2 raspberry-pi3 raspberry-pi3-64 raspberry-pi4 raspberry-pi4-64 raspberry-pi5
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,BCM28XX_UTILS,bcm28xx-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-
-CONFIG_STYLE:= cmake
-
-bcm28xx-utils-install:
- $(INSTALL_DIR) $(IDIR_BCM28XX_UTILS)/usr/bin
- $(INSTALL_BIN) $(WRKINST)/usr/bin/vcgencmd \
- $(IDIR_BCM28XX_UTILS)/usr/bin
- $(INSTALL_BIN) $(WRKINST)/usr/bin/vclog \
- $(IDIR_BCM28XX_UTILS)/usr/bin
-
-include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/bcm28xx-utils/patches/patch-CMakeLists_txt b/package/bcm28xx-utils/patches/patch-CMakeLists_txt
deleted file mode 100644
index 956feac7e..000000000
--- a/package/bcm28xx-utils/patches/patch-CMakeLists_txt
+++ /dev/null
@@ -1,16 +0,0 @@
---- bcm28xx-utils-e65f5ec102e74218cda7da9fdc8b1caa0fd1127d.orig/CMakeLists.txt 2024-01-23 03:17:28.000000000 +0100
-+++ bcm28xx-utils-e65f5ec102e74218cda7da9fdc8b1caa0fd1127d/CMakeLists.txt 2024-01-23 03:21:39.257325745 +0100
-@@ -3,13 +3,10 @@ cmake_minimum_required(VERSION 3.1...3.2
- project(utils)
-
- # List of subsidiary CMakeLists
--add_subdirectory(dtmerge)
- add_subdirectory(eeptools)
- add_subdirectory(otpset)
- add_subdirectory(overlaycheck)
- add_subdirectory(ovmerge)
--add_subdirectory(pinctrl)
- add_subdirectory(raspinfo)
- add_subdirectory(vcgencmd)
- add_subdirectory(vclog)
--add_subdirectory(vcmailbox)
diff --git a/package/cog/Makefile b/package/cog/Makefile
index fead4df57..9a22fac0b 100644
--- a/package/cog/Makefile
+++ b/package/cog/Makefile
@@ -24,13 +24,19 @@ MESON_FLAGS+= -Ddocumentation=false \
-Dmanpages=false \
-Dprograms=true \
-Dwpe_api=2.0 \
- -Dplatforms=drm
+ -Dplatforms="wayland"
CONFIG_STYLE:= meson
BUILD_STYLE:= meson
INSTALL_STYLE:= meson
cog-install:
+ $(INSTALL_DIR) $(IDIR_COG)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libcogcore.so* \
+ $(IDIR_COG)/usr/lib
+ $(INSTALL_DIR) $(IDIR_COG)/usr/lib/cog/modules
+ $(CP) $(WRKINST)/usr/lib/cog/modules/* \
+ $(IDIR_COG)/usr/lib/cog/modules
$(INSTALL_DIR) $(IDIR_COG)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/cog \
$(IDIR_COG)/usr/bin
diff --git a/package/curl/Makefile b/package/curl/Makefile
index a7c53c947..4ee635110 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= curl
-PKG_VERSION:= 8.12.1
+PKG_VERSION:= 8.13.0
PKG_RELEASE:= 1
-PKG_HASH:= 0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202
+PKG_HASH:= 4a093979a3c2d02de2fbc00549a32771007f2e78032c6faa5ecd2f7a9e152025
PKG_DESCR:= client-side url transfer tool
PKG_SECTION:= net/http
PKG_BUILDDEP:= zlib
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index bb72f80cf..d34ee1692 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -4,18 +4,19 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= dillo
-PKG_VERSION:= 3.0.5
+PKG_VERSION:= 3.2.0
PKG_RELEASE:= 1
-PKG_HASH:= db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b
+PKG_HASH:= 1066ed42ea7fe0ce19e79becd029c651c15689922de8408e13e70bb5701931bf
PKG_DESCR:= small graphical web browser
PKG_SECTION:= x11/apps
-PKG_DEPENDS:= libfltk libxi libpng zlib libjpeg-turbo libressl
-PKG_BUILDDEP:= fltk libXi libjpeg-turbo libpng zlib libressl
+PKG_DEPENDS:= libfltk libxi libpng zlib libjpeg-turbo libopenssl
+PKG_DEPENDS:= libXrender libXfixes libXext fontconfig libxml2
+PKG_BUILDDEP:= fltk libXi libjpeg-turbo libpng zlib openssl
PKG_NEEDS:= threads cxx
-PKG_URL:= http://www.dillo.org/
-PKG_SITES:= http://www.dillo.org/download/
+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 x86 x86_64
+PKG_ARCH_DEPENDS:= arm mips mips64 sh x86 x86_64
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -23,11 +24,11 @@ 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
+#TARGET_CFLAGS+= -fcommon
+#TARGET_CXXFLAGS+= -fcommon
+TARGET_LDFLAGS+= -liconv -latomic
CONFIGURE_ENV+= PNG_CONFIG=$(STAGING_TARGET_DIR)/scripts/libpng-config
-CONFIGURE_ARGS+= --enable-ssl
+CONFIGURE_ARGS+= --enable-tls
dillo-install:
$(INSTALL_DIR) $(IDIR_DILLO)/etc/dillo
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index cfadb30af..b47fe75ed 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= e2fsprogs
-PKG_VERSION:= 1.47.1
+PKG_VERSION:= 1.47.2
PKG_RELEASE:= 1
-PKG_HASH:= 5a33dc047fd47284bca4bb10c13cfe7896377ae3d01cb81a05d406025d99e0d1
+PKG_HASH:= 08242e64ca0e8194d9c1caad49762b19209a06318199b63ce74ae4ef2d74e63c
PKG_DESCR:= ext2/3/4 filesystem utilities
PKG_SECTION:= sys/fs
PKG_BUILDDEP:= util-linux
diff --git a/package/elfutils/Makefile b/package/elfutils/Makefile
index 231559424..e4f1d49a9 100644
--- a/package/elfutils/Makefile
+++ b/package/elfutils/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:= 1
PKG_HASH:= 39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8
PKG_DESCR:= libraries/utilities to handle elf objects (drop in replacement for libelf)
PKG_SECTION:= base/libs
+PKG_DEPENDS:= zlib
+PKG_BUILDDEP:= zlib
PKG_NEEDS:= intl
PKG_SITES:= https://sourceware.org/elfutils/ftp/$(PKG_VERSION)/
diff --git a/package/expat/Makefile b/package/expat/Makefile
index b178c115f..d8a723ac9 100644
--- a/package/expat/Makefile
+++ b/package/expat/Makefile
@@ -4,13 +4,12 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= expat
-PKG_VERSION:= 2.7.0
+PKG_VERSION:= 2.7.1
PKG_RELEASE:= 1
-PKG_HASH:= 25df13dd2819e85fb27a1ce0431772b7047d72af81ae78dc26b4c6e0805f48d1
+PKG_HASH:= 354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30
PKG_DESCR:= xml parsing library
PKG_SECTION:= libs/data
-PKG_NEEDS:= c++
-PKG_SITES:= https://github.com/libexpat/libexpat/releases/download/R_2_7_0/
+PKG_SITES:= https://github.com/libexpat/libexpat/releases/download/R_2_7_1/
PKG_LIBNAME:= libexpat
PKG_OPTS:= dev
diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index ce17671e8..36efaf466 100644
--- a/package/fltk/Makefile
+++ b/package/fltk/Makefile
@@ -4,19 +4,20 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= fltk
-PKG_VERSION:= 1.3.8
+PKG_VERSION:= 1.3.11
PKG_RELEASE:= 1
-PKG_HASH:= f3c1102b07eb0e7a50538f9fc9037c18387165bc70d4b626e94ab725b9d4d1bf
+PKG_HASH:= 92805abc84505e3e7e27aec775ab0754ecb4182fe2d8ff2a9d568ccdcb2811ac
PKG_DESCR:= fast light toolkit
PKG_SECTION:= libs/misc
PKG_DEPENDS:= mesa libx11 libxi freeglut libfreetype
PKG_BUILDDEP:= libX11 libXi mesa freeglut freetype
+PKG_NEEDS:= locale
PKG_URL:= http://www.fltk.org/
-PKG_SITES:= http://fltk.org/pub/fltk/$(PKG_VERSION)/
+PKG_SITES:= https://github.com/fltk/fltk/releases/download/release-$(PKG_VERSION)/
PKG_LIBNAME:= libfltk
PKG_OPTS:= dev
-PKG_ARCH_DEPENDS:= x86 x86_64 mips arm
+PKG_ARCH_DEPENDS:= x86 x86_64 mips sh arm
DISTFILES:= ${PKG_NAME}-$(PKG_VERSION)-source.tar.gz
@@ -24,7 +25,10 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-CONFIGURE_ARGS+= --disable-xinerama
+CONFIGURE_ARGS+= --disable-xinerama \
+ --disable-print \
+ --disable-fluid \
+ --disable-test
libfltk-install:
$(INSTALL_DIR) $(IDIR_LIBFLTK)/usr/lib
diff --git a/package/fltk/patches/patch-Makefile b/package/fltk/patches/patch-Makefile
index d6755ba24..1d7f0ea9b 100644
--- a/package/fltk/patches/patch-Makefile
+++ b/package/fltk/patches/patch-Makefile
@@ -1,11 +1,11 @@
---- fltk-1.3.2.orig/Makefile 2011-07-19 06:49:30.000000000 +0200
-+++ fltk-1.3.2/Makefile 2014-05-28 13:50:10.000000000 +0200
-@@ -18,7 +18,7 @@
+--- fltk-1.3.11.orig/Makefile 2025-02-05 15:03:09.000000000 +0100
++++ fltk-1.3.11/Makefile 2025-08-03 08:48:11.761069409 +0200
+@@ -16,7 +16,7 @@
include makeinclude
-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
-+DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation
++DIRS = $(IMAGEDIRS) src $(CAIRODIR)
all: makeinclude fltk-config
for dir in $(DIRS); do\
diff --git a/package/fltk/patches/patch-makeinclude_in b/package/fltk/patches/patch-makeinclude_in
deleted file mode 100644
index 8581117de..000000000
--- a/package/fltk/patches/patch-makeinclude_in
+++ /dev/null
@@ -1,12 +0,0 @@
---- fltk-1.3.2.orig/makeinclude.in 2012-12-05 15:53:03.000000000 +0100
-+++ fltk-1.3.2/makeinclude.in 2014-05-28 16:08:25.000000000 +0200
-@@ -130,9 +130,6 @@ INSTALL_SCRIPT = $(INSTALL) -m 755
- INSTALL_DESKTOP = @INSTALL_DESKTOP@
- UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
-
--# Be quiet when building...
--.SILENT:
--
- # Build commands and filename extensions...
- .SUFFIXES: .0 .1 .3 .6 .c .cxx .mm .h .fl .man .o .z $(EXEEXT)
-
diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile
index a9fcab4ff..cf4f25c08 100644
--- a/package/font-adobe-100dpi/Makefile
+++ b/package/font-adobe-100dpi/Makefile
@@ -20,11 +20,9 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_ADOBE_100DPI,font-adobe-100dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-XAKE_FLAGS+= DESTDIR=''
-
font-adobe-100dpi-install:
$(INSTALL_DIR) $(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi
- $(CP) ${STAGING_TARGET_DIR}/usr/share/fonts/X11/100dpi/* \
+ $(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \
$(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi
include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile
index 4f9d4dae9..61dc6568a 100644
--- a/package/font-adobe-75dpi/Makefile
+++ b/package/font-adobe-75dpi/Makefile
@@ -20,11 +20,9 @@ include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FONT_ADOBE_75DPI,font-adobe-75dpi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-XAKE_FLAGS+= DESTDIR=''
-
font-adobe-75dpi-install:
$(INSTALL_DIR) $(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi
- $(CP) ${STAGING_TARGET_DIR}/usr/share/fonts/X11/75dpi/* \
+ $(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \
$(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi
include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/font-util/Makefile b/package/font-util/Makefile
index 5b9289f89..eeb265a28 100644
--- a/package/font-util/Makefile
+++ b/package/font-util/Makefile
@@ -14,8 +14,10 @@ PKG_SITES:= http://www.x.org/releases/individual/font/
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+include ${ADK_TOPDIR}/mk/host.mk
include ${ADK_TOPDIR}/mk/package.mk
+$(eval $(call HOST_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE}))
$(eval $(call PKG_template,FONT_UTIL,font-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
# XXX: Push the mapping files to a place where we can find them
@@ -38,4 +40,5 @@ font-util-install:
${CP} ${WRKINST}/usr/share/fonts/X11/util/* \
${IDIR_FONT_UTIL}/usr/share/fonts/X11/util
+include ${ADK_TOPDIR}/mk/host-bottom.mk
include ${ADK_TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile
index 614a16381..aeb6fc8e9 100644
--- a/package/fontconfig/Makefile
+++ b/package/fontconfig/Makefile
@@ -4,20 +4,18 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= fontconfig
-PKG_VERSION:= 2.15.0
+PKG_VERSION:= 2.16.0
PKG_RELEASE:= 1
-PKG_HASH:= f5f359d6332861bd497570848fcb42520964a9e83d5e3abe397b6b6db9bcaaf4
+PKG_HASH:= 6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220
PKG_DESCR:= library for configuring and customizing font access
PKG_SECTION:= libs/fonts
-PKG_DEPENDS:= libxml2
+PKG_DEPENDS:= libfreetype libxml2
PKG_BUILDDEP:= freetype libxml2 gperf-host util-linux
HOST_BUILDDEP:= expat-host
PKG_URL:= http://fontconfig.org/
PKG_SITES:= http://fontconfig.org/release/
PKG_OPTS:= dev
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-
include ${ADK_TOPDIR}/mk/host.mk
include ${ADK_TOPDIR}/mk/package.mk
@@ -25,11 +23,13 @@ $(eval $(call HOST_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE})
$(eval $(call PKG_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
HOST_STYLE:= auto
-CONFIGURE_ARGS+= --with-arch=${ADK_TARGET_ARCH} \
- --enable-libxml2 \
+CONFIGURE_ARGS+= --enable-libxml2 \
--disable-docs
fontconfig-install:
+ ${INSTALL_DIR} ${IDIR_FONTCONFIG}/usr/bin
+ ${INSTALL_BIN} ${WRKINST}/usr/bin/fc-* \
+ ${IDIR_FONTCONFIG}/usr/bin
${INSTALL_DIR} ${IDIR_FONTCONFIG}/usr/lib ${IDIR_FONTCONFIG}/etc/fonts
${CP} ${WRKINST}/usr/lib/libfontconfig.so* ${IDIR_FONTCONFIG}/usr/lib
$(CP) ${WRKINST}/etc/fonts/* ${IDIR_FONTCONFIG}/etc/fonts
diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile
index 1ed30db0d..84f8246c5 100644
--- a/package/freeglut/Makefile
+++ b/package/freeglut/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= freeglut
-PKG_VERSION:= 3.2.1
+PKG_VERSION:= 3.6.0
PKG_RELEASE:= 1
-PKG_HASH:= d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68
+PKG_HASH:= 9c3d4d6516fbfa0280edc93c77698fb7303e443c1aaaf37d269e3288a6c3ea52
PKG_DESCR:= opengl utility toolkit libraries
PKG_SECTION:= libs/video
PKG_DEPENDS:= libglu
@@ -18,13 +18,14 @@ PKG_OPTS:= dev
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
-PKG_ARCH_DEPENDS:= arm mips mipsel mips64 mips64el x86 x86_64
+PKG_ARCH_DEPENDS:= arm mips mipsel mips64 mips64el sh x86 x86_64
include $(ADK_TOPDIR)/mk/package.mk
$(eval $(call PKG_template,FREEGLUT,freeglut,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= cmake
+CMAKE_FLAGS+= -DFREEGLUT_BUILD_DEMOS=OFF
freeglut-install:
$(INSTALL_DIR) $(IDIR_FREEGLUT)/usr/lib
diff --git a/package/freeglut/patches/patch-Makefile_in b/package/freeglut/patches/patch-Makefile_in
deleted file mode 100644
index 143efe98a..000000000
--- a/package/freeglut/patches/patch-Makefile_in
+++ /dev/null
@@ -1,31 +0,0 @@
---- freeglut-2.6.0.orig/Makefile.in 2009-11-25 20:14:30.000000000 +0100
-+++ freeglut-2.6.0/Makefile.in 2012-03-12 15:05:53.767407283 +0100
-@@ -220,28 +220,6 @@ EXTRA_DIST = \
- freeglut_static_vs2008.vcproj \
- freeglut_vs2008.sln \
- freeglut_vs2008.vcproj \
-- progs/demos/CallbackMaker/CallbackMakerStatic.dsp \
-- progs/demos/CallbackMaker/CallbackMakerStatic_vs2008.vcproj \
-- progs/demos/CallbackMaker/CallbackMaker_vs2008.vcproj \
-- progs/demos/Fractals/FractalsStatic.dsp \
-- progs/demos/Fractals/FractalsStatic_vs2008.vcproj \
-- progs/demos/Fractals/Fractals_vs2008.vcproj \
-- progs/demos/Fractals_random/Fractals_randomStatic.dsp \
-- progs/demos/Fractals_random/Fractals_randomStatic_vs2008.vcproj \
-- progs/demos/Fractals_random/Fractals_random_vs2008.vcproj \
-- progs/demos/Lorenz/lorenzStatic.dsp \
-- progs/demos/Lorenz/lorenzStatic_vs2008.vcproj \
-- progs/demos/Lorenz/lorenz_vs2008.vcproj \
-- progs/demos/One/oneStatic.dsp \
-- progs/demos/One/oneStatic_vs2008.vcproj \
-- progs/demos/One/one_vs2008.vcproj \
-- progs/demos/demos_vs2008.sln \
-- progs/demos/shapes/shapesStatic.dsp \
-- progs/demos/shapes/shapesStatic_vs2008.vcproj \
-- progs/demos/shapes/shapes_vs2008.vcproj \
-- progs/demos/smooth_opengl3/smooth_opengl3Static.dsp \
-- progs/demos/smooth_opengl3/smooth_opengl3Static_vs2008.vcproj \
-- progs/demos/smooth_opengl3/smooth_opengl3_vs2008.vcproj
-
- all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/package/freeglut/patches/patch-progs_Makefile_in b/package/freeglut/patches/patch-progs_Makefile_in
deleted file mode 100644
index e5d2993d1..000000000
--- a/package/freeglut/patches/patch-progs_Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@