added cdrkit

4 files changed, 61 insertions, 1 deletions

diff --git a/repo/cdrkit/cdrkit.xibuild b/repo/cdrkit/cdrkit.xibuild
new file mode 100644
index 0000000..ac430d8
--- /dev/null
+++ b/repo/cdrkit/cdrkit.xibuild
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+NAME="cdrkit"
+DESC="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction"
+
+MAKEDEPS="make "
+DEPS="bzip2 file libcap musl zlib "
+
+PKG_VER=1.1.11
+SOURCE="https://dev.alpinelinux.org/archive/cdrkit/cdrkit-$PKG_VER.tar.gz"
+ADDITIONAL="gcc10.patch "
+
+prepare () {
+    sed -i include/xconfig.h.in -e "s/#define HAVE_RCMD 1/#undef HAVE_RCMD/g"
+    apply_patches
+}
+
+build () {
+    export CFLAGS="$CFLAGS -D__THROW=''"
+    make 
+}
+
+package () {
+    make PREFIX="$PKG_DEST/usr" install
+	cd "$PKG_DEST/usr/bin"
+	ln -s wodim cdrecord
+	ln -s readom readcd
+	ln -s genisoimage mkisofs
+	ln -s genisoimage mkhybrid
+	ln -s icedax cdda2wav
+	cd "$PKG_DEST/usr/share/man/man1"
+	ln -s wodim.1 cdrecord.1
+	ln -s readom.1 readcd.1
+	ln -s genisoimage.1 mkisofs.1
+	ln -s genisoimage.1 mkhybrid.1
+	ln -s icedax.1 cdda2wav.1
+}
diff --git a/repo/cdrkit/gcc10.patch b/repo/cdrkit/gcc10.patch
new file mode 100644
index 0000000..655562d
--- /dev/null
+++ b/repo/cdrkit/gcc10.patch
@@ -0,0 +1,15 @@
+# Description: fix the build with gcc-10
+# Copied from Fedora
+# https://src.fedoraproject.org/rpms/cdrkit/raw/master/f/cdrkit-1.1.11-gcc10.patch
+diff -up cdrkit-1.1.11/genisoimage/genisoimage.h.me cdrkit-1.1.11/genisoimage/genisoimage.h
+--- cdrkit-1.1.11/genisoimage/genisoimage.h.me	2020-02-24 15:10:35.542998992 +0100
++++ cdrkit-1.1.11/genisoimage/genisoimage.h	2020-02-24 15:10:50.011130450 +0100
+@@ -377,7 +377,7 @@ extern int	use_fileversion;
+ extern int	split_SL_component;
+ extern int	split_SL_field;
+ extern char	*trans_tbl;
+-char		*outfile;
++extern char	*outfile;
+
+ #define	JMAX		64	/* maximum Joliet file name length (spec) */
+ #define	JLONGMAX	103	/* out of spec Joliet file name length */
diff --git a/repo/xipkg/xilinux-installer.xibuild b/repo/xipkg/xilinux-installer.xibuild
new file mode 100644
index 0000000..edd6327
--- /dev/null
+++ b/repo/xipkg/xilinux-installer.xibuild
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+DESC="Installer for xilinux"
+DEPS="xilib xiutils xipkg curl util-linux dosfstools xichroot xitui"
+
+package () {
+    install -Dm755 scripts/installer.sh $PKG_DEST/usr/bin/xilinux-install
+}
diff --git a/repo/xipkg/xipkg.xibuild b/repo/xipkg/xipkg.xibuild
index 1d48e38..b870e90 100644
--- a/repo/xipkg/xipkg.xibuild
+++ b/repo/xipkg/xipkg.xibuild
@@ -3,7 +3,7 @@
 MAKEDEPS="make"
 DEPS="openssl curl dash xiutils findutils diffutils sed xichroot grep base64 sort hbar parseconf xiutils"
 
-PKG_VER=1.4.3
+PKG_VER=1.5.2
 SOURCE=https://git.davidovski.xyz/xilinux/xipkg.git
 BRANCH="v$PKG_VER"