solus
/
iup-stack-solus
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

update to linux kernel 6.3

This commit is contained in:
Alexander Zhirov 2023-08-01 21:34:01 +03:00
parent 8680745257
commit 16edb9152b
22 changed files with 1295 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

621
iup/files/0002-fix-lua-sfx.patch Normal file
View File

@ -0,0 +1,621 @@
diff --git a/srclua5/config.mak b/srclua5/config.mak
index 77a8920..ebc4669 100755
--- a/srclua5/config.mak
+++ b/srclua5/config.mak
@@ -49,7 +49,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
ifdef NO_LUAOBJECT
DEFINES += IUPLUA_USELH
USE_LH_SUBDIR = Yes
@@ -57,7 +57,7 @@ ifdef NO_LUAOBJECT
else
DEFINES += IUPLUA_USELOH
USE_LOH_SUBDIR = Yes
- LOHDIR = loh$(LUASFX)
+ LOHDIR = loh
endif
CTRLUA = button.lua canvas.lua dialog.lua colordlg.lua clipboard.lua \
diff --git a/srclua5/iup_mglplot.mak b/srclua5/iup_mglplot.mak
index 3c3407c..c20f783 100755
--- a/srclua5/iup_mglplot.mak
+++ b/srclua5/iup_mglplot.mak
@@ -53,7 +53,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
ifdef NO_LUAOBJECT
DEFINES += IUPLUA_USELH
USE_LH_SUBDIR = Yes
@@ -61,7 +61,7 @@ ifdef NO_LUAOBJECT
else
DEFINES += IUPLUA_USELOH
USE_LOH_SUBDIR = Yes
- LOHDIR = loh$(LUASFX)
+ LOHDIR = loh
endif
SRCLUA = mglplot.lua mgllabel.lua
diff --git a/srclua5/iup_plot.mak b/srclua5/iup_plot.mak
index b2af19d..21d1311 100755
--- a/srclua5/iup_plot.mak
+++ b/srclua5/iup_plot.mak
@@ -54,7 +54,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
ifdef NO_LUAOBJECT
DEFINES += IUPLUA_USELH
USE_LH_SUBDIR = Yes
@@ -62,7 +62,7 @@ ifdef NO_LUAOBJECT
else
DEFINES += IUPLUA_USELOH
USE_LOH_SUBDIR = Yes
- LOHDIR = loh$(LUASFX)
+ LOHDIR = loh
endif
SRCLUA = plot.lua
diff --git a/srclua5/iup_scintilla.mak b/srclua5/iup_scintilla.mak
index 502bf59..f8ac363 100755
--- a/srclua5/iup_scintilla.mak
+++ b/srclua5/iup_scintilla.mak
@@ -53,7 +53,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
ifdef NO_LUAOBJECT
DEFINES += IUPLUA_USELH
USE_LH_SUBDIR = Yes
@@ -61,7 +61,7 @@ ifdef NO_LUAOBJECT
else
DEFINES += IUPLUA_USELOH
USE_LOH_SUBDIR = Yes
- LOHDIR = loh$(LUASFX)
+ LOHDIR = loh
endif
SRCLUA = scintilla.lua scintilladlg.lua
diff --git a/srclua5/iupcd.mak b/srclua5/iupcd.mak
index 429cd3e..38f0be0 100755
--- a/srclua5/iupcd.mak
+++ b/srclua5/iupcd.mak
@@ -55,8 +55,8 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
-LIBS = iuplua$(LUASFX)
+LIBNAME := $(LIBNAME)
+LIBS = iuplua
ifneq ($(findstring MacOS, $(TEC_UNAME)), )
USE_IUPLUA:=
diff --git a/srclua5/iupcontrols.mak b/srclua5/iupcontrols.mak
index cb00b95..3174b4b 100755
--- a/srclua5/iupcontrols.mak
+++ b/srclua5/iupcontrols.mak
@@ -54,7 +54,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
ifdef NO_LUAOBJECT
DEFINES += IUPLUA_USELH
USE_LH_SUBDIR = Yes
@@ -62,7 +62,7 @@ ifdef NO_LUAOBJECT
else
DEFINES += IUPLUA_USELOH
USE_LOH_SUBDIR = Yes
- LOHDIR = loh$(LUASFX)
+ LOHDIR = loh
endif
SRCLUA = matrix.lua matrixlist.lua matrixex.lua cells.lua
diff --git a/srclua5/iupfiledlg.mak b/srclua5/iupfiledlg.mak
index 6c6cf98..dc78e37 100755
--- a/srclua5/iupfiledlg.mak
+++ b/srclua5/iupfiledlg.mak
@@ -51,7 +51,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
SRC = ctrl/iuplua_filedlg.c
diff --git a/srclua5/iupgl.mak b/srclua5/iupgl.mak
index f633c1c..aace8f5 100755
--- a/srclua5/iupgl.mak
+++ b/srclua5/iupgl.mak
@@ -52,7 +52,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
ifdef NO_LUAOBJECT
DEFINES += IUPLUA_USELH
USE_LH_SUBDIR = Yes
@@ -60,11 +60,11 @@ ifdef NO_LUAOBJECT
else
DEFINES += IUPLUA_USELOH
USE_LOH_SUBDIR = Yes
- LOHDIR = loh$(LUASFX)
+ LOHDIR = loh
endif
SRCLUA = glcanvas.lua glbackgroundbox.lua
-LIBS = iupgl iuplua$(LUASFX)
+LIBS = iupgl iuplua
GC = $(addsuffix .c, $(basename $(SRCLUA)))
GC := $(addprefix ctrl/il_, $(GC))
diff --git a/srclua5/iupglcontrols.mak b/srclua5/iupglcontrols.mak
index e6469f9..c28d2a4 100755
--- a/srclua5/iupglcontrols.mak
+++ b/srclua5/iupglcontrols.mak
@@ -16,7 +16,7 @@ USE_IUP3 = Yes
USE_IUPLUA = Yes
INCLUDES = ../src gl ../srclua5
-LIBS = iupglcontrols iuplua$(LUASFX)
+LIBS = iupglcontrols iuplua
DEF_FILE = gl/iupluaglcontrols.def
ifdef USE_LUA_VERSION
@@ -53,7 +53,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
ifdef NO_LUAOBJECT
DEFINES += IUPLUA_USELH
USE_LH_SUBDIR = Yes
@@ -61,7 +61,7 @@ ifdef NO_LUAOBJECT
else
DEFINES += IUPLUA_USELOH
USE_LOH_SUBDIR = Yes
- LOHDIR = loh$(LUASFX)
+ LOHDIR = loh
endif
SRCLUA = glcanvasbox.lua glsubcanvas.lua gllabel.lua glbutton.lua \
diff --git a/srclua5/iupim.mak b/srclua5/iupim.mak
index d2eb2d4..dd4f94f 100755
--- a/srclua5/iupim.mak
+++ b/srclua5/iupim.mak
@@ -53,7 +53,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
ifneq ($(findstring MacOS, $(TEC_UNAME)), )
USE_IUPLUA:=
diff --git a/srclua5/iupimglib.mak b/srclua5/iupimglib.mak
index fb56ad6..e039330 100755
--- a/srclua5/iupimglib.mak
+++ b/srclua5/iupimglib.mak
@@ -51,7 +51,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
ifneq ($(findstring MacOS, $(TEC_UNAME)), )
USE_IUPLUA:=
diff --git a/srclua5/iupluascripterdlg.mak b/srclua5/iupluascripterdlg.mak
index 56ae104..18a3676 100755
--- a/srclua5/iupluascripterdlg.mak
+++ b/srclua5/iupluascripterdlg.mak
@@ -53,7 +53,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
ifdef NO_LUAOBJECT
DEFINES += IUPLUA_USELH
USE_LH_SUBDIR = Yes
@@ -61,7 +61,7 @@ ifdef NO_LUAOBJECT
else
DEFINES += IUPLUA_USELOH
USE_LOH_SUBDIR = Yes
- LOHDIR = loh$(LUASFX)
+ LOHDIR = loh
endif
SRCLUA_CTRL = luascripterdlg.lua
diff --git a/srclua5/iupole.mak b/srclua5/iupole.mak
index 0b625b6..acc2c9e 100755
--- a/srclua5/iupole.mak
+++ b/srclua5/iupole.mak
@@ -52,7 +52,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
ifdef NO_LUAOBJECT
DEFINES += IUPLUA_USELH
USE_LH_SUBDIR = Yes
@@ -60,7 +60,7 @@ ifdef NO_LUAOBJECT
else
DEFINES += IUPLUA_USELOH
USE_LOH_SUBDIR = Yes
- LOHDIR = loh$(LUASFX)
+ LOHDIR = loh
endif
SRCLUA = olecontrol.lua
diff --git a/srclua5/iuptuio.mak b/srclua5/iuptuio.mak
index 853430c..a46ce42 100755
--- a/srclua5/iuptuio.mak
+++ b/srclua5/iuptuio.mak
@@ -53,7 +53,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
ifdef NO_LUAOBJECT
DEFINES += IUPLUA_USELH
USE_LH_SUBDIR = Yes
@@ -61,7 +61,7 @@ ifdef NO_LUAOBJECT
else
DEFINES += IUPLUA_USELOH
USE_LOH_SUBDIR = Yes
- LOHDIR = loh$(LUASFX)
+ LOHDIR = loh
endif
SRCLUA = tuioclient.lua
diff --git a/srclua5/iupweb.mak b/srclua5/iupweb.mak
index 9d7dff2..40be99c 100755
--- a/srclua5/iupweb.mak
+++ b/srclua5/iupweb.mak
@@ -53,7 +53,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
ifdef NO_LUAOBJECT
DEFINES += IUPLUA_USELH
USE_LH_SUBDIR = Yes
@@ -61,7 +61,7 @@ ifdef NO_LUAOBJECT
else
DEFINES += IUPLUA_USELOH
USE_LOH_SUBDIR = Yes
- LOHDIR = loh$(LUASFX)
+ LOHDIR = loh
endif
SRCLUA = webbrowser.lua
diff --git a/srcluaconsole/config.mak b/srcluaconsole/config.mak
index 12baea3..213a1e1 100755
--- a/srcluaconsole/config.mak
+++ b/srcluaconsole/config.mak
@@ -57,7 +57,7 @@ endif
endif
endif
-APPNAME := $(APPNAME)$(LUASFX)
+APPNAME := $(APPNAME)
SRC = iup_lua.c
ifdef NO_LUAOBJECT
@@ -67,7 +67,7 @@ ifdef NO_LUAOBJECT
else
DEFINES += IUPLUA_USELOH
USE_LOH_SUBDIR = Yes
- LOHDIR = loh$(LUASFX)
+ LOHDIR = loh
endif
ifdef GTK_DEFAULT
@@ -128,16 +128,16 @@ ifdef ALL_STATIC
USE_CDLUA = Yes
USE_IUPCONTROLS = Yes
ifneq ($(findstring Win, $(TEC_SYSNAME)), )
- LIBS += iuplua_plot$(LUASFX) iup_plot cdgl cdcontextplus
+ LIBS += iuplua_plot iup_plot cdgl cdcontextplus
else
- SLIB += $(IUP_LIB)/Lua$(LUASFX)/libiuplua_plot$(LUASFX).a $(IUP_LIB)/libiup_plot.a $(CD_LIB)/libcdgl.a $(CD_LIB)/libcdcontextplus.a
+ SLIB += $(IUP_LIB)/Lua/libiuplua_plot.a $(IUP_LIB)/libiup_plot.a $(CD_LIB)/libcdgl.a $(CD_LIB)/libcdcontextplus.a
endif
ifndef IUPLUA_NO_IM
ifneq ($(findstring Win, $(TEC_SYSNAME)), )
- LIBS += cdluaim$(LUASFX) cdim$(LUASFX)
+ LIBS += cdluaim cdim
else
- SLIB += $(CD_LIB)/Lua$(LUASFX)/libcdluaim$(LUASFX).a $(CD_LIB)/libcdim.a
+ SLIB += $(CD_LIB)/Lua/libcdluaim.a $(CD_LIB)/libcdim.a
endif
endif
ifneq ($(findstring Win, $(TEC_SYSNAME)), )
@@ -157,9 +157,9 @@ ifdef ALL_STATIC
ifndef IUPLUA_NO_IM
USE_IMLUA = Yes
ifneq ($(findstring Win, $(TEC_SYSNAME)), )
- LIBS += imlua_process$(LUASFX) iupluaim$(LUASFX) im_process iupim
+ LIBS += imlua_process iupluaim im_process iupim
else
- SLIB += $(IM_LIB)/Lua$(LUASFX)/libimlua_process$(LUASFX).a $(IUP_LIB)/Lua$(LUASFX)/libiupluaim$(LUASFX).a $(IM_LIB)/libim_process.a $(IUP_LIB)/libiupim.a
+ SLIB += $(IM_LIB)/Lua/libimlua_process.a $(IUP_LIB)/Lua/libiupluaim.a $(IM_LIB)/libim_process.a $(IUP_LIB)/libiupim.a
endif
else
DEFINES += IUPLUA_NO_IM
@@ -169,9 +169,9 @@ ifdef ALL_STATIC
ifdef IUPLUA_IMGLIB
DEFINES += IUPLUA_IMGLIB
ifneq ($(findstring Win, $(TEC_SYSNAME)), )
- LIBS += iupluaimglib$(LUASFX) iupimglib
+ LIBS += iupluaimglib iupimglib
else
- SLIB += $(IUP_LIB)/Lua$(LUASFX)/libiupluaimglib$(LUASFX).a $(IUP_LIB)/libiupimglib.a
+ SLIB += $(IUP_LIB)/Lua/libiupluaimglib.a $(IUP_LIB)/libiupimglib.a
endif
endif
@@ -179,10 +179,10 @@ ifdef ALL_STATIC
ifdef IUPLUA_TUIO
DEFINES += IUPLUA_TUIO
ifneq ($(findstring Win, $(TEC_SYSNAME)), )
- LIBS += iupluatuio$(LUASFX) iuptuio
+ LIBS += iupluatuio iuptuio
LIBS += ws2_32 winmm
else
- SLIB += $(IUP_LIB)/Lua$(LUASFX)/libiupluatuio$(LUASFX).a $(IUP_LIB)/libiuptuio.a
+ SLIB += $(IUP_LIB)/Lua/libiupluatuio.a $(IUP_LIB)/libiuptuio.a
endif
endif
else
@@ -192,7 +192,7 @@ else
USE_DLL = Yes
GEN_MANIFEST = No
else
- LDIR += $(IUP_LIB)/Lua$(LUASFX)
+ LDIR += $(IUP_LIB)/Lua
ifneq ($(findstring cygw, $(TEC_UNAME)), )
# Except in Cygwin
else
diff --git a/srcluascripter/config.mak b/srcluascripter/config.mak
index 76300c6..a2dcfb9 100755
--- a/srcluascripter/config.mak
+++ b/srcluascripter/config.mak
@@ -54,7 +54,7 @@ endif
endif
endif
-APPNAME := $(APPNAME)$(LUASFX)
+APPNAME := $(APPNAME)
SRC = iupluascripter.c
INCLUDES = ../include
@@ -84,9 +84,9 @@ ifdef ALL_STATIC
endif
ifneq ($(findstring Win, $(TEC_SYSNAME)), )
- LIBS += iupluascripterdlg$(LUASFX) iupimglib iup_scintilla imm32
+ LIBS += iupluascripterdlg iupimglib iup_scintilla imm32
else
- SLIB += $(IUP_LIB)/Lua$(LUASFX)/libiupluascripterdlg$(LUASFX).a \
+ SLIB += $(IUP_LIB)/Lua/libiupluascripterdlg.a \
$(IUP_LIB)/libiup_scintilla.a \
$(IUP_LIB)/libiupimglib.a
endif
@@ -94,9 +94,9 @@ ifdef ALL_STATIC
DEFINES += USE_STATIC
ifneq ($(findstring Win, $(TEC_SYSNAME)), )
- LIBS += iuplua_scintilla$(LUASFX)
+ LIBS += iuplua_scintilla
else
- SLIB += $(IUP_LIB)/Lua$(LUASFX)/libiuplua_scintilla$(LUASFX).a
+ SLIB += $(IUP_LIB)/Lua/libiuplua_scintilla.a
endif
ifeq "$(TEC_UNAME)" "SunOS510x86"
@@ -116,16 +116,16 @@ ifdef ALL_STATIC
USE_CDLUA = Yes
USE_IUPCONTROLS = Yes
ifneq ($(findstring Win, $(TEC_SYSNAME)), )
- LIBS += iuplua_plot$(LUASFX) iup_plot cdgl cdcontextplus
+ LIBS += iuplua_plot iup_plot cdgl cdcontextplus
else
- SLIB += $(IUP_LIB)/Lua$(LUASFX)/libiuplua_plot$(LUASFX).a $(IUP_LIB)/libiup_plot.a $(CD_LIB)/libcdgl.a $(CD_LIB)/libcdcontextplus.a
+ SLIB += $(IUP_LIB)/Lua/libiuplua_plot.a $(IUP_LIB)/libiup_plot.a $(CD_LIB)/libcdgl.a $(CD_LIB)/libcdcontextplus.a
endif
ifndef IUPLUA_NO_IM
ifneq ($(findstring Win, $(TEC_SYSNAME)), )
- LIBS += cdluaim$(LUASFX) cdim$(LUASFX)
+ LIBS += cdluaim cdim
else
- SLIB += $(CD_LIB)/Lua$(LUASFX)/libcdluaim$(LUASFX).a $(CD_LIB)/libcdim.a
+ SLIB += $(CD_LIB)/Lua/libcdluaim.a $(CD_LIB)/libcdim.a
endif
endif
else
@@ -136,9 +136,9 @@ ifdef ALL_STATIC
ifndef IUPLUA_NO_IM
USE_IMLUA = Yes
ifneq ($(findstring Win, $(TEC_SYSNAME)), )
- LIBS += imlua_process$(LUASFX) iupluaim$(LUASFX) im_process iupim
+ LIBS += imlua_process iupluaim im_process iupim
else
- SLIB += $(IM_LIB)/Lua$(LUASFX)/libimlua_process$(LUASFX).a $(IUP_LIB)/Lua$(LUASFX)/libiupluaim$(LUASFX).a $(IM_LIB)/libim_process.a $(IUP_LIB)/libiupim.a
+ SLIB += $(IM_LIB)/Lua/libimlua_process.a $(IUP_LIB)/Lua/libiupluaim.a $(IM_LIB)/libim_process.a $(IUP_LIB)/libiupim.a
endif
else
DEFINES += IUPLUA_NO_IM
@@ -148,9 +148,9 @@ ifdef ALL_STATIC
ifdef IUPLUA_IMGLIB
DEFINES += IUPLUA_IMGLIB
ifneq ($(findstring Win, $(TEC_SYSNAME)), )
- LIBS += iupluaimglib$(LUASFX)
+ LIBS += iupluaimglib
else
- SLIB += $(IUP_LIB)/Lua$(LUASFX)/libiupluaimglib$(LUASFX).a
+ SLIB += $(IUP_LIB)/Lua/libiupluaimglib.a
endif
endif
@@ -164,10 +164,10 @@ ifdef ALL_STATIC
ifdef IUPLUA_TUIO
DEFINES += IUPLUA_TUIO
ifneq ($(findstring Win, $(TEC_SYSNAME)), )
- LIBS += iupluatuio$(LUASFX) iuptuio
+ LIBS += iupluatuio iuptuio
LIBS += ws2_32 winmm
else
- SLIB += $(IUP_LIB)/Lua$(LUASFX)/libiupluatuio$(LUASFX).a $(IUP_LIB)/libiuptuio.a
+ SLIB += $(IUP_LIB)/Lua/libiupluatuio.a $(IUP_LIB)/libiuptuio.a
endif
endif
else
@@ -176,10 +176,10 @@ else
# Must call "tecmake dll10" so USE_* will use the correct TEC_UNAME
USE_DLL = Yes
GEN_MANIFEST = No
- LIBS += iupluascripterdlg$(LUASFX) iupimglib iup_scintilla imm32
+ LIBS += iupluascripterdlg iupimglib iup_scintilla imm32
else
- LDIR += $(IUP_LIB)/Lua$(LUASFX)
- LIBS += iupluascripterdlg$(LUASFX) iupimglib iup_scintilla
+ LDIR += $(IUP_LIB)/Lua
+ LIBS += iupluascripterdlg iupimglib iup_scintilla
ifneq ($(findstring cygw, $(TEC_UNAME)), )
# Except in Cygwin
else
diff --git a/tecmake.mak b/tecmake.mak
index 48991a4..03df592 100755
--- a/tecmake.mak
+++ b/tecmake.mak
@@ -478,12 +478,12 @@ endif
ifdef USE_OLDLIBLUA
TEC_UNAME_LIBLUA_DIR ?= $(TEC_UNAME_LIB_DIR)
else
- TEC_UNAME_LIBLUA_DIR ?= $(TEC_UNAME_LIB_DIR)/Lua$(LIBLUA_SFX)
+ TEC_UNAME_LIBLUA_DIR ?= $(TEC_UNAME_LIB_DIR)/Lua
endif
# Subfolder for Lua Modules
ifdef LUAMOD_DIR
- TEC_UNAME_DIR := $(TEC_UNAME_DIR)/Lua$(LIBLUA_SFX)
+ TEC_UNAME_DIR := $(TEC_UNAME_DIR)/Lua
endif
OBJDIR := $(OBJROOT)/$(TEC_UNAME_DIR)
@@ -941,9 +941,9 @@ ifdef USE_IUPCONTROLS
ifdef USE_IUPLUA
ifdef USE_STATIC
- SLIB += $(IUPLUA_LIB)/libiupluacontrols$(LIBLUA_SFX).a
+ SLIB += $(IUPLUA_LIB)/libiupluacontrols.a
else
- LIBS += iupluacontrols$(LIBLUA_SFX)
+ LIBS += iupluacontrols
endif
override USE_CDLUA = Yes
endif
@@ -964,9 +964,9 @@ ifdef USE_IUPGLCONTROLS
ifdef USE_IUPLUA
ifdef USE_STATIC
- SLIB += $(IUPLUA_LIB)/libiupluaglcontrols$(LIBLUA_SFX).a
+ SLIB += $(IUPLUA_LIB)/libiupluaglcontrols.a
else
- LIBS += iupluaglcontrols$(LIBLUA_SFX)
+ LIBS += iupluaglcontrols
endif
endif
@@ -983,9 +983,9 @@ ifdef USE_IUPWEB
ifdef USE_IUPLUA
ifdef USE_STATIC
- SLIB += $(IUPLUA_LIB)/libiupluaweb$(LIBLUA_SFX).a
+ SLIB += $(IUPLUA_LIB)/libiupluaweb.a
else
- LIBS += iupluaweb$(LIBLUA_SFX)
+ LIBS += iupluaweb
endif
endif
@@ -1000,9 +1000,9 @@ ifdef USE_IMLUA
override USE_IM = Yes
IMLUA_LIB ?= $(IM)/lib/$(TEC_UNAME_LIBLUA_DIR)
ifdef USE_STATIC
- SLIB += $(IMLUA_LIB)/libimlua$(LIBLUA_SFX).a
+ SLIB += $(IMLUA_LIB)/libimlua.a
else
- LIBS += imlua$(LIBLUA_SFX)
+ LIBS += imlua
LDIR += $(IMLUA_LIB)
endif
endif
@@ -1011,9 +1011,9 @@ ifdef USE_CDLUA
override USE_CD = Yes
CDLUA_LIB ?= $(CD)/lib/$(TEC_UNAME_LIBLUA_DIR)
ifdef USE_STATIC
- SLIB += $(CDLUA_LIB)/libcdlua$(LIBLUA_SFX).a
+ SLIB += $(CDLUA_LIB)/libcdlua.a
else
- LIBS += cdlua$(LIBLUA_SFX)
+ LIBS += cdlua
LDIR += $(CDLUA_LIB)
endif
endif
@@ -1025,27 +1025,27 @@ ifdef USE_IUPLUA
ifdef USE_STATIC
ifdef USE_CD
ifeq ($(findstring iupluacd, $(LIBNAME)), )
- SLIB += $(IUPLUA_LIB)/libiupluacd$(LIBLUA_SFX).a
+ SLIB += $(IUPLUA_LIB)/libiupluacd.a
endif
endif
ifdef USE_OPENGL
ifeq ($(findstring iupluagl, $(LIBNAME)), )
- SLIB += $(IUPLUA_LIB)/libiupluagl$(LIBLUA_SFX).a
+ SLIB += $(IUPLUA_LIB)/libiupluagl.a
endif
endif
- SLIB += $(IUPLUA_LIB)/libiuplua$(LIBLUA_SFX).a
+ SLIB += $(IUPLUA_LIB)/libiuplua.a
else
ifdef USE_CD
ifeq ($(findstring iupluacd, $(LIBNAME)), )
- LIBS += iupluacd$(LIBLUA_SFX)
+ LIBS += iupluacd
endif
endif
ifdef USE_OPENGL
ifeq ($(findstring iupluagl, $(LIBNAME)), )
- LIBS += iupluagl$(LIBLUA_SFX)
+ LIBS += iupluagl
endif
endif
- LIBS += iuplua$(LIBLUA_SFX)
+ LIBS += iuplua
LDIR += $(IUPLUA_LIB)
endif
endif

15
iup/files/0003-shared-links.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/tecmake.mak b/tecmake.mak
index 03df592..ef029bb 100755
--- a/tecmake.mak
+++ b/tecmake.mak
@@ -1667,7 +1667,9 @@ dynamic-lib: $(TARGETDIR)/$(TARGETDLIBNAME)
$(TARGETDIR)/$(TARGETDLIBNAME) : $(LUAS) $(OBJS) $(EXTRADEPS)
@echo ''; echo Tecmake: linking $(@F) ...
- $(ECHO)$(LD) $(STDLDFLAGS) -o $@ $(OBJS) $(SLIB) $(LFLAGS)
+ $(ECHO)$(LD) $(STDLDFLAGS) -Wl,-soname,$(@F).3 -o $@.3.30 $(OBJS) $(SLIB) $(LFLAGS)
+ @echo ''; ln -sv $(@F).3.30 $@.3
+ @echo ''; ln -sv $(@F).3 $@
@echo ''; echo 'Tecmake: Dynamic Library ($@) Done.'; echo ''

11
iup/files/iup.pc Normal file
View File

@ -0,0 +1,11 @@
prefix=/usr
exec_prefix=${prefix}
libdir=/usr/lib64
includedir=${prefix}/include
Name: IUP
Version: 3.30
Description: IUP is a multi-platform toolkit for building graphical user interfaces
Requires:
Libs: -L${libdir} -liup -liup_mglplot -liup_plot -liup_scintilla -liupcd -liupcontrols -liupgl -liupglcontrols -liupim -liupimglib -liuptuio -liupweb
Cflags: -I${includedir}

11
iup/files/iuplua.pc Normal file
View File

@ -0,0 +1,11 @@
prefix=/usr
exec_prefix=${prefix}
libdir=/usr/lib64
includedir=${prefix}/include
Name: IUP
Version: 3.30
Description: IUP is a multi-platform toolkit for building graphical user interfaces
Requires:
Libs: -L${libdir} -liuplua -liuplua_mglplot -liuplua_plot -liuplua_scintilla -liupluacd -liupluacontrols -liupluagl -liupluaglcontrols -liupluaim -liupluaimglib -liupluascripterdlg -liupluatuio -liupluaweb
Cflags: -I${includedir}

44
iup/package.yml
View File

@ -22,17 +22,9 @@ builddeps :
patterns :
- lua :
- /usr/bin/iuplua*
- /usr/lib64/libiuplua*.so
- /usr/share/applications/iupluascripter.desktop
- /usr/share/applications/iuplua.desktop
- /usr/share/icons/iuplua.png
- /usr/lib64/*.so
- /usr/bin/{iupvled,iupview,ledc}
- /usr/share/applications/iupvled.desktop
- /usr/share/applications/iupview.desktop
- /usr/share/icons/iup.png
- devel :
- /usr/include
- /usr/lib64/libiuplua*.so.*
- /usr/share/applications/iuplua*
- /usr/share/icons/iuplua*
environment:
export USE_PKGCONFIG=Yes
export USE_LUA_VERSION=53
@ -49,22 +41,20 @@ environment:
export FTGL_INC=/usr/include
setup : |
%patch -p1 < $pkgfiles/0001-Disabling-static-linux6-support.patch
%patch -p1 < $pkgfiles/0002-fix-lua-sfx.patch
%patch -p1 < $pkgfiles/0003-shared-links.patch
build : |
%make -j1
install : |
install -dm00755 $installdir/usr/lib64
install -Dm00755 lib/Linux62_64/*.so $installdir/usr/lib64/
install -Dm00755 lib/Linux62_64/Lua53/*.so $installdir/usr/lib64/
install -m00755 lib/Linux62_64/*.so $installdir/usr/lib64/
install -dm00755 $installdir/usr/bin
install -m00755 bin/Linux62_64/{iupview,iupvled,ledc} $installdir/usr/bin
install -m00755 bin/Linux62_64/Lua53/iuplua53 $installdir/usr/bin/iuplua
install -m00755 bin/Linux62_64/Lua53/iupluascripter53 $installdir/usr/bin/iupluascripter
install -dm00755 $installdir/usr/include
install -m00755 include/* $installdir/usr/include
install -Dm00644 $pkgfiles/iupvled.desktop $installdir/usr/share/applications/iupvled.desktop
install -Dm00644 $pkgfiles/iupview.desktop $installdir/usr/share/applications/iupview.desktop
install -Dm00644 $pkgfiles/iupluascripter.desktop $installdir/usr/share/applications/iupluascripter.desktop
install -Dm00644 $pkgfiles/iuplua.desktop $installdir/usr/share/applications/iuplua.desktop
install -Dm00644 $pkgfiles/tecgraf-logo.png $installdir/usr/share/icons/iup.png
install -Dm00644 $pkgfiles/tecgraf-logo.png $installdir/usr/share/icons/iuplua.png
install -dm00755 $installdir/usr/{bin,lib64/pkgconfig,include,share/{icons,applications}}
install -m00644 $pkgfiles/*.pc $installdir/usr/lib64/pkgconfig
rm lib/Linux63_64/{*.a,Lua/*.a}
chmod -R 00755 lib/Linux63_64/*
mv lib/Linux63_64/*.* $installdir/usr/lib64/
mv lib/Linux63_64/Lua/*.* $installdir/usr/lib64/
install -m00644 include/* $installdir/usr/include
install -m00755 bin/Linux63_64/{iupview,iupvled,ledc} $installdir/usr/bin
install -m00755 bin/Linux63_64/Lua/{iuplua,iupluascripter} $installdir/usr/bin
install -m00644 $pkgfiles/*.desktop $installdir/usr/share/applications
install -m00644 $pkgfiles/tecgraf-logo.png $installdir/usr/share/icons/iup.png
install -m00644 $pkgfiles/tecgraf-logo.png $installdir/usr/share/icons/iuplua.png

246
libcd/files/0002-fix-lua-sfx.patch Normal file
View File

@ -0,0 +1,246 @@
diff --git a/src/cdlua5.mak b/src/cdlua5.mak
index e6631ef..0c2ba4e 100755
--- a/src/cdlua5.mak
+++ b/src/cdlua5.mak
@@ -31,7 +31,7 @@ ifdef USE_LUA54
LIBNAME := $(LIBNAME)54
else
ifdef USE_LUA53
- LIBNAME := $(LIBNAME)53
+ LIBNAME := $(LIBNAME)
else
ifdef USE_LUA52
LIBNAME := $(LIBNAME)52
diff --git a/src/cdluacairo5.mak b/src/cdluacairo5.mak
index dea11d2..23bc79e 100755
--- a/src/cdluacairo5.mak
+++ b/src/cdluacairo5.mak
@@ -33,7 +33,7 @@ ifdef USE_LUA54
LIBNAME := $(LIBNAME)54
else
ifdef USE_LUA53
- LIBNAME := $(LIBNAME)53
+ LIBNAME := $(LIBNAME)
else
ifdef USE_LUA52
LIBNAME := $(LIBNAME)52
diff --git a/src/cdluacontextplus5.mak b/src/cdluacontextplus5.mak
index bdb05d8..16b6974 100755
--- a/src/cdluacontextplus5.mak
+++ b/src/cdluacontextplus5.mak
@@ -43,7 +43,7 @@ ifdef USE_LUA54
LIBNAME := $(LIBNAME)54
else
ifdef USE_LUA53
- LIBNAME := $(LIBNAME)53
+ LIBNAME := $(LIBNAME)
else
ifdef USE_LUA52
LIBNAME := $(LIBNAME)52
diff --git a/src/cdluadirect2d5.mak b/src/cdluadirect2d5.mak
index 244a52e..9252d53 100755
--- a/src/cdluadirect2d5.mak
+++ b/src/cdluadirect2d5.mak
@@ -33,7 +33,7 @@ ifdef USE_LUA54
LIBNAME := $(LIBNAME)54
else
ifdef USE_LUA53
- LIBNAME := $(LIBNAME)53
+ LIBNAME := $(LIBNAME)
else
ifdef USE_LUA52
LIBNAME := $(LIBNAME)52
diff --git a/src/cdluagl5.mak b/src/cdluagl5.mak
index 61ed576..fa4f76c 100755
--- a/src/cdluagl5.mak
+++ b/src/cdluagl5.mak
@@ -33,7 +33,7 @@ ifdef USE_LUA54
LIBNAME := $(LIBNAME)54
else
ifdef USE_LUA53
- LIBNAME := $(LIBNAME)53
+ LIBNAME := $(LIBNAME)
else
ifdef USE_LUA52
LIBNAME := $(LIBNAME)52
diff --git a/src/cdluaim5.mak b/src/cdluaim5.mak
index 4858162..8fa930d 100755
--- a/src/cdluaim5.mak
+++ b/src/cdluaim5.mak
@@ -32,7 +32,7 @@ ifdef USE_LUA54
LIBNAME := $(LIBNAME)54
else
ifdef USE_LUA53
- LIBNAME := $(LIBNAME)53
+ LIBNAME := $(LIBNAME)
else
ifdef USE_LUA52
LIBNAME := $(LIBNAME)52
diff --git a/src/cdluapdf5.mak b/src/cdluapdf5.mak
index fae16fb..f7f0efd 100755
--- a/src/cdluapdf5.mak
+++ b/src/cdluapdf5.mak
@@ -33,7 +33,7 @@ ifdef USE_LUA54
LIBNAME := $(LIBNAME)54
else
ifdef USE_LUA53
- LIBNAME := $(LIBNAME)53
+ LIBNAME := $(LIBNAME)
else
ifdef USE_LUA52
LIBNAME := $(LIBNAME)52
diff --git a/tecmake.mak b/tecmake.mak
index 48991a4..b712a36 100755
--- a/tecmake.mak
+++ b/tecmake.mak
@@ -478,12 +478,12 @@ endif
ifdef USE_OLDLIBLUA
TEC_UNAME_LIBLUA_DIR ?= $(TEC_UNAME_LIB_DIR)
else
- TEC_UNAME_LIBLUA_DIR ?= $(TEC_UNAME_LIB_DIR)/Lua$(LIBLUA_SFX)
+ TEC_UNAME_LIBLUA_DIR ?= $(TEC_UNAME_LIB_DIR)/Lua
endif
# Subfolder for Lua Modules
ifdef LUAMOD_DIR
- TEC_UNAME_DIR := $(TEC_UNAME_DIR)/Lua$(LIBLUA_SFX)
+ TEC_UNAME_DIR := $(TEC_UNAME_DIR)/Lua
endif
OBJDIR := $(OBJROOT)/$(TEC_UNAME_DIR)
@@ -941,9 +941,9 @@ ifdef USE_IUPCONTROLS
ifdef USE_IUPLUA
ifdef USE_STATIC
- SLIB += $(IUPLUA_LIB)/libiupluacontrols$(LIBLUA_SFX).a
+ SLIB += $(IUPLUA_LIB)/libiupluacontrols.a
else
- LIBS += iupluacontrols$(LIBLUA_SFX)
+ LIBS += iupluacontrols
endif
override USE_CDLUA = Yes
endif
@@ -964,9 +964,9 @@ ifdef USE_IUPGLCONTROLS
ifdef USE_IUPLUA
ifdef USE_STATIC
- SLIB += $(IUPLUA_LIB)/libiupluaglcontrols$(LIBLUA_SFX).a
+ SLIB += $(IUPLUA_LIB)/libiupluaglcontrols.a
else
- LIBS += iupluaglcontrols$(LIBLUA_SFX)
+ LIBS += iupluaglcontrols
endif
endif
@@ -983,9 +983,9 @@ ifdef USE_IUPWEB
ifdef USE_IUPLUA
ifdef USE_STATIC
- SLIB += $(IUPLUA_LIB)/libiupluaweb$(LIBLUA_SFX).a
+ SLIB += $(IUPLUA_LIB)/libiupluaweb.a
else
- LIBS += iupluaweb$(LIBLUA_SFX)
+ LIBS += iupluaweb
endif
endif
@@ -1000,9 +1000,9 @@ ifdef USE_IMLUA
override USE_IM = Yes
IMLUA_LIB ?= $(IM)/lib/$(TEC_UNAME_LIBLUA_DIR)
ifdef USE_STATIC
- SLIB += $(IMLUA_LIB)/libimlua$(LIBLUA_SFX).a
+ SLIB += $(IMLUA_LIB)/libimlua.a
else
- LIBS += imlua$(LIBLUA_SFX)
+ LIBS += imlua
LDIR += $(IMLUA_LIB)
endif
endif
@@ -1011,9 +1011,9 @@ ifdef USE_CDLUA
override USE_CD = Yes
CDLUA_LIB ?= $(CD)/lib/$(TEC_UNAME_LIBLUA_DIR)
ifdef USE_STATIC
- SLIB += $(CDLUA_LIB)/libcdlua$(LIBLUA_SFX).a
+ SLIB += $(CDLUA_LIB)/libcdlua.a
else
- LIBS += cdlua$(LIBLUA_SFX)
+ LIBS += cdlua
LDIR += $(CDLUA_LIB)
endif
endif
@@ -1025,27 +1025,27 @@ ifdef USE_IUPLUA
ifdef USE_STATIC
ifdef USE_CD
ifeq ($(findstring iupluacd, $(LIBNAME)), )
- SLIB += $(IUPLUA_LIB)/libiupluacd$(LIBLUA_SFX).a
+ SLIB += $(IUPLUA_LIB)/libiupluacd.a
endif
endif
ifdef USE_OPENGL
ifeq ($(findstring iupluagl, $(LIBNAME)), )
- SLIB += $(IUPLUA_LIB)/libiupluagl$(LIBLUA_SFX).a
+ SLIB += $(IUPLUA_LIB)/libiupluagl.a
endif
endif
- SLIB += $(IUPLUA_LIB)/libiuplua$(LIBLUA_SFX).a
+ SLIB += $(IUPLUA_LIB)/libiuplua.a
else
ifdef USE_CD
ifeq ($(findstring iupluacd, $(LIBNAME)), )
- LIBS += iupluacd$(LIBLUA_SFX)
+ LIBS += iupluacd
endif
endif
ifdef USE_OPENGL
ifeq ($(findstring iupluagl, $(LIBNAME)), )
- LIBS += iupluagl$(LIBLUA_SFX)
+ LIBS += iupluagl
endif
endif
- LIBS += iuplua$(LIBLUA_SFX)
+ LIBS += iuplua
LDIR += $(IUPLUA_LIB)
endif
endif
@@ -1054,19 +1054,19 @@ ifdef USE_LUA
LUA_LIB ?= $(LUA)/lib/$(TEC_UNAME)
ifdef USE_STATIC
ifndef NO_LUALIB
- SLIB += $(LUA_LIB)/liblualib$(LUA_SFX).a
+ SLIB += $(LUA_LIB)/liblualib.a
endif
- SLIB += $(LUA_LIB)/liblua$(LUA_SFX).a
+ SLIB += $(LUA_LIB)/liblua.a
else
ifndef NO_LUALIB
- LIBS += lualib$(LUA_SFX)
+ LIBS += lualib
endif
ifndef NO_LUALINK
- LIBS += lua$(LUA_SFX)
+ LIBS += lua
LDIR += $(LUA_LIB)
else
ifneq ($(findstring cygw, $(TEC_UNAME)), )
- LIBS += lua$(LUA_SFX)
+ LIBS += lua
LDIR += $(LUA_LIB)
endif
endif
@@ -1077,12 +1077,12 @@ ifdef USE_LUA
LUA_BIN ?= $(LUA)/bin/$(TEC_UNAME)
ifdef USE_BIN2C_LUA
- BIN2C := $(LUA_BIN)/lua$(LUA_SFX) $(BIN2C_PATH)bin2c.lua
+ BIN2C := $(LUA_BIN)/lua $(BIN2C_PATH)bin2c.lua
else
- BIN2C := $(LUA_BIN)/bin2c$(LUA_SFX)
+ BIN2C := $(LUA_BIN)/bin2c
endif
- LUAC := $(LUA_BIN)/luac$(LUA_SFX)
- LUABIN := $(LUA_BIN)/lua$(LUA_SFX)
+ LUAC := $(LUA_BIN)/luac
+ LUABIN := $(LUA_BIN)/lua
endif
ifdef USE_IUP

15
libcd/files/0003-shared-links.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/tecmake.mak b/tecmake.mak
index b712a36..a25844d 100755
--- a/tecmake.mak
+++ b/tecmake.mak
@@ -1667,7 +1667,9 @@ dynamic-lib: $(TARGETDIR)/$(TARGETDLIBNAME)
$(TARGETDIR)/$(TARGETDLIBNAME) : $(LUAS) $(OBJS) $(EXTRADEPS)
@echo ''; echo Tecmake: linking $(@F) ...
- $(ECHO)$(LD) $(STDLDFLAGS) -o $@ $(OBJS) $(SLIB) $(LFLAGS)
+ $(ECHO)$(LD) $(STDLDFLAGS) -Wl,-soname,$(@F).5 -o $@.5.14 $(OBJS) $(SLIB) $(LFLAGS)
+ @echo ''; ln -sv $(@F).5.14 $@.5
+ @echo ''; ln -sv $(@F).5 $@
@echo ''; echo 'Tecmake: Dynamic Library ($@) Done.'; echo ''

11
libcd/files/libcd.pc Normal file
View File

@ -0,0 +1,11 @@
prefix=/usr
exec_prefix=${prefix}
libdir=/usr/lib64
includedir=${prefix}/include
Name: CD
Version: 5.14
Description: CD is a vector graphics toolkit with device independent output
Requires:
Libs: -L${libdir} -lcd -lcdcontextplus -lcdgl -lcdim -lcdpdf
Cflags: -I${includedir}

11
libcd/files/libcdlua.pc Normal file
View File

@ -0,0 +1,11 @@
prefix=/usr
exec_prefix=${prefix}
libdir=/usr/lib64
includedir=${prefix}/include
Name: CD
Version: 5.14
Description: CD is a vector graphics toolkit with device independent output
Requires:
Libs: -L${libdir} -lcdlua -lcdluacontextplus -lcdluagl -lcdluaim -lcdluapdf
Cflags: -I${includedir}

23
libcd/package.yml
View File

@ -15,16 +15,15 @@ builddeps :
- pkgconfig(glu)
- pkgconfig(gtk+-3.0)
- pkgconfig(lua)
- pdflib-devel
- libim-devel
- libim-lua
- libpdflib-devel
- lsb-release
patterns :
- lua :
- /usr/lib64/libcdlua*.so
- /usr/lib64/*.so
- devel :
- /usr/include
- /usr/lib64/libcdlua*.so
- lua :
- /usr/lib64/libcdlua*.so.*
environment:
export USE_PKGCONFIG=Yes
export USE_LUA_VERSION=53
@ -37,11 +36,15 @@ environment:
export IM_INC=/usr/include
setup : |
%patch -p1 < $pkgfiles/0001-Linux6-support.patch
%patch -p1 < $pkgfiles/0002-fix-lua-sfx.patch
%patch -p1 < $pkgfiles/0003-shared-links.patch
build : |
%make -j1
install : |
install -dm00755 $installdir/usr/lib64
install -Dm00755 lib/Linux62_64/*.so $installdir/usr/lib64/
install -Dm00755 lib/Linux62_64/Lua53/*.so $installdir/usr/lib64/
install -dm00755 $installdir/usr/include
install -m00755 include/* $installdir/usr/include
install -dm00755 $installdir/usr/{lib64/pkgconfig,include}
install -m00644 $pkgfiles/*.pc $installdir/usr/lib64/pkgconfig
rm lib/Linux63_64/{*.a,Lua/*.a}
chmod -R 00755 lib/Linux63_64/*
mv lib/Linux63_64/*.* $installdir/usr/lib64/
mv lib/Linux63_64/Lua/* $installdir/usr/lib64/
install -m00644 include/* $installdir/usr/include/

15
libftgl/files/0001-shared-links.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/tecmake.mak b/tecmake.mak
index 48991a4..b56e14b 100755
--- a/tecmake.mak
+++ b/tecmake.mak
@@ -1667,7 +1667,9 @@ dynamic-lib: $(TARGETDIR)/$(TARGETDLIBNAME)
$(TARGETDIR)/$(TARGETDLIBNAME) : $(LUAS) $(OBJS) $(EXTRADEPS)
@echo ''; echo Tecmake: linking $(@F) ...
- $(ECHO)$(LD) $(STDLDFLAGS) -o $@ $(OBJS) $(SLIB) $(LFLAGS)
+ $(ECHO)$(LD) $(STDLDFLAGS) -Wl,-soname,$(@F).2 -o $@.2.1.5 $(OBJS) $(SLIB) $(LFLAGS)
+ @echo ''; ln -sv $(@F).2.1.5 $@.2
+ @echo ''; ln -sv $(@F).2 $@
@echo ''; echo 'Tecmake: Dynamic Library ($@) Done.'; echo ''

12
libftgl/files/ftgl.pc Normal file
View File

@ -0,0 +1,12 @@
prefix=/usr
exec_prefix=${prefix}
libdir=/usr/lib64
includedir=${prefix}/include
Name: FTGL
Description: OpenGL frontend to Freetype 2
Version: 2.1.5
Libs: -L${libdir} -lftgl
Requires.private: freetype2
Libs.private: -lGLU -lGL -lm
Cflags: -I${includedir} -I${includedir}/FTGL

16
libftgl/package.yml
View File

@ -16,10 +16,6 @@ builddeps :
- pkgconfig(glu)
- pkgconfig(lua)
- lsb-release
patterns :
- /usr/lib64/*.so
- devel :
- /usr/include
environment:
export USE_PKGCONFIG=Yes
export USE_LUA_VERSION=53
@ -28,10 +24,14 @@ environment:
export LUA_INC=/usr/include
export LUA_LIB=/usr/lib
export LUA_BIN=/usr/bin/lua
setup : |
%patch -p1 < $pkgfiles/0001-shared-links.patch
build : |
%make -j1
install : |
install -dm00755 $installdir/usr/lib64
install -Dm00755 lib/Linux62_64/*.so $installdir/usr/lib64/
install -dm00755 $installdir/usr/include/FTGL
install -Dm00755 include/FTGL/* $installdir/usr/include/FTGL
install -dm00755 $installdir/usr/{lib64/pkgconfig,include/FTGL}
install -Dm00644 $pkgfiles/ftgl.pc $installdir/usr/lib64/pkgconfig
rm lib/Linux63_64/*.a
chmod 00755 lib/Linux63_64/*
mv lib/Linux63_64/* $installdir/usr/lib64/
install -Dm00644 include/FTGL/* $installdir/usr/include/FTGL

204
libim/files/0001-fix-lua-sfx.patch Normal file
View File

@ -0,0 +1,204 @@
diff --git a/src/imlua5.mak b/src/imlua5.mak
index f137b89..dd0be3c 100755
--- a/src/imlua5.mak
+++ b/src/imlua5.mak
@@ -57,7 +57,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
ifdef NO_LUAOBJECT
DEFINES += IMLUA_USELH
USE_LH_SUBDIR = Yes
diff --git a/src/imlua_avi5.mak b/src/imlua_avi5.mak
index ff7cb22..77bebab 100755
--- a/src/imlua_avi5.mak
+++ b/src/imlua_avi5.mak
@@ -47,7 +47,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
USE_IMLUA = Yes
# To not link with the Lua dynamic library in UNIX
diff --git a/src/imlua_capture5.mak b/src/imlua_capture5.mak
index 5e11cb4..a550a0e 100755
--- a/src/imlua_capture5.mak
+++ b/src/imlua_capture5.mak
@@ -47,7 +47,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
USE_IMLUA = Yes
# To not link with the Lua dynamic library in UNIX
diff --git a/src/imlua_fftw35.mak b/src/imlua_fftw35.mak
index 5c46764..3007e02 100755
--- a/src/imlua_fftw35.mak
+++ b/src/imlua_fftw35.mak
@@ -57,7 +57,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
ifdef NO_LUAOBJECT
DEFINES += IMLUA_USELH
USE_LH_SUBDIR = Yes
diff --git a/src/imlua_jp25.mak b/src/imlua_jp25.mak
index d811c32..56bd763 100755
--- a/src/imlua_jp25.mak
+++ b/src/imlua_jp25.mak
@@ -47,7 +47,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
USE_IMLUA = Yes
# To not link with the Lua dynamic library in UNIX
diff --git a/src/imlua_process5.mak b/src/imlua_process5.mak
index 5ec9ec7..1ea6eed 100755
--- a/src/imlua_process5.mak
+++ b/src/imlua_process5.mak
@@ -62,7 +62,7 @@ ifdef USE_OPENMP
LIBNAME := $(LIBNAME)_omp
LIBS := im_process_omp
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
ifdef NO_LUAOBJECT
DEFINES += IMLUA_USELH
diff --git a/src/imlua_wmv5.mak b/src/imlua_wmv5.mak
index 38c3572..0e547f1 100755
--- a/src/imlua_wmv5.mak
+++ b/src/imlua_wmv5.mak
@@ -47,7 +47,7 @@ endif
endif
endif
-LIBNAME := $(LIBNAME)$(LUASFX)
+LIBNAME := $(LIBNAME)
IM = ..
USE_IMLUA = Yes
diff --git a/tecmake.mak b/tecmake.mak
index 48991a4..03df592 100755
--- a/tecmake.mak
+++ b/tecmake.mak
@@ -478,12 +478,12 @@ endif
ifdef USE_OLDLIBLUA
TEC_UNAME_LIBLUA_DIR ?= $(TEC_UNAME_LIB_DIR)
else
- TEC_UNAME_LIBLUA_DIR ?= $(TEC_UNAME_LIB_DIR)/Lua$(LIBLUA_SFX)
+ TEC_UNAME_LIBLUA_DIR ?= $(TEC_UNAME_LIB_DIR)/Lua
endif
# Subfolder for Lua Modules
ifdef LUAMOD_DIR
- TEC_UNAME_DIR := $(TEC_UNAME_DIR)/Lua$(LIBLUA_SFX)
+ TEC_UNAME_DIR := $(TEC_UNAME_DIR)/Lua
endif
OBJDIR := $(OBJROOT)/$(TEC_UNAME_DIR)
@@ -941,9 +941,9 @@ ifdef USE_IUPCONTROLS
ifdef USE_IUPLUA
ifdef USE_STATIC
- SLIB += $(IUPLUA_LIB)/libiupluacontrols$(LIBLUA_SFX).a
+ SLIB += $(IUPLUA_LIB)/libiupluacontrols.a
else
- LIBS += iupluacontrols$(LIBLUA_SFX)
+ LIBS += iupluacontrols
endif
override USE_CDLUA = Yes
endif
@@ -964,9 +964,9 @@ ifdef USE_IUPGLCONTROLS
ifdef USE_IUPLUA
ifdef USE_STATIC
- SLIB += $(IUPLUA_LIB)/libiupluaglcontrols$(LIBLUA_SFX).a
+ SLIB += $(IUPLUA_LIB)/libiupluaglcontrols.a
else
- LIBS += iupluaglcontrols$(LIBLUA_SFX)
+ LIBS += iupluaglcontrols
endif
endif
@@ -983,9 +983,9 @@ ifdef USE_IUPWEB
ifdef USE_IUPLUA
ifdef USE_STATIC
- SLIB += $(IUPLUA_LIB)/libiupluaweb$(LIBLUA_SFX).a
+ SLIB += $(IUPLUA_LIB)/libiupluaweb.a
else
- LIBS += iupluaweb$(LIBLUA_SFX)
+ LIBS += iupluaweb
endif
endif
@@ -1000,9 +1000,9 @@ ifdef USE_IMLUA
override USE_IM = Yes
IMLUA_LIB ?= $(IM)/lib/$(TEC_UNAME_LIBLUA_DIR)
ifdef USE_STATIC
- SLIB += $(IMLUA_LIB)/libimlua$(LIBLUA_SFX).a
+ SLIB += $(IMLUA_LIB)/libimlua.a
else
- LIBS += imlua$(LIBLUA_SFX)
+ LIBS += imlua
LDIR += $(IMLUA_LIB)
endif
endif
@@ -1011,9 +1011,9 @@ ifdef USE_CDLUA
override USE_CD = Yes
CDLUA_LIB ?= $(CD)/lib/$(TEC_UNAME_LIBLUA_DIR)
ifdef USE_STATIC
- SLIB += $(CDLUA_LIB)/libcdlua$(LIBLUA_SFX).a
+ SLIB += $(CDLUA_LIB)/libcdlua.a
else
- LIBS += cdlua$(LIBLUA_SFX)
+ LIBS += cdlua
LDIR += $(CDLUA_LIB)
endif
endif
@@ -1025,27 +1025,27 @@ ifdef USE_IUPLUA
ifdef USE_STATIC
ifdef USE_CD
ifeq ($(findstring iupluacd, $(LIBNAME)), )
- SLIB += $(IUPLUA_LIB)/libiupluacd$(LIBLUA_SFX).a
+ SLIB += $(IUPLUA_LIB)/libiupluacd.a
endif
endif
ifdef USE_OPENGL
ifeq ($(findstring iupluagl, $(LIBNAME)), )
- SLIB += $(IUPLUA_LIB)/libiupluagl$(LIBLUA_SFX).a
+ SLIB += $(IUPLUA_LIB)/libiupluagl.a
endif
endif
- SLIB += $(IUPLUA_LIB)/libiuplua$(LIBLUA_SFX).a
+ SLIB += $(IUPLUA_LIB)/libiuplua.a
else
ifdef USE_CD
ifeq ($(findstring iupluacd, $(LIBNAME)), )
- LIBS += iupluacd$(LIBLUA_SFX)
+ LIBS += iupluacd
endif
endif
ifdef USE_OPENGL
ifeq ($(findstring iupluagl, $(LIBNAME)), )
- LIBS += iupluagl$(LIBLUA_SFX)
+ LIBS += iupluagl
endif
endif
- LIBS += iuplua$(LIBLUA_SFX)
+ LIBS += iuplua
LDIR += $(IUPLUA_LIB)
endif
endif

15
libim/files/0002-shared-links.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/tecmake.mak b/tecmake.mak
index 03df592..2e8be22 100755
--- a/tecmake.mak
+++ b/tecmake.mak
@@ -1667,7 +1667,9 @@ dynamic-lib: $(TARGETDIR)/$(TARGETDLIBNAME)
$(TARGETDIR)/$(TARGETDLIBNAME) : $(LUAS) $(OBJS) $(EXTRADEPS)
@echo ''; echo Tecmake: linking $(@F) ...
- $(ECHO)$(LD) $(STDLDFLAGS) -o $@ $(OBJS) $(SLIB) $(LFLAGS)
+ $(ECHO)$(LD) $(STDLDFLAGS) -Wl,-soname,$(@F).3 -o $@.3.15 $(OBJS) $(SLIB) $(LFLAGS)
+ @echo ''; ln -sv $(@F).3.15 $@.3
+ @echo ''; ln -sv $(@F).3 $@
@echo ''; echo 'Tecmake: Dynamic Library ($@) Done.'; echo ''

11
libim/files/libim.pc Normal file
View File

@ -0,0 +1,11 @@
prefix=/usr
exec_prefix=${prefix}
libdir=/usr/lib64
includedir=${prefix}/include
Name: IM
Version: 3.15
Description: IM is a toolkit for image representation, storage, capture and processing
Requires:
Libs: -L${libdir} -lim -lim_fftw3 -lim_jp2 -lim_process -lim_process_omp
Cflags: -I${includedir}

11
libim/files/libimlua.pc Normal file
View File

@ -0,0 +1,11 @@
prefix=/usr
exec_prefix=${prefix}
libdir=/usr/lib64
includedir=${prefix}/include
Name: IM
Version: 3.15
Description: IM is a toolkit for image representation, storage, capture and processing
Requires:
Libs: -L${libdir} -limlua -limlua_fftw3 -limlua_jp2 -limlua_process -limlua_process_omp
Cflags: -I${includedir}

22
libim/package.yml
View File

@ -16,11 +16,10 @@ builddeps :
- pkgconfig(libpng)
- lsb-release
patterns :
- lua :
- /usr/lib64/libimlua*.so
- /usr/lib64/*.so
- devel :
- /usr/include
- /usr/lib64/libimlua*.so
- lua :
- /usr/lib64/libimlua*.so.*
environment:
export USE_PKGCONFIG=Yes
export USE_LUA_VERSION=53
@ -29,11 +28,16 @@ environment:
export LUA_INC=/usr/include
export LUA_LIB=/usr/lib
export LUA_BIN=/usr/bin/lua
setup : |
%patch -p1 < $pkgfiles/0001-fix-lua-sfx.patch
%patch -p1 < $pkgfiles/0002-shared-links.patch
build : |
%make -j1
install : |
install -dm00755 $installdir/usr/lib64
install -Dm00755 lib/Linux62_64/*.so $installdir/usr/lib64/
install -Dm00755 lib/Linux62_64/Lua53/*.so $installdir/usr/lib64/
install -dm00755 $installdir/usr/include
install -m00755 include/* $installdir/usr/include
install -dm00755 $installdir/usr/{lib64/pkgconfig,include}
install -m00644 $pkgfiles/*.pc $installdir/usr/lib64/pkgconfig
rm lib/Linux63_64/{*.a,Lua/*.a}
chmod -R 00755 lib/Linux63_64/*
mv lib/Linux63_64/*.* $installdir/usr/lib64/
mv lib/Linux63_64/Lua/* $installdir/usr/lib64/
install -m00644 include/* $installdir/usr/include/

0
libpdflib/Makefile → pdflib/Makefile
View File

15
pdflib/files/0001-shared-links.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/tecmake.mak b/tecmake.mak
index 48991a4..83623b6 100755
--- a/tecmake.mak
+++ b/tecmake.mak
@@ -1667,7 +1667,9 @@ dynamic-lib: $(TARGETDIR)/$(TARGETDLIBNAME)
$(TARGETDIR)/$(TARGETDLIBNAME) : $(LUAS) $(OBJS) $(EXTRADEPS)
@echo ''; echo Tecmake: linking $(@F) ...
- $(ECHO)$(LD) $(STDLDFLAGS) -o $@ $(OBJS) $(SLIB) $(LFLAGS)
+ $(ECHO)$(LD) $(STDLDFLAGS) -Wl,-soname,$(@F).7 -o $@.7.0.5 $(OBJS) $(SLIB) $(LFLAGS)
+ @echo ''; ln -sv $(@F).7.0.5 $@.7
+ @echo ''; ln -sv $(@F).7 $@
@echo ''; echo 'Tecmake: Dynamic Library ($@) Done.'; echo ''

11
pdflib/files/pdflib.pc Normal file
View File

@ -0,0 +1,11 @@
prefix=/usr
exec_prefix=${prefix}
libdir=/usr/lib64
includedir=${prefix}/include
Name: PDFlib
Version: 7.0.5
Description: PDFlib is a well-established developer component for generating and manipulating PDF documents
Requires:
Libs: -L${libdir} -lpdflib
Cflags: -I${includedir}

17
libpdflib/package.yml → pdflib/package.yml
View File

@ -1,4 +1,4 @@
name : libpdflib
name : pdflib
version : 7.0.5
release : 1
source :
@ -11,13 +11,14 @@ description: |
PDFlib is a well-established developer component for generating and manipulating PDF documents. PDFlib's main targets are dynamic PDF creation on a Web server and PDF creation in any kind of server, desktop or mobile application. You can use PDFlib to dynamically create PDF documents from database contents, similar to dynamic Web pages. Since 1997 PDFlib has proven itself in a wide range of use cases and development environments. Application programmers use PDFlib to create PDF output with text, images, graphics and interactive elements.
builddeps :
- lsb-release
patterns :
- /usr/lib64/*.so
- devel :
- /usr/include
setup : |
%patch -p1 < $pkgfiles/0001-shared-links.patch
build : |
%make
install : |
install -Dm00755 lib/Linux62_64/libpdflib.so $installdir/usr/lib64/libpdflib.so
install -dm00755 $installdir/usr/include
install -m00755 include/* $installdir/usr/include/
install -dm00755 $installdir/usr/{lib64/pkgconfig,include}
install -m00644 $pkgfiles/*.pc $installdir/usr/lib64/pkgconfig
rm lib/Linux63_64/*.a
chmod 00755 lib/Linux63_64/*
mv lib/Linux63_64/* $installdir/usr/lib64/
install -m00644 include/* $installdir/usr/include/