Waldemar Brodkorb 7 месяцев назад
Родитель
Сommit
13e9f18e4d
3 измененных файлов с 13 добавлено и 21 удалено
  1. 9 5
      package/fltk/Makefile
  2. 4 4
      package/fltk/patches/patch-Makefile
  3. 0 12
      package/fltk/patches/patch-makeinclude_in

+ 9 - 5
package/fltk/Makefile

@@ -4,19 +4,20 @@
 include $(ADK_TOPDIR)/rules.mk
 include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		fltk
 PKG_NAME:=		fltk
-PKG_VERSION:=		1.3.8
+PKG_VERSION:=		1.3.11
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
-PKG_HASH:=		f3c1102b07eb0e7a50538f9fc9037c18387165bc70d4b626e94ab725b9d4d1bf
+PKG_HASH:=		92805abc84505e3e7e27aec775ab0754ecb4182fe2d8ff2a9d568ccdcb2811ac
 PKG_DESCR:=		fast light toolkit
 PKG_DESCR:=		fast light toolkit
 PKG_SECTION:=		libs/misc
 PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		mesa libx11 libxi freeglut libfreetype
 PKG_DEPENDS:=		mesa libx11 libxi freeglut libfreetype
 PKG_BUILDDEP:=		libX11 libXi mesa freeglut freetype
 PKG_BUILDDEP:=		libX11 libXi mesa freeglut freetype
+PKG_NEEDS:=		locale
 PKG_URL:=		http://www.fltk.org/
 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_LIBNAME:=		libfltk
 PKG_OPTS:=		dev
 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
 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}))
 $(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:
 libfltk-install:
 	$(INSTALL_DIR) $(IDIR_LIBFLTK)/usr/lib
 	$(INSTALL_DIR) $(IDIR_LIBFLTK)/usr/lib

+ 4 - 4
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
  include makeinclude
  
  
 -DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
 -DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
-+DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation
++DIRS = $(IMAGEDIRS) src $(CAIRODIR)
  
  
  all: makeinclude fltk-config
  all: makeinclude fltk-config
  	for dir in $(DIRS); do\
  	for dir in $(DIRS); do\

+ 0 - 12
package/fltk/patches/patch-makeinclude_in

@@ -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)
-