First attempt at separating the packages

2 files changed, 14 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9e14a9fad5a0..78cac2bad34e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vc4c-git
 	pkgdesc = Compiler for the VC4CL OpenCL-implementation
 	pkgver = 1
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/doe300/VC4C
 	arch = any
 	license = MIT
@@ -13,15 +13,12 @@ pkgbase = vc4c-git
 	depends = llvm
 	depends = clinfo
 	depends = ocl-icd
-	provides = opencl-pi
-	provides = opencl-vc4
-	provides = opencl-driver
-	conflicts = vc4clstdlib-git
+	provides = vc4c
+	provides = vc4-compiler
+	provides = opencl-compiler
 	source = VC4C.tar.gz::https://github.com/doe300/VC4C/archive/master.tar.gz
-	source = VC4CLStdLib.tar.gz::https://github.com/doe300/VC4CLStdLib/archive/master.tar.gz
 	source = auto_dummy.patch
 	md5sums = SKIP
-	md5sums = SKIP
 	md5sums = e409cafcdc79aa53aef1484e53bd25e7
 
 pkgname = vc4c-git
diff --git a/PKGBUILD b/PKGBUILD
index b527b38a2265..2a7e6270b8c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=vc4c-git
 pkgver=1
-pkgrel=4
+pkgrel=5
 pkgdesc="Compiler for the VC4CL OpenCL-implementation"
 arch=('any')
 url="https://github.com/doe300/VC4C"
@@ -11,29 +11,23 @@ groups=()
 depends=('llvm' 'clinfo' 'ocl-icd')
 makedepends=('wget' 'gcc' 'cmake' 'clang' 'opencl-headers')
 optdepends=()
-conflicts=('vc4clstdlib-git')
-provides=('opencl-pi' 'opencl-vc4' 'opencl-driver')
-source=("VC4C.tar.gz::https://github.com/doe300/VC4C/archive/master.tar.gz" "VC4CLStdLib.tar.gz::https://github.com/doe300/VC4CLStdLib/archive/master.tar.gz" "auto_dummy.patch")
-md5sums=('SKIP' 'SKIP' 'e409cafcdc79aa53aef1484e53bd25e7')
+requires=('vc4clstdlib-git')
+provides=('vc4c' 'vc4-compiler' 'opencl-compiler')
+source=("VC4C.tar.gz::https://github.com/doe300/VC4C/archive/master.tar.gz" "auto_dummy.patch")
+md5sums=('SKIP' 'e409cafcdc79aa53aef1484e53bd25e7')
+
+prepare() {
+	patch -R $srcdir/VC4C-master/src/ProcessUtil.cpp $srcdir/auto_dummy.patch
+}
 
 build() {
 	mkdir -p $srcdir/VC4C-master/build
-	mkdir -p $srcdir/VC4CLStdLib-master/build
-	cd $srcdir/VC4CLStdLib-master/build
-	cmake "$srcdir/VC4CLStdLib-master" -DCLANG_FOUND=/usr/bin/clang -DVC4CL_STDLIB_DIR=$srcdir/VC4CLStdLib-master/include
-	make
 	cd $srcdir/VC4C-master/build
-	cmake -DCMAKE_BUILD_TYPE=Release -DMULTI_THREADED=true "$srcdir/VC4C-master"
+	cmake "$srcdir/VC4C-master" -DCMAKE_BUILD_TYPE=Release -DMULTI_THREADED=true -DCLANG_FOUND=/usr/bin/clang
 	make
 }
 
-prepare() {
-	patch -R $srcdir/VC4C-master/src/ProcessUtil.cpp $srcdir/auto_dummy.patch
-}
-
 package() {
-	cd $srcdir/VC4CLStdLib-master/build
-	make DESTDIR="$pkgdir"/ install
 	cd $srcdir/VC4C-master/build
 	make DESTDIR="$pkgdir"/ install
 }