4
1

9 Коммиты 6e6ef91cf0 ... 2fe7e41972

Автор SHA1 Сообщение Дата
  Waldemar Brodkorb 2fe7e41972 linux: update to 6.18.15, make default it is the new LTS 1 неделя назад
  Waldemar Brodkorb 517e267145 virtio: add input driver 1 неделя назад
  Waldemar Brodkorb 01b9b72206 xscreensaver: needs mesa 1 неделя назад
  Waldemar Brodkorb 74d3817d37 zlib: update to 1.3.2 1 неделя назад
  Waldemar Brodkorb f714421e8f allow for qemu targets 1 неделя назад
  Waldemar Brodkorb 762bf3ec1b allow xf86-input-evdev for qemu 1 неделя назад
  Waldemar Brodkorb 12df9bf10d vlc: enable ffmpeg support 1 неделя назад
  Waldemar Brodkorb 026abc81fb libinput: update to 1.30.2 1 неделя назад
  Waldemar Brodkorb ffa47ad3aa dillo: add pkg hash and use openadk mirror for now 1 неделя назад

+ 2 - 2
mk/linux-ver.mk

@@ -16,10 +16,10 @@ KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE)
 endif
 ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_18),y)
-KERNEL_FILE_VER:=	6.18.13
+KERNEL_FILE_VER:=	6.18.15
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		ed2c3c55fd38e6836c094fce356f2567f9516130b73354a29857960368c5687f
+KERNEL_HASH:=		7c716216c3c4134ed0de69195701e677577bbcdd3979f331c182acd06bf2f170
 endif
 ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_12),y)
 KERNEL_FILE_VER:=	6.12.74

+ 1 - 0
package/dillo/Makefile

@@ -6,6 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		dillo
 PKG_VERSION:=		fltk-1.4
 PKG_GIT:=		branch
+PKG_HASH:=		2b5c73bc771f69426e34e538281c163cccb02191964b01f59be8b61555e4949e
 PKG_RELEASE:=		1
 PKG_DESCR:=		small graphical web browser
 PKG_SECTION:=		x11/apps

+ 2 - 2
package/libinput/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libinput
-PKG_VERSION:=		1.28.1
+PKG_VERSION:=		1.30.2
 PKG_RELEASE:=		1
-PKG_HASH:=		a13f8c9a7d93df3c85c66afd135f0296701d8d32f911991b7aa4273fdd6a42a3
+PKG_HASH:=		76130ec033ae0359d9e0288fd6576da70d7bfc682464c394551841f3a3e08e08
 PKG_DESCR:=		input library
 PKG_DEPENDS:=		mtdev libevdev libudev
 PKG_BUILDDEP:=		mtdev libevdev eudev

+ 2 - 2
package/vlc/Makefile

@@ -70,8 +70,8 @@ CONFIGURE_ARGS+=	--disable-lua \
 			--disable-optimizations \
 			--disable-static \
 			--disable-swscale \
-			--disable-avformat \
-			--disable-avcodec \
+			--enable-avformat \
+			--enable-avcodec \
 			--disable-mpg123
 
 ifeq ($(ADK_TARGET_ARCH_ARM_WITH_NEON),)

+ 1 - 1
package/xf86-input-evdev/Makefile

@@ -15,7 +15,7 @@ PKG_SITES:=		http://www.x.org/releases/individual/driver/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 
-PKG_CFLINE_XF86_INPUT_EVDEV:= depends on ADK_TARGET_WITH_INPUT
+PKG_CFLINE_XF86_INPUT_EVDEV:= depends on ADK_TARGET_WITH_INPUT || ADK_TARGET_QEMU
 
 include $(ADK_TOPDIR)/mk/package.mk
 

+ 1 - 1
package/xf86-input-keyboard/Makefile

@@ -16,7 +16,7 @@ PKG_SITES:=		http://www.x.org/releases/individual/driver/
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-PKG_CFLINE_XF86_INPUT_KEYBOARD:=	depends on ADK_TARGET_WITH_INPUT || ADK_TARGET_QEMU_WITH_GRAPHIC
+PKG_CFLINE_XF86_INPUT_KEYBOARD:=	depends on ADK_TARGET_WITH_INPUT || ADK_TARGET_QEMU
 
 include $(ADK_TOPDIR)/mk/package.mk
 

+ 1 - 1
package/xf86-input-mouse/Makefile

@@ -16,7 +16,7 @@ PKG_SITES:=		http://www.x.org/releases/individual/driver/
 
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
-PKG_CFLINE_XF86_INPUT_MOUSE:=	depends on ADK_TARGET_WITH_INPUT || ADK_TARGET_QEMU_WITH_GRAPHIC
+PKG_CFLINE_XF86_INPUT_MOUSE:=	depends on ADK_TARGET_WITH_INPUT || ADK_TARGET_QEMU
 
 include $(ADK_TOPDIR)/mk/package.mk
 

+ 1 - 0
package/xscreensaver/Makefile

@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_HASH:=		07f310eb60ece3a6c57abaa722d7209a2c4f54309a5a7b09b6eed20152d073f2
 PKG_DESCR:=		popular screensaver for xorg
 PKG_SECTION:=		x11/apps
+PKG_BUILDDEP:=		mesa
 PKG_URL:=		https://www.jwz.org/xscreensaver/
 PKG_SITES:=		https://www.jwz.org/xscreensaver/
 

+ 2 - 2
package/zlib/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		zlib
-PKG_VERSION:=		1.3.1
+PKG_VERSION:=		1.3.2
 PKG_RELEASE:=		1
-PKG_HASH:=		38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32
+PKG_HASH:=		d7a0654783a4da529d1bb793b7ad9c3318020af77667bcae35f95d0e42a792f3
 PKG_DESCR:=		implementation of the deflate compression method
 PKG_SECTION:=		libs/comp
 PKG_URL:=		http://www.zlib.net/

+ 2 - 2
target/linux/Config.in.kernelversion

@@ -24,7 +24,7 @@ default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_SYSTEM_ST_STM32F769
 default ADK_TARGET_LINUX_KERNEL_VERSION_5_4 if ADK_TARGET_ARCH_C6X
 default ADK_TARGET_LINUX_KERNEL_VERSION_5_15 if ADK_TARGET_ARCH_NDS32
 default ADK_TARGET_LINUX_KERNEL_VERSION_6_6 if ADK_TARGET_ARCH_IA64
-default ADK_TARGET_LINUX_KERNEL_VERSION_6_12
+default ADK_TARGET_LINUX_KERNEL_VERSION_6_18
 
 config ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	bool "git"
@@ -40,7 +40,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	select ADK_HOST_NEED_LZ4 if ADK_TARGET_SYSTEM_PHYTEC_WEGA && ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 
 config ADK_TARGET_LINUX_KERNEL_VERSION_6_18
-	bool "6.18.13"
+	bool "6.18.15"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_C6X

+ 4 - 0
target/linux/config/Config.in.virtio

@@ -22,6 +22,9 @@ config ADK_LINUX_KERNEL_VIRTIO_PCI_LEGACY
 config ADK_LINUX_KERNEL_VIRTIO_PCI
 	bool
 
+config ADK_LINUX_KERNEL_VIRTIO_INPUT
+	bool
+
 config ADK_LINUX_KERNEL_VIRTIO_MMIO
 	bool
 
@@ -80,6 +83,7 @@ config ADK_LINUX_KERNEL_DRM_VIRTIO_GPU
 	tristate "Virtio GPU support"
 	select ADK_LINUX_KERNEL_DRM_VIRTIO_GPU_KMS
 	select ADK_LINUX_KERNEL_DRM_FBDEV_EMULATION
+	select ADK_LINUX_KERNEL_VIRTIO_INPUT
 	default n
 	help
 	  Enables support for Virtio GPU driver.

+ 0 - 0
target/linux/patches/6.18.13/0001-pcmcia-Add-Hitachi-HD6446x-PCMCIA-socket-support.patch → target/linux/patches/6.18.15/0001-pcmcia-Add-Hitachi-HD6446x-PCMCIA-socket-support.patch


+ 0 - 0
target/linux/patches/6.18.13/orinoco.patch → target/linux/patches/6.18.15/orinoco.patch