4
1

3 Incheckningar 70b069ce78 ... fb5cf1f92e

Upphovsman SHA1 Meddelande Datum
  Waldemar Brodkorb fb5cf1f92e dillo: update to 3.3.0 4 dagar sedan
  Waldemar Brodkorb e8324ccb45 lxde task: disable vlc/xscreensaver 3 veckor sedan
  Waldemar Brodkorb 121464e293 olpc: add USB firmware 3 veckor sedan

+ 4 - 8
package/dillo/Makefile

@@ -4,9 +4,8 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		dillo
-PKG_VERSION:=		fltk-1.4
-PKG_GIT:=		branch
-PKG_HASH:=		2b5c73bc771f69426e34e538281c163cccb02191964b01f59be8b61555e4949e
+PKG_VERSION:=		3.3.0
+PKG_HASH:=		db1863261d5efbd27b090e430c88064082b891cea1edf7a14e234cca51754f60
 PKG_RELEASE:=		1
 PKG_DESCR:=		small graphical web browser
 PKG_SECTION:=		x11/apps
@@ -15,8 +14,7 @@ PKG_DEPENDS+=		libXrender libXfixes libXext fontconfig libxml2 ca-certificates
 PKG_BUILDDEP:=		fltk libXi libjpeg-turbo libpng zlib openssl
 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_SITES:=		https://git.dillo-browser.org/dillo
+PKG_SITES:=		https://dillo-browser.org/release/$(PKG_VERSION)/
 
 PKG_ARCH_DEPENDS:=	aarch64 arm mips mips64 sh x86 x86_64
 
@@ -27,11 +25,9 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,DILLO,dillo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TARGET_LDFLAGS+=	-latomic
-AUTOTOOL_STYLE:=	autoreconf
 CONFIGURE_ENV+=		PNG_CONFIG=$(STAGING_TARGET_DIR)/scripts/libpng-config
 CONFIGURE_ARGS+=	--enable-tls \
-			--enable-experimental-fltk \
-			--disable-xembed
+			--enable-experimental-fltk
 
 dillo-install:
 	$(INSTALL_DIR) $(IDIR_DILLO)/etc/dillo

+ 15 - 0
package/xscreensaver/patches/patch-configure

@@ -0,0 +1,15 @@
+--- xscreensaver-6.14.orig/configure	2026-01-15 23:28:56.616217250 +0100
++++ xscreensaver-6.14/configure	2026-03-23 06:48:38.674173046 +0100
+@@ -22581,5 +22581,11 @@ echo "             Extra Fonts:   ${FONT
+ echo "             App Defaults:  ${APPDEFAULTS}/$addir_err"
+ echo ""
+ 
+-exit $CONF_STATUS
++if test "$CONF_STATUS" != 0; then
++	echo ""
++	echo "Warning: Buildroot build will proceed regardless of above warnings"
++	echo ""
++fi
++
++exit 0
+ 

BIN
target/x86/olpc-xo-1/usb8388.bin


+ 0 - 2
tasks/009-lxde

@@ -25,8 +25,6 @@ config ADK_APPLIANCE_LXDE
 	select ADK_PACKAGE_XTERM
 	select ADK_PACKAGE_VIM
 	select ADK_PACKAGE_VIM_WITH_X
-	select ADK_PACKAGE_VLC
-	select ADK_PACKAGE_XSCREENSAVER
 	select ADK_PACKAGE_XDM
 	select BUSYBOX_NTPD
 	select BUSYBOX_WATCHDOG

+ 4 - 0
toolchain/linux-headers/Makefile

@@ -13,6 +13,10 @@ LINUX_DIR=${WRKBUILD}
 include $(ADK_TOPDIR)/mk/kernel-vars.mk
 
 $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_FILE_VER)/.patched:
+ifeq ($(ADK_TARGET_SYSTEM_OLPC_XO_1),y)
+	mkdir -p $(WRKSRC)/firmware
+	cp $(ADK_TOPDIR)/target/x86/olpc-xo-1/usb8388.bin $(WRKSRC)/firmware/
+endif
 ifeq ($(ADK_TARGET_SYSTEM_PCENGINES_APU),y)
 ifeq ($(ADK_TARGET_ROOTFS_NFSROOT),y)
 	cd $(DL_DIR) && wget https://distfiles.openadk.org/realtek-firmware-1.2.tar.gz