[PR PATCH] mediainfo: split cli

[PR PATCH] mediainfo: split cli

[sgn]

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

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

https://github.com/sgn/void-packages mediainfo-split-cli
https://github.com/void-linux/void-packages/pull/29582

mediainfo: split cli
Yes, GUI doesn't depend on CLI.
However, I think noone really care about 99KB executable.

Close #29578
<!-- 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
- [ ] 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
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mediainfo-split-cli-29582.patch --]
[-- Type: text/x-diff, Size: 3159 bytes --]

From 1f3415fcd5402f416674c3c781c8036e6e86a010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 19 Mar 2021 18:30:33 +0700
Subject: [PATCH] mediainfo: split cli

Yes, GUI doesn't depend on CLI.
However, I think noone really care about 99KB executable.
---
 srcpkgs/mediainfo/template | 51 ++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 29 deletions(-)

diff --git a/srcpkgs/mediainfo/template b/srcpkgs/mediainfo/template
index 03e2e46b90bd..a5e292453f10 100644
--- a/srcpkgs/mediainfo/template
+++ b/srcpkgs/mediainfo/template
@@ -1,12 +1,12 @@
 # Template file for 'mediainfo'
 pkgname=mediainfo
 version=20.09
-revision=1
+revision=2
 wrksrc=MediaInfo
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libmediainfo-devel zlib-devel $(vopt_if GUI wxWidgets-gtk3-devel)"
-depends="$(vopt_if GUI 'desktop-file-utils hicolor-icon-theme')"
+makedepends="libmediainfo-devel zlib-devel wxWidgets-gtk3-devel"
+depends="desktop-file-utils hicolor-icon-theme mediainfo-cli"
 short_desc="Display technical and tag data for video and audio files"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause"
@@ -15,15 +15,8 @@ distfiles="https://mediaarea.net/download/source/${pkgname}/${version}/${pkgname
 checksum=39327ef83caa38a96114d1b90654012b9ef727538fe82c37dd67aea2cf4f0f67
 replaces="mediainfo-gui>=0"
 
-build_options="CLI GUI"
-build_options_default="CLI GUI"
-desc_option_CLI="Build CLI version"
-desc_option_GUI="Build GUI version"
-
 do_configure() {
-	local targets="$(vopt_if CLI CLI) $(vopt_if GUI GUI)"
-
-	for d in $targets; do
+	for d in CLI GUI; do
 		cd $wrksrc/Project/GNU/$d
 		autoreconf -fi
 		./configure ${configure_args}
@@ -31,29 +24,29 @@ do_configure() {
 }
 
 do_build() {
-	local targets="$(vopt_if CLI CLI) $(vopt_if GUI GUI)"
-
-	for d in $targets; do
+	for d in CLI GUI; do
 		cd $wrksrc/Project/GNU/$d
 		make ${makejobs}
 	done
 }
 
 do_install() {
-	local targets="$(vopt_if CLI CLI) $(vopt_if GUI GUI)"
-
-	for d in $targets; do
-		cd $wrksrc/Project/GNU/$d
-		make DESTDIR="${DESTDIR}" install
-	done
-	vlicense ${wrksrc}/License.html
+	cd $wrksrc/Project/GNU/GUI
+	make DESTDIR="${DESTDIR}" install
+
+	vinstall ${wrksrc}/Source/Resource/Image/MediaInfo.svg 644 \
+		usr/share/icons/hicolor/scalable/apps mediainfo.svg
+	vinstall ${wrksrc}/Source/Resource/Image/MediaInfo.png 644 \
+		usr/share/pixmaps mediainfo-gui.png
+	vinstall ${wrksrc}/Project/GNU/GUI/mediainfo-gui.desktop 644 \
+		usr/share/applications
+}
 
-	if [ "$build_option_GUI" ]; then
-		vinstall ${wrksrc}/Source/Resource/Image/MediaInfo.svg 644 \
-			usr/share/icons/hicolor/scalable/apps mediainfo.svg
-		vinstall ${wrksrc}/Source/Resource/Image/MediaInfo.png 644 \
-			usr/share/pixmaps mediainfo-gui.png
-		vinstall ${wrksrc}/Project/GNU/GUI/mediainfo-gui.desktop 644 \
-			usr/share/applications
-	fi
+mediainfo-cli_package() {
+	short_desc+=" - CLI"
+	pkg_install() {
+		cd ${wrksrc}/Project/GNU/CLI
+		make DESTDIR="${PKGDESTDIR}" install
+		vlicense ${wrksrc}/License.html
+	}
 }

Re: mediainfo: split cli

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29582#issuecomment-802776708

Comment:
If we want to split ad infinitum and mark mediainfo a meta package, we need to either:
- source gnu-configure-args.sh in meta build-style
- copy the whole do_configure in util-linux-libs
- change mediainfo-cli or mediainfo-gui to main package and mediainfo a subpackages.

Re: mediainfo: split cli

[Johnnynator]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/29582#issuecomment-802776831

Comment:
You are missing the sub package symlink.

Re: [PR PATCH] [Updated] mediainfo: split cli

[sgn]

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

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

https://github.com/sgn/void-packages mediainfo-split-cli
https://github.com/void-linux/void-packages/pull/29582

mediainfo: split cli
Yes, GUI doesn't depend on CLI.
However, I think noone really care about 99KB executable.

Close #29578
<!-- 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
- [ ] 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
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mediainfo-split-cli-29582.patch --]
[-- Type: text/x-diff, Size: 3445 bytes --]

From c01af066e9e21f79740cc1216bd0e6bb5bbb1968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 19 Mar 2021 18:30:33 +0700
Subject: [PATCH] mediainfo: split cli

Yes, GUI doesn't depend on CLI.
However, I think noone really care about 99KB executable.
---
 srcpkgs/mediainfo-cli      |  1 +
 srcpkgs/mediainfo/template | 51 ++++++++++++++++----------------------
 2 files changed, 23 insertions(+), 29 deletions(-)
 create mode 120000 srcpkgs/mediainfo-cli

diff --git a/srcpkgs/mediainfo-cli b/srcpkgs/mediainfo-cli
new file mode 120000
index 000000000000..76951070b852
--- /dev/null
+++ b/srcpkgs/mediainfo-cli
@@ -0,0 +1 @@
+mediainfo
\ No newline at end of file
diff --git a/srcpkgs/mediainfo/template b/srcpkgs/mediainfo/template
index 03e2e46b90bd..a5e292453f10 100644
--- a/srcpkgs/mediainfo/template
+++ b/srcpkgs/mediainfo/template
@@ -1,12 +1,12 @@
 # Template file for 'mediainfo'
 pkgname=mediainfo
 version=20.09
-revision=1
+revision=2
 wrksrc=MediaInfo
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="automake libtool pkg-config"
-makedepends="libmediainfo-devel zlib-devel $(vopt_if GUI wxWidgets-gtk3-devel)"
-depends="$(vopt_if GUI 'desktop-file-utils hicolor-icon-theme')"
+makedepends="libmediainfo-devel zlib-devel wxWidgets-gtk3-devel"
+depends="desktop-file-utils hicolor-icon-theme mediainfo-cli"
 short_desc="Display technical and tag data for video and audio files"
 maintainer="John <me@johnnynator.dev>"
 license="BSD-2-Clause"
@@ -15,15 +15,8 @@ distfiles="https://mediaarea.net/download/source/${pkgname}/${version}/${pkgname
 checksum=39327ef83caa38a96114d1b90654012b9ef727538fe82c37dd67aea2cf4f0f67
 replaces="mediainfo-gui>=0"
 
-build_options="CLI GUI"
-build_options_default="CLI GUI"
-desc_option_CLI="Build CLI version"
-desc_option_GUI="Build GUI version"
-
 do_configure() {
-	local targets="$(vopt_if CLI CLI) $(vopt_if GUI GUI)"
-
-	for d in $targets; do
+	for d in CLI GUI; do
 		cd $wrksrc/Project/GNU/$d
 		autoreconf -fi
 		./configure ${configure_args}
@@ -31,29 +24,29 @@ do_configure() {
 }
 
 do_build() {
-	local targets="$(vopt_if CLI CLI) $(vopt_if GUI GUI)"
-
-	for d in $targets; do
+	for d in CLI GUI; do
 		cd $wrksrc/Project/GNU/$d
 		make ${makejobs}
 	done
 }
 
 do_install() {
-	local targets="$(vopt_if CLI CLI) $(vopt_if GUI GUI)"
-
-	for d in $targets; do
-		cd $wrksrc/Project/GNU/$d
-		make DESTDIR="${DESTDIR}" install
-	done
-	vlicense ${wrksrc}/License.html
+	cd $wrksrc/Project/GNU/GUI
+	make DESTDIR="${DESTDIR}" install
+
+	vinstall ${wrksrc}/Source/Resource/Image/MediaInfo.svg 644 \
+		usr/share/icons/hicolor/scalable/apps mediainfo.svg
+	vinstall ${wrksrc}/Source/Resource/Image/MediaInfo.png 644 \
+		usr/share/pixmaps mediainfo-gui.png
+	vinstall ${wrksrc}/Project/GNU/GUI/mediainfo-gui.desktop 644 \
+		usr/share/applications
+}
 
-	if [ "$build_option_GUI" ]; then
-		vinstall ${wrksrc}/Source/Resource/Image/MediaInfo.svg 644 \
-			usr/share/icons/hicolor/scalable/apps mediainfo.svg
-		vinstall ${wrksrc}/Source/Resource/Image/MediaInfo.png 644 \
-			usr/share/pixmaps mediainfo-gui.png
-		vinstall ${wrksrc}/Project/GNU/GUI/mediainfo-gui.desktop 644 \
-			usr/share/applications
-	fi
+mediainfo-cli_package() {
+	short_desc+=" - CLI"
+	pkg_install() {
+		cd ${wrksrc}/Project/GNU/CLI
+		make DESTDIR="${PKGDESTDIR}" install
+		vlicense ${wrksrc}/License.html
+	}
 }

Re: mediainfo: split cli

[Johnnynator]

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/29582#issuecomment-802777856

Comment:
> If we want to split ad infinitum and mark mediainfo a meta package, we need to either:
> 
>     * source gnu-configure-args.sh in meta build-style
> 
>     * copy the whole do_configure in util-linux-libs
> 
>     * change mediainfo-cli or mediainfo-gui to main package and mediainfo a subpackages.

Imo just keep main = GUI, and CLI as sub. Should be good enough.

Re: mediainfo: split cli

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29582#issuecomment-802778945

Comment:
> Imo just keep main = GUI, and CLI as sub. Should be good enough.

You meant this PR is good enough? Or `mediainfo-gui` as main?

Re: [PR PATCH] [Merged]: mediainfo: split cli

[Johnnynator]

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

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

mediainfo: split cli
https://github.com/void-linux/void-packages/pull/29582

Description:
Yes, GUI doesn't depend on CLI.
However, I think noone really care about 99KB executable.

Close #29578
<!-- 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
- [ ] 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
-->