[PR PATCH] cdrtools: now a schilytool

[PR PATCH] cdrtools: now a schilytool

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages cdrtools
https://github.com/void-linux/void-packages/pull/46282

cdrtools: now a schilytool
- cdrtools became a schilytool at some point
- siconv tables are now in the "base" schilytools package

cc: @leahneukirchen

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

#### Testing the changes
- I tested the changes in this PR: **NO** (don't really have cd drives...)


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

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

From b3d6871594557f933ef83649fd6b11d7b18fa58d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 26 Sep 2023 21:35:23 -0400
Subject: [PATCH] cdrtools: now a schilytool

- cdrtools became a schilytool at some point
- siconv tables are now in the "base" schilytools package
---
 srcpkgs/cdrtools                              |  1 +
 srcpkgs/cdrtools/files/README.voidlinux       |  2 -
 srcpkgs/cdrtools/template                     | 50 -------------------
 srcpkgs/cdrtools/update                       |  1 -
 .../INSTALL => schilytools/cdrtools.INSTALL}  |  3 +-
 srcpkgs/schilytools/template                  | 29 +++++++++--
 6 files changed, 28 insertions(+), 58 deletions(-)
 create mode 120000 srcpkgs/cdrtools
 delete mode 100644 srcpkgs/cdrtools/files/README.voidlinux
 delete mode 100644 srcpkgs/cdrtools/template
 delete mode 100644 srcpkgs/cdrtools/update
 rename srcpkgs/{cdrtools/INSTALL => schilytools/cdrtools.INSTALL} (91%)

diff --git a/srcpkgs/cdrtools b/srcpkgs/cdrtools
new file mode 120000
index 0000000000000..5064d9720d6a9
--- /dev/null
+++ b/srcpkgs/cdrtools
@@ -0,0 +1 @@
+schilytools
\ No newline at end of file
diff --git a/srcpkgs/cdrtools/files/README.voidlinux b/srcpkgs/cdrtools/files/README.voidlinux
deleted file mode 100644
index dec6d15a0bd48..0000000000000
--- a/srcpkgs/cdrtools/files/README.voidlinux
+++ /dev/null
@@ -1,2 +0,0 @@
-Some utilities need kernel modules to be loaded before they work properly.
-Running the modules-load command at this time is recommended.
diff --git a/srcpkgs/cdrtools/template b/srcpkgs/cdrtools/template
deleted file mode 100644
index 71b3b81437969..0000000000000
--- a/srcpkgs/cdrtools/template
+++ /dev/null
@@ -1,50 +0,0 @@
-# Template file for 'cdrtools'
-pkgname=cdrtools
-version=3.02a09
-revision=3
-build_helper=qemu
-hostmakedepends="smake"
-makedepends="acl-devel libcap-devel e2fsprogs-devel"
-depends="libcap-progs"
-conf_files="/etc/default/rscsi /etc/default/cdrecord"
-short_desc="Highly portable CD/DVD/BluRay command line recording software"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="CDDL-1.0"
-homepage="http://cdrtools.sourceforge.net/private/cdrecord.html"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=aa28438f458ef3f314b79f2029db27679dae1d5ffe1569b6de57742511915e81
-
-if [ "$CROSS_BUILD" ]; then
-	export CONFIG_RMTCALL="qemu-$XBPS_TARGET_QEMU_MACHINE-static"
-	export CONFIG_RMTHOST=non-exist
-fi
-
-do_build() {
-	mkdir -p xinclude/linux
-	for _file in "$XBPS_CROSS_BASE"/usr/include/ext2fs/*; do
-		ln -sf "$_file" xinclude/linux
-	done
-	CPPFLAGS+=" -I$wrksrc/xinclude"
-	CFLAGS+=" -I$wrksrc/xinclude"
-	sed -i 's|/opt/schily|/usr|g' DEFAULTS/Defaults.linux
-	sed -i 's|DEFINSGRP=.*|DEFINSGRP=root|' DEFAULTS/Defaults.linux
-
-	sed -i 's|INSDIR=.*|INSDIR=bin|' rscsi/Makefile
-	smake CC="$CC" COPTX="$CFLAGS" LDOPTX="$LDFLAGS" RUNPATH= LDPATH= NOWARN=1
-}
-do_install() {
-	CPPFLAGS+=" -I$wrksrc/xinclude"
-	CFLAGS+=" -I$wrksrc/xinclude"
-	smake \
-		CC="$CC" COPTX="$CFLAGS" LDOPTX="$LDFLAGS" \
-		RUNPATH= LDPATH= NOWARN=1 \
-		INS_BASE=/usr MANDIR=/man DESTDIR=${DESTDIR} \
-		install
-	# Remove useless stuff
-	rm -rf ${DESTDIR}/usr/include
-	rm -rf ${DESTDIR}/usr/lib/lib* ${DESTDIR}/usr/lib/profiled
-	rm -rf ${DESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man/man5
-	vmkdir usr/lib/modules-load.d
-	echo sg > ${DESTDIR}/usr/lib/modules-load.d/cdrtools.conf
-	vdoc "${FILESDIR}/README.voidlinux"
-}
diff --git a/srcpkgs/cdrtools/update b/srcpkgs/cdrtools/update
deleted file mode 100644
index 2c857beffb293..0000000000000
--- a/srcpkgs/cdrtools/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*a*"
diff --git a/srcpkgs/cdrtools/INSTALL b/srcpkgs/schilytools/cdrtools.INSTALL
similarity index 91%
rename from srcpkgs/cdrtools/INSTALL
rename to srcpkgs/schilytools/cdrtools.INSTALL
index daf6dc6478e26..3303b1d333a9f 100644
--- a/srcpkgs/cdrtools/INSTALL
+++ b/srcpkgs/schilytools/cdrtools.INSTALL
@@ -1,5 +1,4 @@
-if [ "$ACTION" = "post" ]
-then
+if [ "$ACTION" = "post" ]; then
 	setcap cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep /usr/bin/cdrecord
 	setcap cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep /usr/bin/cdda2wav
 	setcap cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep /usr/bin/readcd
diff --git a/srcpkgs/schilytools/template b/srcpkgs/schilytools/template
index 98f1bda7291bf..d88f5e5b018e5 100644
--- a/srcpkgs/schilytools/template
+++ b/srcpkgs/schilytools/template
@@ -2,9 +2,8 @@
 pkgname=schilytools
 version=2023.04.19
 revision=1
-build_style=meta
-makedepends="acl-devel attr-devel e2fsprogs-devel m4"
-depends="sccs sdd sfind smake star ved"
+makedepends="acl-devel attr-devel e2fsprogs-devel libcap-progs m4"
+depends="sccs sdd sfind smake star ved cdrtools"
 short_desc="Schily's portable tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="CDDL-1.0"
@@ -19,6 +18,12 @@ do_build() {
 	make -C sccs clean
 	make -C sccs CC="$CC" COPTX="$CFLAGS" LDOPTX="$LDFLAGS" INS_BASE=/usr/libexec/sccs
 }
+
+do_install() {
+	make install -C libsiconv/tables DESTDIR="$DESTDIR" INS_BASE=/usr
+	vlicense CDDL.Schily.txt
+}
+
 sccs_package() {
 	short_desc+=" - SCCS"
 	pkg_install() {
@@ -78,3 +83,21 @@ ved_package() {
 		vlicense CDDL.Schily.txt
 	}
 }
+
+cdrtools_package() {
+	depends="schilytools libcap-progs"
+	short_desc+=" - cdrtools"
+	conf_files="/etc/default/rscsi /etc/default/cdrecord"
+	pkg_install() {
+		vsed -i 's|INSDIR=.*|INSDIR=bin|' rscsi/Makefile
+		for d in btcflash cdda2wav cdrecord mkisofs mkisofs/diag readcd rscsi \
+			scgcheck scgskeleton; do
+			make install -C "$d" DESTDIR="$PKGDESTDIR" INS_BASE=/usr \
+				CC="$CC" COPTX="$CFLAGS" LDOPTX="$LDFLAGS" LDPATH= RUNPATH=
+		done
+		rm -rf "${PKGDESTDIR}"/usr/lib/profiled
+		vmkdir usr/lib/modules-load.d
+		echo sg > "${PKGDESTDIR}"/usr/lib/modules-load.d/cdrtools.conf
+		vlicense CDDL.Schily.txt
+	}
+}

Re: cdrtools: now a schilytool

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/46282#issuecomment-1737196592

Comment:
Slightly inconvenient as that makes it non-cross, but given these tools are pretty arcane by now it probably doesn't matter...

Re: cdrtools: now a schilytool

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/46282#issuecomment-1737196592

Comment:
Slightly inconvenient as that makes it non-cross, but given these tools are pretty arcane by now it probably doesn't matter... (we have xorriso etc cross-built.)

i686 seems to fail due to architecture mismatch on CI.

Re: [PR PATCH] [Closed]: cdrtools: now a schilytool

[leahneukirchen]

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

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

cdrtools: now a schilytool
https://github.com/void-linux/void-packages/pull/46282

Description:
- cdrtools became a schilytool at some point
- siconv tables are now in the "base" schilytools package

cc: @leahneukirchen

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

#### Testing the changes
- I tested the changes in this PR: **NO** (don't really have cd drives...)

Re: cdrtools: now a schilytool

[clausecker]

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

New comment by clausecker on void-packages repository

https://github.com/void-linux/void-packages/pull/46282#issuecomment-1737606149

Comment:
The build system hasn't changed, so if cross-building was possible before, it should be possible to make it work again now.

Re: cdrtools: now a schilytool

[leahneukirchen]

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

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/46282#issuecomment-1737629641

Comment:
But schilytools uses smake to build things? If it's possible to avoid that, I'd like to learn how.

Re: cdrtools: now a schilytool

[clausecker]

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

New comment by clausecker on void-packages repository

https://github.com/void-linux/void-packages/pull/46282#issuecomment-1737649737

Comment:
It can also be built with gmake, though using smake is preferred.

Leah Neukirchen ***@***.***> schrieb am Mi., 27. Sep. 2023,
11:29:

> But schilytools uses smake to build things? If it's possible to avoid
> that, I'd like to learn how.
>
> —
> Reply to this email directly, view it on GitHub
> <https://github.com/void-linux/void-packages/pull/46282#issuecomment-1737629641>,
> or unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AACQF4I5FLZATC2TKS4WPVLX4RA33ANCNFSM6AAAAAA5ISRSPA>
> .
> You are receiving this because you are subscribed to this thread.Message
> ID: ***@***.***>
>