[PR PATCH] libcaca: enable imlib2 support without x11

[PR PATCH] libcaca: enable imlib2 support without x11

[FollieHiyuki]

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

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

https://github.com/FollieHiyuki/void-packages libcaca-imlib2
https://github.com/void-linux/void-packages/pull/31773

libcaca: enable imlib2 support without x11
<!-- 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
-->

Using ncurses backend is preferable. See https://github.com/void-linux/void-packages/pull/31717#issuecomment-873335867


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

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

From 59a1c297acbb526dc0091ca556ef44437a4f26d2 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 3 Jul 2021 07:00:00 +0300
Subject: [PATCH] libcaca: enable imlib2 support without x11

Using ncurses backend is preferable.
---
 srcpkgs/libcaca/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libcaca/template b/srcpkgs/libcaca/template
index 72bf63993013..c38432664fe2 100644
--- a/srcpkgs/libcaca/template
+++ b/srcpkgs/libcaca/template
@@ -1,9 +1,9 @@
 # Template file for 'libcaca'
 pkgname=libcaca
 version=0.99.beta19
-revision=9
+revision=10
 build_style=gnu-configure
-configure_args="$(vopt_enable x11)"
+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"
@@ -14,7 +14,6 @@ distfiles="https://github.com/cacalabs/libcaca/archive/v${version}.tar.gz"
 checksum=7ed29a00cc7f017424d8b2994f001f137ed5bc4441987b711d78c6734fdf3493
 
 build_options="x11 opengl"
-build_options_default="x11"
 
 pre_configure() {
 	vsed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac

Re: libcaca: enable imlib2 support without x11

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31773#issuecomment-873343550

Comment:
Just remove the default line, using vopt_enable is much preferred.

And commit should be closer to "disable x11 option by default" with the same explanation in the body of the commit.

Re: [PR PATCH] [Updated] libcaca: enable imlib2 support without x11

[FollieHiyuki]

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

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

https://github.com/FollieHiyuki/void-packages libcaca-imlib2
https://github.com/void-linux/void-packages/pull/31773

libcaca: enable imlib2 support without x11
<!-- 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
-->

Using ncurses backend is preferable. See https://github.com/void-linux/void-packages/pull/31717#issuecomment-873335867


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

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

From 0a6aa7afb3178c7847a215d7a23b31522749b876 Mon Sep 17 00:00:00 2001
From: FollieHiyuki <folliekazetani@protonmail.com>
Date: Sat, 3 Jul 2021 07:00:00 +0300
Subject: [PATCH] libcaca: disable x11 option by default

Using ncurses backend is preferable.
---
 srcpkgs/libcaca/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/libcaca/template b/srcpkgs/libcaca/template
index 72bf63993013..d75d64820327 100644
--- a/srcpkgs/libcaca/template
+++ b/srcpkgs/libcaca/template
@@ -1,7 +1,7 @@
 # Template file for 'libcaca'
 pkgname=libcaca
 version=0.99.beta19
-revision=9
+revision=10
 build_style=gnu-configure
 configure_args="$(vopt_enable x11)"
 hostmakedepends="libtool automake pkg-config"
@@ -14,7 +14,6 @@ distfiles="https://github.com/cacalabs/libcaca/archive/v${version}.tar.gz"
 checksum=7ed29a00cc7f017424d8b2994f001f137ed5bc4441987b711d78c6734fdf3493
 
 build_options="x11 opengl"
-build_options_default="x11"
 
 pre_configure() {
 	vsed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac

Re: [PR PATCH] [Merged]: libcaca: enable imlib2 support without x11

[ericonr]

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

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

libcaca: enable imlib2 support without x11
https://github.com/void-linux/void-packages/pull/31773

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
-->

Using ncurses backend is preferable. See https://github.com/void-linux/void-packages/pull/31717#issuecomment-873335867