dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build/linux: Sync with Beta manifest regarding IFF support 

Ported from: 0acddb8909
This commit is contained in:
Bruno 2024-09-08 15:05:40 -03:00
parent fc8194ccf3
commit 898f8917ab
No known key found for this signature in database
3 changed files with 154 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
build/linux/flatpak/org.gimp.GIMP-nightly.json
View File

@ -646,6 +646,60 @@
}
]
},
{
"name": "libilbm",
"sources": [
{
"type": "git",
"url": "https://github.com/svanderburg/libilbm.git",
"commit": "586f5822275ef5780509a851cb90c7407b2633d9"
},
{
"type": "shell",
"commands": [
"./bootstrap"
]
},
{
"type": "patch",
"paths": [
"patches/libilbm-no-ilbmpack-ilbmpp-acbm2ilbm-ilbm2acbm.patch"
]
}
],
"cleanup": [
"/include",
"/lib/pkgconfig"
],
"modules": [
{
"name": "libiff",
"sources": [
{
"type": "git",
"url": "https://github.com/svanderburg/libiff.git",
"commit": "b5f542a83c824f26e0816770c9a17c22bd388606"
},
{
"type": "shell",
"commands": [
"./bootstrap"
]
},
{
"type": "patch",
"paths": [
"patches/libiff-no-iffjoin-and-iffp.patch"
]
}
],
"cleanup": [
"/include",
"/lib/pkgconfig"
]
}
]
},
{
"name": "luajit",
"sources": [

49
build/linux/flatpak/patches/libiff-no-iffjoin-and-iffp.patch Normal file
View File

@ -0,0 +1,49 @@
From 7da16ebeab61c92227021cc7662054b36e800cab Mon Sep 17 00:00:00 2001
From: Bruno <brunvonlope@outlook.com>
Date: Sun, 8 Sep 2024 11:12:03 -0300
Subject: [PATCH] configure, makefile: No need to build 'iffjoin' and 'iffpp'
---
Makefile.am | 2 +-
configure.ac | 4 ----
src/Makefile.am | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 43a2338..af437a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = doc src tests
+SUBDIRS = src
diff --git a/configure.ac b/configure.ac
index 0c29576..2638651 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,13 +22,9 @@ AC_SUBST(IFF_BIG_ENDIAN)
AC_CONFIG_FILES([
Makefile
-doc/Makefile
src/Makefile
src/libiff.pc
src/libiff/ifftypes.h
src/libiff/Makefile
-src/iffjoin/Makefile
-src/iffpp/Makefile
-tests/Makefile
])
AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 1b3db17..cfce91d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libiff iffjoin iffpp
+SUBDIRS = libiff
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libiff.pc
--
2.45.0.windows.1

51
build/linux/flatpak/patches/libilbm-no-ilbmpack-ilbmpp-acbm2ilbm-ilbm2acbm.patch Normal file
View File

@ -0,0 +1,51 @@
From 5186d46c6cbe629680a51b7c65c02a22a6d0f205 Mon Sep 17 00:00:00 2001
From: Bruno <brunvonlope@outlook.com>
Date: Sun, 8 Sep 2024 13:12:19 -0300
Subject: [PATCH] configure, makefile: No need to build 'ilbmpack', 'ilbmpp',
'acbm2ilbm' and 'ilbm2acbm'
---
Makefile.am | 2 +-
configure.ac | 6 ------
src/Makefile.am | 2 +-
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 43a2338..af437a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = doc src tests
+SUBDIRS = src
diff --git a/configure.ac b/configure.ac
index 343c766..4e1a337 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,14 +24,8 @@ AC_SUBST(LIBIFF_LIBS)
# Output
AC_CONFIG_FILES([
Makefile
-doc/Makefile
src/libilbm.pc
src/Makefile
src/libilbm/Makefile
-src/ilbmpack/Makefile
-src/ilbmpp/Makefile
-src/acbm2ilbm/Makefile
-src/ilbm2acbm/Makefile
-tests/Makefile
])
AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index cf17b84..bdcf3c6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libilbm ilbmpack ilbmpp acbm2ilbm ilbm2acbm
+SUBDIRS = libilbm
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libilbm.pc
--
2.45.0.windows.1