Version bump

3 files changed, 33 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 79d0213b3c39..1ddae586ec68 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,23 @@
 pkgbase = aws-sdk-cpp-git
 	pkgdesc = AWS SDK for C++
-	pkgver = 1.7.283.r0.gc9d2aeb1c5
+	pkgver = 1.9.270.r0.g3c6705ee29
 	pkgrel = 1
 	url = https://github.com/aws/aws-sdk-cpp
 	arch = x86_64
 	license = Apache
-	makedepends = openssl
-	makedepends = curl
-	makedepends = zlib
-	makedepends = libutil-linux
-	depends = cmake
-	source = aws-sdk-cpp-git::git+https://github.com/aws/aws-sdk-cpp
+	makedepends = cmake
+	makedepends = ninja
+	depends = openssl
+	depends = curl
+	depends = zlib
+	depends = util-linux-libs
+	depends = aws-c-common
+	depends = aws-c-event-stream
+	depends = libpulse
+	depends = aws-crt-cpp
+	provides = aws-sdk-cpp
+	conflicts = aws-sdk-cpp
+	source = aws-sdk-cpp-git::git+https://github.com/aws/aws-sdk-cpp#branch=main
 	sha256sums = SKIP
 
 pkgname = aws-sdk-cpp-git
-
diff --git a/.gitignore b/.gitignore
index d6a090073448..54ea2256d486 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 src
 pkg
 aws-sdk-cpp-git
-*pkg.tar.xz
+*pkg.tar.*
 tags
diff --git a/PKGBUILD b/PKGBUILD
index c57707369d57..7ce62f789454 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,37 @@
 # Maintainer: Tony Lambiris <tony@libpcap.net>
+
 pkgname=aws-sdk-cpp-git
-pkgver=1.7.283.r0.gc9d2aeb1c5
+pkgver=1.9.270.r0.g3c6705ee29
 pkgrel=1
-pkgdesc="AWS SDK for C++"
-arch=('x86_64')
-url="https://github.com/aws/aws-sdk-cpp"
-license=('Apache')
-depends=('cmake')
-makedepends=('openssl' 'curl' 'zlib' 'libutil-linux')
-conclits=('aws-checksums-git')
-#_gitcommit='1ecade03d980285cb543fe16aa7f64573a651d45'
-#source=("${pkgname}::git+https://github.com/aws/aws-sdk-cpp#commit=${_gitcommit}")
-source=("${pkgname}::git+https://github.com/aws/aws-sdk-cpp")
+pkgdesc='AWS SDK for C++'
+arch=(x86_64)
+url='https://github.com/aws/aws-sdk-cpp'
+license=(Apache)
+depends=(openssl curl zlib util-linux-libs aws-c-common aws-c-event-stream libpulse aws-crt-cpp)
+makedepends=(cmake ninja)
+conflicts=(aws-sdk-cpp)
+provides=(aws-sdk-cpp)
+source=("${pkgname}::git+https://github.com/aws/aws-sdk-cpp#branch=main")
 sha256sums=('SKIP')
 
-# disable until aws engineers can settle on their fucking build process
 pkgver() {
 	cd "${srcdir}/${pkgname}"
 
-	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g'
 }
 
 build() {
 	cd "${srcdir}/${pkgname}"
 
-	mkdir -p build
-	cd build
-
-	export CC="/usr/bin/gcc" CXX="/usr/bin/g++"
-
-	CMAKE_FLAGS="-Wno-dev \
-		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-		-DCMAKE_INSTALL_INCLUDEDIR=/usr/include \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DENABLE_TESTING=OFF \
-		-DSTATIC_LINKING=1 \
-		-DNO_HTTP_CLIENT=1 \
-		-DMINIMIZE_SIZE=ON \
-		-DCMAKE_VERBOSE_MAKEFILE=ON \
-		-DBUILD_SHARED_LIBS=OFF"
-	cmake $CMAKE_FLAGS ..
-
-	make ${MAKEFLAGS}
+    cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCUSTOM_MEMORY_MANAGEMENT=OFF -DENABLE_TESTING=OFF -DBUILD_DEPS=OFF \
+        -DCMAKE_MODULE_PATH=/usr/lib/cmake \
+        -S . -B build -G Ninja
+    ninja -C build -j 2 # the build is so heavy that it gets OOM killed even at powerful machines
 }
 
 package() {
 	cd "${srcdir}/${pkgname}"
 
-	make -C build DESTDIR="${pkgdir}" install
-	install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    DESTDIR="${pkgdir}" ninja -C build install
+    install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }