Update to version 20210104

2 files changed, 56 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9bd602345525..d3c030f76d46 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sidfactory2
 	pkgdesc = Cross-platform editor for composing music for the Commodore C64 SID chip
-	pkgver = 20200911
+	pkgver = 20210104
 	pkgrel = 1
 	url = https://github.com/Chordian/sidfactory2
 	arch = i686
@@ -11,8 +11,8 @@ pkgbase = sidfactory2
 	makedepends = gcc
 	depends = sdl2
 	conflicts = sidfactory2-unstable
-	source = sidfactory2-20200911.tar.gz::https://github.com/Chordian/sidfactory2/archive/release-20200911.tar.gz
-	md5sums = dbba94f8e31f43618354033596470374
+	source = sidfactory2-20210104.tar.gz::https://github.com/Chordian/sidfactory2/archive/release-20210104.tar.gz
+	md5sums = 4ac9c5003f89caa629becf8e01f8e436
 
 pkgname = sidfactory2
 
diff --git a/PKGBUILD b/PKGBUILD
index 9934b9eaaa9b..e7d4e7e88505 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,19 @@
 #
 
 _pkgname=sidfactory2
+_pkgver=20210104
+_commit=fed95a77b995fc594c83d84eee073af1a396cf2b
+
+pkg_ident="release-${_pkgver//_/-}"
+pkg_name_ver="${_pkgname}-${_pkgver//_/-}"
+pkg_name_dir="${_pkgname}-release-${_pkgver}"
+
+#pkg_ident="${_commit}"
+#pkg_name_ver="${_pkgname}-${_commit}"
+#pkg_name_dir="${pkg_name_ver}"
+
 pkgname=${_pkgname}
-pkgver=20200911
+pkgver=${_pkgver}
 pkgrel=1
 pkgdesc="Cross-platform editor for composing music for the Commodore C64 SID chip"
 arch=('i686' 'x86_64')
@@ -19,18 +30,18 @@ makedepends=('pkgconfig' 'make' 'gcc')
 depends=('sdl2')
 optdepends=()
 conflicts=('sidfactory2-unstable')
-source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/Chordian/${_pkgname}/archive/release-${pkgver//_/-}.tar.gz")
-md5sums=('dbba94f8e31f43618354033596470374')
-pkg_name_ver="${_pkgname}-release-${pkgver//_/-}"
+source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/Chordian/${_pkgname}/archive/${pkg_ident}.tar.gz")
+md5sums=('4ac9c5003f89caa629becf8e01f8e436')
+
 
 #
 #
 #
 prepare()
 {
-  cd "${srcdir}/${pkg_name_ver}"
+  cd "${srcdir}/${pkg_name_dir}"
   cp "${startdir}/Makefile.sf2" Makefile
-  #patch -p0 < "${startdir}/CMakeLists.txt.patch"
+  patch -b -p0 < "${startdir}/patch-Makefile.diff"
 }
 
 #
@@ -38,7 +49,7 @@ prepare()
 #
 build()
 {
-  cd "${srcdir}/${pkg_name_ver}"
+  cd "${srcdir}/${pkg_name_dir}"
   make
 }
 
@@ -47,23 +58,47 @@ build()
 #
 package()
 {
-  cd "${srcdir}/${pkg_name_ver}"
+  cd "${srcdir}/${pkg_name_dir}"
   make dist
-  install -m 755 -D "${srcdir}/${pkg_name_ver}/artifacts/SIDFactoryII" "${pkgdir}/usr/bin/SIDFactoryII"
-  ln -sf SIDFactoryII "${pkgdir}/usr/bin/sidfactory2"
-  install -m 644 -D "${srcdir}/${pkg_name_ver}/dist/documentation/faq.txt" "${pkgdir}/usr/share/doc/${pkgname}/faq.txt"
-  install -m 644 -D "${srcdir}/${pkg_name_ver}/dist/documentation/user_manual.pdf" "${pkgdir}/usr/share/doc/${pkgname}/user_manual.pdf"
+
+  #install -m 755 -D "${srcdir}/${pkg_name_dir}/artifacts/SIDFactoryII" "${pkgdir}/usr/bin/SIDFactoryII.exe"
+  #ln -sf SIDFactoryII "${pkgdir}/usr/bin/sidfactory2"
+  #ln -sf sf2 "${pkgdir}/usr/bin/sidfactory2"
+
+  #for aa in "${srcdir}/${pkg_name_dir}/dist/documentation/"*.txt; do
+  #  aaa=$(basename "${aa}")
+  #  install -m 644 -D "${aa}" "${pkgdir}/usr/share/doc/${pkgname}/${aaa}"
+  #done
+
+  mkdir -p "${pkgdir}/usr/share/doc/${pkgname}/"
+  cp -R "${srcdir}/${pkg_name_dir}/dist/documentation/"* "${pkgdir}/usr/share/doc/${pkgname}/"
+
   install -m 755 -d "${pkgdir}/usr/share/${pkgname}"
-  cp -R "${srcdir}/${pkg_name_ver}/artifacts/config" "${pkgdir}/usr/share/${pkgname}"
-  cp -R "${srcdir}/${pkg_name_ver}/artifacts/drivers" "${pkgdir}/usr/share/${pkgname}"
-  cp -R "${srcdir}/${pkg_name_ver}/artifacts/overlay" "${pkgdir}/usr/share/${pkgname}"
-  cp -R "${srcdir}/${pkg_name_ver}/artifacts/color_schemes" "${pkgdir}/usr/share/${pkgname}"
-  cp -R "${srcdir}/${pkg_name_ver}/artifacts/music" "${pkgdir}/usr/share/${pkgname}"
+  cp -R "${srcdir}/${pkg_name_dir}/artifacts/config" "${pkgdir}/usr/share/${pkgname}"
+  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}"
 
   #
   #make -j1 DESTDIR="${pkgdir}" install
-  #install -m 644 -D "${srcdir}/${pkg_name_ver}/SIDFactoryII/COPYING" "${pkgdir}/usr/share/licenses/${_pkgname}/COPYING"
+  #install -m 644 -D "${srcdir}/${pkg_name_dir}/SIDFactoryII/COPYING" "${pkgdir}/usr/share/licenses/${_pkgname}/COPYING"
   #
+
+  # 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"
+  mkdir -p "${pkgdir}/usr/bin"
+  ln -sf "/opt/${_pkgname}/SIDFactoryII" "${pkgdir}/usr/bin/SIDFactoryII"
+  ln -sf SIDFactoryII "${pkgdir}/usr/bin/sidfactory2"
+  ln -sf SIDFactoryII "${pkgdir}/usr/bin/sf2"
+
+  ln -s "/usr/share/${pkgname}/config" "${pkgdir}/opt/${_pkgname}/"
+  ln -s "/usr/share/${pkgname}/drivers" "${pkgdir}/opt/${_pkgname}/"
+  ln -s "/usr/share/${pkgname}/overlay" "${pkgdir}/opt/${_pkgname}/"
+  ln -s "/usr/share/${pkgname}/color_schemes" "${pkgdir}/opt/${_pkgname}/"
+  ln -s "/usr/share/${pkgname}/music" "${pkgdir}/opt/${_pkgname}/"
+
 }
 
 #