[PR PATCH] fbida: remove cairo-gl dependency, fix cross

[PR PATCH] fbida: remove cairo-gl dependency, fix cross

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1273 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages fbida-cross
https://github.com/void-linux/void-packages/pull/37532

fbida: remove cairo-gl dependency, fix cross
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (only build-tested)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37532.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fbida-cross-37532.patch --]
[-- Type: text/x-diff, Size: 3938 bytes --]

From 42cbd551cd59994e829a00ccd1ddbfc52aaa7f90 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 12 Jun 2022 19:20:56 +0200
Subject: [PATCH] fbida: remove cairo-gl dependency, fix cross

---
 srcpkgs/fbida/patches/cross.patch       |  6 ++++
 srcpkgs/fbida/patches/no-cairo-gl.patch | 40 +++++++++++++++++++++++++
 srcpkgs/fbida/template                  |  7 ++---
 3 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/fbida/patches/cross.patch
 create mode 100644 srcpkgs/fbida/patches/no-cairo-gl.patch

diff --git a/srcpkgs/fbida/patches/cross.patch b/srcpkgs/fbida/patches/cross.patch
new file mode 100644
index 000000000000..118ebb47ea48
--- /dev/null
+++ b/srcpkgs/fbida/patches/cross.patch
@@ -0,0 +1,6 @@
+--- a/scripts/jpeg-version.sh
++++ b/scripts/jpeg-version.sh
+@@ -1,2 +1,2 @@
+ #!/bin/sh
+-echo JPEG_LIB_VERSION | cpp $CFLAGS -include jpeglib.h | tail -1
++echo JPEG_LIB_VERSION | cpp -include jpeglib.h | tail -1
diff --git a/srcpkgs/fbida/patches/no-cairo-gl.patch b/srcpkgs/fbida/patches/no-cairo-gl.patch
new file mode 100644
index 000000000000..3d383ae30f9c
--- /dev/null
+++ b/srcpkgs/fbida/patches/no-cairo-gl.patch
@@ -0,0 +1,40 @@
+From 80b2aecc8e763e00b39c0425be90947a7687745b Mon Sep 17 00:00:00 2001
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Thu, 20 Dec 2018 11:28:18 +0100
+Subject: [PATCH] drop cairo-gl dep from meson.build
+
+---
+ meson.build | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 35045ad..3639b97 100644
+--- a/meson.build
++++ b/meson.build
+@@ -17,7 +17,6 @@ fontconf_dep = dependency('fontconfig')
+ pixman_dep   = dependency('pixman-1')
+ poppler_dep  = dependency('poppler-glib')
+ cairo_dep    = dependency('cairo')
+-cairo_gl_dep = dependency('cairo-gl')
+ drm_dep      = dependency('libdrm')
+ gbm_dep      = dependency('gbm')
+ epoxy_dep    = dependency('epoxy')
+@@ -68,9 +67,6 @@ trans_src    = ''.join(['jpeg/', jpeg_ver,  '/transupp.c'])
+ trans_inc    = include_directories(''.join(['jpeg/', jpeg_ver]))
+ 
+ # finish & write configuration
+-if cairo_gl_dep.found()
+-    config.set('HAVE_CAIRO_GL', true)
+-endif
+ if motif_dep.found()
+     config.set('HAVE_MOTIF', true)
+ endif
+@@ -119,7 +115,7 @@ executable('thumbnail.cgi',
+ fbpdf_srcs   = [ 'fbpdf.c', 'parseconfig.c', 'fbiconfig.c',
+                  'vt.c', 'kbd.c', 'fbtools.c', 'drmtools.c', 'drmtools-egl.c' ]
+ fbpdf_deps   = [ drm_dep, gbm_dep, epoxy_dep,
+-                 pixman_dep, poppler_dep, cairo_dep, cairo_gl_dep ]
++                 pixman_dep, poppler_dep, cairo_dep ]
+ 
+ executable('fbpdf',
+            sources             : fbpdf_srcs,
diff --git a/srcpkgs/fbida/template b/srcpkgs/fbida/template
index 347632343733..bcd5fbdba40d 100644
--- a/srcpkgs/fbida/template
+++ b/srcpkgs/fbida/template
@@ -1,10 +1,10 @@
 # Template file for 'fbida'.
 pkgname=fbida
 version=2.14
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="cmake perl pkg-config cairo-devel"
-# XXX ida needs motif-devel; cross needs cairo-gl
+hostmakedepends="cmake perl pkg-config cairo-devel libjpeg-turbo-devel"
+# XXX ida needs motif-devel
 makedepends="MesaLib-devel giflib-devel libexif-devel libpng-devel fontconfig-devel
 freetype-devel libcurl-devel libdrm-devel libepoxy-devel libglib-devel libXpm-devel
 libXt-devel pixman-devel cairo-devel poppler-glib-devel libwebp-devel tiff-devel
@@ -17,7 +17,6 @@ distfiles="https://www.kraxel.org/releases/${pkgname}/${pkgname}-${version}.tar.
 checksum=95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438
 depends="fbida-exiftran-${version}_${revision} fbida-fbi-${version}_${revision}
  fbida-fbpdf-${version}_${revision} $(vopt_if ida fbida-ida-${version}_${revision})"
-nocross="Requires cairo-gl.pc for the target which Void does not have"
 
 build_options="ida"
 desc_option_ida="Build ida motif application (needs motif-devel)"

Re: [PR PATCH] [Updated] fbida: remove cairo-gl dependency, fix cross

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1278 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages fbida-cross
https://github.com/void-linux/void-packages/pull/37532

fbida: remove cairo-gl dependency, fix cross
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (only build-tested)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37532.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fbida-cross-37532.patch --]
[-- Type: text/x-diff, Size: 4338 bytes --]

From e5f8eb000b134e50d591ba87e99f43dbc63328f3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 12 Jun 2022 19:20:56 +0200
Subject: [PATCH] fbida: remove cairo-gl dependency, fix cross

---
 srcpkgs/fbida/patches/cross.patch       |  6 ++++
 srcpkgs/fbida/patches/no-cairo-gl.patch | 40 +++++++++++++++++++++++++
 srcpkgs/fbida/template                  | 13 ++++----
 3 files changed, 52 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/fbida/patches/cross.patch
 create mode 100644 srcpkgs/fbida/patches/no-cairo-gl.patch

diff --git a/srcpkgs/fbida/patches/cross.patch b/srcpkgs/fbida/patches/cross.patch
new file mode 100644
index 000000000000..118ebb47ea48
--- /dev/null
+++ b/srcpkgs/fbida/patches/cross.patch
@@ -0,0 +1,6 @@
+--- a/scripts/jpeg-version.sh
++++ b/scripts/jpeg-version.sh
+@@ -1,2 +1,2 @@
+ #!/bin/sh
+-echo JPEG_LIB_VERSION | cpp $CFLAGS -include jpeglib.h | tail -1
++echo JPEG_LIB_VERSION | cpp -include jpeglib.h | tail -1
diff --git a/srcpkgs/fbida/patches/no-cairo-gl.patch b/srcpkgs/fbida/patches/no-cairo-gl.patch
new file mode 100644
index 000000000000..3d383ae30f9c
--- /dev/null
+++ b/srcpkgs/fbida/patches/no-cairo-gl.patch
@@ -0,0 +1,40 @@
+From 80b2aecc8e763e00b39c0425be90947a7687745b Mon Sep 17 00:00:00 2001
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Thu, 20 Dec 2018 11:28:18 +0100
+Subject: [PATCH] drop cairo-gl dep from meson.build
+
+---
+ meson.build | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 35045ad..3639b97 100644
+--- a/meson.build
++++ b/meson.build
+@@ -17,7 +17,6 @@ fontconf_dep = dependency('fontconfig')
+ pixman_dep   = dependency('pixman-1')
+ poppler_dep  = dependency('poppler-glib')
+ cairo_dep    = dependency('cairo')
+-cairo_gl_dep = dependency('cairo-gl')
+ drm_dep      = dependency('libdrm')
+ gbm_dep      = dependency('gbm')
+ epoxy_dep    = dependency('epoxy')
+@@ -68,9 +67,6 @@ trans_src    = ''.join(['jpeg/', jpeg_ver,  '/transupp.c'])
+ trans_inc    = include_directories(''.join(['jpeg/', jpeg_ver]))
+ 
+ # finish & write configuration
+-if cairo_gl_dep.found()
+-    config.set('HAVE_CAIRO_GL', true)
+-endif
+ if motif_dep.found()
+     config.set('HAVE_MOTIF', true)
+ endif
+@@ -119,7 +115,7 @@ executable('thumbnail.cgi',
+ fbpdf_srcs   = [ 'fbpdf.c', 'parseconfig.c', 'fbiconfig.c',
+                  'vt.c', 'kbd.c', 'fbtools.c', 'drmtools.c', 'drmtools-egl.c' ]
+ fbpdf_deps   = [ drm_dep, gbm_dep, epoxy_dep,
+-                 pixman_dep, poppler_dep, cairo_dep, cairo_gl_dep ]
++                 pixman_dep, poppler_dep, cairo_dep ]
+ 
+ executable('fbpdf',
+            sources             : fbpdf_srcs,
diff --git a/srcpkgs/fbida/template b/srcpkgs/fbida/template
index 347632343733..904e21be97b8 100644
--- a/srcpkgs/fbida/template
+++ b/srcpkgs/fbida/template
@@ -1,23 +1,22 @@
-# Template file for 'fbida'.
+# Template file for 'fbida'
 pkgname=fbida
 version=2.14
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="cmake perl pkg-config cairo-devel"
-# XXX ida needs motif-devel; cross needs cairo-gl
+hostmakedepends="cmake perl pkg-config cairo-devel libjpeg-turbo-devel"
+# XXX ida needs motif-devel
 makedepends="MesaLib-devel giflib-devel libexif-devel libpng-devel fontconfig-devel
 freetype-devel libcurl-devel libdrm-devel libepoxy-devel libglib-devel libXpm-devel
 libXt-devel pixman-devel cairo-devel poppler-glib-devel libwebp-devel tiff-devel
 libwebp-devel sane-devel"
+depends="fbida-exiftran-${version}_${revision} fbida-fbi-${version}_${revision}
+ fbida-fbpdf-${version}_${revision} $(vopt_if ida fbida-ida-${version}_${revision})"
 short_desc="Display and elementary edit images using fbdev"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kraxel.org/blog/linux/fbida/"
 distfiles="https://www.kraxel.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438
-depends="fbida-exiftran-${version}_${revision} fbida-fbi-${version}_${revision}
- fbida-fbpdf-${version}_${revision} $(vopt_if ida fbida-ida-${version}_${revision})"
-nocross="Requires cairo-gl.pc for the target which Void does not have"
 
 build_options="ida"
 desc_option_ida="Build ida motif application (needs motif-devel)"

Re: [PR PATCH] [Merged]: fbida: remove cairo-gl dependency, fix cross

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1118 bytes --]

There's a merged pull request on the void-packages repository

fbida: remove cairo-gl dependency, fix cross
https://github.com/void-linux/void-packages/pull/37532

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (only build-tested)

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->