move to version 0.6.0

3 files changed, 41 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c39469f835b1..e0962882ddcc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = radiance
 	pkgdesc = Video art software for live performance
-	pkgver = 20181013
+	pkgver = 0.6.0
 	pkgrel = 0
 	url = https://radiance.video
 	arch = x86_64
@@ -15,10 +15,12 @@ pkgbase = radiance
 	depends = portaudio
 	depends = rtmidi
 	depends = youtube-dl
-	source = https://github.com/zbanks/${pkgname}/archive/continuous.tar.gz
-	source = https://github.com/zbanks/BTrack/archive/master.tar.gz
-	sha256sums = d5cc1c66a4df834b4c3f931c42c20755f11f169e7cdbe13b060f765b4aac5149
-	sha256sums = 31d3e919deddc0e6938e68af420243847756c5fb18923ec6b4e23ab81cda658f
+	source = https://github.com/zbanks/radiance/archive/0.6.0.tar.gz
+	source = https://github.com/zbanks/BTrack/archive/stable-201810.tar.gz
+	source = fix-cmake.patch
+	sha256sums = 5b0b780e92f2303d38c447a1efee3ab58ecbb6a106dd54d810945a5d8673ffb0
+	sha256sums = 8c265f565358e35f26eb7b38c3caa09d551ddb5b0aff18045a9714e6f1829bcc
+	sha256sums = f2c27d367f3a14b7c8e16f61bedd74b253cb6c6e27e1ed4201fc23d95740183e
 
 pkgname = radiance
 
diff --git a/PKGBUILD b/PKGBUILD
index 803d3d4073c4..54b99c700ec2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Eric Van Albert <eric@van.al>
 
 pkgname=radiance
-pkgver=20181013
+pkgver=0.6.0
 pkgrel=0
 pkgdesc='Video art software for live performance'
 arch=('x86_64')
@@ -9,23 +9,31 @@ url='https://radiance.video'
 license=('MIT')
 depends=('qt5-base' 'qt5-quickcontrols' 'qt5-quickcontrols2' 'fftw' 'libsamplerate' 'mpv' 'portaudio' 'rtmidi' 'youtube-dl')
 makedepends=('cmake')
-source=('https://github.com/zbanks/${pkgname}/archive/continuous.tar.gz'
-'https://github.com/zbanks/BTrack/archive/master.tar.gz')
-sha256sums=('d5cc1c66a4df834b4c3f931c42c20755f11f169e7cdbe13b060f765b4aac5149'
-'31d3e919deddc0e6938e68af420243847756c5fb18923ec6b4e23ab81cda658f')
+btrack_pkgver='stable-201810'
+source=("https://github.com/zbanks/radiance/archive/${pkgver}.tar.gz"
+"https://github.com/zbanks/BTrack/archive/${btrack_pkgver}.tar.gz"
+'fix-cmake.patch')
+sha256sums=('5b0b780e92f2303d38c447a1efee3ab58ecbb6a106dd54d810945a5d8673ffb0'
+'8c265f565358e35f26eb7b38c3caa09d551ddb5b0aff18045a9714e6f1829bcc'
+'f2c27d367f3a14b7c8e16f61bedd74b253cb6c6e27e1ed4201fc23d95740183e')
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix-cmake.patch" "CMakeLists.txt" 
+}
 
 build() {
-  rm -rf "${srcdir}/${pkgname}-continuous/BTrack"
-  mv "${srcdir}/BTrack-master" "${srcdir}/${pkgname}-continuous/BTrack"
-  cd "${srcdir}/${pkgname}-continuous"
+  rm -rf "${srcdir}/${pkgname}-${pkgver}/BTrack"
+  mv "${srcdir}/BTrack-${btrack_pkgver}" "${srcdir}/${pkgname}-${pkgver}/BTrack"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   rm -rf build
   mkdir build
   cd build
-  cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" -DRADIANCE_SYSTEM_RESOURCES=/usr/share/radiance
+  cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" -DRADIANCE_SYSTEM_RESOURCES=/usr/share/radiance/
   make -j7
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-continuous/build"
+  cd "${srcdir}/${pkgname}-${pkgver}/build"
   make install
 }
diff --git a/fix-cmake.patch b/fix-cmake.patch
new file mode 100644
index 000000000000..2eba8cc20cbb
--- /dev/null
+++ b/fix-cmake.patch
@@ -0,0 +1,16 @@
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -130,13 +130,6 @@
+ target_link_libraries(libradiance ${radiance_LIBRARIES})
+ target_link_libraries(radiance libradiance ${radiance_LIBRARIES})
+ 
+-install(CODE "
+-    if(NOT \"${RADIANCE_SYSTEM_RESOURCES}\" STREQUAL \"${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/\")
+-        MESSAGE(\"For an install to work, RADIANCE_SYSTEM_RESOURCES must be set to '\\\${CMAKE_INSTALL_PREFIX}share/${PROJECT_NAME}/'\")
+-        MESSAGE(FATAL_ERROR \"Please recompile with cmake -DRADIANCE_SYSTEM_RESOURCES=${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/\")
+-    endif()
+-")
+-
+ INSTALL(TARGETS radiance
+         DESTINATION bin
+ )