[PR PATCH] libcaca: enable imlib2 support by default + add opengl build option

[PR PATCH] libcaca: enable imlib2 support by default + add opengl build option

[FollieHiyuki]

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

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

https://github.com/FollieHiyuki/void-packages libcaca-image
https://github.com/void-linux/void-packages/pull/31717

libcaca: enable imlib2 support by default + add opengl build option
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->

Revived from issue #5159. Without imlib2 support libcaca only works with BMP format, which seems limited.

Rendering with opengl is nice to have, but I make it optional, as x11 rendering option.


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libcaca-image-31717.patch --]
[-- Type: text/x-diff, Size: 1572 bytes --]

From 222e2f71b0e01962af63a6bf06402df2b1e84ccd Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 30 Jun 2021 01:46:06 +0300
Subject: [PATCH] libcaca: enable imlib2 support by default + add opengl build
 option

Without imlib2 support, libcaca only works with BMP format, which is
really limited. Additionally, libcaca can be built and work with imlib2
without x11 support.
---
 srcpkgs/libcaca/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libcaca/template b/srcpkgs/libcaca/template
index b6d6b4f35c9b..86f934c65f39 100644
--- a/srcpkgs/libcaca/template
+++ b/srcpkgs/libcaca/template
@@ -1,19 +1,20 @@
 # Template file for 'libcaca'
 pkgname=libcaca
 version=0.99.beta19
-revision=8
+revision=9
 build_style=gnu-configure
 hostmakedepends="libtool automake pkg-config"
+makedepends="ncurses-devel imlib2-devel $(vopt_if x11 'libX11-devel')
+ $(vopt_if opengl 'libfreeglut-devel')"
 short_desc="Graphics library that outputs text instead of pixels"
 maintainer="Orphaned <orphan@voidlinux.org>"
-makedepends="ncurses-devel $(vopt_if x11 'libX11-devel imlib2-devel')"
-homepage="http://caca.zoy.org/wiki/libcaca"
 license="WTFPL"
+homepage="http://caca.zoy.org/wiki/libcaca"
 distfiles="https://github.com/cacalabs/libcaca/archive/v${version}.tar.gz"
 checksum=7ed29a00cc7f017424d8b2994f001f137ed5bc4441987b711d78c6734fdf3493
 
 # package build options
-build_options="x11"
+build_options="x11 opengl"
 
 pre_configure() {
 	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac

Re: [PR PATCH] [Updated] libcaca: enable imlib2 support by default + add opengl build option

[FollieHiyuki]

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

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

https://github.com/FollieHiyuki/void-packages libcaca-image
https://github.com/void-linux/void-packages/pull/31717

libcaca: enable imlib2 support by default + add opengl build option
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->

Revived from issue #5159. Without imlib2 support libcaca only works with BMP format, which seems limited.

Rendering with opengl is nice to have, but I make it optional, as x11 rendering option.


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libcaca-image-31717.patch --]
[-- Type: text/x-diff, Size: 1634 bytes --]

From 6c54932360291d9253039e5f0d0faadcfbdfd4d4 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 30 Jun 2021 01:46:06 +0300
Subject: [PATCH] libcaca: enable imlib2 support by default

Without imlib2 support, libcaca only works with BMP format, which is
really limited. Additionally, libcaca can be built and work with imlib2
without x11 support.

Also add opengl rendering option.
---
 srcpkgs/libcaca/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libcaca/template b/srcpkgs/libcaca/template
index b6d6b4f35c9b..7b0c783c59ad 100644
--- a/srcpkgs/libcaca/template
+++ b/srcpkgs/libcaca/template
@@ -1,19 +1,21 @@
 # Template file for 'libcaca'
 pkgname=libcaca
 version=0.99.beta19
-revision=8
+revision=9
 build_style=gnu-configure
+configure_args="$(vopt_if x11 '' '--disable-x11')"
 hostmakedepends="libtool automake pkg-config"
+makedepends="ncurses-devel imlib2-devel $(vopt_if x11 'libX11-devel')
+ $(vopt_if opengl 'libfreeglut-devel')"
 short_desc="Graphics library that outputs text instead of pixels"
 maintainer="Orphaned <orphan@voidlinux.org>"
-makedepends="ncurses-devel $(vopt_if x11 'libX11-devel imlib2-devel')"
-homepage="http://caca.zoy.org/wiki/libcaca"
 license="WTFPL"
+homepage="http://caca.zoy.org/wiki/libcaca"
 distfiles="https://github.com/cacalabs/libcaca/archive/v${version}.tar.gz"
 checksum=7ed29a00cc7f017424d8b2994f001f137ed5bc4441987b711d78c6734fdf3493
 
 # package build options
-build_options="x11"
+build_options="x11 opengl"
 
 pre_configure() {
 	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac

Re: [PR REVIEW] libcaca: enable imlib2 support by default + add opengl build option

[FollieHiyuki]

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

New review comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/31717#discussion_r662549975

Comment:
My bad, didn't check the dependencies. I added a `vopt_if` for `configure_args`.

`cacaview` now open images within the terminal so I think it works.

Re: [PR PATCH] [Updated] libcaca: enable imlib2 support by default + add opengl build option

[FollieHiyuki]

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

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

https://github.com/FollieHiyuki/void-packages libcaca-image
https://github.com/void-linux/void-packages/pull/31717

libcaca: enable imlib2 support by default + add opengl build option
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->

Revived from issue #5159. Without imlib2 support libcaca only works with BMP format, which seems limited.

Rendering with opengl is nice to have, but I make it optional, as x11 rendering option.


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libcaca-image-31717.patch --]
[-- Type: text/x-diff, Size: 1600 bytes --]

From 90daadfeef38b4c2d09b2745a1ff6665b7797481 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Wed, 30 Jun 2021 01:46:06 +0300
Subject: [PATCH] libcaca: enable imlib2 support by default

Without imlib2 support, libcaca only works with BMP format, which is
really limited. Additionally, libcaca can be built and work with imlib2
without x11 support.

Also add opengl rendering option.
---
 srcpkgs/libcaca/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libcaca/template b/srcpkgs/libcaca/template
index b6d6b4f35c9b..0ae84971a0ce 100644
--- a/srcpkgs/libcaca/template
+++ b/srcpkgs/libcaca/template
@@ -1,19 +1,20 @@
 # Template file for 'libcaca'
 pkgname=libcaca
 version=0.99.beta19
-revision=8
+revision=9
 build_style=gnu-configure
+configure_args="$(vopt_if x11 '' '--disable-x11')"
 hostmakedepends="libtool automake pkg-config"
+makedepends="ncurses-devel imlib2-devel $(vopt_if opengl 'libfreeglut-devel')"
 short_desc="Graphics library that outputs text instead of pixels"
 maintainer="Orphaned <orphan@voidlinux.org>"
-makedepends="ncurses-devel $(vopt_if x11 'libX11-devel imlib2-devel')"
-homepage="http://caca.zoy.org/wiki/libcaca"
 license="WTFPL"
+homepage="http://caca.zoy.org/wiki/libcaca"
 distfiles="https://github.com/cacalabs/libcaca/archive/v${version}.tar.gz"
 checksum=7ed29a00cc7f017424d8b2994f001f137ed5bc4441987b711d78c6734fdf3493
 
 # package build options
-build_options="x11"
+build_options="x11 opengl"
 
 pre_configure() {
 	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac

Re: [PR PATCH] [Closed]: libcaca: enable imlib2 support by default + add opengl build option

[ericonr]

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

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

libcaca: enable imlib2 support by default + add opengl build option
https://github.com/void-linux/void-packages/pull/31717

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->

Revived from issue #5159. Without imlib2 support libcaca only works with BMP format, which seems limited.

Rendering with opengl is nice to have, but I make it optional, as x11 rendering option.

Re: libcaca: enable imlib2 support by default + add opengl build option

[FollieHiyuki]

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

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/31717#issuecomment-873335867

Comment:
@ericonr I would prefer we enable only imlib2 feature.

The x11 rendering looks kinda ugly (like ImageMagick GUI) and I would rather open it with my terminal.

Re: libcaca: enable imlib2 support by default + add opengl build option

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31717#issuecomment-873336705

Comment:
@FollieHiyuki does it use the X11 stuff by default if built with it?

If so, feel free to open a PR to fix it, and apologies for making the change.

Re: libcaca: enable imlib2 support by default + add opengl build option

[FollieHiyuki]

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

New comment by FollieHiyuki on void-packages repository

https://github.com/void-linux/void-packages/pull/31717#issuecomment-873339948

Comment:
@ericonr yes for example `cacaview` will open in an X11 window if built with x11 support, while with only imlib2 support it will open inside the terminal (which looks much nicer since it honor the terminal colors).

I think you can just revert back to my commit. I already tested it locally.