summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorUffe Jakobsen2021-01-20 16:37:01 +0100
committerUffe Jakobsen2021-01-20 16:38:44 +0100
commitcd71035708ad3d5342db994888d8a4cebaef431f (patch)
treedc253e91d91bd7eb7ce85bc621917f1cc98fcf40
parentbc3398acbd523f727bf54b9e2a7537bcbe04e6b2 (diff)
downloadaur-cd71035708ad3d5342db994888d8a4cebaef431f.tar.gz
clean up
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD15
2 files changed, 11 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d3c030f76d46..f5b59c50c09d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = sidfactory2
pkgdesc = Cross-platform editor for composing music for the Commodore C64 SID chip
pkgver = 20210104
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/Chordian/sidfactory2
arch = i686
arch = x86_64
@@ -10,7 +10,7 @@ pkgbase = sidfactory2
makedepends = make
makedepends = gcc
depends = sdl2
- conflicts = sidfactory2-unstable
+ conflicts = sidfactory2
source = sidfactory2-20210104.tar.gz::https://github.com/Chordian/sidfactory2/archive/release-20210104.tar.gz
md5sums = 4ac9c5003f89caa629becf8e01f8e436
diff --git a/PKGBUILD b/PKGBUILD
index e7d4e7e88505..c0251dc840a8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,7 +21,7 @@ pkg_name_dir="${_pkgname}-release-${_pkgver}"
pkgname=${_pkgname}
pkgver=${_pkgver}
-pkgrel=1
+pkgrel=2
pkgdesc="Cross-platform editor for composing music for the Commodore C64 SID chip"
arch=('i686' 'x86_64')
url="https://github.com/Chordian/sidfactory2"
@@ -29,7 +29,7 @@ license=('GPL')
makedepends=('pkgconfig' 'make' 'gcc')
depends=('sdl2')
optdepends=()
-conflicts=('sidfactory2-unstable')
+conflicts=('sidfactory2')
source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/Chordian/${_pkgname}/archive/${pkg_ident}.tar.gz")
md5sums=('4ac9c5003f89caa629becf8e01f8e436')
@@ -40,8 +40,8 @@ md5sums=('4ac9c5003f89caa629becf8e01f8e436')
prepare()
{
cd "${srcdir}/${pkg_name_dir}"
- cp "${startdir}/Makefile.sf2" Makefile
- patch -b -p0 < "${startdir}/patch-Makefile.diff"
+ #cp "${startdir}/Makefile.sf2" Makefile
+ #patch -b -p0 < "${startdir}/patch-Makefile.diff"
}
#
@@ -59,7 +59,7 @@ build()
package()
{
cd "${srcdir}/${pkg_name_dir}"
- make dist
+ #make dist
#install -m 755 -D "${srcdir}/${pkg_name_dir}/artifacts/SIDFactoryII" "${pkgdir}/usr/bin/SIDFactoryII.exe"
#ln -sf SIDFactoryII "${pkgdir}/usr/bin/sidfactory2"
@@ -78,7 +78,8 @@ package()
cp -R "${srcdir}/${pkg_name_dir}/artifacts/drivers" "${pkgdir}/usr/share/${pkgname}"
cp -R "${srcdir}/${pkg_name_dir}/artifacts/overlay" "${pkgdir}/usr/share/${pkgname}"
cp -R "${srcdir}/${pkg_name_dir}/artifacts/color_schemes" "${pkgdir}/usr/share/${pkgname}"
- cp -R "${srcdir}/${pkg_name_dir}/artifacts/music" "${pkgdir}/usr/share/${pkgname}"
+ #cp -R "${srcdir}/${pkg_name_dir}/artifacts/music" "${pkgdir}/usr/share/${pkgname}"
+ cp -R "${srcdir}/${pkg_name_dir}/SIDFactoryII/music" "${pkgdir}/usr/share/${pkgname}"
#
#make -j1 DESTDIR="${pkgdir}" install
@@ -88,6 +89,8 @@ package()
# HACK: SF2 expects to find drivers etc in the same dir as the binary :-S
mkdir -p "${pkgdir}/opt/${_pkgname}"
install -m 755 -D "${srcdir}/${pkg_name_dir}/artifacts/SIDFactoryII" "${pkgdir}/opt/${_pkgname}/SIDFactoryII"
+ strip "${pkgdir}/opt/${_pkgname}/SIDFactoryII"
+
mkdir -p "${pkgdir}/usr/bin"
ln -sf "/opt/${_pkgname}/SIDFactoryII" "${pkgdir}/usr/bin/SIDFactoryII"
ln -sf SIDFactoryII "${pkgdir}/usr/bin/sidfactory2"