Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e635354dff62149efb01e0721cd1d596faee154d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e635354dff62149efb01e0721cd1d596faee154d)
  • Date: Fri, 9 Jun 2023 08:21:29 +0000

GIT changes to master grimoire by Florian Franzmann <bwlf AT bandrate.org>:

gnome2-libs/pango/HISTORY | 3
gnome2-libs/pango/SUB_DEPENDS | 2
graphics-libs/mesa/0001-install-GL-headers-in-.mesa.patch | 58 +---
graphics-libs/mesa/HISTORY | 3
graphics/geeqie/HISTORY | 3
graphics/geeqie/PRE_BUILD | 4
graphics/geeqie/patches/0001-Fix-1090-exiv2-0.28.0-support.patch | 130
++++++++++
utils/lshw/DEPENDS | 1
utils/lshw/HISTORY | 4
utils/lshw/PRE_BUILD | 4
10 files changed, 175 insertions(+), 37 deletions(-)

New commits:
commit e635354dff62149efb01e0721cd1d596faee154d
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

graphics/geeqie: fix build against exiv2 0.28.0

commit 391cf48288ab19ee41ff8e7dc89a46bd77ce8bac
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

gnome2-libs/pango: fix option name

commit 1b3eff0ce48b5bd32c8763a15c44277a2569a0d4
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

graphics-libs/mesa: update patch

commit a05d72d6f4d4c0c05fd6bf8a4fbf15a1ef55e211
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

utils/lshw: add dependency on docbook2x

commit 5ce58de8f510dac4d275ba5a61a0298fddef8206
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

utils/lshw: use our LDFLAGS

diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index b480e13..3cdd081 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,6 @@
+2023-06-09 Florian Franzmann <bwlf AT bandrate.org>
+ * SUB_DEPENDS: fix 'introspection' option name
+
2023-06-08 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: introduced Watch line
* PRE_BUILD, patches/0001-Drop-Werror-araay-bounds.patch: added patch
to fix
diff --git a/gnome2-libs/pango/SUB_DEPENDS b/gnome2-libs/pango/SUB_DEPENDS
index 1608db9..84e3b92 100755
--- a/gnome2-libs/pango/SUB_DEPENDS
+++ b/gnome2-libs/pango/SUB_DEPENDS
@@ -1,6 +1,6 @@
case $THIS_SUB_DEPENDS in
GI) message "Pango with GI requested, forcing gobject-instrospection
dependency" &&
- depends gobject-introspection "gir=true"
+ depends gobject-introspection "introspection=enabled"
;;
X) message "Pango with XFT support requested, forcing libxft dependency" &&
depends libxft &&
diff --git a/graphics-libs/mesa/0001-install-GL-headers-in-.mesa.patch
b/graphics-libs/mesa/0001-install-GL-headers-in-.mesa.patch
index 70913b3..bf874a1 100644
--- a/graphics-libs/mesa/0001-install-GL-headers-in-.mesa.patch
+++ b/graphics-libs/mesa/0001-install-GL-headers-in-.mesa.patch
@@ -1,20 +1,19 @@
-From cbdb123158b7e115c9c767104bb2793a10d95151 Mon Sep 17 00:00:00 2001
+From 5ddf5e9f399ba1bb8e3fcac1fc3adce63d89102d Mon Sep 17 00:00:00 2001
From: Florian Franzmann <bwlf AT bandrate.org>
-Date: Sun, 9 May 2021 14:36:52 +0200
-Subject: [PATCH] Install GL headers in .mesa install libGL to lib/.mesa
+Date: Fri, 9 Jun 2023 09:54:37 +0200
+Subject: [PATCH] Install to the right paths

---
- include/meson.build | 8 ++++----
- src/egl/meson.build | 1 +
- src/glx/meson.build | 1 +
- src/mapi/es2api/meson.build | 1 +
- 4 files changed, 7 insertions(+), 4 deletions(-)
+ include/meson.build | 8 ++++----
+ src/egl/meson.build | 1 +
+ src/glx/meson.build | 1 +
+ 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/meson.build b/include/meson.build
-index 4ee415f..7aa2487 100644
+index c55325d..44a0118 100644
--- a/include/meson.build
+++ b/include/meson.build
-@@ -66,7 +66,7 @@ if not with_glvnd
+@@ -65,7 +65,7 @@ if not with_glvnd
'GL/gl.h',
'GL/glcorearb.h',
'GL/glext.h',
@@ -23,7 +22,7 @@ index 4ee415f..7aa2487 100644
)
endif

-@@ -74,7 +74,7 @@ if not with_glvnd
+@@ -73,7 +73,7 @@ if not with_glvnd
install_headers(
'GL/glx.h',
'GL/glxext.h',
@@ -32,7 +31,7 @@ index 4ee415f..7aa2487 100644
endif

if with_egl
-@@ -97,11 +97,11 @@ if with_egl
+@@ -96,11 +96,11 @@ if with_egl
endif

if with_osmesa
@@ -41,27 +40,28 @@ index 4ee415f..7aa2487 100644
endif

if with_dri
- install_headers('GL/internal/dri_interface.h', subdir : 'GL/internal')
+- install_headers('GL/internal/dri_interface.h', subdir : 'GL/internal')
++ install_headers('GL/internal/dri_interface.h', subdir :
'GL/.mesa/internal')
endif

if with_gallium_st_nine
diff --git a/src/egl/meson.build b/src/egl/meson.build
-index 599a667..d482a33 100644
+index ac9a48e..92e83de 100644
--- a/src/egl/meson.build
+++ b/src/egl/meson.build
-@@ -206,6 +206,7 @@ libegl = shared_library(
+@@ -211,6 +211,7 @@ libegl = shared_library(
+ link_args : [ld_args_bsymbolic, ld_args_gc_sections],
+ dependencies : [deps_for_egl, dep_dl, dep_libdrm, dep_clock, dep_thread,
idep_mesautil],
+ install : true,
++ install_dir : 'lib/.mesa',
version : egl_lib_version,
soversion : egl_lib_soversion,
- name_prefix : 'lib', # even on windows
-+ install_dir : 'lib/.mesa',
- vs_module_defs : egl_def
- )
-
+ name_prefix : host_machine.system() == 'windows' ? 'lib' : [], # always
use lib, but avoid warnings on !windows
diff --git a/src/glx/meson.build b/src/glx/meson.build
-index 58f9e1a..b282e5f 100644
+index 20f0474..b8143c2 100644
--- a/src/glx/meson.build
+++ b/src/glx/meson.build
-@@ -159,6 +159,7 @@ libgl = shared_library(
+@@ -154,6 +154,7 @@ libgl = shared_library(
version : gl_lib_version,
darwin_versions : '4.0.0',
install : true,
@@ -69,18 +69,6 @@ index 58f9e1a..b282e5f 100644
)

if with_tests
-diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
-index 356c576..04f3df6 100644
---- a/src/mapi/es2api/meson.build
-+++ b/src/mapi/es2api/meson.build
-@@ -52,6 +52,7 @@ libgles2 = shared_library(
- darwin_versions : '3.0.0',
- name_prefix : 'lib',
- install : true,
-+ install_dir : 'lib/.mesa',
- )
-
- pkg.generate(
--
-2.31.1
+2.40.1

diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index 251e994..934d4a3 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,6 @@
+2023-06-09 Florian Franzmann <bwlf AT bandrate.org>
+ * 0001-install-GL-headers-in-.mesa.patch: update patch
+
2023-06-08 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 23.1.2

diff --git a/graphics/geeqie/HISTORY b/graphics/geeqie/HISTORY
index 418002a..6024567 100644
--- a/graphics/geeqie/HISTORY
+++ b/graphics/geeqie/HISTORY
@@ -1,3 +1,6 @@
+2023-06-09 Florian Franzmann <bwlf AT bandrate.org>
+ * PRE_BUILD, patches/0001-Fix-1090-exiv2-0.28.0-support.patch: fix build
against exiv2 0.28.0
+
2022-08-14 Florian Franzmann <bwlf AT bandrate.org>
* 0001-don-t-install-ChangeLog.patch, PRE_BUILD: removed
* BUILD, CONFIGURE, DEPENDS, DETAILS, PREPARE, PRE_BUILD: version 2.0.1
diff --git a/graphics/geeqie/PRE_BUILD b/graphics/geeqie/PRE_BUILD
new file mode 100755
index 0000000..3357329
--- /dev/null
+++ b/graphics/geeqie/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+apply_patch_dir patches
diff --git a/graphics/geeqie/patches/0001-Fix-1090-exiv2-0.28.0-support.patch
b/graphics/geeqie/patches/0001-Fix-1090-exiv2-0.28.0-support.patch
new file mode 100644
index 0000000..e9f9233
--- /dev/null
+++ b/graphics/geeqie/patches/0001-Fix-1090-exiv2-0.28.0-support.patch
@@ -0,0 +1,130 @@
+From 86d5f780bae35d0fc2122646ff415633b5f15a60 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rosen=20Penev=C2=A0?= <>
+Date: Fri, 2 Jun 2023 16:41:12 +0100
+Subject: [PATCH] Fix #1090: exiv2 0.28.0 support
+
+https://github.com/BestImageViewer/geeqie/issues/1090
+---
+ src/exiv2.cc | 55 +++++++++++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 48 insertions(+), 7 deletions(-)
+
+diff --git a/src/exiv2.cc b/src/exiv2.cc
+index a2c16c4c..6c745a86 100644
+--- a/src/exiv2.cc
++++ b/src/exiv2.cc
+@@ -62,6 +62,11 @@
+
+ #include "misc.h"
+
++#if EXIV2_TEST_VERSION(0,28,0)
++#define AnyError Error
++#define AutoPtr UniquePtr
++#endif
++
+ typedef struct _AltKey AltKey;
+
+ struct _AltKey
+@@ -174,7 +179,7 @@ public:
+ {
+ cp_data_ = NULL;
+ cp_length_ = 0;
+- image_ = image;
++ image_ = std::move(image);
+ valid_ = TRUE;
+ }
+
+@@ -364,7 +369,11 @@ public:
+ Exiv2::Image *image = imageData_->image();
+
+ #ifdef HAVE_EXIV2_ERROR_CODE
++#if EXIV2_TEST_VERSION(0,28,0)
++ if (!image) throw
Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed);
++#else
+ if (!image) throw
Exiv2::Error(Exiv2::kerInputDataReadFailed);
++#endif
+ #else
+ if (!image) throw Exiv2::Error(21);
+ #endif
+@@ -839,7 +848,12 @@ gint exif_item_get_integer(ExifItem *item, gint *value)
+ {
+ try {
+ if (!item || exif_item_get_elements(item) == 0) return 0;
++
++#if EXIV2_TEST_VERSION(0,28,0)
++ *value = ((Exiv2::Metadatum *)item)->toInt64();
++#else
+ *value = ((Exiv2::Metadatum *)item)->toLong();
++#endif
+ return 1;
+ }
+ catch (Exiv2::AnyError& e) {
+@@ -1224,10 +1238,18 @@ guchar *exif_get_preview(ExifData *exif, guint
*data_len, gint requested_width,
+ Exiv2::PreviewImage image = pm.getPreviewImage(*pos);
+
+ Exiv2::DataBuf buf = image.copy();
++
++#if EXIV2_TEST_VERSION(0,28,0)
++ *data_len = buf.size();
++ auto b = buf.data();
++ buf.reset();
++ return b;
++#else
+ std::pair<Exiv2::byte*, long> p = buf.release();
+
+ *data_len = p.second;
+ return p.first;
++#endif
+ }
+ return NULL;
+ }
+@@ -1487,22 +1509,41 @@ unsigned long RawFile::preview_offset(void)
+ if (type == Exiv2::ImageType::cr2)
+ {
+ val = find(0x111, Group::ifd0);
+- if (val) return val->toLong();
+-
++#if EXIV2_TEST_VERSION(0,28,0)
++ if (val) return val->toInt64();
++#else
++ if (val) return val->tolong();
++#endif
+ return 0;
+ }
+
+ val = find(0x201, Group::sub0_0);
+- if (val) return val->toLong();
++#if EXIV2_TEST_VERSION(0,28,0)
++ if (val) return val->toInt64();
++#else
++ if (val) return val->tolong();
++#endif
+
+ val = find(0x201, Group::ifd0);
+- if (val) return val->toLong();
++#if EXIV2_TEST_VERSION(0,28,0)
++ if (val) return val->toInt64();
++#else
++ if (val) return val->tolong();
++#endif
+
+ val = find(0x201, Group::ignr); // for PEF files, originally it was
probably ifd2
+- if (val) return val->toLong();
++#if EXIV2_TEST_VERSION(0,28,0)
++ if (val) return val->toInt64();
++#else
++ if (val) return val->tolong();
++#endif
+
+ val = find(0x111, Group::sub0_1); // dng
+- if (val) return val->toLong();
++#if EXIV2_TEST_VERSION(0,28,0)
++ if (val) return val->toInt64();
++#else
++ if (val) return val->tolong();
++#endif
+
+ return 0;
+ }
+--
+2.40.1
+
diff --git a/utils/lshw/DEPENDS b/utils/lshw/DEPENDS
index dfd193c..1d0c692 100755
--- a/utils/lshw/DEPENDS
+++ b/utils/lshw/DEPENDS
@@ -1,4 +1,5 @@
depends -sub CXX gcc &&
+depends docbook2x &&

#
## Remove this when spell is in stable.
diff --git a/utils/lshw/HISTORY b/utils/lshw/HISTORY
index f927f33..5893335 100644
--- a/utils/lshw/HISTORY
+++ b/utils/lshw/HISTORY
@@ -1,3 +1,7 @@
+2023-06-09 Florian Franzmann <bwlf AT bandrate.org>
+ * PRE_BUILD: use our LDFLAGS
+ * DEPENDS: add dependency on docbook2x
+
2023-03-27 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to B.02.19.2
* patches/fix-array-bounds.patch: removed, no longer needed
diff --git a/utils/lshw/PRE_BUILD b/utils/lshw/PRE_BUILD
index c230ad1..dba50fa 100755
--- a/utils/lshw/PRE_BUILD
+++ b/utils/lshw/PRE_BUILD
@@ -1,3 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-apply_patch_dir patches
+apply_patch_dir patches &&
+
+sedit '/^LDFLAGS=$/d' src/core/Makefile src/gui/Makefile



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e635354dff62149efb01e0721cd1d596faee154d), Florian Franzmann, 06/09/2023

Archive powered by MHonArc 2.6.24.

Top of Page